grpc 1.70.1 → 1.72.0

data/src/core/lib/event_engine/extensions/supports_fd.h

@@ -22,8 +22,7 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 class EndpointSupportsFdExtension {
  public:
@@ -177,7 +176,6 @@ class EventEngineSupportsFdExtension {
       std::unique_ptr<MemoryAllocatorFactory> memory_allocator_factory) = 0;
 };
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_SUPPORTS_FD_H

data/src/core/lib/event_engine/extensions/supports_win_sockets.h

@@ -0,0 +1,48 @@
+// Copyright 2025 The 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_EVENT_ENGINE_EXTENSIONS_SUPPORTS_WIN_SOCKETS_H
+#define GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_SUPPORTS_WIN_SOCKETS_H
+
+#include <grpc/support/port_platform.h>
+
+#ifdef GRPC_WINSOCK_SOCKET
+#include <grpc/event_engine/event_engine.h>
+
+#include "absl/functional/any_invocable.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/string_view.h"
+
+namespace grpc_event_engine::experimental {
+
+class EventEngineWindowsSocketSupport {
+ public:
+  virtual ~EventEngineWindowsSocketSupport() = default;
+  static absl::string_view EndpointExtensionName() {
+    return "io.grpc.event_engine.extension.event_engine_supports_win_sockets";
+  }
+  /// Creates an EventEngine::Endpoint from a windows SOCKET which is already
+  /// assumed to be connected to a remote peer.
+  /// Parameters:
+  /// \a fd - The connected socket.
+  /// \a config - Additional configuration to applied to the endpoint.
+  virtual std::unique_ptr<EventEngine::Endpoint> CreateEndpointFromWinSocket(
+      SOCKET socket, const EndpointConfig& config) = 0;
+};
+
+}  // namespace grpc_event_engine::experimental
+
+#endif  // GRPC_WINSOCK_SOCKET
+
+#endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_SUPPORTS_WIN_SOCKETS_H

data/src/core/lib/event_engine/extensions/tcp_trace.h

@@ -20,8 +20,7 @@
 #include "absl/strings/string_view.h"
 #include "src/core/telemetry/tcp_tracer.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 /** If non-zero, enable TCP tracing and stats collection. */
 #define GRPC_ARG_TCP_TRACING_ENABLED "grpc.tcp_tracing_enabled"
@@ -32,11 +31,10 @@ class TcpTraceExtension {
   static absl::string_view EndpointExtensionName() {
     return "io.grpc.event_engine.extension.tcp_trace";
   }
-  virtual std::shared_ptr<grpc_core::TcpTracerInterface>
+  virtual std::shared_ptr<grpc_core::TcpConnectionTracer>
   InitializeAndReturnTcpTracer() = 0;
 };
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_TCP_TRACE_H

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

@@ -29,8 +29,7 @@
 #include "src/core/config/config_vars.h"
 #include "src/core/lib/debug/trace.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 namespace {
 bool IsForkEnabled() {
@@ -103,5 +102,4 @@ void ObjectGroupForkHandler::PostforkChild() {
   }
 }
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental

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

@@ -21,8 +21,7 @@
 
 #include "src/core/lib/debug/trace.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 // An interface to be implemented by EventEngines that wish to have managed fork
 // support. The child class must guarantee that those methods are thread-safe.
@@ -63,7 +62,6 @@ class ObjectGroupForkHandler {
   std::vector<std::weak_ptr<Forkable> > forkables_;
 };
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_FORKABLE_H

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

@@ -28,8 +28,7 @@
 #include "absl/status/status.h"
 #include "src/core/util/sync.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 // A wrapped fd that integrates with the EventEngine poller of the current
 // platform. A GrpcPolledFd knows how to create grpc platform-specific poller
@@ -83,8 +82,7 @@ class GrpcPolledFdFactory {
   virtual void ConfigureAresChannelLocked(ares_channel channel) = 0;
 };
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_ARES == 1
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_GRPC_POLLED_FD_H

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

@@ -24,8 +24,7 @@
 #include "absl/container/flat_hash_set.h"
 #include "absl/hash/hash.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 // Used for heterogeneous lookup of TaskHandles in abseil containers.
 template <typename TaskHandle>
@@ -47,7 +46,6 @@ using ConnectionHandleSet = absl::flat_hash_set<
     EventEngine::ConnectionHandle,
     TaskHandleComparator<EventEngine::ConnectionHandle>::Hash>;
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_HANDLE_CONTAINERS_H

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

@@ -22,8 +22,7 @@
 #include "absl/strings/string_view.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 class MemoryQuotaBasedMemoryAllocatorFactory : public MemoryAllocatorFactory {
  public:
@@ -39,7 +38,6 @@ class MemoryQuotaBasedMemoryAllocatorFactory : public MemoryAllocatorFactory {
   grpc_core::MemoryQuotaRefPtr memory_quota_;
 };
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_MEMORY_ALLOCATOR_FACTORY_H

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

@@ -19,8 +19,7 @@
 
 #include "absl/functional/function_ref.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 // A generic cross-platform "poller" concept.
 // Concrete implementations will likely manage a set of sockets/file
@@ -55,7 +54,6 @@ class Poller {
   virtual void Kick() = 0;
 };
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_POLLER_H

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

@@ -25,8 +25,7 @@
 #include "src/core/lib/event_engine/extensions/supports_fd.h"
 #include "src/core/lib/event_engine/query_extensions.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 /// This defines an interface that posix specific EventEngines endpoints
 /// may implement to support additional chaotic good related functionality.
@@ -52,7 +51,6 @@ class PosixListenerWithFdSupport
 class PosixEventEngineWithFdSupport
     : public ExtendedType<EventEngine, EventEngineSupportsFdExtension> {};
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_H

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

@@ -53,8 +53,7 @@
 
 #define MAX_EPOLL_EVENTS_HANDLED_PER_ITERATION 1
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 class Epoll1EventHandle : public EventHandle {
  public:
@@ -179,41 +178,8 @@ int EpollCreateAndCloexec() {
 // Only used when GRPC_ENABLE_FORK_SUPPORT=1
 std::list<Epoll1Poller*> fork_poller_list;
 
-// Only used when GRPC_ENABLE_FORK_SUPPORT=1
-Epoll1EventHandle* fork_fd_list_head = nullptr;
 gpr_mu fork_fd_list_mu;
 
-void ForkFdListAddHandle(Epoll1EventHandle* handle) {
-  if (grpc_core::Fork::Enabled()) {
-    gpr_mu_lock(&fork_fd_list_mu);
-    handle->ForkFdListPos().next = fork_fd_list_head;
-    handle->ForkFdListPos().prev = nullptr;
-    if (fork_fd_list_head != nullptr) {
-      fork_fd_list_head->ForkFdListPos().prev = handle;
-    }
-    fork_fd_list_head = handle;
-    gpr_mu_unlock(&fork_fd_list_mu);
-  }
-}
-
-void ForkFdListRemoveHandle(Epoll1EventHandle* handle) {
-  if (grpc_core::Fork::Enabled()) {
-    gpr_mu_lock(&fork_fd_list_mu);
-    if (fork_fd_list_head == handle) {
-      fork_fd_list_head = handle->ForkFdListPos().next;
-    }
-    if (handle->ForkFdListPos().prev != nullptr) {
-      handle->ForkFdListPos().prev->ForkFdListPos().next =
-          handle->ForkFdListPos().next;
-    }
-    if (handle->ForkFdListPos().next != nullptr) {
-      handle->ForkFdListPos().next->ForkFdListPos().prev =
-          handle->ForkFdListPos().prev;
-    }
-    gpr_mu_unlock(&fork_fd_list_mu);
-  }
-}
-
 void ForkPollerListAddPoller(Epoll1Poller* poller) {
   if (grpc_core::Fork::Enabled()) {
     gpr_mu_lock(&fork_fd_list_mu);
@@ -237,14 +203,7 @@ bool InitEpoll1PollerLinux();
 // the child process without interfering with connections or RPCs ongoing in the
 // parent.
 void ResetEventManagerOnFork() {
-  // Delete all pending Epoll1EventHandles.
   gpr_mu_lock(&fork_fd_list_mu);
-  while (fork_fd_list_head != nullptr) {
-    close(fork_fd_list_head->WrappedFd());
-    Epoll1EventHandle* next = fork_fd_list_head->ForkFdListPos().next;
-    delete fork_fd_list_head;
-    fork_fd_list_head = next;
-  }
   // Delete all registered pollers. This also closes all open epoll_sets
   while (!fork_poller_list.empty()) {
     Epoll1Poller* poller = fork_poller_list.front();
@@ -305,7 +264,6 @@ void Epoll1EventHandle::OrphanHandle(PosixEngineClosure* on_done,
     close(fd_);
   }
 
-  ForkFdListRemoveHandle(this);
   {
     // See Epoll1Poller::ShutdownHandle for explanation on why a mutex is
     // required here.
@@ -402,7 +360,6 @@ EventHandle* Epoll1Poller::CreateHandle(int fd, absl::string_view /*name*/,
       new_handle->ReInit(fd);
     }
   }
-  ForkFdListAddHandle(new_handle);
   struct epoll_event ev;
   ev.events = static_cast<uint32_t>(EPOLLIN | EPOLLOUT | EPOLLET);
   // Use the least significant bit of ev.data.ptr to store track_err. We expect
@@ -575,14 +532,12 @@ void Epoll1Poller::PostforkParent() {}
 // TODO(vigneshbabu): implement
 void Epoll1Poller::PostforkChild() {}
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #else  // defined(GRPC_LINUX_EPOLL)
 #if defined(GRPC_POSIX_SOCKET_EV_EPOLL1)
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 using ::grpc_event_engine::experimental::EventEngine;
 using ::grpc_event_engine::experimental::Poller;
@@ -629,8 +584,7 @@ void Epoll1Poller::PostforkParent() {}
 
 void Epoll1Poller::PostforkChild() {}
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // defined(GRPC_POSIX_SOCKET_EV_EPOLL1)
 #endif  // !defined(GRPC_LINUX_EPOLL)

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

@@ -38,8 +38,7 @@
 
 #define MAX_EPOLL_EVENTS 100
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 class Epoll1EventHandle;
 
@@ -130,7 +129,6 @@ class Epoll1Poller : public PosixEventPoller {
 // engine.
 std::shared_ptr<Epoll1Poller> MakeEpoll1Poller(Scheduler* scheduler);
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_EV_EPOLL1_LINUX_H

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

@@ -62,8 +62,7 @@ static const intptr_t kClosureReady = 1;
 static const int kPollinCheck = POLLIN | POLLHUP | POLLERR;
 static const int kPolloutCheck = POLLOUT | POLLHUP | POLLERR;
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 using Events = absl::InlinedVector<PollEventHandle*, 5>;
 
@@ -223,41 +222,8 @@ namespace {
 // Only used when GRPC_ENABLE_FORK_SUPPORT=1
 std::list<PollPoller*> fork_poller_list;
 
-// Only used when GRPC_ENABLE_FORK_SUPPORT=1
-PollEventHandle* fork_fd_list_head = nullptr;
 gpr_mu fork_fd_list_mu;
 
-void ForkFdListAddHandle(PollEventHandle* handle) {
-  if (grpc_core::Fork::Enabled()) {
-    gpr_mu_lock(&fork_fd_list_mu);
-    handle->ForkFdListPos().next = fork_fd_list_head;
-    handle->ForkFdListPos().prev = nullptr;
-    if (fork_fd_list_head != nullptr) {
-      fork_fd_list_head->ForkFdListPos().prev = handle;
-    }
-    fork_fd_list_head = handle;
-    gpr_mu_unlock(&fork_fd_list_mu);
-  }
-}
-
-void ForkFdListRemoveHandle(PollEventHandle* handle) {
-  if (grpc_core::Fork::Enabled()) {
-    gpr_mu_lock(&fork_fd_list_mu);
-    if (fork_fd_list_head == handle) {
-      fork_fd_list_head = handle->ForkFdListPos().next;
-    }
-    if (handle->ForkFdListPos().prev != nullptr) {
-      handle->ForkFdListPos().prev->ForkFdListPos().next =
-          handle->ForkFdListPos().next;
-    }
-    if (handle->ForkFdListPos().next != nullptr) {
-      handle->ForkFdListPos().next->ForkFdListPos().prev =
-          handle->ForkFdListPos().prev;
-    }
-    gpr_mu_unlock(&fork_fd_list_mu);
-  }
-}
-
 void ForkPollerListAddPoller(PollPoller* poller) {
   if (grpc_core::Fork::Enabled()) {
     gpr_mu_lock(&fork_fd_list_mu);
@@ -296,15 +262,7 @@ bool InitPollPollerPosix();
 // in the child process without interfering with connections or RPCs ongoing
 // in the parent.
 void ResetEventManagerOnFork() {
-  // Delete all pending Epoll1EventHandles.
   gpr_mu_lock(&fork_fd_list_mu);
-  while (fork_fd_list_head != nullptr) {
-    close(fork_fd_list_head->WrappedFd());
-    PollEventHandle* next = fork_fd_list_head->ForkFdListPos().next;
-    fork_fd_list_head->ForceRemoveHandleFromPoller();
-    delete fork_fd_list_head;
-    fork_fd_list_head = next;
-  }
   // Delete all registered pollers.
   while (!fork_poller_list.empty()) {
     PollPoller* poller = fork_poller_list.front();
@@ -338,7 +296,6 @@ EventHandle* PollPoller::CreateHandle(int fd, absl::string_view /*name*/,
   (void)track_err;
   DCHECK(track_err == false);
   PollEventHandle* handle = new PollEventHandle(fd, shared_from_this());
-  ForkFdListAddHandle(handle);
   // We need to send a kick to the thread executing Work(..) so that it can
   // add this new Fd into the list of Fds to poll.
   KickExternal(false);
@@ -347,7 +304,6 @@ EventHandle* PollPoller::CreateHandle(int fd, absl::string_view /*name*/,
 
 void PollEventHandle::OrphanHandle(PosixEngineClosure* on_done, int* release_fd,
                                    absl::string_view /*reason*/) {
-  ForkFdListRemoveHandle(this);
   ForceRemoveHandleFromPoller();
   {
     grpc_core::ReleasableMutexLock lock(&mu_);
@@ -844,15 +800,13 @@ std::shared_ptr<PollPoller> MakePollPoller(Scheduler* scheduler,
   return nullptr;
 }
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #else  // GRPC_POSIX_SOCKET_EV_POLL
 
 #include "src/core/util/crash.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 PollPoller::PollPoller(Scheduler* /* engine */) {
   grpc_core::Crash("unimplemented");
@@ -900,7 +854,6 @@ void PollPoller::PollerHandlesListRemoveHandle(PollEventHandle* /*handle*/) {
   grpc_core::Crash("unimplemented");
 }
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_POSIX_SOCKET_EV_POLL

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

@@ -29,8 +29,7 @@
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h"
 #include "src/core/util/sync.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 class PollEventHandle;
 
@@ -91,7 +90,6 @@ class PollPoller : public PosixEventPoller,
 std::shared_ptr<PollPoller> MakePollPoller(Scheduler* scheduler,
                                            bool use_phony_poll);
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_EV_POLL_POSIX_H

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

@@ -26,8 +26,7 @@
 #include "src/core/lib/event_engine/poller.h"
 #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 class Scheduler {
  public:
@@ -105,7 +104,6 @@ class PosixEventPoller : public grpc_event_engine::experimental::Poller,
   ~PosixEventPoller() override = default;
 };
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_EVENT_POLLER_H

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

@@ -27,8 +27,7 @@
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/no_destruct.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 #ifdef GRPC_POSIX_SOCKET_TCP
 namespace {
@@ -82,5 +81,4 @@ std::shared_ptr<PosixEventPoller> MakeDefaultPoller(Scheduler* /*scheduler*/) {
 
 #endif  // GRPC_POSIX_SOCKET_TCP
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental

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

@@ -19,8 +19,7 @@
 
 #include <memory>
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 class PosixEventPoller;
 class Scheduler;
@@ -29,7 +28,6 @@ class Scheduler;
 // scheduler.
 std::shared_ptr<PosixEventPoller> MakeDefaultPoller(Scheduler* scheduler);
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_EVENT_POLLER_POSIX_DEFAULT_H

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

@@ -45,8 +45,7 @@
 #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h"
 #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 class GrpcPolledFdPosix : public GrpcPolledFd {
  public:
@@ -195,8 +194,7 @@ class GrpcPolledFdFactoryPosix : public GrpcPolledFdFactory {
   std::unordered_set<ares_socket_t> owned_fds_;
 };
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER)
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_GRPC_POLLED_FD_POSIX_H

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

@@ -31,8 +31,7 @@
 
 #include "src/core/util/strerror.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 #ifdef GRPC_LINUX_ERRQUEUE
 int GetSocketTcpInfo(struct tcp_info* info, int fd) {
@@ -68,7 +67,6 @@ bool KernelSupportsErrqueue() {
   return errqueue_supported;
 }
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_POSIX_SOCKET_TCP

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

@@ -29,8 +29,7 @@
 #include <sys/socket.h>
 #endif  // GRPC_LINUX_ERRQUEUE
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 #ifdef GRPC_LINUX_ERRQUEUE
 
@@ -170,8 +169,7 @@ int GetSocketTcpInfo(tcp_info* info, int fd);
 // Currently allowing only linux kernels above 4.0.0
 bool KernelSupportsErrqueue();
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_POSIX_SOCKET_TCP
 

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

@@ -57,8 +57,7 @@
 //     For 2, 3 : See NotifyOn() function
 //     For 5,6,7: See SetShutdown() function
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 void LockfreeEvent::InitEvent() {
   // Perform an atomic store to start the state machine.
@@ -248,5 +247,4 @@ void LockfreeEvent::SetReady() {
   }
 }
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental

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

@@ -22,8 +22,7 @@
 #include "absl/status/status.h"
 #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 
 class Scheduler;
 
@@ -66,7 +65,6 @@ class LockfreeEvent {
   Scheduler* scheduler_;
 };
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_LOCKFREE_EVENT_H

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

@@ -36,8 +36,7 @@
 #include "src/core/util/host_port.h"
 #include "src/core/util/useful.h"
 
-namespace grpc_event_engine {
-namespace experimental {
+namespace grpc_event_engine::experimental {
 namespace {
 
 absl::StatusOr<std::vector<EventEngine::ResolvedAddress>>
@@ -125,7 +124,6 @@ void NativePosixDNSResolver::LookupTXT(
   });
 }
 
-}  // namespace experimental
-}  // namespace grpc_event_engine
+}  // namespace grpc_event_engine::experimental
 
 #endif  // GRPC_POSIX_SOCKET_RESOLVE_ADDRESS