Clean up

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

@@ -33,9 +33,9 @@
 
 namespace grpc_core {
 
-int ServiceConfig::registered_parsers_count = 0;
+int ServiceConfig::registered_parsers_count_ = 0;
 ServiceConfigParser
-    ServiceConfig::registered_parsers[ServiceConfigParser::kMaxParsers];
+    ServiceConfig::registered_parsers_[ServiceConfigParser::kMaxParsers];
 
 RefCountedPtr<ServiceConfig> ServiceConfig::Create(const char* json) {
   UniquePtr<char> service_config_json(gpr_strdup(json));
@@ -50,7 +50,6 @@ RefCountedPtr<ServiceConfig> ServiceConfig::Create(const char* json) {
       std::move(service_config_json), std::move(json_string), json_tree,
       &success);
 
-  // return return_value;
   return success ? return_value : nullptr;
 }
 
@@ -62,18 +61,15 @@ ServiceConfig::ServiceConfig(UniquePtr<char> service_config_json,
       json_tree_(json_tree) {
   GPR_DEBUG_ASSERT(success != nullptr);
   if (json_tree->type != GRPC_JSON_OBJECT || json_tree->key != nullptr) {
-    gpr_log(GPR_ERROR, "error");
     *success = false;
     return;
   }
   ParseGlobalParams(json_tree, success);
   if (!*success) {
-    gpr_log(GPR_ERROR, "global error");
     return;
   }
   ParsePerMethodParams(json_tree, success);
   if (!*success) {
-    gpr_log(GPR_ERROR, "local error");
     return;
   }
 }
@@ -83,13 +79,13 @@ void ServiceConfig::ParseGlobalParams(const grpc_json* json_tree,
   GPR_DEBUG_ASSERT(success != nullptr);
   GPR_DEBUG_ASSERT(json_tree_->type == GRPC_JSON_OBJECT);
   GPR_DEBUG_ASSERT(json_tree_->key == nullptr);
-  for (auto i = 0; i < registered_parsers_count; i++) {
+  for (auto i = 0; i < registered_parsers_count_; i++) {
     auto parsed_obj =
-        registered_parsers[i].ParseGlobalParams(json_tree, success);
+        registered_parsers_[i].ParseGlobalParams(json_tree, success);
     if (!*success) {
       return;
     }
-    parsed_global_service_config_objects.push_back(parsed_obj);
+    parsed_global_service_config_objects_.push_back(parsed_obj);
   }
   *success = true;
 }
@@ -99,10 +95,10 @@ bool ServiceConfig::ParseJsonMethodConfigToServiceConfigObjectsTable(
     SliceHashTable<RefCountedPtr<ServiceConfigObjectsVector>>::Entry* entries,
     size_t* idx) {
   auto objs_vector = MakeRefCounted<ServiceConfigObjectsVector>();
-  for (auto i = 0; i < registered_parsers_count; i++) {
+  for (auto i = 0; i < registered_parsers_count_; i++) {
     bool success;
     auto parsed_obj =
-        registered_parsers[i].ParsePerMethodParams(json, &success);
+        registered_parsers_[i].ParsePerMethodParams(json, &success);
     if (!success) {
       return false;
     }
@@ -187,7 +183,7 @@ void ServiceConfig::ParsePerMethodParams(const grpc_json* json_tree,
     }
   }
   if (entries != nullptr) {
-    parsed_method_service_config_objects_table =
+    parsed_method_service_config_objects_table_ =
         SliceHashTable<RefCountedPtr<ServiceConfigObjectsVector>>::Create(
             num_entries, entries, nullptr);
     gpr_free(entries);

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

@@ -141,15 +141,15 @@ class ServiceConfig : public RefCounted<ServiceConfig> {
 
   /// Retrieves the parsed global service config object at index \a index.
   ServiceConfigParsedObject* GetParsedGlobalServiceConfigObject(int index) {
-    GPR_DEBUG_ASSERT(index < registered_parsers_count);
-    return parsed_global_service_config_objects[index].get();
+    GPR_DEBUG_ASSERT(index < registered_parsers_count_);
+    return parsed_global_service_config_objects_[index].get();
   }
 
   /// Retrieves the vector of method service config objects for a given path \a
   /// path.
   const RefCountedPtr<ServiceConfigObjectsVector>*
   GetMethodServiceConfigObjectsVector(const grpc_slice& path) {
-    const auto* value = parsed_method_service_config_objects_table->Get(path);
+    const auto* value = parsed_method_service_config_objects_table_->Get(path);
     // If we didn't find a match for the path, try looking for a wildcard
     // entry (i.e., change "/service/method" to "/service/*").
     if (value == nullptr) {
@@ -162,7 +162,7 @@ class ServiceConfig : public RefCounted<ServiceConfig> {
       buf[len + 1] = '\0';
       grpc_slice wildcard_path = grpc_slice_from_copied_string(buf);
       gpr_free(buf);
-      value = parsed_method_service_config_objects_table->Get(wildcard_path);
+      value = parsed_method_service_config_objects_table_->Get(wildcard_path);
       grpc_slice_unref_internal(wildcard_path);
       gpr_free(path_str);
       if (value == nullptr) return nullptr;
@@ -177,11 +177,12 @@ class ServiceConfig : public RefCounted<ServiceConfig> {
   /// config json and returning a parsed object. This parsed object can later be
   /// retrieved using the same index that was returned at registration time.
   static int RegisterParser(const ServiceConfigParser& parser) {
-    registered_parsers[registered_parsers_count] = parser;
-    return registered_parsers_count++;
+    registered_parsers_[registered_parsers_count_] = parser;
+    return registered_parsers_count_++;
   }
 
-  static void ResetServiceConfigParsers() { registered_parsers_count = 0; }
+  /// Should be called on initialization and shutdown.
+  static void ResetServiceConfigParsers() { registered_parsers_count_ = 0; }
 
  private:
   // So New() can call our private ctor.
@@ -193,6 +194,7 @@ class ServiceConfig : public RefCounted<ServiceConfig> {
                 UniquePtr<char> json_string, grpc_json* json_tree,
                 bool* success);
 
+  // Helper functions to parse the service config
   void ParseGlobalParams(const grpc_json* json_tree, bool* success);
   void ParsePerMethodParams(const grpc_json* json_tree, bool* success);
 
@@ -216,9 +218,9 @@ class ServiceConfig : public RefCounted<ServiceConfig> {
       SliceHashTable<RefCountedPtr<ServiceConfigObjectsVector>>::Entry* entries,
       size_t* idx);
 
-  static int registered_parsers_count;
+  static int registered_parsers_count_;
   static ServiceConfigParser
-      registered_parsers[ServiceConfigParser::kMaxParsers];
+      registered_parsers_[ServiceConfigParser::kMaxParsers];
 
   UniquePtr<char> service_config_json_;
   UniquePtr<char> json_string_;  // Underlying storage for json_tree.
@@ -226,9 +228,9 @@ class ServiceConfig : public RefCounted<ServiceConfig> {
 
   InlinedVector<RefCountedPtr<ServiceConfigParsedObject>,
                 ServiceConfigParser::kMaxParsers>
-      parsed_global_service_config_objects;
+      parsed_global_service_config_objects_;
   RefCountedPtr<SliceHashTable<RefCountedPtr<ServiceConfigObjectsVector>>>
-      parsed_method_service_config_objects_table;
+      parsed_method_service_config_objects_table_;
 };
 
 //