diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-03-29 14:35:18 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-03-29 14:35:18 -0700 |
| commit | 6696894e6a3e02170a560e0abcea1b4e948d583f (patch) | |
| tree | 9485b4d5736c3b6ed8e62e8154dcf700b79a27ac /src | |
| parent | 1c10a7b3b4330244ab038ab6985247ffb4a62836 (diff) | |
| parent | b58de7238981dc5fa3a18db4941bddca75c0d521 (diff) | |
Merge branch 'lazy-batches' into lazy-parent
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/lib/surface/call.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/lib/surface/call.c b/src/core/lib/surface/call.c index 946ad1b83e..b3c686c4d9 100644 --- a/src/core/lib/surface/call.c +++ b/src/core/lib/surface/call.c @@ -175,7 +175,7 @@ struct grpc_call { /* have we received initial metadata */ bool has_initial_md_been_received; - batch_control active_batches[MAX_CONCURRENT_BATCHES]; + batch_control *active_batches[MAX_CONCURRENT_BATCHES]; grpc_transport_stream_op_payload stream_op_payload; /* first idx: is_receiving, second idx: is_trailing */ @@ -1052,7 +1052,11 @@ static batch_control *allocate_batch_control(grpc_call *call, const grpc_op *ops, size_t num_ops) { int slot = batch_slot_for_op(ops[0].op); - batch_control *bctl = &call->active_batches[slot]; + batch_control **pslot = &call->active_batches[slot]; + if (*pslot == NULL) { + *pslot = gpr_arena_alloc(call->arena, sizeof(batch_control)); + } + batch_control *bctl = *pslot; if (bctl->call != NULL) { return NULL; } |