diff options
author | 2017-08-30 20:34:51 -0700 | |
---|---|---|
committer | 2017-08-30 20:34:51 -0700 | |
commit | 0fda880c752c827d82a05c645b129f75760ffa2a (patch) | |
tree | 72e4e64e9ddb6197a151a7bf7c94973a850ffd9e /src | |
parent | 8af54b8bfaa03d0012eed37077ac602a84b354a6 (diff) |
Enable epoll1
Diffstat (limited to 'src')
-rw-r--r-- | src/core/lib/iomgr/ev_epoll1_linux.c | 4 | ||||
-rw-r--r-- | src/core/lib/iomgr/ev_epollsig_linux.c | 4 | ||||
-rw-r--r-- | src/core/lib/iomgr/ev_posix.c | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/src/core/lib/iomgr/ev_epoll1_linux.c b/src/core/lib/iomgr/ev_epoll1_linux.c index b940d48ba9..8b0a65006e 100644 --- a/src/core/lib/iomgr/ev_epoll1_linux.c +++ b/src/core/lib/iomgr/ev_epoll1_linux.c @@ -1192,10 +1192,6 @@ static const grpc_event_engine_vtable vtable = { * Create epoll_fd (epoll_set_init() takes care of that) 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_epollsig_linux.c b/src/core/lib/iomgr/ev_epollsig_linux.c index 070d75e42a..fad12ff65c 100644 --- a/src/core/lib/iomgr/ev_epollsig_linux.c +++ b/src/core/lib/iomgr/ev_epollsig_linux.c @@ -1728,9 +1728,7 @@ const grpc_event_engine_vtable *grpc_init_epollsig_linux( } if (!is_grpc_wakeup_signal_initialized) { - /* TODO(ctiller): when other epoll engines are ready, remove the true || to - * force this to be explitly chosen if needed */ - if (true || explicit_request) { + if (explicit_request) { grpc_use_signal(SIGRTMIN + 6); } else { 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}, |