diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-01-12 10:45:23 -0800 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-01-12 10:45:23 -0800 |
| commit | 8c8ff03cc3e1e900d9c22bb2c4ed54eee11aa275 (patch) | |
| tree | b5645bc65455f7f063e766659d8118a6d1ec5613 /src/core/client_config | |
| parent | 82a0aabb7a6a4f0852bb02cef3a5f079d386fbac (diff) | |
| parent | bff0d4f2f6bd82b90b11afab456a832d36b9c434 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into grpclb_api
Diffstat (limited to 'src/core/client_config')
| -rw-r--r-- | src/core/client_config/lb_policies/pick_first.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/client_config/lb_policies/pick_first.c b/src/core/client_config/lb_policies/pick_first.c index 4a90b07002..8f95028295 100644 --- a/src/core/client_config/lb_policies/pick_first.c +++ b/src/core/client_config/lb_policies/pick_first.c @@ -75,7 +75,8 @@ typedef struct { grpc_connectivity_state_tracker state_tracker; } pick_first_lb_policy; -#define GET_SELECTED(p) ((grpc_connected_subchannel *)gpr_atm_no_barrier_load(&(p)->selected)) +#define GET_SELECTED(p) \ + ((grpc_connected_subchannel *)gpr_atm_no_barrier_load(&(p)->selected)) void pf_destroy(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) { pick_first_lb_policy *p = (pick_first_lb_policy *)pol; @@ -264,7 +265,8 @@ static void pf_connectivity_changed(grpc_exec_ctx *exec_ctx, void *arg, grpc_connectivity_state_set(exec_ctx, &p->state_tracker, GRPC_CHANNEL_READY, "connecting_ready"); selected_subchannel = p->subchannels[p->checking_subchannel]; - selected = grpc_subchannel_get_connected_subchannel(selected_subchannel); + selected = + grpc_subchannel_get_connected_subchannel(selected_subchannel); GPR_ASSERT(selected != NULL); gpr_atm_no_barrier_store(&p->selected, (gpr_atm)selected); GRPC_CONNECTED_SUBCHANNEL_REF(selected, "picked_first"); |