diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-06-11 09:36:33 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-06-11 09:36:33 -0700 |
| commit | f3fba749aa5a74b64f0a2c9423d470708e648b9a (patch) | |
| tree | ee5580ae4201a4fbb2c1701e0938b3aa98ef76e0 /src/core/surface | |
| parent | a603a450a979a54ec3e5d8106be0ffe64a7e256c (diff) | |
Ensure we dont destroy a call until it is closed
Diffstat (limited to 'src/core/surface')
| -rw-r--r-- | src/core/surface/call.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/core/surface/call.c b/src/core/surface/call.c index b5f8af3fc1..3803e648b4 100644 --- a/src/core/surface/call.c +++ b/src/core/surface/call.c @@ -148,6 +148,8 @@ struct grpc_call { gpr_uint8 receiving; /* are we currently completing requests */ gpr_uint8 completing; + /** has grpc_call_destroy been called */ + gpr_uint8 destroy_called; /* pairs with completed_requests */ gpr_uint8 num_completed_requests; /* are we currently reading a message? */ @@ -294,8 +296,8 @@ grpc_call *grpc_call_create(grpc_channel *channel, grpc_completion_queue *cq, grpc_sopb_init(&call->send_ops); grpc_sopb_init(&call->recv_ops); gpr_slice_buffer_init(&call->incoming_message); - /* dropped in destroy */ - gpr_ref_init(&call->internal_refcount, 1); + /* dropped in destroy and when READ_STATE_STREAM_CLOSED received */ + gpr_ref_init(&call->internal_refcount, 2); /* server hack: start reads immediately so we can get initial metadata. TODO(ctiller): figure out a cleaner solution */ if (!call->is_client) { @@ -436,7 +438,8 @@ static int need_more_data(grpc_call *call) { (is_op_live(call, GRPC_IOREQ_RECV_CLOSE) && grpc_bbq_empty(&call->incoming_queue)) || (call->write_state == WRITE_STATE_INITIAL && !call->is_client) || - (call->cancel_with_status != GRPC_STATUS_OK); + (call->cancel_with_status != GRPC_STATUS_OK) || + call->destroy_called; } static void unlock(grpc_call *call) { @@ -774,6 +777,7 @@ static void call_on_done_recv(void *pc, int success) { grpc_alarm_cancel(&call->alarm); call->have_alarm = 0; } + GRPC_CALL_INTERNAL_UNREF(call, "closed", 0); } finish_read_ops(call); } else { @@ -1036,6 +1040,8 @@ grpc_call_error grpc_call_start_ioreq_and_call_back( void grpc_call_destroy(grpc_call *c) { int cancel; lock(c); + GPR_ASSERT(!c->destroy_called); + c->destroy_called = 1; if (c->have_alarm) { grpc_alarm_cancel(&c->alarm); c->have_alarm = 0; |