Improve KQUEUE edge-triggered (#240)

ZLMediaKit · Jul 26, 2024 · abf61ef · abf61ef
1 parent 054f2f6
commit abf61ef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/Network/Socket.cpp b/src/Network/Socket.cpp
@@ -543,9 +543,9 @@ int Socket::onAccept(const SockNum::Ptr &sock, int event) noexcept {
                 // emitErr(ex); https://github.com/ZLMediaKit/ZLMediaKit/issues/2946
                 ErrorL << "Accept socket failed: " << ex.what();
                 // 可能打开的文件描述符太多了:UV_EMFILE/UV_ENFILE
-#if defined(HAS_EPOLL) &&  !defined(_WIN32) 
+#if (defined(HAS_EPOLL) && !defined(_WIN32)) || defined(HAS_KQUEUE) 
                 // 边缘触发，还需要手动再触发accept事件,  
-                //wepoll, Edge-triggered (`EPOLLET`) mode isn't supported.
+                // wepoll, Edge-triggered (`EPOLLET`) mode isn't supported.
                 std::weak_ptr<Socket> weak_self = shared_from_this();
                 _poller->doDelayTask(100, [weak_self, sock]() {
                     if (auto strong_self = weak_self.lock()) {

diff --git a/src/Poller/EventPoller.cpp b/src/Poller/EventPoller.cpp
@@ -129,10 +129,10 @@ int EventPoller::addEvent(int fd, int event, PollEventCB cb) {
         struct kevent kev[2];
         int index = 0;
         if (event & Event_Read) {
-            EV_SET(&kev[index++], fd, EVFILT_READ, EV_ADD, 0, 0, nullptr);
+            EV_SET(&kev[index++], fd, EVFILT_READ, EV_ADD | EV_CLEAR, 0, 0, nullptr);
         }
         if (event & Event_Write) {
-            EV_SET(&kev[index++], fd, EVFILT_WRITE, EV_ADD, 0, 0, nullptr);
+            EV_SET(&kev[index++], fd, EVFILT_WRITE, EV_ADD | EV_CLEAR, 0, 0, nullptr);
         }
         int ret = kevent(_event_fd, kev, index, nullptr, 0, nullptr);
         if (ret != -1) {
@@ -223,8 +223,8 @@ int EventPoller::modifyEvent(int fd, int event, PollCompleteCB cb) {
 #elif defined(HAS_KQUEUE)
         struct kevent kev[2];
         int index = 0;
-        EV_SET(&kev[index++], fd, EVFILT_READ, event & Event_Read ? EV_ADD : EV_DELETE, 0, 0, nullptr);
-        EV_SET(&kev[index++], fd, EVFILT_WRITE, event & Event_Write ? EV_ADD : EV_DELETE, 0, 0, nullptr);
+        EV_SET(&kev[index++], fd, EVFILT_READ, event & Event_Read ? EV_ADD | EV_CLEAR : EV_DELETE, 0, 0, nullptr);
+        EV_SET(&kev[index++], fd, EVFILT_WRITE, event & Event_Write ? EV_ADD | EV_CLEAR : EV_DELETE, 0, 0, nullptr);
         int ret = kevent(_event_fd, kev, index, nullptr, 0, nullptr);
         cb(ret != -1);
         return ret;