diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-01-26 06:50:51 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-01-26 06:50:51 -0800 |
| commit | d9d474a670460786d5424a8abdb44b2c345c8d44 (patch) | |
| tree | 799410d7d8b43bba855ee2ba678ca298a0bc6042 /src/core/client_config/lb_policies | |
| parent | 98d27d89a9c29af2411f8df61ee2ea9f1fd6aaa4 (diff) | |
Fix some barriers
Diffstat (limited to 'src/core/client_config/lb_policies')
| -rw-r--r-- | src/core/client_config/lb_policies/pick_first.c | 4 |
1 files changed, 2 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 e6ddb1a11f..5b10600ab5 100644 --- a/src/core/client_config/lb_policies/pick_first.c +++ b/src/core/client_config/lb_policies/pick_first.c @@ -76,7 +76,7 @@ typedef struct { } pick_first_lb_policy; #define GET_SELECTED(p) \ - ((grpc_connected_subchannel *)gpr_atm_no_barrier_load(&(p)->selected)) + ((grpc_connected_subchannel *)gpr_atm_acq_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; @@ -268,10 +268,10 @@ static void pf_connectivity_changed(grpc_exec_ctx *exec_ctx, void *arg, 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"); /* drop the pick list: we are connected now */ GRPC_LB_POLICY_WEAK_REF(&p->base, "destroy_subchannels"); + gpr_atm_rel_store(&p->selected, (gpr_atm)selected); grpc_exec_ctx_enqueue(exec_ctx, grpc_closure_create(destroy_subchannels, p), 1); /* update any calls that were waiting for a pick */ |