diff options
| author |  Sree Kuchibhotla <sreek@google.com> | 2016-06-16 10:05:13 -0700 |
|---|---|---|
| committer | Sree Kuchibhotla <sreek@google.com> | 2016-06-16 10:05:13 -0700 |
| commit | 812c66ba1bd811efb10457cb0e8b4d1f22329167 (patch) | |
| tree | 58a4ba688707ebcef03fecbaae1b896782a9000d /src/core/lib/iomgr | |
| parent | cf4205dff54d8e3920f98dac28049770b5f8f044 (diff) | |
| parent | fa9b7c1bc6488be17d18007f45c57dac39ea5b79 (diff) | |
Merge branch 'master' into epoll_changes
Diffstat (limited to 'src/core/lib/iomgr')
| -rw-r--r-- | src/core/lib/iomgr/iomgr.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/core/lib/iomgr/iomgr.c b/src/core/lib/iomgr/iomgr.c index 60cef8ba77..89292a153e 100644 --- a/src/core/lib/iomgr/iomgr.c +++ b/src/core/lib/iomgr/iomgr.c @@ -96,7 +96,8 @@ void grpc_iomgr_shutdown(void) { gpr_time_sub(gpr_now(GPR_CLOCK_REALTIME), last_warning_time), gpr_time_from_seconds(1, GPR_TIMESPAN)) >= 0) { if (g_root_object.next != &g_root_object) { - gpr_log(GPR_DEBUG, "Waiting for %d iomgr objects to be destroyed", + gpr_log(GPR_DEBUG, + "Waiting for %" PRIuPTR " iomgr objects to be destroyed", count_objects()); } last_warning_time = gpr_now(GPR_CLOCK_REALTIME); @@ -114,9 +115,9 @@ void grpc_iomgr_shutdown(void) { if (gpr_cv_wait(&g_rcv, &g_mu, short_deadline)) { if (gpr_time_cmp(gpr_now(GPR_CLOCK_REALTIME), shutdown_deadline) > 0) { if (g_root_object.next != &g_root_object) { - gpr_log(GPR_DEBUG, - "Failed to free %d iomgr objects before shutdown deadline: " - "memory leaks are likely", + gpr_log(GPR_DEBUG, "Failed to free %" PRIuPTR + " iomgr objects before shutdown deadline: " + "memory leaks are likely", count_objects()); dump_objects("LEAKED"); if (grpc_iomgr_abort_on_leaks()) { |