Change uses of PRIdPTR to PRIuPTR.

pull/12878/head
Mark D. Roth 7 years ago
parent 3e7d95fb8e
commit e9b1083791
  1. 4
      src/core/ext/filters/client_channel/client_channel.cc
  2. 6
      src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc
  3. 2
      src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc
  4. 14
      src/core/ext/filters/client_channel/lb_policy/subchannel_list.cc

@ -898,7 +898,7 @@ static void waiting_for_pick_batches_fail(grpc_exec_ctx *exec_ctx,
call_data *calld = (call_data *)elem->call_data; call_data *calld = (call_data *)elem->call_data;
if (GRPC_TRACER_ON(grpc_client_channel_trace)) { if (GRPC_TRACER_ON(grpc_client_channel_trace)) {
gpr_log(GPR_DEBUG, gpr_log(GPR_DEBUG,
"chand=%p calld=%p: failing %" PRIdPTR " pending batches: %s", "chand=%p calld=%p: failing %" PRIuPTR " pending batches: %s",
elem->channel_data, calld, calld->waiting_for_pick_batches_count, elem->channel_data, calld, calld->waiting_for_pick_batches_count,
grpc_error_string(error)); grpc_error_string(error));
} }
@ -940,7 +940,7 @@ static void waiting_for_pick_batches_resume(grpc_exec_ctx *exec_ctx,
channel_data *chand = (channel_data *)elem->channel_data; channel_data *chand = (channel_data *)elem->channel_data;
call_data *calld = (call_data *)elem->call_data; call_data *calld = (call_data *)elem->call_data;
if (GRPC_TRACER_ON(grpc_client_channel_trace)) { if (GRPC_TRACER_ON(grpc_client_channel_trace)) {
gpr_log(GPR_DEBUG, "chand=%p calld=%p: sending %" PRIdPTR gpr_log(GPR_DEBUG, "chand=%p calld=%p: sending %" PRIuPTR
" pending batches to subchannel_call=%p", " pending batches to subchannel_call=%p",
chand, calld, calld->waiting_for_pick_batches_count, chand, calld, calld->waiting_for_pick_batches_count,
calld->subchannel_call); calld->subchannel_call);

@ -300,7 +300,7 @@ static void pf_update_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy,
if (GRPC_TRACER_ON(grpc_lb_pick_first_trace)) { if (GRPC_TRACER_ON(grpc_lb_pick_first_trace)) {
gpr_log(GPR_INFO, gpr_log(GPR_INFO,
"Pick First %p found already selected subchannel %p " "Pick First %p found already selected subchannel %p "
"at update index %" PRIdPTR " of %" PRIdPTR "; update done", "at update index %" PRIuPTR " of %" PRIuPTR "; update done",
p, p->selected->subchannel, i, p, p->selected->subchannel, i,
subchannel_list->num_subchannels); subchannel_list->num_subchannels);
} }
@ -360,8 +360,8 @@ static void pf_connectivity_changed_locked(grpc_exec_ctx *exec_ctx, void *arg,
pick_first_lb_policy *p = (pick_first_lb_policy *)sd->subchannel_list->policy; pick_first_lb_policy *p = (pick_first_lb_policy *)sd->subchannel_list->policy;
if (GRPC_TRACER_ON(grpc_lb_pick_first_trace)) { if (GRPC_TRACER_ON(grpc_lb_pick_first_trace)) {
gpr_log(GPR_DEBUG, gpr_log(GPR_DEBUG,
"Pick First %p connectivity changed for subchannel %p (%" PRIdPTR "Pick First %p connectivity changed for subchannel %p (%" PRIuPTR
" of %" PRIdPTR " of %" PRIuPTR
"), subchannel_list %p: state=%s p->shutdown=%d " "), subchannel_list %p: state=%s p->shutdown=%d "
"sd->subchannel_list->shutting_down=%d error=%s", "sd->subchannel_list->shutting_down=%d error=%s",
(void *)p, (void *)sd->subchannel, (void *)p, (void *)sd->subchannel,

@ -585,7 +585,7 @@ static void rr_update_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *policy,
} }
grpc_lb_addresses *addresses = (grpc_lb_addresses *)arg->value.pointer.p; grpc_lb_addresses *addresses = (grpc_lb_addresses *)arg->value.pointer.p;
if (GRPC_TRACER_ON(grpc_lb_round_robin_trace)) { if (GRPC_TRACER_ON(grpc_lb_round_robin_trace)) {
gpr_log(GPR_DEBUG, "[RR %p] received update with %" PRIdPTR " addresses", p, gpr_log(GPR_DEBUG, "[RR %p] received update with %" PRIuPTR " addresses", p,
addresses->num_addresses); addresses->num_addresses);
} }
grpc_lb_subchannel_list *subchannel_list = grpc_lb_subchannel_list_create( grpc_lb_subchannel_list *subchannel_list = grpc_lb_subchannel_list_create(

@ -34,8 +34,8 @@ void grpc_lb_subchannel_data_unref_subchannel(grpc_exec_ctx *exec_ctx,
if (sd->subchannel != NULL) { if (sd->subchannel != NULL) {
if (GRPC_TRACER_ON(*sd->subchannel_list->tracer)) { if (GRPC_TRACER_ON(*sd->subchannel_list->tracer)) {
gpr_log( gpr_log(
GPR_DEBUG, "[%s %p] subchannel list %p index %" PRIdPTR GPR_DEBUG, "[%s %p] subchannel list %p index %" PRIuPTR
" of %" PRIdPTR " (subchannel %p): unreffing subchannel", " of %" PRIuPTR " (subchannel %p): unreffing subchannel",
sd->subchannel_list->tracer->name, sd->subchannel_list->policy, sd->subchannel_list->tracer->name, sd->subchannel_list->policy,
sd->subchannel_list, (size_t)(sd - sd->subchannel_list->subchannels), sd->subchannel_list, (size_t)(sd - sd->subchannel_list->subchannels),
sd->subchannel_list->num_subchannels, sd->subchannel); sd->subchannel_list->num_subchannels, sd->subchannel);
@ -59,7 +59,7 @@ void grpc_lb_subchannel_data_start_connectivity_watch(
grpc_exec_ctx *exec_ctx, grpc_lb_subchannel_data *sd) { grpc_exec_ctx *exec_ctx, grpc_lb_subchannel_data *sd) {
if (GRPC_TRACER_ON(*sd->subchannel_list->tracer)) { if (GRPC_TRACER_ON(*sd->subchannel_list->tracer)) {
gpr_log(GPR_DEBUG, gpr_log(GPR_DEBUG,
"[%s %p] subchannel list %p index %" PRIdPTR " of %" PRIdPTR "[%s %p] subchannel list %p index %" PRIuPTR " of %" PRIuPTR
" (subchannel %p): requesting connectivity change notification", " (subchannel %p): requesting connectivity change notification",
sd->subchannel_list->tracer->name, sd->subchannel_list->policy, sd->subchannel_list->tracer->name, sd->subchannel_list->policy,
sd->subchannel_list, sd->subchannel_list,
@ -77,7 +77,7 @@ void grpc_lb_subchannel_data_stop_connectivity_watch(
grpc_exec_ctx *exec_ctx, grpc_lb_subchannel_data *sd) { grpc_exec_ctx *exec_ctx, grpc_lb_subchannel_data *sd) {
if (GRPC_TRACER_ON(*sd->subchannel_list->tracer)) { if (GRPC_TRACER_ON(*sd->subchannel_list->tracer)) {
gpr_log( gpr_log(
GPR_DEBUG, "[%s %p] subchannel list %p index %" PRIdPTR " of %" PRIdPTR GPR_DEBUG, "[%s %p] subchannel list %p index %" PRIuPTR " of %" PRIuPTR
" (subchannel %p): stopping connectivity watch", " (subchannel %p): stopping connectivity watch",
sd->subchannel_list->tracer->name, sd->subchannel_list->policy, sd->subchannel_list->tracer->name, sd->subchannel_list->policy,
sd->subchannel_list, (size_t)(sd - sd->subchannel_list->subchannels), sd->subchannel_list, (size_t)(sd - sd->subchannel_list->subchannels),
@ -95,7 +95,7 @@ grpc_lb_subchannel_list *grpc_lb_subchannel_list_create(
(grpc_lb_subchannel_list *)gpr_zalloc(sizeof(*subchannel_list)); (grpc_lb_subchannel_list *)gpr_zalloc(sizeof(*subchannel_list));
if (GRPC_TRACER_ON(*tracer)) { if (GRPC_TRACER_ON(*tracer)) {
gpr_log(GPR_DEBUG, gpr_log(GPR_DEBUG,
"[%s %p] Creating subchannel list %p for %" PRIdPTR " subchannels", "[%s %p] Creating subchannel list %p for %" PRIuPTR " subchannels",
tracer->name, p, subchannel_list, addresses->num_addresses); tracer->name, p, subchannel_list, addresses->num_addresses);
} }
subchannel_list->policy = p; subchannel_list->policy = p;
@ -159,7 +159,7 @@ grpc_lb_subchannel_list *grpc_lb_subchannel_list_create(
if (GRPC_TRACER_ON(*tracer)) { if (GRPC_TRACER_ON(*tracer)) {
char *address_uri = char *address_uri =
grpc_sockaddr_to_uri(&addresses->addresses[i].address); grpc_sockaddr_to_uri(&addresses->addresses[i].address);
gpr_log(GPR_DEBUG, "[%s %p] subchannel list %p index %" PRIdPTR gpr_log(GPR_DEBUG, "[%s %p] subchannel list %p index %" PRIuPTR
": Created subchannel %p for address uri %s; " ": Created subchannel %p for address uri %s; "
"initial connectivity state: %s", "initial connectivity state: %s",
tracer->name, p, subchannel_list, subchannel_index, subchannel, tracer->name, p, subchannel_list, subchannel_index, subchannel,
@ -255,7 +255,7 @@ static void subchannel_data_cancel_connectivity_watch(
grpc_exec_ctx *exec_ctx, grpc_lb_subchannel_data *sd, const char *reason) { grpc_exec_ctx *exec_ctx, grpc_lb_subchannel_data *sd, const char *reason) {
if (GRPC_TRACER_ON(*sd->subchannel_list->tracer)) { if (GRPC_TRACER_ON(*sd->subchannel_list->tracer)) {
gpr_log( gpr_log(
GPR_DEBUG, "[%s %p] subchannel list %p index %" PRIdPTR " of %" PRIdPTR GPR_DEBUG, "[%s %p] subchannel list %p index %" PRIuPTR " of %" PRIuPTR
" (subchannel %p): canceling connectivity watch (%s)", " (subchannel %p): canceling connectivity watch (%s)",
sd->subchannel_list->tracer->name, sd->subchannel_list->policy, sd->subchannel_list->tracer->name, sd->subchannel_list->policy,
sd->subchannel_list, (size_t)(sd - sd->subchannel_list->subchannels), sd->subchannel_list, (size_t)(sd - sd->subchannel_list->subchannels),

Loading…
Cancel
Save