diff options
author | David Garcia Quintas <dgq@google.com> | 2018-01-30 20:38:04 -0800 |
---|---|---|
committer | David Garcia Quintas <dgq@google.com> | 2018-01-30 20:38:04 -0800 |
commit | af7afbd4a12de16dda4f34db2a4d5ae8d3059091 (patch) | |
tree | 15c58d0da3b074e87251445b6e02d5c0f64d6b87 /src/core/ext/filters/client_channel | |
parent | 75508a3f66d1e4b6a4ea1442a61170f20e42b8b8 (diff) |
fixed format string
Diffstat (limited to 'src/core/ext/filters/client_channel')
-rw-r--r-- | src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc | 10 | ||||
-rw-r--r-- | src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc | 10 |
2 files changed, 8 insertions, 12 deletions
diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc index 3d1395f773..d2bf9950ee 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc @@ -85,7 +85,7 @@ typedef struct { grpc_channel_args** target_result; /** current (fully resolved) result */ grpc_channel_args* resolved_result; - /** retry timer */ + /** next resolution timer */ bool have_next_resolution_timer; grpc_timer next_resolution_timer; /** retry backoff state */ @@ -348,11 +348,9 @@ static void dns_ares_maybe_start_resolving_locked(ares_dns_resolver* r) { if (ms_until_next_resolution > 0) { const grpc_millis last_resolution_ago = grpc_core::ExecCtx::Get()->Now() - r->last_resolution_timestamp; - gpr_log( - GPR_DEBUG, - "In cooldown from last resolution (from %ld ms ago). Will resolve " - "again in %ld ms", - last_resolution_ago, ms_until_next_resolution); + gpr_log(GPR_DEBUG, "In cooldown from last resolution (from %" PRIdPTR + " ms ago). Will resolve again in %" PRIdPTR " ms", + last_resolution_ago, ms_until_next_resolution); if (!r->have_next_resolution_timer) { r->have_next_resolution_timer = true; GRPC_RESOLVER_REF(&r->base, "next_resolution_timer_cooldown"); diff --git a/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc b/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc index 1168c2f548..b726cc4c6d 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc @@ -67,7 +67,7 @@ typedef struct { grpc_channel_args** target_result; /** current (fully resolved) result */ grpc_channel_args* resolved_result; - /** retry timer */ + /** next resolution timer */ bool have_next_resolution_timer; grpc_timer next_resolution_timer; grpc_closure on_retry; @@ -204,11 +204,9 @@ static void maybe_start_resolving_locked(dns_resolver* r) { if (ms_until_next_resolution > 0) { const grpc_millis last_resolution_ago = grpc_core::ExecCtx::Get()->Now() - r->last_resolution_timestamp; - gpr_log( - GPR_DEBUG, - "In cooldown from last resolution (from %ld ms ago). Will resolve " - "again in %ld ms", - last_resolution_ago, ms_until_next_resolution); + gpr_log(GPR_DEBUG, "In cooldown from last resolution (from %" PRIdPTR + " ms ago). Will resolve again in %" PRIdPTR " ms", + last_resolution_ago, ms_until_next_resolution); if (!r->have_next_resolution_timer) { r->have_next_resolution_timer = true; GRPC_RESOLVER_REF(&r->base, "next_resolution_timer_cooldown"); |