From 06c854c7ada6c18d507729b5d4212a886c775d3f Mon Sep 17 00:00:00 2001
From: cb-robot <8571829+cb-robot@users.noreply.github.com>
Date: Wed, 23 Apr 2025 23:13:40 +0000
Subject: [PATCH] Automated change: Fix sanity tests
---
CMakeLists.txt | 5 +++++
Makefile | 1 +
Package.swift | 2 ++
build_autogenerated.yaml | 10 ++++++++++
config.m4 | 1 +
config.w32 | 1 +
gRPC-C++.podspec | 2 ++
gRPC-Core.podspec | 3 +++
grpc.gemspec | 2 ++
package.xml | 2 ++
src/core/lib/event_engine/cf_engine/cf_engine.cc | 4 ++--
.../lib/event_engine/cf_engine/dispatch_thread_pool.h | 3 ++-
src/python/grpcio/grpc_core_dependencies.py | 1 +
tools/doxygen/Doxyfile.c++.internal | 2 ++
tools/doxygen/Doxyfile.core.internal | 2 ++
15 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a3804a85d809f..5ea2b3f64fc63 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2630,6 +2630,7 @@ add_library(grpc
src/core/lib/event_engine/ares_resolver.cc
src/core/lib/event_engine/cf_engine/cf_engine.cc
src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc
+ src/core/lib/event_engine/cf_engine/dispatch_thread_pool.cc
src/core/lib/event_engine/cf_engine/dns_service_resolver.cc
src/core/lib/event_engine/channel_args_endpoint_config.cc
src/core/lib/event_engine/default_event_engine.cc
@@ -3379,6 +3380,7 @@ add_library(grpc_unsecure
src/core/lib/event_engine/ares_resolver.cc
src/core/lib/event_engine/cf_engine/cf_engine.cc
src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc
+ src/core/lib/event_engine/cf_engine/dispatch_thread_pool.cc
src/core/lib/event_engine/cf_engine/dns_service_resolver.cc
src/core/lib/event_engine/channel_args_endpoint_config.cc
src/core/lib/event_engine/default_event_engine.cc
@@ -5567,6 +5569,7 @@ add_library(grpc_authorization_provider
src/core/lib/event_engine/ares_resolver.cc
src/core/lib/event_engine/cf_engine/cf_engine.cc
src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc
+ src/core/lib/event_engine/cf_engine/dispatch_thread_pool.cc
src/core/lib/event_engine/cf_engine/dns_service_resolver.cc
src/core/lib/event_engine/channel_args_endpoint_config.cc
src/core/lib/event_engine/default_event_engine.cc
@@ -9309,6 +9312,7 @@ add_executable(call_utils_test
src/core/lib/event_engine/ares_resolver.cc
src/core/lib/event_engine/cf_engine/cf_engine.cc
src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc
+ src/core/lib/event_engine/cf_engine/dispatch_thread_pool.cc
src/core/lib/event_engine/cf_engine/dns_service_resolver.cc
src/core/lib/event_engine/channel_args_endpoint_config.cc
src/core/lib/event_engine/default_event_engine.cc
@@ -15422,6 +15426,7 @@ add_executable(filter_fusion_test
src/core/lib/event_engine/ares_resolver.cc
src/core/lib/event_engine/cf_engine/cf_engine.cc
src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc
+ src/core/lib/event_engine/cf_engine/dispatch_thread_pool.cc
src/core/lib/event_engine/cf_engine/dns_service_resolver.cc
src/core/lib/event_engine/channel_args_endpoint_config.cc
src/core/lib/event_engine/default_event_engine.cc
diff --git a/Makefile b/Makefile
index 9b4973c2e4c59..777b239f5f5ce 100644
--- a/Makefile
+++ b/Makefile
@@ -1165,6 +1165,7 @@ LIBGRPC_SRC = \
src/core/lib/event_engine/ares_resolver.cc \
src/core/lib/event_engine/cf_engine/cf_engine.cc \
src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc \
+ src/core/lib/event_engine/cf_engine/dispatch_thread_pool.cc \
src/core/lib/event_engine/cf_engine/dns_service_resolver.cc \
src/core/lib/event_engine/channel_args_endpoint_config.cc \
src/core/lib/event_engine/default_event_engine.cc \
diff --git a/Package.swift b/Package.swift
index 81c70fc885d17..545dbb87fab66 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1290,6 +1290,8 @@ let package = Package(
"src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc",
"src/core/lib/event_engine/cf_engine/cfstream_endpoint.h",
"src/core/lib/event_engine/cf_engine/cftype_unique_ref.h",
+ "src/core/lib/event_engine/cf_engine/dispatch_thread_pool.cc",
+ "src/core/lib/event_engine/cf_engine/dispatch_thread_pool.h",
"src/core/lib/event_engine/cf_engine/dns_service_resolver.cc",
"src/core/lib/event_engine/cf_engine/dns_service_resolver.h",
"src/core/lib/event_engine/channel_args_endpoint_config.cc",
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index a136308345cae..3c5d1b1499f7c 100644
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@@ -856,6 +856,7 @@ libs:
- src/core/lib/event_engine/cf_engine/cf_engine.h
- src/core/lib/event_engine/cf_engine/cfstream_endpoint.h
- src/core/lib/event_engine/cf_engine/cftype_unique_ref.h
+ - src/core/lib/event_engine/cf_engine/dispatch_thread_pool.h
- src/core/lib/event_engine/cf_engine/dns_service_resolver.h
- src/core/lib/event_engine/channel_args_endpoint_config.h
- src/core/lib/event_engine/common_closures.h
@@ -1751,6 +1752,7 @@ libs:
- src/core/lib/event_engine/ares_resolver.cc
- src/core/lib/event_engine/cf_engine/cf_engine.cc
- src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc
+ - src/core/lib/event_engine/cf_engine/dispatch_thread_pool.cc
- src/core/lib/event_engine/cf_engine/dns_service_resolver.cc
- src/core/lib/event_engine/channel_args_endpoint_config.cc
- src/core/lib/event_engine/default_event_engine.cc
@@ -2397,6 +2399,7 @@ libs:
- src/core/lib/event_engine/cf_engine/cf_engine.h
- src/core/lib/event_engine/cf_engine/cfstream_endpoint.h
- src/core/lib/event_engine/cf_engine/cftype_unique_ref.h
+ - src/core/lib/event_engine/cf_engine/dispatch_thread_pool.h
- src/core/lib/event_engine/cf_engine/dns_service_resolver.h
- src/core/lib/event_engine/channel_args_endpoint_config.h
- src/core/lib/event_engine/common_closures.h
@@ -2867,6 +2870,7 @@ libs:
- src/core/lib/event_engine/ares_resolver.cc
- src/core/lib/event_engine/cf_engine/cf_engine.cc
- src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc
+ - src/core/lib/event_engine/cf_engine/dispatch_thread_pool.cc
- src/core/lib/event_engine/cf_engine/dns_service_resolver.cc
- src/core/lib/event_engine/channel_args_endpoint_config.cc
- src/core/lib/event_engine/default_event_engine.cc
@@ -4452,6 +4456,7 @@ libs:
- src/core/lib/event_engine/cf_engine/cf_engine.h
- src/core/lib/event_engine/cf_engine/cfstream_endpoint.h
- src/core/lib/event_engine/cf_engine/cftype_unique_ref.h
+ - src/core/lib/event_engine/cf_engine/dispatch_thread_pool.h
- src/core/lib/event_engine/cf_engine/dns_service_resolver.h
- src/core/lib/event_engine/channel_args_endpoint_config.h
- src/core/lib/event_engine/common_closures.h
@@ -4789,6 +4794,7 @@ libs:
- src/core/lib/event_engine/ares_resolver.cc
- src/core/lib/event_engine/cf_engine/cf_engine.cc
- src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc
+ - src/core/lib/event_engine/cf_engine/dispatch_thread_pool.cc
- src/core/lib/event_engine/cf_engine/dns_service_resolver.cc
- src/core/lib/event_engine/channel_args_endpoint_config.cc
- src/core/lib/event_engine/default_event_engine.cc
@@ -6467,6 +6473,7 @@ targets:
- src/core/lib/event_engine/cf_engine/cf_engine.h
- src/core/lib/event_engine/cf_engine/cfstream_endpoint.h
- src/core/lib/event_engine/cf_engine/cftype_unique_ref.h
+ - src/core/lib/event_engine/cf_engine/dispatch_thread_pool.h
- src/core/lib/event_engine/cf_engine/dns_service_resolver.h
- src/core/lib/event_engine/channel_args_endpoint_config.h
- src/core/lib/event_engine/common_closures.h
@@ -6768,6 +6775,7 @@ targets:
- src/core/lib/event_engine/ares_resolver.cc
- src/core/lib/event_engine/cf_engine/cf_engine.cc
- src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc
+ - src/core/lib/event_engine/cf_engine/dispatch_thread_pool.cc
- src/core/lib/event_engine/cf_engine/dns_service_resolver.cc
- src/core/lib/event_engine/channel_args_endpoint_config.cc
- src/core/lib/event_engine/default_event_engine.cc
@@ -10610,6 +10618,7 @@ targets:
- src/core/lib/event_engine/cf_engine/cf_engine.h
- src/core/lib/event_engine/cf_engine/cfstream_endpoint.h
- src/core/lib/event_engine/cf_engine/cftype_unique_ref.h
+ - src/core/lib/event_engine/cf_engine/dispatch_thread_pool.h
- src/core/lib/event_engine/cf_engine/dns_service_resolver.h
- src/core/lib/event_engine/channel_args_endpoint_config.h
- src/core/lib/event_engine/common_closures.h
@@ -10911,6 +10920,7 @@ targets:
- src/core/lib/event_engine/ares_resolver.cc
- src/core/lib/event_engine/cf_engine/cf_engine.cc
- src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc
+ - src/core/lib/event_engine/cf_engine/dispatch_thread_pool.cc
- src/core/lib/event_engine/cf_engine/dns_service_resolver.cc
- src/core/lib/event_engine/channel_args_endpoint_config.cc
- src/core/lib/event_engine/default_event_engine.cc
diff --git a/config.m4 b/config.m4
index 2f3254742e2a0..bee7bad62a29f 100644
--- a/config.m4
+++ b/config.m4
@@ -539,6 +539,7 @@ if test "$PHP_GRPC" != "no"; then
src/core/lib/event_engine/ares_resolver.cc \
src/core/lib/event_engine/cf_engine/cf_engine.cc \
src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc \
+ src/core/lib/event_engine/cf_engine/dispatch_thread_pool.cc \
src/core/lib/event_engine/cf_engine/dns_service_resolver.cc \
src/core/lib/event_engine/channel_args_endpoint_config.cc \
src/core/lib/event_engine/default_event_engine.cc \
diff --git a/config.w32 b/config.w32
index b9513c3178437..e44a3fbbe2a70 100644
--- a/config.w32
+++ b/config.w32
@@ -505,6 +505,7 @@ if (PHP_GRPC != "no") {
"src\\core\\lib\\event_engine\\ares_resolver.cc " +
"src\\core\\lib\\event_engine\\cf_engine\\cf_engine.cc " +
"src\\core\\lib\\event_engine\\cf_engine\\cfstream_endpoint.cc " +
+ "src\\core\\lib\\event_engine\\cf_engine\\dispatch_thread_pool.cc " +
"src\\core\\lib\\event_engine\\cf_engine\\dns_service_resolver.cc " +
"src\\core\\lib\\event_engine\\channel_args_endpoint_config.cc " +
"src\\core\\lib\\event_engine\\default_event_engine.cc " +
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
index b2f15472c9e57..e5a89b1c9e50a 100644
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@@ -944,6 +944,7 @@ Pod::Spec.new do |s|
'src/core/lib/event_engine/cf_engine/cf_engine.h',
'src/core/lib/event_engine/cf_engine/cfstream_endpoint.h',
'src/core/lib/event_engine/cf_engine/cftype_unique_ref.h',
+ 'src/core/lib/event_engine/cf_engine/dispatch_thread_pool.h',
'src/core/lib/event_engine/cf_engine/dns_service_resolver.h',
'src/core/lib/event_engine/channel_args_endpoint_config.h',
'src/core/lib/event_engine/common_closures.h',
@@ -2251,6 +2252,7 @@ Pod::Spec.new do |s|
'src/core/lib/event_engine/cf_engine/cf_engine.h',
'src/core/lib/event_engine/cf_engine/cfstream_endpoint.h',
'src/core/lib/event_engine/cf_engine/cftype_unique_ref.h',
+ 'src/core/lib/event_engine/cf_engine/dispatch_thread_pool.h',
'src/core/lib/event_engine/cf_engine/dns_service_resolver.h',
'src/core/lib/event_engine/channel_args_endpoint_config.h',
'src/core/lib/event_engine/common_closures.h',
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index 6524c71011913..2b82655c6eeb0 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -1410,6 +1410,8 @@ Pod::Spec.new do |s|
'src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc',
'src/core/lib/event_engine/cf_engine/cfstream_endpoint.h',
'src/core/lib/event_engine/cf_engine/cftype_unique_ref.h',
+ 'src/core/lib/event_engine/cf_engine/dispatch_thread_pool.cc',
+ 'src/core/lib/event_engine/cf_engine/dispatch_thread_pool.h',
'src/core/lib/event_engine/cf_engine/dns_service_resolver.cc',
'src/core/lib/event_engine/cf_engine/dns_service_resolver.h',
'src/core/lib/event_engine/channel_args_endpoint_config.cc',
@@ -3109,6 +3111,7 @@ Pod::Spec.new do |s|
'src/core/lib/event_engine/cf_engine/cf_engine.h',
'src/core/lib/event_engine/cf_engine/cfstream_endpoint.h',
'src/core/lib/event_engine/cf_engine/cftype_unique_ref.h',
+ 'src/core/lib/event_engine/cf_engine/dispatch_thread_pool.h',
'src/core/lib/event_engine/cf_engine/dns_service_resolver.h',
'src/core/lib/event_engine/channel_args_endpoint_config.h',
'src/core/lib/event_engine/common_closures.h',
diff --git a/grpc.gemspec b/grpc.gemspec
index 7d46cfa04fd1a..d2c40c135f532 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -1296,6 +1296,8 @@ Gem::Specification.new do |s|
s.files += %w( src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc )
s.files += %w( src/core/lib/event_engine/cf_engine/cfstream_endpoint.h )
s.files += %w( src/core/lib/event_engine/cf_engine/cftype_unique_ref.h )
+ s.files += %w( src/core/lib/event_engine/cf_engine/dispatch_thread_pool.cc )
+ s.files += %w( src/core/lib/event_engine/cf_engine/dispatch_thread_pool.h )
s.files += %w( src/core/lib/event_engine/cf_engine/dns_service_resolver.cc )
s.files += %w( src/core/lib/event_engine/cf_engine/dns_service_resolver.h )
s.files += %w( src/core/lib/event_engine/channel_args_endpoint_config.cc )
diff --git a/package.xml b/package.xml
index 5550ce3a62a73..65d37b73313e0 100644
--- a/package.xml
+++ b/package.xml
@@ -1278,6 +1278,8 @@
+
+
diff --git a/src/core/lib/event_engine/cf_engine/cf_engine.cc b/src/core/lib/event_engine/cf_engine/cf_engine.cc
index a5a3afe45a310..bb3bb9bd17d7c 100644
--- a/src/core/lib/event_engine/cf_engine/cf_engine.cc
+++ b/src/core/lib/event_engine/cf_engine/cf_engine.cc
@@ -21,6 +21,8 @@
#include
#include
+#include "absl/log/check.h"
+#include "absl/log/log.h"
#include "src/core/lib/event_engine/cf_engine/cf_engine.h"
#include "src/core/lib/event_engine/cf_engine/cfstream_endpoint.h"
#include "src/core/lib/event_engine/cf_engine/dns_service_resolver.h"
@@ -29,8 +31,6 @@
#include "src/core/lib/event_engine/thread_pool/thread_pool.h"
#include "src/core/lib/event_engine/utils.h"
#include "src/core/util/crash.h"
-#include "absl/log/check.h"
-#include "absl/log/log.h"
#if GRPC_CFSTREAM_DISPATCH
#include "src/core/lib/event_engine/cf_engine/dispatch_thread_pool.h"
diff --git a/src/core/lib/event_engine/cf_engine/dispatch_thread_pool.h b/src/core/lib/event_engine/cf_engine/dispatch_thread_pool.h
index f4f1e6a1c92b8..76fb6ed92fdfb 100644
--- a/src/core/lib/event_engine/cf_engine/dispatch_thread_pool.h
+++ b/src/core/lib/event_engine/cf_engine/dispatch_thread_pool.h
@@ -25,9 +25,10 @@
#include
#ifdef AVAILABLE_MAC_OS_X_VERSION_10_12_AND_LATER
+#include
+
#include
#include
-#include
#include "src/core/lib/event_engine/thread_pool/thread_pool.h"
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py
index c02c7f650fa45..2c3123993e70a 100644
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@@ -514,6 +514,7 @@
'src/core/lib/event_engine/ares_resolver.cc',
'src/core/lib/event_engine/cf_engine/cf_engine.cc',
'src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc',
+ 'src/core/lib/event_engine/cf_engine/dispatch_thread_pool.cc',
'src/core/lib/event_engine/cf_engine/dns_service_resolver.cc',
'src/core/lib/event_engine/channel_args_endpoint_config.cc',
'src/core/lib/event_engine/default_event_engine.cc',
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index c01d93de07114..6733bea7bf699 100644
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -2263,6 +2263,8 @@ src/core/lib/event_engine/cf_engine/cf_engine.h \
src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc \
src/core/lib/event_engine/cf_engine/cfstream_endpoint.h \
src/core/lib/event_engine/cf_engine/cftype_unique_ref.h \
+src/core/lib/event_engine/cf_engine/dispatch_thread_pool.cc \
+src/core/lib/event_engine/cf_engine/dispatch_thread_pool.h \
src/core/lib/event_engine/cf_engine/dns_service_resolver.cc \
src/core/lib/event_engine/cf_engine/dns_service_resolver.h \
src/core/lib/event_engine/channel_args_endpoint_config.cc \
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index ebc0ef1474ed2..1ec14f082b6be 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -2069,6 +2069,8 @@ src/core/lib/event_engine/cf_engine/cf_engine.h \
src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc \
src/core/lib/event_engine/cf_engine/cfstream_endpoint.h \
src/core/lib/event_engine/cf_engine/cftype_unique_ref.h \
+src/core/lib/event_engine/cf_engine/dispatch_thread_pool.cc \
+src/core/lib/event_engine/cf_engine/dispatch_thread_pool.h \
src/core/lib/event_engine/cf_engine/dns_service_resolver.cc \
src/core/lib/event_engine/cf_engine/dns_service_resolver.h \
src/core/lib/event_engine/channel_args_endpoint_config.cc \