grpc 1.52.0.pre2 → 1.53.0.pre2

data/src/core/lib/experiments/experiments.h

@@ -13,9 +13,40 @@
 // limitations under the License.
 
 // Automatically generated by tools/codegen/core/gen_experiments.py
+//
+// This file contains the autogenerated parts of the experiments API.
+//
+// It generates two symbols for each experiment.
+//
+// For the experiment named new_car_project, it generates:
+//
+// - a function IsNewCarProjectEnabled() that returns true if the experiment
+//   should be enabled at runtime.
+//
+// - a macro GRPC_EXPERIMENT_IS_INCLUDED_NEW_CAR_PROJECT that is defined if the
+//   experiment *could* be enabled at runtime.
+//
+// The function is used to determine whether to run the experiment or
+// non-experiment code path.
+//
+// If the experiment brings significant bloat, the macro can be used to avoid
+// including the experiment code path in the binary for binaries that are size
+// sensitive.
+//
+// By default that includes our iOS and Android builds.
+//
+// Finally, a small array is included that contains the metadata for each
+// experiment.
+//
+// A macro, GRPC_EXPERIMENTS_ARE_FINAL, controls whether we fix experiment
+// configuration at build time (if it's defined) or allow it to be tuned at
+// runtime (if it's disabled).
+//
+// If you are using the Bazel build system, that macro can be configured with
+// --define=grpc_experiments_are_final=true
 
-#ifndef GRPC_CORE_LIB_EXPERIMENTS_EXPERIMENTS_H
-#define GRPC_CORE_LIB_EXPERIMENTS_EXPERIMENTS_H
+#ifndef GRPC_SRC_CORE_LIB_EXPERIMENTS_EXPERIMENTS_H
+#define GRPC_SRC_CORE_LIB_EXPERIMENTS_EXPERIMENTS_H
 
 #include <grpc/support/port_platform.h>
 
@@ -25,34 +56,62 @@
 
 namespace grpc_core {
 
+#ifdef GRPC_EXPERIMENTS_ARE_FINAL
+inline bool IsTcpFrameSizeTuningEnabled() { return false; }
+inline bool IsTcpRcvLowatEnabled() { return false; }
+inline bool IsPeerStateBasedFramingEnabled() { return false; }
+#define GRPC_EXPERIMENT_IS_INCLUDED_FLOW_CONTROL_FIXES
+inline bool IsFlowControlFixesEnabled() { return true; }
+inline bool IsMemoryPressureControllerEnabled() { return false; }
+inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return false; }
+inline bool IsEventEngineClientEnabled() { return false; }
+#define GRPC_EXPERIMENT_IS_INCLUDED_MONITORING_EXPERIMENT
+inline bool IsMonitoringExperimentEnabled() { return true; }
+inline bool IsPromiseBasedClientCallEnabled() { return false; }
+inline bool IsFreeLargeAllocatorEnabled() { return false; }
+inline bool IsPromiseBasedServerCallEnabled() { return false; }
+inline bool IsTransportSuppliesClientLatencyEnabled() { return false; }
+inline bool IsEventEngineListenerEnabled() { return false; }
+#else
+#define GRPC_EXPERIMENT_IS_INCLUDED_TCP_FRAME_SIZE_TUNING
 inline bool IsTcpFrameSizeTuningEnabled() { return IsExperimentEnabled(0); }
-inline bool IsTcpReadChunksEnabled() { return IsExperimentEnabled(1); }
-inline bool IsTcpRcvLowatEnabled() { return IsExperimentEnabled(2); }
-inline bool IsPeerStateBasedFramingEnabled() { return IsExperimentEnabled(3); }
-inline bool IsFlowControlFixesEnabled() { return IsExperimentEnabled(4); }
+#define GRPC_EXPERIMENT_IS_INCLUDED_TCP_RCV_LOWAT
+inline bool IsTcpRcvLowatEnabled() { return IsExperimentEnabled(1); }
+#define GRPC_EXPERIMENT_IS_INCLUDED_PEER_STATE_BASED_FRAMING
+inline bool IsPeerStateBasedFramingEnabled() { return IsExperimentEnabled(2); }
+#define GRPC_EXPERIMENT_IS_INCLUDED_FLOW_CONTROL_FIXES
+inline bool IsFlowControlFixesEnabled() { return IsExperimentEnabled(3); }
+#define GRPC_EXPERIMENT_IS_INCLUDED_MEMORY_PRESSURE_CONTROLLER
 inline bool IsMemoryPressureControllerEnabled() {
-  return IsExperimentEnabled(5);
+  return IsExperimentEnabled(4);
 }
+#define GRPC_EXPERIMENT_IS_INCLUDED_UNCONSTRAINED_MAX_QUOTA_BUFFER_SIZE
 inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() {
-  return IsExperimentEnabled(6);
+  return IsExperimentEnabled(5);
 }
-inline bool IsNewHpackHuffmanDecoderEnabled() { return IsExperimentEnabled(7); }
-inline bool IsEventEngineClientEnabled() { return IsExperimentEnabled(8); }
-inline bool IsMonitoringExperimentEnabled() { return IsExperimentEnabled(9); }
-inline bool IsPromiseBasedClientCallEnabled() {
+#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_CLIENT
+inline bool IsEventEngineClientEnabled() { return IsExperimentEnabled(6); }
+#define GRPC_EXPERIMENT_IS_INCLUDED_MONITORING_EXPERIMENT
+inline bool IsMonitoringExperimentEnabled() { return IsExperimentEnabled(7); }
+#define GRPC_EXPERIMENT_IS_INCLUDED_PROMISE_BASED_CLIENT_CALL
+inline bool IsPromiseBasedClientCallEnabled() { return IsExperimentEnabled(8); }
+#define GRPC_EXPERIMENT_IS_INCLUDED_FREE_LARGE_ALLOCATOR
+inline bool IsFreeLargeAllocatorEnabled() { return IsExperimentEnabled(9); }
+#define GRPC_EXPERIMENT_IS_INCLUDED_PROMISE_BASED_SERVER_CALL
+inline bool IsPromiseBasedServerCallEnabled() {
   return IsExperimentEnabled(10);
 }
-inline bool IsFreeLargeAllocatorEnabled() { return IsExperimentEnabled(11); }
-
-struct ExperimentMetadata {
-  const char* name;
-  const char* description;
-  bool default_value;
-};
+#define GRPC_EXPERIMENT_IS_INCLUDED_TRANSPORT_SUPPLIES_CLIENT_LATENCY
+inline bool IsTransportSuppliesClientLatencyEnabled() {
+  return IsExperimentEnabled(11);
+}
+#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_LISTENER
+inline bool IsEventEngineListenerEnabled() { return IsExperimentEnabled(12); }
 
-constexpr const size_t kNumExperiments = 12;
+constexpr const size_t kNumExperiments = 13;
 extern const ExperimentMetadata g_experiment_metadata[kNumExperiments];
 
+#endif
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_EXPERIMENTS_EXPERIMENTS_H
+#endif  // GRPC_SRC_CORE_LIB_EXPERIMENTS_EXPERIMENTS_H

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

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_GPR_ALLOC_H
-#define GRPC_CORE_LIB_GPR_ALLOC_H
+#ifndef GRPC_SRC_CORE_LIB_GPR_ALLOC_H
+#define GRPC_SRC_CORE_LIB_GPR_ALLOC_H
 
 #include <grpc/support/port_platform.h>
 
@@ -25,4 +25,4 @@
 #define GPR_ROUND_UP_TO_ALIGNMENT_SIZE(x) \
   (((x) + GPR_MAX_ALIGNMENT - 1u) & ~(GPR_MAX_ALIGNMENT - 1u))
 
-#endif  // GRPC_CORE_LIB_GPR_ALLOC_H
+#endif  // GRPC_SRC_CORE_LIB_GPR_ALLOC_H

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

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_GPR_SPINLOCK_H
-#define GRPC_CORE_LIB_GPR_SPINLOCK_H
+#ifndef GRPC_SRC_CORE_LIB_GPR_SPINLOCK_H
+#define GRPC_SRC_CORE_LIB_GPR_SPINLOCK_H
 
 #include <grpc/support/port_platform.h>
 
@@ -50,4 +50,4 @@ struct gpr_spinlock {
   do {                          \
   } while (!gpr_spinlock_trylock((lock)))
 
-#endif  // GRPC_CORE_LIB_GPR_SPINLOCK_H
+#endif  // GRPC_SRC_CORE_LIB_GPR_SPINLOCK_H

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

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_GPR_STRING_H
-#define GRPC_CORE_LIB_GPR_STRING_H
+#ifndef GRPC_SRC_CORE_LIB_GPR_STRING_H
+#define GRPC_SRC_CORE_LIB_GPR_STRING_H
 
 #include <grpc/support/port_platform.h>
 
@@ -109,4 +109,4 @@ void* gpr_memrchr(const void* s, int c, size_t n);
 // Otherwise, it returns false.
 bool gpr_parse_bool_value(const char* value, bool* dst);
 
-#endif  // GRPC_CORE_LIB_GPR_STRING_H
+#endif  // GRPC_SRC_CORE_LIB_GPR_STRING_H

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

@@ -34,6 +34,7 @@
 #include <grpc/support/time.h>
 
 #include "src/core/lib/gprpp/crash.h"
+#include "src/core/lib/gprpp/time_util.h"
 
 void gpr_mu_init(gpr_mu* mu) {
   static_assert(sizeof(gpr_mu) == sizeof(absl::Mutex),
@@ -70,17 +71,24 @@ void gpr_cv_destroy(gpr_cv* cv) {
 }
 
 int gpr_cv_wait(gpr_cv* cv, gpr_mu* mu, gpr_timespec abs_deadline) {
+  absl::CondVar* const c = reinterpret_cast<absl::CondVar*>(cv);
+  absl::Mutex* const m = reinterpret_cast<absl::Mutex*>(mu);
   if (gpr_time_cmp(abs_deadline, gpr_inf_future(abs_deadline.clock_type)) ==
       0) {
-    reinterpret_cast<absl::CondVar*>(cv)->Wait(
-        reinterpret_cast<absl::Mutex*>(mu));
+    c->Wait(m);
     return 0;
   }
-  abs_deadline = gpr_convert_clock_type(abs_deadline, GPR_CLOCK_REALTIME);
-  timespec ts = {static_cast<decltype(ts.tv_sec)>(abs_deadline.tv_sec),
-                 static_cast<decltype(ts.tv_nsec)>(abs_deadline.tv_nsec)};
-  return reinterpret_cast<absl::CondVar*>(cv)->WaitWithDeadline(
-      reinterpret_cast<absl::Mutex*>(mu), absl::TimeFromTimespec(ts));
+  // Use WaitWithTimeout if possible instead of WaitWithDeadline hoping that
+  // it's going to use a monotonic clock.
+  if (abs_deadline.clock_type == GPR_TIMESPAN) {
+    return c->WaitWithTimeout(m, grpc_core::ToAbslDuration(abs_deadline));
+  } else if (abs_deadline.clock_type == GPR_CLOCK_MONOTONIC) {
+    absl::Duration duration = grpc_core::ToAbslDuration(
+        gpr_time_sub(abs_deadline, gpr_now(GPR_CLOCK_MONOTONIC)));
+    return c->WaitWithTimeout(m, duration);
+  } else {
+    return c->WaitWithDeadline(m, grpc_core::ToAbslTime(abs_deadline));
+  }
 }
 
 void gpr_cv_signal(gpr_cv* cv) {

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

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_GPR_TIME_PRECISE_H
-#define GRPC_CORE_LIB_GPR_TIME_PRECISE_H
+#ifndef GRPC_SRC_CORE_LIB_GPR_TIME_PRECISE_H
+#define GRPC_SRC_CORE_LIB_GPR_TIME_PRECISE_H
 
 #include <grpc/support/port_platform.h>
 
@@ -66,4 +66,4 @@ void gpr_precise_clock_now(gpr_timespec* clk);
 gpr_timespec gpr_cycle_counter_to_time(gpr_cycle_counter cycles);
 gpr_timespec gpr_cycle_counter_sub(gpr_cycle_counter a, gpr_cycle_counter b);
 
-#endif  // GRPC_CORE_LIB_GPR_TIME_PRECISE_H
+#endif  // GRPC_SRC_CORE_LIB_GPR_TIME_PRECISE_H

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

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_GPR_TMPFILE_H
-#define GRPC_CORE_LIB_GPR_TMPFILE_H
+#ifndef GRPC_SRC_CORE_LIB_GPR_TMPFILE_H
+#define GRPC_SRC_CORE_LIB_GPR_TMPFILE_H
 
 #include <grpc/support/port_platform.h>
 
@@ -29,4 +29,4 @@
 // unless an error occurs in which case it will be set to NULL.
 FILE* gpr_tmpfile(const char* prefix, char** tmp_filename);
 
-#endif  // GRPC_CORE_LIB_GPR_TMPFILE_H
+#endif  // GRPC_SRC_CORE_LIB_GPR_TMPFILE_H

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

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_GPR_USEFUL_H
-#define GRPC_CORE_LIB_GPR_USEFUL_H
+#ifndef GRPC_SRC_CORE_LIB_GPR_USEFUL_H
+#define GRPC_SRC_CORE_LIB_GPR_USEFUL_H
 
 #include <grpc/support/port_platform.h>
 
@@ -181,4 +181,4 @@ inline uint32_t RoundUpToPowerOf2(uint32_t v) {
 
 #define GPR_ARRAY_SIZE(array) (sizeof(array) / sizeof(*(array)))
 
-#endif  // GRPC_CORE_LIB_GPR_USEFUL_H
+#endif  // GRPC_SRC_CORE_LIB_GPR_USEFUL_H

data/src/core/lib/gprpp/atomic_utils.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_GPRPP_ATOMIC_UTILS_H
-#define GRPC_CORE_LIB_GPRPP_ATOMIC_UTILS_H
+#ifndef GRPC_SRC_CORE_LIB_GPRPP_ATOMIC_UTILS_H
+#define GRPC_SRC_CORE_LIB_GPRPP_ATOMIC_UTILS_H
 
 #include <grpc/support/port_platform.h>
 
@@ -44,4 +44,4 @@ inline bool IncrementIfNonzero(std::atomic<T>* p) {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_GPRPP_ATOMIC_UTILS_H
+#endif  // GRPC_SRC_CORE_LIB_GPRPP_ATOMIC_UTILS_H

data/src/core/lib/gprpp/bitset.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_CORE_LIB_GPRPP_BITSET_H
-#define GRPC_CORE_LIB_GPRPP_BITSET_H
+#ifndef GRPC_SRC_CORE_LIB_GPRPP_BITSET_H
+#define GRPC_SRC_CORE_LIB_GPRPP_BITSET_H
 
 #include <grpc/support/port_platform.h>
 
@@ -222,4 +222,4 @@ class BitSet<0> {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_GPRPP_BITSET_H
+#endif  // GRPC_SRC_CORE_LIB_GPRPP_BITSET_H

data/src/core/lib/gprpp/chunked_vector.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_CORE_LIB_GPRPP_CHUNKED_VECTOR_H
-#define GRPC_CORE_LIB_GPRPP_CHUNKED_VECTOR_H
+#ifndef GRPC_SRC_CORE_LIB_GPRPP_CHUNKED_VECTOR_H
+#define GRPC_SRC_CORE_LIB_GPRPP_CHUNKED_VECTOR_H
 
 #include <grpc/support/port_platform.h>
 
@@ -254,4 +254,4 @@ class ChunkedVector {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_GPRPP_CHUNKED_VECTOR_H
+#endif  // GRPC_SRC_CORE_LIB_GPRPP_CHUNKED_VECTOR_H

data/src/core/lib/gprpp/construct_destruct.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_CORE_LIB_GPRPP_CONSTRUCT_DESTRUCT_H
-#define GRPC_CORE_LIB_GPRPP_CONSTRUCT_DESTRUCT_H
+#ifndef GRPC_SRC_CORE_LIB_GPRPP_CONSTRUCT_DESTRUCT_H
+#define GRPC_SRC_CORE_LIB_GPRPP_CONSTRUCT_DESTRUCT_H
 
 #include <grpc/support/port_platform.h>
 
@@ -37,4 +37,4 @@ void Construct(T* p, Args&&... args) {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_GPRPP_CONSTRUCT_DESTRUCT_H
+#endif  // GRPC_SRC_CORE_LIB_GPRPP_CONSTRUCT_DESTRUCT_H

data/src/core/lib/gprpp/cpp_impl_of.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_CORE_LIB_GPRPP_CPP_IMPL_OF_H
-#define GRPC_CORE_LIB_GPRPP_CPP_IMPL_OF_H
+#ifndef GRPC_SRC_CORE_LIB_GPRPP_CPP_IMPL_OF_H
+#define GRPC_SRC_CORE_LIB_GPRPP_CPP_IMPL_OF_H
 
 namespace grpc_core {
 
@@ -46,4 +46,4 @@ class CppImplOf {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_GPRPP_CPP_IMPL_OF_H
+#endif  // GRPC_SRC_CORE_LIB_GPRPP_CPP_IMPL_OF_H

data/src/core/lib/gprpp/crash.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_CORE_LIB_GPRPP_CRASH_H
-#define GRPC_CORE_LIB_GPRPP_CRASH_H
+#ifndef GRPC_SRC_CORE_LIB_GPRPP_CRASH_H
+#define GRPC_SRC_CORE_LIB_GPRPP_CRASH_H
 
 #include <grpc/support/port_platform.h>
 
@@ -31,4 +31,4 @@ namespace grpc_core {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_GPRPP_CRASH_H
+#endif  // GRPC_SRC_CORE_LIB_GPRPP_CRASH_H

data/src/core/lib/gprpp/debug_location.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_GPRPP_DEBUG_LOCATION_H
-#define GRPC_CORE_LIB_GPRPP_DEBUG_LOCATION_H
+#ifndef GRPC_SRC_CORE_LIB_GPRPP_DEBUG_LOCATION_H
+#define GRPC_SRC_CORE_LIB_GPRPP_DEBUG_LOCATION_H
 
 #if defined(__has_builtin)
 #if __has_builtin(__builtin_FILE)
@@ -56,9 +56,6 @@ class SourceLocation {
 // No-op for non-debug builds.
 // Callers can use the DEBUG_LOCATION macro in either case.
 #ifndef NDEBUG
-// TODO(roth): See if there's a way to automatically populate this,
-// similarly to how absl::SourceLocation::current() works, so that
-// callers don't need to explicitly pass DEBUG_LOCATION anywhere.
 class DebugLocation {
  public:
   DebugLocation(const char* file = GRPC_DEFAULT_FILE,
@@ -84,4 +81,4 @@ class DebugLocation {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_GPRPP_DEBUG_LOCATION_H
+#endif  // GRPC_SRC_CORE_LIB_GPRPP_DEBUG_LOCATION_H

data/src/core/lib/gprpp/dual_ref_counted.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_LIB_GPRPP_DUAL_REF_COUNTED_H
-#define GRPC_CORE_LIB_GPRPP_DUAL_REF_COUNTED_H
+#ifndef GRPC_SRC_CORE_LIB_GPRPP_DUAL_REF_COUNTED_H
+#define GRPC_SRC_CORE_LIB_GPRPP_DUAL_REF_COUNTED_H
 
 #include <grpc/support/port_platform.h>
 
@@ -324,4 +324,4 @@ class DualRefCounted : public Orphanable {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_GPRPP_DUAL_REF_COUNTED_H
+#endif  // GRPC_SRC_CORE_LIB_GPRPP_DUAL_REF_COUNTED_H

data/src/core/lib/gprpp/env.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_GPRPP_ENV_H
-#define GRPC_CORE_LIB_GPRPP_ENV_H
+#ifndef GRPC_SRC_CORE_LIB_GPRPP_ENV_H
+#define GRPC_SRC_CORE_LIB_GPRPP_ENV_H
 
 #include <grpc/support/port_platform.h>
 
@@ -50,4 +50,4 @@ void SetOrUnsetEnv(const char* name, const absl::optional<T>& value) {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_GPRPP_ENV_H
+#endif  // GRPC_SRC_CORE_LIB_GPRPP_ENV_H

data/src/core/lib/gprpp/examine_stack.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_GPRPP_EXAMINE_STACK_H
-#define GRPC_CORE_LIB_GPRPP_EXAMINE_STACK_H
+#ifndef GRPC_SRC_CORE_LIB_GPRPP_EXAMINE_STACK_H
+#define GRPC_SRC_CORE_LIB_GPRPP_EXAMINE_STACK_H
 
 #include <grpc/support/port_platform.h>
 
@@ -42,4 +42,4 @@ absl::optional<std::string> GetCurrentStackTrace();
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_GPRPP_EXAMINE_STACK_H
+#endif  // GRPC_SRC_CORE_LIB_GPRPP_EXAMINE_STACK_H

data/src/core/lib/gprpp/fork.cc

@@ -24,6 +24,7 @@
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>
 
+#include "src/core/lib/event_engine/thread_local.h"
 #include "src/core/lib/gprpp/global_config_env.h"
 #include "src/core/lib/gprpp/no_destruct.h"
 
@@ -63,6 +64,12 @@ class ExecCtxState {
   }
 
   void IncExecCtxCount() {
+    // EventEngine is expected to terminate all threads before fork, and so this
+    // extra work is unnecessary
+    if (grpc_event_engine::experimental::ThreadLocal::IsEventEngineThread()) {
+      gpr_atm_no_barrier_fetch_add(&count_, 1);
+      return;
+    }
     gpr_atm count = gpr_atm_no_barrier_load(&count_);
     while (true) {
       if (count <= BLOCKED(1)) {
@@ -190,10 +197,19 @@ void Fork::DoDecExecCtxCount() {
 
 void Fork::SetResetChildPollingEngineFunc(
     Fork::child_postfork_func reset_child_polling_engine) {
-  reset_child_polling_engine_ = reset_child_polling_engine;
+  if (reset_child_polling_engine_ == nullptr) {
+    reset_child_polling_engine_ = new std::vector<Fork::child_postfork_func>();
+  }
+  if (reset_child_polling_engine == nullptr) {
+    reset_child_polling_engine_->clear();
+  } else {
+    reset_child_polling_engine_->emplace_back(reset_child_polling_engine);
+  }
 }
-Fork::child_postfork_func Fork::GetResetChildPollingEngineFunc() {
-  return reset_child_polling_engine_;
+
+const std::vector<Fork::child_postfork_func>&
+Fork::GetResetChildPollingEngineFunc() {
+  return *reset_child_polling_engine_;
 }
 
 bool Fork::BlockExecCtx() {
@@ -228,5 +244,6 @@ void Fork::AwaitThreads() {
 
 std::atomic<bool> Fork::support_enabled_(false);
 bool Fork::override_enabled_ = false;
-Fork::child_postfork_func Fork::reset_child_polling_engine_ = nullptr;
+std::vector<Fork::child_postfork_func>* Fork::reset_child_polling_engine_ =
+    nullptr;
 }  // namespace grpc_core

data/src/core/lib/gprpp/fork.h

@@ -16,12 +16,13 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_GPRPP_FORK_H
-#define GRPC_CORE_LIB_GPRPP_FORK_H
+#ifndef GRPC_SRC_CORE_LIB_GPRPP_FORK_H
+#define GRPC_SRC_CORE_LIB_GPRPP_FORK_H
 
 #include <grpc/support/port_platform.h>
 
 #include <atomic>
+#include <vector>
 
 //
 // NOTE: FORKING IS NOT GENERALLY SUPPORTED, THIS IS ONLY INTENDED TO WORK
@@ -58,7 +59,8 @@ class Fork {
   // reset the polling engine's internal state.
   static void SetResetChildPollingEngineFunc(
       child_postfork_func reset_child_polling_engine);
-  static child_postfork_func GetResetChildPollingEngineFunc();
+  static const std::vector<child_postfork_func>&
+  GetResetChildPollingEngineFunc();
 
   // Check if there is a single active ExecCtx
   // (the one used to invoke this function).  If there are more,
@@ -87,9 +89,9 @@ class Fork {
 
   static std::atomic<bool> support_enabled_;
   static bool override_enabled_;
-  static child_postfork_func reset_child_polling_engine_;
+  static std::vector<child_postfork_func>* reset_child_polling_engine_;
 };
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_GPRPP_FORK_H
+#endif  // GRPC_SRC_CORE_LIB_GPRPP_FORK_H

data/src/core/lib/gprpp/global_config.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_GPRPP_GLOBAL_CONFIG_H
-#define GRPC_CORE_LIB_GPRPP_GLOBAL_CONFIG_H
+#ifndef GRPC_SRC_CORE_LIB_GPRPP_GLOBAL_CONFIG_H
+#define GRPC_SRC_CORE_LIB_GPRPP_GLOBAL_CONFIG_H
 
 #include <grpc/support/port_platform.h>
 
@@ -90,4 +90,4 @@
 #include "src/core/lib/gprpp/global_config_custom.h"  // IWYU pragma: export
 #include "src/core/lib/gprpp/global_config_env.h"     // IWYU pragma: export
 
-#endif  // GRPC_CORE_LIB_GPRPP_GLOBAL_CONFIG_H
+#endif  // GRPC_SRC_CORE_LIB_GPRPP_GLOBAL_CONFIG_H

data/src/core/lib/gprpp/global_config_custom.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_GPRPP_GLOBAL_CONFIG_CUSTOM_H
-#define GRPC_CORE_LIB_GPRPP_GLOBAL_CONFIG_CUSTOM_H
+#ifndef GRPC_SRC_CORE_LIB_GPRPP_GLOBAL_CONFIG_CUSTOM_H
+#define GRPC_SRC_CORE_LIB_GPRPP_GLOBAL_CONFIG_CUSTOM_H
 
 // This is a placeholder for custom global configuration implementation.
 // To use the custom one, please define following macros here.
@@ -26,4 +26,4 @@
 //   GPR_GLOBAL_CONFIG_DEFINE_INT32
 //   GPR_GLOBAL_CONFIG_DEFINE_STRING
 
-#endif  // GRPC_CORE_LIB_GPRPP_GLOBAL_CONFIG_CUSTOM_H
+#endif  // GRPC_SRC_CORE_LIB_GPRPP_GLOBAL_CONFIG_CUSTOM_H

data/src/core/lib/gprpp/global_config_env.cc

@@ -23,6 +23,7 @@
 #include <ctype.h>
 #include <stdlib.h>
 
+#include <initializer_list>
 #include <memory>
 #include <string>
 #include <type_traits>

data/src/core/lib/gprpp/global_config_env.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_GPRPP_GLOBAL_CONFIG_ENV_H
-#define GRPC_CORE_LIB_GPRPP_GLOBAL_CONFIG_ENV_H
+#ifndef GRPC_SRC_CORE_LIB_GPRPP_GLOBAL_CONFIG_ENV_H
+#define GRPC_SRC_CORE_LIB_GPRPP_GLOBAL_CONFIG_ENV_H
 
 #include <grpc/support/port_platform.h>
 
@@ -130,4 +130,4 @@ class GlobalConfigEnvString : public GlobalConfigEnv {
     g_env_##name.Set(value);                                               \
   }
 
-#endif  // GRPC_CORE_LIB_GPRPP_GLOBAL_CONFIG_ENV_H
+#endif  // GRPC_SRC_CORE_LIB_GPRPP_GLOBAL_CONFIG_ENV_H

data/src/core/lib/gprpp/global_config_generic.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_GPRPP_GLOBAL_CONFIG_GENERIC_H
-#define GRPC_CORE_LIB_GPRPP_GLOBAL_CONFIG_GENERIC_H
+#ifndef GRPC_SRC_CORE_LIB_GPRPP_GLOBAL_CONFIG_GENERIC_H
+#define GRPC_SRC_CORE_LIB_GPRPP_GLOBAL_CONFIG_GENERIC_H
 
 #include <grpc/support/port_platform.h>
 
@@ -37,4 +37,4 @@
   extern grpc_core::UniquePtr<char> gpr_global_config_get_##name(); \
   extern void gpr_global_config_set_##name(const char* value)
 
-#endif  // GRPC_CORE_LIB_GPRPP_GLOBAL_CONFIG_GENERIC_H
+#endif  // GRPC_SRC_CORE_LIB_GPRPP_GLOBAL_CONFIG_GENERIC_H

data/src/core/lib/gprpp/host_port.cc

@@ -22,6 +22,8 @@
 
 #include <stddef.h>
 
+#include <initializer_list>
+
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
 

data/src/core/lib/gprpp/host_port.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_GPRPP_HOST_PORT_H
-#define GRPC_CORE_LIB_GPRPP_HOST_PORT_H
+#ifndef GRPC_SRC_CORE_LIB_GPRPP_HOST_PORT_H
+#define GRPC_SRC_CORE_LIB_GPRPP_HOST_PORT_H
 
 #include <grpc/support/port_platform.h>
 
@@ -54,4 +54,4 @@ bool SplitHostPort(absl::string_view name, std::string* host,
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_GPRPP_HOST_PORT_H
+#endif  // GRPC_SRC_CORE_LIB_GPRPP_HOST_PORT_H