From 0fda880c752c827d82a05c645b129f75760ffa2a Mon Sep 17 00:00:00 2001 From: Sree Kuchibhotla Date: Wed, 30 Aug 2017 20:34:51 -0700 Subject: Enable epoll1 --- src/core/lib/iomgr/ev_epoll1_linux.c | 4 ---- src/core/lib/iomgr/ev_epollsig_linux.c | 4 +--- src/core/lib/iomgr/ev_posix.c | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) (limited to 'src') 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}, -- cgit v1.2.3 From 8d6a61af2fa67e7f777d9807ee3cecc27ddca0f9 Mon Sep 17 00:00:00 2001 From: thinkerou Date: Fri, 1 Sep 2017 10:30:25 +0800 Subject: Remove invalide macro --- src/php/ext/grpc/php_grpc.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src') diff --git a/src/php/ext/grpc/php_grpc.c b/src/php/ext/grpc/php_grpc.c index 4ed56de993..0f2c5b8114 100644 --- a/src/php/ext/grpc/php_grpc.c +++ b/src/php/ext/grpc/php_grpc.c @@ -49,9 +49,7 @@ const zend_function_entry grpc_functions[] = { /* {{{ grpc_module_entry */ zend_module_entry grpc_module_entry = { -#if ZEND_MODULE_API_NO >= 20010901 STANDARD_MODULE_HEADER, -#endif "grpc", grpc_functions, PHP_MINIT(grpc), @@ -59,9 +57,7 @@ zend_module_entry grpc_module_entry = { PHP_RINIT(grpc), NULL, PHP_MINFO(grpc), -#if ZEND_MODULE_API_NO >= 20010901 PHP_GRPC_VERSION, -#endif PHP_MODULE_GLOBALS(grpc), PHP_GINIT(grpc), NULL, -- cgit v1.2.3