clang-format

reviewable/pr4232/r6
Craig Tiller 9 years ago
parent f036a64303
commit a6bebf4b0e
  1. 10
      src/core/channel/client_uchannel.c
  2. 8
      src/core/client_config/lb_policies/pick_first.c
  3. 6
      src/core/client_config/subchannel.c
  4. 3
      src/core/client_config/subchannel.h
  5. 3
      test/core/end2end/tests/channel_connectivity.c

@ -85,8 +85,8 @@ static void monitor_subchannel(grpc_exec_ctx *exec_ctx, void *arg,
chand->subchannel_connectivity,
"uchannel_monitor_subchannel");
grpc_connected_subchannel_notify_on_state_change(
exec_ctx, chand->connected_subchannel, NULL, &chand->subchannel_connectivity,
&chand->connectivity_cb);
exec_ctx, chand->connected_subchannel, NULL,
&chand->subchannel_connectivity, &chand->connectivity_cb);
}
static char *cuc_get_peer(grpc_exec_ctx *exec_ctx, grpc_call_element *elem) {
@ -168,10 +168,12 @@ static void cuc_destroy_channel_elem(grpc_exec_ctx *exec_ctx,
channel_data *chand = elem->channel_data;
/* cancel subscription */
grpc_connected_subchannel_notify_on_state_change(
exec_ctx, chand->connected_subchannel, NULL, NULL, &chand->connectivity_cb);
exec_ctx, chand->connected_subchannel, NULL, NULL,
&chand->connectivity_cb);
grpc_connectivity_state_destroy(exec_ctx, &chand->state_tracker);
gpr_mu_destroy(&chand->mu_state);
GRPC_CONNECTED_SUBCHANNEL_UNREF(exec_ctx, chand->connected_subchannel, "uchannel");
GRPC_CONNECTED_SUBCHANNEL_UNREF(exec_ctx, chand->connected_subchannel,
"uchannel");
}
static void cuc_set_pollset(grpc_exec_ctx *exec_ctx, grpc_call_element *elem,

@ -235,8 +235,8 @@ static void pf_connectivity_changed(grpc_exec_ctx *exec_ctx, void *arg,
p->checking_connectivity, "selected_changed");
if (p->checking_connectivity != GRPC_CHANNEL_FATAL_FAILURE) {
grpc_connected_subchannel_notify_on_state_change(
exec_ctx, p->selected, &p->base.interested_parties, &p->checking_connectivity,
&p->connectivity_changed);
exec_ctx, p->selected, &p->base.interested_parties,
&p->checking_connectivity, &p->connectivity_changed);
} else {
GRPC_LB_POLICY_WEAK_UNREF(exec_ctx, &p->base, "pick_first_connectivity");
}
@ -265,8 +265,8 @@ static void pf_connectivity_changed(grpc_exec_ctx *exec_ctx, void *arg,
gpr_free(pp);
}
grpc_connected_subchannel_notify_on_state_change(
exec_ctx, p->selected, &p->base.interested_parties, &p->checking_connectivity,
&p->connectivity_changed);
exec_ctx, p->selected, &p->base.interested_parties,
&p->checking_connectivity, &p->connectivity_changed);
break;
case GRPC_CHANNEL_TRANSIENT_FAILURE:
grpc_connectivity_state_set(exec_ctx, &p->state_tracker,

@ -455,8 +455,10 @@ static void connected_subchannel_state_op(grpc_exec_ctx *exec_ctx,
void grpc_connected_subchannel_notify_on_state_change(
grpc_exec_ctx *exec_ctx, grpc_connected_subchannel *con,
grpc_pollset_set *interested_parties, grpc_connectivity_state *state, grpc_closure *closure) {
connected_subchannel_state_op(exec_ctx, con, interested_parties, state, closure);
grpc_pollset_set *interested_parties, grpc_connectivity_state *state,
grpc_closure *closure) {
connected_subchannel_state_op(exec_ctx, con, interested_parties, state,
closure);
}
static void publish_transport(grpc_exec_ctx *exec_ctx, grpc_subchannel *c) {

@ -122,7 +122,8 @@ void grpc_subchannel_notify_on_state_change(
grpc_closure *notify);
void grpc_connected_subchannel_notify_on_state_change(
grpc_exec_ctx *exec_ctx, grpc_connected_subchannel *channel,
grpc_pollset_set *interested_parties, grpc_connectivity_state *state, grpc_closure *notify);
grpc_pollset_set *interested_parties, grpc_connectivity_state *state,
grpc_closure *notify);
/** retrieve the grpc_connected_subchannel - or NULL if called before
the subchannel becomes connected */

@ -153,8 +153,7 @@ static void test_connectivity(grpc_end2end_test_config config) {
cq_verify(cqv);
state = grpc_channel_check_connectivity_state(f.client, 0);
GPR_ASSERT(state == GRPC_CHANNEL_TRANSIENT_FAILURE ||
state == GRPC_CHANNEL_CONNECTING ||
state == GRPC_CHANNEL_IDLE);
state == GRPC_CHANNEL_CONNECTING || state == GRPC_CHANNEL_IDLE);
/* cleanup server */
grpc_server_destroy(f.server);

Loading…
Cancel
Save