diff --git a/BUILD b/BUILD index 9b672a627d94c..2db3f2cb99f56 100644 --- a/BUILD +++ b/BUILD @@ -598,6 +598,7 @@ grpc_cc_library( "//src/core:server_call_tracer_filter", "//src/core:service_config_channel_arg_filter", "//src/core:slice", + "//src/core:sync", "//src/core:tcp_connect_handshaker", ], ) @@ -707,6 +708,7 @@ grpc_cc_library( "//src/core:service_config_channel_arg_filter", "//src/core:slice", "//src/core:slice_refcount", + "//src/core:sync", "//src/core:tcp_connect_handshaker", "//src/core:useful", ], @@ -728,22 +730,15 @@ grpc_cc_library( "//src/core:util/posix/cpu.cc", "//src/core:util/posix/stat.cc", "//src/core:util/posix/string.cc", - "//src/core:util/posix/sync.cc", "//src/core:util/posix/thd.cc", - "//src/core:util/posix/time.cc", "//src/core:util/posix/tmpfile.cc", "//src/core:util/string.cc", - "//src/core:util/sync.cc", - "//src/core:util/sync_abseil.cc", - "//src/core:util/time_precise.cc", "//src/core:util/time_util.cc", "//src/core:util/windows/cpu.cc", "//src/core:util/windows/stat.cc", "//src/core:util/windows/string.cc", "//src/core:util/windows/string_util.cc", - "//src/core:util/windows/sync.cc", "//src/core:util/windows/thd.cc", - "//src/core:util/windows/time.cc", "//src/core:util/windows/tmpfile.cc", ], hdrs = [ @@ -755,10 +750,7 @@ grpc_cc_library( "//src/core:util/mpscq.h", "//src/core:util/stat.h", "//src/core:util/string.h", - "//src/core:util/sync.h", "//src/core:util/thd.h", - "//src/core:util/time_precise.h", - "//src/core:util/time_util.h", "//src/core:util/tmpfile.h", ], external_deps = [ @@ -791,9 +783,13 @@ grpc_cc_library( "//src/core:event_engine_thread_local", "//src/core:examine_stack", "//src/core:gpr_atm", + "//src/core:gpr_time", "//src/core:no_destruct", "//src/core:strerror", + "//src/core:sync", "//src/core:tchar", + "//src/core:time_precise", + "//src/core:time_util", "//src/core:useful", ], ) @@ -991,8 +987,8 @@ grpc_cc_library( ], external_deps = [ "absl/base:core_headers", + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", @@ -1015,6 +1011,7 @@ grpc_cc_library( "//src/core:slice", "//src/core:slice_refcount", "//src/core:status_helper", + "//src/core:sync", "//src/core:useful", ], ) @@ -1260,8 +1257,8 @@ grpc_cc_library( ], external_deps = [ "absl/base:core_headers", + "absl/log", "absl/log:check", - "absl/log:log", "absl/status:statusor", "absl/strings", ], @@ -1281,7 +1278,9 @@ grpc_cc_library( "//src/core:ref_counted", "//src/core:resolved_address", "//src/core:slice", + "//src/core:sync", "//src/core:time", + "//src/core:time_precise", "//src/core:useful", ], ) @@ -1509,7 +1508,6 @@ grpc_cc_library( public_hdrs = GRPC_PUBLIC_HDRS + GRPC_PUBLIC_EVENT_ENGINE_HDRS, visibility = ["@grpc:alt_grpc_base_legacy"], deps = [ - "byte_buffer", "channel_arg_names", "config_vars", "debug_location", @@ -1562,7 +1560,9 @@ grpc_cc_library( "//src/core:socket_mutator", "//src/core:stats_data", "//src/core:strerror", + "//src/core:sync", "//src/core:time", + "//src/core:time_util", "//src/core:useful", "//src/core:windows_event_engine", "//src/core:windows_event_engine_listener", @@ -1636,6 +1636,7 @@ grpc_cc_library( "//src/core:resource_quota", "//src/core:slice", "//src/core:stats_data", + "//src/core:sync", "//src/core:time", ], ) @@ -1682,6 +1683,7 @@ grpc_cc_library( "//src/core:resource_quota", "//src/core:slice", "//src/core:stats_data", + "//src/core:sync", "//src/core:time", ], ) @@ -1798,6 +1800,7 @@ grpc_cc_library( "//src/core:slice", "//src/core:slice_buffer", "//src/core:status_helper", + "//src/core:sync", "//src/core:time", "//src/core:try_join", "//src/core:try_seq", @@ -1880,6 +1883,7 @@ grpc_cc_library( public_hdrs = GRPC_PUBLIC_HDRS + GRPC_PUBLIC_EVENT_ENGINE_HDRS, visibility = ["@grpc:alt_grpc_base_legacy"], deps = [ + "byte_buffer", "call_combiner", "call_tracer", "channel", @@ -1961,7 +1965,9 @@ grpc_cc_library( "//src/core:stats_data", "//src/core:status_flag", "//src/core:status_helper", + "//src/core:sync", "//src/core:time", + "//src/core:time_precise", "//src/core:transport_fwd", "//src/core:try_seq", "//src/core:unique_type_name", @@ -2050,6 +2056,7 @@ grpc_cc_library( ":gpr", ":grpc++", ":lb_load_reporter", + "//src/core:sync", "//src/proto/grpc/lb/v1:load_reporter_cc_grpc", ], ) @@ -2095,6 +2102,7 @@ grpc_cc_library( "gpr", "lb_get_cpu_stats", "lb_load_data_store", + "//src/core:sync", "//src/proto/grpc/lb/v1:load_reporter_cc_grpc", ], ) @@ -2128,8 +2136,8 @@ grpc_cc_library( "absl/base:core_headers", "absl/container:inlined_vector", "absl/functional:any_invocable", + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", @@ -2179,6 +2187,7 @@ grpc_cc_library( "//src/core:slice_refcount", "//src/core:stats_data", "//src/core:status_helper", + "//src/core:sync", "//src/core:try_seq", "//src/core:unique_type_name", "//src/core:useful", @@ -2362,6 +2371,7 @@ grpc_cc_library( "//src/core:slice_refcount", "//src/core:socket_mutator", "//src/core:status_helper", + "//src/core:sync", "//src/core:thread_quota", "//src/core:time", "//src/core:useful", @@ -2441,6 +2451,7 @@ grpc_cc_library( "//src/core:resource_quota", "//src/core:slice", "//src/core:socket_mutator", + "//src/core:sync", "//src/core:thread_quota", "//src/core:time", "//src/core:useful", @@ -2754,6 +2765,7 @@ grpc_cc_library( "//src/core:slice", "//src/core:slice_buffer", "//src/core:slice_refcount", + "//src/core:sync", ], ) @@ -2875,6 +2887,7 @@ grpc_cc_library( "//src/core:experiments", "//src/core:latent_see", "//src/core:stats_data", + "//src/core:sync", ], ) @@ -3038,8 +3051,8 @@ grpc_cc_library( "absl/base:core_headers", "absl/container:inlined_vector", "absl/functional:any_invocable", + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings:str_format", @@ -3066,6 +3079,7 @@ grpc_cc_library( "//src/core:slice", "//src/core:slice_buffer", "//src/core:status_helper", + "//src/core:sync", "//src/core:time", ], ) @@ -3103,6 +3117,7 @@ grpc_cc_library( "//src/core:iomgr_fwd", "//src/core:slice", "//src/core:slice_buffer", + "//src/core:sync", ], ) @@ -3121,8 +3136,8 @@ grpc_cc_library( "//src/core:lib/iomgr/iomgr_internal.h", ], external_deps = [ + "absl/log", "absl/log:check", - "absl/log:log", "absl/strings:str_format", ], visibility = [ @@ -3141,6 +3156,7 @@ grpc_cc_library( "//src/core:gpr_spinlock", "//src/core:latent_see", "//src/core:time", + "//src/core:time_precise", "//src/core:useful", ], ) @@ -3251,6 +3267,7 @@ grpc_cc_library( "iomgr_internal_errqueue", "//src/core:error", "//src/core:iomgr_port", + "//src/core:sync", ], ) @@ -3480,13 +3497,12 @@ grpc_cc_library( "//src/core:load_balancing/oob_backend_metric_internal.h", ], external_deps = [ + "@com_google_protobuf//upb:mem", "absl/base:core_headers", + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/strings", - "@com_google_protobuf//upb:base", - "@com_google_protobuf//upb:mem", ], deps = [ "channelz", @@ -3500,7 +3516,6 @@ grpc_cc_library( "protobuf_duration_upb", "ref_counted_ptr", "xds_orca_service_upb", - "xds_orca_upb", "//src/core:backend_metric_parser", "//src/core:closure", "//src/core:error", @@ -3509,6 +3524,7 @@ grpc_cc_library( "//src/core:pollset_set", "//src/core:slice", "//src/core:subchannel_interface", + "//src/core:sync", "//src/core:time", "//src/core:unique_type_name", ], @@ -3623,7 +3639,6 @@ grpc_cc_library( "//src/core:backend_metric_parser", "//src/core:blackboard", "//src/core:call_destination", - "//src/core:call_filters", "//src/core:call_spine", "//src/core:cancel_callback", "//src/core:channel_args", @@ -3686,7 +3701,9 @@ grpc_cc_library( "//src/core:subchannel_connector", "//src/core:subchannel_interface", "//src/core:subchannel_pool_interface", + "//src/core:sync", "//src/core:time", + "//src/core:time_precise", "//src/core:try_seq", "//src/core:unique_type_name", "//src/core:useful", @@ -3711,8 +3728,8 @@ grpc_cc_library( external_deps = [ "absl/base:core_headers", "absl/functional:any_invocable", + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", @@ -3729,7 +3746,6 @@ grpc_cc_library( "endpoint_addresses", "exec_ctx", "gpr", - "grpc_base", "grpc_grpclb_balancer_addresses", "grpc_resolver", "grpc_service_config_impl", @@ -3755,6 +3771,7 @@ grpc_cc_library( "//src/core:service_config_helper", "//src/core:slice", "//src/core:status_helper", + "//src/core:sync", "//src/core:time", ], ) @@ -3774,8 +3791,8 @@ grpc_cc_library( external_deps = [ "absl/base:core_headers", "absl/functional:bind_front", + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", @@ -3812,6 +3829,7 @@ grpc_cc_library( "//src/core:slice", "//src/core:slice_refcount", "//src/core:status_helper", + "//src/core:sync", "//src/core:tcp_connect_handshaker", "//src/core:time", ], @@ -3991,18 +4009,16 @@ grpc_cc_library( "//src/core:tsi/alts/handshaker/alts_tsi_utils.h", ], external_deps = [ + "@com_google_protobuf//upb:mem", + "absl/log", "absl/log:check", - "absl/log:log", "absl/strings", - "@com_google_protobuf//upb:base", - "@com_google_protobuf//upb:mem", ], visibility = ["@grpc:public"], deps = [ "alts_upb", "alts_util", "channel", - "channel_create", "exec_ctx", "gpr", "grpc_base", @@ -4015,6 +4031,7 @@ grpc_cc_library( "//src/core:env", "//src/core:pollset_set", "//src/core:slice", + "//src/core:sync", ], ) @@ -4082,8 +4099,8 @@ grpc_cc_library( "//src/core:tsi/ssl/session_cache/ssl_session_cache.h", ], external_deps = [ + "absl/log", "absl/log:check", - "absl/log:log", "absl/memory", "libssl", ], @@ -4094,6 +4111,7 @@ grpc_cc_library( "grpc_public_hdrs", "//src/core:ref_counted", "//src/core:slice", + "//src/core:sync", ], ) @@ -4141,6 +4159,7 @@ grpc_cc_library( "//src/core:load_file", "//src/core:ref_counted", "//src/core:slice", + "//src/core:sync", "//src/core:tsi_ssl_types", "//src/core:useful", ], @@ -4295,6 +4314,7 @@ grpc_cc_library( "//src/core:per_cpu", "//src/core:ref_counted", "//src/core:ref_counted_string", + "//src/core:sync", "//src/core:time", "//src/core:upb_utils", "//src/core:useful", @@ -4351,6 +4371,7 @@ grpc_cc_library( "//src/core:channel_args", "//src/core:notification", "//src/core:ref_counted", + "//src/core:sync", "//src/core:useful", ], ) diff --git a/src/core/BUILD b/src/core/BUILD index 5bf4e210cbd74..3515f62d6e862 100644 --- a/src/core/BUILD +++ b/src/core/BUILD @@ -83,16 +83,15 @@ grpc_cc_library( "lib/event_engine/extensions/tcp_trace.h", ], external_deps = [ - "absl/status:statusor", "absl/functional:any_invocable", + "absl/status:statusor", "absl/strings", ], visibility = [ "@grpc:event_engine_base_hdrs", ], deps = [ - ":memory_quota", - ":slice_buffer", + "memory_quota", "//:event_engine_base_hdrs", "//:gpr_platform", "//:tcp_tracer", @@ -128,7 +127,6 @@ grpc_cc_library( "slice_cast", "slice_refcount", "//:event_engine_base_hdrs", - "//:gpr", "//:gpr_platform", ], ) @@ -144,7 +142,6 @@ grpc_cc_library( ], deps = [ "slice_buffer", - "//:event_engine_base_hdrs", "//:gpr_platform", ], ) @@ -172,6 +169,7 @@ grpc_cc_library( deps = [ "per_cpu", "ring_buffer", + "sync", "//:gpr", ], ) @@ -182,11 +180,7 @@ grpc_cc_library( hdrs = [ "util/ring_buffer.h", ], - external_deps = [ - ], - deps = [ - "//:gpr_platform", - ], + deps = ["//:gpr_platform"], ) grpc_cc_library( @@ -252,7 +246,6 @@ grpc_cc_library( "slice", "//:call_tracer", "//:gpr_platform", - "//:grpc_base", ], ) @@ -313,7 +306,6 @@ grpc_cc_library( "absl/log:check", "absl/numeric:bits", ], - deps = ["//:gpr_platform"], ) grpc_cc_library( @@ -339,10 +331,7 @@ grpc_cc_library( "//:include/grpc/impl/codegen/atm_gcc_sync.h", "//:include/grpc/impl/codegen/atm_windows.h", ], - deps = [ - "useful", - "//:gpr_platform", - ], + deps = ["//:gpr_platform"], ) grpc_cc_library( @@ -369,6 +358,96 @@ grpc_cc_library( ], ) +grpc_cc_library( + name = "gpr_time", + srcs = [ + "util/gpr_time.cc", + "util/posix/time.cc", + "util/windows/time.cc", + ], + hdrs = [ + "util/gpr_time.cc", + ], + external_deps = ["absl/log:check"], + tags = [ + "nofixdeps", + ], + deps = [ + "gpr_atm", + "time_precise", + "//:gpr_platform", + "//:gpr_public_hdrs", + ], +) + +grpc_cc_library( + name = "time_precise", + srcs = [ + "util/time_precise.cc", + ], + hdrs = [ + "util/time_precise.h", + ], + external_deps = ["absl/log"], + tags = [ + "nofixdeps", + ], + deps = [ + "//:gpr_platform", + "//:gpr_public_hdrs", + ], +) + +grpc_cc_library( + name = "time_util", + srcs = [ + "util/time_util.cc", + ], + hdrs = [ + "util/time_util.h", + ], + external_deps = [ + "absl/log:check", + "absl/time", + ], + tags = [ + "nofixdeps", + ], + deps = [ + "//:gpr_platform", + "//:gpr_public_hdrs", + ], +) + +grpc_cc_library( + name = "sync", + srcs = [ + "//src/core:util/posix/sync.cc", + "//src/core:util/sync.cc", + "//src/core:util/sync_abseil.cc", + "//src/core:util/windows/sync.cc", + ], + hdrs = [ + "util/sync.h", + ], + external_deps = [ + "absl/base", + "absl/base:core_headers", + "absl/log:check", + "absl/synchronization", + "absl/time", + ], + tags = [ + "nofixdeps", + ], + deps = [ + "gpr_atm", + "time_util", + "//:gpr_platform", + "//:gpr_public_hdrs", + ], +) + grpc_cc_library( name = "env", srcs = [ @@ -380,6 +459,8 @@ grpc_cc_library( "util/env.h", ], deps = [ + "no_destruct", + "sync", "tchar", "//:gpr_platform", ], @@ -400,18 +481,13 @@ grpc_cc_library( "absl/status:statusor", "absl/strings", ], - deps = [ - "//:gpr", - "//:gpr_platform", - ], + deps = ["//:gpr_platform"], ) grpc_cc_library( name = "chunked_vector", hdrs = ["util/chunked_vector.h"], - external_deps = [ - "absl/log:check", - ], + external_deps = ["absl/log:check"], deps = [ "arena", "gpr_manual_constructor", @@ -434,13 +510,13 @@ grpc_cc_library( "util/status_helper.h", ], external_deps = [ + "@com_google_protobuf//upb:base", + "@com_google_protobuf//upb:mem", "absl/log:check", "absl/status", "absl/strings", "absl/strings:cord", "absl/time", - "@com_google_protobuf//upb:base", - "@com_google_protobuf//upb:mem", ], deps = [ "percent_encoding", @@ -471,7 +547,7 @@ grpc_cc_library( "util/validation_errors.h", ], external_deps = [ - "absl/log:log", + "absl/log", "absl/status", "absl/strings", ], @@ -556,7 +632,6 @@ grpc_cc_library( ], deps = [ "construct_destruct", - "//:gpr", "//:gpr_platform", ], ) @@ -574,7 +649,6 @@ grpc_cc_library( ], deps = [ "promise_status", - "//:gpr", "//:gpr_platform", ], ) @@ -582,7 +656,7 @@ grpc_cc_library( grpc_cc_library( name = "map_pipe", external_deps = [ - "absl/log:log", + "absl/log", "absl/status", ], public_hdrs = [ @@ -595,7 +669,6 @@ grpc_cc_library( "poll", "promise_factory", "try_seq", - "//:gpr", "//:gpr_platform", ], ) @@ -610,11 +683,11 @@ grpc_cc_library( ], external_deps = [ "absl/base:core_headers", + "absl/log", "absl/log:check", - "absl/log:log", + "absl/random", "absl/strings", "absl/strings:str_format", - "absl/random", ], deps = [ "activity", @@ -626,7 +699,7 @@ grpc_cc_library( "poll", "promise_factory", "ref_counted", - "useful", + "sync", "//:event_engine_base_hdrs", "//:exec_ctx", "//:gpr", @@ -668,23 +741,16 @@ grpc_cc_library( grpc_cc_library( name = "promise_variant", public_hdrs = ["lib/promise/detail/promise_variant.h"], - deps = [ - ], ) grpc_cc_library( name = "match_promise", - external_deps = [ - "absl/strings", - ], public_hdrs = ["lib/promise/match_promise.h"], deps = [ "overload", - "poll", "promise_factory", "promise_like", "promise_variant", - "//:gpr_platform", ], ) @@ -718,6 +784,7 @@ grpc_cc_library( deps = [ "activity", "poll", + "sync", "//:gpr", ], ) @@ -779,9 +846,7 @@ grpc_cc_library( grpc_cc_library( name = "if", - external_deps = [ - "absl/status:statusor", - ], + external_deps = ["absl/status:statusor"], public_hdrs = ["lib/promise/if.h"], deps = [ "construct_destruct", @@ -850,8 +915,8 @@ grpc_cc_library( grpc_cc_library( name = "join_state", external_deps = [ + "absl/log", "absl/log:check", - "absl/log:log", ], public_hdrs = [ "lib/promise/detail/join_state.h", @@ -937,8 +1002,8 @@ grpc_cc_library( name = "seq_state", external_deps = [ "absl/base:core_headers", + "absl/log", "absl/log:check", - "absl/log:log", "absl/strings", ], public_hdrs = [ @@ -957,7 +1022,6 @@ grpc_cc_library( grpc_cc_library( name = "seq", - external_deps = ["absl/log:log"], public_hdrs = [ "lib/promise/seq.h", ], @@ -1018,6 +1082,7 @@ grpc_cc_library( "poll", "promise_factory", "promise_status", + "sync", "//:gpr", "//:grpc_trace", "//:orphanable", @@ -1071,8 +1136,8 @@ grpc_cc_library( grpc_cc_library( name = "latch", external_deps = [ + "absl/log", "absl/log:check", - "absl/log:log", "absl/strings", ], public_hdrs = [ @@ -1090,7 +1155,7 @@ grpc_cc_library( name = "inter_activity_latch", external_deps = [ "absl/base:core_headers", - "absl/log:log", + "absl/log", "absl/strings", ], public_hdrs = [ @@ -1099,6 +1164,7 @@ grpc_cc_library( deps = [ "activity", "poll", + "sync", "wait_set", "//:gpr", "//:grpc_trace", @@ -1111,8 +1177,8 @@ grpc_cc_library( "lib/promise/interceptor_list.h", ], external_deps = [ + "absl/log", "absl/log:check", - "absl/log:log", "absl/strings", "absl/strings:str_format", ], @@ -1133,8 +1199,8 @@ grpc_cc_library( "lib/promise/pipe.h", ], external_deps = [ + "absl/log", "absl/log:check", - "absl/log:log", "absl/strings", ], deps = [ @@ -1170,13 +1236,12 @@ grpc_cc_library( hdrs = [ "lib/promise/inter_activity_pipe.h", ], - external_deps = [ - "absl/base:core_headers", - ], + external_deps = ["absl/base:core_headers"], deps = [ "activity", "poll", "ref_counted", + "sync", "//:gpr", "//:ref_counted_ptr", ], @@ -1197,6 +1262,7 @@ grpc_cc_library( "poll", "ref_counted", "status_flag", + "sync", "wait_set", "//:gpr", "//:ref_counted_ptr", @@ -1216,6 +1282,7 @@ grpc_cc_library( deps = [ "activity", "poll", + "sync", "//:gpr", ], ) @@ -1223,8 +1290,8 @@ grpc_cc_library( grpc_cc_library( name = "for_each", external_deps = [ + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/strings", ], @@ -1236,7 +1303,6 @@ grpc_cc_library( "promise_factory", "promise_status", "status_flag", - "//:gpr", "//:gpr_platform", "//:grpc_trace", ], @@ -1245,8 +1311,8 @@ grpc_cc_library( grpc_cc_library( name = "ref_counted", external_deps = [ + "absl/log", "absl/log:check", - "absl/log:log", ], public_hdrs = ["util/ref_counted.h"], deps = [ @@ -1261,8 +1327,8 @@ grpc_cc_library( grpc_cc_library( name = "dual_ref_counted", external_deps = [ + "absl/log", "absl/log:check", - "absl/log:log", ], public_hdrs = ["util/dual_ref_counted.h"], deps = [ @@ -1355,6 +1421,7 @@ grpc_cc_library( "pollset_set", "resolved_address", "slice", + "sync", "//:config", "//:debug_location", "//:exec_ctx", @@ -1449,8 +1516,8 @@ grpc_cc_library( external_deps = [ "absl/base:core_headers", "absl/container:flat_hash_set", + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/strings", ], @@ -1466,6 +1533,7 @@ grpc_cc_library( "race", "seq", "slice_refcount", + "sync", "time", "useful", "//:gpr", @@ -1499,9 +1567,7 @@ grpc_cc_library( hdrs = [ "lib/resource_quota/arena.h", ], - external_deps = [ - "absl/log:log", - ], + external_deps = ["absl/log"], visibility = [ "@grpc:alt_grpc_base_legacy", ], @@ -1529,6 +1595,7 @@ grpc_cc_library( ], deps = [ "ref_counted", + "sync", "//:gpr", "//:ref_counted_ptr", ], @@ -1549,6 +1616,7 @@ grpc_cc_library( deps = [ "memory_quota", "ref_counted", + "sync", "//:gpr", "//:ref_counted_ptr", ], @@ -1567,7 +1635,6 @@ grpc_cc_library( "@grpc:alt_grpc_base_legacy", ], deps = [ - "connection_quota", "memory_quota", "ref_counted", "thread_quota", @@ -1588,9 +1655,7 @@ grpc_cc_library( hdrs = [ "call/request_buffer.h", ], - external_deps = [ - "absl/strings", - ], + external_deps = ["absl/strings"], deps = [ "call_spine", "match", @@ -1604,9 +1669,6 @@ grpc_cc_library( hdrs = [ "lib/slice/slice_refcount.h", ], - external_deps = [ - "absl/log:log", - ], public_hdrs = [ "//:include/grpc/slice.h", ], @@ -1654,9 +1716,7 @@ grpc_cc_library( "lib/slice/slice_buffer.h", "//:include/grpc/slice_buffer.h", ], - external_deps = [ - "absl/log:check", - ], + external_deps = ["absl/log:check"], deps = [ "slice", "slice_refcount", @@ -1673,8 +1733,8 @@ grpc_cc_library( "lib/iomgr/error.h", ], external_deps = [ + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/strings", "absl/strings:str_format", @@ -1702,8 +1762,8 @@ grpc_cc_library( "lib/iomgr/closure.h", ], external_deps = [ + "absl/log", "absl/log:check", - "absl/log:log", "absl/strings:str_format", ], visibility = ["@grpc:alt_grpc_base_legacy"], @@ -1724,12 +1784,13 @@ grpc_cc_library( "util/time.h", ], external_deps = [ + "absl/log", "absl/log:check", - "absl/log:log", "absl/strings:str_format", ], deps = [ "no_destruct", + "time_precise", "useful", "//:event_engine_base_hdrs", "//:gpr", @@ -1765,9 +1826,7 @@ grpc_cc_library( "lib/iomgr/sockaddr_windows.h", "lib/iomgr/socket_utils.h", ], - external_deps = [ - "absl/log:check", - ], + external_deps = ["absl/log:check"], deps = [ "iomgr_port", "//:gpr", @@ -1804,13 +1863,9 @@ grpc_cc_library( hdrs = [ "lib/event_engine/forkable.h", ], - external_deps = [ - "absl/log:check", - "absl/log:log", - ], + external_deps = ["absl/log:check"], deps = [ "//:config_vars", - "//:gpr", "//:gpr_platform", "//:grpc_trace", ], @@ -1877,6 +1932,7 @@ grpc_cc_library( deps = [ "common_event_engine_closures", "event_engine_work_queue", + "sync", "//:event_engine_base_hdrs", "//:gpr", ], @@ -1902,10 +1958,9 @@ grpc_cc_library( "lib/event_engine/posix_engine/timer.h", "lib/event_engine/posix_engine/timer_heap.h", ], - external_deps = [ - "absl/base:core_headers", - ], + external_deps = ["absl/base:core_headers"], deps = [ + "sync", "time", "time_averaged_stats", "useful", @@ -1928,13 +1983,14 @@ grpc_cc_library( ], hdrs = ["lib/event_engine/thread_pool/thread_count.h"], external_deps = [ - "absl/log:log", "absl/base:core_headers", - "absl/time", + "absl/log", "absl/status", "absl/strings:str_format", + "absl/time", ], deps = [ + "sync", "time", "useful", "//:gpr", @@ -1970,6 +2026,7 @@ grpc_cc_library( "forkable", "no_destruct", "notification", + "sync", "time", "//:backoff", "//:event_engine_base_hdrs", @@ -1984,11 +2041,6 @@ grpc_cc_library( hdrs = [ "lib/event_engine/posix.h", ], - external_deps = [ - "absl/functional:any_invocable", - "absl/status", - "absl/status:statusor", - ], deps = [ "event_engine_extensions", "event_engine_query_extensions", @@ -2005,8 +2057,8 @@ grpc_cc_library( ], external_deps = [ "absl/base:core_headers", + "absl/log", "absl/log:check", - "absl/log:log", "absl/time", ], deps = [ @@ -2014,6 +2066,7 @@ grpc_cc_library( "forkable", "notification", "posix_event_engine_timer", + "sync", "time", "//:event_engine_base_hdrs", "//:gpr", @@ -2162,8 +2215,8 @@ grpc_cc_library( "absl/base:core_headers", "absl/container:inlined_vector", "absl/functional:function_ref", + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", @@ -2181,6 +2234,7 @@ grpc_cc_library( "posix_event_engine_wakeup_fd_posix_default", "status_helper", "strerror", + "sync", "//:event_engine_base_hdrs", "//:gpr", "//:grpc_public_hdrs", @@ -2217,6 +2271,7 @@ grpc_cc_library( "posix_event_engine_wakeup_fd_posix_default", "status_helper", "strerror", + "sync", "time", "//:event_engine_base_hdrs", "//:gpr", @@ -2253,9 +2308,7 @@ grpc_cc_library( hdrs = [ "lib/event_engine/posix_engine/internal_errqueue.h", ], - external_deps = [ - "absl/log:log", - ], + external_deps = ["absl/log"], deps = [ "iomgr_port", "strerror", @@ -2273,12 +2326,13 @@ grpc_cc_library( ], external_deps = [ "absl/functional:any_invocable", - "absl/log:log", + "absl/log", "absl/status", ], deps = [ "iomgr_port", "posix_event_engine_internal_errqueue", + "sync", "//:gpr", ], ) @@ -2296,7 +2350,7 @@ grpc_cc_library( "absl/container:flat_hash_map", "absl/functional:any_invocable", "absl/hash", - "absl/log:log", + "absl/log", "absl/log:check", "absl/status", "absl/status:statusor", @@ -2319,9 +2373,9 @@ grpc_cc_library( "ref_counted", "resource_quota", "slice", - "stats_data", "status_helper", "strerror", + "sync", "time", "//:debug_location", "//:event_engine_base_hdrs", @@ -2339,7 +2393,6 @@ grpc_cc_library( srcs = ["lib/event_engine/utils.cc"], hdrs = ["lib/event_engine/utils.h"], external_deps = [ - "absl/log:check", "absl/status:statusor", "absl/strings", ], @@ -2361,8 +2414,8 @@ grpc_cc_library( ], external_deps = [ "absl/cleanup", + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", @@ -2393,8 +2446,8 @@ grpc_cc_library( ], external_deps = [ "absl/cleanup", + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", @@ -2439,6 +2492,7 @@ grpc_cc_library( "socket_mutator", "status_helper", "strerror", + "sync", "time", "//:event_engine_base_hdrs", "//:exec_ctx", @@ -2457,8 +2511,8 @@ grpc_cc_library( "absl/container:flat_hash_map", "absl/functional:any_invocable", "absl/hash", + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", @@ -2486,6 +2540,7 @@ grpc_cc_library( "posix_event_engine_timer", "posix_event_engine_timer_manager", "ref_counted_dns_resolver_interface", + "sync", "useful", "//:event_engine_base_hdrs", "//:gpr", @@ -2499,8 +2554,8 @@ grpc_cc_library( srcs = ["lib/event_engine/windows/windows_engine.cc"], hdrs = ["lib/event_engine/windows/windows_engine.h"], external_deps = [ + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", @@ -2518,6 +2573,7 @@ grpc_cc_library( "init_internally", "iomgr_port", "posix_event_engine_timer_manager", + "sync", "time", "windows_endpoint", "windows_event_engine_listener", @@ -2532,7 +2588,10 @@ grpc_cc_library( name = "windows_native_resolver", srcs = ["lib/event_engine/windows/native_windows_dns_resolver.cc"], hdrs = ["lib/event_engine/windows/native_windows_dns_resolver.h"], - external_deps = ["absl/strings:str_format"], + external_deps = [ + "absl/strings", + "absl/strings:str_format", + ], deps = [ "error", "status_helper", @@ -2554,8 +2613,8 @@ grpc_cc_library( external_deps = [ "absl/base:core_headers", "absl/functional:any_invocable", + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/strings:str_format", ], @@ -2565,6 +2624,7 @@ grpc_cc_library( "event_engine_tcp_socket_utils", "event_engine_thread_pool", "event_engine_time_util", + "sync", "//:debug_location", "//:event_engine_base_hdrs", "//:gpr", @@ -2583,8 +2643,8 @@ grpc_cc_library( external_deps = [ "absl/cleanup", "absl/functional:any_invocable", + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/strings:str_format", ], @@ -2611,8 +2671,8 @@ grpc_cc_library( ], external_deps = [ "absl/base:core_headers", + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings:str_format", @@ -2622,6 +2682,8 @@ grpc_cc_library( "error", "event_engine_tcp_socket_utils", "event_engine_thread_pool", + "iomgr_port", + "sync", "windows_endpoint", "windows_iocp", "//:event_engine_base_hdrs", @@ -2645,8 +2707,9 @@ grpc_cc_library( ], external_deps = [ "absl/container:flat_hash_map", + "absl/log", "absl/log:check", - "absl/log:log", + "absl/status", "absl/strings", "absl/strings:str_format", ], @@ -2662,6 +2725,7 @@ grpc_cc_library( "posix_event_engine_timer_manager", "ref_counted", "strerror", + "sync", "//:event_engine_base_hdrs", "//:gpr", "//:parse_address", @@ -2679,8 +2743,8 @@ grpc_cc_library( "lib/event_engine/tcp_socket_utils.h", ], external_deps = [ + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", @@ -2761,9 +2825,7 @@ grpc_cc_library( hdrs = [ "lib/event_engine/channel_args_endpoint_config.h", ], - external_deps = [ - "absl/strings", - ], + external_deps = ["absl/strings"], visibility = ["@grpc:alt_grpc_base_legacy"], deps = [ "channel_args", @@ -2783,6 +2845,7 @@ grpc_cc_library( "absl/strings", ], deps = [ + "sync", "//:event_engine_base_hdrs", "//:gpr", ], @@ -2820,13 +2883,13 @@ grpc_cc_library( "default_event_engine_factory", "match", "no_destruct", + "sync", "thready_event_engine", "wait_for_single_owner", "//:config", "//:debug_location", "//:event_engine_base_hdrs", "//:gpr", - "//:grpc_trace", ], ) @@ -2882,8 +2945,8 @@ grpc_cc_library( "absl/container:flat_hash_map", "absl/functional:any_invocable", "absl/hash", + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", @@ -2903,6 +2966,7 @@ grpc_cc_library( "ref_counted_dns_resolver_interface", "resolved_address", "slice", + "sync", "windows_iocp", "//:config_vars", "//:debug_location", @@ -2938,8 +3002,8 @@ grpc_cc_library( ], hdrs = ["lib/transport/bdp_estimator.h"], external_deps = [ + "absl/log", "absl/log:check", - "absl/log:log", "absl/strings", ], deps = [ @@ -2957,9 +3021,7 @@ grpc_cc_library( hdrs = [ "lib/slice/percent_encoding.h", ], - external_deps = [ - "absl/log:check", - ], + external_deps = ["absl/log:check"], deps = [ "bitset", "slice", @@ -3055,6 +3117,8 @@ grpc_cc_library( ], deps = [ "per_cpu", + "sync", + "time_precise", "//:gpr", ], ) @@ -3107,8 +3171,8 @@ grpc_cc_library( ], external_deps = [ "absl/functional:any_invocable", + "absl/log", "absl/log:check", - "absl/log:log", "absl/strings", ], deps = [ @@ -3117,6 +3181,7 @@ grpc_cc_library( "channel_fwd", "channel_stack_type", "interception_chain", + "sync", "unique_type_name", "//:channel_stack_builder", "//:debug_location", @@ -3144,9 +3209,7 @@ grpc_cc_library( hdrs = [ "util/single_set_ptr.h", ], - external_deps = [ - "absl/log:check", - ], + external_deps = ["absl/log:check"], deps = ["//:gpr"], ) @@ -3156,10 +3219,7 @@ grpc_cc_library( "service_config/service_config.h", "service_config/service_config_call_data.h", ], - external_deps = [ - "absl/log:check", - "absl/strings", - ], + external_deps = ["absl/strings"], deps = [ "arena", "chunked_vector", @@ -3183,7 +3243,7 @@ grpc_cc_library( "service_config/service_config_parser.h", ], external_deps = [ - "absl/log:log", + "absl/log", "absl/strings", ], deps = [ @@ -3200,7 +3260,10 @@ grpc_cc_library( "util/notification.h", ], external_deps = ["absl/time"], - deps = ["//:gpr"], + deps = [ + "sync", + "//:gpr", + ], ) grpc_cc_library( @@ -3212,8 +3275,8 @@ grpc_cc_library( "lib/channel/channel_args.h", ], external_deps = [ + "absl/log", "absl/log:check", - "absl/log:log", "absl/meta:type_traits", "absl/strings", "absl/strings:str_format", @@ -3316,7 +3379,6 @@ grpc_cc_library( "//:channelz", "//:gpr_platform", "//:grpc_base", - "//:iomgr", "//:orphanable", "//:ref_counted_ptr", ], @@ -3359,7 +3421,6 @@ grpc_cc_library( ], deps = [ "arena", - "channel_args", "channel_fwd", "client_channel_internal_header", "grpc_service_config", @@ -3369,7 +3430,7 @@ grpc_cc_library( "slice", "unique_type_name", "useful", - "//:gpr_public_hdrs", + "//:gpr_platform", "//:grpc_public_hdrs", "//:ref_counted_ptr", ], @@ -3444,7 +3505,7 @@ grpc_cc_library( "client_channel/retry_service_config.h", ], external_deps = [ - "absl/log:log", + "absl/log", "absl/strings", ], deps = [ @@ -3458,7 +3519,7 @@ grpc_cc_library( "validation_errors", "//:channel_arg_names", "//:config", - "//:gpr_public_hdrs", + "//:gpr", "//:grpc_base", "//:grpc_public_hdrs", ], @@ -3475,6 +3536,7 @@ grpc_cc_library( external_deps = ["absl/base:core_headers"], deps = [ "ref_counted", + "sync", "useful", "//:gpr", "//:ref_counted_ptr", @@ -3490,7 +3552,7 @@ grpc_cc_library( "client_channel/backup_poller.h", ], external_deps = [ - "absl/log:log", + "absl/log", "absl/status", ], deps = [ @@ -3513,7 +3575,7 @@ grpc_cc_library( "service_config/service_config_channel_arg_filter.cc", ], external_deps = [ - "absl/log:log", + "absl/log", "absl/status", "absl/status:statusor", ], @@ -3532,7 +3594,6 @@ grpc_cc_library( "//:channel_arg_names", "//:config", "//:gpr_platform", - "//:gpr_public_hdrs", "//:grpc_base", "//:grpc_service_config_impl", "//:ref_counted_ptr", @@ -3562,11 +3623,11 @@ grpc_cc_library( "ref_counted", "resolved_address", "subchannel_interface", + "sync", "//:debug_location", "//:endpoint_addresses", "//:event_engine_base_hdrs", "//:exec_ctx", - "//:gpr", "//:gpr_platform", "//:grpc_trace", "//:orphanable", @@ -3596,8 +3657,8 @@ grpc_cc_library( srcs = ["load_balancing/lb_policy_registry.cc"], hdrs = ["load_balancing/lb_policy_registry.h"], external_deps = [ + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", @@ -3618,7 +3679,7 @@ grpc_cc_library( srcs = ["client_channel/lb_metadata.cc"], hdrs = ["client_channel/lb_metadata.h"], external_deps = [ - "absl/log:log", + "absl/log", "absl/strings", ], deps = [ @@ -3685,24 +3746,22 @@ grpc_cc_library( "load_balancing/backend_metric_parser.h", ], external_deps = [ - "absl/strings", "@com_google_protobuf//upb:base", "@com_google_protobuf//upb:mem", "@com_google_protobuf//upb:message", + "absl/strings", ], deps = [ "grpc_backend_metric_data", - "xds_orca_upb", "//:gpr_platform", + "//:xds_orca_upb", ], ) grpc_cc_library( name = "proxy_mapper", hdrs = ["handshaker/proxy_mapper.h"], - external_deps = [ - "absl/strings", - ], + external_deps = ["absl/strings"], deps = [ "channel_args", "resolved_address", @@ -3714,9 +3773,7 @@ grpc_cc_library( name = "proxy_mapper_registry", srcs = ["handshaker/proxy_mapper_registry.cc"], hdrs = ["handshaker/proxy_mapper_registry.h"], - external_deps = [ - "absl/strings", - ], + external_deps = ["absl/strings"], deps = [ "channel_args", "proxy_mapper", @@ -3734,8 +3791,8 @@ grpc_cc_library( "handshaker/http_connect/http_proxy_mapper.h", ], external_deps = [ + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", @@ -3743,13 +3800,11 @@ grpc_cc_library( deps = [ "channel_args", "env", - "experiments", "proxy_mapper", "resolved_address", "//:channel_arg_names", "//:config", "//:gpr", - "//:grpc_base", "//:http_connect_handshaker", "//:iomgr", "//:parse_address", @@ -3767,7 +3822,7 @@ grpc_cc_library( "handshaker/http_connect/xds_http_proxy_mapper.h", ], external_deps = [ - "absl/log:log", + "absl/log", "absl/strings", ], deps = [ @@ -3776,7 +3831,6 @@ grpc_cc_library( "resolved_address", "xds_endpoint", "//:config", - "//:grpc_base", "//:http_connect_handshaker", "//:parse_address", "//:sockaddr_utils", @@ -3800,7 +3854,6 @@ grpc_cc_library( "service_config_parser", "useful", "//:gpr_platform", - "//:grpc_base", "//:ref_counted_ptr", ], ) @@ -3831,6 +3884,7 @@ grpc_cc_library( "latent_see", "metadata_batch", "status_helper", + "sync", "//:gpr", "//:grpc_base", "//:promise", @@ -3873,12 +3927,11 @@ grpc_cc_library( "util/tdigest.h", ], external_deps = [ - "absl/strings", - "absl/status", - "absl/log:check", "absl/log", + "absl/log:check", + "absl/status", + "absl/strings", ], - deps = ["//:gpr_platform"], ) grpc_cc_library( @@ -3908,8 +3961,8 @@ grpc_cc_library( "lib/security/certificate_provider/certificate_provider_registry.h", ], external_deps = [ + "absl/log", "absl/log:check", - "absl/log:log", "absl/strings", ], deps = [ @@ -3938,6 +3991,7 @@ grpc_cc_library( "absl/time", ], deps = [ + "sync", "//:gpr", "//:grpc_base", ], @@ -3957,7 +4011,7 @@ grpc_cc_library( "lib/security/authorization/grpc_server_authz_filter.h", ], external_deps = [ - "absl/log:log", + "absl/log", "absl/status", "absl/status:statusor", "absl/strings", @@ -3969,7 +4023,6 @@ grpc_cc_library( "dual_ref_counted", "endpoint_info_handshaker", "latent_see", - "load_file", "metadata_batch", "ref_counted", "resolved_address", @@ -3999,7 +4052,7 @@ grpc_cc_library( external_deps = [ "absl/base:core_headers", "absl/container:flat_hash_map", - "absl/log:log", + "absl/log", "absl/status", "absl/status:statusor", "absl/strings", @@ -4012,6 +4065,7 @@ grpc_cc_library( "directory_reader", "load_file", "slice", + "sync", "time", "//:exec_ctx", "//:gpr", @@ -4031,8 +4085,8 @@ grpc_cc_library( "load_balancing/grpclb/grpclb.h", ], external_deps = [ + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", @@ -4059,7 +4113,6 @@ grpc_cc_library( "//:iomgr", "//:promise", "//:ref_counted_ptr", - "//:resource_quota_api", "//:tsi_base", "//:tsi_fake_credentials", ], @@ -4110,9 +4163,7 @@ grpc_cc_library( hdrs = [ "tsi/local_transport_security.h", ], - external_deps = [ - "absl/log:log", - ], + external_deps = ["absl/log"], deps = [ "//:event_engine_base_hdrs", "//:exec_ctx", @@ -4132,8 +4183,8 @@ grpc_cc_library( "lib/security/security_connector/local/local_security_connector.h", ], external_deps = [ + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", @@ -4179,8 +4230,8 @@ grpc_cc_library( "lib/security/security_connector/ssl/ssl_security_connector.h", ], external_deps = [ + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/strings", "absl/strings:str_format", @@ -4191,6 +4242,7 @@ grpc_cc_library( "closure", "error", "iomgr_fwd", + "sync", "unique_type_name", "useful", "//:channel_arg_names", @@ -4245,6 +4297,7 @@ grpc_cc_library( "slice", "slice_refcount", "status_helper", + "sync", "time", "unique_type_name", "useful", @@ -4302,8 +4355,8 @@ grpc_cc_library( "absl/base:core_headers", "absl/container:inlined_vector", "absl/functional:bind_front", + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", @@ -4321,6 +4374,7 @@ grpc_cc_library( "slice", "slice_refcount", "status_helper", + "sync", "unique_type_name", "useful", "//:channel_arg_names", @@ -4395,10 +4449,10 @@ grpc_cc_library( "poll", "pollset_set", "ref_counted", + "sync", "time", "useful", "//:backoff", - "//:gpr", "//:grpc_security_base", "//:grpc_trace", "//:httpcli", @@ -4424,8 +4478,6 @@ grpc_cc_library( "absl/strings", ], deps = [ - "activity", - "arena_promise", "closure", "error", "json", @@ -4433,8 +4485,6 @@ grpc_cc_library( "json_object_loader", "json_reader", "metadata", - "pollset_set", - "ref_counted", "slice", "status_conversion", "status_helper", @@ -4448,7 +4498,6 @@ grpc_cc_library( "//:httpcli", "//:iomgr", "//:orphanable", - "//:promise", "//:ref_counted_ptr", "//:uri", ], @@ -4463,8 +4512,8 @@ grpc_cc_library( "lib/security/credentials/oauth2/oauth2_credentials.h", ], external_deps = [ + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", @@ -4524,8 +4573,8 @@ grpc_cc_library( "lib/security/credentials/external/url_external_account_credentials.h", ], external_deps = [ + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", @@ -4571,7 +4620,7 @@ grpc_cc_library( "util/http_client/httpcli_ssl_credentials.h", ], external_deps = [ - "absl/log:log", + "absl/log", "absl/status", "absl/strings", ], @@ -4640,8 +4689,8 @@ grpc_cc_library( "lib/security/authorization/rbac_policy.h", ], external_deps = [ + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", @@ -4754,9 +4803,7 @@ grpc_cc_library( grpc_cc_library( name = "json_channel_args", hdrs = ["util/json/json_channel_args.h"], - external_deps = [ - "absl/strings", - ], + external_deps = ["absl/strings"], deps = [ "channel_args", "json_args", @@ -4812,6 +4859,7 @@ grpc_cc_library( "single_set_ptr", "sleep", "status_helper", + "sync", "time", "try_seq", "//:channel_arg_names", @@ -4865,7 +4913,7 @@ grpc_cc_library( "ext/filters/message_size/message_size_filter.h", ], external_deps = [ - "absl/log:log", + "absl/log", "absl/status:statusor", "absl/strings", "absl/strings:str_format", @@ -4911,7 +4959,7 @@ grpc_cc_library( ], external_deps = [ "absl/base:core_headers", - "absl/log:log", + "absl/log", "absl/meta:type_traits", "absl/random", "absl/status", @@ -4930,6 +4978,7 @@ grpc_cc_library( "metadata_batch", "service_config_parser", "sleep", + "sync", "time", "try_seq", "validation_errors", @@ -5055,13 +5104,13 @@ grpc_cc_library( "json_object_loader", "lru_cache", "service_config_parser", + "sync", "validation_errors", "xds_config", "//:config", "//:gpr", "//:grpc_base", "//:grpc_security_base", - "//:grpc_trace", "//:ref_counted_ptr", ], ) @@ -5081,18 +5130,18 @@ grpc_cc_library( "load_balancing/grpclb/load_balancer_api.h", ], external_deps = [ + "@com_google_protobuf//upb:base", + "@com_google_protobuf//upb:mem", "absl/base:core_headers", "absl/container:inlined_vector", "absl/functional:function_ref", + "absl/log", "absl/log:check", "absl/log:globals", - "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", "absl/strings:str_format", - "@com_google_protobuf//upb:base", - "@com_google_protobuf//upb:mem", ], deps = [ "arena", @@ -5125,13 +5174,13 @@ grpc_cc_library( "slice_refcount", "status_helper", "subchannel_interface", + "sync", "time", "useful", "validation_errors", "//:backoff", "//:channel", "//:channel_arg_names", - "//:channel_create", "//:channelz", "//:config", "//:debug_location", @@ -5198,17 +5247,17 @@ grpc_cc_library( "load_balancing/rls/rls.h", ], external_deps = [ + "@com_google_protobuf//upb:base", + "@com_google_protobuf//upb:mem", "absl/base:core_headers", "absl/hash", + "absl/log", "absl/log:check", - "absl/log:log", "absl/random", "absl/status", "absl/status:statusor", "absl/strings", "absl/strings:str_format", - "@com_google_protobuf//upb:base", - "@com_google_protobuf//upb:mem", ], deps = [ "channel_args", @@ -5232,6 +5281,7 @@ grpc_cc_library( "slice", "slice_refcount", "status_helper", + "sync", "time", "upb_utils", "uuid_v4", @@ -5239,7 +5289,6 @@ grpc_cc_library( "//:backoff", "//:channel", "//:channel_arg_names", - "//:channel_create", "//:channelz", "//:config", "//:debug_location", @@ -5271,9 +5320,6 @@ grpc_cc_library( "absl/functional:any_invocable", "absl/log:check", ], - # TODO(roth): Remove this unnecessary dependency once - # yaqs/eng/q/6510477728410501120 is resolved. - deps = ["//:grpc_public_hdrs"], ) grpc_cc_library( @@ -5282,8 +5328,8 @@ grpc_cc_library( "util/upb_utils.h", ], external_deps = [ - "absl/strings", "@com_google_protobuf//upb:base", + "absl/strings", ], ) @@ -5315,6 +5361,7 @@ grpc_cc_library( "error", "grpc_matchers", "grpc_tls_credentials", + "sync", "unique_type_name", "useful", "//:gpr", @@ -5345,6 +5392,7 @@ grpc_cc_library( "json", "json_args", "json_object_loader", + "sync", "unique_type_name", "useful", "validation_errors", @@ -5621,6 +5669,7 @@ grpc_cc_library( tags = ["nofixdeps"], deps = [ "ref_counted", + "sync", "//:endpoint_addresses", "//:gpr", "//:ref_counted_ptr", @@ -5822,6 +5871,7 @@ grpc_cc_library( "slice_refcount", "status_conversion", "status_helper", + "sync", "time", "unique_type_name", "upb_utils", @@ -5902,8 +5952,8 @@ grpc_cc_library( ], external_deps = [ "absl/base:core_headers", + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", @@ -5924,6 +5974,7 @@ grpc_cc_library( "metadata_batch", "resolved_address", "slice_refcount", + "sync", "unique_type_name", "xds_certificate_provider", "xds_certificate_provider_store", @@ -5983,8 +6034,8 @@ grpc_cc_library( "load_balancing/xds/cds.cc", ], external_deps = [ + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", @@ -5996,7 +6047,6 @@ grpc_cc_library( "grpc_lb_address_filtering", "grpc_lb_xds_channel_args", "grpc_outlier_detection_header", - "grpc_xds_client", "json", "json_args", "json_object_loader", @@ -6010,7 +6060,6 @@ grpc_cc_library( "unique_type_name", "xds_cluster", "xds_common_types", - "xds_config", "xds_dependency_manager", "xds_health_status", "//:config", @@ -6022,7 +6071,6 @@ grpc_cc_library( "//:orphanable", "//:ref_counted_ptr", "//:work_serializer", - "//:xds_client", ], ) @@ -6044,8 +6092,8 @@ grpc_cc_library( ], external_deps = [ "absl/base:core_headers", + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", @@ -6071,6 +6119,7 @@ grpc_cc_library( "ref_counted_string", "resolved_address", "subchannel_interface", + "sync", "validation_errors", "xds_config", "xds_credentials", @@ -6081,7 +6130,6 @@ grpc_cc_library( "//:endpoint_addresses", "//:gpr", "//:grpc_base", - "//:grpc_client_channel", "//:grpc_trace", "//:lb_child_policy_handler", "//:orphanable", @@ -6096,7 +6144,7 @@ grpc_cc_library( "load_balancing/xds/xds_cluster_manager.cc", ], external_deps = [ - "absl/log:log", + "absl/log", "absl/status", "absl/status:statusor", "absl/strings", @@ -6120,10 +6168,8 @@ grpc_cc_library( "//:debug_location", "//:endpoint_addresses", "//:exec_ctx", - "//:gpr", "//:gpr_platform", "//:grpc_base", - "//:grpc_client_channel", "//:grpc_trace", "//:lb_child_policy_handler", "//:orphanable", @@ -6138,7 +6184,7 @@ grpc_cc_library( "load_balancing/xds/xds_wrr_locality.cc", ], external_deps = [ - "absl/log:log", + "absl/log", "absl/status", "absl/status:statusor", "absl/strings", @@ -6203,14 +6249,14 @@ grpc_cc_library( "load_balancing/health_check_client_internal.h", ], external_deps = [ + "@com_google_protobuf//upb:base", + "@com_google_protobuf//upb:mem", "absl/base:core_headers", + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", - "@com_google_protobuf//upb:base", - "@com_google_protobuf//upb:mem", ], deps = [ "channel_args", @@ -6222,6 +6268,7 @@ grpc_cc_library( "pollset_set", "slice", "subchannel_interface", + "sync", "unique_type_name", "//:channel_arg_names", "//:channelz", @@ -6250,8 +6297,8 @@ grpc_cc_library( ], external_deps = [ "absl/functional:function_ref", + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", ], @@ -6287,8 +6334,8 @@ grpc_cc_library( ], external_deps = [ "absl/algorithm:container", + "absl/log", "absl/log:check", - "absl/log:log", "absl/random", "absl/status", "absl/status:statusor", @@ -6382,7 +6429,7 @@ grpc_cc_library( ], external_deps = [ "absl/container:flat_hash_set", - "absl/log:log", + "absl/log", "absl/status", ], deps = [ @@ -6417,8 +6464,8 @@ grpc_cc_library( external_deps = [ "absl/base:core_headers", "absl/container:inlined_vector", + "absl/log", "absl/log:check", - "absl/log:log", "absl/random", "absl/status", "absl/status:statusor", @@ -6454,7 +6501,6 @@ grpc_cc_library( "//:exec_ctx", "//:gpr", "//:grpc_base", - "//:grpc_client_channel", "//:grpc_trace", "//:orphanable", "//:ref_counted_ptr", @@ -6469,8 +6515,8 @@ grpc_cc_library( "load_balancing/round_robin/round_robin.cc", ], external_deps = [ + "absl/log", "absl/log:check", - "absl/log:log", "absl/meta:type_traits", "absl/random", "absl/status", @@ -6519,8 +6565,8 @@ grpc_cc_library( ], external_deps = [ "absl/base:core_headers", + "absl/log", "absl/log:check", - "absl/log:log", "absl/meta:type_traits", "absl/random", "absl/status", @@ -6545,6 +6591,7 @@ grpc_cc_library( "static_stride_scheduler", "stats_data", "subchannel_interface", + "sync", "time", "validation_errors", "//:config", @@ -6553,7 +6600,6 @@ grpc_cc_library( "//:exec_ctx", "//:gpr", "//:grpc_base", - "//:grpc_client_channel", "//:grpc_trace", "//:oob_backend_metric", "//:orphanable", @@ -6585,8 +6631,8 @@ grpc_cc_library( ], external_deps = [ "absl/base:core_headers", + "absl/log", "absl/log:check", - "absl/log:log", "absl/meta:type_traits", "absl/random", "absl/status", @@ -6609,6 +6655,7 @@ grpc_cc_library( "ref_counted", "resolved_address", "subchannel_interface", + "sync", "unique_type_name", "validation_errors", "//:config", @@ -6633,8 +6680,8 @@ grpc_cc_library( "load_balancing/priority/priority.cc", ], external_deps = [ + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", @@ -6661,7 +6708,6 @@ grpc_cc_library( "//:exec_ctx", "//:gpr", "//:grpc_base", - "//:grpc_client_channel", "//:grpc_trace", "//:lb_child_policy_handler", "//:orphanable", @@ -6680,8 +6726,8 @@ grpc_cc_library( ], external_deps = [ "absl/base:core_headers", + "absl/log", "absl/log:check", - "absl/log:log", "absl/meta:type_traits", "absl/random", "absl/status", @@ -6700,6 +6746,7 @@ grpc_cc_library( "lb_policy_factory", "lb_policy_registry", "pollset_set", + "sync", "time", "validation_errors", "//:config", @@ -6708,7 +6755,6 @@ grpc_cc_library( "//:exec_ctx", "//:gpr", "//:grpc_base", - "//:grpc_client_channel", "//:grpc_trace", "//:lb_child_policy_handler", "//:orphanable", @@ -6728,8 +6774,8 @@ grpc_cc_library( external_deps = [ "absl/base:core_headers", "absl/functional:function_ref", + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", @@ -6744,7 +6790,6 @@ grpc_cc_library( "error", "experiments", "grpc_stateful_session_filter", - "grpc_xds_client", "iomgr_fwd", "json", "json_args", @@ -6757,6 +6802,7 @@ grpc_cc_library( "ref_counted_string", "resolved_address", "subchannel_interface", + "sync", "validation_errors", "xds_config", "xds_health_status", @@ -6766,7 +6812,6 @@ grpc_cc_library( "//:exec_ctx", "//:gpr", "//:grpc_base", - "//:grpc_client_channel", "//:grpc_trace", "//:lb_child_policy_handler", "//:orphanable", @@ -6789,7 +6834,7 @@ grpc_cc_library( ], external_deps = [ "absl/container:inlined_vector", - "absl/log:log", + "absl/log", "absl/status", "absl/status:statusor", "absl/strings", @@ -6833,11 +6878,11 @@ grpc_cc_library( "ext/filters/backend_metrics/backend_metric_filter.h", ], external_deps = [ - "absl/log:log", - "absl/status:statusor", - "absl/strings", "@com_google_protobuf//upb:base", "@com_google_protobuf//upb:mem", + "absl/log", + "absl/status:statusor", + "absl/strings", ], deps = [ "arena_promise", @@ -6854,7 +6899,6 @@ grpc_cc_library( "slice", "//:channel_arg_names", "//:config", - "//:gpr", "//:gpr_platform", "//:grpc_base", "//:grpc_trace", @@ -6871,8 +6915,8 @@ grpc_cc_library( "resolver/polling_resolver.h", ], external_deps = [ + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", @@ -6917,7 +6961,6 @@ grpc_cc_library( "json_writer", "status_helper", "//:gpr_platform", - "//:grpc_base", "//:iomgr", ], ) @@ -6933,8 +6976,8 @@ grpc_cc_library( external_deps = [ "absl/base:core_headers", "absl/cleanup", + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", @@ -6945,6 +6988,7 @@ grpc_cc_library( "grpc_service_config", "polling_resolver", "service_config_helper", + "sync", "time", "validation_errors", "//:backoff", @@ -6952,7 +6996,6 @@ grpc_cc_library( "//:debug_location", "//:endpoint_addresses", "//:exec_ctx", - "//:gpr", "//:gpr_platform", "//:grpc_base", "//:grpc_grpclb_balancer_addresses", @@ -6975,7 +7018,7 @@ grpc_cc_library( "resolver/dns/dns_resolver_plugin.h", ], external_deps = [ - "absl/log:log", + "absl/log", "absl/strings", ], deps = [ @@ -7000,7 +7043,7 @@ grpc_cc_library( ], external_deps = [ "absl/functional:bind_front", - "absl/log:log", + "absl/log", "absl/status", "absl/status:statusor", "absl/strings", @@ -7016,7 +7059,6 @@ grpc_cc_library( "//:debug_location", "//:endpoint_addresses", "//:gpr", - "//:grpc_base", "//:grpc_resolver", "//:grpc_trace", "//:iomgr", @@ -7032,7 +7074,7 @@ grpc_cc_library( "resolver/sockaddr/sockaddr_resolver.cc", ], external_deps = [ - "absl/log:log", + "absl/log", "absl/status:statusor", "absl/strings", ], @@ -7098,8 +7140,8 @@ grpc_cc_library( external_deps = [ "absl/container:flat_hash_map", "absl/container:flat_hash_set", + "absl/log", "absl/log:check", - "absl/log:log", "absl/strings", ], deps = [ @@ -7113,7 +7155,6 @@ grpc_cc_library( "xds_listener", "xds_route_config", "//:config", - "//:gpr", "//:grpc_resolver", "//:grpc_resolver_fake", ], @@ -7125,8 +7166,8 @@ grpc_cc_library( "resolver/xds/xds_resolver.cc", ], external_deps = [ + "absl/log", "absl/log:check", - "absl/log:log", "absl/meta:type_traits", "absl/random", "absl/status", @@ -7156,7 +7197,6 @@ grpc_cc_library( "ref_counted", "slice", "time", - "xds_config", "xds_dependency_manager", "xds_http_filter", "xds_listener", @@ -7186,8 +7226,8 @@ grpc_cc_library( "resolver/google_c2p/google_c2p_resolver.cc", ], external_deps = [ + "absl/log", "absl/log:check", - "absl/log:log", "absl/status:statusor", "absl/strings", ], @@ -7204,7 +7244,6 @@ grpc_cc_library( "//:config", "//:debug_location", "//:gpr", - "//:grpc_base", "//:grpc_resolver", "//:iomgr", "//:orphanable", @@ -7231,9 +7270,7 @@ grpc_cc_library( hdrs = [ "ext/transport/chttp2/transport/hpack_encoder_table.h", ], - external_deps = [ - "absl/log:check", - ], + external_deps = ["absl/log:check"], deps = [ "hpack_constants", "//:gpr", @@ -7250,8 +7287,8 @@ grpc_cc_library( ], external_deps = [ "absl/functional:function_ref", + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/strings", "absl/strings:str_format", @@ -7276,9 +7313,7 @@ grpc_cc_library( hdrs = [ "ext/transport/chttp2/transport/ping_abuse_policy.h", ], - external_deps = [ - "absl/strings", - ], + external_deps = ["absl/strings"], deps = [ "channel_args", "time", @@ -7307,7 +7342,6 @@ grpc_cc_library( deps = [ "time", "//:event_engine_base_hdrs", - "//:gpr", "//:gpr_platform", "//:grpc_trace", ], @@ -7321,12 +7355,9 @@ grpc_cc_library( hdrs = [ "ext/transport/chttp2/transport/write_size_policy.h", ], - external_deps = [ - "absl/log:check", - ], + external_deps = ["absl/log:check"], deps = [ "time", - "//:gpr", "//:gpr_platform", ], ) @@ -7339,9 +7370,7 @@ grpc_cc_library( hdrs = [ "ext/transport/chttp2/transport/ping_rate_policy.h", ], - external_deps = [ - "absl/strings", - ], + external_deps = ["absl/strings"], deps = [ "channel_args", "experiments", @@ -7402,12 +7431,11 @@ grpc_cc_library( hdrs = [ "ext/transport/chttp2/transport/http2_client_transport.h", ], - external_deps = [], deps = [ + "grpc_promise_endpoint", "//:grpc_base", "//:hpack_encoder", "//:hpack_parser", - "//src/core:grpc_promise_endpoint", ], ) @@ -7419,12 +7447,11 @@ grpc_cc_library( hdrs = [ "ext/transport/chttp2/transport/http2_server_transport.h", ], - external_deps = [], deps = [ + "grpc_promise_endpoint", "//:grpc_base", "//:hpack_encoder", "//:hpack_parser", - "//src/core:grpc_promise_endpoint", ], ) @@ -7436,9 +7463,7 @@ grpc_cc_library( hdrs = [ "ext/transport/chttp2/alpn/alpn.h", ], - external_deps = [ - "absl/log:check", - ], + external_deps = ["absl/log:check"], deps = [ "useful", "//:gpr", @@ -7455,8 +7480,8 @@ grpc_cc_library( ], external_deps = [ "absl/base:core_headers", + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings:str_format", @@ -7474,6 +7499,7 @@ grpc_cc_library( "resolved_address", "status_helper", "subchannel_connector", + "sync", "tcp_connect_handshaker", "time", "unique_type_name", @@ -7510,8 +7536,8 @@ grpc_cc_library( ], external_deps = [ "absl/base:core_headers", + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", @@ -7538,6 +7564,7 @@ grpc_cc_library( "resolved_address", "resource_quota", "status_helper", + "sync", "time", "unique_type_name", "//:channel_arg_names", @@ -7572,7 +7599,7 @@ grpc_cc_library( "ext/transport/inproc/legacy_inproc_transport.h", ], external_deps = [ - "absl/log:log", + "absl/log", "absl/log:check", "absl/status", "absl/status:statusor", @@ -7649,7 +7676,6 @@ grpc_cc_library( "match", "message", "metadata", - "metadata_batch", "no_destruct", "slice", "slice_buffer", @@ -7674,7 +7700,6 @@ grpc_cc_library( ], deps = [ "bitset", - "//:gpr", "//:gpr_platform", ], ) @@ -7689,8 +7714,8 @@ grpc_cc_library( ], external_deps = [ "absl/functional:any_invocable", + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", "absl/strings", @@ -7701,7 +7726,6 @@ grpc_cc_library( "error", "status_helper", "time", - "//:gpr", "//:gpr_platform", "//:grpc_base", "//:grpc_core_credentials_header", @@ -7743,7 +7767,7 @@ grpc_cc_library( "ext/filters/logging/logging_filter.h", ], external_deps = [ - "absl/log:log", + "absl/log", "absl/numeric:int128", "absl/random", "absl/random:distributions", @@ -7804,6 +7828,7 @@ grpc_cc_library( "poll", "slice", "slice_buffer", + "sync", "//:event_engine_base_hdrs", "//:exec_ctx", "//:gpr", @@ -7815,9 +7840,7 @@ grpc_cc_library( hdrs = [ "ext/transport/chaotic_good/config.h", ], - external_deps = [ - "absl/container:flat_hash_set", - ], + external_deps = ["absl/container:flat_hash_set"], deps = [ "channel_args", "chaotic_good_frame_cc_proto", @@ -7869,8 +7892,8 @@ grpc_cc_library( "event_engine_tcp_socket_utils", "grpc_promise_endpoint", "loop", + "sync", "try_seq", - "//:gpr", ], ) @@ -7927,7 +7950,6 @@ grpc_cc_library( "chaotic_good_data_endpoints", "chaotic_good_frame", "chaotic_good_frame_header", - "chaotic_good_pending_connection", "event_engine_context", "event_engine_tcp_socket_utils", "grpc_promise_endpoint", @@ -7987,10 +8009,10 @@ grpc_cc_library( "slice", "slice_buffer", "switch", + "sync", "try_join", "try_seq", "//:exec_ctx", - "//:gpr", "//:gpr_platform", "//:grpc_base", "//:ref_counted_ptr", @@ -8047,10 +8069,10 @@ grpc_cc_library( "slice", "slice_buffer", "switch", + "sync", "try_join", "try_seq", "//:exec_ctx", - "//:gpr", "//:gpr_platform", "//:grpc_base", "//:ref_counted_ptr", @@ -8111,8 +8133,8 @@ grpc_cc_library( "lib/transport/call_filters.h", ], external_deps = [ + "absl/log", "absl/log:check", - "absl/log:log", ], deps = [ "call_final_info", @@ -8209,9 +8231,7 @@ grpc_cc_library( hdrs = [ "lib/transport/message.h", ], - external_deps = [ - "absl/strings", - ], + external_deps = ["absl/strings"], deps = [ "arena", "slice_buffer", @@ -8293,7 +8313,6 @@ grpc_cc_library( "absl/strings:str_format", ], deps = [ - "arena", "chunked_vector", "compression", "experiments", @@ -8401,7 +8420,6 @@ grpc_cc_library( "chaotic_good_frame_header", "chaotic_good_pending_connection", "chaotic_good_server_transport", - "chaotic_good_transport", "closure", "context", "error", @@ -8428,10 +8446,10 @@ grpc_cc_library( "slice", "slice_buffer", "status_helper", + "sync", "time", "try_seq", "//:channelz", - "//:gpr", "//:gpr_platform", "//:grpc_base", "//:handshaker", @@ -8469,7 +8487,6 @@ grpc_cc_library( "chaotic_good_frame", "chaotic_good_frame_cc_proto", "chaotic_good_frame_header", - "chaotic_good_transport", "closure", "context", "error", @@ -8491,6 +8508,7 @@ grpc_cc_library( "slice", "slice_buffer", "subchannel_connector", + "sync", "time", "try_seq", "wait_for_callback", @@ -8499,7 +8517,6 @@ grpc_cc_library( "//:config", "//:debug_location", "//:exec_ctx", - "//:gpr", "//:gpr_platform", "//:grpc_base", "//:grpc_client_channel", @@ -8518,7 +8535,6 @@ grpc_cc_library( "telemetry/metrics.h", ], external_deps = [ - "absl/container:flat_hash_map", "absl/functional:any_invocable", "absl/functional:function_ref", "absl/log:check", @@ -8526,10 +8542,10 @@ grpc_cc_library( "absl/types:span", ], deps = [ - "arena", "channel_args", "no_destruct", "slice", + "sync", "time", "//:call_tracer", "//:gpr", diff --git a/src/core/util/gpr_time.cc b/src/core/util/gpr_time.cc index ac19283bb04d2..657da132f5eb1 100644 --- a/src/core/util/gpr_time.cc +++ b/src/core/util/gpr_time.cc @@ -18,7 +18,6 @@ // Generic implementation of time calls. -#include #include #include #include @@ -26,7 +25,6 @@ #include #include "absl/log/check.h" -#include "src/core/util/crash.h" int gpr_time_cmp(gpr_timespec a, gpr_timespec b) { int cmp = (a.tv_sec > b.tv_sec) - (a.tv_sec < b.tv_sec); diff --git a/src/core/util/linux/env.cc b/src/core/util/linux/env.cc index 2450038e69438..eb1e7619de902 100644 --- a/src/core/util/linux/env.cc +++ b/src/core/util/linux/env.cc @@ -32,11 +32,16 @@ #include #include "src/core/util/env.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/sync.h" namespace grpc_core { +NoDestruct g_mu; + std::optional GetEnv(const char* name) { char* result = nullptr; + MutexLock lock(g_mu.get()); #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 17) result = secure_getenv(name); #else @@ -47,11 +52,13 @@ std::optional GetEnv(const char* name) { } void SetEnv(const char* name, const char* value) { + MutexLock lock(g_mu.get()); int res = setenv(name, value, 1); if (res != 0) abort(); } void UnsetEnv(const char* name) { + MutexLock lock(g_mu.get()); int res = unsetenv(name); if (res != 0) abort(); } diff --git a/src/core/util/posix/env.cc b/src/core/util/posix/env.cc index 43cfc70683640..c9eeeb3dc7597 100644 --- a/src/core/util/posix/env.cc +++ b/src/core/util/posix/env.cc @@ -23,21 +23,28 @@ #include #include "src/core/util/env.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/sync.h" namespace grpc_core { +NoDestruct g_mu; + std::optional GetEnv(const char* name) { + MutexLock lock(g_mu.get()); char* result = getenv(name); if (result == nullptr) return std::nullopt; return result; } void SetEnv(const char* name, const char* value) { + MutexLock lock(g_mu.get()); int res = setenv(name, value, 1); if (res != 0) abort(); } void UnsetEnv(const char* name) { + MutexLock lock(g_mu.get()); int res = unsetenv(name); if (res != 0) abort(); } diff --git a/src/core/util/posix/time.cc b/src/core/util/posix/time.cc index ff44468210157..8231cc588c745 100644 --- a/src/core/util/posix/time.cc +++ b/src/core/util/posix/time.cc @@ -32,7 +32,6 @@ #include #include "absl/log/check.h" -#include "src/core/util/crash.h" static struct timespec timespec_from_gpr(gpr_timespec gts) { struct timespec rv; diff --git a/src/core/util/sync_abseil.cc b/src/core/util/sync_abseil.cc index 688e4665612b0..e39085197d2ee 100644 --- a/src/core/util/sync_abseil.cc +++ b/src/core/util/sync_abseil.cc @@ -30,7 +30,6 @@ #include "absl/synchronization/mutex.h" #include "absl/time/clock.h" #include "absl/time/time.h" -#include "src/core/util/crash.h" #include "src/core/util/time_util.h" void gpr_mu_init(gpr_mu* mu) { diff --git a/src/core/util/time_precise.cc b/src/core/util/time_precise.cc index 0fe62929ef25a..76dce6d57dfba 100644 --- a/src/core/util/time_precise.cc +++ b/src/core/util/time_precise.cc @@ -28,7 +28,6 @@ #include #include "absl/log/log.h" -#include "src/core/util/crash.h" #include "src/core/util/time_precise.h" #ifndef GPR_CYCLE_COUNTER_CUSTOM diff --git a/src/core/util/windows/env.cc b/src/core/util/windows/env.cc index e1704d8149edf..fbfec30dacd23 100644 --- a/src/core/util/windows/env.cc +++ b/src/core/util/windows/env.cc @@ -25,12 +25,17 @@ #include #include "src/core/util/env.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/sync.h" #include "src/core/util/tchar.h" namespace grpc_core { +NoDestruct g_mu; + std::optional GetEnv(const char* name) { auto tname = CharToTchar(name); + MutexLock lock(g_mu.get()); DWORD ret = GetEnvironmentVariable(tname.c_str(), NULL, 0); if (ret == 0) return std::nullopt; std::unique_ptr tresult(new TCHAR[ret]); @@ -41,12 +46,14 @@ std::optional GetEnv(const char* name) { } void SetEnv(const char* name, const char* value) { + MutexLock lock(g_mu.get()); BOOL res = SetEnvironmentVariable(CharToTchar(name).c_str(), CharToTchar(value).c_str()); if (!res) abort(); } void UnsetEnv(const char* name) { + MutexLock lock(g_mu.get()); BOOL res = SetEnvironmentVariable(CharToTchar(name).c_str(), NULL); if (!res) abort(); } diff --git a/src/cpp/ext/gcp/BUILD b/src/cpp/ext/gcp/BUILD index a20b911f96783..b7737cc9f3d9c 100644 --- a/src/cpp/ext/gcp/BUILD +++ b/src/cpp/ext/gcp/BUILD @@ -83,9 +83,7 @@ grpc_cc_library( ], deps = [ "//:gpr", - "//:grpc_base", "//:grpc_public_hdrs", - "//:iomgr", "//src/core:env", "//src/core:error", "//src/core:error_utils", @@ -111,7 +109,7 @@ grpc_cc_library( ], external_deps = [ "absl/base:core_headers", - "absl/log:log", + "absl/log", "absl/numeric:int128", "absl/strings", "absl/strings:str_format", @@ -134,6 +132,7 @@ grpc_cc_library( "//src/core:env", "//src/core:json", "//src/core:logging_sink", + "//src/core:sync", "//src/core:time", "//src/core:uuid_v4", ], @@ -151,8 +150,8 @@ grpc_cc_library( "absl/base:core_headers", "absl/container:flat_hash_map", "absl/functional:any_invocable", + "absl/log", "absl/log:check", - "absl/log:log", "absl/status", "absl/status:statusor", ], @@ -178,6 +177,7 @@ grpc_cc_library( "//src/core:load_file", "//src/core:slice", "//src/core:status_helper", + "//src/core:sync", "//src/core:time", ], ) diff --git a/src/cpp/ext/otel/BUILD b/src/cpp/ext/otel/BUILD index 2ebc65e557033..ef64ac3471c79 100644 --- a/src/cpp/ext/otel/BUILD +++ b/src/cpp/ext/otel/BUILD @@ -80,5 +80,6 @@ grpc_cc_library( "//src/core:metrics", "//src/core:slice", "//src/core:slice_buffer", + "//src/core:sync", ], ) diff --git a/tools/distrib/fix_build_deps.py b/tools/distrib/fix_build_deps.py index 0605800764bc1..94fdc8a5cf58b 100755 --- a/tools/distrib/fix_build_deps.py +++ b/tools/distrib/fix_build_deps.py @@ -47,6 +47,7 @@ "absl/base/config.h": "absl/base:config", # TODO(ctiller) remove this "absl/base/internal/endian.h": "absl/base:endian", + "absl/base/no_destructor.h": "absl/base:no_destructor", "absl/base/thread_annotations.h": "absl/base:core_headers", "absl/container/flat_hash_map.h": "absl/container:flat_hash_map", "absl/container/flat_hash_set.h": "absl/container:flat_hash_set", @@ -65,9 +66,11 @@ "absl/functional/function_ref.h": "absl/functional:function_ref", "absl/hash/hash.h": "absl/hash", "absl/log/check.h": "absl/log:check", + "absl/log/globals.h": "absl/log:globals", "absl/log/log.h": "absl/log", "absl/memory/memory.h": "absl/memory", "absl/meta/type_traits.h": "absl/meta:type_traits", + "absl/numeric/bits.h": "absl/numeric:bits", "absl/numeric/int128.h": "absl/numeric:int128", "absl/random/random.h": "absl/random", "absl/random/bit_gen_ref.h": "absl/random:bit_gen_ref", @@ -116,9 +119,7 @@ "opentelemetry/sdk/resource/semantic_conventions.h": "otel/sdk:headers", "ares.h": "cares", "fuzztest/fuzztest.h": ["fuzztest", "fuzztest_main"], - "google/api/monitored_resource.pb.h": ( - "google/api:monitored_resource_cc_proto" - ), + "google/api/monitored_resource.pb.h": ("google/api:monitored_resource_cc_proto"), "google/devtools/cloudtrace/v2/tracing.grpc.pb.h": ( "googleapis_trace_grpc_service" ), @@ -137,9 +138,7 @@ "opencensus-trace-stackdriver_exporter" ), "opencensus/trace/context_util.h": "opencensus-trace-context_util", - "opencensus/trace/propagation/grpc_trace_bin.h": ( - "opencensus-trace-propagation" - ), + "opencensus/trace/propagation/grpc_trace_bin.h": ("opencensus-trace-propagation"), "opencensus/tags/context_util.h": "opencensus-tags-context_util", "opencensus/trace/span_context.h": "opencensus-trace-span_context", "openssl/base.h": "libssl", @@ -162,13 +161,13 @@ "openssl/x509.h": "libcrypto", "openssl/x509v3.h": "libcrypto", "re2/re2.h": "re2", - "upb/base/status.hpp": "upb_base_lib", - "upb/base/string_view.h": "upb_base_lib", - "upb/message/map.h": "upb_message_lib", + "upb/base/status.hpp": "@com_google_protobuf//upb:base", + "upb/base/string_view.h": "@com_google_protobuf//upb:base", + "upb/message/map.h": "@com_google_protobuf//upb:message", "upb/reflection/def.h": "upb_reflection", "upb/json/encode.h": "upb_json_lib", - "upb/mem/arena.h": "upb_mem_lib", - "upb/mem/arena.hpp": "upb_mem_lib", + "upb/mem/arena.h": "@com_google_protobuf//upb:mem", + "upb/mem/arena.hpp": "@com_google_protobuf//upb:mem", "upb/text/encode.h": "upb_textformat_lib", "upb/reflection/def.hpp": "upb_reflection", "xxhash.h": "xxhash", @@ -229,11 +228,7 @@ def config_setting_group(self, **kwargs): # Convert the source or header target to a relative path. def _get_filename(name, parsing_path): filename = "%s%s" % ( - ( - parsing_path + "/" - if (parsing_path and not name.startswith("//")) - else "" - ), + (parsing_path + "/" if (parsing_path and not name.startswith("//")) else ""), name, ) filename = filename.replace("//:", "") @@ -319,9 +314,7 @@ def buildozer_set_list(name, values, target, via=""): buildozer("remove %s" % name, target) return adjust = via if via else name - buildozer( - "set %s %s" % (adjust, " ".join('"%s"' % s for s in values)), target - ) + buildozer("set %s %s" % (adjust, " ".join('"%s"' % s for s in values)), target) if via: buildozer("remove %s" % name, target) buildozer("rename %s %s" % (via, name), target) @@ -413,9 +406,9 @@ def score_best(proposed, existing): "test/core/transport/chaotic_good", "test/core/transport/test_suite", "test/core/transport", - "fuzztest", - "fuzztest/core/channel", - "fuzztest/core/transport/chttp2", + # "fuzztest", + # "fuzztest/core/channel", + # "fuzztest/core/transport/chttp2", ]: parsing_path = dirname exec( @@ -444,7 +437,7 @@ def score_best(proposed, existing): "grpc_proto_fuzzer": grpc_cc_library, "grpc_proto_library": grpc_proto_library, "grpc_internal_proto_library": grpc_proto_library, - "grpc_cc_proto_library": grpc_cc_library, + "grpc_cc_proto_library": lambda **kwargs: None, "select": lambda d: d["//conditions:default"], "glob": lambda files, **kwargs: None, "grpc_end2end_tests": lambda: None, @@ -502,19 +495,11 @@ def __init__(self, library, substitutions): def add_one_of(self, choices, trigger): if not choices: return - choices = sum( - [self.apply_substitutions(choice) for choice in choices], [] - ) + choices = sum([self.apply_substitutions(choice) for choice in choices], []) if args.explain and (args.why is None or args.why in choices): - print( - "{}: Adding one of {} for {}".format( - self.library, choices, trigger - ) - ) + print("{}: Adding one of {} for {}".format(self.library, choices, trigger)) self.to_add.append( - tuple( - make_relative_path(choice, self.library) for choice in choices - ) + tuple(make_relative_path(choice, self.library) for choice in choices) ) def add(self, choice, trigger): @@ -661,16 +646,12 @@ def make_library(library): # assume a system include continue - print( - "# ERROR: can't categorize header: %s used by %s" % (hdr, library) - ) + print("# ERROR: can't categorize header: %s used by %s" % (hdr, library)) error = True deps.remove(library) - deps = sorted( - deps.best(lambda x: SCORERS[args.score](x, original_deps[library])) - ) + deps = sorted(deps.best(lambda x: SCORERS[args.score](x, original_deps[library]))) external_deps = sorted( external_deps.best( lambda x: SCORERS[args.score](x, original_external_deps[library])