diff options
| author |  Sree Kuchibhotla <sreek@google.com> | 2017-08-16 12:30:58 -0700 |
|---|---|---|
| committer | Sree Kuchibhotla <sreek@google.com> | 2017-08-16 12:30:58 -0700 |
| commit | 54749da91bf07dbe9060e97659190942c567f124 (patch) | |
| tree | 891ad3dec05499ffd7f631e445a48ca5a5652a2f /src | |
| parent | a7cfb12d914a3d4ecc5daa3c0517c5d901937e85 (diff) | |
Enable epoll1 by default (and move epollsig as second choice)
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/lib/iomgr/ev_epoll1_linux.c | 6 | ||||
| -rw-r--r-- | src/core/lib/iomgr/ev_posix.c | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/core/lib/iomgr/ev_epoll1_linux.c b/src/core/lib/iomgr/ev_epoll1_linux.c index 90e0ce36cd..695f0dea93 100644 --- a/src/core/lib/iomgr/ev_epoll1_linux.c +++ b/src/core/lib/iomgr/ev_epoll1_linux.c @@ -1043,12 +1043,6 @@ 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) { - /* TODO(sreek): Temporarily disable this poller unless explicitly requested - * via GRPC_POLL_STRATEGY */ - 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 91f8cd5482..424b40e425 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[] = { - {"epollsig", grpc_init_epollsig_linux}, {"epoll1", grpc_init_epoll1_linux}, + {"epollsig", grpc_init_epollsig_linux}, {"epoll-threadpool", grpc_init_epoll_thread_pool_linux}, {"epoll-limited", grpc_init_epoll_limited_pollers_linux}, {"poll", grpc_init_poll_posix}, |