diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-04-12 06:44:00 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-04-12 06:44:00 -0700 |
| commit | c20fa90c6094599540e3a7ef16a5aa381580be33 (patch) | |
| tree | 10233657606d5207a83bcebb36b8676dad459655 /src/core/lib/surface/completion_queue.c | |
| parent | d4e9a4863a25f40389db01347aaabcb798dc9138 (diff) | |
| parent | f200f25d4dad5b74e7216a2b17fa2c2783ceb40e (diff) | |
Merge github.com:grpc/grpc into cpparena
Diffstat (limited to 'src/core/lib/surface/completion_queue.c')
| -rw-r--r-- | src/core/lib/surface/completion_queue.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/lib/surface/completion_queue.c b/src/core/lib/surface/completion_queue.c index b4594817e4..3273addf1d 100644 --- a/src/core/lib/surface/completion_queue.c +++ b/src/core/lib/surface/completion_queue.c @@ -345,7 +345,6 @@ static void dump_pending_tags(grpc_completion_queue *cc) {} grpc_event grpc_completion_queue_next(grpc_completion_queue *cc, gpr_timespec deadline, void *reserved) { grpc_event ret; - grpc_pollset_worker *worker = NULL; gpr_timespec now; GPR_TIMER_BEGIN("grpc_completion_queue_next", 0); @@ -426,8 +425,8 @@ grpc_event grpc_completion_queue_next(grpc_completion_queue *cc, gpr_mu_lock(cc->mu); continue; } else { - grpc_error *err = grpc_pollset_work(&exec_ctx, POLLSET_FROM_CQ(cc), - &worker, now, iteration_deadline); + grpc_error *err = grpc_pollset_work(&exec_ctx, POLLSET_FROM_CQ(cc), NULL, + now, iteration_deadline); if (err != GRPC_ERROR_NONE) { gpr_mu_unlock(cc->mu); const char *msg = grpc_error_string(err); |