From eea5d11fddd3f760173e075402f7b9ad2f7e8242 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Sun, 13 Nov 2022 22:04:29 -0800 Subject: [PATCH] [build] Move exec_ctx headers out of grpc_base (#31603) * [build] Move exec_ctx headers out of grpc_base * Automated change: Fix sanity tests Co-authored-by: ctiller --- BUILD | 23 ++++++++++++++++++----- src/core/BUILD | 16 ++++++++++++++++ test/core/end2end/BUILD | 4 ++++ test/core/util/BUILD | 2 ++ 4 files changed, 40 insertions(+), 5 deletions(-) diff --git a/BUILD b/BUILD index 2abf618301a..648caf5b8fb 100644 --- a/BUILD +++ b/BUILD @@ -485,6 +485,7 @@ grpc_cc_library( visibility = ["@grpc:public"], deps = [ "config", + "exec_ctx", "gpr", "grpc_base", "grpc_client_channel", @@ -552,6 +553,7 @@ grpc_cc_library( ], deps = [ "config", + "exec_ctx", "gpr", "grpc_alts_credentials", "grpc_base", @@ -972,6 +974,7 @@ grpc_cc_library( deps = [ "config", "debug_location", + "exec_ctx", "gpr", "gpr_platform", "grpc", @@ -1004,6 +1007,7 @@ grpc_cc_library( external_deps = ["absl/strings"], language = "c++", deps = [ + "exec_ctx", "gpr", "grpc", "grpc++_base", @@ -1339,10 +1343,6 @@ grpc_cc_library( "//src/core:lib/iomgr/closure.h", "//src/core:lib/slice/slice_internal.h", "//src/core:lib/slice/slice_string_helpers.h", - "//src/core:lib/iomgr/exec_ctx.h", - "//src/core:lib/iomgr/executor.h", - "//src/core:lib/iomgr/combiner.h", - "//src/core:lib/iomgr/iomgr_internal.h", "//src/core:lib/channel/channel_args.h", "//src/core:lib/channel/channel_stack_builder.h", ], @@ -1749,6 +1749,7 @@ grpc_cc_library( visibility = ["@grpc:alt_grpc++_base_legacy"], deps = [ "config", + "exec_ctx", "gpr", "grpc", "grpc++_codegen_proto", @@ -1813,6 +1814,7 @@ grpc_cc_library( visibility = ["@grpc:alt_grpc++_base_unsecure_legacy"], deps = [ "config", + "exec_ctx", "gpr", "grpc_base", "grpc_health_upb", @@ -1963,6 +1965,7 @@ grpc_cc_library( visibility = ["@grpc:public"], deps = [ "debug_location", + "exec_ctx", "gpr", "grpc++", "grpc_base", @@ -2346,7 +2349,10 @@ grpc_cc_library( "//src/core:lib/iomgr/executor.h", "//src/core:lib/iomgr/iomgr_internal.h", ], - visibility = ["@grpc:exec_ctx"], + visibility = [ + "@grpc:alt_grpc_base_legacy", + "@grpc:exec_ctx", + ], deps = [ "debug_location", "gpr", @@ -2661,6 +2667,7 @@ grpc_cc_library( "backoff", "config", "debug_location", + "exec_ctx", "gpr", "grpc_base", "grpc_health_upb", @@ -2752,6 +2759,7 @@ grpc_cc_library( "backoff", "config", "debug_location", + "exec_ctx", "gpr", "grpc_base", "grpc_grpclb_balancer_addresses", @@ -2807,6 +2815,7 @@ grpc_cc_library( deps = [ "config", "debug_location", + "exec_ctx", "gpr", "grpc_base", "grpc_public_hdrs", @@ -2852,6 +2861,7 @@ grpc_cc_library( deps = [ "alts_util", "debug_location", + "exec_ctx", "gpr", "grpc_base", "grpc_public_hdrs", @@ -2916,6 +2926,7 @@ grpc_cc_library( language = "c++", visibility = ["@grpc:public"], deps = [ + "exec_ctx", "gpr", "grpc_base", "grpc_credentials_util", @@ -3021,6 +3032,7 @@ grpc_cc_library( "alts_upb", "alts_util", "config", + "exec_ctx", "gpr", "grpc_base", "tsi_base", @@ -3352,6 +3364,7 @@ grpc_cc_library( visibility = ["@grpc:grpclb"], deps = [ "debug_location", + "exec_ctx", "gpr", "grpc_base", "grpc_public_hdrs", diff --git a/src/core/BUILD b/src/core/BUILD index 88ea93587b6..2e1c1dee5d6 100644 --- a/src/core/BUILD +++ b/src/core/BUILD @@ -2449,6 +2449,7 @@ grpc_cc_library( "unique_type_name", "useful", "//:debug_location", + "//:exec_ctx", "//:gpr", "//:grpc_base", "//:grpc_security_base", @@ -2482,6 +2483,7 @@ grpc_cc_library( "tsi_local_credentials", "unique_type_name", "//:debug_location", + "//:exec_ctx", "//:gpr", "//:grpc_base", "//:grpc_security_base", @@ -2536,6 +2538,7 @@ grpc_cc_library( "unique_type_name", "useful", "//:debug_location", + "//:exec_ctx", "//:gpr", "//:grpc_base", "//:grpc_client_channel", @@ -2573,6 +2576,7 @@ grpc_cc_library( "unique_type_name", "useful", "//:debug_location", + "//:exec_ctx", "//:gpr", "//:grpc_base", "//:grpc_security_base", @@ -2619,6 +2623,7 @@ grpc_cc_library( "unique_type_name", "useful", "//:alts_util", + "//:exec_ctx", "//:gpr", "//:grpc_alts_credentials", "//:grpc_base", @@ -2686,6 +2691,7 @@ grpc_cc_library( "unique_type_name", "useful", "//:debug_location", + "//:exec_ctx", "//:gpr", "//:grpc_base", "//:grpc_credentials_util", @@ -2721,6 +2727,7 @@ grpc_cc_library( "slice", "unique_type_name", "useful", + "//:exec_ctx", "//:gpr", "//:grpc_base", "//:grpc_security_base", @@ -2842,6 +2849,7 @@ grpc_cc_library( "iomgr_fwd", "unique_type_name", "//:debug_location", + "//:exec_ctx", "//:gpr", "//:grpc_base", "//:grpc_security_base", @@ -3286,6 +3294,7 @@ grpc_cc_library( "//:backoff", "//:config", "//:debug_location", + "//:exec_ctx", "//:gpr", "//:grpc_base", "//:grpc_client_channel", @@ -3354,6 +3363,7 @@ grpc_cc_library( "//:backoff", "//:config", "//:debug_location", + "//:exec_ctx", "//:gpr", "//:grpc_base", "//:grpc_client_channel", @@ -3529,6 +3539,7 @@ grpc_cc_library( "xds_type_upbdefs", "//:config", "//:debug_location", + "//:exec_ctx", "//:gpr", "//:grpc_base", "//:grpc_client_channel", @@ -3841,6 +3852,7 @@ grpc_cc_library( "validation_errors", "//:config", "//:debug_location", + "//:exec_ctx", "//:gpr", "//:gpr_platform", "//:grpc_base", @@ -4165,6 +4177,7 @@ grpc_cc_library( "validation_errors", "//:config", "//:debug_location", + "//:exec_ctx", "//:gpr", "//:grpc_base", "//:grpc_client_channel", @@ -4579,6 +4592,7 @@ grpc_cc_library( "unique_type_name", "//:config", "//:debug_location", + "//:exec_ctx", "//:gpr", "//:grpc_base", "//:grpc_client_channel", @@ -4627,6 +4641,7 @@ grpc_cc_library( "unique_type_name", "//:config", "//:debug_location", + "//:exec_ctx", "//:gpr", "//:grpc_base", "//:grpc_security_base", @@ -4670,6 +4685,7 @@ grpc_cc_library( "transport_fwd", "//:config", "//:debug_location", + "//:exec_ctx", "//:gpr", "//:grpc_base", "//:grpc_public_hdrs", diff --git a/test/core/end2end/BUILD b/test/core/end2end/BUILD index 52763465c1b..4b396916085 100644 --- a/test/core/end2end/BUILD +++ b/test/core/end2end/BUILD @@ -64,6 +64,7 @@ grpc_cc_library( language = "C++", deps = [ "//:config", + "//:exec_ctx", "//:gpr", "//:grpc", "//:httpcli", @@ -113,6 +114,7 @@ grpc_cc_test( language = "C++", deps = [ "cq_verifier", + "//:exec_ctx", "//:gpr", "//:grpc", "//:grpc_public_hdrs", @@ -173,6 +175,7 @@ grpc_cc_test( deps = [ "cq_verifier", "//:debug_location", + "//:exec_ctx", "//:gpr", "//:grpc", "//:grpc_public_hdrs", @@ -258,6 +261,7 @@ grpc_cc_test( language = "C++", deps = [ "cq_verifier", + "//:exec_ctx", "//:gpr", "//:grpc", "//:grpc_public_hdrs", diff --git a/test/core/util/BUILD b/test/core/util/BUILD index c2a6f00fce7..3059188c2f3 100644 --- a/test/core/util/BUILD +++ b/test/core/util/BUILD @@ -125,6 +125,7 @@ grpc_cc_library( "build", "stack_tracer", "//:config", + "//:exec_ctx", "//:gpr", "//:grpc", "//:grpc_public_hdrs", @@ -165,6 +166,7 @@ grpc_cc_library( "build", "stack_tracer", "//:config", + "//:exec_ctx", "//:gpr", "//:grpc_security_base", "//:grpc_unsecure",