Merge master

2 files changed, 41 insertions, 40 deletions

diff --git a/test/cpp/naming/resolver_component_test.cc b/test/cpp/naming/resolver_component_test.cc
index a0ac4c501a..94adbcbd35 100644
--- a/test/cpp/naming/resolver_component_test.cc
+++ b/test/cpp/naming/resolver_component_test.cc
@@ -47,8 +47,8 @@
 #include "test/core/util/port.h"
 #include "test/core/util/test_config.h"
 
-using std::vector;
 using grpc::SubProcess;
+using std::vector;
 using testing::UnorderedElementsAreArray;
 
 // Hack copied from "test/cpp/end2end/server_crash_test_client.cc"!
@@ -83,12 +83,12 @@ class GrpcLBAddress final {
   GrpcLBAddress(std::string address, bool is_balancer)
       : is_balancer(is_balancer), address(address) {}
 
-  bool operator==(const GrpcLBAddress &other) const {
+  bool operator==(const GrpcLBAddress& other) const {
     return this->is_balancer == other.is_balancer &&
            this->address == other.address;
   }
 
-  bool operator!=(const GrpcLBAddress &other) const {
+  bool operator!=(const GrpcLBAddress& other) const {
     return !(*this == other);
   }
 
@@ -139,19 +139,19 @@ gpr_timespec TestDeadline(void) {
 struct ArgsStruct {
   gpr_event ev;
   gpr_atm done_atm;
-  gpr_mu *mu;
-  grpc_pollset *pollset;
-  grpc_pollset_set *pollset_set;
-  grpc_combiner *lock;
-  grpc_channel_args *channel_args;
+  gpr_mu* mu;
+  grpc_pollset* pollset;
+  grpc_pollset_set* pollset_set;
+  grpc_combiner* lock;
+  grpc_channel_args* channel_args;
   vector<GrpcLBAddress> expected_addrs;
   std::string expected_service_config_string;
   std::string expected_lb_policy;
 };
 
-void ArgsInit(grpc_exec_ctx *exec_ctx, ArgsStruct *args) {
+void ArgsInit(grpc_exec_ctx* exec_ctx, ArgsStruct* args) {
   gpr_event_init(&args->ev);
-  args->pollset = (grpc_pollset *)gpr_zalloc(grpc_pollset_size());
+  args->pollset = (grpc_pollset*)gpr_zalloc(grpc_pollset_size());
   grpc_pollset_init(args->pollset, &args->mu);
   args->pollset_set = grpc_pollset_set_create();
   grpc_pollset_set_add_pollset(exec_ctx, args->pollset_set, args->pollset);
@@ -160,9 +160,9 @@ void ArgsInit(grpc_exec_ctx *exec_ctx, ArgsStruct *args) {
   args->channel_args = NULL;
 }
 
-void DoNothing(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) {}
+void DoNothing(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) {}
 
-void ArgsFinish(grpc_exec_ctx *exec_ctx, ArgsStruct *args) {
+void ArgsFinish(grpc_exec_ctx* exec_ctx, ArgsStruct* args) {
   GPR_ASSERT(gpr_event_wait(&args->ev, TestDeadline()));
   grpc_pollset_set_del_pollset(exec_ctx, args->pollset_set, args->pollset);
   grpc_pollset_set_destroy(exec_ctx, args->pollset_set);
@@ -182,7 +182,7 @@ gpr_timespec NSecondDeadline(int seconds) {
                       gpr_time_from_seconds(seconds, GPR_TIMESPAN));
 }
 
-void PollPollsetUntilRequestDone(ArgsStruct *args) {
+void PollPollsetUntilRequestDone(ArgsStruct* args) {
   gpr_timespec deadline = NSecondDeadline(10);
   while (true) {
     bool done = gpr_atm_acq_load(&args->done_atm) != 0;
@@ -194,7 +194,7 @@ void PollPollsetUntilRequestDone(ArgsStruct *args) {
     gpr_log(GPR_DEBUG, "done=%d, time_left=%" PRId64 ".%09d", done,
             time_left.tv_sec, time_left.tv_nsec);
     GPR_ASSERT(gpr_time_cmp(time_left, gpr_time_0(GPR_TIMESPAN)) >= 0);
-    grpc_pollset_worker *worker = NULL;
+    grpc_pollset_worker* worker = NULL;
     grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
     gpr_mu_lock(args->mu);
     GRPC_LOG_IF_ERROR("pollset_work",
@@ -204,12 +204,12 @@ void PollPollsetUntilRequestDone(ArgsStruct *args) {
     gpr_mu_unlock(args->mu);
     grpc_exec_ctx_finish(&exec_ctx);
   }
-  gpr_event_set(&args->ev, (void *)1);
+  gpr_event_set(&args->ev, (void*)1);
 }
 
-void CheckServiceConfigResultLocked(grpc_channel_args *channel_args,
-                                    ArgsStruct *args) {
-  const grpc_arg *service_config_arg =
+void CheckServiceConfigResultLocked(grpc_channel_args* channel_args,
+                                    ArgsStruct* args) {
+  const grpc_arg* service_config_arg =
       grpc_channel_args_find(channel_args, GRPC_ARG_SERVICE_CONFIG);
   if (args->expected_service_config_string != "") {
     GPR_ASSERT(service_config_arg != NULL);
@@ -221,9 +221,9 @@ void CheckServiceConfigResultLocked(grpc_channel_args *channel_args,
   }
 }
 
-void CheckLBPolicyResultLocked(grpc_channel_args *channel_args,
-                               ArgsStruct *args) {
-  const grpc_arg *lb_policy_arg =
+void CheckLBPolicyResultLocked(grpc_channel_args* channel_args,
+                               ArgsStruct* args) {
+  const grpc_arg* lb_policy_arg =
       grpc_channel_args_find(channel_args, GRPC_ARG_LB_POLICY_NAME);
   if (args->expected_lb_policy != "") {
     GPR_ASSERT(lb_policy_arg != NULL);
@@ -234,23 +234,23 @@ void CheckLBPolicyResultLocked(grpc_channel_args *channel_args,
   }
 }
 
-void CheckResolverResultLocked(grpc_exec_ctx *exec_ctx, void *argsp,
-                               grpc_error *err) {
-  ArgsStruct *args = (ArgsStruct *)argsp;
-  grpc_channel_args *channel_args = args->channel_args;
-  const grpc_arg *channel_arg =
+void CheckResolverResultLocked(grpc_exec_ctx* exec_ctx, void* argsp,
+                               grpc_error* err) {
+  ArgsStruct* args = (ArgsStruct*)argsp;
+  grpc_channel_args* channel_args = args->channel_args;
+  const grpc_arg* channel_arg =
       grpc_channel_args_find(channel_args, GRPC_ARG_LB_ADDRESSES);
   GPR_ASSERT(channel_arg != NULL);
   GPR_ASSERT(channel_arg->type == GRPC_ARG_POINTER);
-  grpc_lb_addresses *addresses =
-      (grpc_lb_addresses *)channel_arg->value.pointer.p;
+  grpc_lb_addresses* addresses =
+      (grpc_lb_addresses*)channel_arg->value.pointer.p;
   gpr_log(GPR_INFO, "num addrs found: %" PRIdPTR ". expected %" PRIdPTR,
           addresses->num_addresses, args->expected_addrs.size());
   GPR_ASSERT(addresses->num_addresses == args->expected_addrs.size());
   std::vector<GrpcLBAddress> found_lb_addrs;
   for (size_t i = 0; i < addresses->num_addresses; i++) {
     grpc_lb_address addr = addresses->addresses[i];
-    char *str;
+    char* str;
     grpc_sockaddr_to_string(&str, &addr.address, 1 /* normalize */);
     gpr_log(GPR_INFO, "%s", str);
     found_lb_addrs.emplace_back(
@@ -258,8 +258,9 @@ void CheckResolverResultLocked(grpc_exec_ctx *exec_ctx, void *argsp,
     gpr_free(str);
   }
   if (args->expected_addrs.size() != found_lb_addrs.size()) {
-    gpr_log(GPR_DEBUG, "found lb addrs size is: %" PRIdPTR
-                       ". expected addrs size is %" PRIdPTR,
+    gpr_log(GPR_DEBUG,
+            "found lb addrs size is: %" PRIdPTR
+            ". expected addrs size is %" PRIdPTR,
             found_lb_addrs.size(), args->expected_addrs.size());
     abort();
   }
@@ -283,17 +284,17 @@ TEST(ResolverComponentTest, TestResolvesRelevantRecords) {
   args.expected_service_config_string = FLAGS_expected_chosen_service_config;
   args.expected_lb_policy = FLAGS_expected_lb_policy;
   // maybe build the address with an authority
-  char *whole_uri = NULL;
+  char* whole_uri = NULL;
   GPR_ASSERT(asprintf(&whole_uri, "dns://%s/%s",
                       FLAGS_local_dns_server_address.c_str(),
                       FLAGS_target_name.c_str()));
   // create resolver and resolve
-  grpc_resolver *resolver = grpc_resolver_create(&exec_ctx, whole_uri, NULL,
+  grpc_resolver* resolver = grpc_resolver_create(&exec_ctx, whole_uri, NULL,
                                                  args.pollset_set, args.lock);
   gpr_free(whole_uri);
   grpc_closure on_resolver_result_changed;
   GRPC_CLOSURE_INIT(&on_resolver_result_changed, CheckResolverResultLocked,
-                    (void *)&args, grpc_combiner_scheduler(args.lock));
+                    (void*)&args, grpc_combiner_scheduler(args.lock));
   grpc_resolver_next_locked(&exec_ctx, resolver, &args.channel_args,
                             &on_resolver_result_changed);
   grpc_exec_ctx_flush(&exec_ctx);
@@ -305,7 +306,7 @@ TEST(ResolverComponentTest, TestResolvesRelevantRecords) {
 
 }  // namespace
 
-int main(int argc, char **argv) {
+int main(int argc, char** argv) {
   grpc_init();
   grpc_test_init(argc, argv);
   ::testing::InitGoogleTest(&argc, argv);
diff --git a/test/cpp/naming/resolver_component_tests_runner_invoker.cc b/test/cpp/naming/resolver_component_tests_runner_invoker.cc
index 96f2e5abb5..7ea005cc1d 100644
--- a/test/cpp/naming/resolver_component_tests_runner_invoker.cc
+++ b/test/cpp/naming/resolver_component_tests_runner_invoker.cc
@@ -68,8 +68,8 @@ namespace {
 
 const int kTestTimeoutSeconds = 60 * 2;
 
-void RunSigHandlingThread(SubProcess *test_driver, gpr_mu *test_driver_mu,
-                          gpr_cv *test_driver_cv, int *test_driver_done) {
+void RunSigHandlingThread(SubProcess* test_driver, gpr_mu* test_driver_mu,
+                          gpr_cv* test_driver_cv, int* test_driver_done) {
   gpr_timespec overall_deadline =
       gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC),
                    gpr_time_from_seconds(kTestTimeoutSeconds, GPR_TIMESPAN));
@@ -92,7 +92,7 @@ void RunSigHandlingThread(SubProcess *test_driver, gpr_mu *test_driver_mu,
   test_driver->Interrupt();
   return;
 }
-}
+}  // namespace
 
 namespace grpc {
 
@@ -104,7 +104,7 @@ void InvokeResolverComponentTestsRunner(std::string test_runner_bin_path,
                                         std::string records_config_path) {
   int test_dns_server_port = grpc_pick_unused_port_or_die();
 
-  SubProcess *test_driver = new SubProcess(
+  SubProcess* test_driver = new SubProcess(
       {test_runner_bin_path, "--test_bin_path=" + test_bin_path,
        "--dns_server_bin_path=" + dns_server_bin_path,
        "--records_config_path=" + records_config_path,
@@ -151,7 +151,7 @@ void InvokeResolverComponentTestsRunner(std::string test_runner_bin_path,
 
 }  // namespace grpc
 
-int main(int argc, char **argv) {
+int main(int argc, char** argv) {
   grpc::testing::InitTest(&argc, &argv, true);
   grpc_init();
   GPR_ASSERT(FLAGS_test_bin_name != "");