diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-02-24 09:01:14 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-02-24 09:01:14 -0800 |
| commit | ee1f1f347de8c9a74d8b2cf01840a44fbed83996 (patch) | |
| tree | a0ee2bf2e305b40b95d4d13b525442de68ac8155 /src/core/surface | |
| parent | c605c62b30ca15c83a7c4e98386062c62de0d36d (diff) | |
| parent | 9114a142c9211e0f3401166c0b753349573caf14 (diff) | |
Merge branch 'hide-the-worker' into hide-the-pollset
Diffstat (limited to 'src/core/surface')
| -rw-r--r-- | src/core/surface/completion_queue.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/core/surface/completion_queue.c b/src/core/surface/completion_queue.c index d0659c7e52..41449fb4a6 100644 --- a/src/core/surface/completion_queue.c +++ b/src/core/surface/completion_queue.c @@ -339,9 +339,10 @@ grpc_event grpc_completion_queue_next(grpc_completion_queue *cc, grpc_exec_ctx_flush(&exec_ctx); gpr_mu_lock(&cc->mu); continue; + } else { + grpc_pollset_work(&exec_ctx, POLLSET_FROM_CQ(cc), &worker, now, + iteration_deadline); } - grpc_pollset_work(&exec_ctx, POLLSET_FROM_CQ(cc), &worker, now, - iteration_deadline); } GRPC_SURFACE_TRACE_RETURNED_EVENT(cc, &ret); GRPC_CQ_INTERNAL_UNREF(cc, "next"); @@ -456,9 +457,10 @@ grpc_event grpc_completion_queue_pluck(grpc_completion_queue *cc, void *tag, grpc_exec_ctx_flush(&exec_ctx); gpr_mu_lock(&cc->mu); continue; + } else { + grpc_pollset_work(&exec_ctx, POLLSET_FROM_CQ(cc), &worker, now, + iteration_deadline); } - grpc_pollset_work(&exec_ctx, POLLSET_FROM_CQ(cc), &worker, now, - iteration_deadline); del_plucker(cc, tag, &worker); } done: |