From 8f5300b95df0cf9cfb9cc4c0f2530c4cb4d7b182 Mon Sep 17 00:00:00 2001 From: AJ Heller Date: Mon, 8 Aug 2022 13:13:53 -0700 Subject: [PATCH] Rename the default EventEngine headers (#30528) * Rename the default EventEngine headers Small cleanup. This code hasn't been related to factories for a month or two. * ensure only one target contains default_event_engine.h * src + hdr in same target * include guards --- BUILD | 37 ++++++------------- CMakeLists.txt | 4 +- Makefile | 4 +- build_autogenerated.yaml | 8 ++-- config.m4 | 2 +- config.w32 | 2 +- gRPC-C++.podspec | 4 +- gRPC-Core.podspec | 6 +-- grpc.gemspec | 4 +- grpc.gyp | 4 +- package.xml | 4 +- .../client_channel/lb_policy/grpclb/grpclb.cc | 2 +- .../weighted_target/weighted_target.cc | 2 +- .../ext/filters/client_channel/subchannel.cc | 2 +- src/core/ext/xds/xds_client.cc | 2 +- ...vent_engine.cc => default_event_engine.cc} | 3 +- ...ngine_factory.h => default_event_engine.h} | 6 +-- src/core/lib/iomgr/resolve_address_posix.cc | 2 +- src/core/lib/iomgr/resolve_address_windows.cc | 2 +- src/core/lib/promise/sleep.cc | 2 +- src/cpp/server/orca/orca_service.cc | 2 +- src/python/grpcio/grpc_core_dependencies.py | 2 +- .../resolvers/dns_resolver_cooldown_test.cc | 2 +- test/core/end2end/BUILD | 2 +- test/core/end2end/fuzzers/api_fuzzer.cc | 2 +- test/core/end2end/goaway_server_test.cc | 2 +- .../posix/lock_free_event_test.cc | 2 +- tools/doxygen/Doxyfile.c++.internal | 4 +- tools/doxygen/Doxyfile.core.internal | 4 +- 29 files changed, 56 insertions(+), 68 deletions(-) rename src/core/lib/event_engine/{event_engine.cc => default_event_engine.cc} (97%) rename src/core/lib/event_engine/{event_engine_factory.h => default_event_engine.h} (86%) diff --git a/BUILD b/BUILD index 995116a88e5..b3ac78cc859 100644 --- a/BUILD +++ b/BUILD @@ -416,7 +416,7 @@ grpc_cc_library( "channel_init", "channel_stack_type", "config", - "default_event_engine_factory_hdrs", + "default_event_engine", "gpr_base", "grpc_authorization_base", "grpc_base", @@ -479,7 +479,7 @@ grpc_cc_library( "channel_init", "channel_stack_type", "config", - "default_event_engine_factory_hdrs", + "default_event_engine", "gpr_base", "grpc_authorization_base", "grpc_base", @@ -1267,7 +1267,7 @@ grpc_cc_library( external_deps = ["absl/status"], deps = [ "activity", - "event_engine_base", + "default_event_engine", "event_engine_base_hdrs", "exec_ctx", "gpr_base", @@ -2212,18 +2212,6 @@ grpc_cc_library( ], ) -grpc_cc_library( - name = "default_event_engine_factory_hdrs", - hdrs = [ - "src/core/lib/event_engine/event_engine_factory.h", - ], - tags = ["nofixdeps"], - deps = [ - "event_engine_base_hdrs", - "gpr_base", - ], -) - grpc_cc_library( name = "time_averaged_stats", srcs = ["src/core/lib/gprpp/time_averaged_stats.cc"], @@ -2708,12 +2696,12 @@ grpc_cc_library( ) grpc_cc_library( - name = "event_engine_base", + name = "default_event_engine", srcs = [ - "src/core/lib/event_engine/event_engine.cc", + "src/core/lib/event_engine/default_event_engine.cc", ], hdrs = [ - "src/core/lib/event_engine/event_engine_factory.h", + "src/core/lib/event_engine/default_event_engine.h", ], external_deps = ["absl/functional:any_invocable"], deps = [ @@ -3057,10 +3045,9 @@ grpc_cc_library( "config", "cpp_impl_of", "debug_location", - "default_event_engine_factory_hdrs", + "default_event_engine", "dual_ref_counted", "error", - "event_engine_base", "event_engine_common", "exec_ctx", "gpr_base", @@ -3524,8 +3511,8 @@ grpc_cc_library( "config", "construct_destruct", "debug_location", + "default_event_engine", "dual_ref_counted", - "event_engine_base", "gpr_base", "gpr_codegen", "grpc_backend_metric_data", @@ -3988,7 +3975,7 @@ grpc_cc_library( "channel_stack_type", "config", "debug_location", - "event_engine_base", + "default_event_engine", "gpr_base", "gpr_codegen", "grpc_base", @@ -4165,7 +4152,7 @@ grpc_cc_library( "channel_fwd", "config", "debug_location", - "default_event_engine_factory_hdrs", + "default_event_engine", "envoy_admin_upb", "envoy_config_cluster_upb", "envoy_config_cluster_upbdefs", @@ -4806,7 +4793,7 @@ grpc_cc_library( deps = [ "channel_args", "debug_location", - "event_engine_base", + "default_event_engine", "gpr_base", "grpc_base", "grpc_client_channel", @@ -7034,7 +7021,7 @@ grpc_cc_library( visibility = ["@grpc:public"], deps = [ "debug_location", - "event_engine_base", + "default_event_engine", "gpr_base", "grpc++", "grpc++_codegen_base", diff --git a/CMakeLists.txt b/CMakeLists.txt index 22ac9eaebbd..e4832431a40 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2091,8 +2091,8 @@ add_library(grpc src/core/lib/debug/stats_data.cc src/core/lib/debug/trace.cc src/core/lib/event_engine/channel_args_endpoint_config.cc + src/core/lib/event_engine/default_event_engine.cc src/core/lib/event_engine/default_event_engine_factory.cc - src/core/lib/event_engine/event_engine.cc src/core/lib/event_engine/executor/threaded_executor.cc src/core/lib/event_engine/memory_allocator.cc src/core/lib/event_engine/posix_engine/posix_engine.cc @@ -2701,8 +2701,8 @@ add_library(grpc_unsecure src/core/lib/debug/stats_data.cc src/core/lib/debug/trace.cc src/core/lib/event_engine/channel_args_endpoint_config.cc + src/core/lib/event_engine/default_event_engine.cc src/core/lib/event_engine/default_event_engine_factory.cc - src/core/lib/event_engine/event_engine.cc src/core/lib/event_engine/executor/threaded_executor.cc src/core/lib/event_engine/memory_allocator.cc src/core/lib/event_engine/posix_engine/posix_engine.cc diff --git a/Makefile b/Makefile index 9c902fcd849..2b2d3feea1c 100644 --- a/Makefile +++ b/Makefile @@ -1451,8 +1451,8 @@ LIBGRPC_SRC = \ src/core/lib/debug/stats_data.cc \ src/core/lib/debug/trace.cc \ src/core/lib/event_engine/channel_args_endpoint_config.cc \ + src/core/lib/event_engine/default_event_engine.cc \ src/core/lib/event_engine/default_event_engine_factory.cc \ - src/core/lib/event_engine/event_engine.cc \ src/core/lib/event_engine/executor/threaded_executor.cc \ src/core/lib/event_engine/memory_allocator.cc \ src/core/lib/event_engine/posix_engine/posix_engine.cc \ @@ -1925,8 +1925,8 @@ LIBGRPC_UNSECURE_SRC = \ src/core/lib/debug/stats_data.cc \ src/core/lib/debug/trace.cc \ src/core/lib/event_engine/channel_args_endpoint_config.cc \ + src/core/lib/event_engine/default_event_engine.cc \ src/core/lib/event_engine/default_event_engine_factory.cc \ - src/core/lib/event_engine/event_engine.cc \ src/core/lib/event_engine/executor/threaded_executor.cc \ src/core/lib/event_engine/memory_allocator.cc \ src/core/lib/event_engine/posix_engine/posix_engine.cc \ diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index fde78011a28..7f87f51f741 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -748,8 +748,8 @@ libs: - src/core/lib/debug/stats_data.h - src/core/lib/debug/trace.h - src/core/lib/event_engine/channel_args_endpoint_config.h + - src/core/lib/event_engine/default_event_engine.h - src/core/lib/event_engine/default_event_engine_factory.h - - src/core/lib/event_engine/event_engine_factory.h - src/core/lib/event_engine/executor/executor.h - src/core/lib/event_engine/executor/threaded_executor.h - src/core/lib/event_engine/handle_containers.h @@ -1445,8 +1445,8 @@ libs: - src/core/lib/debug/stats_data.cc - src/core/lib/debug/trace.cc - src/core/lib/event_engine/channel_args_endpoint_config.cc + - src/core/lib/event_engine/default_event_engine.cc - src/core/lib/event_engine/default_event_engine_factory.cc - - src/core/lib/event_engine/event_engine.cc - src/core/lib/event_engine/executor/threaded_executor.cc - src/core/lib/event_engine/memory_allocator.cc - src/core/lib/event_engine/posix_engine/posix_engine.cc @@ -1934,8 +1934,8 @@ libs: - src/core/lib/debug/stats_data.h - src/core/lib/debug/trace.h - src/core/lib/event_engine/channel_args_endpoint_config.h + - src/core/lib/event_engine/default_event_engine.h - src/core/lib/event_engine/default_event_engine_factory.h - - src/core/lib/event_engine/event_engine_factory.h - src/core/lib/event_engine/executor/executor.h - src/core/lib/event_engine/executor/threaded_executor.h - src/core/lib/event_engine/handle_containers.h @@ -2272,8 +2272,8 @@ libs: - src/core/lib/debug/stats_data.cc - src/core/lib/debug/trace.cc - src/core/lib/event_engine/channel_args_endpoint_config.cc + - src/core/lib/event_engine/default_event_engine.cc - src/core/lib/event_engine/default_event_engine_factory.cc - - src/core/lib/event_engine/event_engine.cc - src/core/lib/event_engine/executor/threaded_executor.cc - src/core/lib/event_engine/memory_allocator.cc - src/core/lib/event_engine/posix_engine/posix_engine.cc diff --git a/config.m4 b/config.m4 index 06d35812bf1..dbdf6a3d0c6 100644 --- a/config.m4 +++ b/config.m4 @@ -469,8 +469,8 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/debug/stats_data.cc \ src/core/lib/debug/trace.cc \ src/core/lib/event_engine/channel_args_endpoint_config.cc \ + src/core/lib/event_engine/default_event_engine.cc \ src/core/lib/event_engine/default_event_engine_factory.cc \ - src/core/lib/event_engine/event_engine.cc \ src/core/lib/event_engine/executor/threaded_executor.cc \ src/core/lib/event_engine/memory_allocator.cc \ src/core/lib/event_engine/posix_engine/posix_engine.cc \ diff --git a/config.w32 b/config.w32 index 26f612c41af..68213c2a4d3 100644 --- a/config.w32 +++ b/config.w32 @@ -435,8 +435,8 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\debug\\stats_data.cc " + "src\\core\\lib\\debug\\trace.cc " + "src\\core\\lib\\event_engine\\channel_args_endpoint_config.cc " + + "src\\core\\lib\\event_engine\\default_event_engine.cc " + "src\\core\\lib\\event_engine\\default_event_engine_factory.cc " + - "src\\core\\lib\\event_engine\\event_engine.cc " + "src\\core\\lib\\event_engine\\executor\\threaded_executor.cc " + "src\\core\\lib\\event_engine\\memory_allocator.cc " + "src\\core\\lib\\event_engine\\posix_engine\\posix_engine.cc " + diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 2597838fd64..dcced15e77a 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -680,8 +680,8 @@ Pod::Spec.new do |s| 'src/core/lib/debug/stats_data.h', 'src/core/lib/debug/trace.h', 'src/core/lib/event_engine/channel_args_endpoint_config.h', + 'src/core/lib/event_engine/default_event_engine.h', 'src/core/lib/event_engine/default_event_engine_factory.h', - 'src/core/lib/event_engine/event_engine_factory.h', 'src/core/lib/event_engine/executor/executor.h', 'src/core/lib/event_engine/executor/threaded_executor.h', 'src/core/lib/event_engine/handle_containers.h', @@ -1534,8 +1534,8 @@ Pod::Spec.new do |s| 'src/core/lib/debug/stats_data.h', 'src/core/lib/debug/trace.h', 'src/core/lib/event_engine/channel_args_endpoint_config.h', + 'src/core/lib/event_engine/default_event_engine.h', 'src/core/lib/event_engine/default_event_engine_factory.h', - 'src/core/lib/event_engine/event_engine_factory.h', 'src/core/lib/event_engine/executor/executor.h', 'src/core/lib/event_engine/executor/threaded_executor.h', 'src/core/lib/event_engine/handle_containers.h', diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 0bf5b88aba9..41a68fe464b 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -1047,10 +1047,10 @@ Pod::Spec.new do |s| 'src/core/lib/debug/trace.h', 'src/core/lib/event_engine/channel_args_endpoint_config.cc', 'src/core/lib/event_engine/channel_args_endpoint_config.h', + 'src/core/lib/event_engine/default_event_engine.cc', + 'src/core/lib/event_engine/default_event_engine.h', 'src/core/lib/event_engine/default_event_engine_factory.cc', 'src/core/lib/event_engine/default_event_engine_factory.h', - 'src/core/lib/event_engine/event_engine.cc', - 'src/core/lib/event_engine/event_engine_factory.h', 'src/core/lib/event_engine/executor/executor.h', 'src/core/lib/event_engine/executor/threaded_executor.cc', 'src/core/lib/event_engine/executor/threaded_executor.h', @@ -2156,8 +2156,8 @@ Pod::Spec.new do |s| 'src/core/lib/debug/stats_data.h', 'src/core/lib/debug/trace.h', 'src/core/lib/event_engine/channel_args_endpoint_config.h', + 'src/core/lib/event_engine/default_event_engine.h', 'src/core/lib/event_engine/default_event_engine_factory.h', - 'src/core/lib/event_engine/event_engine_factory.h', 'src/core/lib/event_engine/executor/executor.h', 'src/core/lib/event_engine/executor/threaded_executor.h', 'src/core/lib/event_engine/handle_containers.h', diff --git a/grpc.gemspec b/grpc.gemspec index b45550cd2ec..db96e3ffba5 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -960,10 +960,10 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/debug/trace.h ) s.files += %w( src/core/lib/event_engine/channel_args_endpoint_config.cc ) s.files += %w( src/core/lib/event_engine/channel_args_endpoint_config.h ) + s.files += %w( src/core/lib/event_engine/default_event_engine.cc ) + s.files += %w( src/core/lib/event_engine/default_event_engine.h ) s.files += %w( src/core/lib/event_engine/default_event_engine_factory.cc ) s.files += %w( src/core/lib/event_engine/default_event_engine_factory.h ) - s.files += %w( src/core/lib/event_engine/event_engine.cc ) - s.files += %w( src/core/lib/event_engine/event_engine_factory.h ) s.files += %w( src/core/lib/event_engine/executor/executor.h ) s.files += %w( src/core/lib/event_engine/executor/threaded_executor.cc ) s.files += %w( src/core/lib/event_engine/executor/threaded_executor.h ) diff --git a/grpc.gyp b/grpc.gyp index 332a579fff2..97bcee758c2 100644 --- a/grpc.gyp +++ b/grpc.gyp @@ -802,8 +802,8 @@ 'src/core/lib/debug/stats_data.cc', 'src/core/lib/debug/trace.cc', 'src/core/lib/event_engine/channel_args_endpoint_config.cc', + 'src/core/lib/event_engine/default_event_engine.cc', 'src/core/lib/event_engine/default_event_engine_factory.cc', - 'src/core/lib/event_engine/event_engine.cc', 'src/core/lib/event_engine/executor/threaded_executor.cc', 'src/core/lib/event_engine/memory_allocator.cc', 'src/core/lib/event_engine/posix_engine/posix_engine.cc', @@ -1244,8 +1244,8 @@ 'src/core/lib/debug/stats_data.cc', 'src/core/lib/debug/trace.cc', 'src/core/lib/event_engine/channel_args_endpoint_config.cc', + 'src/core/lib/event_engine/default_event_engine.cc', 'src/core/lib/event_engine/default_event_engine_factory.cc', - 'src/core/lib/event_engine/event_engine.cc', 'src/core/lib/event_engine/executor/threaded_executor.cc', 'src/core/lib/event_engine/memory_allocator.cc', 'src/core/lib/event_engine/posix_engine/posix_engine.cc', diff --git a/package.xml b/package.xml index 471e31dd4cd..7e1465a22d4 100644 --- a/package.xml +++ b/package.xml @@ -942,10 +942,10 @@ + + - - diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc index 106bcfd3bc8..4069cc66d47 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc @@ -106,7 +106,7 @@ #include "src/core/lib/channel/channelz.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/event_engine/event_engine_factory.h" +#include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/debug_location.h" diff --git a/src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc b/src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc index 4549329f6b9..98e119bece8 100644 --- a/src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc +++ b/src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc @@ -42,7 +42,7 @@ #include "src/core/ext/filters/client_channel/lb_policy/child_policy_handler.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/event_engine/event_engine_factory.h" +#include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/orphanable.h" diff --git a/src/core/ext/filters/client_channel/subchannel.cc b/src/core/ext/filters/client_channel/subchannel.cc index ee9dfcd460b..05ce63dabb4 100644 --- a/src/core/ext/filters/client_channel/subchannel.cc +++ b/src/core/ext/filters/client_channel/subchannel.cc @@ -49,7 +49,7 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/stats.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/event_engine/event_engine_factory.h" +#include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/gpr/alloc.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/debug_location.h" diff --git a/src/core/ext/xds/xds_client.cc b/src/core/ext/xds/xds_client.cc index 4328d396acd..9d26eca3f2e 100644 --- a/src/core/ext/xds/xds_client.cc +++ b/src/core/ext/xds/xds_client.cc @@ -41,7 +41,7 @@ #include "src/core/ext/xds/xds_bootstrap.h" #include "src/core/ext/xds/xds_client_stats.h" #include "src/core/lib/backoff/backoff.h" -#include "src/core/lib/event_engine/event_engine_factory.h" +#include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" diff --git a/src/core/lib/event_engine/event_engine.cc b/src/core/lib/event_engine/default_event_engine.cc similarity index 97% rename from src/core/lib/event_engine/event_engine.cc rename to src/core/lib/event_engine/default_event_engine.cc index 8549734dd91..70c4eb17175 100644 --- a/src/core/lib/event_engine/event_engine.cc +++ b/src/core/lib/event_engine/default_event_engine.cc @@ -13,6 +13,8 @@ // limitations under the License. #include +#include "src/core/lib/event_engine/default_event_engine.h" + #include #include #include @@ -22,7 +24,6 @@ #include #include "src/core/lib/event_engine/default_event_engine_factory.h" -#include "src/core/lib/event_engine/event_engine_factory.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/event_engine_factory.h b/src/core/lib/event_engine/default_event_engine.h similarity index 86% rename from src/core/lib/event_engine/event_engine_factory.h rename to src/core/lib/event_engine/default_event_engine.h index 05d830060f8..1a182bd73f3 100644 --- a/src/core/lib/event_engine/event_engine_factory.h +++ b/src/core/lib/event_engine/default_event_engine.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_CORE_LIB_EVENT_ENGINE_EVENT_ENGINE_FACTORY_H -#define GRPC_CORE_LIB_EVENT_ENGINE_EVENT_ENGINE_FACTORY_H +#ifndef GRPC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_H +#define GRPC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_H #include @@ -34,4 +34,4 @@ void ResetDefaultEventEngine(); } // namespace experimental } // namespace grpc_event_engine -#endif // GRPC_CORE_LIB_EVENT_ENGINE_EVENT_ENGINE_FACTORY_H +#endif // GRPC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_H diff --git a/src/core/lib/iomgr/resolve_address_posix.cc b/src/core/lib/iomgr/resolve_address_posix.cc index b292b36d5e8..3c96ac0f4d7 100644 --- a/src/core/lib/iomgr/resolve_address_posix.cc +++ b/src/core/lib/iomgr/resolve_address_posix.cc @@ -29,7 +29,7 @@ #include #include -#include "src/core/lib/event_engine/event_engine_factory.h" +#include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/host_port.h" diff --git a/src/core/lib/iomgr/resolve_address_windows.cc b/src/core/lib/iomgr/resolve_address_windows.cc index 3734fa21f15..185d026de2f 100644 --- a/src/core/lib/iomgr/resolve_address_windows.cc +++ b/src/core/lib/iomgr/resolve_address_windows.cc @@ -34,7 +34,7 @@ #include #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/event_engine/event_engine_factory.h" +#include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/gprpp/thd.h" diff --git a/src/core/lib/promise/sleep.cc b/src/core/lib/promise/sleep.cc index e58a6b2ec2b..8ff910283df 100644 --- a/src/core/lib/promise/sleep.cc +++ b/src/core/lib/promise/sleep.cc @@ -20,7 +20,7 @@ #include -#include "src/core/lib/event_engine/event_engine_factory.h" +#include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/activity.h" diff --git a/src/cpp/server/orca/orca_service.cc b/src/cpp/server/orca/orca_service.cc index 98581791ef0..21c25413fbb 100644 --- a/src/cpp/server/orca/orca_service.cc +++ b/src/cpp/server/orca/orca_service.cc @@ -43,7 +43,7 @@ #include #include -#include "src/core/lib/event_engine/event_engine_factory.h" +#include "src/core/lib/event_engine/default_event_engine.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" diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 854bdb9f2de..2166350b595 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -444,8 +444,8 @@ CORE_SOURCE_FILES = [ 'src/core/lib/debug/stats_data.cc', 'src/core/lib/debug/trace.cc', 'src/core/lib/event_engine/channel_args_endpoint_config.cc', + 'src/core/lib/event_engine/default_event_engine.cc', 'src/core/lib/event_engine/default_event_engine_factory.cc', - 'src/core/lib/event_engine/event_engine.cc', 'src/core/lib/event_engine/executor/threaded_executor.cc', 'src/core/lib/event_engine/memory_allocator.cc', 'src/core/lib/event_engine/posix_engine/posix_engine.cc', diff --git a/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc b/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc index 7179026612b..63cb1f8a3c6 100644 --- a/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc +++ b/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc @@ -29,7 +29,7 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/event_engine/event_engine_factory.h" +#include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/gprpp/memory.h" #include "src/core/lib/gprpp/time.h" #include "src/core/lib/gprpp/work_serializer.h" diff --git a/test/core/end2end/BUILD b/test/core/end2end/BUILD index e25e8e5e6ce..3d7677e051f 100644 --- a/test/core/end2end/BUILD +++ b/test/core/end2end/BUILD @@ -170,7 +170,7 @@ grpc_cc_test( deps = [ "cq_verifier", "//:debug_location", - "//:default_event_engine_factory_hdrs", + "//:default_event_engine", "//:gpr_base", "//:grpc", "//:grpc_codegen", diff --git a/test/core/end2end/fuzzers/api_fuzzer.cc b/test/core/end2end/fuzzers/api_fuzzer.cc index 92dca972456..a36e3cebfc0 100644 --- a/test/core/end2end/fuzzers/api_fuzzer.cc +++ b/test/core/end2end/fuzzers/api_fuzzer.cc @@ -51,7 +51,7 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channelz.h" -#include "src/core/lib/event_engine/event_engine_factory.h" +#include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/gpr/env.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/time.h" diff --git a/test/core/end2end/goaway_server_test.cc b/test/core/end2end/goaway_server_test.cc index 7b7ed55a01d..8e031868f78 100644 --- a/test/core/end2end/goaway_server_test.cc +++ b/test/core/end2end/goaway_server_test.cc @@ -44,7 +44,7 @@ #include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/event_engine/event_engine_factory.h" +#include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" diff --git a/test/core/event_engine/posix/lock_free_event_test.cc b/test/core/event_engine/posix/lock_free_event_test.cc index 90ce246f6c0..f142649b6f4 100644 --- a/test/core/event_engine/posix/lock_free_event_test.cc +++ b/test/core/event_engine/posix/lock_free_event_test.cc @@ -20,7 +20,7 @@ #include #include -#include "src/core/lib/event_engine/event_engine_factory.h" +#include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/posix_engine/event_poller.h" #include "src/core/lib/event_engine/posix_engine/lockfree_event.h" #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h" diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index 6bdffa36b8f..2f5827ed915 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -1943,10 +1943,10 @@ src/core/lib/debug/trace.cc \ src/core/lib/debug/trace.h \ src/core/lib/event_engine/channel_args_endpoint_config.cc \ src/core/lib/event_engine/channel_args_endpoint_config.h \ +src/core/lib/event_engine/default_event_engine.cc \ +src/core/lib/event_engine/default_event_engine.h \ src/core/lib/event_engine/default_event_engine_factory.cc \ src/core/lib/event_engine/default_event_engine_factory.h \ -src/core/lib/event_engine/event_engine.cc \ -src/core/lib/event_engine/event_engine_factory.h \ src/core/lib/event_engine/executor/executor.h \ src/core/lib/event_engine/executor/threaded_executor.cc \ src/core/lib/event_engine/executor/threaded_executor.h \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index cfe051cd0fc..c99e329f9c8 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -1733,10 +1733,10 @@ src/core/lib/debug/trace.cc \ src/core/lib/debug/trace.h \ src/core/lib/event_engine/channel_args_endpoint_config.cc \ src/core/lib/event_engine/channel_args_endpoint_config.h \ +src/core/lib/event_engine/default_event_engine.cc \ +src/core/lib/event_engine/default_event_engine.h \ src/core/lib/event_engine/default_event_engine_factory.cc \ src/core/lib/event_engine/default_event_engine_factory.h \ -src/core/lib/event_engine/event_engine.cc \ -src/core/lib/event_engine/event_engine_factory.h \ src/core/lib/event_engine/executor/executor.h \ src/core/lib/event_engine/executor/threaded_executor.cc \ src/core/lib/event_engine/executor/threaded_executor.h \