Skip to content

Commit

Permalink
Fix kqueue response for wait_for_fd with interests=0
Browse files Browse the repository at this point in the history
  • Loading branch information
Coldwings committed Sep 12, 2024
1 parent 5b40acf commit 668e8aa
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion io/epoll.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ ok: entry.interests |= eint;
}
return ret;
}
ret = thread_usleep(timeout.timeout() ? timeout : Timeout(10));
ret = thread_usleep(timeout);
ERRNO err;
if (ret == -1 && err.no == EOK) {
return 0; // Event arrived
Expand Down
17 changes: 9 additions & 8 deletions io/kqueue.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,17 +77,13 @@ class KQueue : public MasterEventEngine, public CascadingEventEngine, public Res
}

int enqueue(int fd, short event, uint16_t action, uint32_t event_flags, void* udata, bool immediate = false) {
// if (fd == _kq) debug_breakpoint();
// immediate = true;
// LOG_DEBUG(VALUE(_kq), VALUE(fd), VALUE(event), VALUE(action), VALUE(event_flags), VALUE(udata), VALUE(immediate));
assert(_n < LEN(_events));
auto entry = &_events[_n++];
EV_SET(entry, fd, event, action, event_flags, 0, udata);
if (immediate || _n == LEN(_events)) {
struct timespec tm{0, 0};
int ret = kevent(_kq, _events, _n, nullptr, 0, &tm);
if (ret < 0) {
// debug_breakpoint();
LOG_ERRNO_RETURN(0, -1, "failed to submit events with kevent()");
}
_n = 0;
Expand Down Expand Up @@ -122,11 +118,16 @@ class KQueue : public MasterEventEngine, public CascadingEventEngine, public Res
}

int wait_for_fd(int fd, uint32_t interests, Timeout timeout) override {
if (unlikely(interests == 0)) {
errno = ENOSYS;
return -1;
}
short ev = (interests == EVENT_READ) ? EVFILT_READ : EVFILT_WRITE;
auto current = CURRENT;
enqueue(fd, ev, EV_ADD | EV_ONESHOT, 0, current, true);
int ret = enqueue(fd, ev, EV_ADD | EV_ONESHOT, 0, current);
if (ret < 0) return ret;
if (timeout.expired()) {
int ret = -1;
ret = -1;
do_wait_and_fire_events(0, [current, &ret](thread* th) {
if (th == current)
ret = 0;
Expand All @@ -139,14 +140,14 @@ class KQueue : public MasterEventEngine, public CascadingEventEngine, public Res
}
return ret;
}
int ret = thread_usleep(timeout);
ret = thread_usleep(timeout);
ERRNO err;
if (ret == -1 && err.no == EOK) {
return 0; // event arrived
}

errno = (ret == 0) ? ETIMEDOUT : err.no;
enqueue(fd, ev, EV_DELETE, 0, current, true);
errno = (ret == 0) ? ETIMEDOUT : err.no;
return -1;
}

Expand Down

0 comments on commit 668e8aa

Please sign in to comment.