diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-02-25 15:35:54 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-02-25 15:35:54 -0800 |
| commit | a0a63c7b4af720e3790509c35318590f52296a3d (patch) | |
| tree | 06e368fc389840e06779809bf52b7bf1b62cb91d /src/core/surface/alarm.c | |
| parent | 8be227840333e3766cbdbc477d7ebc8bfe6c3d10 (diff) | |
| parent | 2305a51cd67f39bc24cc20adc90269a58374a46d (diff) | |
Merge branch 'hide-the-pollset-set' into cleaner-posix2
Diffstat (limited to 'src/core/surface/alarm.c')
| -rw-r--r-- | src/core/surface/alarm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/surface/alarm.c b/src/core/surface/alarm.c index fb496f6c47..8169ede065 100644 --- a/src/core/surface/alarm.c +++ b/src/core/surface/alarm.c @@ -64,8 +64,9 @@ grpc_alarm *grpc_alarm_create(grpc_completion_queue *cq, gpr_timespec deadline, alarm->tag = tag; grpc_cq_begin_op(cq, tag); - grpc_timer_init(&exec_ctx, &alarm->alarm, deadline, alarm_cb, alarm, - gpr_now(GPR_CLOCK_MONOTONIC)); + grpc_timer_init(&exec_ctx, &alarm->alarm, + gpr_convert_clock_type(deadline, GPR_CLOCK_MONOTONIC), + alarm_cb, alarm, gpr_now(GPR_CLOCK_MONOTONIC)); grpc_exec_ctx_finish(&exec_ctx); return alarm; } |