fix

alibaba · Sep 12, 2024 · 442af9a · 442af9a
1 parent 41fe49e
commit 442af9a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/io/epoll.cpp b/io/epoll.cpp
@@ -299,16 +299,17 @@ ok:     entry.interests |= eint;
             LOG_ERROR_RETURN(EINVAL, -1, "can not wait for multiple interests");
         if (unlikely(interest == 0))
             return rm_interest({fd, EVENT_RWE| ONE_SHOT, 0}); // remove fd from epoll
-        int ret = add_interest({fd, interest | ONE_SHOT, CURRENT});
+        thread* current = CURRENT;
+        int ret = add_interest({fd, interest | ONE_SHOT, current});
         if (ret < 0) LOG_ERROR_RETURN(0, -1, "failed to add event interest");
         // if timeout is just simple 0, wait for a tiny little moment
         // so that events can be collect.
         if (timeout.expired()) {
             ret = -1;
             wait_for_events(
                 0,
-                [&](void* data) __INLINE__ {
-                    if ((thread*)data == CURRENT) {
+                [current, &ret](void* data) __INLINE__ {
+                    if ((thread*)data == current) {
                         ret = 0;
                     } else {
                         thread_interrupt((thread*)data, EOK);

diff --git a/io/kqueue.cpp b/io/kqueue.cpp
@@ -84,7 +84,7 @@ class KQueue : public MasterEventEngine, public CascadingEventEngine, public Res
         auto entry = &_events[_n++];
         EV_SET(entry, fd, event, action, event_flags, 0, udata);
         if (immediate || _n == LEN(_events)) {
-            struct timespec tm {0, 0};
+            struct timespec tm{0, 0};
             int ret = kevent(_kq, _events, _n, nullptr, 0, &tm);
             if (ret < 0) {
                 // debug_breakpoint();
@@ -111,7 +111,8 @@ class KQueue : public MasterEventEngine, public CascadingEventEngine, public Res
         nev += ret;
         for (int i = 0; i < ret; ++i) {
             if (_events[i].filter == EVFILT_USER) continue;
-            event_callback((thread*)_events[i].udata);
+            auto th = (thread*) _events[i].udata;
+            if (th) event_callback(th);
         }
         if (ret == (int) LEN(_events)) {  // there may be more events
             tm.tv_sec = tm.tv_nsec = 0;
@@ -121,8 +122,6 @@ class KQueue : public MasterEventEngine, public CascadingEventEngine, public Res
     }
 
     int wait_for_fd(int fd, uint32_t interests, Timeout timeout) override {
-        if (unlikely(interests == 0))
-            return 0;
         short ev = (interests == EVENT_READ) ? EVFILT_READ : EVFILT_WRITE;
         auto current = CURRENT;
         enqueue(fd, ev, EV_ADD | EV_ONESHOT, 0, current, true);
@@ -132,7 +131,7 @@ class KQueue : public MasterEventEngine, public CascadingEventEngine, public Res
                 if (th == current)
                     ret = 0;
                 else
-                    thread_interrupt(th);
+                    thread_interrupt(th, EOK);
             });
             if (ret <0) {
                 enqueue(fd, ev, EV_DELETE, 0, current, true);
@@ -145,16 +144,14 @@ class KQueue : public MasterEventEngine, public CascadingEventEngine, public Res
         if (ret == -1 && err.no == EOK) {
             return 0;  // event arrived
         }
-    
+
         errno = (ret == 0) ? ETIMEDOUT : err.no;
         enqueue(fd, ev, EV_DELETE, 0, current, true);
         return -1;
     }
 
     ssize_t wait_and_fire_events(uint64_t timeout) override {
-        return do_wait_and_fire_events(timeout, [](thread* th) {
-            thread_interrupt(th);
-        });
+        return do_wait_and_fire_events(timeout, [](thread *th) { thread_interrupt(th, EOK); });
     }
 
     int cancel_wait() override {