diff options
author | 2018-08-29 09:46:13 -0700 | |
---|---|---|
committer | 2018-08-29 09:46:13 -0700 | |
commit | 5b3e6c2139d9d9a6c819f63811308723ebaf01be (patch) | |
tree | 2a4d411f28e12d3ee296b9749d307b3f023dcbc4 /src | |
parent | ceecf80283e6ca184df587f76ed053f1f5295b7f (diff) | |
parent | 60b6f2df20d490107c17eca1c8a2cccecfd97119 (diff) |
Merge pull request #15813 from sreecha/minor-timer-fix
Minor bug in timer during shutdown code
Diffstat (limited to 'src')
-rw-r--r-- | src/core/lib/iomgr/timer_generic.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/lib/iomgr/timer_generic.cc b/src/core/lib/iomgr/timer_generic.cc index 4294162af7..008d37119a 100644 --- a/src/core/lib/iomgr/timer_generic.cc +++ b/src/core/lib/iomgr/timer_generic.cc @@ -291,7 +291,7 @@ static void timer_list_init() { static void timer_list_shutdown() { size_t i; run_some_expired_timers( - GPR_ATM_MAX, nullptr, + GRPC_MILLIS_INF_FUTURE, nullptr, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Timer list shutdown")); for (i = 0; i < g_num_shards; i++) { timer_shard* shard = &g_shards[i]; @@ -714,9 +714,10 @@ static grpc_timer_check_result timer_check(grpc_millis* next) { #if GPR_ARCH_64 gpr_log(GPR_INFO, "TIMER CHECK BEGIN: now=%" PRId64 " next=%s tls_min=%" PRId64 - " glob_min=%" PRIdPTR, + " glob_min=%" PRId64, now, next_str, min_timer, - gpr_atm_no_barrier_load((gpr_atm*)(&g_shared_mutables.min_timer))); + static_cast<grpc_millis>(gpr_atm_no_barrier_load( + (gpr_atm*)(&g_shared_mutables.min_timer)))); #else gpr_log(GPR_INFO, "TIMER CHECK BEGIN: now=%" PRId64 " next=%s min=%" PRId64, now, next_str, min_timer); |