aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar ncteisen <ncteisen@gmail.com>2018-10-18 11:42:32 -0700
committerGravatar ncteisen <ncteisen@gmail.com>2018-10-18 12:34:21 -0700
commit0582a003d5385ce16ec13d5e5d1128913f9b59c6 (patch)
tree0a35d570be14c8306fb8cb5169146590f133ef27 /src
parenta60226726ae6076916db0e1d616338a1a211770d (diff)
reviewer comments
Diffstat (limited to 'src')
-rw-r--r--src/core/ext/filters/client_channel/client_channel.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc
index 64e206ec63..daf1b89b09 100644
--- a/src/core/ext/filters/client_channel/client_channel.cc
+++ b/src/core/ext/filters/client_channel/client_channel.cc
@@ -511,7 +511,7 @@ get_service_config_from_resolver_result_locked(channel_data* chand) {
return grpc_core::UniquePtr<char>(gpr_strdup(service_config_json));
}
-static void check_for_important_resolution_change(
+static void maybe_add_trace_message_for_address_changes_locked(
channel_data* chand, TraceStringVector* trace_strings) {
int resolution_contains_addresses = false;
const grpc_arg* channel_arg =
@@ -534,7 +534,7 @@ static void check_for_important_resolution_change(
resolution_contains_addresses;
}
-static void concatenate_and_add_channel_trace(
+static void concatenate_and_add_channel_trace_locked(
channel_data* chand, TraceStringVector* trace_strings) {
if (!trace_strings->empty()) {
gpr_strvec v;
@@ -641,8 +641,8 @@ static void on_resolver_result_changed_locked(void* arg, grpc_error* error) {
// config in the trace, at the risk of bloating the trace logs.
trace_strings.push_back(gpr_strdup("Service config changed"));
}
- check_for_important_resolution_change(chand, &trace_strings);
- concatenate_and_add_channel_trace(chand, &trace_strings);
+ maybe_add_trace_message_for_address_changes_locked(chand, &trace_strings);
+ concatenate_and_add_channel_trace_locked(chand, &trace_strings);
}
// Swap out the data used by cc_get_channel_info().
gpr_mu_lock(&chand->info_mu);