diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2017-08-30 23:13:25 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2017-08-30 23:13:25 +0200 |
| commit | 90df76b4633c6a3c8a492148ba5268b94284ea6a (patch) | |
| tree | 91ec10271620b7d9baaf510bbfc11349bd4fa663 /src/core/lib/surface/completion_queue.c | |
| parent | 2bc5e3ac40fc1b6f7d329a1727c78e8a820d5cf6 (diff) | |
| parent | 7a8488c4d2b0274c7c71cd15d39f0cf277a3a119 (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into visibility
Diffstat (limited to 'src/core/lib/surface/completion_queue.c')
| -rw-r--r-- | src/core/lib/surface/completion_queue.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/core/lib/surface/completion_queue.c b/src/core/lib/surface/completion_queue.c index c20cfbc740..10e4e5ab0c 100644 --- a/src/core/lib/surface/completion_queue.c +++ b/src/core/lib/surface/completion_queue.c @@ -976,7 +976,6 @@ static void cq_shutdown_next(grpc_exec_ctx *exec_ctx, if (cqd->shutdown_called) { gpr_mu_unlock(cq->mu); GRPC_CQ_INTERNAL_UNREF(exec_ctx, cq, "shutting_down"); - GPR_TIMER_END("grpc_completion_queue_shutdown", 0); return; } cqd->shutdown_called = true; @@ -1208,7 +1207,6 @@ static void cq_shutdown_pluck(grpc_exec_ctx *exec_ctx, if (cqd->shutdown_called) { gpr_mu_unlock(cq->mu); GRPC_CQ_INTERNAL_UNREF(exec_ctx, cq, "shutting_down (pluck cq)"); - GPR_TIMER_END("grpc_completion_queue_shutdown", 0); return; } cqd->shutdown_called = true; |