Skip to content

Fix libxev poller callback leaks and re-enable poller tests #442

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

Merged
heartwilltell merged 1 commit into from
Apr 28, 2026
Merged

Fix libxev poller callback leaks and re-enable poller tests #442

Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions src/runtime/run_xev_bridge.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,11 +272,13 @@ fn readPollCallback(
const wg = s.write_g;
s.read_g = null;
s.write_g = null;
if (rg != null or wg != null) callbacks_fired += 1;
cb(fd, 3, rg, wg);
return .disarm;
};
const rg = s.read_g;
s.read_g = null;
if (rg != null) callbacks_fired += 1;
cb(fd, 1, rg, null);
}
return .disarm;
Expand Down Expand Up @@ -348,6 +350,9 @@ export fn run_xev_tick() c_int {
if (!loop_initialized) return 0;
if (registered_count <= 0) return 0;

// Drain all currently-ready completions in this tick. On kqueue, a single
// no_wait run can report only one completion even when multiple fds are
// already ready; bounded draining ensures fairness and avoids dropped wakeups.
callbacks_fired = 0;
var previous_callbacks: u32 = 0;
var i: u8 = 0;
Expand Down
21 changes: 4 additions & 17 deletions src/runtime/tests/test_poller.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,23 +398,10 @@ void run_test_poller(void) {
TEST_SUITE("run_poller");
RUN_TEST(test_poller_has_waiters);
RUN_TEST(test_poller_open_close);
#ifdef _WIN32
RUN_TEST(test_poller_pipe_read);
RUN_TEST(test_poller_close_while_waiting);
#else
/* Gated on #426: hangs on Linux x86_64 CI due to libxev epoll state leaking
* across tests (passes in isolation and on macOS). Re-enable once #426 is fixed. */
/* RUN_TEST(test_poller_close_while_waiting); */
/* Gated on #426: hangs on macOS CI due to libxev kqueue state leaking from
* prior tests (passes in isolation). Re-enable once #426 is fixed. */
/* RUN_TEST(test_poller_pipe_read); */
/* Gated on #426: passes in isolation, but running it in the same suite as
* test_poller_pipe_read in either order causes the second test to hang due
* to inter-test libxev state leak. Re-enable once #426 is fixed. */
/* RUN_TEST(test_poller_write_park); */
/* Gated on #424: libxev kqueue adapter only fires one fd's callback per
* tick when multiple fds are ready, so this test hangs. Re-enable once
* the adapter is fixed. */
/* RUN_TEST(test_poller_multiple_fds); */
RUN_TEST(test_poller_pipe_read);
#ifndef _WIN32
RUN_TEST(test_poller_write_park);
#endif
RUN_TEST(test_poller_multiple_fds);
}
Loading