Remaning commits

src/core/ext/filters/client_channel/client_channel.cc

@@ -1062,7 +1062,7 @@ class ChannelData::SubchannelWrapper : public SubchannelInterface {
       void ApplyUpdateInControlPlaneLogicalThread() {
         if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) {
           gpr_log(GPR_INFO,
-                  "chand=%p: processing connectivity change in logical thread "
+                  "chand=%p: processing connectivity change in work serializer "
                   "for subchannel wrapper %p subchannel %p "
                   "(connected_subchannel=%p state=%s): watcher=%p",
                   parent_->parent_->chand_, parent_->parent_.get(),
@@ -3843,7 +3843,7 @@ bool CallData::PickSubchannelLocked(grpc_call_element* elem,
   // The picker being null means that the channel is currently in IDLE state.
   // The incoming call will make the channel exit IDLE.
   if (chand->picker() == nullptr) {
-    // Bounce into the control plane logical thread to exit IDLE.
+    // Bounce into the control plane work serializer to exit IDLE.
     ExecCtx::Run(
         DEBUG_LOCATION,
         GRPC_CLOSURE_CREATE(

src/core/ext/filters/client_channel/lb_policy/subchannel_list.h

@@ -62,7 +62,7 @@ class MySubchannelList
 };
 
 */
-// All methods will be called from within the client_channel logical thread.
+// All methods will be called from within the client_channel work serializer.
 
 namespace grpc_core {
 

src/core/ext/filters/client_channel/local_subchannel_pool.h

@@ -38,8 +38,8 @@ class LocalSubchannelPool final : public SubchannelPoolInterface {
   ~LocalSubchannelPool() override;
 
   // Implements interface methods.
-  // Thread-unsafe. Intended to be invoked within the client_channel logical
-  // thread.
+  // Thread-unsafe. Intended to be invoked within the client_channel work
+  // serializer.
   Subchannel* RegisterSubchannel(SubchannelKey* key,
                                  Subchannel* constructed) override;
   void UnregisterSubchannel(SubchannelKey* key) override;

src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc

@@ -236,11 +236,8 @@ void FakeResolverResponseGenerator::SetResponse(Resolver::Result result) {
   }
   FakeResolverResponseSetter* arg =
       new FakeResolverResponseSetter(resolver, std::move(result));
-  resolver->work_serializer()->Run(
-      [arg]() {
-        arg->SetResponseLocked();
-      },
-      DEBUG_LOCATION);
+  resolver->work_serializer()->Run([arg]() { arg->SetResponseLocked(); },
+                                   DEBUG_LOCATION);
 }
 
 void FakeResolverResponseGenerator::SetReresolutionResponse(
@@ -251,13 +248,10 @@ void FakeResolverResponseGenerator::SetReresolutionResponse(
     GPR_ASSERT(resolver_ != nullptr);
     resolver = resolver_->Ref();
   }
-  FakeResolverResponseSetter* arg =
-      new FakeResolverResponseSetter(resolver, std::move(result), true /* has_result */);
+  FakeResolverResponseSetter* arg = new FakeResolverResponseSetter(
+      resolver, std::move(result), true /* has_result */);
   resolver->work_serializer()->Run(
-      [arg]() {
-        arg->SetReresolutionResponseLocked();
-      },
-      DEBUG_LOCATION);
+      [arg]() { arg->SetReresolutionResponseLocked(); }, DEBUG_LOCATION);
 }
 
 void FakeResolverResponseGenerator::UnsetReresolutionResponse() {
@@ -270,10 +264,7 @@ void FakeResolverResponseGenerator::UnsetReresolutionResponse() {
   FakeResolverResponseSetter* arg =
       new FakeResolverResponseSetter(resolver, Resolver::Result());
   resolver->work_serializer()->Run(
-      [arg]() {
-        arg->SetReresolutionResponseLocked();
-      },
-      DEBUG_LOCATION);
+      [arg]() { arg->SetReresolutionResponseLocked(); }, DEBUG_LOCATION);
 }
 
 void FakeResolverResponseGenerator::SetFailure() {
@@ -285,11 +276,8 @@ void FakeResolverResponseGenerator::SetFailure() {
   }
   FakeResolverResponseSetter* arg =
       new FakeResolverResponseSetter(resolver, Resolver::Result());
-  resolver->work_serializer()->Run(
-      [arg]() {
-        arg->SetFailureLocked();
-      },
-      DEBUG_LOCATION);
+  resolver->work_serializer()->Run([arg]() { arg->SetFailureLocked(); },
+                                   DEBUG_LOCATION);
 }
 
 void FakeResolverResponseGenerator::SetFailureOnReresolution() {
@@ -300,12 +288,10 @@ void FakeResolverResponseGenerator::SetFailureOnReresolution() {
     resolver = resolver_->Ref();
   }
   FakeResolverResponseSetter* arg = new FakeResolverResponseSetter(
-      resolver, Resolver::Result(), false /* has_result */, false /* immediate */);
-  resolver->work_serializer()->Run(
-      [arg]() {
-        arg->SetFailureLocked();
-      },
-      DEBUG_LOCATION);
+      resolver, Resolver::Result(), false /* has_result */,
+      false /* immediate */);
+  resolver->work_serializer()->Run([arg]() { arg->SetFailureLocked(); },
+                                   DEBUG_LOCATION);
 }
 
 void FakeResolverResponseGenerator::SetFakeResolver(
@@ -316,11 +302,8 @@ void FakeResolverResponseGenerator::SetFakeResolver(
   if (has_result_) {
     FakeResolverResponseSetter* arg =
         new FakeResolverResponseSetter(resolver_, std::move(result_));
-    resolver_->work_serializer()->Run(
-        [arg]() {
-          arg->SetResponseLocked();
-        },
-        DEBUG_LOCATION);
+    resolver_->work_serializer()->Run([arg]() { arg->SetResponseLocked(); },
+                                      DEBUG_LOCATION);
     has_result_ = false;
   }
 }

test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc

@@ -161,14 +161,14 @@ int main(int argc, char** argv) {
 
   grpc_init();
   gpr_mu_init(&g_mu);
-    auto work_serializer = std::make_shared<grpc_core::WorkSerializer>();
-    g_work_serializer = &work_serializer;
-    grpc_set_resolver_impl(&test_resolver);
-    grpc_dns_lookup_ares_locked = my_dns_lookup_ares_locked;
-    grpc_cancel_ares_request_locked = my_cancel_ares_request_locked;
-    
+  auto work_serializer = std::make_shared<grpc_core::WorkSerializer>();
+  g_work_serializer = &work_serializer;
+  grpc_set_resolver_impl(&test_resolver);
+  grpc_dns_lookup_ares_locked = my_dns_lookup_ares_locked;
+  grpc_cancel_ares_request_locked = my_cancel_ares_request_locked;
+
   {
-    grpc_core::ExecCtx exec_ctx;    
+    grpc_core::ExecCtx exec_ctx;
     ResultHandler* result_handler = new ResultHandler();
     grpc_core::OrphanablePtr<grpc_core::Resolver> resolver = create_resolver(
         "dns:test",

test/core/client_channel/resolvers/dns_resolver_test.cc

@@ -72,24 +72,24 @@ static void test_fails(grpc_core::ResolverFactory* factory,
 int main(int argc, char** argv) {
   grpc::testing::TestEnvironment env(argc, argv);
   grpc_init();
-  
-    auto work_serializer = std::make_shared<grpc_core::WorkSerializer>();
-    g_work_serializer = &work_serializer;
 
-    grpc_core::ResolverFactory* dns =
-        grpc_core::ResolverRegistry::LookupResolverFactory("dns");
+  auto work_serializer = std::make_shared<grpc_core::WorkSerializer>();
+  g_work_serializer = &work_serializer;
 
-    test_succeeds(dns, "dns:10.2.1.1");
-    test_succeeds(dns, "dns:10.2.1.1:1234");
-    test_succeeds(dns, "dns:www.google.com");
-    test_succeeds(dns, "dns:///www.google.com");
-    grpc_core::UniquePtr<char> resolver =
-        GPR_GLOBAL_CONFIG_GET(grpc_dns_resolver);
-    if (gpr_stricmp(resolver.get(), "native") == 0) {
-      test_fails(dns, "dns://8.8.8.8/8.8.8.8:8888");
-    } else {
-      test_succeeds(dns, "dns://8.8.8.8/8.8.8.8:8888");
-    }
+  grpc_core::ResolverFactory* dns =
+      grpc_core::ResolverRegistry::LookupResolverFactory("dns");
+
+  test_succeeds(dns, "dns:10.2.1.1");
+  test_succeeds(dns, "dns:10.2.1.1:1234");
+  test_succeeds(dns, "dns:www.google.com");
+  test_succeeds(dns, "dns:///www.google.com");
+  grpc_core::UniquePtr<char> resolver =
+      GPR_GLOBAL_CONFIG_GET(grpc_dns_resolver);
+  if (gpr_stricmp(resolver.get(), "native") == 0) {
+    test_fails(dns, "dns://8.8.8.8/8.8.8.8:8888");
+  } else {
+    test_succeeds(dns, "dns://8.8.8.8/8.8.8.8:8888");
+  }
   grpc_shutdown();
 
   return 0;