diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-05-01 14:26:49 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-05-01 14:26:49 -0700 |
| commit | c610985aeb3931c53726e742707aa1a8b2fe84b9 (patch) | |
| tree | 586cddcd4ed8380f659c681f9c5a4010553cffb0 /src/core/lib/iomgr/ev_epollex_linux.c | |
| parent | b72a74ae039d666cf6cfc60477289c03dc5b5933 (diff) | |
| parent | 50da5ec21d3d8be5e76b9809242821f9e5badba1 (diff) | |
Merge branch 'hiertune' into epex4+epoll1
Diffstat (limited to 'src/core/lib/iomgr/ev_epollex_linux.c')
| -rw-r--r-- | src/core/lib/iomgr/ev_epollex_linux.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/lib/iomgr/ev_epollex_linux.c b/src/core/lib/iomgr/ev_epollex_linux.c index 952f0172cc..b9f60d8e3e 100644 --- a/src/core/lib/iomgr/ev_epollex_linux.c +++ b/src/core/lib/iomgr/ev_epollex_linux.c @@ -36,7 +36,7 @@ /* This polling engine is only relevant on linux kernels supporting epoll() */ #ifdef GRPC_LINUX_EPOLL -#include "src/core/lib/iomgr/ev_epoll_linux.h" +#include "src/core/lib/iomgr/ev_epollex_linux.h" #include <assert.h> #include <errno.h> @@ -1493,7 +1493,7 @@ static const grpc_event_engine_vtable vtable = { .shutdown_engine = shutdown_engine, }; -const grpc_event_engine_vtable *grpc_init_epollex_linux(void) { +const grpc_event_engine_vtable *grpc_init_epollex_linux(bool explicitly_requested) { if (!grpc_has_wakeup_fd()) { return NULL; } @@ -1518,7 +1518,7 @@ const grpc_event_engine_vtable *grpc_init_epollex_linux(void) { #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_epollex_linux(void) { return NULL; } +const grpc_event_engine_vtable *grpc_init_epollex_linux(bool explicitly_requested) { return NULL; } #endif /* defined(GRPC_POSIX_SOCKET) */ #endif /* !defined(GRPC_LINUX_EPOLL) */ |