From 8b0e9fb17edab249f41391d877d8d03961f4f7ee Mon Sep 17 00:00:00 2001 From: Mehrdad Afshari Date: Wed, 17 Jan 2018 13:42:26 -0800 Subject: Explicitly enable epoll on manylinux1 For some reason, the glibc version check does not enable GRPC_LINUX_EPOLL on manylinux1. This commit: * Explicitly enables GRPC_LINUX_LEGACY_EPOLL on MANYLINUX1 * Switches the flag to enable epoll1 IO manager to GRPC_LINUX_LEGACY_EPOLL instead of GRPC_LINUX_EPOLL. This is to ensure epollex and epollsig that are not yet compatible with epoll_create (not epoll_create1) do not get activated unintentionally. --- src/core/lib/iomgr/port.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/core/lib/iomgr/port.h') diff --git a/src/core/lib/iomgr/port.h b/src/core/lib/iomgr/port.h index 80867ee09f..2d56ded4e2 100644 --- a/src/core/lib/iomgr/port.h +++ b/src/core/lib/iomgr/port.h @@ -37,6 +37,7 @@ #define GRPC_POSIX_SOCKETUTILS 1 #define GRPC_POSIX_WAKEUP_FD 1 #define GRPC_TIMER_USE_GENERIC 1 +#define GRPC_LINUX_LEGACY_EPOLL 1 #elif defined(GPR_WINDOWS) #define GRPC_TIMER_USE_GENERIC 1 #define GRPC_WINSOCK_SOCKET 1 @@ -68,9 +69,10 @@ #define GRPC_TIMER_USE_GENERIC 1 #ifdef __GLIBC_PREREQ #if __GLIBC_PREREQ(2, 4) -#define GRPC_LINUX_EPOLL 1 +#define GRPC_LINUX_LEGACY_EPOLL 1 #endif #if __GLIBC_PREREQ(2, 9) +#define GRPC_LINUX_EPOLL 1 #define GRPC_LINUX_EPOLL_CREATE1 1 #define GRPC_LINUX_EVENTFD 1 #endif -- cgit v1.2.3