Skip to content

Fix FreeBSD: EVFILT_USER wakeup lost when event loop is idle #260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mstdokumaci wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix FreeBSD: EVFILT_USER wakeup lost when event loop is idle #260

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/eventing/epoll_kqueue.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,6 @@ struct us_internal_async *us_internal_create_async(struct us_loop_t *loop, int f
void us_internal_async_close(struct us_internal_async *a) {
struct us_internal_callback_t *internal_cb = (struct us_internal_callback_t *) a;

/* Note: This will fail most of the time as there probably is no pending trigger */
struct kevent event;
EV_SET(&event, (uintptr_t) internal_cb, EVFILT_USER, EV_DELETE, 0, 0, internal_cb);
kevent(internal_cb->loop->fd, &event, 1, NULL, 0, NULL);
Expand All @@ -443,14 +442,19 @@ void us_internal_async_set(struct us_internal_async *a, void (*cb)(struct us_int
struct us_internal_callback_t *internal_cb = (struct us_internal_callback_t *) a;

internal_cb->cb = (void (*)(struct us_internal_callback_t *)) cb;

/* Register once: FreeBSD does not trigger NOTE_TRIGGER on initial EV_ADD.
* EV_CLEAR resets each delivered wakeup while keeping the event registered. */
struct kevent event;
EV_SET(&event, (uintptr_t) internal_cb, EVFILT_USER, EV_ADD | EV_CLEAR, 0, 0, internal_cb);
kevent(internal_cb->loop->fd, &event, 1, NULL, 0, NULL);
}

void us_internal_async_wakeup(struct us_internal_async *a) {
struct us_internal_callback_t *internal_cb = (struct us_internal_callback_t *) a;

/* In kqueue you really only need to add a triggered oneshot event */
struct kevent event;
EV_SET(&event, (uintptr_t) internal_cb, EVFILT_USER, EV_ADD | EV_ONESHOT, NOTE_TRIGGER, 0, internal_cb);
EV_SET(&event, (uintptr_t) internal_cb, EVFILT_USER, 0, NOTE_TRIGGER, 0, internal_cb);
kevent(internal_cb->loop->fd, &event, 1, NULL, 0, NULL);
}
#endif
Expand Down