diff options
| author |  Muxi Yan <mxyan@google.com> | 2017-04-04 15:03:19 -0700 |
|---|---|---|
| committer | Muxi Yan <mxyan@google.com> | 2017-04-04 15:03:19 -0700 |
| commit | b3cec5df24514711d1171558216ff76ac18c5cda (patch) | |
| tree | a6b15412ad568122018d5fdb10ab1d1141fb2351 /src/core/lib/iomgr/ev_poll_posix.c | |
| parent | f5684b4e13bb8281a2246b3219a9e53cfa8d6bfb (diff) | |
| parent | ca38800d6236835d3907b8c29e6faeebe31ffeb7 (diff) | |
Merge remote-tracking branch 'upstream/master' into lazy-deframe
Diffstat (limited to 'src/core/lib/iomgr/ev_poll_posix.c')
| -rw-r--r-- | src/core/lib/iomgr/ev_poll_posix.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/lib/iomgr/ev_poll_posix.c b/src/core/lib/iomgr/ev_poll_posix.c index ca6e855611..d90f223362 100644 --- a/src/core/lib/iomgr/ev_poll_posix.c +++ b/src/core/lib/iomgr/ev_poll_posix.c @@ -52,6 +52,7 @@ #include <grpc/support/useful.h> #include "src/core/lib/iomgr/iomgr_internal.h" +#include "src/core/lib/iomgr/timer.h" #include "src/core/lib/iomgr/wakeup_fd_cv.h" #include "src/core/lib/iomgr/wakeup_fd_posix.h" #include "src/core/lib/profiling/timers.h" @@ -1006,6 +1007,7 @@ static grpc_error *pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, } } else { if (pfds[0].revents & POLLIN_CHECK) { + grpc_timer_consume_kick(); work_combine_error(&error, grpc_wakeup_fd_consume_wakeup(&global_wakeup_fd)); } |