diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-02-22 22:13:08 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-02-22 22:13:08 -0800 |
| commit | 5b0fde1a0a2bfa9c2bd39da7285f541a534e65c1 (patch) | |
| tree | 132d08b55131627b9d77e929558404e9330c45ce /src/core/surface | |
| parent | 89d517c86a7ce072fec93d435b27f5a7903a7f1b (diff) | |
| parent | 914a2e7217e3376dfbd69fa37008d6d60f797689 (diff) | |
Merge github.com:grpc/grpc into hide-the-worker
Diffstat (limited to 'src/core/surface')
| -rw-r--r-- | src/core/surface/completion_queue.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/surface/completion_queue.c b/src/core/surface/completion_queue.c index 376feb1bbe..f9cb852722 100644 --- a/src/core/surface/completion_queue.c +++ b/src/core/surface/completion_queue.c @@ -333,10 +333,10 @@ grpc_event grpc_completion_queue_next(grpc_completion_queue *cc, gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); grpc_exec_ctx_flush(&exec_ctx); gpr_mu_lock(GRPC_POLLSET_MU(&cc->pollset)); - continue; + } else { + grpc_pollset_work(&exec_ctx, &cc->pollset, &worker, now, + iteration_deadline); } - grpc_pollset_work(&exec_ctx, &cc->pollset, &worker, now, - iteration_deadline); } GRPC_SURFACE_TRACE_RETURNED_EVENT(cc, &ret); GRPC_CQ_INTERNAL_UNREF(cc, "next"); @@ -450,10 +450,10 @@ grpc_event grpc_completion_queue_pluck(grpc_completion_queue *cc, void *tag, gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); grpc_exec_ctx_flush(&exec_ctx); gpr_mu_lock(GRPC_POLLSET_MU(&cc->pollset)); - continue; + } else { + grpc_pollset_work(&exec_ctx, &cc->pollset, &worker, now, + iteration_deadline); } - grpc_pollset_work(&exec_ctx, &cc->pollset, &worker, now, - iteration_deadline); del_plucker(cc, tag, &worker); } done: |