diff options
| author |  Sree Kuchibhotla <sreek@google.com> | 2018-04-11 14:30:26 -0700 |
|---|---|---|
| committer | Sree Kuchibhotla <sreek@google.com> | 2018-04-11 14:30:26 -0700 |
| commit | 6997718c6fb3b276762967f87a32e06c6495c2e3 (patch) | |
| tree | 43cc3a3cd976042ba8b90369632f31635988faa0 /src/core/lib/iomgr/timer_generic.cc | |
| parent | a1b1095fc3f7807dc24f5aaeeae1147246406f6c (diff) | |
Change shared_mutables.min_timer to gpr_atm64 (Forgot to do this previously)
Diffstat (limited to 'src/core/lib/iomgr/timer_generic.cc')
| -rw-r--r-- | src/core/lib/iomgr/timer_generic.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/core/lib/iomgr/timer_generic.cc b/src/core/lib/iomgr/timer_generic.cc index 8b98e015a4..211b1a1dd7 100644 --- a/src/core/lib/iomgr/timer_generic.cc +++ b/src/core/lib/iomgr/timer_generic.cc @@ -218,7 +218,7 @@ GPR_TLS_DECL(g_last_seen_min_timer); struct shared_mutables { /* The deadline of the next timer due across all timer shards */ - grpc_millis min_timer; + gpr_atm64 min_timer; /* Allow only one run_some_expired_timers at once */ gpr_spinlock checker_mu; bool initialized; @@ -418,7 +418,7 @@ static void timer_init(grpc_timer* timer, grpc_millis deadline, shard->min_deadline = deadline; note_deadline_change(shard); if (shard->shard_queue_index == 0 && deadline < old_min_deadline) { - gpr_atm_no_barrier_store(&g_shared_mutables.min_timer, deadline); + gpr_atm64_no_barrier_store(&g_shared_mutables.min_timer, deadline); grpc_kick_poller(); } } @@ -559,7 +559,8 @@ static grpc_timer_check_result run_some_expired_timers(grpc_millis now, grpc_error* error) { grpc_timer_check_result result = GRPC_TIMERS_NOT_CHECKED; - grpc_millis min_timer = gpr_atm_no_barrier_load(&g_shared_mutables.min_timer); + grpc_millis min_timer = + gpr_atm64_no_barrier_load(&g_shared_mutables.min_timer); #if GPR_ARCH_64 gpr_tls_set(&g_last_seen_min_timer, min_timer); #endif @@ -612,8 +613,8 @@ static grpc_timer_check_result run_some_expired_timers(grpc_millis now, *next = GPR_MIN(*next, g_shard_queue[0]->min_deadline); } - gpr_atm_no_barrier_store(&g_shared_mutables.min_timer, - g_shard_queue[0]->min_deadline); + gpr_atm64_no_barrier_store(&g_shared_mutables.min_timer, + g_shard_queue[0]->min_deadline); gpr_mu_unlock(&g_shared_mutables.mu); gpr_spinlock_unlock(&g_shared_mutables.checker_mu); } @@ -632,7 +633,8 @@ static grpc_timer_check_result timer_check(grpc_millis* next) { mutable cacheline in the common case */ grpc_millis min_timer = gpr_tls_get(&g_last_seen_min_timer); #else - grpc_millis min_timer = gpr_atm_no_barrier_load(&g_shared_mutables.min_timer); + grpc_millis min_timer = + gpr_atm64_no_barrier_load(&g_shared_mutables.min_timer); #endif if (now < min_timer) { |