grpc 1.75.0 → 1.78.0

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

@@ -25,13 +25,6 @@
 #include <utility>
 #include <vector>
 
-#include "absl/base/thread_annotations.h"
-#include "absl/container/flat_hash_map.h"
-#include "absl/container/inlined_vector.h"
-#include "absl/functional/any_invocable.h"
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/string_view.h"
 #include "src/core/lib/event_engine/ares_resolver.h"
 #include "src/core/lib/event_engine/handle_containers.h"
 #include "src/core/lib/event_engine/posix.h"
@@ -42,19 +35,19 @@
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/orphanable.h"
 #include "src/core/util/sync.h"
+#include "absl/base/thread_annotations.h"
+#include "absl/container/flat_hash_map.h"
+#include "absl/container/inlined_vector.h"
+#include "absl/functional/any_invocable.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/string_view.h"
 
 #ifdef GRPC_POSIX_SOCKET_TCP
 #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h"
 #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h"
 #endif  // GRPC_POSIX_SOCKET_TCP
 
-#if defined(GRPC_POSIX_SOCKET_TCP) && \
-    !defined(GRPC_DO_NOT_INSTANTIATE_POSIX_POLLER)
-#define GRPC_PLATFORM_SUPPORTS_POSIX_POLLING true
-#else
-#define GRPC_PLATFORM_SUPPORTS_POSIX_POLLING false
-#endif
-
 namespace grpc_event_engine::experimental {
 
 #ifdef GRPC_POSIX_SOCKET_TCP
@@ -127,10 +120,10 @@ class PosixEventEngine final : public PosixEventEngineWithFdSupport {
 
   ~PosixEventEngine() override;
 
-  std::unique_ptr<EventEngine::Endpoint> CreatePosixEndpointFromFd(
-      int fd, const EndpointConfig& config,
-      MemoryAllocator memory_allocator) override;
-  std::unique_ptr<EventEngine::Endpoint> CreateEndpointFromFd(
+  absl::StatusOr<std::unique_ptr<EventEngine::Endpoint>>
+  CreatePosixEndpointFromFd(int fd, const EndpointConfig& config,
+                            MemoryAllocator memory_allocator) override;
+  absl::StatusOr<std::unique_ptr<EventEngine::Endpoint>> CreateEndpointFromFd(
       int fd, const EndpointConfig& config) override;
 
   ConnectionHandle CreateEndpointFromUnconnectedFd(
@@ -194,19 +187,14 @@ class PosixEventEngine final : public PosixEventEngineWithFdSupport {
 
   PosixEventEngine();
 
-#if GRPC_PLATFORM_SUPPORTS_POSIX_POLLING
+#ifdef GRPC_POSIX_SOCKET_TCP
   // Constructs an EventEngine which has a shared ownership of the poller. Use
   // the MakeTestOnlyPosixEventEngine static method to call this. Its expected
   // to be used only in tests.
   explicit PosixEventEngine(
       std::shared_ptr<grpc_event_engine::experimental::PosixEventPoller>
           poller);
-#endif  // GRPC_PLATFORM_SUPPORTS_POSIX_POLLING
-
-  EventEngine::TaskHandle RunAfterInternal(Duration when,
-                                           absl::AnyInvocable<void()> cb);
 
-#ifdef GRPC_POSIX_SOCKET_TCP
   friend class AsyncConnect;
   struct ConnectionShard {
     grpc_core::Mutex mu;
@@ -214,40 +202,8 @@ class PosixEventEngine final : public PosixEventEngineWithFdSupport {
         ABSL_GUARDED_BY(&mu);
   };
 
-  ConnectionHandle CreateEndpointFromUnconnectedFdInternal(
-      const FileDescriptor& fd, EventEngine::OnConnectCallback on_connect,
-      const EventEngine::ResolvedAddress& addr, const PosixTcpOptions& options,
-      MemoryAllocator memory_allocator, EventEngine::Duration timeout);
-
   void OnConnectFinishInternal(int connection_handle);
 
-  std::vector<ConnectionShard> connection_shards_;
-  std::atomic<int64_t> last_connection_id_{1};
-
-#endif  // GRPC_POSIX_SOCKET_TCP
-
-#if GRPC_ENABLE_FORK_SUPPORT
-  void AfterForkInChild();
-#endif
-
-  grpc_core::Mutex mu_;
-  TaskHandleSet known_handles_ ABSL_GUARDED_BY(mu_);
-  std::atomic<intptr_t> aba_token_{0};
-#if GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER)
-
-  void RegisterAresResolverForFork(AresResolver* resolver);
-
-#if GRPC_ENABLE_FORK_SUPPORT
-  // A separate mutex to avoid deadlocks.
-  grpc_core::Mutex resolver_handles_mu_;
-  absl::InlinedVector<std::weak_ptr<AresResolver::ReinitHandle>, 16>
-      resolver_handles_ ABSL_GUARDED_BY(resolver_handles_mu_);
-#endif  // GRPC_ENABLE_FORK_SUPPORT
-#endif  // GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER)
-  std::shared_ptr<ThreadPool> executor_;
-
-#if GRPC_PLATFORM_SUPPORTS_POSIX_POLLING
-
   // RAII wrapper for a polling cycle. Starts a new one in ctor and stops
   // in dtor.
   class PollingCycle {
@@ -272,18 +228,41 @@ class PosixEventEngine final : public PosixEventEngineWithFdSupport {
   void SchedulePoller();
   void ResetPollCycle();
 
-  PosixEventPoller* GetPollerChecked() const {
-    CHECK_NE(poller_, nullptr);
-    return poller_.get();
-  }
+  ConnectionHandle CreateEndpointFromUnconnectedFdInternal(
+      const FileDescriptor& fd, EventEngine::OnConnectCallback on_connect,
+      const EventEngine::ResolvedAddress& addr, const PosixTcpOptions& options,
+      MemoryAllocator memory_allocator, EventEngine::Duration timeout);
 
+  std::vector<ConnectionShard> connection_shards_;
+  std::atomic<int64_t> last_connection_id_{1};
   std::shared_ptr<grpc_event_engine::experimental::PosixEventPoller> poller_;
 
   // Ensures there's ever only one of these.
   std::optional<PollingCycle> polling_cycle_ ABSL_GUARDED_BY(&mu_);
+#endif  // GRPC_POSIX_SOCKET_TCP
+
+  EventEngine::TaskHandle RunAfterInternal(Duration when,
+                                           absl::AnyInvocable<void()> cb);
+
+#if GRPC_ENABLE_FORK_SUPPORT
+  void AfterForkInChild();
+#endif
+
+  grpc_core::Mutex mu_;
+  TaskHandleSet known_handles_ ABSL_GUARDED_BY(mu_);
+  std::atomic<intptr_t> aba_token_{0};
+#if GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER)
 
-#endif  // GRPC_PLATFORM_SUPPORTS_POSIX_POLLING
+  void RegisterAresResolverForFork(AresResolver* resolver);
 
+#if GRPC_ENABLE_FORK_SUPPORT
+  // A separate mutex to avoid deadlocks.
+  grpc_core::Mutex resolver_handles_mu_;
+  absl::InlinedVector<std::weak_ptr<AresResolver::ReinitHandle>, 16>
+      resolver_handles_ ABSL_GUARDED_BY(resolver_handles_mu_);
+#endif  // GRPC_ENABLE_FORK_SUPPORT
+#endif  // GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER)
+  std::shared_ptr<ThreadPool> executor_;
   std::shared_ptr<TimerManager> timer_manager_;
 };
 

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

@@ -32,11 +32,6 @@
 #include <tuple>
 #include <utility>
 
-#include "absl/functional/any_invocable.h"
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/status/status.h"
-#include "absl/strings/str_cat.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/posix_engine/event_poller.h"
 #include "src/core/lib/event_engine/posix_engine/posix_endpoint.h"
@@ -44,10 +39,16 @@
 #include "src/core/lib/event_engine/posix_engine/posix_interface.h"
 #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
+#include "src/core/lib/iomgr/socket_mutator.h"
 #include "src/core/net/socket_mutator.h"
+#include "src/core/util/grpc_check.h"
 #include "src/core/util/status_helper.h"
 #include "src/core/util/strerror.h"
 #include "src/core/util/time.h"
+#include "absl/functional/any_invocable.h"
+#include "absl/log/log.h"
+#include "absl/status/status.h"
+#include "absl/strings/str_cat.h"
 
 namespace grpc_event_engine::experimental {
 
@@ -77,7 +78,7 @@ absl::StatusOr<int> PosixEngineListenerImpl::Bind(
   EventEngine::ResolvedAddress res_addr = addr;
   EventEngine::ResolvedAddress addr6_v4mapped;
   int requested_port = ResolvedAddressGetPort(res_addr);
-  CHECK(addr.size() <= EventEngine::ResolvedAddress::MAX_SIZE_BYTES);
+  GRPC_CHECK(addr.size() <= EventEngine::ResolvedAddress::MAX_SIZE_BYTES);
   UnlinkIfUnixDomainSocket(addr);
 
   EventEnginePosixInterface& posix_interface = poller_->posix_interface();
@@ -272,6 +273,9 @@ absl::Status PosixEngineListenerImpl::HandleExternalConnection(
   (void)posix_interface.SetSocketNoSigpipeIfPossible(wrapped);
   auto peer_name = posix_interface.PeerAddressString(wrapped);
   if (!peer_name.ok()) {
+    if (grpc_core::IsGracefulExternalConnectionFailureEnabled()) {
+      posix_interface.Close(wrapped);
+    }
     return absl::UnknownError(
         absl::StrCat("HandleExternalConnection: peer not connected: ",
                      peer_name.status().ToString()));
@@ -307,7 +311,7 @@ void PosixEngineListenerImpl::AsyncConnectionAcceptor::Shutdown() {
 absl::Status PosixEngineListenerImpl::Start() {
   grpc_core::MutexLock lock(&this->mu_);
   // Start each asynchronous acceptor.
-  CHECK(!this->started_);
+  GRPC_CHECK(!this->started_);
   this->started_ = true;
   for (auto it = acceptors_.begin(); it != acceptors_.end(); it++) {
     (*it)->Start();

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

@@ -26,14 +26,14 @@
 #include <memory>
 #include <utility>
 
-#include "absl/base/thread_annotations.h"
-#include "absl/functional/any_invocable.h"
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
 #include "src/core/lib/event_engine/posix.h"
 #include "src/core/lib/event_engine/posix_engine/posix_interface.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/sync.h"
+#include "absl/base/thread_annotations.h"
+#include "absl/functional/any_invocable.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
 
 #ifdef GRPC_POSIX_SOCKET_TCP
 #include "src/core/lib/event_engine/posix_engine/event_poller.h"

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

@@ -23,17 +23,17 @@
 #include <cstring>
 #include <string>
 
-#include "absl/cleanup/cleanup.h"
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/status/status.h"
-#include "absl/strings/str_cat.h"
 #include "src/core/lib/event_engine/posix_engine/posix_interface.h"
 #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/crash.h"  // IWYU pragma: keep
+#include "src/core/util/grpc_check.h"
 #include "src/core/util/status_helper.h"
+#include "absl/cleanup/cleanup.h"
+#include "absl/log/log.h"
+#include "absl/status/status.h"
+#include "absl/strings/str_cat.h"
 
 #ifdef GRPC_POSIX_SOCKET_UTILS_COMMON
 #include <errno.h>       // IWYU pragma: keep
@@ -68,7 +68,7 @@ absl::Status PrepareSocket(EventEnginePosixInterface* posix_interface,
                            const PosixTcpOptions& options,
                            ListenerSocket& socket) {
   FileDescriptor fd = socket.sock;
-  CHECK(fd.ready());
+  GRPC_CHECK(fd.ready());
   bool close_fd = true;
   socket.port = 0;
   auto sock_cleanup =
@@ -110,7 +110,7 @@ absl::StatusOr<ListenerSocket> CreateAndPrepareListenerSocket(
     socket.addr = addr;
   }
   GRPC_RETURN_IF_ERROR(PrepareSocket(posix_interface, options, socket));
-  CHECK_GT(socket.port, 0);
+  GRPC_CHECK_GT(socket.port, 0);
   return socket;
 }
 
@@ -269,8 +269,8 @@ absl::StatusOr<int> ListenerContainerAddWildcardAddresses(
     }
     return assigned_port;
   } else {
-    CHECK(!v6_sock.ok());
-    CHECK(!v4_sock.ok());
+    GRPC_CHECK(!v6_sock.ok());
+    GRPC_CHECK(!v4_sock.ok());
     return absl::FailedPreconditionError(absl::StrCat(
         "Failed to add any wildcard listeners: ", v6_sock.status().message(),
         v4_sock.status().message()));

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

@@ -17,9 +17,9 @@
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
-#include "absl/status/statusor.h"
 #include "src/core/lib/event_engine/posix_engine/posix_interface.h"
 #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h"
+#include "absl/status/statusor.h"
 
 namespace grpc_event_engine::experimental {
 

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

@@ -23,10 +23,10 @@
 #include <string>
 #include <utility>
 
-#include "absl/log/check.h"
-#include "absl/status/status.h"
 #include "src/core/lib/event_engine/posix_engine/file_descriptor_collection.h"
 #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h"
+#include "src/core/util/grpc_check.h"
+#include "absl/status/status.h"
 
 namespace grpc_event_engine::experimental {
 

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

@@ -32,17 +32,17 @@
 #include <cstdint>
 #include <utility>
 
+#include "src/core/lib/event_engine/posix_engine/file_descriptor_collection.h"
+#include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h"
+#include "src/core/lib/event_engine/tcp_socket_utils.h"
+#include "src/core/util/crash.h"  // IWYU pragma: keep
+#include "src/core/util/status_helper.h"
 #include "absl/cleanup/cleanup.h"
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_replace.h"
 #include "absl/strings/string_view.h"
-#include "src/core/lib/event_engine/posix_engine/file_descriptor_collection.h"
-#include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h"
-#include "src/core/lib/event_engine/tcp_socket_utils.h"
-#include "src/core/util/crash.h"  // IWYU pragma: keep
-#include "src/core/util/status_helper.h"
 
 #ifdef GRPC_POSIX_SOCKET_UTILS_COMMON
 #include <arpa/inet.h>  // IWYU pragma: keep

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

@@ -17,9 +17,9 @@
 
 #include <grpc/event_engine/event_engine.h>
 
+#include "src/core/util/bitset.h"
 #include "absl/base/no_destructor.h"
 #include "absl/functional/any_invocable.h"
-#include "src/core/util/bitset.h"
 
 namespace grpc_event_engine::experimental {
 

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

@@ -41,7 +41,7 @@
 
 #include <cstring>
 
-#include "absl/log/check.h"
+#include "src/core/util/grpc_check.h"
 
 #ifdef GRPC_HAVE_UNIX_SOCKET
 #ifdef GPR_WINDOWS

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

@@ -46,7 +46,7 @@ namespace grpc_event_engine::experimental {
 struct PosixTcpOptions {
   static constexpr int kDefaultReadChunkSize = 8192;
   static constexpr int kDefaultMinReadChunksize = 256;
-  static constexpr int kDefaultMaxReadChunksize = 4 * 1024 * 1024;
+  static constexpr int kDefaultMaxReadChunksize = 64 * 1024;
   static constexpr int kZerocpTxEnabledDefault = 0;
   static constexpr int kMaxChunkSize = 32 * 1024 * 1024;
   static constexpr int kDefaultMaxSends = 4;

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

@@ -29,11 +29,11 @@
 #include <optional>
 #include <vector>
 
-#include "absl/base/thread_annotations.h"
 #include "src/core/lib/event_engine/posix_engine/timer_heap.h"
 #include "src/core/util/sync.h"
 #include "src/core/util/time.h"
 #include "src/core/util/time_averaged_stats.h"
+#include "absl/base/thread_annotations.h"
 
 namespace grpc_event_engine::experimental {
 

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

@@ -25,10 +25,10 @@
 #include <optional>
 #include <utility>
 
-#include "absl/log/check.h"
+#include "src/core/lib/debug/trace.h"
+#include "src/core/util/grpc_check.h"
 #include "absl/log/log.h"
 #include "absl/time/time.h"
-#include "src/core/lib/debug/trace.h"
 
 static thread_local bool g_timer_thread;
 
@@ -65,7 +65,7 @@ void TimerManager::MainLoop() {
   grpc_core::Timestamp next = grpc_core::Timestamp::InfFuture();
   std::optional<std::vector<experimental::EventEngine::Closure*>> check_result =
       timer_list_->TimerCheck(&next);
-  CHECK(check_result.has_value())
+  GRPC_CHECK(check_result.has_value())
       << "ERROR: More than one MainLoop is running.";
   bool timers_found = !check_result->empty();
   if (timers_found) {
@@ -126,7 +126,7 @@ void TimerManager::Kick() {
 
 void TimerManager::RestartPostFork() {
   grpc_core::MutexLock lock(&mu_);
-  CHECK(state_ != TimerManager::State::kRunning);
+  GRPC_CHECK(state_ != TimerManager::State::kRunning);
   GRPC_TRACE_VLOG(timer, 2)
       << "TimerManager::" << this << " restarting after suspend";
   if (state_ == TimerManager::State::kSuspended) {

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

@@ -27,12 +27,12 @@
 #include <optional>
 #include <vector>
 
-#include "absl/base/thread_annotations.h"
 #include "src/core/lib/event_engine/posix_engine/timer.h"
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
 #include "src/core/util/notification.h"
 #include "src/core/util/sync.h"
 #include "src/core/util/time.h"
+#include "absl/base/thread_annotations.h"
 
 namespace grpc_event_engine::experimental {
 

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

@@ -23,12 +23,12 @@
 
 #include <utility>
 
-#include "absl/functional/any_invocable.h"
-#include "absl/log/log.h"
 #include "src/core/lib/event_engine/posix_engine/posix_interface.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/sync.h"
+#include "absl/functional/any_invocable.h"
+#include "absl/log/log.h"
 
 #ifdef GRPC_LINUX_ERRQUEUE
 #include <linux/errqueue.h>  // IWYU pragma: keep

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

@@ -22,13 +22,13 @@
 
 #include <optional>
 
-#include "absl/functional/any_invocable.h"
-#include "absl/status/status.h"
 #include "src/core/lib/event_engine/posix_engine/internal_errqueue.h"
 #include "src/core/lib/event_engine/posix_engine/posix_interface.h"
 #include "src/core/lib/event_engine/posix_engine/posix_write_event_sink.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/sync.h"
+#include "absl/functional/any_invocable.h"
+#include "absl/status/status.h"
 
 namespace grpc_event_engine::experimental {
 

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

@@ -16,10 +16,10 @@
 
 #include <utility>
 
-#include "absl/strings/str_cat.h"
 #include "src/core/lib/event_engine/posix_engine/posix_interface.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/crash.h"  // IWYU pragma: keep
+#include "absl/strings/str_cat.h"
 
 #ifdef GRPC_LINUX_EVENTFD
 

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

@@ -18,10 +18,10 @@
 
 #include <memory>
 
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
 #include "src/core/lib/event_engine/posix_engine/posix_interface.h"
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
 
 namespace grpc_event_engine::experimental {
 

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

@@ -17,10 +17,10 @@
 #include <memory>
 #include <utility>
 
-#include "absl/strings/str_cat.h"
 #include "src/core/lib/event_engine/posix_engine/posix_interface.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/crash.h"  // IWYU pragma: keep
+#include "absl/strings/str_cat.h"
 
 #ifdef GRPC_POSIX_WAKEUP_FD
 #include <errno.h>

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

@@ -18,10 +18,10 @@
 
 #include <memory>
 
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
 #include "src/core/lib/event_engine/posix_engine/posix_interface.h"
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
 
 namespace grpc_event_engine::experimental {
 

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

@@ -44,8 +44,8 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "absl/status/status.h"
 #include "src/core/lib/event_engine/posix_engine/posix_interface.h"
+#include "absl/status/status.h"
 
 namespace grpc_event_engine::experimental {
 

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

@@ -15,13 +15,13 @@
 
 #include <memory>
 
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
 #include "src/core/lib/event_engine/posix_engine/posix_interface.h"
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.h"
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h"
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h"
 #include "src/core/lib/iomgr/port.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
 
 namespace grpc_event_engine::experimental {
 

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

@@ -18,8 +18,8 @@
 
 #include <memory>
 
-#include "absl/status/statusor.h"
 #include "src/core/lib/event_engine/posix_engine/posix_interface.h"
+#include "absl/status/statusor.h"
 
 namespace grpc_event_engine::experimental {
 

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

@@ -19,8 +19,8 @@
 #include <grpc/support/port_platform.h>
 #include <stdint.h>
 
-#include "absl/strings/string_view.h"
 #include "src/core/util/orphanable.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_event_engine::experimental {
 

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

@@ -18,8 +18,8 @@
 #include <grpc/support/port_platform.h>
 #include <string.h>
 
-#include "absl/log/check.h"
 #include "src/core/lib/event_engine/resolved_address_internal.h"
+#include "src/core/util/grpc_check.h"
 
 // IWYU pragma: no_include <sys/socket.h>
 
@@ -28,8 +28,8 @@ namespace grpc_event_engine::experimental {
 EventEngine::ResolvedAddress::ResolvedAddress(const sockaddr* address,
                                               socklen_t size)
     : size_(size) {
-  DCHECK_GE(size, 0u);
-  CHECK(static_cast<size_t>(size) <= sizeof(address_));
+  GRPC_DCHECK_GE(size, 0u);
+  GRPC_CHECK(static_cast<size_t>(size) <= sizeof(address_));
   memcpy(&address_, address, size);
 }
 

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

@@ -22,17 +22,13 @@
 namespace grpc_event_engine::experimental {
 
 bool UseEventEngineClient() {
-#if defined(GRPC_DO_NOT_INSTANTIATE_POSIX_POLLER)
-  return false;
-#endif
-  return grpc_core::IsEventEngineClientEnabled();
+  return !EventEngineExperimentDisabledForPython() &&
+         grpc_core::IsEventEngineClientEnabled();
 }
 
 bool UseEventEngineListener() {
-#if defined(GRPC_DO_NOT_INSTANTIATE_POSIX_POLLER)
-  return false;
-#endif
-  return grpc_core::IsEventEngineListenerEnabled();
+  return !EventEngineExperimentDisabledForPython() &&
+         grpc_core::IsEventEngineListenerEnabled();
 }
 
 bool UsePollsetAlternative() {
@@ -40,10 +36,11 @@ bool UsePollsetAlternative() {
          grpc_core::IsPollsetAlternativeEnabled();
 }
 
-// Returns true if GRPC_DO_NOT_INSTANTIATE_POSIX_POLLER is defined.
+// Returns true if the poller is disabled by build configuration or experiment
+// flags.
 bool EventEngineExperimentDisabledForPython() {
-#ifdef GRPC_DO_NOT_INSTANTIATE_POSIX_POLLER
-  return true;
+#ifdef GRPC_PYTHON_BUILD
+  return !grpc_core::IsEventEnginePollerForPythonEnabled();
 #else
   return false;
 #endif

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

@@ -35,7 +35,8 @@ bool UseEventEngineListener();
 // may disable the poller in some builds.
 bool UsePollsetAlternative();
 
-// Returns true if GRPC_DO_NOT_INSTANTIATE_POSIX_POLLER is defined.
+// Returns true if the poller is disabled by build configuration or experiment
+// flags.
 bool EventEngineExperimentDisabledForPython();
 
 }  // namespace grpc_event_engine::experimental