grpc 1.70.1 → 1.72.0

data/src/core/lib/event_engine/posix_engine/traced_buffer_list.h

@@ -19,63 +19,63 @@
 #include <grpc/support/time.h>
 #include <stdint.h>
 
+#include <optional>
+
 #include "absl/functional/any_invocable.h"
 #include "absl/status/status.h"
-#include "absl/types/optional.h"
 #include "src/core/lib/event_engine/posix_engine/internal_errqueue.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/sync.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 struct ConnectionMetrics {  // Delivery rate in Bytes/s.
-  absl::optional<uint64_t> delivery_rate;
+  std::optional<uint64_t> delivery_rate;
   // If the delivery rate is limited by the application, this is set to true.
-  absl::optional<bool> is_delivery_rate_app_limited;
+  std::optional<bool> is_delivery_rate_app_limited;
   // Total packets retransmitted.
-  absl::optional<uint32_t> packet_retx;
+  std::optional<uint32_t> packet_retx;
   // Total packets retransmitted spuriously. This metric is smaller than or
   // equal to packet_retx.
-  absl::optional<uint32_t> packet_spurious_retx;
+  std::optional<uint32_t> packet_spurious_retx;
   // Total packets sent.
-  absl::optional<uint32_t> packet_sent;
+  std::optional<uint32_t> packet_sent;
   // Total packets delivered.
-  absl::optional<uint32_t> packet_delivered;
+  std::optional<uint32_t> packet_delivered;
   // Total packets delivered with ECE marked. This metric is smaller than or
   // equal to packet_delivered.
-  absl::optional<uint32_t> packet_delivered_ce;
+  std::optional<uint32_t> packet_delivered_ce;
   // Total bytes lost so far.
-  absl::optional<uint64_t> data_retx;
+  std::optional<uint64_t> data_retx;
   // Total bytes sent so far.
-  absl::optional<uint64_t> data_sent;
+  std::optional<uint64_t> data_sent;
   // Total bytes in write queue but not sent.
-  absl::optional<uint64_t> data_notsent;
+  std::optional<uint64_t> data_notsent;
   // Pacing rate of the connection in Bps
-  absl::optional<uint64_t> pacing_rate;
+  std::optional<uint64_t> pacing_rate;
   // Minimum RTT observed in usec.
-  absl::optional<uint32_t> min_rtt;
+  std::optional<uint32_t> min_rtt;
   // Smoothed RTT in usec
-  absl::optional<uint32_t> srtt;
+  std::optional<uint32_t> srtt;
   // Send congestion window.
-  absl::optional<uint32_t> congestion_window;
+  std::optional<uint32_t> congestion_window;
   // Slow start threshold in packets.
-  absl::optional<uint32_t> snd_ssthresh;
+  std::optional<uint32_t> snd_ssthresh;
   // Maximum degree of reordering (i.e., maximum number of packets reodered)
   // on the connection.
-  absl::optional<uint32_t> reordering;
+  std::optional<uint32_t> reordering;
   // Represents the number of recurring retransmissions of the first sequence
   // that is not acknowledged yet.
-  absl::optional<uint8_t> recurring_retrans;
+  std::optional<uint8_t> recurring_retrans;
   // The cumulative time (in usec) that the transport protocol was busy
   // sending data.
-  absl::optional<uint64_t> busy_usec;
+  std::optional<uint64_t> busy_usec;
   // The cumulative time (in usec) that the transport protocol was limited by
   // the receive window size.
-  absl::optional<uint64_t> rwnd_limited_usec;
+  std::optional<uint64_t> rwnd_limited_usec;
   // The cumulative time (in usec) that the transport protocol was limited by
   // the send buffer size.
-  absl::optional<uint64_t> sndbuf_limited_usec;
+  std::optional<uint64_t> sndbuf_limited_usec;
 };
 
 struct BufferTimestamp {
@@ -176,7 +176,6 @@ class TracedBufferList {
 void TcpSetWriteTimestampsCallback(
     absl::AnyInvocable<void(void*, Timestamps*, absl::Status)>);
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_TRACED_BUFFER_LIST_H

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

@@ -32,8 +32,7 @@
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.h"
 #include "src/core/util/strerror.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 #ifdef GRPC_LINUX_EVENTFD
 
@@ -121,5 +120,4 @@ EventFdWakeupFd::CreateEventFdWakeupFd() {
 
 #endif  // GRPC_LINUX_EVENTFD
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental

data/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.h

@@ -22,8 +22,7 @@
 #include "absl/status/statusor.h"
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 class EventFdWakeupFd : public WakeupFd {
  public:
@@ -38,7 +37,6 @@ class EventFdWakeupFd : public WakeupFd {
   absl::Status Init();
 };
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_WAKEUP_FD_EVENTFD_H

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

@@ -32,8 +32,7 @@
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h"
 #include "src/core/util/strerror.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 #ifdef GRPC_POSIX_WAKEUP_FD
 
@@ -65,9 +64,17 @@ absl::Status PipeWakeupFd::Init() {
                         absl::StrCat("pipe: ", grpc_core::StrError(errno)));
   }
   auto status = SetSocketNonBlocking(pipefd[0]);
-  if (!status.ok()) return status;
+  if (!status.ok()) {
+    close(pipefd[0]);
+    close(pipefd[1]);
+    return status;
+  }
   status = SetSocketNonBlocking(pipefd[1]);
-  if (!status.ok()) return status;
+  if (!status.ok()) {
+    close(pipefd[0]);
+    close(pipefd[1]);
+    return status;
+  }
   SetWakeupFds(pipefd[0], pipefd[1]);
   return absl::OkStatus();
 }
@@ -144,5 +151,4 @@ absl::StatusOr<std::unique_ptr<WakeupFd>> PipeWakeupFd::CreatePipeWakeupFd() {
 
 #endif  //  GRPC_POSIX_WAKEUP_FD
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental

data/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h

@@ -22,8 +22,7 @@
 #include "absl/status/statusor.h"
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 class PipeWakeupFd : public WakeupFd {
  public:
@@ -38,7 +37,6 @@ class PipeWakeupFd : public WakeupFd {
   absl::Status Init();
 };
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_WAKEUP_FD_PIPE_H

data/src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h

@@ -46,8 +46,7 @@
 
 #include "absl/status/status.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 class WakeupFd {
  public:
@@ -70,7 +69,6 @@ class WakeupFd {
   int write_fd_;
 };
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_WAKEUP_FD_POSIX_H

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

@@ -22,8 +22,7 @@
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h"
 #include "src/core/lib/iomgr/port.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 #ifdef GRPC_POSIX_WAKEUP_FD
 
@@ -62,5 +61,4 @@ absl::StatusOr<std::unique_ptr<WakeupFd>> CreateWakeupFd() {
 
 #endif  // GRPC_POSIX_WAKEUP_FD
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental

data/src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h

@@ -20,8 +20,7 @@
 
 #include "absl/status/statusor.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 class WakeupFd;
 
@@ -31,7 +30,6 @@ bool SupportsWakeupFd();
 // Create and return an initialized WakeupFd instance if supported.
 absl::StatusOr<std::unique_ptr<WakeupFd>> CreateWakeupFd();
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_WAKEUP_FD_POSIX_DEFAULT_H

data/src/core/lib/event_engine/query_extensions.h

@@ -19,8 +19,7 @@
 
 #include "absl/strings/string_view.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 namespace endpoint_detail {
 
@@ -80,7 +79,6 @@ T* QueryExtension(EventEngine* engine) {
   return static_cast<T*>(engine->QueryExtension(T::EndpointExtensionName()));
 }
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_QUERY_EXTENSIONS_H

data/src/core/lib/event_engine/ref_counted_dns_resolver_interface.h

@@ -22,8 +22,7 @@
 #include "absl/strings/string_view.h"
 #include "src/core/util/orphanable.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 class RefCountedDNSResolverInterface
     : public grpc_core::InternallyRefCounted<RefCountedDNSResolverInterface> {
@@ -46,7 +45,6 @@ class RefCountedDNSResolverInterface
       absl::string_view name) = 0;
 };
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_REF_COUNTED_DNS_RESOLVER_INTERFACE_H

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

@@ -23,8 +23,7 @@
 
 // IWYU pragma: no_include <sys/socket.h>
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 EventEngine::ResolvedAddress::ResolvedAddress(const sockaddr* address,
                                               socklen_t size)
@@ -58,5 +57,4 @@ grpc_resolved_address CreateGRPCResolvedAddress(
   return grpc_addr;
 }
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental

data/src/core/lib/event_engine/resolved_address_internal.h

@@ -18,8 +18,7 @@
 
 #include "src/core/lib/iomgr/resolved_address.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 EventEngine::ResolvedAddress CreateResolvedAddress(
     const grpc_resolved_address& addr);
@@ -27,7 +26,6 @@ EventEngine::ResolvedAddress CreateResolvedAddress(
 grpc_resolved_address CreateGRPCResolvedAddress(
     const EventEngine::ResolvedAddress& ra);
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_RESOLVED_ADDRESS_INTERNAL_H

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

@@ -19,34 +19,25 @@
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/iomgr/port.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 bool UseEventEngineClient() {
-// TODO(hork, eryu): Adjust the ifdefs accordingly when event engines become
-// available for other platforms.
-#if defined(GRPC_POSIX_SOCKET_TCP) && !defined(GRPC_CFSTREAM) && \
-    !defined(GRPC_DO_NOT_INSTANTIATE_POSIX_POLLER)
-  return grpc_core::IsEventEngineClientEnabled();
-#elif defined(GPR_WINDOWS) && !defined(GRPC_DO_NOT_INSTANTIATE_POSIX_POLLER)
-  return grpc_core::IsEventEngineClientEnabled();
-#elif GRPC_IOS_EVENT_ENGINE_CLIENT
-  return true;
-#else
+#if defined(GRPC_DO_NOT_INSTANTIATE_POSIX_POLLER)
   return false;
 #endif
+  return grpc_core::IsEventEngineClientEnabled();
 }
 
 bool UseEventEngineListener() {
-// TODO(hork, eryu): Adjust the ifdefs accordingly when event engines become
-// available for other platforms.
-#if defined(GRPC_POSIX_SOCKET_TCP) && !defined(GRPC_CFSTREAM) && \
-    !defined(GRPC_DO_NOT_INSTANTIATE_POSIX_POLLER)
-  return grpc_core::IsEventEngineListenerEnabled();
-#else
+#if defined(GRPC_DO_NOT_INSTANTIATE_POSIX_POLLER)
   return false;
 #endif
+  return grpc_core::IsEventEngineListenerEnabled();
+}
+
+bool UsePollsetAlternative() {
+  return UseEventEngineClient() && UseEventEngineListener() &&
+         grpc_core::IsPollsetAlternativeEnabled();
 }
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental

data/src/core/lib/event_engine/shim.h

@@ -18,14 +18,23 @@
 
 #include <grpc/support/port_platform.h>
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
+// Returns true if the EventEngine client shim should be used.
+// This is based on the experiment state, and compile-time configurations that
+// may disable the poller in some builds.
 bool UseEventEngineClient();
 
+// Returns true if the EventEngine listener shim should be used.
+// This is based on the experiment state, and compile-time configurations that
+// may disable the poller in some builds.
 bool UseEventEngineListener();
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+// Returns true if the pollset alternative experiment should be used.
+// This is based on the experiment state, and compile-time configurations that
+// may disable the poller in some builds.
+bool UsePollsetAlternative();
+
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_SHIM_H

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

@@ -26,8 +26,7 @@
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/slice/slice_refcount.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 namespace slice_detail {
 
@@ -97,5 +96,4 @@ Slice Slice::FromRefcountAndBytes(grpc_slice_refcount* r, const uint8_t* begin,
   return Slice(out);
 }
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental

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

@@ -20,8 +20,7 @@
 
 #include "src/core/lib/slice/slice.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 void SliceBuffer::Append(Slice slice) {
   grpc_slice_buffer_add(&slice_buffer_, slice.TakeCSlice());
@@ -43,5 +42,4 @@ Slice SliceBuffer::RefSlice(size_t index) {
   return Slice(grpc_core::CSliceRef(slice_buffer_.slices[index]));
 }
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental

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

@@ -63,8 +63,7 @@
 #include "src/core/util/status_helper.h"
 #include "src/core/util/uri.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 namespace {
 constexpr uint8_t kV4MappedPrefix[] = {0, 0, 0, 0, 0,    0,
@@ -307,7 +306,7 @@ void ResolvedAddressSetPort(EventEngine::ResolvedAddress& resolved_addr,
   }
 }
 
-absl::optional<int> MaybeGetWildcardPortFromAddress(
+std::optional<int> MaybeGetWildcardPortFromAddress(
     const EventEngine::ResolvedAddress& addr) {
   const EventEngine::ResolvedAddress* resolved_addr = &addr;
   EventEngine::ResolvedAddress addr4_normalized;
@@ -319,7 +318,7 @@ absl::optional<int> MaybeGetWildcardPortFromAddress(
     const sockaddr_in* addr4 =
         reinterpret_cast<const sockaddr_in*>(resolved_addr->address());
     if (addr4->sin_addr.s_addr != 0) {
-      return absl::nullopt;
+      return std::nullopt;
     }
     return static_cast<int>(ntohs(addr4->sin_port));
   } else if (resolved_addr->address()->sa_family == AF_INET6) {
@@ -329,12 +328,12 @@ absl::optional<int> MaybeGetWildcardPortFromAddress(
     int i;
     for (i = 0; i < 16; i++) {
       if (addr6->sin6_addr.s6_addr[i] != 0) {
-        return absl::nullopt;
+        return std::nullopt;
       }
     }
     return static_cast<int>(ntohs(addr6->sin6_port));
   } else {
-    return absl::nullopt;
+    return std::nullopt;
   }
 }
 
@@ -446,5 +445,4 @@ absl::StatusOr<EventEngine::ResolvedAddress> URIToResolvedAddress(
       reinterpret_cast<const sockaddr*>(addr.addr), addr.len);
 }
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental

data/src/core/lib/event_engine/tcp_socket_utils.h

@@ -17,13 +17,12 @@
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include <optional>
 #include <string>
 
 #include "absl/status/statusor.h"
-#include "absl/types/optional.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 // Returns true if resolved_addr is an IPv4-mapped IPv6 address within the
 //  ::ffff:0.0.0.0/96 range, or false otherwise.
@@ -56,8 +55,8 @@ void ResolvedAddressSetPort(EventEngine::ResolvedAddress& resolved_addr,
                             int port);
 
 // Returns the port number associated with the address if the given address is
-// a wildcard ipv4 or ipv6 address. Otherwise returns absl::nullopt
-absl::optional<int> MaybeGetWildcardPortFromAddress(
+// a wildcard ipv4 or ipv6 address. Otherwise returns std::nullopt
+std::optional<int> MaybeGetWildcardPortFromAddress(
     const EventEngine::ResolvedAddress& addr);
 
 // Returns true if resolved_addr is an VSOCK address. Otherwise returns false.
@@ -86,7 +85,6 @@ absl::StatusOr<std::string> ResolvedAddressToURI(
 absl::StatusOr<EventEngine::ResolvedAddress> URIToResolvedAddress(
     std::string address_str);
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_TCP_SOCKET_UTILS_H

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

@@ -15,8 +15,7 @@
 
 #include <grpc/support/port_platform.h>
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 namespace {
 thread_local bool g_thread_local{false};
@@ -25,5 +24,4 @@ thread_local bool g_thread_local{false};
 void ThreadLocal::SetIsEventEngineThread(bool is) { g_thread_local = is; }
 bool ThreadLocal::IsEventEngineThread() { return g_thread_local; }
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental

data/src/core/lib/event_engine/thread_local.h

@@ -15,8 +15,7 @@
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREAD_LOCAL_H
 #include <grpc/support/port_platform.h>
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 /// A lightweight facility to allow gpr's fork handlers and
 /// EventEngine::Forkables to coordinate.
@@ -26,7 +25,6 @@ class ThreadLocal {
   static bool IsEventEngineThread();
 };
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREAD_LOCAL_H

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

@@ -25,8 +25,7 @@
 #include "absl/time/time.h"
 #include "src/core/util/time.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 // -------- LivingThreadCount --------
 
@@ -72,5 +71,4 @@ size_t LivingThreadCount::WaitForCountChange(size_t desired_threads,
   return count;
 }
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental

data/src/core/lib/event_engine/thread_pool/thread_count.h

@@ -29,8 +29,7 @@
 #include "src/core/util/time.h"
 #include "src/core/util/useful.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 // Tracks counts across some fixed number of shards.
 // It is intended for fast increment/decrement operations, but a slower overall
@@ -87,23 +86,11 @@ class BusyThreadCount {
   size_t NextIndex() { return next_idx_.fetch_add(1) % shards_.size(); }
 
  private:
-// We want to ensure that this data structure lands on different cachelines per
-// cpu. With C++17 we can do so explicitly with an `alignas` specifier. Prior
-// versions we can at best approximate it by padding the structure. It'll
-// probably work out ok, but it's not guaranteed across allocators.
-// TODO(ctiller): When we move to C++17 delete the duplicate definition.
-#if __cplusplus >= 201703L
+  // We want to ensure that this data structure lands on different cachelines
+  // per cpu.
   struct ShardedData {
     std::atomic<size_t> busy_count{0};
   } GPR_ALIGN_STRUCT(GPR_CACHELINE_SIZE);
-#else
-  struct ShardedDataHeader {
-    std::atomic<size_t> busy_count{0};
-  };
-  struct ShardedData : public ShardedDataHeader {
-    uint8_t padding[GPR_CACHELINE_SIZE - sizeof(ShardedDataHeader)];
-  };
-#endif
 
   std::vector<ShardedData> shards_;
   std::atomic<size_t> next_idx_{0};
@@ -173,7 +160,6 @@ class LivingThreadCount {
   size_t living_count_ ABSL_GUARDED_BY(mu_) = 0;
 };
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREAD_POOL_THREAD_COUNT_H

data/src/core/lib/event_engine/thread_pool/thread_pool.h

@@ -22,8 +22,7 @@
 #include "absl/functional/any_invocable.h"
 #include "src/core/lib/event_engine/forkable.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 // Interface for all EventEngine ThreadPool implementations
 class ThreadPool : public Forkable {
@@ -41,7 +40,6 @@ class ThreadPool : public Forkable {
 // Creates a default thread pool.
 std::shared_ptr<ThreadPool> MakeThreadPool(size_t reserve_threads);
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREAD_POOL_THREAD_POOL_H

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

@@ -21,8 +21,7 @@
 #include "src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h"
 #include "src/core/util/no_destruct.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 namespace {
 grpc_core::NoDestruct<ObjectGroupForkHandler> g_thread_pool_fork_manager;
@@ -44,5 +43,4 @@ std::shared_ptr<ThreadPool> MakeThreadPool(size_t reserve_threads) {
   return thread_pool;
 }
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental