diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-09-01 09:03:49 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-09-01 09:03:49 -0700 |
| commit | 4b852546266e63fcc1e5a67ae7be3608be69af50 (patch) | |
| tree | 0f385250d488eb4e3d36c2c1f68aaa873a0152d5 /src/core | |
| parent | 86115cd114171a087fb3cb8ecf1bed2d9fd37e44 (diff) | |
| parent | c928cfee2b94a99747f97ff8c5fb09277a1352b7 (diff) | |
Merge github.com:grpc/grpc into moar_stats
Diffstat (limited to 'src/core')
| -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 47ad2f45c3..7f053fa728 100644 --- a/src/core/lib/iomgr/ev_epoll1_linux.c +++ b/src/core/lib/iomgr/ev_epoll1_linux.c @@ -1194,10 +1194,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 16f2d21237..59c7cdc285 100644 --- a/src/core/lib/iomgr/ev_epollsig_linux.c +++ b/src/core/lib/iomgr/ev_epollsig_linux.c @@ -1730,9 +1730,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}, |