diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-04-28 15:45:47 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-04-28 15:45:47 -0700 |
| commit | 0d6fee6c8ef3a46b72816332893f0044294b852e (patch) | |
| tree | 08389d33d157cc7a3651ff29267b87a8ba37a923 /src/core/lib/surface/call.c | |
| parent | c230881333510b52b157ac3478723d85b18440c2 (diff) | |
| parent | a93e5a49e3d04c2f72e320040a15121e4d88b5d3 (diff) | |
Merge pull request #2286 from ctiller/split-me-baby-one-more-time
Further lock contention reduction for CHTTP2
Diffstat (limited to 'src/core/lib/surface/call.c')
| -rw-r--r-- | src/core/lib/surface/call.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/lib/surface/call.c b/src/core/lib/surface/call.c index c4f310e2fb..9b2b94eedf 100644 --- a/src/core/lib/surface/call.c +++ b/src/core/lib/surface/call.c @@ -373,8 +373,6 @@ static void destroy_call(grpc_exec_ctx *exec_ctx, void *call, bool success) { if (c->receiving_stream != NULL) { grpc_byte_stream_destroy(exec_ctx, c->receiving_stream); } - grpc_call_stack_destroy(exec_ctx, CALL_STACK_FROM_CALL(c)); - GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, c->channel, "call"); gpr_mu_destroy(&c->mu); for (i = 0; i < STATUS_SOURCE_COUNT; i++) { if (c->status[i].details) { @@ -392,7 +390,9 @@ static void destroy_call(grpc_exec_ctx *exec_ctx, void *call, bool success) { if (c->cq) { GRPC_CQ_INTERNAL_UNREF(c->cq, "bind"); } - gpr_free(c); + grpc_channel *channel = c->channel; + grpc_call_stack_destroy(exec_ctx, CALL_STACK_FROM_CALL(c), c); + GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, channel, "call"); GPR_TIMER_END("destroy_call", 0); } |