diff options
author | 2017-10-12 00:27:00 +0000 | |
---|---|---|
committer | 2017-10-12 00:27:00 +0000 | |
commit | 6b9a99c58d93cef4e538b9f33c68534e2a972505 (patch) | |
tree | 52b37c364df4d74b8fae769c559415ef4f900cce /src/core/lib/iomgr/pollset_uv.cc | |
parent | 513daab34b6761986237f81793be7627e1fcf77a (diff) | |
parent | 2ac511f44c000fd73951ddd268a4c86d76665e1b (diff) |
Merge github.com:grpc/grpc into epexinf
Diffstat (limited to 'src/core/lib/iomgr/pollset_uv.cc')
-rw-r--r-- | src/core/lib/iomgr/pollset_uv.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/lib/iomgr/pollset_uv.cc b/src/core/lib/iomgr/pollset_uv.cc index 7ea5019ad5..b9901bf8ef 100644 --- a/src/core/lib/iomgr/pollset_uv.cc +++ b/src/core/lib/iomgr/pollset_uv.cc @@ -116,13 +116,14 @@ void grpc_pollset_destroy(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset) { grpc_error *grpc_pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, grpc_pollset_worker **worker_hdl, - gpr_timespec now, gpr_timespec deadline) { + grpc_millis deadline) { uint64_t timeout; GRPC_UV_ASSERT_SAME_THREAD(); gpr_mu_unlock(&grpc_polling_mu); if (grpc_pollset_work_run_loop) { - if (gpr_time_cmp(deadline, now) >= 0) { - timeout = (uint64_t)gpr_time_to_millis(gpr_time_sub(deadline, now)); + grpc_millis now = grpc_exec_ctx_now(exec_ctx); + if (deadline >= now) { + timeout = deadline - now; } else { timeout = 0; } |