From 5368efa045c81b262a93f98a45a113e2af1441b8 Mon Sep 17 00:00:00 2001 From: "Keith Burns (alagalah)" Date: Wed, 7 Feb 2018 13:20:28 -0800 Subject: [PATCH] Fix bug with glibc epoll fd Change-Id: I0b8ebe2c47fdd1e23a91723a7b454a0c1c8b996e Signed-off-by: Keith Burns (alagalah) --- src/vcl/vcom.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/vcl/vcom.c b/src/vcl/vcom.c index 592be1b1b51..327ab88f0cc 100644 --- a/src/vcl/vcom.c +++ b/src/vcl/vcom.c @@ -3194,7 +3194,7 @@ vcom_epoll_pwait (int epfd, struct epoll_event *events, getpid (), epfd, epfd, func_str, libc_epfd, libc_epfd, events, maxevents, sigmask); - rv = libc_epoll_pwait (epfd, events, maxevents, 1, sigmask); + rv = libc_epoll_pwait (libc_epfd, events, maxevents, 1, sigmask); if (rv != 0) goto done; } @@ -3207,6 +3207,8 @@ vcom_epoll_pwait (int epfd, struct epoll_event *events, done: if (VCOM_DEBUG > 3) { + if (libc_epfd > 0) + epfd = libc_epfd; if (rv < 0) { int errno_val = errno; -- 2.16.6