diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-01-26 12:40:51 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-01-26 12:40:51 -0800 |
| commit | 1291fd4b2f9f502f412c3d6cd5dd5fdc18092842 (patch) | |
| tree | 13581d08ccd104a656a02e22a23398616022ddf0 | |
| parent | 4ffcb2058df96c1fa0a319cd3e5d4aa9358e5bae (diff) | |
| parent | e49959dc98cf88eebbdc0cadcbc13394eff53faf (diff) | |
Merge pull request #9471 from ctiller/cp
Consume the correct event fd
| -rw-r--r-- | src/core/lib/iomgr/ev_epoll_linux.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/lib/iomgr/ev_epoll_linux.c b/src/core/lib/iomgr/ev_epoll_linux.c index 715d057c51..2a6956ae54 100644 --- a/src/core/lib/iomgr/ev_epoll_linux.c +++ b/src/core/lib/iomgr/ev_epoll_linux.c @@ -1527,7 +1527,8 @@ static void pollset_work_and_unlock(grpc_exec_ctx *exec_ctx, append_error(error, grpc_wakeup_fd_consume_wakeup(&global_wakeup_fd), err_desc); } else if (data_ptr == &pi->workqueue_wakeup_fd) { - append_error(error, grpc_wakeup_fd_consume_wakeup(&global_wakeup_fd), + append_error(error, + grpc_wakeup_fd_consume_wakeup(&pi->workqueue_wakeup_fd), err_desc); maybe_do_workqueue_work(exec_ctx, pi); } else if (data_ptr == &polling_island_wakeup_fd) { |