diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-10-12 08:42:31 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-10-12 08:42:31 -0700 |
| commit | 5d73d47f642dcd1b30a59c7a53c5332465bd0efa (patch) | |
| tree | c398127c11d460f81fcf82004a7ebf468277e9a7 /src/core/lib/surface/alarm.cc | |
| parent | 4e9576663113f28fb4a6aaec43c8950666caff44 (diff) | |
| parent | 97e11e02e00e96c94551fda3bc980c64b446e759 (diff) | |
Merge github.com:grpc/grpc into vector
Diffstat (limited to 'src/core/lib/surface/alarm.cc')
| -rw-r--r-- | src/core/lib/surface/alarm.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/lib/surface/alarm.cc b/src/core/lib/surface/alarm.cc index 4e67543191..16a16bfd93 100644 --- a/src/core/lib/surface/alarm.cc +++ b/src/core/lib/surface/alarm.cc @@ -126,8 +126,7 @@ void grpc_alarm_set(grpc_alarm *alarm, grpc_completion_queue *cq, GPR_ASSERT(grpc_cq_begin_op(cq, tag)); grpc_timer_init(&exec_ctx, &alarm->alarm, - gpr_convert_clock_type(deadline, GPR_CLOCK_MONOTONIC), - &alarm->on_alarm, gpr_now(GPR_CLOCK_MONOTONIC)); + grpc_timespec_to_millis_round_up(deadline), &alarm->on_alarm); grpc_exec_ctx_finish(&exec_ctx); } |