diff options
| author |  Sree Kuchibhotla <sreecha@users.noreply.github.com> | 2018-05-22 12:33:19 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-05-22 12:33:19 -0700 |
| commit | 4a7a39fab6f32e51f6e3ff249860f833cad73bbf (patch) | |
| tree | c01ecbd677dd5441b11af3f7c6d43b7e13c0452d /src/core/lib/iomgr/ev_epollex_linux.cc | |
| parent | 463e4d56193bbaec3977ce38fb8f0103d006794e (diff) | |
| parent | a2171d49bfacc2a9f364a17ee50c6d89767cdb6c (diff) | |
Merge pull request #14894 from sreecha/fix-time
Fix grpc_millis type (timers are broken on 32-bit systems otherwise)
Diffstat (limited to 'src/core/lib/iomgr/ev_epollex_linux.cc')
| -rw-r--r-- | src/core/lib/iomgr/ev_epollex_linux.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc index 4c6cff7fe2..12f23ea1d6 100644 --- a/src/core/lib/iomgr/ev_epollex_linux.cc +++ b/src/core/lib/iomgr/ev_epollex_linux.cc @@ -1066,7 +1066,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, #endif if (grpc_polling_trace.enabled()) { gpr_log(GPR_INFO, - "PS:%p work hdl=%p worker=%p now=%" PRIdPTR " deadline=%" PRIdPTR + "PS:%p work hdl=%p worker=%p now=%" PRId64 " deadline=%" PRId64 " kwp=%d pollable=%p", pollset, worker_hdl, WORKER_PTR, grpc_core::ExecCtx::Get()->Now(), deadline, pollset->kicked_without_poller, pollset->active_pollable); |