aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeith Burns (alagalah) <alagalah@gmail.com>2018-02-07 13:20:28 -0800
committerFlorin Coras <florin.coras@gmail.com>2018-02-07 22:52:52 +0000
commit5368efa045c81b262a93f98a45a113e2af1441b8 (patch)
tree11bbb28b5f7d1ba92f987a4ae78267800b38e514
parentdf41cf62d8360bdabb5e0174297790a2ffb7e840 (diff)
Fix bug with glibc epoll fd
Change-Id: I0b8ebe2c47fdd1e23a91723a7b454a0c1c8b996e Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>
-rw-r--r--src/vcl/vcom.c4
1 files changed, 3 insertions, 1 deletions
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;