diff options
author | 2015-05-08 09:52:54 -0700 | |
---|---|---|
committer | 2015-05-08 09:52:54 -0700 | |
commit | 928cd7710f6289586729f19488d275d02284601c (patch) | |
tree | 5a43fec4c507a2067ea079bf7f97b59d8821fd68 /src/core/channel/client_channel.c | |
parent | fe4ba36625c8870e1d24f2c7bb67ec4e53f5f957 (diff) |
Plumb pollset_set through setup pipeline
Diffstat (limited to 'src/core/channel/client_channel.c')
-rw-r--r-- | src/core/channel/client_channel.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/channel/client_channel.c b/src/core/channel/client_channel.c index 43a793f39e..6c21ca34ef 100644 --- a/src/core/channel/client_channel.c +++ b/src/core/channel/client_channel.c @@ -212,6 +212,7 @@ static void cc_start_transport_op(grpc_call_element *elem, if (!chand->transport_setup_initiated) { chand->transport_setup_initiated = 1; initiate_transport_setup = 1; + grpc_pollset_set_init(&chand->waiting_pollsets); } /* add this call to the waiting set to be resumed once we have a child channel stack, growing the waiting set if needed */ @@ -222,9 +223,6 @@ static void cc_start_transport_op(grpc_call_element *elem, chand->waiting_children, chand->waiting_child_capacity * sizeof(call_data *)); } - if (chand->waiting_child_count == 0) { - grpc_pollset_set_init(&chand->waiting_pollsets); - } grpc_pollset_set_add_pollset(&chand->waiting_pollsets, op->bind_pollset); calld->s.waiting_op = *op; chand->waiting_children[chand->waiting_child_count++] = calld; @@ -232,7 +230,8 @@ static void cc_start_transport_op(grpc_call_element *elem, /* finally initiate transport setup if needed */ if (initiate_transport_setup) { - grpc_transport_setup_initiate(chand->transport_setup); + grpc_transport_setup_initiate(chand->transport_setup, + &chand->waiting_pollsets); } } } |