diff options
Diffstat (limited to 'src/core/client_config')
| -rw-r--r-- | src/core/client_config/client_config.c | 2 | ||||
| -rw-r--r-- | src/core/client_config/connector.c | 6 | ||||
| -rw-r--r-- | src/core/client_config/lb_policies/pick_first.c | 64 | ||||
| -rw-r--r-- | src/core/client_config/lb_policies/round_robin.c | 54 | ||||
| -rw-r--r-- | src/core/client_config/lb_policy.c | 14 | ||||
| -rw-r--r-- | src/core/client_config/resolver.c | 8 | ||||
| -rw-r--r-- | src/core/client_config/resolvers/dns_resolver.c | 16 | ||||
| -rw-r--r-- | src/core/client_config/resolvers/sockaddr_resolver.c | 8 | ||||
| -rw-r--r-- | src/core/client_config/subchannel.c | 108 | ||||
| -rw-r--r-- | src/core/client_config/subchannel_factory.c | 4 | ||||
| -rw-r--r-- | src/core/client_config/subchannel_factory_decorators/merge_channel_args.c | 4 |
11 files changed, 144 insertions, 144 deletions
diff --git a/src/core/client_config/client_config.c b/src/core/client_config/client_config.c index ceb52e93e5..fc6448201f 100644 --- a/src/core/client_config/client_config.c +++ b/src/core/client_config/client_config.c @@ -63,7 +63,7 @@ grpc_client_config_unref (grpc_exec_ctx * exec_ctx, grpc_client_config * c) { if (gpr_unref (&c->refs)) { - GRPC_LB_POLICY_UNREF (c->lb_policy, "client_config", closure_list); + GRPC_LB_POLICY_UNREF (exec_ctx, c->lb_policy, "client_config"); gpr_free (c); } } diff --git a/src/core/client_config/connector.c b/src/core/client_config/connector.c index 823b82af5c..209c3f1767 100644 --- a/src/core/client_config/connector.c +++ b/src/core/client_config/connector.c @@ -42,17 +42,17 @@ grpc_connector_ref (grpc_connector * connector) void grpc_connector_unref (grpc_exec_ctx * exec_ctx, grpc_connector * connector) { - connector->vtable->unref (connector, closure_list); + connector->vtable->unref (exec_ctx, connector); } void grpc_connector_connect (grpc_exec_ctx * exec_ctx, grpc_connector * connector, const grpc_connect_in_args * in_args, grpc_connect_out_args * out_args, grpc_closure * notify) { - connector->vtable->connect (connector, in_args, out_args, notify, closure_list); + connector->vtable->connect (exec_ctx, connector, in_args, out_args, notify); } void grpc_connector_shutdown (grpc_exec_ctx * exec_ctx, grpc_connector * connector) { - connector->vtable->shutdown (connector, closure_list); + connector->vtable->shutdown (exec_ctx, connector); } diff --git a/src/core/client_config/lb_policies/pick_first.c b/src/core/client_config/lb_policies/pick_first.c index 02aaac1dc3..c07cc81b27 100644 --- a/src/core/client_config/lb_policies/pick_first.c +++ b/src/core/client_config/lb_policies/pick_first.c @@ -84,7 +84,7 @@ del_interested_parties_locked (grpc_exec_ctx * exec_ctx, pick_first_lb_policy * pending_pick *pp; for (pp = p->pending_picks; pp; pp = pp->next) { - grpc_subchannel_del_interested_party (p->subchannels[p->checking_subchannel], pp->pollset, closure_list); + grpc_subchannel_del_interested_party (exec_ctx, p->subchannels[p->checking_subchannel], pp->pollset); } } @@ -94,7 +94,7 @@ add_interested_parties_locked (grpc_exec_ctx * exec_ctx, pick_first_lb_policy * pending_pick *pp; for (pp = p->pending_picks; pp; pp = pp->next) { - grpc_subchannel_add_interested_party (p->subchannels[p->checking_subchannel], pp->pollset, closure_list); + grpc_subchannel_add_interested_party (exec_ctx, p->subchannels[p->checking_subchannel], pp->pollset); } } @@ -106,9 +106,9 @@ pf_destroy (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol) GPR_ASSERT (p->pending_picks == NULL); for (i = 0; i < p->num_subchannels; i++) { - GRPC_SUBCHANNEL_UNREF (p->subchannels[i], "pick_first", closure_list); + GRPC_SUBCHANNEL_UNREF (exec_ctx, p->subchannels[i], "pick_first"); } - grpc_connectivity_state_destroy (&p->state_tracker, closure_list); + grpc_connectivity_state_destroy (exec_ctx, &p->state_tracker); gpr_free (p->subchannels); gpr_mu_destroy (&p->mu); gpr_free (p); @@ -120,11 +120,11 @@ pf_shutdown (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol) pick_first_lb_policy *p = (pick_first_lb_policy *) pol; pending_pick *pp; gpr_mu_lock (&p->mu); - del_interested_parties_locked (p, closure_list); + del_interested_parties_locked (exec_ctx, p); p->shutdown = 1; pp = p->pending_picks; p->pending_picks = NULL; - grpc_connectivity_state_set (&p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "shutdown", closure_list); + grpc_connectivity_state_set (exec_ctx, &p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "shutdown"); gpr_mu_unlock (&p->mu); while (pp != NULL) { @@ -143,7 +143,7 @@ start_picking (grpc_exec_ctx * exec_ctx, pick_first_lb_policy * p) p->checking_subchannel = 0; p->checking_connectivity = GRPC_CHANNEL_IDLE; GRPC_LB_POLICY_REF (&p->base, "pick_first_connectivity"); - grpc_subchannel_notify_on_state_change (p->subchannels[p->checking_subchannel], &p->checking_connectivity, &p->connectivity_changed, closure_list); + grpc_subchannel_notify_on_state_change (exec_ctx, p->subchannels[p->checking_subchannel], &p->checking_connectivity, &p->connectivity_changed); } void @@ -153,7 +153,7 @@ pf_exit_idle (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol) gpr_mu_lock (&p->mu); if (!p->started_picking) { - start_picking (p, closure_list); + start_picking (exec_ctx, p); } gpr_mu_unlock (&p->mu); } @@ -174,9 +174,9 @@ pf_pick (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol, grpc_pollset * pollset, { if (!p->started_picking) { - start_picking (p, closure_list); + start_picking (exec_ctx, p); } - grpc_subchannel_add_interested_party (p->subchannels[p->checking_subchannel], pollset, closure_list); + grpc_subchannel_add_interested_party (exec_ctx, p->subchannels[p->checking_subchannel], pollset); pp = gpr_malloc (sizeof (*pp)); pp->next = p->pending_picks; pp->pollset = pollset; @@ -198,19 +198,19 @@ pf_connectivity_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) if (p->shutdown) { gpr_mu_unlock (&p->mu); - GRPC_LB_POLICY_UNREF (&p->base, "pick_first_connectivity", closure_list); + GRPC_LB_POLICY_UNREF (exec_ctx, &p->base, "pick_first_connectivity"); return; } else if (p->selected != NULL) { - grpc_connectivity_state_set (&p->state_tracker, p->checking_connectivity, "selected_changed", closure_list); + grpc_connectivity_state_set (exec_ctx, &p->state_tracker, p->checking_connectivity, "selected_changed"); if (p->checking_connectivity != GRPC_CHANNEL_FATAL_FAILURE) { - grpc_subchannel_notify_on_state_change (p->selected, &p->checking_connectivity, &p->connectivity_changed, closure_list); + grpc_subchannel_notify_on_state_change (exec_ctx, p->selected, &p->checking_connectivity, &p->connectivity_changed); } else { - GRPC_LB_POLICY_UNREF (&p->base, "pick_first_connectivity", closure_list); + GRPC_LB_POLICY_UNREF (exec_ctx, &p->base, "pick_first_connectivity"); } } else @@ -219,27 +219,27 @@ pf_connectivity_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) switch (p->checking_connectivity) { case GRPC_CHANNEL_READY: - grpc_connectivity_state_set (&p->state_tracker, GRPC_CHANNEL_READY, "connecting_ready", closure_list); + grpc_connectivity_state_set (exec_ctx, &p->state_tracker, GRPC_CHANNEL_READY, "connecting_ready"); p->selected = p->subchannels[p->checking_subchannel]; while ((pp = p->pending_picks)) { p->pending_picks = pp->next; *pp->target = p->selected; - grpc_subchannel_del_interested_party (p->selected, pp->pollset, closure_list); + grpc_subchannel_del_interested_party (exec_ctx, p->selected, pp->pollset); grpc_closure_list_add (closure_list, pp->on_complete, 1); gpr_free (pp); } - grpc_subchannel_notify_on_state_change (p->selected, &p->checking_connectivity, &p->connectivity_changed, closure_list); + grpc_subchannel_notify_on_state_change (exec_ctx, p->selected, &p->checking_connectivity, &p->connectivity_changed); break; case GRPC_CHANNEL_TRANSIENT_FAILURE: - grpc_connectivity_state_set (&p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, "connecting_transient_failure", closure_list); - del_interested_parties_locked (p, closure_list); + grpc_connectivity_state_set (exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, "connecting_transient_failure"); + del_interested_parties_locked (exec_ctx, p); p->checking_subchannel = (p->checking_subchannel + 1) % p->num_subchannels; p->checking_connectivity = grpc_subchannel_check_connectivity (p->subchannels[p->checking_subchannel]); - add_interested_parties_locked (p, closure_list); + add_interested_parties_locked (exec_ctx, p); if (p->checking_connectivity == GRPC_CHANNEL_TRANSIENT_FAILURE) { - grpc_subchannel_notify_on_state_change (p->subchannels[p->checking_subchannel], &p->checking_connectivity, &p->connectivity_changed, closure_list); + grpc_subchannel_notify_on_state_change (exec_ctx, p->subchannels[p->checking_subchannel], &p->checking_connectivity, &p->connectivity_changed); } else { @@ -248,17 +248,17 @@ pf_connectivity_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) break; case GRPC_CHANNEL_CONNECTING: case GRPC_CHANNEL_IDLE: - grpc_connectivity_state_set (&p->state_tracker, GRPC_CHANNEL_CONNECTING, "connecting_changed", closure_list); - grpc_subchannel_notify_on_state_change (p->subchannels[p->checking_subchannel], &p->checking_connectivity, &p->connectivity_changed, closure_list); + grpc_connectivity_state_set (exec_ctx, &p->state_tracker, GRPC_CHANNEL_CONNECTING, "connecting_changed"); + grpc_subchannel_notify_on_state_change (exec_ctx, p->subchannels[p->checking_subchannel], &p->checking_connectivity, &p->connectivity_changed); break; case GRPC_CHANNEL_FATAL_FAILURE: - del_interested_parties_locked (p, closure_list); + del_interested_parties_locked (exec_ctx, p); GPR_SWAP (grpc_subchannel *, p->subchannels[p->checking_subchannel], p->subchannels[p->num_subchannels - 1]); p->num_subchannels--; - GRPC_SUBCHANNEL_UNREF (p->subchannels[p->num_subchannels], "pick_first", closure_list); + GRPC_SUBCHANNEL_UNREF (exec_ctx, p->subchannels[p->num_subchannels], "pick_first"); if (p->num_subchannels == 0) { - grpc_connectivity_state_set (&p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "no_more_channels", closure_list); + grpc_connectivity_state_set (exec_ctx, &p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "no_more_channels"); while ((pp = p->pending_picks)) { p->pending_picks = pp->next; @@ -266,14 +266,14 @@ pf_connectivity_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) grpc_closure_list_add (closure_list, pp->on_complete, 1); gpr_free (pp); } - GRPC_LB_POLICY_UNREF (&p->base, "pick_first_connectivity", closure_list); + GRPC_LB_POLICY_UNREF (exec_ctx, &p->base, "pick_first_connectivity"); } else { - grpc_connectivity_state_set (&p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, "subchannel_failed", closure_list); + grpc_connectivity_state_set (exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, "subchannel_failed"); p->checking_subchannel %= p->num_subchannels; p->checking_connectivity = grpc_subchannel_check_connectivity (p->subchannels[p->checking_subchannel]); - add_interested_parties_locked (p, closure_list); + add_interested_parties_locked (exec_ctx, p); goto loop; } } @@ -302,8 +302,8 @@ pf_broadcast (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol, grpc_transport_op for (i = 0; i < n; i++) { - grpc_subchannel_process_transport_op (subchannels[i], op, closure_list); - GRPC_SUBCHANNEL_UNREF (subchannels[i], "pf_broadcast", closure_list); + grpc_subchannel_process_transport_op (exec_ctx, subchannels[i], op); + GRPC_SUBCHANNEL_UNREF (exec_ctx, subchannels[i], "pf_broadcast"); } gpr_free (subchannels); } @@ -324,7 +324,7 @@ pf_notify_on_state_change (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol, grpc_ { pick_first_lb_policy *p = (pick_first_lb_policy *) pol; gpr_mu_lock (&p->mu); - grpc_connectivity_state_notify_on_state_change (&p->state_tracker, current, notify, closure_list); + grpc_connectivity_state_notify_on_state_change (exec_ctx, &p->state_tracker, current, notify); gpr_mu_unlock (&p->mu); } diff --git a/src/core/client_config/lb_policies/round_robin.c b/src/core/client_config/lb_policies/round_robin.c index 959d9e1c32..b745628bbc 100644 --- a/src/core/client_config/lb_policies/round_robin.c +++ b/src/core/client_config/lb_policies/round_robin.c @@ -233,7 +233,7 @@ del_interested_parties_locked (grpc_exec_ctx * exec_ctx, round_robin_lb_policy * pending_pick *pp; for (pp = p->pending_picks; pp; pp = pp->next) { - grpc_subchannel_del_interested_party (p->subchannels[subchannel_idx], pp->pollset, closure_list); + grpc_subchannel_del_interested_party (exec_ctx, p->subchannels[subchannel_idx], pp->pollset); } } @@ -245,16 +245,16 @@ rr_destroy (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol) ready_list *elem; for (i = 0; i < p->num_subchannels; i++) { - del_interested_parties_locked (p, i, closure_list); + del_interested_parties_locked (exec_ctx, p, i); } for (i = 0; i < p->num_subchannels; i++) { - GRPC_SUBCHANNEL_UNREF (p->subchannels[i], "round_robin", closure_list); + GRPC_SUBCHANNEL_UNREF (exec_ctx, p->subchannels[i], "round_robin"); } gpr_free (p->connectivity_changed_cbs); gpr_free (p->subchannel_connectivity); - grpc_connectivity_state_destroy (&p->state_tracker, closure_list); + grpc_connectivity_state_destroy (exec_ctx, &p->state_tracker); gpr_free (p->subchannels); gpr_mu_destroy (&p->mu); @@ -284,7 +284,7 @@ rr_shutdown (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol) for (i = 0; i < p->num_subchannels; i++) { - del_interested_parties_locked (p, i, closure_list); + del_interested_parties_locked (exec_ctx, p, i); } p->shutdown = 1; @@ -295,7 +295,7 @@ rr_shutdown (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol) grpc_closure_list_add (closure_list, pp->on_complete, 0); gpr_free (pp); } - grpc_connectivity_state_set (&p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "shutdown", closure_list); + grpc_connectivity_state_set (exec_ctx, &p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "shutdown"); gpr_mu_unlock (&p->mu); } @@ -308,7 +308,7 @@ start_picking (grpc_exec_ctx * exec_ctx, round_robin_lb_policy * p) for (i = 0; i < p->num_subchannels; i++) { p->subchannel_connectivity[i] = GRPC_CHANNEL_IDLE; - grpc_subchannel_notify_on_state_change (p->subchannels[i], &p->subchannel_connectivity[i], &p->connectivity_changed_cbs[i], closure_list); + grpc_subchannel_notify_on_state_change (exec_ctx, p->subchannels[i], &p->subchannel_connectivity[i], &p->connectivity_changed_cbs[i]); GRPC_LB_POLICY_REF (&p->base, "round_robin_connectivity"); } } @@ -320,7 +320,7 @@ rr_exit_idle (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol) gpr_mu_lock (&p->mu); if (!p->started_picking) { - start_picking (p, closure_list); + start_picking (exec_ctx, p); } gpr_mu_unlock (&p->mu); } @@ -343,17 +343,17 @@ rr_pick (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol, grpc_pollset * pollset, } /* only advance the last picked pointer if the selection was used */ advance_last_picked_locked (p); - on_complete->cb (on_complete->cb_arg, 1, closure_list); + on_complete->cb (exec_ctx, on_complete->cb_arg, 1); } else { if (!p->started_picking) { - start_picking (p, closure_list); + start_picking (exec_ctx, p); } for (i = 0; i < p->num_subchannels; i++) { - grpc_subchannel_add_interested_party (p->subchannels[i], pollset, closure_list); + grpc_subchannel_add_interested_party (exec_ctx, p->subchannels[i], pollset); } pp = gpr_malloc (sizeof (*pp)); pp->next = p->pending_picks; @@ -393,7 +393,7 @@ rr_connectivity_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) switch (*this_connectivity) { case GRPC_CHANNEL_READY: - grpc_connectivity_state_set (&p->state_tracker, GRPC_CHANNEL_READY, "connecting_ready", closure_list); + grpc_connectivity_state_set (exec_ctx, &p->state_tracker, GRPC_CHANNEL_READY, "connecting_ready"); /* add the newly connected subchannel to the list of connected ones. * Note that it goes to the "end of the line". */ p->subchannel_index_to_readylist_node[this_idx] = add_connected_sc_locked (p, p->subchannels[this_idx]); @@ -415,21 +415,21 @@ rr_connectivity_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) { gpr_log (GPR_DEBUG, "[RR CONN CHANGED] TARGET <-- SUBCHANNEL %p (NODE %p)", selected->subchannel, selected); } - grpc_subchannel_del_interested_party (selected->subchannel, pp->pollset, closure_list); + grpc_subchannel_del_interested_party (exec_ctx, selected->subchannel, pp->pollset); grpc_closure_list_add (closure_list, pp->on_complete, 1); gpr_free (pp); } - grpc_subchannel_notify_on_state_change (p->subchannels[this_idx], this_connectivity, &p->connectivity_changed_cbs[this_idx], closure_list); + grpc_subchannel_notify_on_state_change (exec_ctx, p->subchannels[this_idx], this_connectivity, &p->connectivity_changed_cbs[this_idx]); break; case GRPC_CHANNEL_CONNECTING: case GRPC_CHANNEL_IDLE: - grpc_connectivity_state_set (&p->state_tracker, *this_connectivity, "connecting_changed", closure_list); - grpc_subchannel_notify_on_state_change (p->subchannels[this_idx], this_connectivity, &p->connectivity_changed_cbs[this_idx], closure_list); + grpc_connectivity_state_set (exec_ctx, &p->state_tracker, *this_connectivity, "connecting_changed"); + grpc_subchannel_notify_on_state_change (exec_ctx, p->subchannels[this_idx], this_connectivity, &p->connectivity_changed_cbs[this_idx]); break; case GRPC_CHANNEL_TRANSIENT_FAILURE: - del_interested_parties_locked (p, this_idx, closure_list); + del_interested_parties_locked (exec_ctx, p, this_idx); /* renew state notification */ - grpc_subchannel_notify_on_state_change (p->subchannels[this_idx], this_connectivity, &p->connectivity_changed_cbs[this_idx], closure_list); + grpc_subchannel_notify_on_state_change (exec_ctx, p->subchannels[this_idx], this_connectivity, &p->connectivity_changed_cbs[this_idx]); /* remove from ready list if still present */ if (p->subchannel_index_to_readylist_node[this_idx] != NULL) @@ -437,10 +437,10 @@ rr_connectivity_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) remove_disconnected_sc_locked (p, p->subchannel_index_to_readylist_node[this_idx]); p->subchannel_index_to_readylist_node[this_idx] = NULL; } - grpc_connectivity_state_set (&p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, "connecting_transient_failure", closure_list); + grpc_connectivity_state_set (exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, "connecting_transient_failure"); break; case GRPC_CHANNEL_FATAL_FAILURE: - del_interested_parties_locked (p, this_idx, closure_list); + del_interested_parties_locked (exec_ctx, p, this_idx); if (p->subchannel_index_to_readylist_node[this_idx] != NULL) { remove_disconnected_sc_locked (p, p->subchannel_index_to_readylist_node[this_idx]); @@ -449,11 +449,11 @@ rr_connectivity_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) GPR_SWAP (grpc_subchannel *, p->subchannels[this_idx], p->subchannels[p->num_subchannels - 1]); p->num_subchannels--; - GRPC_SUBCHANNEL_UNREF (p->subchannels[p->num_subchannels], "round_robin", closure_list); + GRPC_SUBCHANNEL_UNREF (exec_ctx, p->subchannels[p->num_subchannels], "round_robin"); if (p->num_subchannels == 0) { - grpc_connectivity_state_set (&p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "no_more_channels", closure_list); + grpc_connectivity_state_set (exec_ctx, &p->state_tracker, GRPC_CHANNEL_FATAL_FAILURE, "no_more_channels"); while ((pp = p->pending_picks)) { p->pending_picks = pp->next; @@ -465,7 +465,7 @@ rr_connectivity_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) } else { - grpc_connectivity_state_set (&p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, "subchannel_failed", closure_list); + grpc_connectivity_state_set (exec_ctx, &p->state_tracker, GRPC_CHANNEL_TRANSIENT_FAILURE, "subchannel_failed"); } } /* switch */ } /* !unref */ @@ -474,7 +474,7 @@ rr_connectivity_changed (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) if (unref) { - GRPC_LB_POLICY_UNREF (&p->base, "round_robin_connectivity", closure_list); + GRPC_LB_POLICY_UNREF (exec_ctx, &p->base, "round_robin_connectivity"); } } @@ -498,8 +498,8 @@ rr_broadcast (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol, grpc_transport_op for (i = 0; i < n; i++) { - grpc_subchannel_process_transport_op (subchannels[i], op, closure_list); - GRPC_SUBCHANNEL_UNREF (subchannels[i], "rr_broadcast", closure_list); + grpc_subchannel_process_transport_op (exec_ctx, subchannels[i], op); + GRPC_SUBCHANNEL_UNREF (exec_ctx, subchannels[i], "rr_broadcast"); } gpr_free (subchannels); } @@ -520,7 +520,7 @@ rr_notify_on_state_change (grpc_exec_ctx * exec_ctx, grpc_lb_policy * pol, grpc_ { round_robin_lb_policy *p = (round_robin_lb_policy *) pol; gpr_mu_lock (&p->mu); - grpc_connectivity_state_notify_on_state_change (&p->state_tracker, current, notify, closure_list); + grpc_connectivity_state_notify_on_state_change (exec_ctx, &p->state_tracker, current, notify); gpr_mu_unlock (&p->mu); } diff --git a/src/core/client_config/lb_policy.c b/src/core/client_config/lb_policy.c index 06ac41ff56..6a9cf66887 100644 --- a/src/core/client_config/lb_policy.c +++ b/src/core/client_config/lb_policy.c @@ -65,42 +65,42 @@ grpc_lb_policy_unref (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy) #endif if (gpr_unref (&policy->refs)) { - policy->vtable->destroy (policy, closure_list); + policy->vtable->destroy (exec_ctx, policy); } } void grpc_lb_policy_shutdown (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy) { - policy->vtable->shutdown (policy, closure_list); + policy->vtable->shutdown (exec_ctx, policy); } void grpc_lb_policy_pick (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy, grpc_pollset * pollset, grpc_metadata_batch * initial_metadata, grpc_subchannel ** target, grpc_closure * on_complete) { - policy->vtable->pick (policy, pollset, initial_metadata, target, on_complete, closure_list); + policy->vtable->pick (exec_ctx, policy, pollset, initial_metadata, target, on_complete); } void grpc_lb_policy_broadcast (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy, grpc_transport_op * op) { - policy->vtable->broadcast (policy, op, closure_list); + policy->vtable->broadcast (exec_ctx, policy, op); } void grpc_lb_policy_exit_idle (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy) { - policy->vtable->exit_idle (policy, closure_list); + policy->vtable->exit_idle (exec_ctx, policy); } void grpc_lb_policy_notify_on_state_change (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy, grpc_connectivity_state * state, grpc_closure * closure) { - policy->vtable->notify_on_state_change (policy, state, closure, closure_list); + policy->vtable->notify_on_state_change (exec_ctx, policy, state, closure); } grpc_connectivity_state grpc_lb_policy_check_connectivity (grpc_exec_ctx * exec_ctx, grpc_lb_policy * policy) { - return policy->vtable->check_connectivity (policy, closure_list); + return policy->vtable->check_connectivity (exec_ctx, policy); } diff --git a/src/core/client_config/resolver.c b/src/core/client_config/resolver.c index cb5a6a5333..a55daad5a2 100644 --- a/src/core/client_config/resolver.c +++ b/src/core/client_config/resolver.c @@ -65,24 +65,24 @@ grpc_resolver_unref (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver) #endif if (gpr_unref (&resolver->refs)) { - resolver->vtable->destroy (resolver, closure_list); + resolver->vtable->destroy (exec_ctx, resolver); } } void grpc_resolver_shutdown (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver) { - resolver->vtable->shutdown (resolver, closure_list); + resolver->vtable->shutdown (exec_ctx, resolver); } void grpc_resolver_channel_saw_error (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver, struct sockaddr *failing_address, int failing_address_len) { - resolver->vtable->channel_saw_error (resolver, failing_address, failing_address_len, closure_list); + resolver->vtable->channel_saw_error (exec_ctx, resolver, failing_address, failing_address_len); } void grpc_resolver_next (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver, grpc_client_config ** target_config, grpc_closure * on_complete) { - resolver->vtable->next (resolver, target_config, on_complete, closure_list); + resolver->vtable->next (exec_ctx, resolver, target_config, on_complete); } diff --git a/src/core/client_config/resolvers/dns_resolver.c b/src/core/client_config/resolvers/dns_resolver.c index 66430c43cb..781f1a9e23 100644 --- a/src/core/client_config/resolvers/dns_resolver.c +++ b/src/core/client_config/resolvers/dns_resolver.c @@ -128,7 +128,7 @@ dns_next (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver, grpc_client_config } else { - dns_maybe_finish_next_locked (r, closure_list); + dns_maybe_finish_next_locked (exec_ctx, r); } gpr_mu_unlock (&r->mu); } @@ -152,14 +152,14 @@ dns_on_resolved (grpc_exec_ctx * exec_ctx, void *arg, grpc_resolved_addresses * memset (&args, 0, sizeof (args)); args.addr = (struct sockaddr *) (addresses->addrs[i].addr); args.addr_len = (size_t) addresses->addrs[i].len; - subchannels[i] = grpc_subchannel_factory_create_subchannel (r->subchannel_factory, &args, closure_list); + subchannels[i] = grpc_subchannel_factory_create_subchannel (exec_ctx, r->subchannel_factory, &args); } memset (&lb_policy_args, 0, sizeof (lb_policy_args)); lb_policy_args.subchannels = subchannels; lb_policy_args.num_subchannels = addresses->naddrs; lb_policy = grpc_lb_policy_create (r->lb_policy_name, &lb_policy_args); grpc_client_config_set_lb_policy (config, lb_policy); - GRPC_LB_POLICY_UNREF (lb_policy, "construction", closure_list); + GRPC_LB_POLICY_UNREF (exec_ctx, lb_policy, "construction"); grpc_resolved_addresses_destroy (addresses); gpr_free (subchannels); } @@ -168,14 +168,14 @@ dns_on_resolved (grpc_exec_ctx * exec_ctx, void *arg, grpc_resolved_addresses * r->resolving = 0; if (r->resolved_config) { - grpc_client_config_unref (r->resolved_config, closure_list); + grpc_client_config_unref (exec_ctx, r->resolved_config); } r->resolved_config = config; r->resolved_version++; - dns_maybe_finish_next_locked (r, closure_list); + dns_maybe_finish_next_locked (exec_ctx, r); gpr_mu_unlock (&r->mu); - GRPC_RESOLVER_UNREF (&r->base, "dns-resolving", closure_list); + GRPC_RESOLVER_UNREF (exec_ctx, &r->base, "dns-resolving"); } static void @@ -210,9 +210,9 @@ dns_destroy (grpc_exec_ctx * exec_ctx, grpc_resolver * gr) gpr_mu_destroy (&r->mu); if (r->resolved_config) { - grpc_client_config_unref (r->resolved_config, closure_list); + grpc_client_config_unref (exec_ctx, r->resolved_config); } - grpc_subchannel_factory_unref (r->subchannel_factory, closure_list); + grpc_subchannel_factory_unref (exec_ctx, r->subchannel_factory); gpr_free (r->name); gpr_free (r->default_port); gpr_free (r->lb_policy_name); diff --git a/src/core/client_config/resolvers/sockaddr_resolver.c b/src/core/client_config/resolvers/sockaddr_resolver.c index 2887cffcd4..1b2eac997d 100644 --- a/src/core/client_config/resolvers/sockaddr_resolver.c +++ b/src/core/client_config/resolvers/sockaddr_resolver.c @@ -117,7 +117,7 @@ sockaddr_next (grpc_exec_ctx * exec_ctx, grpc_resolver * resolver, grpc_client_c GPR_ASSERT (!r->next_completion); r->next_completion = on_complete; r->target_config = target_config; - sockaddr_maybe_finish_next_locked (r, closure_list); + sockaddr_maybe_finish_next_locked (exec_ctx, r); gpr_mu_unlock (&r->mu); } @@ -140,7 +140,7 @@ sockaddr_maybe_finish_next_locked (grpc_exec_ctx * exec_ctx, sockaddr_resolver * memset (&args, 0, sizeof (args)); args.addr = (struct sockaddr *) &r->addrs[i]; args.addr_len = r->addrs_len[i]; - subchannels[i] = grpc_subchannel_factory_create_subchannel (r->subchannel_factory, &args, closure_list); + subchannels[i] = grpc_subchannel_factory_create_subchannel (exec_ctx, r->subchannel_factory, &args); } memset (&lb_policy_args, 0, sizeof (lb_policy_args)); lb_policy_args.subchannels = subchannels; @@ -148,7 +148,7 @@ sockaddr_maybe_finish_next_locked (grpc_exec_ctx * exec_ctx, sockaddr_resolver * lb_policy = grpc_lb_policy_create (r->lb_policy_name, &lb_policy_args); gpr_free (subchannels); grpc_client_config_set_lb_policy (cfg, lb_policy); - GRPC_LB_POLICY_UNREF (lb_policy, "sockaddr", closure_list); + GRPC_LB_POLICY_UNREF (exec_ctx, lb_policy, "sockaddr"); r->published = 1; *r->target_config = cfg; grpc_closure_list_add (closure_list, r->next_completion, 1); @@ -161,7 +161,7 @@ sockaddr_destroy (grpc_exec_ctx * exec_ctx, grpc_resolver * gr) { sockaddr_resolver *r = (sockaddr_resolver *) gr; gpr_mu_destroy (&r->mu); - grpc_subchannel_factory_unref (r->subchannel_factory, closure_list); + grpc_subchannel_factory_unref (exec_ctx, r->subchannel_factory); gpr_free (r->addrs); gpr_free (r->addrs_len); gpr_free (r->lb_policy_name); diff --git a/src/core/client_config/subchannel.c b/src/core/client_config/subchannel.c index 1ab348da83..3db2fae593 100644 --- a/src/core/client_config/subchannel.c +++ b/src/core/client_config/subchannel.c @@ -199,7 +199,7 @@ subchannel_unref_locked (grpc_subchannel * c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) static void connection_destroy (grpc_exec_ctx * exec_ctx, connection * c) { GPR_ASSERT (c->refs == 0); - grpc_channel_stack_destroy (CHANNEL_STACK_FROM_CONNECTION (c), closure_list); + grpc_channel_stack_destroy (CHANNEL_STACK_FROM_CONNECTION (exec_ctx, c)); gpr_free (c); } @@ -222,7 +222,7 @@ connection_unref_locked (connection * c, grpc_closure_list * closure_list GRPC_S } if (--c->refs == 0 && c->subchannel->active != c) { - connection_destroy (c, closure_list); + connection_destroy (exec_ctx, c); } return destroy; } @@ -261,7 +261,7 @@ grpc_subchannel_unref (grpc_subchannel * c, grpc_closure_list * closure_list GRP destroy = subchannel_unref_locked (c REF_PASS_ARGS); gpr_mu_unlock (&c->mu); if (destroy) - subchannel_destroy (c, closure_list); + subchannel_destroy (exec_ctx, c); } static void @@ -269,27 +269,27 @@ subchannel_destroy (grpc_exec_ctx * exec_ctx, grpc_subchannel * c) { if (c->active != NULL) { - connection_destroy (c->active, closure_list); + connection_destroy (exec_ctx, c->active); } gpr_free (c->filters); grpc_channel_args_destroy (c->args); gpr_free (c->addr); grpc_mdctx_unref (c->mdctx); - grpc_connectivity_state_destroy (&c->state_tracker, closure_list); - grpc_connector_unref (c->connector, closure_list); + grpc_connectivity_state_destroy (exec_ctx, &c->state_tracker); + grpc_connector_unref (exec_ctx, c->connector); gpr_free (c); } void grpc_subchannel_add_interested_party (grpc_exec_ctx * exec_ctx, grpc_subchannel * c, grpc_pollset * pollset) { - grpc_pollset_set_add_pollset (c->pollset_set, pollset, closure_list); + grpc_pollset_set_add_pollset (exec_ctx, c->pollset_set, pollset); } void grpc_subchannel_del_interested_party (grpc_exec_ctx * exec_ctx, grpc_subchannel * c, grpc_pollset * pollset) { - grpc_pollset_set_del_pollset (c->pollset_set, pollset, closure_list); + grpc_pollset_set_del_pollset (exec_ctx, c->pollset_set, pollset); } static gpr_uint32 @@ -336,7 +336,7 @@ continue_connect (grpc_exec_ctx * exec_ctx, grpc_subchannel * c) args.deadline = compute_connect_deadline (c); args.channel_args = c->args; - grpc_connector_connect (c->connector, &args, &c->connecting_result, &c->connected, closure_list); + grpc_connector_connect (exec_ctx, c->connector, &args, &c->connecting_result, &c->connected); } static void @@ -344,16 +344,16 @@ start_connect (grpc_exec_ctx * exec_ctx, grpc_subchannel * c) { c->backoff_delta = gpr_time_from_seconds (GRPC_SUBCHANNEL_INITIAL_CONNECT_BACKOFF_SECONDS, GPR_TIMESPAN); c->next_attempt = gpr_time_add (gpr_now (GPR_CLOCK_MONOTONIC), c->backoff_delta); - continue_connect (c, closure_list); + continue_connect (exec_ctx, c); } static void continue_creating_call (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) { waiting_for_connect *w4c = arg; - grpc_subchannel_del_interested_party (w4c->subchannel, w4c->pollset, closure_list); - grpc_subchannel_create_call (w4c->subchannel, w4c->pollset, w4c->target, w4c->notify, closure_list); - GRPC_SUBCHANNEL_UNREF (w4c->subchannel, "waiting_for_connect", closure_list); + grpc_subchannel_del_interested_party (exec_ctx, w4c->subchannel, w4c->pollset); + grpc_subchannel_create_call (exec_ctx, w4c->subchannel, w4c->pollset, w4c->target, w4c->notify); + GRPC_SUBCHANNEL_UNREF (exec_ctx, w4c->subchannel, "waiting_for_connect"); gpr_free (w4c); } @@ -368,8 +368,8 @@ grpc_subchannel_create_call (grpc_exec_ctx * exec_ctx, grpc_subchannel * c, grpc CONNECTION_REF_LOCKED (con, "call"); gpr_mu_unlock (&c->mu); - *target = create_call (con, closure_list); - notify->cb (notify->cb_arg, 1, closure_list); + *target = create_call (exec_ctx, con); + notify->cb (exec_ctx, notify->cb_arg, 1); } else { @@ -383,17 +383,17 @@ grpc_subchannel_create_call (grpc_exec_ctx * exec_ctx, grpc_subchannel * c, grpc SUBCHANNEL_REF_LOCKED (c, "waiting_for_connect"); grpc_closure_init (&w4c->continuation, continue_creating_call, w4c); c->waiting = w4c; - grpc_subchannel_add_interested_party (c, pollset, closure_list); + grpc_subchannel_add_interested_party (exec_ctx, c, pollset); if (!c->connecting) { c->connecting = 1; - connectivity_state_changed_locked (c, "create_call", closure_list); + connectivity_state_changed_locked (exec_ctx, c, "create_call"); /* released by connection */ SUBCHANNEL_REF_LOCKED (c, "connecting"); GRPC_CHANNEL_INTERNAL_REF (c->master, "connecting"); gpr_mu_unlock (&c->mu); - start_connect (c, closure_list); + start_connect (exec_ctx, c); } else { @@ -417,20 +417,20 @@ grpc_subchannel_notify_on_state_change (grpc_exec_ctx * exec_ctx, grpc_subchanne { int do_connect = 0; gpr_mu_lock (&c->mu); - if (grpc_connectivity_state_notify_on_state_change (&c->state_tracker, state, notify, closure_list)) + if (grpc_connectivity_state_notify_on_state_change (exec_ctx, &c->state_tracker, state, notify)) { do_connect = 1; c->connecting = 1; /* released by connection */ SUBCHANNEL_REF_LOCKED (c, "connecting"); GRPC_CHANNEL_INTERNAL_REF (c->master, "connecting"); - connectivity_state_changed_locked (c, "state_change", closure_list); + connectivity_state_changed_locked (exec_ctx, c, "state_change"); } gpr_mu_unlock (&c->mu); if (do_connect) { - start_connect (c, closure_list); + start_connect (exec_ctx, c); } } @@ -449,7 +449,7 @@ grpc_subchannel_process_transport_op (grpc_exec_ctx * exec_ctx, grpc_subchannel if (op->disconnect) { c->disconnected = 1; - connectivity_state_changed_locked (c, "disconnect", closure_list); + connectivity_state_changed_locked (exec_ctx, c, "disconnect"); if (c->have_alarm) { cancel_alarm = 1; @@ -461,25 +461,25 @@ grpc_subchannel_process_transport_op (grpc_exec_ctx * exec_ctx, grpc_subchannel { grpc_channel_stack *channel_stack = CHANNEL_STACK_FROM_CONNECTION (con); grpc_channel_element *top_elem = grpc_channel_stack_element (channel_stack, 0); - top_elem->filter->start_transport_op (top_elem, op, closure_list); + top_elem->filter->start_transport_op (exec_ctx, top_elem, op); gpr_mu_lock (&c->mu); - destroy = CONNECTION_UNREF_LOCKED (con, "transport-op", closure_list); + destroy = CONNECTION_UNREF_LOCKED (exec_ctx, con, "transport-op"); gpr_mu_unlock (&c->mu); if (destroy) { - subchannel_destroy (destroy, closure_list); + subchannel_destroy (exec_ctx, destroy); } } if (cancel_alarm) { - grpc_alarm_cancel (&c->alarm, closure_list); + grpc_alarm_cancel (exec_ctx, &c->alarm); } if (op->disconnect) { - grpc_connector_shutdown (c->connector, closure_list); + grpc_connector_shutdown (exec_ctx, c->connector); } } @@ -513,7 +513,7 @@ on_state_changed (grpc_exec_ctx * exec_ctx, void *p, int iomgr_success) op.connectivity_state = &sw->connectivity_state; op.on_connectivity_state_change = &sw->closure; elem = grpc_channel_stack_element (CHANNEL_STACK_FROM_CONNECTION (c->active), 0); - elem->filter->start_transport_op (elem, &op, closure_list); + elem->filter->start_transport_op (exec_ctx, elem, &op); /* early out */ gpr_mu_unlock (mu); return; @@ -525,22 +525,22 @@ on_state_changed (grpc_exec_ctx * exec_ctx, void *p, int iomgr_success) destroy_connection = sw->subchannel->active; } sw->subchannel->active = NULL; - grpc_connectivity_state_set (&c->state_tracker, c->disconnected ? GRPC_CHANNEL_FATAL_FAILURE : GRPC_CHANNEL_TRANSIENT_FAILURE, "connection_failed", closure_list); + grpc_connectivity_state_set (exec_ctx, &c->state_tracker, c->disconnected ? GRPC_CHANNEL_FATAL_FAILURE : GRPC_CHANNEL_TRANSIENT_FAILURE, "connection_failed"); break; } done: - connectivity_state_changed_locked (c, "transport_state_changed", closure_list); + connectivity_state_changed_locked (exec_ctx, c, "transport_state_changed"); destroy = SUBCHANNEL_UNREF_LOCKED (c, "state_watcher"); gpr_free (sw); gpr_mu_unlock (mu); if (destroy) { - subchannel_destroy (c, closure_list); + subchannel_destroy (exec_ctx, c); } if (destroy_connection != NULL) { - connection_destroy (destroy_connection, closure_list); + connection_destroy (exec_ctx, destroy_connection); } } @@ -571,7 +571,7 @@ publish_transport (grpc_exec_ctx * exec_ctx, grpc_subchannel * c) stk = (grpc_channel_stack *) (con + 1); con->refs = 0; con->subchannel = c; - grpc_channel_stack_init (filters, num_filters, c->master, c->args, c->mdctx, stk, closure_list); + grpc_channel_stack_init (exec_ctx, filters, num_filters, c->master, c->args, c->mdctx, stk); grpc_connected_channel_bind_transport (stk, c->connecting_result.transport); gpr_free (c->connecting_result.filters); memset (&c->connecting_result, 0, sizeof (c->connecting_result)); @@ -589,9 +589,9 @@ publish_transport (grpc_exec_ctx * exec_ctx, grpc_subchannel * c) gpr_mu_unlock (&c->mu); gpr_free (sw); gpr_free (filters); - grpc_channel_stack_destroy (stk, closure_list); - GRPC_CHANNEL_INTERNAL_UNREF (c->master, "connecting", closure_list); - GRPC_SUBCHANNEL_UNREF (c, "connecting", closure_list); + grpc_channel_stack_destroy (exec_ctx, stk); + GRPC_CHANNEL_INTERNAL_UNREF (exec_ctx, c->master, "connecting"); + GRPC_SUBCHANNEL_UNREF (exec_ctx, c, "connecting"); return; } @@ -612,13 +612,13 @@ publish_transport (grpc_exec_ctx * exec_ctx, grpc_subchannel * c) op.on_connectivity_state_change = &sw->closure; op.bind_pollset_set = c->pollset_set; SUBCHANNEL_REF_LOCKED (c, "state_watcher"); - GRPC_CHANNEL_INTERNAL_UNREF (c->master, "connecting", closure_list); + GRPC_CHANNEL_INTERNAL_UNREF (exec_ctx, c->master, "connecting"); GPR_ASSERT (!SUBCHANNEL_UNREF_LOCKED (c, "connecting")); elem = grpc_channel_stack_element (CHANNEL_STACK_FROM_CONNECTION (c->active), 0); - elem->filter->start_transport_op (elem, &op, closure_list); + elem->filter->start_transport_op (exec_ctx, elem, &op); /* signal completion */ - connectivity_state_changed_locked (c, "connected", closure_list); + connectivity_state_changed_locked (exec_ctx, c, "connected"); w4c = c->waiting; c->waiting = NULL; @@ -635,7 +635,7 @@ publish_transport (grpc_exec_ctx * exec_ctx, grpc_subchannel * c) if (destroy_connection != NULL) { - connection_destroy (destroy_connection, closure_list); + connection_destroy (exec_ctx, destroy_connection); } } @@ -677,17 +677,17 @@ on_alarm (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) { iomgr_success = 0; } - connectivity_state_changed_locked (c, "alarm", closure_list); + connectivity_state_changed_locked (exec_ctx, c, "alarm"); gpr_mu_unlock (&c->mu); if (iomgr_success) { update_reconnect_parameters (c); - continue_connect (c, closure_list); + continue_connect (exec_ctx, c); } else { - GRPC_CHANNEL_INTERNAL_UNREF (c->master, "connecting", closure_list); - GRPC_SUBCHANNEL_UNREF (c, "connecting", closure_list); + GRPC_CHANNEL_INTERNAL_UNREF (exec_ctx, c->master, "connecting"); + GRPC_SUBCHANNEL_UNREF (exec_ctx, c, "connecting"); } } @@ -697,7 +697,7 @@ subchannel_connected (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) grpc_subchannel *c = arg; if (c->connecting_result.transport != NULL) { - publish_transport (c, closure_list); + publish_transport (exec_ctx, c); } else { @@ -705,8 +705,8 @@ subchannel_connected (grpc_exec_ctx * exec_ctx, void *arg, int iomgr_success) gpr_mu_lock (&c->mu); GPR_ASSERT (!c->have_alarm); c->have_alarm = 1; - connectivity_state_changed_locked (c, "connect_failed", closure_list); - grpc_alarm_init (&c->alarm, c->next_attempt, on_alarm, c, now, closure_list); + connectivity_state_changed_locked (exec_ctx, c, "connect_failed"); + grpc_alarm_init (exec_ctx, &c->alarm, c->next_attempt, on_alarm, c, now); gpr_mu_unlock (&c->mu); } } @@ -747,7 +747,7 @@ static void connectivity_state_changed_locked (grpc_exec_ctx * exec_ctx, grpc_subchannel * c, const char *reason) { grpc_connectivity_state current = compute_connectivity_locked (c); - grpc_connectivity_state_set (&c->state_tracker, current, reason, closure_list); + grpc_connectivity_state_set (exec_ctx, &c->state_tracker, current, reason); } /* @@ -767,14 +767,14 @@ grpc_subchannel_call_unref (grpc_subchannel_call * c, grpc_closure_list * closur { gpr_mu *mu = &c->connection->subchannel->mu; grpc_subchannel *destroy; - grpc_call_stack_destroy (SUBCHANNEL_CALL_TO_CALL_STACK (c), closure_list); + grpc_call_stack_destroy (SUBCHANNEL_CALL_TO_CALL_STACK (exec_ctx, c)); gpr_mu_lock (mu); - destroy = CONNECTION_UNREF_LOCKED (c->connection, "call", closure_list); + destroy = CONNECTION_UNREF_LOCKED (exec_ctx, c->connection, "call"); gpr_mu_unlock (mu); gpr_free (c); if (destroy != NULL) { - subchannel_destroy (destroy, closure_list); + subchannel_destroy (exec_ctx, destroy); } } } @@ -784,7 +784,7 @@ grpc_subchannel_call_get_peer (grpc_exec_ctx * exec_ctx, grpc_subchannel_call * { grpc_call_stack *call_stack = SUBCHANNEL_CALL_TO_CALL_STACK (call); grpc_call_element *top_elem = grpc_call_stack_element (call_stack, 0); - return top_elem->filter->get_peer (top_elem, closure_list); + return top_elem->filter->get_peer (exec_ctx, top_elem); } void @@ -792,7 +792,7 @@ grpc_subchannel_call_process_op (grpc_exec_ctx * exec_ctx, grpc_subchannel_call { grpc_call_stack *call_stack = SUBCHANNEL_CALL_TO_CALL_STACK (call); grpc_call_element *top_elem = grpc_call_stack_element (call_stack, 0); - top_elem->filter->start_transport_stream_op (top_elem, op, closure_list); + top_elem->filter->start_transport_stream_op (exec_ctx, top_elem, op); } static grpc_subchannel_call * @@ -803,6 +803,6 @@ create_call (grpc_exec_ctx * exec_ctx, connection * con) grpc_call_stack *callstk = SUBCHANNEL_CALL_TO_CALL_STACK (call); call->connection = con; gpr_ref_init (&call->refs, 1); - grpc_call_stack_init (chanstk, NULL, NULL, callstk, closure_list); + grpc_call_stack_init (exec_ctx, chanstk, NULL, NULL, callstk); return call; } diff --git a/src/core/client_config/subchannel_factory.c b/src/core/client_config/subchannel_factory.c index 82b851c2f7..f60cd02421 100644 --- a/src/core/client_config/subchannel_factory.c +++ b/src/core/client_config/subchannel_factory.c @@ -42,11 +42,11 @@ grpc_subchannel_factory_ref (grpc_subchannel_factory * factory) void grpc_subchannel_factory_unref (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * factory) { - factory->vtable->unref (factory, closure_list); + factory->vtable->unref (exec_ctx, factory); } grpc_subchannel * grpc_subchannel_factory_create_subchannel (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * factory, grpc_subchannel_args * args) { - return factory->vtable->create_subchannel (factory, args, closure_list); + return factory->vtable->create_subchannel (exec_ctx, factory, args); } diff --git a/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c b/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c index 59af175da1..442862a4b8 100644 --- a/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c +++ b/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c @@ -56,7 +56,7 @@ merge_args_factory_unref (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * sc merge_args_factory *f = (merge_args_factory *) scf; if (gpr_unref (&f->refs)) { - grpc_subchannel_factory_unref (f->wrapped, closure_list); + grpc_subchannel_factory_unref (exec_ctx, f->wrapped); grpc_channel_args_destroy (f->merge_args); gpr_free (f); } @@ -69,7 +69,7 @@ merge_args_factory_create_subchannel (grpc_exec_ctx * exec_ctx, grpc_subchannel_ grpc_channel_args *final_args = grpc_channel_args_merge (args->args, f->merge_args); grpc_subchannel *s; args->args = final_args; - s = grpc_subchannel_factory_create_subchannel (f->wrapped, args, closure_list); + s = grpc_subchannel_factory_create_subchannel (exec_ctx, f->wrapped, args); grpc_channel_args_destroy (final_args); return s; } |