diff options
author | 2017-08-17 15:42:57 -0700 | |
---|---|---|
committer | 2017-08-17 15:42:57 -0700 | |
commit | 87ffcb6ab4f7af706736872b5274b2a21feff5e8 (patch) | |
tree | 20e5a4c8a04828e25e7642a96791b370d16ac5a2 /src | |
parent | 308823032890078da18a4b5607858bd0b89db235 (diff) |
disable epoll1 by default (just enable tests)
Diffstat (limited to 'src')
-rw-r--r-- | src/core/lib/iomgr/ev_epoll1_linux.c | 4 | ||||
-rw-r--r-- | src/core/lib/iomgr/ev_posix.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/core/lib/iomgr/ev_epoll1_linux.c b/src/core/lib/iomgr/ev_epoll1_linux.c index 7d44cb1884..6b034ca960 100644 --- a/src/core/lib/iomgr/ev_epoll1_linux.c +++ b/src/core/lib/iomgr/ev_epoll1_linux.c @@ -1050,6 +1050,10 @@ static const grpc_event_engine_vtable vtable = { /* It is possible that GLIBC has epoll but the underlying kernel doesn't. * Create a dummy epoll_fd to make sure epoll support is available */ const grpc_event_engine_vtable *grpc_init_epoll1_linux(bool explicit_request) { + if (!explicit_request) { + return NULL; + } + if (!grpc_has_wakeup_fd()) { return NULL; } diff --git a/src/core/lib/iomgr/ev_posix.c b/src/core/lib/iomgr/ev_posix.c index 424b40e425..91f8cd5482 100644 --- a/src/core/lib/iomgr/ev_posix.c +++ b/src/core/lib/iomgr/ev_posix.c @@ -64,8 +64,8 @@ typedef struct { } event_engine_factory; static const event_engine_factory g_factories[] = { - {"epoll1", grpc_init_epoll1_linux}, {"epollsig", grpc_init_epollsig_linux}, + {"epoll1", grpc_init_epoll1_linux}, {"epoll-threadpool", grpc_init_epoll_thread_pool_linux}, {"epoll-limited", grpc_init_epoll_limited_pollers_linux}, {"poll", grpc_init_poll_posix}, |