diff options
| author |  Hongwei Wang <hongweiw@google.com> | 2015-07-17 17:38:34 -0700 |
|---|---|---|
| committer | Hongwei Wang <hongweiw@google.com> | 2015-07-17 17:38:34 -0700 |
| commit | b307ae280b974a927cd1319ffd974c1dd90ec95d (patch) | |
| tree | e38b428e51ec491cc7aac5a78925540092079131 /src/ruby/ext/grpc/rb_completion_queue.c | |
| parent | eec3b9103baa784bbcd6be10d101ab53b1f169de (diff) | |
| parent | efccb3f5ce7cae89739d3a0474fcc0d6e2a5b12c (diff) | |
Merge branch 'master' into zookeeper
Diffstat (limited to 'src/ruby/ext/grpc/rb_completion_queue.c')
| -rw-r--r-- | src/ruby/ext/grpc/rb_completion_queue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ruby/ext/grpc/rb_completion_queue.c b/src/ruby/ext/grpc/rb_completion_queue.c index 8fb3949b3d..2d52d96dc8 100644 --- a/src/ruby/ext/grpc/rb_completion_queue.c +++ b/src/ruby/ext/grpc/rb_completion_queue.c @@ -91,7 +91,7 @@ static void grpc_rb_completion_queue_shutdown_drain(grpc_completion_queue *cq) { * - investigate further, this is probably another example of C-level cleanup * not working consistently in all cases. */ - next_call.timeout = gpr_time_add(gpr_now(), gpr_time_from_micros(5e3)); + next_call.timeout = gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), gpr_time_from_micros(5e3)); do { rb_thread_call_without_gvl(grpc_rb_completion_queue_next_no_gil, (void *)&next_call, NULL, NULL); |