From 7e3ada34e6568144bb570e37fe7f3bd8a5a979b5 Mon Sep 17 00:00:00 2001 From: Cheng-Yu Chung Date: Fri, 18 Nov 2022 18:35:22 -0500 Subject: [PATCH] Clean up the TODO item in build target `grpc_base` -- part `closure` (#31001) * Clean up the TODO item in build target `grpc_base` part `closure` * Update * Update * Revert "Update" This reverts commit daf31183903b3f3c2350d9d30b327869b1c7ec0b. * Update * Update * Automated change: Fix sanity tests --- BUILD | 11 ++++++++++- src/core/BUILD | 17 +++++++++++++++++ src/core/ext/transport/cronet/BUILD | 1 + test/core/channel/BUILD | 1 + test/core/client_channel/resolvers/BUILD | 1 + test/core/end2end/BUILD | 3 +++ test/core/end2end/fuzzers/BUILD | 1 + test/core/filters/BUILD | 1 + test/core/handshake/BUILD | 1 + test/core/http/BUILD | 1 + test/core/surface/BUILD | 2 ++ test/core/transport/chttp2/BUILD | 3 +++ test/core/util/BUILD | 3 +++ test/cpp/common/BUILD | 2 ++ test/cpp/microbenchmarks/BUILD | 6 +++++- 15 files changed, 52 insertions(+), 2 deletions(-) diff --git a/BUILD b/BUILD index 63f565c905c..14b01887622 100644 --- a/BUILD +++ b/BUILD @@ -1342,7 +1342,6 @@ grpc_cc_library( # re-export these headers from here for now, and when LSC's have completed # to clean this up, we'll remove these. [ - "//src/core:lib/iomgr/closure.h", "//src/core:lib/channel/channel_args.h", ], external_deps = [ @@ -1766,6 +1765,7 @@ grpc_cc_library( "//src/core:channel_fwd", "//src/core:channel_init", "//src/core:channel_stack_type", + "//src/core:closure", "//src/core:default_event_engine", "//src/core:env", "//src/core:error", @@ -1827,6 +1827,7 @@ grpc_cc_library( "ref_counted_ptr", "//src/core:arena", "//src/core:channel_init", + "//src/core:closure", "//src/core:error", "//src/core:gpr_atm", "//src/core:gpr_manual_constructor", @@ -2135,6 +2136,7 @@ grpc_cc_library( "grpc_base", "//src/core:arena", "//src/core:channel_stack_type", + "//src/core:closure", "//src/core:slice", "//src/core:slice_buffer", "//src/core:slice_refcount", @@ -2692,6 +2694,7 @@ grpc_cc_library( "//src/core:channel_fwd", "//src/core:channel_init", "//src/core:channel_stack_type", + "//src/core:closure", "//src/core:construct_destruct", "//src/core:dual_ref_counted", "//src/core:env", @@ -2773,6 +2776,7 @@ grpc_cc_library( "server_address", "sockaddr_utils", "uri_parser", + "//src/core:closure", "//src/core:error", "//src/core:event_engine_common", "//src/core:grpc_resolver_dns_selection", @@ -2828,6 +2832,7 @@ grpc_cc_library( "sockaddr_utils", "uri_parser", "//src/core:channel_args_preconditioning", + "//src/core:closure", "//src/core:error", "//src/core:handshaker_registry", "//src/core:iomgr_fwd", @@ -2873,6 +2878,7 @@ grpc_cc_library( "tsi_alts_credentials", "tsi_base", "//src/core:arena_promise", + "//src/core:closure", "//src/core:error", "//src/core:iomgr_fwd", "//src/core:slice", @@ -2939,6 +2945,7 @@ grpc_cc_library( "ref_counted_ptr", "uri_parser", "//src/core:arena_promise", + "//src/core:closure", "//src/core:error", "//src/core:gpr_manual_constructor", "//src/core:httpcli_ssl_credentials", @@ -3038,6 +3045,7 @@ grpc_cc_library( "grpc_base", "tsi_base", "//src/core:arena", + "//src/core:closure", "//src/core:error", "//src/core:pollset_set", "//src/core:slice", @@ -3510,6 +3518,7 @@ grpc_cc_library( "//src/core:bdp_estimator", "//src/core:bitset", "//src/core:chttp2_flow_control", + "//src/core:closure", "//src/core:error", "//src/core:gpr_atm", "//src/core:http2_errors", diff --git a/src/core/BUILD b/src/core/BUILD index a276882b183..f728ea088c1 100644 --- a/src/core/BUILD +++ b/src/core/BUILD @@ -1145,6 +1145,7 @@ grpc_cc_library( hdrs = [ "lib/iomgr/closure.h", ], + visibility = ["@grpc:alt_grpc_base_legacy"], deps = [ "error", "gpr_manual_constructor", @@ -2479,6 +2480,7 @@ grpc_cc_library( language = "c++", deps = [ "arena_promise", + "closure", "error", "iomgr_fwd", "slice", @@ -2514,6 +2516,7 @@ grpc_cc_library( language = "c++", deps = [ "arena_promise", + "closure", "error", "iomgr_fwd", "tsi_local_credentials", @@ -2566,6 +2569,7 @@ grpc_cc_library( language = "c++", deps = [ "arena_promise", + "closure", "error", "grpc_sockaddr", "iomgr_fwd", @@ -2607,6 +2611,7 @@ grpc_cc_library( language = "c++", deps = [ "arena_promise", + "closure", "error", "iomgr_fwd", "unique_type_name", @@ -2644,6 +2649,7 @@ grpc_cc_library( language = "c++", tags = ["nofixdeps"], deps = [ + "closure", "env", "error", "grpc_external_account_credentials", @@ -2718,6 +2724,7 @@ grpc_cc_library( language = "c++", deps = [ "arena_promise", + "closure", "error", "iomgr_fwd", "ref_counted", @@ -2792,6 +2799,7 @@ grpc_cc_library( deps = [ "activity", "arena_promise", + "closure", "context", "error", "httpcli_ssl_credentials", @@ -2845,6 +2853,7 @@ grpc_cc_library( ], language = "c++", deps = [ + "closure", "env", "error", "grpc_oauth2_credentials", @@ -2881,6 +2890,7 @@ grpc_cc_library( language = "c++", deps = [ "arena_promise", + "closure", "error", "iomgr_fwd", "unique_type_name", @@ -3308,6 +3318,7 @@ grpc_cc_library( "channel_fwd", "channel_init", "channel_stack_type", + "closure", "error", "gpr_atm", "grpc_sockaddr", @@ -3381,6 +3392,7 @@ grpc_cc_library( ], language = "c++", deps = [ + "closure", "dual_ref_counted", "error", "grpc_fake_credentials", @@ -3498,6 +3510,7 @@ grpc_cc_library( "certificate_provider_registry", "channel_creds_registry", "channel_fwd", + "closure", "default_event_engine", "env", "envoy_admin_upb", @@ -4475,6 +4488,7 @@ grpc_cc_library( ], language = "c++", deps = [ + "closure", "env", "error", "grpc_xds_client", @@ -4621,6 +4635,7 @@ grpc_cc_library( deps = [ "channel_args_preconditioning", "channel_stack_type", + "closure", "error", "grpc_insecure_credentials", "handshaker_registry", @@ -4666,6 +4681,7 @@ grpc_cc_library( ], language = "c++", deps = [ + "closure", "error", "grpc_insecure_credentials", "handshaker_registry", @@ -4716,6 +4732,7 @@ grpc_cc_library( "arena", "channel_args_preconditioning", "channel_stack_type", + "closure", "error", "iomgr_fwd", "slice", diff --git a/src/core/ext/transport/cronet/BUILD b/src/core/ext/transport/cronet/BUILD index da811f5a994..3e8303b9608 100644 --- a/src/core/ext/transport/cronet/BUILD +++ b/src/core/ext/transport/cronet/BUILD @@ -49,5 +49,6 @@ grpc_cc_library( deps = [ "//:grpc_base", "//:grpc_transport_chttp2", + "//src/core:closure", ], ) diff --git a/test/core/channel/BUILD b/test/core/channel/BUILD index 516976b2103..3ad7ecfb738 100644 --- a/test/core/channel/BUILD +++ b/test/core/channel/BUILD @@ -57,6 +57,7 @@ grpc_cc_test( "//:channel_stack_builder", "//:gpr", "//:grpc", + "//src/core:closure", "//test/core/util:grpc_test_util", ], ) diff --git a/test/core/client_channel/resolvers/BUILD b/test/core/client_channel/resolvers/BUILD index 48b3f25d5f1..ac44f5d0c85 100644 --- a/test/core/client_channel/resolvers/BUILD +++ b/test/core/client_channel/resolvers/BUILD @@ -53,6 +53,7 @@ grpc_cc_test( deps = [ "//:gpr", "//:grpc", + "//src/core:closure", "//test/core/util:grpc_test_util", ], ) diff --git a/test/core/end2end/BUILD b/test/core/end2end/BUILD index 08cb717d449..f1d0d72a14c 100644 --- a/test/core/end2end/BUILD +++ b/test/core/end2end/BUILD @@ -70,6 +70,7 @@ grpc_cc_library( "//:httpcli", "//:sockaddr_utils", "//src/core:channel_args_preconditioning", + "//src/core:closure", "//src/core:error", "//src/core:iomgr_fwd", "//src/core:pollset_set", @@ -118,6 +119,7 @@ grpc_cc_test( "//:gpr", "//:grpc", "//:grpc_public_hdrs", + "//src/core:closure", "//src/core:error", "//src/core:gpr_atm", "//src/core:iomgr_fwd", @@ -182,6 +184,7 @@ grpc_cc_test( "//:grpc_public_hdrs", "//:grpc_resolver_dns_ares", "//:server_address", + "//src/core:closure", "//src/core:default_event_engine", "//src/core:error", "//src/core:grpc_sockaddr", diff --git a/test/core/end2end/fuzzers/BUILD b/test/core/end2end/fuzzers/BUILD index a4a03a433d4..87786fcdc73 100644 --- a/test/core/end2end/fuzzers/BUILD +++ b/test/core/end2end/fuzzers/BUILD @@ -38,6 +38,7 @@ grpc_proto_fuzzer( deps = [ "//:gpr", "//:grpc", + "//src/core:closure", "//src/core:slice", "//test/core/end2end:ssl_test_data", "//test/core/event_engine/fuzzing_event_engine", diff --git a/test/core/filters/BUILD b/test/core/filters/BUILD index b57785713ad..24a6536540a 100644 --- a/test/core/filters/BUILD +++ b/test/core/filters/BUILD @@ -58,6 +58,7 @@ grpc_proto_fuzzer( deps = [ "//:gpr", "//:grpc", + "//src/core:closure", "//test/core/end2end:ssl_test_data", "//test/core/util:grpc_test_util", ], diff --git a/test/core/handshake/BUILD b/test/core/handshake/BUILD index 291a6e05e1f..23ab88bb2d7 100644 --- a/test/core/handshake/BUILD +++ b/test/core/handshake/BUILD @@ -82,6 +82,7 @@ grpc_cc_test( ":server_ssl_common", "//:gpr", "//:grpc", + "//src/core:closure", "//test/core/util:grpc_test_util", ], ) diff --git a/test/core/http/BUILD b/test/core/http/BUILD index 83bf13ad76a..b08e5ea7bd3 100644 --- a/test/core/http/BUILD +++ b/test/core/http/BUILD @@ -114,6 +114,7 @@ grpc_cc_test( ":httpcli_test_util", "//:gpr", "//:grpc", + "//src/core:closure", "//test/core/end2end:ssl_test_data", "//test/core/util:fake_udp_and_tcp_server", "//test/core/util:grpc_test_util", diff --git a/test/core/surface/BUILD b/test/core/surface/BUILD index a405836582f..57bf61ef3da 100644 --- a/test/core/surface/BUILD +++ b/test/core/surface/BUILD @@ -64,6 +64,7 @@ grpc_cc_test( deps = [ "//:gpr", "//:grpc", + "//src/core:closure", "//test/core/util:grpc_test_util", ], ) @@ -93,6 +94,7 @@ grpc_cc_test( deps = [ "//:gpr", "//:grpc", + "//src/core:closure", "//test/core/end2end:cq_verifier", "//test/core/util:grpc_test_util", ], diff --git a/test/core/transport/chttp2/BUILD b/test/core/transport/chttp2/BUILD index 5af23f1a159..d3715be6091 100644 --- a/test/core/transport/chttp2/BUILD +++ b/test/core/transport/chttp2/BUILD @@ -163,6 +163,7 @@ grpc_cc_test( deps = [ "//:gpr", "//:grpc", + "//src/core:closure", "//src/core:slice", "//test/core/end2end:cq_verifier", "//test/core/util:grpc_test_util", @@ -239,6 +240,7 @@ grpc_cc_test( "//:channel_stack_builder", "//:gpr", "//:grpc", + "//src/core:closure", "//src/core:slice", "//test/core/end2end:cq_verifier", "//test/core/util:grpc_test_util", @@ -256,6 +258,7 @@ grpc_cc_test( deps = [ "//:gpr", "//:grpc", + "//src/core:closure", "//test/core/util:grpc_test_util", "//test/core/util:grpc_test_util_base", ], diff --git a/test/core/util/BUILD b/test/core/util/BUILD index 3059188c2f3..9b66c831a1c 100644 --- a/test/core/util/BUILD +++ b/test/core/util/BUILD @@ -95,6 +95,7 @@ grpc_cc_library( "//:iomgr_timer", "//:ref_counted_ptr", "//src/core:arena", + "//src/core:closure", "//src/core:grpc_authorization_base", "//src/core:grpc_sockaddr", "//src/core:iomgr_fwd", @@ -136,6 +137,7 @@ grpc_cc_library( "//:tsi_ssl_credentials", "//:uri_parser", "//src/core:channel_args_preconditioning", + "//src/core:closure", "//src/core:error", "//src/core:gpr_atm", "//src/core:grpc_sockaddr", @@ -175,6 +177,7 @@ grpc_cc_library( "//:ref_counted_ptr", "//:uri_parser", "//src/core:channel_args_preconditioning", + "//src/core:closure", "//src/core:error", "//src/core:gpr_atm", "//src/core:grpc_sockaddr", diff --git a/test/cpp/common/BUILD b/test/cpp/common/BUILD index 4ed3ac7cdb7..44e2eaafffb 100644 --- a/test/cpp/common/BUILD +++ b/test/cpp/common/BUILD @@ -41,6 +41,7 @@ grpc_cc_test( flaky = True, deps = [ "//:grpc++", + "//src/core:closure", "//test/core/util:grpc_test_util", ], ) @@ -61,6 +62,7 @@ grpc_cc_test( ], deps = [ "//:grpc++", + "//src/core:closure", "//test/core/util:grpc_test_util", ], ) diff --git a/test/cpp/microbenchmarks/BUILD b/test/cpp/microbenchmarks/BUILD index 604d7c35f3c..96c3aed38bb 100644 --- a/test/cpp/microbenchmarks/BUILD +++ b/test/cpp/microbenchmarks/BUILD @@ -137,7 +137,10 @@ grpc_cc_test( "no_mac", "no_windows", ], - deps = [":helpers"], + deps = [ + ":helpers", + "//src/core:closure", + ], ) grpc_cc_test( @@ -340,6 +343,7 @@ grpc_cc_test( ], deps = [ ":helpers", + "//src/core:closure", "//src/core:slice", ], )