grpc 1.40.0 → 1.41.0.pre2

data/src/core/lib/channel/handshaker_registry.h

@@ -21,6 +21,9 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+#include <vector>
+
 #include <grpc/impl/codegen/grpc_types.h>
 
 #include "src/core/lib/channel/handshaker_factory.h"
@@ -35,18 +38,32 @@ typedef enum {
 
 class HandshakerRegistry {
  public:
-  /// Registers a new handshaker factory.  Takes ownership.
-  /// If \a at_start is true, the new handshaker will be at the beginning of
-  /// the list.  Otherwise, it will be added to the end.
-  static void RegisterHandshakerFactory(
-      bool at_start, HandshakerType handshaker_type,
-      std::unique_ptr<HandshakerFactory> factory);
-  static void AddHandshakers(HandshakerType handshaker_type,
-                             const grpc_channel_args* args,
-                             grpc_pollset_set* interested_parties,
-                             HandshakeManager* handshake_mgr);
-  static void Init();
-  static void Shutdown();
+  class Builder {
+   public:
+    /// Registers a new handshaker factory.  Takes ownership.
+    /// If \a at_start is true, the new handshaker will be at the beginning of
+    /// the list.  Otherwise, it will be added to the end.
+    void RegisterHandshakerFactory(bool at_start,
+                                   HandshakerType handshaker_type,
+                                   std::unique_ptr<HandshakerFactory> factory);
+
+    HandshakerRegistry Build();
+
+   private:
+    std::vector<std::unique_ptr<HandshakerFactory>>
+        factories_[NUM_HANDSHAKER_TYPES];
+  };
+
+  void AddHandshakers(HandshakerType handshaker_type,
+                      const grpc_channel_args* args,
+                      grpc_pollset_set* interested_parties,
+                      HandshakeManager* handshake_mgr) const;
+
+ private:
+  HandshakerRegistry() = default;
+
+  std::vector<std::unique_ptr<HandshakerFactory>>
+      factories_[NUM_HANDSHAKER_TYPES];
 };
 
 }  // namespace grpc_core

data/src/core/lib/channel/status_util.h

@@ -21,11 +21,11 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <grpc/status.h>
-
 #include <stdbool.h>
 #include <string.h>
 
+#include <grpc/status.h>
+
 /// If \a status_str is a valid status string, sets \a status to the
 /// corresponding status value and returns true.
 bool grpc_status_code_from_string(const char* status_str,

data/src/core/lib/compression/algorithm_metadata.h

@@ -22,6 +22,7 @@
 #include <grpc/support/port_platform.h>
 
 #include <grpc/compression.h>
+
 #include "src/core/lib/compression/compression_internal.h"
 #include "src/core/lib/transport/metadata.h"
 

data/src/core/lib/compression/compression_args.cc

@@ -18,6 +18,8 @@
 
 #include <grpc/support/port_platform.h>
 
+#include "src/core/lib/compression/compression_args.h"
+
 #include <limits.h>
 #include <string.h>
 
@@ -28,7 +30,6 @@
 #include <grpc/support/string_util.h>
 
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/compression/compression_args.h"
 #include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gpr/useful.h"
 

data/src/core/lib/compression/compression_internal.cc

@@ -18,13 +18,14 @@
 
 #include <grpc/support/port_platform.h>
 
+#include "src/core/lib/compression/compression_internal.h"
+
 #include <stdlib.h>
 #include <string.h>
 
 #include <grpc/compression.h>
 
 #include "src/core/lib/compression/algorithm_metadata.h"
-#include "src/core/lib/compression/compression_internal.h"
 #include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/slice/slice_utils.h"
 #include "src/core/lib/surface/api_trace.h"
@@ -168,7 +169,6 @@ int grpc_compression_algorithm_from_message_stream_compression_algorithm(
         return 0;
     }
   }
-  return 0;
 }
 
 /* Interfaces for message compression. */
@@ -265,7 +265,6 @@ int grpc_message_compression_algorithm_parse(
   } else {
     return 0;
   }
-  return 0;
 }
 
 /* Interfaces for stream compression. */
@@ -281,5 +280,4 @@ int grpc_stream_compression_algorithm_parse(
   } else {
     return 0;
   }
-  return 0;
 }

data/src/core/lib/compression/message_compress.cc

@@ -22,11 +22,11 @@
 
 #include <string.h>
 
+#include <zlib.h>
+
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 
-#include <zlib.h>
-
 #include "src/core/lib/slice/slice_internal.h"
 
 #define OUTPUT_BLOCK_SIZE 1024

data/src/core/lib/compression/stream_compression.cc

@@ -18,9 +18,10 @@
 
 #include <grpc/support/port_platform.h>
 
+#include "src/core/lib/compression/stream_compression.h"
+
 #include <grpc/support/log.h>
 
-#include "src/core/lib/compression/stream_compression.h"
 #include "src/core/lib/compression/stream_compression_gzip.h"
 #include "src/core/lib/slice/slice_utils.h"
 

data/src/core/lib/compression/stream_compression.h

@@ -23,9 +23,10 @@
 
 #include <stdbool.h>
 
-#include <grpc/slice_buffer.h>
 #include <zlib.h>
 
+#include <grpc/slice_buffer.h>
+
 #include "src/core/lib/transport/static_metadata.h"
 
 typedef struct grpc_stream_compression_vtable grpc_stream_compression_vtable;

data/src/core/lib/compression/stream_compression_gzip.cc

@@ -18,10 +18,11 @@
 
 #include <grpc/support/port_platform.h>
 
+#include "src/core/lib/compression/stream_compression_gzip.h"
+
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 
-#include "src/core/lib/compression/stream_compression_gzip.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/slice/slice_internal.h"
 

data/src/core/lib/compression/stream_compression_identity.cc

@@ -18,10 +18,11 @@
 
 #include <grpc/support/port_platform.h>
 
+#include "src/core/lib/compression/stream_compression_identity.h"
+
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 
-#include "src/core/lib/compression/stream_compression_identity.h"
 #include "src/core/lib/slice/slice_internal.h"
 
 #define OUTPUT_BLOCK_SIZE (1024)

data/src/core/lib/config/core_configuration.cc

@@ -0,0 +1,54 @@
+// Copyright 2021 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include <grpc/impl/codegen/port_platform.h>
+
+#include "src/core/lib/config/core_configuration.h"
+
+namespace grpc_core {
+
+std::atomic<CoreConfiguration*> CoreConfiguration::config_{nullptr};
+
+CoreConfiguration::Builder::Builder() = default;
+
+CoreConfiguration* CoreConfiguration::Builder::Build() {
+  return new CoreConfiguration(this);
+}
+
+CoreConfiguration::CoreConfiguration(Builder* builder)
+    : handshaker_registry_(builder->handshaker_registry_.Build()) {}
+
+const CoreConfiguration& CoreConfiguration::BuildNewAndMaybeSet() {
+  // Construct builder, pass it up to code that knows about build configuration
+  Builder builder;
+  BuildCoreConfiguration(&builder);
+  // Use builder to construct a confguration
+  CoreConfiguration* p = builder.Build();
+  // Try to set configuration global - it's possible another thread raced us
+  // here, in which case we drop the work we did and use the one that got set
+  // first
+  CoreConfiguration* expected = nullptr;
+  if (!config_.compare_exchange_strong(expected, p, std::memory_order_acq_rel,
+                                       std::memory_order_acquire)) {
+    delete p;
+    return *expected;
+  }
+  return *p;
+}
+
+void CoreConfiguration::Reset() {
+  delete config_.exchange(nullptr, std::memory_order_acquire);
+}
+
+}  // namespace grpc_core

data/src/core/lib/config/core_configuration.h

@@ -0,0 +1,108 @@
+// Copyright 2021 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef GRPC_CORE_LIB_CONFIG_CORE_CONFIGURATION_H
+#define GRPC_CORE_LIB_CONFIG_CORE_CONFIGURATION_H
+
+#include <grpc/impl/codegen/port_platform.h>
+
+#include <atomic>
+
+#include "src/core/lib/channel/handshaker_registry.h"
+
+namespace grpc_core {
+
+// Global singleton that stores library configuration - factories, etc...
+// that plugins might choose to extend.
+class CoreConfiguration {
+ public:
+  CoreConfiguration(const CoreConfiguration&) = delete;
+  CoreConfiguration& operator=(const CoreConfiguration&) = delete;
+
+  // Builder is passed to plugins, etc... at initialization time to collect
+  // their configuration and assemble the published CoreConfiguration.
+  class Builder {
+   public:
+    HandshakerRegistry::Builder* handshaker_registry() {
+      return &handshaker_registry_;
+    }
+
+   private:
+    friend class CoreConfiguration;
+
+    HandshakerRegistry::Builder handshaker_registry_;
+
+    Builder();
+    CoreConfiguration* Build();
+  };
+
+  // Lifetime methods
+
+  // Get the core configuration; if it does not exist, create it.
+  static const CoreConfiguration& Get() {
+    CoreConfiguration* p = config_.load(std::memory_order_acquire);
+    if (p != nullptr) {
+      return *p;
+    }
+    return BuildNewAndMaybeSet();
+  }
+
+  // Build a special core configuration.
+  // Requires no concurrent Get() be called.
+  // Doesn't call the regular BuildCoreConfiguration function, instead calls
+  // `build`.
+  // BuildFunc is a callable that takes a Builder* and returns void.
+  // We use a template instead of std::function<void(Builder*)> to avoid
+  // including std::function in this widely used header, and to ensure no code
+  // is generated in programs that do not use this function.
+  // This is sometimes useful for testing.
+  template <typename BuildFunc>
+  static void BuildSpecialConfiguration(BuildFunc build) {
+    // Build bespoke configuration
+    Builder builder;
+    build(&builder);
+    CoreConfiguration* p = builder.Build();
+    // Swap in final configuration, deleting anything that was already present.
+    delete config_.exchange(p, std::memory_order_release);
+  }
+
+  // Drop the core configuration. Users must ensure no other threads are
+  // accessing the configuration.
+  // Clears any dynamically registered builders.
+  static void Reset();
+
+  // Accessors
+
+  const HandshakerRegistry& handshaker_registry() const {
+    return handshaker_registry_;
+  }
+
+ private:
+  explicit CoreConfiguration(Builder* builder);
+
+  // Create a new CoreConfiguration, and either set it or throw it away.
+  // We allow multiple CoreConfiguration's to be created in parallel.
+  static const CoreConfiguration& BuildNewAndMaybeSet();
+
+  // The configuration
+  static std::atomic<CoreConfiguration*> config_;
+
+  HandshakerRegistry handshaker_registry_;
+};
+
+extern void BuildCoreConfiguration(CoreConfiguration::Builder* builder);
+
+}  // namespace grpc_core
+
+#endif /* GRPC_CORE_LIB_CONFIG_CORE_CONFIGURATION_H */

data/src/core/lib/debug/stats.h

@@ -24,6 +24,7 @@
 #include <string>
 
 #include <grpc/support/atm.h>
+
 #include "src/core/lib/debug/stats_data.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 

data/src/core/lib/debug/stats_data.cc

@@ -20,8 +20,9 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/debug/stats.h"
 #include "src/core/lib/debug/stats_data.h"
+
+#include "src/core/lib/debug/stats.h"
 #include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 

data/src/core/lib/debug/stats_data.h

@@ -24,6 +24,7 @@
 #include <grpc/support/port_platform.h>
 
 #include <inttypes.h>
+
 #include "src/core/lib/iomgr/exec_ctx.h"
 
 typedef enum {

data/src/core/lib/debug/trace.cc

@@ -21,6 +21,7 @@
 #include "src/core/lib/debug/trace.h"
 
 #include <string.h>
+
 #include <type_traits>
 
 #include <grpc/grpc.h>

data/src/core/lib/debug/trace.h

@@ -21,9 +21,10 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <grpc/support/atm.h>
 #include <stdbool.h>
 
+#include <grpc/support/atm.h>
+
 #include "src/core/lib/gprpp/global_config.h"
 
 GPR_GLOBAL_CONFIG_DECLARE_STRING(grpc_trace);

data/src/core/lib/event_engine/endpoint_config.cc

@@ -14,7 +14,6 @@
 #include <grpc/support/port_platform.h>
 
 #include <grpc/event_engine/endpoint_config.h>
-
 #include <grpc/impl/codegen/grpc_types.h>
 #include <grpc/impl/codegen/log.h>
 

data/src/core/lib/event_engine/event_engine.cc

@@ -13,15 +13,15 @@
 // limitations under the License.
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/str_format.h"
+#include "absl/strings/str_join.h"
+
 #include <grpc/event_engine/endpoint_config.h>
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/event_engine/port.h>
 #include <grpc/impl/codegen/grpc_types.h>
 #include <grpc/support/log.h>
 
-#include "absl/strings/str_format.h"
-#include "absl/strings/str_join.h"
-
 #include "src/core/lib/event_engine/sockaddr.h"
 
 namespace grpc_event_engine {

data/src/core/lib/event_engine/sockaddr.cc

@@ -16,9 +16,9 @@
 #ifdef GRPC_USE_EVENT_ENGINE
 #include <string.h>
 
-#include "grpc/event_engine/event_engine.h"
-#include "grpc/event_engine/port.h"
-#include "grpc/support/log.h"
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/port.h>
+#include <grpc/support/log.h>
 
 uint16_t grpc_htons(uint16_t hostshort) { return htons(hostshort); }
 

data/src/core/lib/gpr/alloc.cc

@@ -18,11 +18,12 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <grpc/support/alloc.h>
-
-#include <grpc/support/log.h>
 #include <stdlib.h>
 #include <string.h>
+
+#include <grpc/support/alloc.h>
+#include <grpc/support/log.h>
+
 #include "src/core/lib/profiling/timers.h"
 
 void* gpr_malloc(size_t size) {

data/src/core/lib/gpr/env_linux.cc

@@ -25,8 +25,6 @@
 
 #ifdef GPR_LINUX_ENV
 
-#include "src/core/lib/gpr/env.h"
-
 #include <dlfcn.h>
 #include <features.h>
 #include <stdlib.h>
@@ -35,6 +33,7 @@
 #include <grpc/support/log.h>
 #include <grpc/support/string_util.h>
 
+#include "src/core/lib/gpr/env.h"
 #include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gpr/useful.h"
 

data/src/core/lib/gpr/env_posix.cc

@@ -20,13 +20,12 @@
 
 #ifdef GPR_POSIX_ENV
 
-#include "src/core/lib/gpr/env.h"
-
 #include <stdlib.h>
 
 #include <grpc/support/log.h>
-
 #include <grpc/support/string_util.h>
+
+#include "src/core/lib/gpr/env.h"
 #include "src/core/lib/gpr/string.h"
 
 char* gpr_getenv(const char* name) {

data/src/core/lib/gpr/log.cc

@@ -18,6 +18,9 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <stdio.h>
+#include <string.h>
+
 #include <grpc/support/alloc.h>
 #include <grpc/support/atm.h>
 #include <grpc/support/log.h>
@@ -25,9 +28,6 @@
 #include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gprpp/global_config.h"
 
-#include <stdio.h>
-#include <string.h>
-
 #ifndef GPR_DEFAULT_LOG_VERBOSITY_STRING
 #define GPR_DEFAULT_LOG_VERBOSITY_STRING "ERROR"
 #endif  // !GPR_DEFAULT_LOG_VERBOSITY_STRING

data/src/core/lib/gpr/log_android.cc

@@ -21,12 +21,13 @@
 #ifdef GPR_ANDROID
 
 #include <android/log.h>
-#include <grpc/support/log.h>
-#include <grpc/support/time.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 
+#include <grpc/support/log.h>
+#include <grpc/support/time.h>
+
 static android_LogPriority severity_to_log_priority(gpr_log_severity severity) {
   switch (severity) {
     case GPR_LOG_SEVERITY_DEBUG:

data/src/core/lib/gpr/log_linux.cc

@@ -28,9 +28,6 @@
 
 #ifdef GPR_LINUX_LOG
 
-#include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
-#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -42,6 +39,12 @@
 #include <string>
 
 #include "absl/strings/str_format.h"
+
+#include <grpc/support/alloc.h>
+#include <grpc/support/log.h>
+#include <grpc/support/time.h>
+
+#include "src/core/lib/gpr/tls.h"
 #include "src/core/lib/gprpp/examine_stack.h"
 
 int gpr_should_log_stacktrace(gpr_log_severity severity);
@@ -74,7 +77,7 @@ void gpr_default_log(gpr_log_func_args* args) {
   time_t timer;
   gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME);
   struct tm tm;
-  static __thread long tid = 0;
+  static GPR_THREAD_LOCAL(long) tid(0);
   if (tid == 0) tid = sys_gettid();
 
   timer = static_cast<time_t>(now.tv_sec);

data/src/core/lib/gpr/log_posix.cc

@@ -20,18 +20,21 @@
 
 #ifdef GPR_POSIX_LOG
 
-#include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
-#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <pthread.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
+
 #include <string>
 
 #include "absl/strings/str_format.h"
+
+#include <grpc/support/alloc.h>
+#include <grpc/support/log.h>
+#include <grpc/support/time.h>
+
 #include "src/core/lib/gprpp/examine_stack.h"
 
 int gpr_should_log_stacktrace(gpr_log_severity severity);

data/src/core/lib/gpr/string.h

@@ -21,13 +21,13 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <grpc/impl/codegen/gpr_types.h>
-
 #include <stdbool.h>
 #include <stddef.h>
 
 #include <string>
 
+#include <grpc/impl/codegen/gpr_types.h>
+
 /* String utility functions */
 
 /* Flags for gpr_dump function. */

data/src/core/lib/gpr/sync.cc

@@ -20,12 +20,12 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <assert.h>
+
 #include <grpc/support/atm.h>
 #include <grpc/support/log.h>
 #include <grpc/support/sync.h>
 
-#include <assert.h>
-
 /* Number of mutexes to allocate for events, to avoid lock contention.
    Should be a prime. */
 enum { event_sync_partitions = 31 };

data/src/core/lib/gpr/sync_abseil.cc

@@ -20,20 +20,21 @@
 
 #if defined(GPR_ABSEIL_SYNC) && !defined(GPR_CUSTOM_SYNC)
 
-#include <grpc/support/alloc.h>
-
 #include <errno.h>
-#include <grpc/support/log.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
 #include <time.h>
-#include "src/core/lib/profiling/timers.h"
 
 #include "absl/base/call_once.h"
 #include "absl/synchronization/mutex.h"
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/log.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
+
+#include "src/core/lib/profiling/timers.h"
+
 #ifdef GPR_LOW_LEVEL_COUNTERS
 gpr_atm gpr_mu_locks = 0;
 gpr_atm gpr_counter_atm_cas = 0;