diff options
| author |  Sree Kuchibhotla <sreek@google.com> | 2018-03-30 20:11:56 -0700 |
|---|---|---|
| committer | Sree Kuchibhotla <sreek@google.com> | 2018-04-02 14:51:47 -0700 |
| commit | c069af240b7197cf1b968df29b4206597d719c22 (patch) | |
| tree | 137cf2b38b8b55475eaf910acd78f69d6b9877d2 /src/core/lib/iomgr/timer_generic.cc | |
| parent | 22054d4a22efd14ac4b103bb3c71576c07f2db19 (diff) | |
Fix grpc_millis type (timers are broken on 32-bit systems otherwise)
Diffstat (limited to 'src/core/lib/iomgr/timer_generic.cc')
| -rw-r--r-- | src/core/lib/iomgr/timer_generic.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/lib/iomgr/timer_generic.cc b/src/core/lib/iomgr/timer_generic.cc index 93e654b7fa..7a2767aa0c 100644 --- a/src/core/lib/iomgr/timer_generic.cc +++ b/src/core/lib/iomgr/timer_generic.cc @@ -30,6 +30,7 @@ #include <grpc/support/string_util.h> #include <grpc/support/sync.h> +#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/gpr/spinlock.h" #include "src/core/lib/gpr/tls.h" @@ -337,7 +338,7 @@ static void timer_init(grpc_timer* timer, grpc_millis deadline, if (grpc_timer_trace.enabled()) { gpr_log(GPR_DEBUG, - "TIMER %p: SET %" PRIdPTR " now %" PRIdPTR " call %p[%p]", timer, + "TIMER %p: SET %" PRIdPTR " now %" PRId64 " call %p[%p]", timer, deadline, grpc_core::ExecCtx::Get()->Now(), closure, closure->cb); } @@ -650,7 +651,7 @@ static grpc_timer_check_result timer_check(grpc_millis* next) { if (next == nullptr) { next_str = gpr_strdup("NULL"); } else { - gpr_asprintf(&next_str, "%" PRIdPTR, *next); + gpr_asprintf(&next_str, "%" PRId64, *next); } gpr_log(GPR_DEBUG, "TIMER CHECK END: r=%d; next=%s", r, next_str); gpr_free(next_str); |