diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-05-15 14:42:54 -0700 |
|---|---|---|
| committer |  Craig Tiller <craig.tiller@gmail.com> | 2015-05-17 14:35:29 -0700 |
| commit | 4751fb1e462bcb0835aba24921cdfe4921fd4e85 (patch) | |
| tree | fae98bc636c6e4f9b6ca612df3fdb9825c39b549 /src/core | |
| parent | 09600be0a56774d11fd575b5a80a1e8cfc7d13a2 (diff) | |
Make cq tracing work again
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/surface/completion_queue.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/surface/completion_queue.c b/src/core/surface/completion_queue.c index 48910afda3..8c9ca48a05 100644 --- a/src/core/surface/completion_queue.c +++ b/src/core/surface/completion_queue.c @@ -275,14 +275,14 @@ grpc_event grpc_completion_queue_pluck(grpc_completion_queue *cc, void *tag, gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); memset(&ret, 0, sizeof(ret)); ret.type = GRPC_QUEUE_TIMEOUT; - GRPC_SURFACE_TRACE_RETURNED_EVENT(cc, &ev->base); + GRPC_SURFACE_TRACE_RETURNED_EVENT(cc, &ret); return ret; } } gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset)); ret = ev->base; gpr_free(ev); - GRPC_SURFACE_TRACE_RETURNED_EVENT(cc, &ev->base); + GRPC_SURFACE_TRACE_RETURNED_EVENT(cc, &ret); return ret; } |