linux: fix epoll_pwait() fallback on arm64

bnoordhuis · bnoordhuis · commit 1d8332f7e6af · 2015-04-07T15:07:28.000+02:00
arm64 doesn't have a epoll_wait() system call but a logic error stopped libuv from falling back to epoll_pwait(). This bug was introduced in commit 67bb2b5 ("linux: fix epoll_pwait() regression with < 2.6.19") which sadly exchanged one regression for another. PR-URL: #308 Reviewed-By: Saúl Ibarra Corretgé <saghul@gmail.com>
diff --git a/src/unix/linux-core.c b/src/unix/linux-core.c
@@ -215,7 +215,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
       if (pthread_sigmask(SIG_BLOCK, &sigset, NULL))
         abort();
 
-    if (sigmask != 0 && no_epoll_pwait == 0) {
+    if (no_epoll_wait != 0 || (sigmask != 0 && no_epoll_pwait == 0)) {
       nfds = uv__epoll_pwait(loop->backend_fd,
                              events,
                              ARRAY_SIZE(events),
