grpc 1.67.0 → 1.69.0.pre1

data/src/core/lib/surface/completion_queue.cc

@@ -17,6 +17,12 @@
 //
 #include "src/core/lib/surface/completion_queue.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/atm.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <stdio.h>
 
@@ -32,20 +38,7 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/atm.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/event_engine/default_event_engine.h"
-#include "src/core/lib/gprpp/atomic_utils.h"
-#include "src/core/lib/gprpp/debug_location.h"
-#include "src/core/lib/gprpp/ref_counted.h"
-#include "src/core/lib/gprpp/status_helper.h"
-#include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/executor.h"
@@ -54,7 +47,12 @@
 #include "src/core/lib/surface/event_string.h"
 #include "src/core/telemetry/stats.h"
 #include "src/core/telemetry/stats_data.h"
+#include "src/core/util/atomic_utils.h"
+#include "src/core/util/debug_location.h"
+#include "src/core/util/ref_counted.h"
 #include "src/core/util/spinlock.h"
+#include "src/core/util/status_helper.h"
+#include "src/core/util/time.h"
 
 #ifdef GPR_WINDOWS
 #include "src/core/lib/experiments/experiments.h"
@@ -1001,7 +999,7 @@ static grpc_event cq_next(grpc_completion_queue* cq, gpr_timespec deadline,
       break;
     } else {
       // If c == NULL it means either the queue is empty OR in an transient
-      // inconsistent state. If it is the latter, we shold do a 0-timeout poll
+      // inconsistent state. If it is the latter, we should do a 0-timeout poll
       // so that the thread comes back quickly from poll to make a second
       // attempt at popping. Not doing this can potentially deadlock this
       // thread forever (if the deadline is infinity)

data/src/core/lib/surface/completion_queue.h

@@ -21,15 +21,14 @@
 
 // Internal API for completion queues
 
-#include <stdint.h>
-
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
 
-#include "src/core/lib/gprpp/manual_constructor.h"
-#include "src/core/lib/gprpp/mpscq.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
+#include "src/core/util/manual_constructor.h"
+#include "src/core/util/mpscq.h"
 
 typedef struct grpc_cq_completion {
   grpc_core::ManualConstructor<
@@ -63,7 +62,7 @@ void grpc_cq_internal_unref(grpc_completion_queue* cq);
 #endif
 
 // Flag that an operation is beginning: the completion channel will not finish
-// shutdown until a corrensponding grpc_cq_end_* call is made.
+// shutdown until a corresponding grpc_cq_end_* call is made.
 // \a tag is currently used only in debug builds. Return true on success, and
 // false if completion_queue has been shutdown.
 bool grpc_cq_begin_op(grpc_completion_queue* cq, void* tag);

data/src/core/lib/surface/completion_queue_factory.cc

@@ -18,11 +18,10 @@
 
 #include "src/core/lib/surface/completion_queue_factory.h"
 
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/surface/completion_queue.h"
 

data/src/core/lib/surface/connection_context.cc

@@ -0,0 +1,77 @@
+//
+//
+// Copyright 2024 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 "src/core/lib/surface/connection_context.h"
+
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+
+#include <cstddef>
+
+#include "src/core/util/alloc.h"
+#include "src/core/util/orphanable.h"
+
+namespace grpc_core {
+
+namespace {
+
+void* ConnectionContextStorage() {
+  size_t base_size = sizeof(ConnectionContext) +
+                     GPR_ROUND_UP_TO_ALIGNMENT_SIZE(
+                         connection_context_detail::
+                             BaseConnectionContextPropertiesTraits::Size());
+  static constexpr size_t alignment =
+      (GPR_CACHELINE_SIZE > GPR_MAX_ALIGNMENT &&
+       GPR_CACHELINE_SIZE % GPR_MAX_ALIGNMENT == 0)
+          ? GPR_CACHELINE_SIZE
+          : GPR_MAX_ALIGNMENT;
+  return gpr_malloc_aligned(base_size, alignment);
+}
+
+}  // namespace
+
+OrphanablePtr<ConnectionContext> ConnectionContext::Create() {
+  void* p = ConnectionContextStorage();
+  return OrphanablePtr<ConnectionContext>(new (p) ConnectionContext());
+}
+
+ConnectionContext::ConnectionContext() {
+  for (size_t i = 0;
+       i < connection_context_detail::BaseConnectionContextPropertiesTraits::
+               NumProperties();
+       ++i) {
+    registered_properties()[i] = nullptr;
+  }
+}
+
+void ConnectionContext::Orphan() {
+  this->~ConnectionContext();
+  gpr_free_aligned(const_cast<ConnectionContext*>(this));
+}
+
+ConnectionContext::~ConnectionContext() {
+  for (size_t i = 0;
+       i < connection_context_detail::BaseConnectionContextPropertiesTraits::
+               NumProperties();
+       ++i) {
+    connection_context_detail::BaseConnectionContextPropertiesTraits::Destroy(
+        i, registered_properties()[i]);
+  }
+}
+
+}  // namespace grpc_core

data/src/core/lib/surface/connection_context.h

@@ -0,0 +1,156 @@
+//
+//
+// Copyright 2024 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_SRC_CORE_LIB_SURFACE_CONNECTION_CONTEXT_H
+#define GRPC_SRC_CORE_LIB_SURFACE_CONNECTION_CONTEXT_H
+
+#include <grpc/support/port_platform.h>
+#include <stddef.h>
+
+#include <cstdint>
+#include <vector>
+
+#include "src/core/util/no_destruct.h"
+#include "src/core/util/orphanable.h"
+
+namespace grpc_core {
+
+class ConnectionContext;
+
+template <typename T>
+struct ConnectionContextProperty;
+
+namespace connection_context_detail {
+
+// Tracks all registered/known auth property types (these should only be
+// registered via AuthPropertyTraits at static initialization time).
+class BaseConnectionContextPropertiesTraits {
+ public:
+  // Count of number of registered auth context properties.
+  static uint16_t NumProperties() {
+    return static_cast<uint16_t>(RegisteredTraits().size());
+  }
+
+  // Number of bytes required to store pointers of all registered auth context
+  // properties.
+  static size_t Size() { return NumProperties() * sizeof(void*); }
+
+  // Call the registered destruction function for a context.
+  static void Destroy(uint16_t id, void* ptr) {
+    if (ptr == nullptr) return;
+    RegisteredTraits()[id](ptr);
+  }
+
+  // Allocate a new context id and register the destruction function.
+  template <typename T>
+  static uint16_t AllocateId(void (*destroy)(void* ptr)) {
+    auto& traits = RegisteredTraits();
+    const uint16_t id = static_cast<uint16_t>(traits.size());
+    traits.push_back(destroy);
+    return id;
+  }
+
+ private:
+  // Allocate a new context id and register the destruction function.
+
+  static std::vector<void (*)(void*)>& RegisteredTraits() {
+    static NoDestruct<std::vector<void (*)(void*)>> registered_traits;
+    return *registered_traits;
+  }
+};
+
+template <typename T>
+class ConnectionContextPropertiesTraits
+    : public BaseConnectionContextPropertiesTraits {
+ public:
+  static uint16_t id() { return id_; }
+  template <typename... Args>
+  static T* Construct(Args&&... args) {
+    return new T(std::forward<Args>(args)...);
+  }
+  static void Destruct(void* p) { delete reinterpret_cast<T*>(p); }
+
+ protected:
+  static const uint16_t id_;
+};
+
+template <typename T>
+const uint16_t ConnectionContextPropertiesTraits<T>::id_ =
+    BaseConnectionContextPropertiesTraits::AllocateId<T>(
+        ConnectionContextPropertiesTraits<T>::Destruct);
+
+}  // namespace connection_context_detail
+
+class ConnectionContext final : public Orphanable {
+ public:
+  static OrphanablePtr<ConnectionContext> Create();
+
+  // Sets the value of a registered property if it is not already set. Return
+  // false if the property is already set. If the property is not already
+  // set, an object of type Which is created using the passed args
+  // and stored in the map.
+  template <typename Which, typename... Args>
+  bool EmplaceIfUnset(Args&&... args) {
+    using Traits =
+        connection_context_detail::ConnectionContextPropertiesTraits<Which>;
+    Which* value = static_cast<Which*>(registered_properties()[Traits::id()]);
+    if (value == nullptr) {
+      registered_properties()[Traits::id()] = Traits::Construct(args...);
+      return true;
+    }
+    return false;
+  }
+
+  // Force updates the value of a registered property. It deletes any previously
+  // set value.
+  template <typename Which, typename... Args>
+  void Update(Args&&... args) {
+    using Traits =
+        connection_context_detail::ConnectionContextPropertiesTraits<Which>;
+    Which* prev = static_cast<Which*>(registered_properties()[Traits::id()]);
+    if (prev != nullptr) {
+      Traits::Destroy(Traits::id(), prev);
+    }
+    registered_properties()[Traits::id()] = Traits::Construct(args...);
+  }
+
+  // Returns the value of a registered property. If the property is not set,
+  // returns nullptr.
+  template <typename Which>
+  const Which* Get() {
+    return static_cast<Which*>(
+        registered_properties()
+            [connection_context_detail::ConnectionContextPropertiesTraits<
+                Which>::id()]);
+  }
+
+  void Orphan() override;
+
+  ~ConnectionContext() override;
+
+ private:
+  GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION void** registered_properties() {
+    return reinterpret_cast<void**>(this + 1);
+  }
+
+  ConnectionContext();
+};
+
+}  // namespace grpc_core
+
+#endif  // GRPC_SRC_CORE_LIB_SURFACE_CONNECTION_CONTEXT_H

data/src/core/lib/surface/event_string.cc

@@ -18,14 +18,14 @@
 
 #include "src/core/lib/surface/event_string.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <vector>
 
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 
-#include <grpc/support/port_platform.h>
-
 static void addhdr(grpc_event* ev, std::vector<std::string>* buf) {
   buf->push_back(absl::StrFormat("tag:%p", ev->tag));
 }

data/src/core/lib/surface/event_string.h

@@ -19,11 +19,11 @@
 #ifndef GRPC_SRC_CORE_LIB_SURFACE_EVENT_STRING_H
 #define GRPC_SRC_CORE_LIB_SURFACE_EVENT_STRING_H
 
-#include <string>
-
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
 
+#include <string>
+
 // Returns a string describing an event. Must be later freed with gpr_free()
 std::string grpc_event_string(grpc_event* ev);
 

data/src/core/lib/surface/filter_stack_call.cc

@@ -14,6 +14,19 @@
 
 #include "src/core/lib/surface/filter_stack_call.h"
 
+#include <grpc/byte_buffer.h>
+#include <grpc/compression.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/call.h>
+#include <grpc/impl/propagation_bits.h>
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/atm.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <stdlib.h>
@@ -29,30 +42,10 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/compression.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/call.h>
-#include <grpc/impl/propagation_bits.h>
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/atm.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/event_engine/event_engine_context.h"
 #include "src/core/lib/experiments/experiments.h"
-#include "src/core/lib/gprpp/crash.h"
-#include "src/core/lib/gprpp/debug_location.h"
-#include "src/core/lib/gprpp/ref_counted.h"
-#include "src/core/lib/gprpp/ref_counted_ptr.h"
-#include "src/core/lib/gprpp/status_helper.h"
 #include "src/core/lib/iomgr/call_combiner.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/polling_entity.h"
@@ -71,6 +64,11 @@
 #include "src/core/telemetry/stats.h"
 #include "src/core/telemetry/stats_data.h"
 #include "src/core/util/alloc.h"
+#include "src/core/util/crash.h"
+#include "src/core/util/debug_location.h"
+#include "src/core/util/ref_counted.h"
+#include "src/core/util/ref_counted_ptr.h"
+#include "src/core/util/status_helper.h"
 #include "src/core/util/time_precise.h"
 
 namespace grpc_core {

data/src/core/lib/surface/filter_stack_call.h

@@ -15,21 +15,6 @@
 #ifndef GRPC_SRC_CORE_LIB_SURFACE_FILTER_STACK_CALL_H
 #define GRPC_SRC_CORE_LIB_SURFACE_FILTER_STACK_CALL_H
 
-#include <inttypes.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <atomic>
-#include <cstdint>
-#include <string>
-#include <vector>
-
-#include "absl/log/check.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/str_join.h"
-#include "absl/strings/string_view.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpc/compression.h>
 #include <grpc/event_engine/event_engine.h>
@@ -43,10 +28,21 @@
 #include <grpc/support/atm.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
+#include <inttypes.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <atomic>
+#include <cstdint>
+#include <string>
+#include <vector>
 
+#include "absl/log/check.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_join.h"
+#include "absl/strings/string_view.h"
 #include "src/core/lib/channel/channel_stack.h"
-#include "src/core/lib/gprpp/ref_counted.h"
-#include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/iomgr/call_combiner.h"
 #include "src/core/lib/iomgr/polling_entity.h"
 #include "src/core/lib/promise/context.h"
@@ -60,6 +56,8 @@
 #include "src/core/server/server_interface.h"
 #include "src/core/telemetry/call_tracer.h"
 #include "src/core/util/alloc.h"
+#include "src/core/util/ref_counted.h"
+#include "src/core/util/ref_counted_ptr.h"
 
 namespace grpc_core {
 
@@ -133,7 +131,7 @@ class FilterStackCall final : public Call {
 
   static size_t InitialSizeEstimate() {
     return sizeof(FilterStackCall) +
-           sizeof(BatchControl) * kMaxConcurrentBatches;
+           (sizeof(BatchControl) * kMaxConcurrentBatches);
   }
 
   char* GetPeer() final;

data/src/core/lib/surface/init.cc

@@ -18,9 +18,7 @@
 
 #include "src/core/lib/surface/init.h"
 
-#include "absl/base/thread_annotations.h"
-#include "absl/log/log.h"
-
+#include <address_sorting/address_sorting.h>
 #include <grpc/fork.h>
 #include <grpc/grpc.h>
 #include <grpc/impl/channel_arg_names.h>
@@ -29,15 +27,16 @@
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>
 
+#include "absl/base/thread_annotations.h"
+#include "absl/log/log.h"
+#include "absl/time/clock.h"
+#include "absl/time/time.h"
 #include "src/core/client_channel/backup_poller.h"
-#include "src/core/lib/config/core_configuration.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/posix_engine/timer_manager.h"
 #include "src/core/lib/experiments/config.h"
 #include "src/core/lib/experiments/experiments.h"
-#include "src/core/lib/gprpp/fork.h"
-#include "src/core/lib/gprpp/sync.h"
-#include "src/core/lib/gprpp/thd.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/iomgr.h"
 #include "src/core/lib/iomgr/timer_manager.h"
@@ -47,6 +46,9 @@
 #include "src/core/lib/security/transport/auth_filters.h"
 #include "src/core/lib/surface/channel_stack_type.h"
 #include "src/core/lib/surface/init_internally.h"
+#include "src/core/util/fork.h"
+#include "src/core/util/sync.h"
+#include "src/core/util/thd.h"
 
 // Remnants of the old plugin system
 void grpc_resolver_dns_ares_init(void);
@@ -114,6 +116,7 @@ void grpc_init(void) {
     }
     grpc_iomgr_init();
     if (grpc_core::IsEventEngineDnsEnabled()) {
+      address_sorting_init();
       auto status = AresInit();
       if (!status.ok()) {
         VLOG(2) << "AresInit failed: " << status.message();
@@ -137,6 +140,7 @@ void grpc_shutdown_internal_locked(void)
     grpc_iomgr_shutdown_background_closure();
     grpc_timer_manager_set_threading(false);  // shutdown timer_manager thread
     if (grpc_core::IsEventEngineDnsEnabled()) {
+      address_sorting_shutdown();
       AresShutdown();
     } else {
       grpc_resolver_dns_ares_shutdown();
@@ -216,3 +220,20 @@ void grpc_maybe_wait_for_async_shutdown(void) {
     g_shutting_down_cv->Wait(g_init_mu);
   }
 }
+
+bool grpc_wait_for_shutdown_with_timeout(absl::Duration timeout) {
+  GRPC_TRACE_LOG(api, INFO) << "grpc_wait_for_shutdown_with_timeout()";
+  const auto started = absl::Now();
+  const auto deadline = started + timeout;
+  gpr_once_init(&g_basic_init, do_basic_init);
+  grpc_core::MutexLock lock(g_init_mu);
+  while (g_initializations != 0) {
+    if (g_shutting_down_cv->WaitWithDeadline(g_init_mu, deadline)) {
+      LOG(ERROR) << "grpc_wait_for_shutdown_with_timeout() timed out.";
+      return false;
+    }
+  }
+  GRPC_TRACE_LOG(api, INFO)
+      << "grpc_wait_for_shutdown_with_timeout() took " << absl::Now() - started;
+  return true;
+}

data/src/core/lib/surface/init.h

@@ -20,6 +20,11 @@
 
 #include <grpc/support/port_platform.h>
 
+#include "absl/time/time.h"
+
 void grpc_maybe_wait_for_async_shutdown(void);
 
+// Returns false if the timeout expired before fully shut down.
+bool grpc_wait_for_shutdown_with_timeout(absl::Duration timeout);
+
 #endif  // GRPC_SRC_CORE_LIB_SURFACE_INIT_H

data/src/core/lib/surface/lame_client.cc

@@ -18,26 +18,22 @@
 
 #include "src/core/lib/surface/lame_client.h"
 
-#include <memory>
-#include <utility>
-
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/connectivity_state.h>
 #include <grpc/status.h>
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+#include <utility>
+
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "src/core/config/core_configuration.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_args_preconditioning.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/promise_based_filter.h"
-#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
-#include "src/core/lib/gprpp/debug_location.h"
-#include "src/core/lib/gprpp/ref_counted_ptr.h"
-#include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/promise/pipe.h"
 #include "src/core/lib/promise/promise.h"
@@ -46,10 +42,13 @@
 #include "src/core/lib/transport/connectivity_state.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/transport/transport.h"
+#include "src/core/util/debug_location.h"
+#include "src/core/util/ref_counted_ptr.h"
+#include "src/core/util/sync.h"
 #include "src/core/util/useful.h"
 
 // Avoid some IWYU confusion:
-// IWYU pragma: no_include "src/core/lib/gprpp/orphanable.h"
+// IWYU pragma: no_include "src/core/util/orphanable.h"
 
 namespace grpc_core {
 

data/src/core/lib/surface/lame_client.h

@@ -19,23 +19,22 @@
 #ifndef GRPC_SRC_CORE_LIB_SURFACE_LAME_CLIENT_H
 #define GRPC_SRC_CORE_LIB_SURFACE_LAME_CLIENT_H
 
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/base/thread_annotations.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/promise_based_filter.h"
-#include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/promise/arena_promise.h"
 #include "src/core/lib/transport/connectivity_state.h"
 #include "src/core/lib/transport/transport.h"
+#include "src/core/util/sync.h"
 
 #define GRPC_ARG_LAME_FILTER_ERROR "grpc.lame_filter_error"