diff options
| author |  Sree Kuchibhotla <sreek@google.com> | 2018-06-19 23:16:42 -0700 |
|---|---|---|
| committer | Sree Kuchibhotla <sreek@google.com> | 2018-06-19 23:16:42 -0700 |
| commit | e670c3754c56f3d2cd1612df95953508e299a5a1 (patch) | |
| tree | 5c4c29e4231362622c03d4a2fa370ae1c9c4faab /src/core/lib/iomgr/timer_generic.cc | |
| parent | d07a5ff3ea32cc491e16e50e0e3bf227bb04eeaf (diff) | |
Minor bug in timer code during shutdown
Diffstat (limited to 'src/core/lib/iomgr/timer_generic.cc')
| -rw-r--r-- | src/core/lib/iomgr/timer_generic.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/lib/iomgr/timer_generic.cc b/src/core/lib/iomgr/timer_generic.cc index 4294162af7..70417d69b6 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,7 +714,7 @@ 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))); #else |