diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-04-04 08:00:55 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-04-04 08:00:55 -0700 |
| commit | 29ebc575546481a8bb4d10b9bb6c18c510f349af (patch) | |
| tree | 5b7a9fde57fd4f0de05b07a22f26463870f554ff /src/core/lib/iomgr/ev_epoll_linux.c | |
| parent | 0e101ea8a3971f498cea4ac9b41e2a0483fefaa3 (diff) | |
| parent | ad286c35da683ab2e1e60c1d6fd41a75a5c5cf6f (diff) | |
Merge branch 'minimal' into minimal_test
Diffstat (limited to 'src/core/lib/iomgr/ev_epoll_linux.c')
| -rw-r--r-- | src/core/lib/iomgr/ev_epoll_linux.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/lib/iomgr/ev_epoll_linux.c b/src/core/lib/iomgr/ev_epoll_linux.c index f6372c0f3f..7014b98349 100644 --- a/src/core/lib/iomgr/ev_epoll_linux.c +++ b/src/core/lib/iomgr/ev_epoll_linux.c @@ -56,6 +56,7 @@ #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/iomgr_internal.h" +#include "src/core/lib/iomgr/timer.h" #include "src/core/lib/iomgr/wakeup_fd_posix.h" #include "src/core/lib/iomgr/workqueue.h" #include "src/core/lib/profiling/timers.h" @@ -1467,8 +1468,9 @@ static int poll_deadline_to_millis_timeout(gpr_timespec deadline, return 0; } timeout = gpr_time_sub(deadline, now); - return gpr_time_to_millis(gpr_time_add( + int millis = gpr_time_to_millis(gpr_time_add( timeout, gpr_time_from_nanos(GPR_NS_PER_MS - 1, GPR_TIMESPAN))); + return millis >= 1 ? millis : 1; } static void fd_become_readable(grpc_exec_ctx *exec_ctx, grpc_fd *fd, @@ -1650,6 +1652,7 @@ static void pollset_work_and_unlock(grpc_exec_ctx *exec_ctx, for (int i = 0; i < ep_rv; ++i) { void *data_ptr = ep_ev[i].data.ptr; if (data_ptr == &global_wakeup_fd) { + grpc_timer_consume_kick(); append_error(error, grpc_wakeup_fd_consume_wakeup(&global_wakeup_fd), err_desc); } else if (data_ptr == &pi->workqueue_wakeup_fd) { |