diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-02-02 09:23:22 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-02-02 09:23:22 -0800 |
| commit | 841c72614073223b83a361976d39a66e16ee1fee (patch) | |
| tree | d2627de953f9963b199fbaa4cf883a43550e0c6b /src/core/surface/alarm.c | |
| parent | f1b0849bb024fcd0794b2b0eca8af8a949f9fc70 (diff) | |
| parent | 0727180da8891485168fbe39b4c9ebb859b6b390 (diff) | |
Merge github.com:grpc/grpc into sceq
Diffstat (limited to 'src/core/surface/alarm.c')
| -rw-r--r-- | src/core/surface/alarm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/surface/alarm.c b/src/core/surface/alarm.c index 7c47dd56f8..d753023ca9 100644 --- a/src/core/surface/alarm.c +++ b/src/core/surface/alarm.c @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -48,7 +48,7 @@ struct grpc_alarm { static void do_nothing_end_completion(grpc_exec_ctx *exec_ctx, void *arg, grpc_cq_completion *c) {} -static void alarm_cb(grpc_exec_ctx *exec_ctx, void *arg, int success) { +static void alarm_cb(grpc_exec_ctx *exec_ctx, void *arg, bool success) { grpc_alarm *alarm = arg; grpc_cq_end_op(exec_ctx, alarm->cq, alarm->tag, success, do_nothing_end_completion, NULL, &alarm->completion); @@ -65,7 +65,7 @@ grpc_alarm *grpc_alarm_create(grpc_completion_queue *cq, gpr_timespec deadline, grpc_timer_init(&exec_ctx, &alarm->alarm, deadline, alarm_cb, alarm, gpr_now(GPR_CLOCK_MONOTONIC)); - grpc_cq_begin_op(cq); + grpc_cq_begin_op(cq, tag); grpc_exec_ctx_finish(&exec_ctx); return alarm; } |