diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-01-31 06:25:39 +0100 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-01-31 06:25:39 +0100 |
| commit | bf192eff5632213772ea3351f552722741d68e99 (patch) | |
| tree | 2caecb5a960425ff69a4b68068c66d9d05260c04 /src | |
| parent | 9d476392b7082f0aba187867c0ed873c96f5949f (diff) | |
| parent | d5d83aa33f0bab183ea64dea877abf6cdb0ec65a (diff) | |
Merge branch 'alarming' into make-ruby-installable
Conflicts:
tools/run_tests/sources_and_headers.json
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/surface/alarm.c | 4 | ||||
| -rw-r--r-- | src/python/grpcio/grpc_core_dependencies.py | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/core/surface/alarm.c b/src/core/surface/alarm.c index 7c47dd56f8..22d5f2c7a0 100644 --- a/src/core/surface/alarm.c +++ b/src/core/surface/alarm.c @@ -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; } diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index bc1ce72378..db06092368 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -129,6 +129,7 @@ CORE_SOURCE_FILES = [ 'src/core/json/json_reader.c', 'src/core/json/json_string.c', 'src/core/json/json_writer.c', + 'src/core/surface/alarm.c', 'src/core/surface/api_trace.c', 'src/core/surface/byte_buffer.c', 'src/core/surface/byte_buffer_reader.c', |