diff options
| author | Maria Matejka <mq@ucw.cz> | 2022-10-04 16:15:36 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2022-10-04 16:15:36 +0200 |
| commit | dc9351d326b9d2d8bcb7e9a0e5126878c2b02762 (patch) | |
| tree | 842b9d21cc1f4b16869cac58711902f5b1f78b91 /sysdep/unix/io.c | |
| parent | 00679a688a5feff7a919cbeae71dd050ccc90b22 (diff) | |
| parent | 67256d50359d42aca4e64bb1cb5dcb3c63669578 (diff) | |
Merge commit '67256d50' into HEAD
Diffstat (limited to 'sysdep/unix/io.c')
| -rw-r--r-- | sysdep/unix/io.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c index 23baffb2..6454f15f 100644 --- a/sysdep/unix/io.c +++ b/sysdep/unix/io.c @@ -2213,8 +2213,6 @@ static int short_loops = 0; #define SHORT_LOOP_MAX 10 #define WORK_EVENTS_MAX 10 -void pipe_drain(int fd); - void io_loop(void) { @@ -2246,8 +2244,7 @@ io_loop(void) } /* A hack to reload main io_loop() when something has changed asynchronously. */ - pfd[0].fd = main_birdloop.wakeup_fds[0]; - pfd[0].events = POLLIN; + pipe_pollin(&main_birdloop.wakeup, &pfd[0]); nfds = 1; @@ -2325,7 +2322,7 @@ io_loop(void) if (pfd[0].revents & POLLIN) { /* IO loop reload requested */ - pipe_drain(main_birdloop.wakeup_fds[0]); + pipe_drain(&main_birdloop.wakeup); atomic_exchange_explicit(&main_birdloop.ping_sent, 0, memory_order_acq_rel); continue; } |