diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-04-27 23:29:26 +0000 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-04-27 23:29:26 +0000 |
| commit | 7068eafd894d506b76d24d5d5e95de23f36abf71 (patch) | |
| tree | 1884cad951ec518c109e2dc60b16e4b7b97044e3 | |
| parent | 375eb258d8d66dc3ff1e8a9e82760b8ce6e51954 (diff) | |
| parent | f8382b80caf5f27a69f12e8620cc27255f8afdb8 (diff) | |
Merge branch 'epoll1' of github.com:ctiller/grpc into epoll1
| -rw-r--r-- | src/core/lib/iomgr/ev_epollsig_linux.c | 15 | ||||
| -rw-r--r-- | src/core/lib/iomgr/ev_posix.c | 6 |
2 files changed, 15 insertions, 6 deletions
diff --git a/src/core/lib/iomgr/ev_epollsig_linux.c b/src/core/lib/iomgr/ev_epollsig_linux.c index 25986598b7..65259912a9 100644 --- a/src/core/lib/iomgr/ev_epollsig_linux.c +++ b/src/core/lib/iomgr/ev_epollsig_linux.c @@ -1921,7 +1921,8 @@ static bool is_epoll_available() { return true; } -const grpc_event_engine_vtable *grpc_init_epollsig_linux(bool explicit_request) { +const grpc_event_engine_vtable *grpc_init_epollsig_linux( + bool explicit_request) { /* If use of signals is disabled, we cannot use epoll engine*/ if (is_grpc_wakeup_signal_initialized && grpc_wakeup_signal < 0) { return NULL; @@ -1936,8 +1937,11 @@ const grpc_event_engine_vtable *grpc_init_epollsig_linux(bool explicit_request) } if (!is_grpc_wakeup_signal_initialized) { - if (explicit_request) grpc_use_signal(SIGRTMIN + 6); - else return NULL; + if (explicit_request) { + grpc_use_signal(SIGRTMIN + 6); + } else { + return NULL; + } } fd_global_init(); @@ -1959,7 +1963,10 @@ const grpc_event_engine_vtable *grpc_init_epollsig_linux(bool explicit_request) #include "src/core/lib/iomgr/ev_posix.h" /* If GRPC_LINUX_EPOLL is not defined, it means epoll is not available. Return * NULL */ -const grpc_event_engine_vtable *grpc_init_epollsig_linux(bool explicit_request) { return NULL; } +const grpc_event_engine_vtable *grpc_init_epollsig_linux( + bool explicit_request) { + return NULL; +} #endif /* defined(GRPC_POSIX_SOCKET) */ void grpc_use_signal(int signum) {} diff --git a/src/core/lib/iomgr/ev_posix.c b/src/core/lib/iomgr/ev_posix.c index 442faeac3e..a436d649dd 100644 --- a/src/core/lib/iomgr/ev_posix.c +++ b/src/core/lib/iomgr/ev_posix.c @@ -58,7 +58,8 @@ grpc_wakeup_fd grpc_global_wakeup_fd; static const grpc_event_engine_vtable *g_event_engine; static const char *g_poll_strategy_name = NULL; -typedef const grpc_event_engine_vtable *(*event_engine_factory_fn)(bool explicit_request); +typedef const grpc_event_engine_vtable *(*event_engine_factory_fn)( + bool explicit_request); typedef struct { const char *name; @@ -104,7 +105,8 @@ static bool is(const char *want, const char *have) { static void try_engine(const char *engine) { for (size_t i = 0; i < GPR_ARRAY_SIZE(g_factories); i++) { if (is(engine, g_factories[i].name)) { - if ((g_event_engine = g_factories[i].factory(0 == strcmp(engine, g_factories[i].name)))) { + if ((g_event_engine = g_factories[i].factory( + 0 == strcmp(engine, g_factories[i].name)))) { g_poll_strategy_name = g_factories[i].name; gpr_log(GPR_DEBUG, "Using polling engine: %s", g_factories[i].name); return; |