diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-08-17 13:23:14 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-08-17 13:23:14 -0700 |
| commit | 8f7bff7d48129e577f972815afcc9f32c78d258b (patch) | |
| tree | c2f278fdefc6348a0ba2ba413b13e613115fdc8c /src/core/surface/completion_queue.c | |
| parent | d067c263b250657891de4ad96ae51249435c6066 (diff) | |
| parent | 2194cd8fd4d53a3333fbd0e7bc938e22210d23d2 (diff) | |
Merge github.com:grpc/grpc into y12kdm3
Diffstat (limited to 'src/core/surface/completion_queue.c')
| -rw-r--r-- | src/core/surface/completion_queue.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/core/surface/completion_queue.c b/src/core/surface/completion_queue.c index 4e9de16c5e..b58115a93f 100644 --- a/src/core/surface/completion_queue.c +++ b/src/core/surface/completion_queue.c @@ -69,8 +69,9 @@ struct grpc_completion_queue { plucker pluckers[GRPC_MAX_COMPLETION_QUEUE_PLUCKERS]; }; -grpc_completion_queue *grpc_completion_queue_create(void) { +grpc_completion_queue *grpc_completion_queue_create(void *reserved) { grpc_completion_queue *cc = gpr_malloc(sizeof(grpc_completion_queue)); + GPR_ASSERT(!reserved); memset(cc, 0, sizeof(*cc)); /* Initial ref is dropped by grpc_completion_queue_shutdown */ gpr_ref_init(&cc->pending_events, 1); @@ -166,12 +167,14 @@ void grpc_cq_end_op(grpc_completion_queue *cc, void *tag, int success, } grpc_event grpc_completion_queue_next(grpc_completion_queue *cc, - gpr_timespec deadline) { + gpr_timespec deadline, void *reserved) { grpc_event ret; grpc_pollset_worker worker; int first_loop = 1; gpr_timespec now; + GPR_ASSERT(!reserved); + deadline = gpr_convert_clock_type(deadline, GPR_CLOCK_MONOTONIC); GRPC_CQ_INTERNAL_REF(cc, "next"); @@ -237,7 +240,7 @@ static void del_plucker(grpc_completion_queue *cc, void *tag, } grpc_event grpc_completion_queue_pluck(grpc_completion_queue *cc, void *tag, - gpr_timespec deadline) { + gpr_timespec deadline, void *reserved) { grpc_event ret; grpc_cq_completion *c; grpc_cq_completion *prev; @@ -245,6 +248,8 @@ grpc_event grpc_completion_queue_pluck(grpc_completion_queue *cc, void *tag, gpr_timespec now; int first_loop = 1; + GPR_ASSERT(!reserved); + deadline = gpr_convert_clock_type(deadline, GPR_CLOCK_MONOTONIC); GRPC_CQ_INTERNAL_REF(cc, "pluck"); @@ -275,8 +280,9 @@ grpc_event grpc_completion_queue_pluck(grpc_completion_queue *cc, void *tag, break; } if (!add_plucker(cc, tag, &worker)) { - gpr_log(GPR_DEBUG, - "Too many outstanding grpc_completion_queue_pluck calls: maximum is %d", + gpr_log(GPR_DEBUG, + "Too many outstanding grpc_completion_queue_pluck calls: maximum " + "is %d", GRPC_MAX_COMPLETION_QUEUE_PLUCKERS); gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); memset(&ret, 0, sizeof(ret)); |