diff options
| author |  David Garcia Quintas <dgq@google.com> | 2015-07-17 16:02:15 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2015-07-17 16:02:15 -0700 |
| commit | 6016e260ca5d36408a3ae23db3c44481ee4c8427 (patch) | |
| tree | 7dc0825c12b7c5eec567a833327b23706ce0363f /src/cpp/common/completion_queue.cc | |
| parent | 211e65be3cb1f4b6f7184c1945d8284905f79968 (diff) | |
| parent | e9881bbaf3d53aa80099c42c80fb3331ff38270a (diff) | |
Merge branch 'master' of github.com:grpc/grpc into str_join_with_sep
Diffstat (limited to 'src/cpp/common/completion_queue.cc')
| -rw-r--r-- | src/cpp/common/completion_queue.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/cpp/common/completion_queue.cc b/src/cpp/common/completion_queue.cc index b2dd1acdca..593963f672 100644 --- a/src/cpp/common/completion_queue.cc +++ b/src/cpp/common/completion_queue.cc @@ -70,7 +70,8 @@ CompletionQueue::NextStatus CompletionQueue::AsyncNextInternal( } bool CompletionQueue::Pluck(CompletionQueueTag* tag) { - auto ev = grpc_completion_queue_pluck(cq_, tag, gpr_inf_future); + auto ev = + grpc_completion_queue_pluck(cq_, tag, gpr_inf_future(GPR_CLOCK_REALTIME)); bool ok = ev.success != 0; void* ignored = tag; GPR_ASSERT(tag->FinalizeResult(&ignored, &ok)); @@ -80,7 +81,8 @@ bool CompletionQueue::Pluck(CompletionQueueTag* tag) { } void CompletionQueue::TryPluck(CompletionQueueTag* tag) { - auto ev = grpc_completion_queue_pluck(cq_, tag, gpr_time_0); + auto ev = + grpc_completion_queue_pluck(cq_, tag, gpr_time_0(GPR_CLOCK_REALTIME)); if (ev.type == GRPC_QUEUE_TIMEOUT) return; bool ok = ev.success != 0; void* ignored = tag; |