From 4931e453423d22aa3cb13c0a8f9bf1157a93eec4 Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Fri, 31 May 2024 22:35:30 +0000 Subject: [PATCH] fix sanity --- CMakeLists.txt | 220 ++--- Makefile | 74 +- Package.swift | 184 ++-- build_autogenerated.yaml | 832 +++++++++--------- config.m4 | 81 +- config.w32 | 81 +- gRPC-C++.podspec | 220 ++--- gRPC-Core.podspec | 294 +++---- grpc.gemspec | 184 ++-- package.xml | 184 ++-- src/core/channelz/channel_trace.cc | 2 +- src/core/channelz/channel_trace.h | 2 +- src/core/channelz/channelz.cc | 2 +- src/core/channelz/channelz.h | 2 +- src/core/channelz/channelz_registry.cc | 2 +- src/core/client_channel/backup_poller.cc | 4 +- src/core/client_channel/client_channel.cc | 14 +- src/core/client_channel/client_channel.h | 2 +- .../client_channel/client_channel_factory.h | 2 +- .../client_channel/client_channel_filter.cc | 14 +- .../client_channel/client_channel_filter.h | 12 +- .../client_channel/client_channel_internal.h | 2 +- .../client_channel_service_config.h | 6 +- src/core/client_channel/config_selector.h | 4 +- src/core/client_channel/connector.h | 6 +- src/core/client_channel/dynamic_filters.cc | 2 +- src/core/client_channel/dynamic_filters.h | 8 +- src/core/client_channel/retry_filter.cc | 4 +- src/core/client_channel/retry_filter.h | 2 +- .../retry_filter_legacy_call_data.cc | 16 +- .../retry_filter_legacy_call_data.h | 12 +- .../client_channel/retry_service_config.h | 4 +- src/core/client_channel/subchannel.cc | 14 +- src/core/client_channel/subchannel.h | 20 +- .../subchannel_interface_internal.h | 2 +- .../subchannel_pool_interface.h | 2 +- .../subchannel_stream_client.cc | 6 +- .../client_channel/subchannel_stream_client.h | 8 +- .../legacy_channel_idle_filter.cc | 12 +- .../channel_idle/legacy_channel_idle_filter.h | 8 +- .../fault_injection/fault_injection_filter.cc | 2 +- .../fault_injection/fault_injection_filter.h | 2 +- .../fault_injection_service_config_parser.h | 4 +- .../ext/filters/logging/logging_filter.cc | 6 +- .../message_size/message_size_filter.h | 2 +- .../rbac/rbac_service_config_parser.cc | 2 +- .../filters/rbac/rbac_service_config_parser.h | 2 +- .../stateful_session_filter.cc | 4 +- .../stateful_session_filter.h | 4 +- .../stateful_session_service_config_parser.h | 4 +- src/core/ext/gcp/metadata_query.cc | 2 +- src/core/ext/gcp/metadata_query.h | 4 +- .../binder/transport/binder_transport.cc | 2 +- .../binder/transport/binder_transport.h | 2 +- .../binder/wire_format/wire_writer.h | 2 +- .../client/chaotic_good_connector.cc | 8 +- .../client/chaotic_good_connector.h | 6 +- .../chaotic_good/client_transport.cc | 4 +- .../transport/chaotic_good/client_transport.h | 2 +- src/core/ext/transport/chaotic_good/frame.cc | 6 +- src/core/ext/transport/chaotic_good/frame.h | 2 +- .../server/chaotic_good_server.cc | 10 +- .../chaotic_good/server/chaotic_good_server.h | 4 +- .../chaotic_good/server_transport.cc | 2 +- .../transport/chaotic_good/server_transport.h | 4 +- .../chttp2/client/chttp2_connector.cc | 10 +- .../chttp2/client/chttp2_connector.h | 4 +- .../transport/chttp2/server/chttp2_server.cc | 16 +- .../chttp2/transport/chttp2_transport.cc | 12 +- .../chttp2/transport/chttp2_transport.h | 4 +- .../transport/chttp2/transport/flow_control.h | 2 +- .../transport/chttp2/transport/frame_data.cc | 2 +- .../chttp2/transport/frame_rst_stream.cc | 2 +- .../chttp2/transport/frame_settings.cc | 2 +- .../chttp2/transport/frame_settings.h | 2 +- .../chttp2/transport/hpack_encoder.cc | 2 +- .../chttp2/transport/hpack_encoder.h | 2 +- .../chttp2/transport/hpack_parse_result.cc | 2 +- .../chttp2/transport/hpack_parse_result.h | 4 +- .../chttp2/transport/hpack_parser.cc | 2 +- .../transport/chttp2/transport/hpack_parser.h | 2 +- .../chttp2/transport/hpack_parser_table.h | 2 +- .../ext/transport/chttp2/transport/internal.h | 10 +- .../ext/transport/chttp2/transport/parsing.cc | 6 +- .../ext/transport/chttp2/transport/writing.cc | 8 +- .../client/secure/cronet_channel_create.cc | 2 +- .../cronet/transport/cronet_transport.cc | 6 +- .../ext/transport/inproc/inproc_transport.cc | 2 +- .../inproc/legacy_inproc_transport.cc | 8 +- .../endpoint_info/endpoint_info_handshaker.cc | 4 +- src/core/handshaker/handshaker.cc | 4 +- src/core/handshaker/handshaker.h | 8 +- .../http_connect/http_connect_handshaker.cc | 6 +- .../http_connect/http_proxy_mapper.cc | 4 +- .../handshaker/security/secure_endpoint.cc | 6 +- .../security/security_handshaker.cc | 8 +- .../handshaker/security/security_handshaker.h | 2 +- .../tcp_connect/tcp_connect_handshaker.cc | 6 +- src/core/lib/address_utils/parse_address.cc | 6 +- src/core/lib/address_utils/sockaddr_utils.cc | 4 +- src/core/lib/channel/channel_args.h | 4 +- src/core/lib/channel/channel_stack.h | 6 +- src/core/lib/channel/channel_stack_builder.h | 2 +- .../lib/channel/channel_stack_builder_impl.cc | 4 +- src/core/lib/channel/connected_channel.cc | 8 +- src/core/lib/channel/promise_based_filter.cc | 6 +- src/core/lib/channel/promise_based_filter.h | 6 +- .../lib/compression/compression_internal.h | 2 +- src/core/lib/event_engine/ares_resolver.cc | 4 +- .../lib/event_engine/cf_engine/cf_engine.h | 2 +- .../posix_engine/ev_epoll1_linux.cc | 2 +- .../posix_engine/ev_epoll1_linux.h | 2 +- .../posix_engine/ev_poll_posix.cc | 2 +- .../event_poller_posix_default.cc | 2 +- .../posix_engine/grpc_polled_fd_posix.h | 2 +- .../posix_engine/posix_endpoint.cc | 6 +- .../posix_engine/posix_endpoint.h | 4 +- .../event_engine/posix_engine/posix_engine.h | 4 +- .../posix_engine/posix_engine_listener.cc | 2 +- .../posix_engine/posix_engine_listener.h | 2 +- .../posix_engine_listener_utils.cc | 4 +- .../posix_engine/tcp_socket_utils.cc | 2 +- .../posix_engine/tcp_socket_utils.h | 2 +- .../posix_engine/traced_buffer_list.cc | 2 +- .../posix_engine/traced_buffer_list.h | 2 +- .../posix_engine/wakeup_fd_eventfd.cc | 2 +- .../posix_engine/wakeup_fd_pipe.cc | 2 +- src/core/lib/event_engine/tcp_socket_utils.cc | 2 +- .../thread_pool/work_stealing_thread_pool.cc | 2 +- .../thread_pool/work_stealing_thread_pool.h | 2 +- .../windows/grpc_polled_fd_windows.cc | 4 +- src/core/lib/event_engine/windows/iocp.cc | 2 +- .../windows/native_windows_dns_resolver.cc | 2 +- .../lib/event_engine/windows/win_socket.cc | 2 +- .../event_engine/windows/windows_endpoint.cc | 2 +- .../event_engine/windows/windows_engine.cc | 2 +- .../lib/event_engine/windows/windows_engine.h | 2 +- .../event_engine/windows/windows_listener.cc | 4 +- .../event_engine/windows/windows_listener.h | 2 +- src/core/lib/iomgr/buffer_list.cc | 2 +- src/core/lib/iomgr/buffer_list.h | 2 +- src/core/lib/iomgr/call_combiner.cc | 2 +- src/core/lib/iomgr/call_combiner.h | 6 +- src/core/lib/iomgr/cfstream_handle.cc | 2 +- src/core/lib/iomgr/cfstream_handle.h | 2 +- src/core/lib/iomgr/closure.h | 2 +- src/core/lib/iomgr/combiner.cc | 4 +- src/core/lib/iomgr/endpoint_pair_posix.cc | 2 +- src/core/lib/iomgr/endpoint_pair_windows.cc | 2 +- src/core/lib/iomgr/error.cc | 2 +- src/core/lib/iomgr/error.h | 4 +- src/core/lib/iomgr/ev_apple.cc | 2 +- src/core/lib/iomgr/ev_epoll1_linux.cc | 6 +- src/core/lib/iomgr/ev_poll_posix.cc | 4 +- src/core/lib/iomgr/ev_posix.cc | 2 +- .../lib/iomgr/event_engine_shims/endpoint.cc | 6 +- src/core/lib/iomgr/exec_ctx.cc | 2 +- src/core/lib/iomgr/exec_ctx.h | 2 +- src/core/lib/iomgr/executor.cc | 4 +- src/core/lib/iomgr/executor.h | 2 +- src/core/lib/iomgr/fork_posix.cc | 6 +- src/core/lib/iomgr/iocp_windows.cc | 4 +- src/core/lib/iomgr/iomgr.cc | 4 +- src/core/lib/iomgr/iomgr_windows.cc | 2 +- src/core/lib/iomgr/lockfree_event.cc | 2 +- src/core/lib/iomgr/pollset_windows.cc | 4 +- src/core/lib/iomgr/resolve_address.h | 4 +- src/core/lib/iomgr/resolve_address_posix.cc | 6 +- src/core/lib/iomgr/resolve_address_windows.cc | 6 +- src/core/lib/iomgr/sockaddr_utils_posix.cc | 2 +- .../lib/iomgr/socket_utils_common_posix.cc | 2 +- src/core/lib/iomgr/socket_utils_linux.cc | 2 +- src/core/lib/iomgr/socket_utils_posix.cc | 4 +- src/core/lib/iomgr/socket_utils_windows.cc | 2 +- src/core/lib/iomgr/socket_windows.cc | 2 +- src/core/lib/iomgr/tcp_client_cfstream.cc | 4 +- src/core/lib/iomgr/tcp_client_posix.cc | 2 +- src/core/lib/iomgr/tcp_client_windows.cc | 2 +- src/core/lib/iomgr/tcp_posix.cc | 10 +- src/core/lib/iomgr/tcp_server_posix.cc | 2 +- .../iomgr/tcp_server_utils_posix_common.cc | 2 +- .../iomgr/tcp_server_utils_posix_ifaddrs.cc | 2 +- src/core/lib/iomgr/tcp_server_windows.cc | 2 +- src/core/lib/iomgr/tcp_windows.cc | 2 +- src/core/lib/iomgr/timer_generic.cc | 8 +- src/core/lib/iomgr/timer_manager.cc | 2 +- src/core/lib/iomgr/unix_sockets_posix.cc | 2 +- src/core/lib/iomgr/vsock.cc | 2 +- src/core/lib/iomgr/wakeup_fd_eventfd.cc | 2 +- src/core/lib/iomgr/wakeup_fd_pipe.cc | 4 +- src/core/lib/promise/activity.h | 8 +- src/core/lib/promise/arena_promise.h | 2 +- src/core/lib/promise/detail/basic_seq.h | 2 +- src/core/lib/promise/detail/join_state.h | 4 +- src/core/lib/promise/detail/seq_state.h | 4 +- .../lib/promise/exec_ctx_wakeup_scheduler.h | 2 +- src/core/lib/promise/for_each.h | 2 +- src/core/lib/promise/if.h | 2 +- src/core/lib/promise/inter_activity_latch.h | 2 +- src/core/lib/promise/inter_activity_pipe.h | 4 +- src/core/lib/promise/interceptor_list.h | 4 +- src/core/lib/promise/loop.h | 2 +- src/core/lib/promise/mpsc.h | 6 +- src/core/lib/promise/observable.h | 2 +- src/core/lib/promise/party.cc | 4 +- src/core/lib/promise/party.h | 10 +- src/core/lib/promise/pipe.h | 4 +- src/core/lib/promise/seq.h | 2 +- src/core/lib/promise/sleep.cc | 2 +- src/core/lib/promise/sleep.h | 2 +- src/core/lib/promise/wait_for_callback.h | 2 +- src/core/lib/resource_quota/api.cc | 2 +- src/core/lib/resource_quota/arena.h | 2 +- .../lib/resource_quota/connection_quota.h | 2 +- src/core/lib/resource_quota/memory_quota.cc | 2 +- src/core/lib/resource_quota/memory_quota.h | 8 +- src/core/lib/resource_quota/resource_quota.h | 4 +- .../security/authorization/audit_logging.cc | 2 +- .../authorization/authorization_engine.h | 2 +- .../authorization_policy_provider.h | 2 +- .../authorization_policy_provider_vtable.cc | 2 +- .../security/authorization/evaluate_args.cc | 2 +- .../grpc_authorization_policy_provider.cc | 4 +- .../grpc_authorization_policy_provider.h | 6 +- .../authorization/grpc_server_authz_filter.h | 2 +- .../lib/security/authorization/matchers.h | 2 +- .../security/authorization/rbac_translator.cc | 2 +- .../certificate_provider_factory.h | 4 +- .../lib/security/context/security_context.cc | 2 +- .../lib/security/context/security_context.h | 4 +- .../credentials/alts/alts_credentials.h | 4 +- .../alts/check_gcp_environment_no_op.cc | 2 +- .../alts/check_gcp_environment_windows.cc | 2 +- .../security/credentials/call_creds_util.cc | 2 +- .../credentials/channel_creds_registry.h | 4 +- .../channel_creds_registry_init.cc | 6 +- .../composite/composite_credentials.cc | 2 +- .../composite/composite_credentials.h | 4 +- .../lib/security/credentials/credentials.cc | 2 +- .../lib/security/credentials/credentials.h | 8 +- .../aws_external_account_credentials.cc | 4 +- .../aws_external_account_credentials.h | 4 +- .../external/external_account_credentials.cc | 4 +- .../external/external_account_credentials.h | 6 +- .../file_external_account_credentials.cc | 2 +- .../file_external_account_credentials.h | 2 +- .../url_external_account_credentials.h | 6 +- .../credentials/fake/fake_credentials.cc | 2 +- .../credentials/fake/fake_credentials.h | 4 +- .../google_default/credentials_generic.cc | 2 +- .../google_default_credentials.cc | 16 +- .../google_default_credentials.h | 4 +- .../credentials/iam/iam_credentials.cc | 2 +- .../credentials/iam/iam_credentials.h | 2 +- .../insecure/insecure_credentials.h | 4 +- .../credentials/jwt/jwt_credentials.cc | 4 +- .../credentials/jwt/jwt_credentials.h | 4 +- .../security/credentials/jwt/jwt_verifier.cc | 8 +- .../security/credentials/jwt/jwt_verifier.h | 2 +- .../credentials/local/local_credentials.h | 4 +- .../credentials/oauth2/oauth2_credentials.cc | 10 +- .../credentials/oauth2/oauth2_credentials.h | 12 +- .../credentials/plugin/plugin_credentials.h | 6 +- .../credentials/ssl/ssl_credentials.h | 4 +- .../tls/grpc_tls_certificate_distributor.h | 4 +- .../tls/grpc_tls_certificate_provider.cc | 6 +- .../tls/grpc_tls_certificate_provider.h | 4 +- .../tls/grpc_tls_certificate_verifier.cc | 2 +- .../tls/grpc_tls_credentials_options.cc | 2 +- .../credentials/tls/grpc_tls_crl_provider.cc | 4 +- .../credentials/tls/tls_credentials.h | 4 +- .../credentials/xds/xds_credentials.h | 6 +- .../alts/alts_security_connector.cc | 4 +- .../alts/alts_security_connector.h | 2 +- .../fake/fake_security_connector.cc | 8 +- .../fake/fake_security_connector.h | 2 +- .../insecure/insecure_security_connector.cc | 4 +- .../insecure/insecure_security_connector.h | 2 +- .../load_system_roots_supported.cc | 2 +- .../local/local_security_connector.cc | 6 +- .../local/local_security_connector.h | 2 +- .../security_connector/security_connector.cc | 2 +- .../security_connector/security_connector.h | 6 +- .../ssl/ssl_security_connector.cc | 8 +- .../ssl/ssl_security_connector.h | 2 +- .../security/security_connector/ssl_utils.cc | 6 +- .../security/security_connector/ssl_utils.h | 2 +- .../tls/tls_security_connector.cc | 6 +- .../tls/tls_security_connector.h | 4 +- .../lib/security/transport/auth_filters.h | 2 +- .../security/transport/client_auth_filter.cc | 4 +- .../security/transport/server_auth_filter.cc | 6 +- src/core/lib/slice/slice.cc | 2 +- src/core/lib/slice/slice.h | 2 +- src/core/lib/surface/call.cc | 16 +- src/core/lib/surface/call.h | 4 +- src/core/lib/surface/channel.h | 10 +- src/core/lib/surface/channel_create.h | 2 +- src/core/lib/surface/channel_init.cc | 2 +- src/core/lib/surface/channel_init.h | 2 +- src/core/lib/surface/completion_queue.cc | 10 +- src/core/lib/surface/completion_queue.h | 4 +- src/core/lib/surface/init.cc | 6 +- src/core/lib/surface/lame_client.cc | 6 +- src/core/lib/surface/lame_client.h | 2 +- src/core/lib/surface/legacy_channel.cc | 10 +- src/core/lib/surface/legacy_channel.h | 4 +- src/core/lib/surface/validate_metadata.cc | 2 +- src/core/lib/surface/wait_for_cq_end_op.cc | 2 +- src/core/lib/transport/batch_builder.h | 4 +- src/core/lib/transport/call_arena_allocator.h | 2 +- src/core/lib/transport/call_destination.h | 2 +- src/core/lib/transport/call_filters.cc | 2 +- src/core/lib/transport/call_filters.h | 6 +- src/core/lib/transport/call_spine.h | 2 +- src/core/lib/transport/connectivity_state.cc | 4 +- src/core/lib/transport/error_utils.cc | 2 +- src/core/lib/transport/error_utils.h | 2 +- src/core/lib/transport/interception_chain.cc | 2 +- src/core/lib/transport/interception_chain.h | 2 +- src/core/lib/transport/metadata_batch.h | 10 +- src/core/lib/transport/parsed_metadata.h | 2 +- src/core/lib/transport/promise_endpoint.cc | 2 +- src/core/lib/transport/promise_endpoint.h | 2 +- src/core/lib/transport/status_conversion.h | 2 +- src/core/lib/transport/timeout_encoding.h | 2 +- src/core/lib/transport/transport.cc | 2 +- src/core/lib/transport/transport.h | 4 +- src/core/lib/transport/transport_op_string.cc | 4 +- src/core/load_balancing/address_filtering.cc | 2 +- src/core/load_balancing/address_filtering.h | 2 +- .../load_balancing/child_policy_handler.cc | 2 +- .../load_balancing/child_policy_handler.h | 2 +- src/core/load_balancing/delegating_helper.h | 4 +- src/core/load_balancing/endpoint_list.cc | 6 +- src/core/load_balancing/endpoint_list.h | 8 +- .../grpclb/client_load_reporting_filter.cc | 2 +- src/core/load_balancing/grpclb/grpclb.cc | 20 +- .../load_balancing/grpclb/load_balancer_api.h | 2 +- .../load_balancing/health_check_client.cc | 10 +- src/core/load_balancing/health_check_client.h | 2 +- .../health_check_client_internal.h | 6 +- src/core/load_balancing/lb_policy.h | 12 +- src/core/load_balancing/lb_policy_factory.h | 4 +- src/core/load_balancing/lb_policy_registry.h | 4 +- src/core/load_balancing/oob_backend_metric.cc | 12 +- src/core/load_balancing/oob_backend_metric.h | 2 +- .../oob_backend_metric_internal.h | 4 +- .../outlier_detection/outlier_detection.cc | 16 +- .../outlier_detection/outlier_detection.h | 4 +- .../load_balancing/pick_first/pick_first.cc | 12 +- src/core/load_balancing/priority/priority.cc | 14 +- .../load_balancing/ring_hash/ring_hash.cc | 16 +- src/core/load_balancing/ring_hash/ring_hash.h | 4 +- src/core/load_balancing/rls/rls.cc | 24 +- .../load_balancing/round_robin/round_robin.cc | 8 +- .../load_balancing/subchannel_interface.h | 2 +- .../weighted_round_robin.cc | 16 +- .../weighted_target/weighted_target.cc | 14 +- src/core/load_balancing/xds/cds.cc | 16 +- .../load_balancing/xds/xds_cluster_impl.cc | 16 +- .../load_balancing/xds/xds_cluster_manager.cc | 12 +- .../load_balancing/xds/xds_override_host.cc | 16 +- .../load_balancing/xds/xds_override_host.h | 4 +- .../load_balancing/xds/xds_wrr_locality.cc | 10 +- src/core/resolver/binder/binder_resolver.cc | 6 +- .../resolver/dns/c_ares/dns_resolver_ares.cc | 16 +- .../resolver/dns/c_ares/grpc_ares_ev_driver.h | 2 +- .../dns/c_ares/grpc_ares_ev_driver_posix.cc | 2 +- .../dns/c_ares/grpc_ares_ev_driver_windows.cc | 4 +- .../resolver/dns/c_ares/grpc_ares_wrapper.cc | 8 +- .../resolver/dns/c_ares/grpc_ares_wrapper.h | 2 +- src/core/resolver/dns/dns_resolver_plugin.cc | 2 +- .../event_engine_client_channel_resolver.cc | 12 +- .../event_engine_client_channel_resolver.h | 4 +- .../dns/event_engine/service_config_helper.cc | 2 +- src/core/resolver/dns/native/dns_resolver.cc | 12 +- src/core/resolver/fake/fake_resolver.cc | 4 +- src/core/resolver/fake/fake_resolver.h | 2 +- .../google_c2p/google_c2p_resolver.cc | 14 +- src/core/resolver/polling_resolver.cc | 10 +- src/core/resolver/polling_resolver.h | 8 +- src/core/resolver/resolver.h | 4 +- src/core/resolver/resolver_factory.h | 4 +- src/core/resolver/resolver_registry.h | 4 +- .../resolver/sockaddr/sockaddr_resolver.cc | 4 +- .../resolver/xds/xds_dependency_manager.cc | 2 +- .../resolver/xds/xds_dependency_manager.h | 2 +- src/core/resolver/xds/xds_resolver.cc | 20 +- .../resolver/xds/xds_resolver_attributes.h | 2 +- src/core/server/server.cc | 10 +- src/core/server/server.h | 14 +- src/core/server/server_config_selector.h | 6 +- .../server/server_config_selector_filter.cc | 6 +- src/core/server/xds_server_config_fetcher.cc | 14 +- src/core/service_config/service_config.h | 2 +- .../service_config/service_config_call_data.h | 6 +- .../service_config_channel_arg_filter.cc | 2 +- .../service_config/service_config_impl.cc | 4 +- src/core/service_config/service_config_impl.h | 4 +- .../service_config/service_config_parser.h | 2 +- src/core/telemetry/call_tracer.h | 2 +- src/core/telemetry/metrics.h | 4 +- src/core/telemetry/stats.h | 2 +- src/core/telemetry/stats_data.h | 2 +- .../frame_protector/alts_frame_protector.cc | 2 +- .../alts/handshaker/alts_handshaker_client.cc | 6 +- .../alts/handshaker/alts_shared_resource.cc | 2 +- .../alts/handshaker/alts_shared_resource.h | 2 +- .../alts/handshaker/alts_tsi_handshaker.cc | 4 +- ...lts_grpc_integrity_only_record_protocol.cc | 2 +- ..._grpc_privacy_integrity_record_protocol.cc | 2 +- .../alts_grpc_record_protocol_common.cc | 2 +- .../alts_iovec_record_protocol.cc | 2 +- src/core/tsi/fake_transport_security.cc | 4 +- src/core/tsi/local_transport_security.cc | 2 +- .../tsi/ssl/key_logging/ssl_key_logging.cc | 4 +- .../ssl/session_cache/ssl_session_cache.cc | 4 +- .../tsi/ssl/session_cache/ssl_session_cache.h | 2 +- .../ssl/session_cache/ssl_session_openssl.cc | 2 +- src/core/tsi/ssl_transport_security.cc | 2 +- src/core/util/atomic_utils.h | 4 +- src/core/util/backoff.cc | 4 +- src/core/util/backoff.h | 4 +- src/core/util/bitset.h | 4 +- src/core/util/chunked_vector.h | 5 +- src/core/util/construct_destruct.h | 4 +- src/core/util/crash.cc | 3 +- src/core/util/crash.h | 4 +- src/core/util/debug_location.h | 4 +- src/core/util/directory_reader.h | 4 +- src/core/util/down_cast.h | 3 +- src/core/util/dual_ref_counted.h | 3 +- src/core/util/env.h | 4 +- src/core/util/event_log.cc | 3 +- src/core/util/event_log.h | 4 +- src/core/util/examine_stack.cc | 4 +- src/core/util/examine_stack.h | 4 +- src/core/util/fork.cc | 3 +- src/core/util/fork.h | 4 +- src/core/util/gethostname_fallback.cc | 2 +- src/core/util/gethostname_host_name_max.cc | 2 +- src/core/util/gethostname_sysconf.cc | 2 +- src/core/util/grpc_if_nametoindex.h | 4 +- src/core/util/host_port.cc | 3 +- src/core/util/host_port.h | 4 +- src/core/util/http_client/httpcli.cc | 2 +- src/core/util/http_client/httpcli.h | 12 +- .../http_client/httpcli_security_connector.cc | 6 +- src/core/util/json/json_object_loader.h | 4 +- src/core/util/json/json_reader.cc | 2 +- src/core/util/json/json_util.cc | 4 +- src/core/util/json/json_util.h | 2 +- src/core/util/linux/env.cc | 4 +- src/core/util/load_file.cc | 3 +- src/core/util/load_file.h | 4 +- src/core/util/manual_constructor.h | 4 +- src/core/util/match.h | 4 +- src/core/util/matchers.cc | 4 +- src/core/util/matchers.h | 4 +- src/core/util/memory.h | 3 +- src/core/util/mpscq.cc | 4 +- src/core/util/mpscq.h | 3 +- src/core/util/no_destruct.h | 4 +- src/core/util/notification.h | 4 +- src/core/util/orphanable.h | 4 +- src/core/util/overload.h | 4 +- src/core/util/per_cpu.cc | 3 +- src/core/util/per_cpu.h | 3 +- src/core/util/posix/directory_reader.cc | 4 +- src/core/util/posix/stat.cc | 4 +- src/core/util/posix/thd.cc | 4 +- src/core/util/random_early_detection.cc | 4 +- src/core/util/random_early_detection.h | 4 +- src/core/util/ref_counted.h | 3 +- src/core/util/ref_counted_ptr.h | 4 +- src/core/util/ref_counted_string.cc | 3 +- src/core/util/ref_counted_string.h | 4 +- src/core/util/single_set_ptr.h | 3 +- src/core/util/sorted_pack.h | 4 +- src/core/util/stat.h | 4 +- src/core/util/status_helper.cc | 3 +- src/core/util/status_helper.h | 4 +- src/core/util/strerror.cc | 4 +- src/core/util/strerror.h | 4 +- src/core/util/subprocess_windows.cc | 2 +- src/core/util/sync.h | 3 +- src/core/util/table.h | 4 +- src/core/util/tchar.cc | 4 +- src/core/util/thd.h | 3 +- src/core/util/time.cc | 3 +- src/core/util/time.h | 3 +- src/core/util/time_averaged_stats.cc | 4 +- src/core/util/time_util.cc | 3 +- src/core/util/time_util.h | 3 +- src/core/util/unique_type_name.h | 4 +- src/core/util/uri.cc | 3 +- src/core/util/uri.h | 4 +- src/core/util/uuid_v4.cc | 4 +- src/core/util/uuid_v4.h | 4 +- src/core/util/validation_errors.cc | 3 +- src/core/util/validation_errors.h | 4 +- src/core/util/windows/string_util.cc | 2 +- src/core/util/work_serializer.cc | 9 +- src/core/util/work_serializer.h | 3 +- .../xds/grpc/certificate_provider_store.h | 10 +- ...ile_watcher_certificate_provider_factory.h | 6 +- .../xds/grpc/xds_audit_logger_registry.cc | 2 +- src/core/xds/grpc/xds_audit_logger_registry.h | 2 +- src/core/xds/grpc/xds_bootstrap_grpc.cc | 4 +- src/core/xds/grpc/xds_bootstrap_grpc.h | 4 +- src/core/xds/grpc/xds_certificate_provider.h | 6 +- src/core/xds/grpc/xds_client_grpc.cc | 12 +- src/core/xds/grpc/xds_client_grpc.h | 4 +- src/core/xds/grpc/xds_cluster.cc | 6 +- .../xds/grpc/xds_cluster_specifier_plugin.h | 2 +- src/core/xds/grpc/xds_common_types.h | 4 +- src/core/xds/grpc/xds_endpoint.cc | 4 +- src/core/xds/grpc/xds_endpoint.h | 2 +- src/core/xds/grpc/xds_http_fault_filter.cc | 4 +- src/core/xds/grpc/xds_http_filters.h | 2 +- .../grpc/xds_http_stateful_session_filter.cc | 4 +- src/core/xds/grpc/xds_lb_policy_registry.cc | 2 +- src/core/xds/grpc/xds_lb_policy_registry.h | 2 +- src/core/xds/grpc/xds_listener.cc | 4 +- src/core/xds/grpc/xds_listener.h | 2 +- src/core/xds/grpc/xds_route_config.cc | 10 +- src/core/xds/grpc/xds_route_config.h | 2 +- src/core/xds/grpc/xds_transport_grpc.cc | 8 +- src/core/xds/grpc/xds_transport_grpc.h | 4 +- src/core/xds/xds_client/xds_client.cc | 2 +- src/core/xds/xds_client/xds_client.h | 2 +- src/core/xds/xds_client/xds_client_stats.h | 4 +- src/cpp/client/secure_credentials.cc | 4 +- src/cpp/common/alarm.cc | 2 +- src/cpp/common/secure_auth_context.h | 2 +- src/cpp/common/secure_create_auth_context.cc | 2 +- src/cpp/common/validate_service_config.cc | 2 +- src/cpp/ext/csm/metadata_exchange.cc | 4 +- src/cpp/ext/filters/census/client_filter.cc | 2 +- .../filters/census/open_census_call_tracer.h | 2 +- src/cpp/ext/gcp/environment_autodetect.cc | 12 +- src/cpp/ext/gcp/observability_config.cc | 8 +- src/cpp/ext/gcp/observability_config.h | 2 +- src/cpp/ext/gcp/observability_logging_sink.cc | 2 +- src/cpp/ext/otel/otel_client_call_tracer.cc | 2 +- src/cpp/ext/otel/otel_client_call_tracer.h | 2 +- src/cpp/ext/otel/otel_plugin.cc | 2 +- .../external_connection_acceptor_impl.h | 2 +- src/cpp/server/orca/orca_service.cc | 4 +- src/cpp/server/server_cc.cc | 2 +- src/cpp/server/server_context.cc | 4 +- src/cpp/thread_manager/thread_manager.cc | 2 +- src/cpp/thread_manager/thread_manager.h | 4 +- src/python/grpcio/grpc_core_dependencies.py | 74 +- .../observability_lib_deps.py | 34 +- .../parse_address_with_named_scope_id_test.cc | 4 +- test/core/backoff/backoff_test.cc | 2 +- test/core/bad_client/bad_client.cc | 2 +- test/core/bad_connection/close_fd_test.cc | 4 +- test/core/call/yodel/yodel_test.h | 2 +- test/core/channel/call_finalization_test.cc | 2 +- test/core/channel/channel_args_test.cc | 2 +- test/core/channel/channel_stack_test.cc | 2 +- .../server_call_tracer_factory_test.cc | 2 +- test/core/channelz/channelz_test.cc | 2 +- .../client_channel_service_config_test.cc | 2 +- .../retry_service_config_test.cc | 4 +- test/core/end2end/bad_server_response_test.cc | 8 +- test/core/end2end/connection_refused_test.cc | 2 +- test/core/end2end/cq_verifier.cc | 2 +- test/core/end2end/dualstack_socket_test.cc | 2 +- test/core/end2end/end2end_test_fuzzer.cc | 2 +- test/core/end2end/end2end_test_suites.cc | 8 +- test/core/end2end/end2end_tests.h | 6 +- .../end2end/fixtures/http_proxy_fixture.cc | 10 +- test/core/end2end/fixtures/proxy.cc | 2 +- test/core/end2end/fixtures/sockpair_fixture.h | 2 +- test/core/end2end/fuzzers/api_fuzzer.cc | 8 +- test/core/end2end/fuzzers/client_fuzzer.cc | 4 +- test/core/end2end/fuzzers/fuzzing_common.cc | 2 +- test/core/end2end/fuzzers/fuzzing_common.h | 2 +- test/core/end2end/fuzzers/network_input.h | 2 +- test/core/end2end/fuzzers/server_fuzzer.cc | 2 +- test/core/end2end/goaway_server_test.cc | 4 +- .../core/end2end/h2_ssl_session_reuse_test.cc | 2 +- ...ls_peer_property_external_verifier_test.cc | 2 +- test/core/end2end/no_server_test.cc | 2 +- test/core/end2end/tests/binary_metadata.cc | 2 +- test/core/end2end/tests/call_creds.cc | 2 +- test/core/end2end/tests/channelz.cc | 2 +- .../core/end2end/tests/filter_causes_close.cc | 6 +- test/core/end2end/tests/filter_context.cc | 2 +- test/core/end2end/tests/filter_init_fails.cc | 4 +- test/core/end2end/tests/grpc_authz.cc | 4 +- test/core/end2end/tests/http2_stats.cc | 6 +- .../end2end/tests/invoke_large_request.cc | 2 +- test/core/end2end/tests/keepalive_timeout.cc | 2 +- test/core/end2end/tests/payload.cc | 2 +- .../core/end2end/tests/ping_pong_streaming.cc | 2 +- test/core/end2end/tests/request_with_flags.cc | 2 +- .../end2end/tests/resource_quota_server.cc | 2 +- ...retry_cancel_with_multiple_send_batches.cc | 4 +- test/core/end2end/tests/retry_lb_drop.cc | 6 +- .../tests/retry_recv_message_replay.cc | 4 +- .../retry_recv_trailing_metadata_error.cc | 6 +- .../core/end2end/tests/retry_send_op_fails.cc | 4 +- test/core/end2end/tests/retry_streaming.cc | 2 +- .../end2end/tests/retry_transparent_goaway.cc | 4 +- .../retry_transparent_not_sent_on_wire.cc | 4 +- test/core/end2end/tests/simple_request.cc | 2 +- .../tests/timeout_before_request_call.cc | 2 +- .../event_engine/event_engine_test_utils.cc | 2 +- .../event_engine/event_engine_test_utils.h | 2 +- .../fuzzing_event_engine.cc | 2 +- .../posix/event_poller_posix_test.cc | 2 +- .../event_engine/posix/posix_endpoint_test.cc | 2 +- .../posix/posix_event_engine_connect_test.cc | 4 +- .../posix/traced_buffer_list_test.cc | 2 +- .../posix/oracle_event_engine_posix.cc | 2 +- .../test_suite/tests/client_test.cc | 2 +- .../event_engine/test_suite/tests/dns_test.cc | 2 +- .../test_suite/tests/server_test.cc | 2 +- .../test_suite/tools/echo_client.cc | 2 +- test/core/event_engine/windows/iocp_test.cc | 2 +- .../event_engine/windows/win_socket_test.cc | 2 +- .../windows/windows_endpoint_test.cc | 2 +- .../resolver_fuzzer.cc | 8 +- .../rbac/rbac_service_config_parser_test.cc | 2 +- test/core/filters/client_auth_filter_test.cc | 4 +- test/core/filters/filter_test.cc | 2 +- test/core/filters/filter_test.h | 2 +- test/core/gprpp/chunked_vector_fuzzer.cc | 4 +- test/core/gprpp/chunked_vector_test.cc | 2 +- test/core/gprpp/work_serializer_test.cc | 4 +- .../readahead_handshaker_server_ssl.cc | 2 +- test/core/handshake/server_ssl_common.cc | 2 +- test/core/http/httpcli_test.cc | 6 +- test/core/http/httpscli_test.cc | 12 +- test/core/iomgr/buffer_list_test.cc | 2 +- test/core/iomgr/endpoint_pair_test.cc | 2 +- test/core/iomgr/endpoint_tests.cc | 4 +- test/core/iomgr/fd_conservation_posix_test.cc | 2 +- test/core/iomgr/fd_posix_test.cc | 4 +- .../grpc_ipv6_loopback_available_test.cc | 2 +- .../iomgr/pollset_windows_starvation_test.cc | 2 +- test/core/iomgr/resolve_address_posix_test.cc | 8 +- test/core/iomgr/resolve_address_test.cc | 6 +- test/core/iomgr/socket_utils_test.cc | 2 +- test/core/iomgr/tcp_client_posix_test.cc | 4 +- test/core/iomgr/tcp_posix_test.cc | 4 +- test/core/iomgr/tcp_server_posix_test.cc | 8 +- test/core/iomgr/timer_heap_test.cc | 2 +- test/core/iomgr/timer_list_test.cc | 4 +- test/core/json/json_object_loader_test.cc | 4 +- test/core/load_balancing/lb_policy_test_lib.h | 18 +- ...outlier_detection_lb_config_parser_test.cc | 2 +- .../load_balancing/outlier_detection_test.cc | 6 +- test/core/load_balancing/pick_first_test.cc | 10 +- test/core/load_balancing/ring_hash_test.cc | 4 +- .../rls_lb_config_parser_test.cc | 2 +- test/core/load_balancing/round_robin_test.cc | 2 +- .../static_stride_scheduler_benchmark.cc | 2 +- .../weighted_round_robin_config_test.cc | 2 +- .../weighted_round_robin_test.cc | 8 +- ...xds_override_host_lb_config_parser_test.cc | 2 +- .../load_balancing/xds_override_host_test.cc | 4 +- .../message_size_service_config_test.cc | 2 +- .../network_benchmarks/low_level_ping_pong.cc | 4 +- test/core/promise/arena_promise_test.cc | 2 +- .../event_engine_wakeup_scheduler_test.cc | 2 +- test/core/promise/for_each_test.cc | 2 +- .../core/promise/inter_activity_latch_test.cc | 2 +- test/core/promise/interceptor_list_test.cc | 2 +- test/core/promise/map_pipe_test.cc | 2 +- test/core/promise/observable_test.cc | 2 +- test/core/promise/party_test.cc | 8 +- test/core/promise/pipe_test.cc | 4 +- test/core/promise/sleep_test.cc | 4 +- test/core/promise/wait_for_callback_test.cc | 2 +- test/core/resolver/binder_resolver_test.cc | 4 +- .../resolver/dns_resolver_cooldown_test.cc | 14 +- test/core/resolver/dns_resolver_test.cc | 6 +- test/core/resolver/fake_resolver_test.cc | 10 +- test/core/resolver/sockaddr_resolver_test.cc | 6 +- test/core/resource_quota/arena_test.cc | 4 +- .../resource_quota/memory_quota_fuzzer.cc | 2 +- .../memory_quota_stress_test.cc | 2 +- test/core/security/alts_credentials_fuzzer.cc | 4 +- .../security/alts_security_connector_test.cc | 2 +- test/core/security/auth_context_test.cc | 2 +- .../check_gcp_environment_linux_test.cc | 2 +- .../check_gcp_environment_windows_test.cc | 2 +- test/core/security/create_jwt.cc | 2 +- test/core/security/credentials_test.cc | 12 +- test/core/security/fetch_oauth2.cc | 2 +- .../grpc_tls_certificate_distributor_test.cc | 2 +- .../grpc_tls_certificate_provider_test.cc | 2 +- .../grpc_tls_certificate_verifier_test.cc | 2 +- .../grpc_tls_credentials_options_test.cc | 2 +- test/core/security/json_token_test.cc | 2 +- test/core/security/jwt_verifier_test.cc | 2 +- test/core/security/oauth2_utils.cc | 4 +- .../print_google_default_creds_token.cc | 2 +- test/core/security/rbac_translator_test.cc | 2 +- test/core/security/secure_endpoint_test.cc | 2 +- test/core/security/security_connector_test.cc | 4 +- test/core/security/ssl_credentials_test.cc | 2 +- test/core/security/ssl_server_fuzzer.cc | 4 +- test/core/security/system_roots_test.cc | 6 +- .../security/tls_security_connector_test.cc | 4 +- test/core/security/verify_jwt.cc | 2 +- .../service_config/service_config_test.cc | 4 +- test/core/slice/slice_test.cc | 4 +- .../completion_queue_threading_test.cc | 4 +- .../surface/concurrent_connectivity_test.cc | 4 +- test/core/surface/lame_client_test.cc | 2 +- ...num_external_connectivity_watchers_test.cc | 2 +- .../surface/sequential_connectivity_test.cc | 2 +- test/core/surface/server_chttp2_test.cc | 2 +- test/core/surface/server_test.cc | 2 +- test/core/telemetry/call_tracer_test.cc | 2 +- test/core/test_util/evaluate_args_test_util.h | 2 +- test/core/test_util/fake_stats_plugin.h | 2 +- test/core/test_util/fuzzer_corpus_test.cc | 2 +- test/core/test_util/fuzzing_channel_args.h | 2 +- .../core/test_util/one_corpus_entry_fuzzer.cc | 2 +- .../port_isolated_runtime_environment.cc | 2 +- test/core/test_util/port_server_client.cc | 10 +- test/core/test_util/test_config.cc | 2 +- test/core/test_util/test_lb_policies.cc | 10 +- test/core/test_util/test_tcp_server.cc | 2 +- test/core/test_util/tls_utils.cc | 2 +- test/core/test_util/tls_utils.h | 2 +- .../transport/binder/binder_transport_test.cc | 2 +- .../chaotic_good/chaotic_good_server_test.cc | 2 +- .../client_transport_error_test.cc | 2 +- .../transport/chaotic_good/frame_fuzzer.cc | 2 +- .../chaotic_good/server_transport_test.cc | 2 +- .../transport/chttp2/flow_control_fuzzer.cc | 2 +- .../transport/chttp2/flow_control_test.cc | 4 +- .../chttp2/graceful_shutdown_test.cc | 6 +- .../transport/chttp2/hpack_encoder_test.cc | 2 +- .../chttp2/hpack_parser_fuzzer_test.cc | 4 +- .../chttp2/hpack_parser_input_size_fuzzer.cc | 4 +- .../transport/chttp2/hpack_parser_test.cc | 6 +- .../transport/chttp2/hpack_sync_fuzzer.cc | 4 +- .../chttp2/ping_configuration_test.cc | 2 +- .../transport/chttp2/settings_timeout_test.cc | 4 +- .../transport/chttp2/streams_not_seen_test.cc | 10 +- .../transport/chttp2/too_many_pings_test.cc | 10 +- test/core/transport/error_utils_test.cc | 2 +- test/core/transport/metadata_map_test.cc | 4 +- .../alts_frame_protector_test.cc | 2 +- .../alts_concurrent_connectivity_test.cc | 6 +- .../handshaker/alts_handshaker_client_test.cc | 2 +- .../handshaker/alts_tsi_handshaker_test.cc | 2 +- .../tsi/crl_ssl_transport_security_test.cc | 2 +- test/core/tsi/fake_transport_security_test.cc | 2 +- test/core/tsi/ssl_transport_security_test.cc | 2 +- .../tsi/ssl_transport_security_utils_test.cc | 2 +- test/core/tsi/transport_security_test.cc | 2 +- test/core/uri/uri_parser_test.cc | 3 +- .../xds/xds_audit_logger_registry_test.cc | 2 +- test/core/xds/xds_bootstrap_test.cc | 6 +- .../core/xds/xds_certificate_provider_test.cc | 2 +- test/core/xds/xds_client_test.cc | 4 +- .../xds/xds_cluster_resource_type_test.cc | 6 +- test/core/xds/xds_common_types_test.cc | 4 +- .../xds/xds_endpoint_resource_type_test.cc | 4 +- test/core/xds/xds_http_filters_test.cc | 4 +- test/core/xds/xds_lb_policy_registry_test.cc | 6 +- .../xds/xds_listener_resource_type_test.cc | 6 +- .../xds_route_config_resource_type_test.cc | 6 +- test/core/xds/xds_transport_fake.cc | 2 +- ...channel_with_active_connect_stress_test.cc | 6 +- test/cpp/common/time_jump_test.cc | 4 +- test/cpp/common/timer_test.cc | 4 +- test/cpp/end2end/async_end2end_test.cc | 2 +- test/cpp/end2end/cfstream_test.cc | 2 +- test/cpp/end2end/channelz_service_test.cc | 2 +- .../end2end/client_callback_end2end_test.cc | 2 +- test/cpp/end2end/client_lb_end2end_test.cc | 14 +- .../end2end/connection_attempt_injector.cc | 2 +- .../cpp/end2end/connection_attempt_injector.h | 2 +- test/cpp/end2end/end2end_test.cc | 4 +- test/cpp/end2end/grpclb_end2end_test.cc | 10 +- test/cpp/end2end/hybrid_end2end_test.cc | 2 +- test/cpp/end2end/port_sharing_end2end_test.cc | 4 +- test/cpp/end2end/raw_end2end_test.cc | 2 +- .../resource_quota_end2end_stress_test.cc | 2 +- test/cpp/end2end/rls_end2end_test.cc | 8 +- .../end2end/service_config_end2end_test.cc | 8 +- test/cpp/end2end/thread_stress_test.cc | 2 +- test/cpp/end2end/time_change_test.cc | 2 +- .../xds/xds_cluster_type_end2end_test.cc | 2 +- test/cpp/end2end/xds/xds_end2end_test.cc | 12 +- test/cpp/end2end/xds/xds_end2end_test_lib.cc | 2 +- .../xds/xds_pick_first_end2end_test.cc | 2 +- .../end2end/xds/xds_ring_hash_end2end_test.cc | 2 +- test/cpp/end2end/xds/xds_utils.cc | 2 +- test/cpp/ext/csm/metadata_exchange_test.cc | 2 +- test/cpp/ext/otel/otel_test_library.cc | 2 +- test/cpp/interop/grpclb_fallback_test.cc | 2 +- test/cpp/interop/interop_server.cc | 2 +- test/cpp/interop/interop_test.cc | 2 +- test/cpp/interop/istio_echo_server.cc | 2 +- test/cpp/microbenchmarks/bm_chttp2_hpack.cc | 4 +- test/cpp/microbenchmarks/bm_cq.cc | 2 +- .../microbenchmarks/bm_cq_multiple_threads.cc | 4 +- test/cpp/microbenchmarks/bm_exec_ctx.cc | 2 +- test/cpp/microbenchmarks/bm_huffman_decode.cc | 2 +- test/cpp/microbenchmarks/fullstack_fixtures.h | 2 +- test/cpp/naming/address_sorting_test.cc | 4 +- test/cpp/naming/cancel_ares_query_test.cc | 8 +- test/cpp/naming/resolver_component_test.cc | 8 +- test/cpp/performance/writes_per_rpc_test.cc | 2 +- test/cpp/qps/client_async.cc | 2 +- test/cpp/qps/server_async.cc | 2 +- test/cpp/util/channel_trace_proto_helper.cc | 2 +- tools/doxygen/Doxyfile.c++.internal | 184 ++-- tools/doxygen/Doxyfile.core.internal | 185 ++-- 822 files changed, 3065 insertions(+), 3055 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 79cc39e4173..c5946a35ecd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1670,45 +1670,45 @@ add_library(gpr src/core/lib/config/config_vars_non_generated.cc src/core/lib/config/load_config.cc src/core/lib/event_engine/thread_local.cc + src/core/util/alloc.cc + src/core/util/android/log.cc + src/core/util/atm.cc src/core/util/crash.cc src/core/util/examine_stack.cc src/core/util/fork.cc + src/core/util/gpr_time.cc src/core/util/host_port.cc - src/core/util/linux/env.cc - src/core/util/mpscq.cc - src/core/util/posix/env.cc - src/core/util/posix/stat.cc - src/core/util/posix/thd.cc - src/core/util/strerror.cc - src/core/util/tchar.cc - src/core/util/time_util.cc - src/core/util/windows/env.cc - src/core/util/windows/stat.cc - src/core/util/windows/thd.cc - src/core/util/alloc.cc - src/core/util/android/log.cc - src/core/util/atm.cc src/core/util/iphone/cpu.cc src/core/util/linux/cpu.cc + src/core/util/linux/env.cc src/core/util/linux/log.cc src/core/util/log.cc + src/core/util/mpscq.cc src/core/util/msys/tmpfile.cc src/core/util/posix/cpu.cc + src/core/util/posix/env.cc src/core/util/posix/log.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/strerror.cc src/core/util/string.cc src/core/util/sync.cc src/core/util/sync_abseil.cc - src/core/util/time.cc + src/core/util/tchar.cc src/core/util/time_precise.cc + src/core/util/time_util.cc src/core/util/windows/cpu.cc + src/core/util/windows/env.cc src/core/util/windows/log.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 ) @@ -2237,8 +2237,6 @@ add_library(grpc src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc src/core/lib/address_utils/parse_address.cc src/core/lib/address_utils/sockaddr_utils.cc - src/core/util/backoff.cc - src/core/util/random_early_detection.cc src/core/lib/channel/channel_args.cc src/core/lib/channel/channel_args_preconditioning.cc src/core/lib/channel/channel_stack.cc @@ -2252,7 +2250,6 @@ add_library(grpc src/core/lib/compression/compression_internal.cc src/core/lib/compression/message_compress.cc src/core/lib/config/core_configuration.cc - src/core/util/event_log.cc src/core/lib/debug/trace.cc src/core/lib/event_engine/ares_resolver.cc src/core/lib/event_engine/cf_engine/cf_engine.cc @@ -2303,18 +2300,6 @@ add_library(grpc src/core/lib/event_engine/work_queue/basic_work_queue.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/util/dump_args.cc - src/core/util/load_file.cc - src/core/util/per_cpu.cc - src/core/util/posix/directory_reader.cc - src/core/util/ref_counted_string.cc - src/core/util/status_helper.cc - src/core/util/time.cc - src/core/util/time_averaged_stats.cc - src/core/util/uuid_v4.cc - src/core/util/validation_errors.cc - src/core/util/windows/directory_reader.cc - src/core/util/work_serializer.cc src/core/lib/iomgr/buffer_list.cc src/core/lib/iomgr/call_combiner.cc src/core/lib/iomgr/cfstream_handle.cc @@ -2339,11 +2324,6 @@ add_library(grpc src/core/lib/iomgr/executor.cc src/core/lib/iomgr/fork_posix.cc src/core/lib/iomgr/fork_windows.cc - src/core/util/gethostname_fallback.cc - src/core/util/gethostname_host_name_max.cc - src/core/util/gethostname_sysconf.cc - src/core/util/grpc_if_nametoindex_posix.cc - src/core/util/grpc_if_nametoindex_unsupported.cc src/core/lib/iomgr/internal_errqueue.cc src/core/lib/iomgr/iocp_windows.cc src/core/lib/iomgr/iomgr.cc @@ -2392,7 +2372,6 @@ add_library(grpc src/core/lib/iomgr/wakeup_fd_nospecial.cc src/core/lib/iomgr/wakeup_fd_pipe.cc src/core/lib/iomgr/wakeup_fd_posix.cc - src/core/util/matchers.cc src/core/lib/promise/activity.cc src/core/lib/promise/party.cc src/core/lib/promise/sleep.cc @@ -2511,7 +2490,6 @@ add_library(grpc src/core/lib/transport/timeout_encoding.cc src/core/lib/transport/transport.cc src/core/lib/transport/transport_op_string.cc - src/core/util/uri.cc src/core/load_balancing/address_filtering.cc src/core/load_balancing/backend_metric_parser.cc src/core/load_balancing/child_policy_handler.cc @@ -2604,6 +2582,14 @@ add_library(grpc src/core/tsi/ssl_transport_security_utils.cc src/core/tsi/transport_security.cc src/core/tsi/transport_security_grpc.cc + src/core/util/backoff.cc + src/core/util/dump_args.cc + src/core/util/event_log.cc + src/core/util/gethostname_fallback.cc + src/core/util/gethostname_host_name_max.cc + src/core/util/gethostname_sysconf.cc + src/core/util/grpc_if_nametoindex_posix.cc + src/core/util/grpc_if_nametoindex_unsupported.cc src/core/util/http_client/format_request.cc src/core/util/http_client/httpcli.cc src/core/util/http_client/httpcli_security_connector.cc @@ -2612,6 +2598,20 @@ add_library(grpc src/core/util/json/json_reader.cc src/core/util/json/json_util.cc src/core/util/json/json_writer.cc + src/core/util/load_file.cc + src/core/util/matchers.cc + src/core/util/per_cpu.cc + src/core/util/posix/directory_reader.cc + src/core/util/random_early_detection.cc + src/core/util/ref_counted_string.cc + src/core/util/status_helper.cc + src/core/util/time.cc + src/core/util/time_averaged_stats.cc + src/core/util/uri.cc + src/core/util/uuid_v4.cc + src/core/util/validation_errors.cc + src/core/util/windows/directory_reader.cc + src/core/util/work_serializer.cc src/core/xds/grpc/certificate_provider_store.cc src/core/xds/grpc/file_watcher_certificate_provider_factory.cc src/core/xds/grpc/xds_audit_logger_registry.cc @@ -3033,8 +3033,6 @@ add_library(grpc_unsecure src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc src/core/lib/address_utils/parse_address.cc src/core/lib/address_utils/sockaddr_utils.cc - src/core/util/backoff.cc - src/core/util/random_early_detection.cc src/core/lib/channel/channel_args.cc src/core/lib/channel/channel_args_preconditioning.cc src/core/lib/channel/channel_stack.cc @@ -3048,7 +3046,6 @@ add_library(grpc_unsecure src/core/lib/compression/compression_internal.cc src/core/lib/compression/message_compress.cc src/core/lib/config/core_configuration.cc - src/core/util/event_log.cc src/core/lib/debug/trace.cc src/core/lib/event_engine/ares_resolver.cc src/core/lib/event_engine/cf_engine/cf_engine.cc @@ -3099,16 +3096,6 @@ add_library(grpc_unsecure src/core/lib/event_engine/work_queue/basic_work_queue.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/util/dump_args.cc - src/core/util/load_file.cc - src/core/util/per_cpu.cc - src/core/util/ref_counted_string.cc - src/core/util/status_helper.cc - src/core/util/time.cc - src/core/util/time_averaged_stats.cc - src/core/util/uuid_v4.cc - src/core/util/validation_errors.cc - src/core/util/work_serializer.cc src/core/lib/iomgr/buffer_list.cc src/core/lib/iomgr/call_combiner.cc src/core/lib/iomgr/cfstream_handle.cc @@ -3133,11 +3120,6 @@ add_library(grpc_unsecure src/core/lib/iomgr/executor.cc src/core/lib/iomgr/fork_posix.cc src/core/lib/iomgr/fork_windows.cc - src/core/util/gethostname_fallback.cc - src/core/util/gethostname_host_name_max.cc - src/core/util/gethostname_sysconf.cc - src/core/util/grpc_if_nametoindex_posix.cc - src/core/util/grpc_if_nametoindex_unsupported.cc src/core/lib/iomgr/internal_errqueue.cc src/core/lib/iomgr/iocp_windows.cc src/core/lib/iomgr/iomgr.cc @@ -3270,7 +3252,6 @@ add_library(grpc_unsecure src/core/lib/transport/timeout_encoding.cc src/core/lib/transport/transport.cc src/core/lib/transport/transport_op_string.cc - src/core/util/uri.cc src/core/load_balancing/address_filtering.cc src/core/load_balancing/backend_metric_parser.cc src/core/load_balancing/child_policy_handler.cc @@ -3326,12 +3307,31 @@ add_library(grpc_unsecure src/core/tsi/local_transport_security.cc src/core/tsi/transport_security.cc src/core/tsi/transport_security_grpc.cc + src/core/util/backoff.cc + src/core/util/dump_args.cc + src/core/util/event_log.cc + src/core/util/gethostname_fallback.cc + src/core/util/gethostname_host_name_max.cc + src/core/util/gethostname_sysconf.cc + src/core/util/grpc_if_nametoindex_posix.cc + src/core/util/grpc_if_nametoindex_unsupported.cc src/core/util/http_client/format_request.cc src/core/util/http_client/httpcli.cc src/core/util/http_client/parser.cc src/core/util/json/json_object_loader.cc src/core/util/json/json_reader.cc src/core/util/json/json_writer.cc + src/core/util/load_file.cc + src/core/util/per_cpu.cc + src/core/util/random_early_detection.cc + src/core/util/ref_counted_string.cc + src/core/util/status_helper.cc + src/core/util/time.cc + src/core/util/time_averaged_stats.cc + src/core/util/uri.cc + src/core/util/uuid_v4.cc + src/core/util/validation_errors.cc + src/core/util/work_serializer.cc third_party/upb/upb/mini_descriptor/build_enum.c third_party/upb/upb/mini_descriptor/decode.c third_party/upb/upb/mini_descriptor/internal/base92.c @@ -5153,7 +5153,6 @@ add_library(grpc_authorization_provider src/core/handshaker/security/tsi_error.cc src/core/lib/address_utils/parse_address.cc src/core/lib/address_utils/sockaddr_utils.cc - src/core/util/backoff.cc src/core/lib/channel/channel_args.cc src/core/lib/channel/channel_args_preconditioning.cc src/core/lib/channel/channel_stack.cc @@ -5167,7 +5166,6 @@ add_library(grpc_authorization_provider src/core/lib/compression/compression_internal.cc src/core/lib/compression/message_compress.cc src/core/lib/config/core_configuration.cc - src/core/util/event_log.cc src/core/lib/debug/trace.cc src/core/lib/event_engine/ares_resolver.cc src/core/lib/event_engine/cf_engine/cf_engine.cc @@ -5218,15 +5216,6 @@ add_library(grpc_authorization_provider src/core/lib/event_engine/work_queue/basic_work_queue.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/util/dump_args.cc - src/core/util/load_file.cc - src/core/util/per_cpu.cc - src/core/util/ref_counted_string.cc - src/core/util/status_helper.cc - src/core/util/time.cc - src/core/util/time_averaged_stats.cc - src/core/util/validation_errors.cc - src/core/util/work_serializer.cc src/core/lib/iomgr/buffer_list.cc src/core/lib/iomgr/call_combiner.cc src/core/lib/iomgr/cfstream_handle.cc @@ -5251,11 +5240,6 @@ add_library(grpc_authorization_provider src/core/lib/iomgr/executor.cc src/core/lib/iomgr/fork_posix.cc src/core/lib/iomgr/fork_windows.cc - src/core/util/gethostname_fallback.cc - src/core/util/gethostname_host_name_max.cc - src/core/util/gethostname_sysconf.cc - src/core/util/grpc_if_nametoindex_posix.cc - src/core/util/grpc_if_nametoindex_unsupported.cc src/core/lib/iomgr/internal_errqueue.cc src/core/lib/iomgr/iocp_windows.cc src/core/lib/iomgr/iomgr.cc @@ -5304,7 +5288,6 @@ add_library(grpc_authorization_provider src/core/lib/iomgr/wakeup_fd_nospecial.cc src/core/lib/iomgr/wakeup_fd_pipe.cc src/core/lib/iomgr/wakeup_fd_posix.cc - src/core/util/matchers.cc src/core/lib/promise/activity.cc src/core/lib/promise/party.cc src/core/lib/promise/trace.cc @@ -5386,7 +5369,6 @@ add_library(grpc_authorization_provider src/core/lib/transport/timeout_encoding.cc src/core/lib/transport/transport.cc src/core/lib/transport/transport_op_string.cc - src/core/util/uri.cc src/core/load_balancing/lb_policy.cc src/core/load_balancing/lb_policy_registry.cc src/core/resolver/endpoint_addresses.cc @@ -5401,8 +5383,26 @@ add_library(grpc_authorization_provider src/core/tsi/alts/handshaker/transport_security_common_api.cc src/core/tsi/transport_security.cc src/core/tsi/transport_security_grpc.cc + src/core/util/backoff.cc + src/core/util/dump_args.cc + src/core/util/event_log.cc + src/core/util/gethostname_fallback.cc + src/core/util/gethostname_host_name_max.cc + src/core/util/gethostname_sysconf.cc + src/core/util/grpc_if_nametoindex_posix.cc + src/core/util/grpc_if_nametoindex_unsupported.cc src/core/util/json/json_reader.cc src/core/util/json/json_writer.cc + src/core/util/load_file.cc + src/core/util/matchers.cc + src/core/util/per_cpu.cc + src/core/util/ref_counted_string.cc + src/core/util/status_helper.cc + src/core/util/time.cc + src/core/util/time_averaged_stats.cc + src/core/util/uri.cc + src/core/util/validation_errors.cc + src/core/util/work_serializer.cc third_party/upb/upb/mini_descriptor/build_enum.c third_party/upb/upb/mini_descriptor/decode.c third_party/upb/upb/mini_descriptor/internal/base92.c @@ -8522,10 +8522,6 @@ add_executable(call_filters_test src/core/lib/debug/trace.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/util/dump_args.cc - src/core/util/ref_counted_string.cc - src/core/util/status_helper.cc - src/core/util/time.cc src/core/lib/iomgr/closure.cc src/core/lib/iomgr/combiner.cc src/core/lib/iomgr/error.cc @@ -8557,6 +8553,10 @@ add_executable(call_filters_test src/core/lib/transport/parsed_metadata.cc src/core/lib/transport/status_conversion.cc src/core/lib/transport/timeout_encoding.cc + src/core/util/dump_args.cc + src/core/util/ref_counted_string.cc + src/core/util/status_helper.cc + src/core/util/time.cc test/core/transport/call_filters_test.cc third_party/upb/upb/mini_descriptor/build_enum.c third_party/upb/upb/mini_descriptor/decode.c @@ -10198,8 +10198,6 @@ add_executable(chunked_vector_test src/core/lib/debug/trace.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/util/status_helper.cc - src/core/util/time.cc src/core/lib/iomgr/closure.cc src/core/lib/iomgr/combiner.cc src/core/lib/iomgr/error.cc @@ -10219,6 +10217,8 @@ add_executable(chunked_vector_test src/core/lib/slice/slice.cc src/core/lib/slice/slice_refcount.cc src/core/lib/slice/slice_string_helpers.cc + src/core/util/status_helper.cc + src/core/util/time.cc test/core/gprpp/chunked_vector_test.cc third_party/upb/upb/mini_descriptor/build_enum.c third_party/upb/upb/mini_descriptor/decode.c @@ -12900,9 +12900,9 @@ if(gRPC_BUILD_TESTS) add_executable(endpoint_config_test src/core/lib/channel/channel_args.cc src/core/lib/event_engine/channel_args_endpoint_config.cc + src/core/lib/surface/channel_stack_type.cc src/core/util/ref_counted_string.cc src/core/util/time.cc - src/core/lib/surface/channel_stack_type.cc test/core/event_engine/endpoint_config_test.cc ) if(WIN32 AND MSVC) @@ -13447,8 +13447,6 @@ add_executable(exec_ctx_wakeup_scheduler_test src/core/lib/debug/trace.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/util/status_helper.cc - src/core/util/time.cc src/core/lib/iomgr/closure.cc src/core/lib/iomgr/combiner.cc src/core/lib/iomgr/error.cc @@ -13460,6 +13458,8 @@ add_executable(exec_ctx_wakeup_scheduler_test src/core/lib/slice/slice.cc src/core/lib/slice/slice_refcount.cc src/core/lib/slice/slice_string_helpers.cc + src/core/util/status_helper.cc + src/core/util/time.cc test/core/promise/exec_ctx_wakeup_scheduler_test.cc third_party/upb/upb/mini_descriptor/build_enum.c third_party/upb/upb/mini_descriptor/decode.c @@ -14306,8 +14306,6 @@ add_executable(flow_control_test src/core/lib/debug/trace.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/util/status_helper.cc - src/core/util/time.cc src/core/lib/iomgr/closure.cc src/core/lib/iomgr/combiner.cc src/core/lib/iomgr/error.cc @@ -14328,6 +14326,8 @@ add_executable(flow_control_test src/core/lib/slice/slice_refcount.cc src/core/lib/slice/slice_string_helpers.cc src/core/lib/transport/bdp_estimator.cc + src/core/util/status_helper.cc + src/core/util/time.cc test/core/transport/chttp2/flow_control_test.cc third_party/upb/upb/mini_descriptor/build_enum.c third_party/upb/upb/mini_descriptor/decode.c @@ -14392,8 +14392,6 @@ add_executable(for_each_test src/core/lib/debug/trace.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/util/status_helper.cc - src/core/util/time.cc src/core/lib/iomgr/closure.cc src/core/lib/iomgr/combiner.cc src/core/lib/iomgr/error.cc @@ -14413,6 +14411,8 @@ add_executable(for_each_test src/core/lib/slice/slice.cc src/core/lib/slice/slice_refcount.cc src/core/lib/slice/slice_string_helpers.cc + src/core/util/status_helper.cc + src/core/util/time.cc test/core/promise/for_each_test.cc third_party/upb/upb/mini_descriptor/build_enum.c third_party/upb/upb/mini_descriptor/decode.c @@ -17849,7 +17849,6 @@ add_executable(interception_chain_test src/core/handshaker/proxy_mapper_registry.cc src/core/lib/address_utils/parse_address.cc src/core/lib/address_utils/sockaddr_utils.cc - src/core/util/backoff.cc src/core/lib/channel/channel_args.cc src/core/lib/channel/channel_args_preconditioning.cc src/core/lib/channel/channel_stack.cc @@ -17863,7 +17862,6 @@ add_executable(interception_chain_test src/core/lib/compression/compression_internal.cc src/core/lib/compression/message_compress.cc src/core/lib/config/core_configuration.cc - src/core/util/event_log.cc src/core/lib/debug/trace.cc src/core/lib/event_engine/ares_resolver.cc src/core/lib/event_engine/cf_engine/cf_engine.cc @@ -17914,15 +17912,6 @@ add_executable(interception_chain_test src/core/lib/event_engine/work_queue/basic_work_queue.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/util/dump_args.cc - src/core/util/load_file.cc - src/core/util/per_cpu.cc - src/core/util/ref_counted_string.cc - src/core/util/status_helper.cc - src/core/util/time.cc - src/core/util/time_averaged_stats.cc - src/core/util/validation_errors.cc - src/core/util/work_serializer.cc src/core/lib/iomgr/buffer_list.cc src/core/lib/iomgr/call_combiner.cc src/core/lib/iomgr/cfstream_handle.cc @@ -17947,11 +17936,6 @@ add_executable(interception_chain_test src/core/lib/iomgr/executor.cc src/core/lib/iomgr/fork_posix.cc src/core/lib/iomgr/fork_windows.cc - src/core/util/gethostname_fallback.cc - src/core/util/gethostname_host_name_max.cc - src/core/util/gethostname_sysconf.cc - src/core/util/grpc_if_nametoindex_posix.cc - src/core/util/grpc_if_nametoindex_unsupported.cc src/core/lib/iomgr/internal_errqueue.cc src/core/lib/iomgr/iocp_windows.cc src/core/lib/iomgr/iomgr.cc @@ -18058,7 +18042,6 @@ add_executable(interception_chain_test src/core/lib/transport/timeout_encoding.cc src/core/lib/transport/transport.cc src/core/lib/transport/transport_op_string.cc - src/core/util/uri.cc src/core/load_balancing/lb_policy.cc src/core/load_balancing/lb_policy_registry.cc src/core/resolver/endpoint_addresses.cc @@ -18071,7 +18054,24 @@ add_executable(interception_chain_test src/core/telemetry/stats.cc src/core/telemetry/stats_data.cc src/core/tsi/alts/handshaker/transport_security_common_api.cc + src/core/util/backoff.cc + src/core/util/dump_args.cc + src/core/util/event_log.cc + src/core/util/gethostname_fallback.cc + src/core/util/gethostname_host_name_max.cc + src/core/util/gethostname_sysconf.cc + src/core/util/grpc_if_nametoindex_posix.cc + src/core/util/grpc_if_nametoindex_unsupported.cc src/core/util/json/json_writer.cc + src/core/util/load_file.cc + src/core/util/per_cpu.cc + src/core/util/ref_counted_string.cc + src/core/util/status_helper.cc + src/core/util/time.cc + src/core/util/time_averaged_stats.cc + src/core/util/uri.cc + src/core/util/validation_errors.cc + src/core/util/work_serializer.cc test/core/transport/interception_chain_test.cc third_party/upb/upb/mini_descriptor/build_enum.c third_party/upb/upb/mini_descriptor/decode.c @@ -18144,8 +18144,6 @@ add_executable(interceptor_list_test src/core/lib/debug/trace.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/util/status_helper.cc - src/core/util/time.cc src/core/lib/iomgr/closure.cc src/core/lib/iomgr/combiner.cc src/core/lib/iomgr/error.cc @@ -18165,6 +18163,8 @@ add_executable(interceptor_list_test src/core/lib/slice/slice.cc src/core/lib/slice/slice_refcount.cc src/core/lib/slice/slice_string_helpers.cc + src/core/util/status_helper.cc + src/core/util/time.cc test/core/promise/interceptor_list_test.cc third_party/upb/upb/mini_descriptor/build_enum.c third_party/upb/upb/mini_descriptor/decode.c @@ -19389,8 +19389,6 @@ add_executable(map_pipe_test src/core/lib/debug/trace.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/util/status_helper.cc - src/core/util/time.cc src/core/lib/iomgr/closure.cc src/core/lib/iomgr/combiner.cc src/core/lib/iomgr/error.cc @@ -19410,6 +19408,8 @@ add_executable(map_pipe_test src/core/lib/slice/slice.cc src/core/lib/slice/slice_refcount.cc src/core/lib/slice/slice_string_helpers.cc + src/core/util/status_helper.cc + src/core/util/time.cc test/core/promise/map_pipe_test.cc third_party/upb/upb/mini_descriptor/build_enum.c third_party/upb/upb/mini_descriptor/decode.c @@ -21661,8 +21661,6 @@ add_executable(periodic_update_test src/core/lib/debug/trace.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/util/status_helper.cc - src/core/util/time.cc src/core/lib/iomgr/closure.cc src/core/lib/iomgr/combiner.cc src/core/lib/iomgr/error.cc @@ -21674,6 +21672,8 @@ add_executable(periodic_update_test src/core/lib/slice/slice.cc src/core/lib/slice/slice_refcount.cc src/core/lib/slice/slice_string_helpers.cc + src/core/util/status_helper.cc + src/core/util/time.cc test/core/resource_quota/periodic_update_test.cc third_party/upb/upb/mini_descriptor/build_enum.c third_party/upb/upb/mini_descriptor/decode.c diff --git a/Makefile b/Makefile index f8a3ad87215..b64809ba1d1 100644 --- a/Makefile +++ b/Makefile @@ -1068,8 +1068,6 @@ LIBGRPC_SRC = \ src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc \ src/core/lib/address_utils/parse_address.cc \ src/core/lib/address_utils/sockaddr_utils.cc \ - src/core/util/backoff.cc \ - src/core/util/random_early_detection.cc \ src/core/lib/channel/channel_args.cc \ src/core/lib/channel/channel_args_preconditioning.cc \ src/core/lib/channel/channel_stack.cc \ @@ -1086,7 +1084,6 @@ LIBGRPC_SRC = \ src/core/lib/config/config_vars_non_generated.cc \ src/core/lib/config/core_configuration.cc \ src/core/lib/config/load_config.cc \ - src/core/util/event_log.cc \ src/core/lib/debug/trace.cc \ src/core/lib/event_engine/ares_resolver.cc \ src/core/lib/event_engine/cf_engine/cf_engine.cc \ @@ -1138,33 +1135,6 @@ LIBGRPC_SRC = \ src/core/lib/event_engine/work_queue/basic_work_queue.cc \ src/core/lib/experiments/config.cc \ src/core/lib/experiments/experiments.cc \ - src/core/util/crash.cc \ - src/core/util/dump_args.cc \ - src/core/util/examine_stack.cc \ - src/core/util/fork.cc \ - src/core/util/host_port.cc \ - src/core/util/linux/env.cc \ - src/core/util/load_file.cc \ - src/core/util/mpscq.cc \ - src/core/util/per_cpu.cc \ - src/core/util/posix/directory_reader.cc \ - src/core/util/posix/env.cc \ - src/core/util/posix/stat.cc \ - src/core/util/posix/thd.cc \ - src/core/util/ref_counted_string.cc \ - src/core/util/status_helper.cc \ - src/core/util/strerror.cc \ - src/core/util/tchar.cc \ - src/core/util/time.cc \ - src/core/util/time_averaged_stats.cc \ - src/core/util/time_util.cc \ - src/core/util/uuid_v4.cc \ - src/core/util/validation_errors.cc \ - src/core/util/windows/directory_reader.cc \ - src/core/util/windows/env.cc \ - src/core/util/windows/stat.cc \ - src/core/util/windows/thd.cc \ - src/core/util/work_serializer.cc \ src/core/lib/iomgr/buffer_list.cc \ src/core/lib/iomgr/call_combiner.cc \ src/core/lib/iomgr/cfstream_handle.cc \ @@ -1189,11 +1159,6 @@ LIBGRPC_SRC = \ src/core/lib/iomgr/executor.cc \ src/core/lib/iomgr/fork_posix.cc \ src/core/lib/iomgr/fork_windows.cc \ - src/core/util/gethostname_fallback.cc \ - src/core/util/gethostname_host_name_max.cc \ - src/core/util/gethostname_sysconf.cc \ - src/core/util/grpc_if_nametoindex_posix.cc \ - src/core/util/grpc_if_nametoindex_unsupported.cc \ src/core/lib/iomgr/internal_errqueue.cc \ src/core/lib/iomgr/iocp_windows.cc \ src/core/lib/iomgr/iomgr.cc \ @@ -1242,7 +1207,6 @@ LIBGRPC_SRC = \ src/core/lib/iomgr/wakeup_fd_nospecial.cc \ src/core/lib/iomgr/wakeup_fd_pipe.cc \ src/core/lib/iomgr/wakeup_fd_posix.cc \ - src/core/util/matchers.cc \ src/core/lib/promise/activity.cc \ src/core/lib/promise/party.cc \ src/core/lib/promise/sleep.cc \ @@ -1361,7 +1325,6 @@ LIBGRPC_SRC = \ src/core/lib/transport/timeout_encoding.cc \ src/core/lib/transport/transport.cc \ src/core/lib/transport/transport_op_string.cc \ - src/core/util/uri.cc \ src/core/load_balancing/address_filtering.cc \ src/core/load_balancing/backend_metric_parser.cc \ src/core/load_balancing/child_policy_handler.cc \ @@ -1457,6 +1420,19 @@ LIBGRPC_SRC = \ src/core/util/alloc.cc \ src/core/util/android/log.cc \ src/core/util/atm.cc \ + src/core/util/backoff.cc \ + src/core/util/crash.cc \ + src/core/util/dump_args.cc \ + src/core/util/event_log.cc \ + src/core/util/examine_stack.cc \ + src/core/util/fork.cc \ + src/core/util/gethostname_fallback.cc \ + src/core/util/gethostname_host_name_max.cc \ + src/core/util/gethostname_sysconf.cc \ + src/core/util/gpr_time.cc \ + src/core/util/grpc_if_nametoindex_posix.cc \ + src/core/util/grpc_if_nametoindex_unsupported.cc \ + src/core/util/host_port.cc \ src/core/util/http_client/format_request.cc \ src/core/util/http_client/httpcli.cc \ src/core/util/http_client/httpcli_security_connector.cc \ @@ -1467,27 +1443,51 @@ LIBGRPC_SRC = \ src/core/util/json/json_util.cc \ src/core/util/json/json_writer.cc \ src/core/util/linux/cpu.cc \ + src/core/util/linux/env.cc \ src/core/util/linux/log.cc \ + src/core/util/load_file.cc \ src/core/util/log.cc \ + src/core/util/matchers.cc \ + src/core/util/mpscq.cc \ src/core/util/msys/tmpfile.cc \ + src/core/util/per_cpu.cc \ src/core/util/posix/cpu.cc \ + src/core/util/posix/directory_reader.cc \ + src/core/util/posix/env.cc \ src/core/util/posix/log.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/random_early_detection.cc \ + src/core/util/ref_counted_string.cc \ + src/core/util/status_helper.cc \ + src/core/util/strerror.cc \ src/core/util/string.cc \ src/core/util/sync.cc \ src/core/util/sync_abseil.cc \ + src/core/util/tchar.cc \ src/core/util/time.cc \ + src/core/util/time_averaged_stats.cc \ src/core/util/time_precise.cc \ + src/core/util/time_util.cc \ + src/core/util/uri.cc \ + src/core/util/uuid_v4.cc \ + src/core/util/validation_errors.cc \ src/core/util/windows/cpu.cc \ + src/core/util/windows/directory_reader.cc \ + src/core/util/windows/env.cc \ src/core/util/windows/log.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 \ + src/core/util/work_serializer.cc \ src/core/xds/grpc/certificate_provider_store.cc \ src/core/xds/grpc/file_watcher_certificate_provider_factory.cc \ src/core/xds/grpc/xds_audit_logger_registry.cc \ diff --git a/Package.swift b/Package.swift index afee52fde3e..125a7544378 100644 --- a/Package.swift +++ b/Package.swift @@ -1090,10 +1090,6 @@ let package = Package( "src/core/lib/address_utils/parse_address.h", "src/core/lib/address_utils/sockaddr_utils.cc", "src/core/lib/address_utils/sockaddr_utils.h", - "src/core/util/backoff.cc", - "src/core/util/backoff.h", - "src/core/util/random_early_detection.cc", - "src/core/util/random_early_detection.h", "src/core/lib/channel/call_finalization.h", "src/core/lib/channel/channel_args.cc", "src/core/lib/channel/channel_args.h", @@ -1127,8 +1123,6 @@ let package = Package( "src/core/lib/config/core_configuration.h", "src/core/lib/config/load_config.cc", "src/core/lib/config/load_config.h", - "src/core/util/event_log.cc", - "src/core/util/event_log.h", "src/core/lib/debug/trace.cc", "src/core/lib/debug/trace.h", "src/core/lib/event_engine/ares_resolver.cc", @@ -1247,81 +1241,6 @@ let package = Package( "src/core/lib/experiments/config.h", "src/core/lib/experiments/experiments.cc", "src/core/lib/experiments/experiments.h", - "src/core/util/atomic_utils.h", - "src/core/util/bitset.h", - "src/core/util/chunked_vector.h", - "src/core/util/construct_destruct.h", - "src/core/util/cpp_impl_of.h", - "src/core/util/crash.cc", - "src/core/util/crash.h", - "src/core/util/debug_location.h", - "src/core/util/directory_reader.h", - "src/core/util/down_cast.h", - "src/core/util/dual_ref_counted.h", - "src/core/util/dump_args.cc", - "src/core/util/dump_args.h", - "src/core/util/env.h", - "src/core/util/examine_stack.cc", - "src/core/util/examine_stack.h", - "src/core/util/fork.cc", - "src/core/util/fork.h", - "src/core/util/host_port.cc", - "src/core/util/host_port.h", - "src/core/util/if_list.h", - "src/core/util/linux/env.cc", - "src/core/util/load_file.cc", - "src/core/util/load_file.h", - "src/core/util/manual_constructor.h", - "src/core/util/match.h", - "src/core/util/memory.h", - "src/core/util/mpscq.cc", - "src/core/util/mpscq.h", - "src/core/util/no_destruct.h", - "src/core/util/notification.h", - "src/core/util/orphanable.h", - "src/core/util/overload.h", - "src/core/util/packed_table.h", - "src/core/util/per_cpu.cc", - "src/core/util/per_cpu.h", - "src/core/util/posix/directory_reader.cc", - "src/core/util/posix/env.cc", - "src/core/util/posix/stat.cc", - "src/core/util/posix/thd.cc", - "src/core/util/ref_counted.h", - "src/core/util/ref_counted_ptr.h", - "src/core/util/ref_counted_string.cc", - "src/core/util/ref_counted_string.h", - "src/core/util/single_set_ptr.h", - "src/core/util/sorted_pack.h", - "src/core/util/stat.h", - "src/core/util/status_helper.cc", - "src/core/util/status_helper.h", - "src/core/util/strerror.cc", - "src/core/util/strerror.h", - "src/core/util/sync.h", - "src/core/util/table.h", - "src/core/util/tchar.cc", - "src/core/util/tchar.h", - "src/core/util/thd.h", - "src/core/util/time.cc", - "src/core/util/time.h", - "src/core/util/time_averaged_stats.cc", - "src/core/util/time_averaged_stats.h", - "src/core/util/time_util.cc", - "src/core/util/time_util.h", - "src/core/util/type_list.h", - "src/core/util/unique_type_name.h", - "src/core/util/uuid_v4.cc", - "src/core/util/uuid_v4.h", - "src/core/util/validation_errors.cc", - "src/core/util/validation_errors.h", - "src/core/util/windows/directory_reader.cc", - "src/core/util/windows/env.cc", - "src/core/util/windows/stat.cc", - "src/core/util/windows/thd.cc", - "src/core/util/work_serializer.cc", - "src/core/util/work_serializer.h", - "src/core/util/xxhash_inline.h", "src/core/lib/iomgr/block_annotate.h", "src/core/lib/iomgr/buffer_list.cc", "src/core/lib/iomgr/buffer_list.h", @@ -1367,13 +1286,6 @@ let package = Package( "src/core/lib/iomgr/executor.h", "src/core/lib/iomgr/fork_posix.cc", "src/core/lib/iomgr/fork_windows.cc", - "src/core/util/gethostname.h", - "src/core/util/gethostname_fallback.cc", - "src/core/util/gethostname_host_name_max.cc", - "src/core/util/gethostname_sysconf.cc", - "src/core/util/grpc_if_nametoindex.h", - "src/core/util/grpc_if_nametoindex_posix.cc", - "src/core/util/grpc_if_nametoindex_unsupported.cc", "src/core/lib/iomgr/internal_errqueue.cc", "src/core/lib/iomgr/internal_errqueue.h", "src/core/lib/iomgr/iocp_windows.cc", @@ -1464,8 +1376,6 @@ let package = Package( "src/core/lib/iomgr/wakeup_fd_pipe.h", "src/core/lib/iomgr/wakeup_fd_posix.cc", "src/core/lib/iomgr/wakeup_fd_posix.h", - "src/core/util/matchers.cc", - "src/core/util/matchers.h", "src/core/lib/promise/activity.cc", "src/core/lib/promise/activity.h", "src/core/lib/promise/all_ok.h", @@ -1728,8 +1638,6 @@ let package = Package( "src/core/lib/transport/transport.h", "src/core/lib/transport/transport_fwd.h", "src/core/lib/transport/transport_op_string.cc", - "src/core/util/uri.cc", - "src/core/util/uri.h", "src/core/load_balancing/address_filtering.cc", "src/core/load_balancing/address_filtering.h", "src/core/load_balancing/backend_metric_data.h", @@ -1915,7 +1823,39 @@ let package = Package( "src/core/util/alloc.h", "src/core/util/android/log.cc", "src/core/util/atm.cc", + "src/core/util/atomic_utils.h", "src/core/util/avl.h", + "src/core/util/backoff.cc", + "src/core/util/backoff.h", + "src/core/util/bitset.h", + "src/core/util/chunked_vector.h", + "src/core/util/construct_destruct.h", + "src/core/util/cpp_impl_of.h", + "src/core/util/crash.cc", + "src/core/util/crash.h", + "src/core/util/debug_location.h", + "src/core/util/directory_reader.h", + "src/core/util/down_cast.h", + "src/core/util/dual_ref_counted.h", + "src/core/util/dump_args.cc", + "src/core/util/dump_args.h", + "src/core/util/env.h", + "src/core/util/event_log.cc", + "src/core/util/event_log.h", + "src/core/util/examine_stack.cc", + "src/core/util/examine_stack.h", + "src/core/util/fork.cc", + "src/core/util/fork.h", + "src/core/util/gethostname.h", + "src/core/util/gethostname_fallback.cc", + "src/core/util/gethostname_host_name_max.cc", + "src/core/util/gethostname_sysconf.cc", + "src/core/util/gpr_time.cc", + "src/core/util/grpc_if_nametoindex.h", + "src/core/util/grpc_if_nametoindex_posix.cc", + "src/core/util/grpc_if_nametoindex_unsupported.cc", + "src/core/util/host_port.cc", + "src/core/util/host_port.h", "src/core/util/http_client/format_request.cc", "src/core/util/http_client/format_request.h", "src/core/util/http_client/httpcli.cc", @@ -1924,6 +1864,7 @@ let package = Package( "src/core/util/http_client/httpcli_ssl_credentials.h", "src/core/util/http_client/parser.cc", "src/core/util/http_client/parser.h", + "src/core/util/if_list.h", "src/core/util/iphone/cpu.cc", "src/core/util/json/json.h", "src/core/util/json/json_args.h", @@ -1937,32 +1878,91 @@ let package = Package( "src/core/util/json/json_writer.cc", "src/core/util/json/json_writer.h", "src/core/util/linux/cpu.cc", + "src/core/util/linux/env.cc", "src/core/util/linux/log.cc", + "src/core/util/load_file.cc", + "src/core/util/load_file.h", "src/core/util/log.cc", + "src/core/util/manual_constructor.h", + "src/core/util/match.h", + "src/core/util/matchers.cc", + "src/core/util/matchers.h", + "src/core/util/memory.h", + "src/core/util/mpscq.cc", + "src/core/util/mpscq.h", "src/core/util/msys/tmpfile.cc", + "src/core/util/no_destruct.h", + "src/core/util/notification.h", + "src/core/util/orphanable.h", + "src/core/util/overload.h", + "src/core/util/packed_table.h", + "src/core/util/per_cpu.cc", + "src/core/util/per_cpu.h", "src/core/util/posix/cpu.cc", + "src/core/util/posix/directory_reader.cc", + "src/core/util/posix/env.cc", "src/core/util/posix/log.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/random_early_detection.cc", + "src/core/util/random_early_detection.h", + "src/core/util/ref_counted.h", + "src/core/util/ref_counted_ptr.h", + "src/core/util/ref_counted_string.cc", + "src/core/util/ref_counted_string.h", + "src/core/util/single_set_ptr.h", + "src/core/util/sorted_pack.h", "src/core/util/spinlock.h", + "src/core/util/stat.h", + "src/core/util/status_helper.cc", + "src/core/util/status_helper.h", + "src/core/util/strerror.cc", + "src/core/util/strerror.h", "src/core/util/string.cc", "src/core/util/string.h", "src/core/util/sync.cc", + "src/core/util/sync.h", "src/core/util/sync_abseil.cc", + "src/core/util/table.h", + "src/core/util/tchar.cc", + "src/core/util/tchar.h", + "src/core/util/thd.h", "src/core/util/time.cc", + "src/core/util/time.h", + "src/core/util/time_averaged_stats.cc", + "src/core/util/time_averaged_stats.h", "src/core/util/time_precise.cc", "src/core/util/time_precise.h", + "src/core/util/time_util.cc", + "src/core/util/time_util.h", "src/core/util/tmpfile.h", + "src/core/util/type_list.h", + "src/core/util/unique_type_name.h", + "src/core/util/uri.cc", + "src/core/util/uri.h", "src/core/util/useful.h", + "src/core/util/uuid_v4.cc", + "src/core/util/uuid_v4.h", + "src/core/util/validation_errors.cc", + "src/core/util/validation_errors.h", "src/core/util/windows/cpu.cc", + "src/core/util/windows/directory_reader.cc", + "src/core/util/windows/env.cc", "src/core/util/windows/log.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", + "src/core/util/work_serializer.cc", + "src/core/util/work_serializer.h", + "src/core/util/xxhash_inline.h", "src/core/xds/grpc/certificate_provider_store.cc", "src/core/xds/grpc/certificate_provider_store.h", "src/core/xds/grpc/file_watcher_certificate_provider_factory.cc", diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index 902f09a06f1..9f1222b2d2d 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -55,6 +55,7 @@ libs: - src/core/lib/config/config_vars.h - src/core/lib/config/load_config.h - src/core/lib/event_engine/thread_local.h + - src/core/util/alloc.h - src/core/util/construct_destruct.h - src/core/util/crash.h - src/core/util/debug_location.h @@ -67,13 +68,12 @@ libs: - src/core/util/no_destruct.h - src/core/util/stat.h - src/core/util/strerror.h + - src/core/util/string.h - src/core/util/sync.h - src/core/util/tchar.h - src/core/util/thd.h - - src/core/util/time_util.h - - src/core/util/alloc.h - - src/core/util/string.h - src/core/util/time_precise.h + - src/core/util/time_util.h - src/core/util/tmpfile.h - src/core/util/useful.h src: @@ -81,45 +81,45 @@ libs: - src/core/lib/config/config_vars_non_generated.cc - src/core/lib/config/load_config.cc - src/core/lib/event_engine/thread_local.cc + - src/core/util/alloc.cc + - src/core/util/android/log.cc + - src/core/util/atm.cc - src/core/util/crash.cc - src/core/util/examine_stack.cc - src/core/util/fork.cc + - src/core/util/gpr_time.cc - src/core/util/host_port.cc - - src/core/util/linux/env.cc - - src/core/util/mpscq.cc - - src/core/util/posix/env.cc - - src/core/util/posix/stat.cc - - src/core/util/posix/thd.cc - - src/core/util/strerror.cc - - src/core/util/tchar.cc - - src/core/util/time_util.cc - - src/core/util/windows/env.cc - - src/core/util/windows/stat.cc - - src/core/util/windows/thd.cc - - src/core/util/alloc.cc - - src/core/util/android/log.cc - - src/core/util/atm.cc - src/core/util/iphone/cpu.cc - src/core/util/linux/cpu.cc + - src/core/util/linux/env.cc - src/core/util/linux/log.cc - src/core/util/log.cc + - src/core/util/mpscq.cc - src/core/util/msys/tmpfile.cc - src/core/util/posix/cpu.cc + - src/core/util/posix/env.cc - src/core/util/posix/log.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/strerror.cc - src/core/util/string.cc - src/core/util/sync.cc - src/core/util/sync_abseil.cc - - src/core/util/time.cc + - src/core/util/tchar.cc - src/core/util/time_precise.cc + - src/core/util/time_util.cc - src/core/util/windows/cpu.cc + - src/core/util/windows/env.cc - src/core/util/windows/log.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 deps: @@ -793,8 +793,6 @@ libs: - src/core/handshaker/tcp_connect/tcp_connect_handshaker.h - src/core/lib/address_utils/parse_address.h - src/core/lib/address_utils/sockaddr_utils.h - - src/core/util/backoff.h - - src/core/util/random_early_detection.h - src/core/lib/channel/call_finalization.h - src/core/lib/channel/channel_args.h - src/core/lib/channel/channel_args_preconditioning.h @@ -810,7 +808,6 @@ libs: - src/core/lib/compression/compression_internal.h - src/core/lib/compression/message_compress.h - src/core/lib/config/core_configuration.h - - src/core/util/event_log.h - src/core/lib/debug/trace.h - src/core/lib/event_engine/ares_resolver.h - src/core/lib/event_engine/cf_engine/cf_engine.h @@ -877,38 +874,6 @@ libs: - src/core/lib/event_engine/work_queue/work_queue.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/util/atomic_utils.h - - src/core/util/bitset.h - - src/core/util/chunked_vector.h - - src/core/util/cpp_impl_of.h - - src/core/util/directory_reader.h - - src/core/util/down_cast.h - - src/core/util/dual_ref_counted.h - - src/core/util/dump_args.h - - src/core/util/if_list.h - - src/core/util/load_file.h - - src/core/util/manual_constructor.h - - src/core/util/match.h - - src/core/util/notification.h - - src/core/util/orphanable.h - - src/core/util/overload.h - - src/core/util/packed_table.h - - src/core/util/per_cpu.h - - src/core/util/ref_counted.h - - src/core/util/ref_counted_ptr.h - - src/core/util/ref_counted_string.h - - src/core/util/single_set_ptr.h - - src/core/util/sorted_pack.h - - src/core/util/status_helper.h - - src/core/util/table.h - - src/core/util/time.h - - src/core/util/time_averaged_stats.h - - src/core/util/type_list.h - - src/core/util/unique_type_name.h - - src/core/util/uuid_v4.h - - src/core/util/validation_errors.h - - src/core/util/work_serializer.h - - src/core/util/xxhash_inline.h - src/core/lib/iomgr/block_annotate.h - src/core/lib/iomgr/buffer_list.h - src/core/lib/iomgr/call_combiner.h @@ -930,8 +895,6 @@ libs: - src/core/lib/iomgr/event_engine_shims/tcp_client.h - src/core/lib/iomgr/exec_ctx.h - src/core/lib/iomgr/executor.h - - src/core/util/gethostname.h - - src/core/util/grpc_if_nametoindex.h - src/core/lib/iomgr/internal_errqueue.h - src/core/lib/iomgr/iocp_windows.h - src/core/lib/iomgr/iomgr.h @@ -974,7 +937,6 @@ libs: - src/core/lib/iomgr/vsock.h - src/core/lib/iomgr/wakeup_fd_pipe.h - src/core/lib/iomgr/wakeup_fd_posix.h - - src/core/util/matchers.h - src/core/lib/promise/activity.h - src/core/lib/promise/all_ok.h - src/core/lib/promise/arena_promise.h @@ -1115,7 +1077,6 @@ libs: - src/core/lib/transport/timeout_encoding.h - src/core/lib/transport/transport.h - src/core/lib/transport/transport_fwd.h - - src/core/util/uri.h - src/core/load_balancing/address_filtering.h - src/core/load_balancing/backend_metric_data.h - src/core/load_balancing/backend_metric_parser.h @@ -1205,11 +1166,24 @@ libs: - src/core/tsi/transport_security.h - src/core/tsi/transport_security_grpc.h - src/core/tsi/transport_security_interface.h + - src/core/util/atomic_utils.h - src/core/util/avl.h + - src/core/util/backoff.h + - src/core/util/bitset.h + - src/core/util/chunked_vector.h + - src/core/util/cpp_impl_of.h + - src/core/util/directory_reader.h + - src/core/util/down_cast.h + - src/core/util/dual_ref_counted.h + - src/core/util/dump_args.h + - src/core/util/event_log.h + - src/core/util/gethostname.h + - src/core/util/grpc_if_nametoindex.h - src/core/util/http_client/format_request.h - src/core/util/http_client/httpcli.h - src/core/util/http_client/httpcli_ssl_credentials.h - src/core/util/http_client/parser.h + - src/core/util/if_list.h - src/core/util/json/json.h - src/core/util/json/json_args.h - src/core/util/json/json_channel_args.h @@ -1217,7 +1191,33 @@ libs: - src/core/util/json/json_reader.h - src/core/util/json/json_util.h - src/core/util/json/json_writer.h + - src/core/util/load_file.h + - src/core/util/manual_constructor.h + - src/core/util/match.h + - src/core/util/matchers.h + - src/core/util/notification.h + - src/core/util/orphanable.h + - src/core/util/overload.h + - src/core/util/packed_table.h + - src/core/util/per_cpu.h + - src/core/util/random_early_detection.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h + - src/core/util/ref_counted_string.h + - src/core/util/single_set_ptr.h + - src/core/util/sorted_pack.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/table.h + - src/core/util/time.h + - src/core/util/time_averaged_stats.h + - src/core/util/type_list.h + - src/core/util/unique_type_name.h + - src/core/util/uri.h + - src/core/util/uuid_v4.h + - src/core/util/validation_errors.h + - src/core/util/work_serializer.h + - src/core/util/xxhash_inline.h - src/core/xds/grpc/certificate_provider_store.h - src/core/xds/grpc/file_watcher_certificate_provider_factory.h - src/core/xds/grpc/upb_utils.h @@ -1653,8 +1653,6 @@ libs: - src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc - src/core/lib/address_utils/parse_address.cc - src/core/lib/address_utils/sockaddr_utils.cc - - src/core/util/backoff.cc - - src/core/util/random_early_detection.cc - src/core/lib/channel/channel_args.cc - src/core/lib/channel/channel_args_preconditioning.cc - src/core/lib/channel/channel_stack.cc @@ -1668,7 +1666,6 @@ libs: - src/core/lib/compression/compression_internal.cc - src/core/lib/compression/message_compress.cc - src/core/lib/config/core_configuration.cc - - src/core/util/event_log.cc - src/core/lib/debug/trace.cc - src/core/lib/event_engine/ares_resolver.cc - src/core/lib/event_engine/cf_engine/cf_engine.cc @@ -1719,18 +1716,6 @@ libs: - src/core/lib/event_engine/work_queue/basic_work_queue.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/util/dump_args.cc - - src/core/util/load_file.cc - - src/core/util/per_cpu.cc - - src/core/util/posix/directory_reader.cc - - src/core/util/ref_counted_string.cc - - src/core/util/status_helper.cc - - src/core/util/time.cc - - src/core/util/time_averaged_stats.cc - - src/core/util/uuid_v4.cc - - src/core/util/validation_errors.cc - - src/core/util/windows/directory_reader.cc - - src/core/util/work_serializer.cc - src/core/lib/iomgr/buffer_list.cc - src/core/lib/iomgr/call_combiner.cc - src/core/lib/iomgr/cfstream_handle.cc @@ -1755,11 +1740,6 @@ libs: - src/core/lib/iomgr/executor.cc - src/core/lib/iomgr/fork_posix.cc - src/core/lib/iomgr/fork_windows.cc - - src/core/util/gethostname_fallback.cc - - src/core/util/gethostname_host_name_max.cc - - src/core/util/gethostname_sysconf.cc - - src/core/util/grpc_if_nametoindex_posix.cc - - src/core/util/grpc_if_nametoindex_unsupported.cc - src/core/lib/iomgr/internal_errqueue.cc - src/core/lib/iomgr/iocp_windows.cc - src/core/lib/iomgr/iomgr.cc @@ -1808,7 +1788,6 @@ libs: - src/core/lib/iomgr/wakeup_fd_nospecial.cc - src/core/lib/iomgr/wakeup_fd_pipe.cc - src/core/lib/iomgr/wakeup_fd_posix.cc - - src/core/util/matchers.cc - src/core/lib/promise/activity.cc - src/core/lib/promise/party.cc - src/core/lib/promise/sleep.cc @@ -1927,7 +1906,6 @@ libs: - src/core/lib/transport/timeout_encoding.cc - src/core/lib/transport/transport.cc - src/core/lib/transport/transport_op_string.cc - - src/core/util/uri.cc - src/core/load_balancing/address_filtering.cc - src/core/load_balancing/backend_metric_parser.cc - src/core/load_balancing/child_policy_handler.cc @@ -2020,6 +1998,14 @@ libs: - src/core/tsi/ssl_transport_security_utils.cc - src/core/tsi/transport_security.cc - src/core/tsi/transport_security_grpc.cc + - src/core/util/backoff.cc + - src/core/util/dump_args.cc + - src/core/util/event_log.cc + - src/core/util/gethostname_fallback.cc + - src/core/util/gethostname_host_name_max.cc + - src/core/util/gethostname_sysconf.cc + - src/core/util/grpc_if_nametoindex_posix.cc + - src/core/util/grpc_if_nametoindex_unsupported.cc - src/core/util/http_client/format_request.cc - src/core/util/http_client/httpcli.cc - src/core/util/http_client/httpcli_security_connector.cc @@ -2028,6 +2014,20 @@ libs: - src/core/util/json/json_reader.cc - src/core/util/json/json_util.cc - src/core/util/json/json_writer.cc + - src/core/util/load_file.cc + - src/core/util/matchers.cc + - src/core/util/per_cpu.cc + - src/core/util/posix/directory_reader.cc + - src/core/util/random_early_detection.cc + - src/core/util/ref_counted_string.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc + - src/core/util/time_averaged_stats.cc + - src/core/util/uri.cc + - src/core/util/uuid_v4.cc + - src/core/util/validation_errors.cc + - src/core/util/windows/directory_reader.cc + - src/core/util/work_serializer.cc - src/core/xds/grpc/certificate_provider_store.cc - src/core/xds/grpc/file_watcher_certificate_provider_factory.cc - src/core/xds/grpc/xds_audit_logger_registry.cc @@ -2338,8 +2338,6 @@ libs: - src/core/handshaker/tcp_connect/tcp_connect_handshaker.h - src/core/lib/address_utils/parse_address.h - src/core/lib/address_utils/sockaddr_utils.h - - src/core/util/backoff.h - - src/core/util/random_early_detection.h - src/core/lib/channel/call_finalization.h - src/core/lib/channel/channel_args.h - src/core/lib/channel/channel_args_preconditioning.h @@ -2355,7 +2353,6 @@ libs: - src/core/lib/compression/compression_internal.h - src/core/lib/compression/message_compress.h - src/core/lib/config/core_configuration.h - - src/core/util/event_log.h - src/core/lib/debug/trace.h - src/core/lib/event_engine/ares_resolver.h - src/core/lib/event_engine/cf_engine/cf_engine.h @@ -2422,36 +2419,6 @@ libs: - src/core/lib/event_engine/work_queue/work_queue.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/util/atomic_utils.h - - src/core/util/bitset.h - - src/core/util/chunked_vector.h - - src/core/util/cpp_impl_of.h - - src/core/util/down_cast.h - - src/core/util/dual_ref_counted.h - - src/core/util/dump_args.h - - src/core/util/if_list.h - - src/core/util/load_file.h - - src/core/util/manual_constructor.h - - src/core/util/match.h - - src/core/util/notification.h - - src/core/util/orphanable.h - - src/core/util/overload.h - - src/core/util/packed_table.h - - src/core/util/per_cpu.h - - src/core/util/ref_counted.h - - src/core/util/ref_counted_ptr.h - - src/core/util/ref_counted_string.h - - src/core/util/single_set_ptr.h - - src/core/util/sorted_pack.h - - src/core/util/status_helper.h - - src/core/util/table.h - - src/core/util/time.h - - src/core/util/time_averaged_stats.h - - src/core/util/type_list.h - - src/core/util/unique_type_name.h - - src/core/util/uuid_v4.h - - src/core/util/validation_errors.h - - src/core/util/work_serializer.h - src/core/lib/iomgr/block_annotate.h - src/core/lib/iomgr/buffer_list.h - src/core/lib/iomgr/call_combiner.h @@ -2473,8 +2440,6 @@ libs: - src/core/lib/iomgr/event_engine_shims/tcp_client.h - src/core/lib/iomgr/exec_ctx.h - src/core/lib/iomgr/executor.h - - src/core/util/gethostname.h - - src/core/util/grpc_if_nametoindex.h - src/core/lib/iomgr/internal_errqueue.h - src/core/lib/iomgr/iocp_windows.h - src/core/lib/iomgr/iomgr.h @@ -2626,7 +2591,6 @@ libs: - src/core/lib/transport/timeout_encoding.h - src/core/lib/transport/transport.h - src/core/lib/transport/transport_fwd.h - - src/core/util/uri.h - src/core/load_balancing/address_filtering.h - src/core/load_balancing/backend_metric_data.h - src/core/load_balancing/backend_metric_parser.h @@ -2684,17 +2648,53 @@ libs: - src/core/tsi/transport_security.h - src/core/tsi/transport_security_grpc.h - src/core/tsi/transport_security_interface.h + - src/core/util/atomic_utils.h - src/core/util/avl.h + - src/core/util/backoff.h + - src/core/util/bitset.h + - src/core/util/chunked_vector.h + - src/core/util/cpp_impl_of.h + - src/core/util/down_cast.h + - src/core/util/dual_ref_counted.h + - src/core/util/dump_args.h + - src/core/util/event_log.h + - src/core/util/gethostname.h + - src/core/util/grpc_if_nametoindex.h - src/core/util/http_client/format_request.h - src/core/util/http_client/httpcli.h - src/core/util/http_client/parser.h + - src/core/util/if_list.h - src/core/util/json/json.h - src/core/util/json/json_args.h - src/core/util/json/json_channel_args.h - src/core/util/json/json_object_loader.h - src/core/util/json/json_reader.h - src/core/util/json/json_writer.h + - src/core/util/load_file.h + - src/core/util/manual_constructor.h + - src/core/util/match.h + - src/core/util/notification.h + - src/core/util/orphanable.h + - src/core/util/overload.h + - src/core/util/packed_table.h + - src/core/util/per_cpu.h + - src/core/util/random_early_detection.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h + - src/core/util/ref_counted_string.h + - src/core/util/single_set_ptr.h + - src/core/util/sorted_pack.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/table.h + - src/core/util/time.h + - src/core/util/time_averaged_stats.h + - src/core/util/type_list.h + - src/core/util/unique_type_name.h + - src/core/util/uri.h + - src/core/util/uuid_v4.h + - src/core/util/validation_errors.h + - src/core/util/work_serializer.h - third_party/upb/upb/generated_code_support.h - third_party/upb/upb/mini_descriptor/build_enum.h - third_party/upb/upb/mini_descriptor/decode.h @@ -2813,8 +2813,6 @@ libs: - src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc - src/core/lib/address_utils/parse_address.cc - src/core/lib/address_utils/sockaddr_utils.cc - - src/core/util/backoff.cc - - src/core/util/random_early_detection.cc - src/core/lib/channel/channel_args.cc - src/core/lib/channel/channel_args_preconditioning.cc - src/core/lib/channel/channel_stack.cc @@ -2828,7 +2826,6 @@ libs: - src/core/lib/compression/compression_internal.cc - src/core/lib/compression/message_compress.cc - src/core/lib/config/core_configuration.cc - - src/core/util/event_log.cc - src/core/lib/debug/trace.cc - src/core/lib/event_engine/ares_resolver.cc - src/core/lib/event_engine/cf_engine/cf_engine.cc @@ -2879,16 +2876,6 @@ libs: - src/core/lib/event_engine/work_queue/basic_work_queue.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/util/dump_args.cc - - src/core/util/load_file.cc - - src/core/util/per_cpu.cc - - src/core/util/ref_counted_string.cc - - src/core/util/status_helper.cc - - src/core/util/time.cc - - src/core/util/time_averaged_stats.cc - - src/core/util/uuid_v4.cc - - src/core/util/validation_errors.cc - - src/core/util/work_serializer.cc - src/core/lib/iomgr/buffer_list.cc - src/core/lib/iomgr/call_combiner.cc - src/core/lib/iomgr/cfstream_handle.cc @@ -2913,11 +2900,6 @@ libs: - src/core/lib/iomgr/executor.cc - src/core/lib/iomgr/fork_posix.cc - src/core/lib/iomgr/fork_windows.cc - - src/core/util/gethostname_fallback.cc - - src/core/util/gethostname_host_name_max.cc - - src/core/util/gethostname_sysconf.cc - - src/core/util/grpc_if_nametoindex_posix.cc - - src/core/util/grpc_if_nametoindex_unsupported.cc - src/core/lib/iomgr/internal_errqueue.cc - src/core/lib/iomgr/iocp_windows.cc - src/core/lib/iomgr/iomgr.cc @@ -3050,7 +3032,6 @@ libs: - src/core/lib/transport/timeout_encoding.cc - src/core/lib/transport/transport.cc - src/core/lib/transport/transport_op_string.cc - - src/core/util/uri.cc - src/core/load_balancing/address_filtering.cc - src/core/load_balancing/backend_metric_parser.cc - src/core/load_balancing/child_policy_handler.cc @@ -3106,12 +3087,31 @@ libs: - src/core/tsi/local_transport_security.cc - src/core/tsi/transport_security.cc - src/core/tsi/transport_security_grpc.cc + - src/core/util/backoff.cc + - src/core/util/dump_args.cc + - src/core/util/event_log.cc + - src/core/util/gethostname_fallback.cc + - src/core/util/gethostname_host_name_max.cc + - src/core/util/gethostname_sysconf.cc + - src/core/util/grpc_if_nametoindex_posix.cc + - src/core/util/grpc_if_nametoindex_unsupported.cc - src/core/util/http_client/format_request.cc - src/core/util/http_client/httpcli.cc - src/core/util/http_client/parser.cc - src/core/util/json/json_object_loader.cc - src/core/util/json/json_reader.cc - src/core/util/json/json_writer.cc + - src/core/util/load_file.cc + - src/core/util/per_cpu.cc + - src/core/util/random_early_detection.cc + - src/core/util/ref_counted_string.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc + - src/core/util/time_averaged_stats.cc + - src/core/util/uri.cc + - src/core/util/uuid_v4.cc + - src/core/util/validation_errors.cc + - src/core/util/work_serializer.cc - third_party/upb/upb/mini_descriptor/build_enum.c - third_party/upb/upb/mini_descriptor/decode.c - third_party/upb/upb/mini_descriptor/internal/base92.c @@ -4434,7 +4434,6 @@ libs: - src/core/handshaker/security/tsi_error.h - src/core/lib/address_utils/parse_address.h - src/core/lib/address_utils/sockaddr_utils.h - - src/core/util/backoff.h - src/core/lib/channel/call_finalization.h - src/core/lib/channel/channel_args.h - src/core/lib/channel/channel_args_preconditioning.h @@ -4450,7 +4449,6 @@ libs: - src/core/lib/compression/compression_internal.h - src/core/lib/compression/message_compress.h - src/core/lib/config/core_configuration.h - - src/core/util/event_log.h - src/core/lib/debug/trace.h - src/core/lib/event_engine/ares_resolver.h - src/core/lib/event_engine/cf_engine/cf_engine.h @@ -4495,56 +4493,28 @@ libs: - src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h - src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h - src/core/lib/event_engine/query_extensions.h - - src/core/lib/event_engine/ref_counted_dns_resolver_interface.h - - src/core/lib/event_engine/resolved_address_internal.h - - src/core/lib/event_engine/shim.h - - src/core/lib/event_engine/tcp_socket_utils.h - - src/core/lib/event_engine/thread_pool/thread_count.h - - src/core/lib/event_engine/thread_pool/thread_pool.h - - src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h - - src/core/lib/event_engine/thready_event_engine/thready_event_engine.h - - src/core/lib/event_engine/time_util.h - - src/core/lib/event_engine/trace.h - - src/core/lib/event_engine/utils.h - - src/core/lib/event_engine/windows/grpc_polled_fd_windows.h - - src/core/lib/event_engine/windows/iocp.h - - src/core/lib/event_engine/windows/native_windows_dns_resolver.h - - src/core/lib/event_engine/windows/win_socket.h - - src/core/lib/event_engine/windows/windows_endpoint.h - - src/core/lib/event_engine/windows/windows_engine.h - - src/core/lib/event_engine/windows/windows_listener.h - - src/core/lib/event_engine/work_queue/basic_work_queue.h - - src/core/lib/event_engine/work_queue/work_queue.h - - src/core/lib/experiments/config.h - - src/core/lib/experiments/experiments.h - - src/core/util/atomic_utils.h - - src/core/util/bitset.h - - src/core/util/chunked_vector.h - - src/core/util/cpp_impl_of.h - - src/core/util/down_cast.h - - src/core/util/dual_ref_counted.h - - src/core/util/dump_args.h - - src/core/util/if_list.h - - src/core/util/load_file.h - - src/core/util/manual_constructor.h - - src/core/util/match.h - - src/core/util/notification.h - - src/core/util/orphanable.h - - src/core/util/overload.h - - src/core/util/packed_table.h - - src/core/util/per_cpu.h - - src/core/util/ref_counted.h - - src/core/util/ref_counted_ptr.h - - src/core/util/ref_counted_string.h - - src/core/util/sorted_pack.h - - src/core/util/status_helper.h - - src/core/util/table.h - - src/core/util/time.h - - src/core/util/time_averaged_stats.h - - src/core/util/type_list.h - - src/core/util/unique_type_name.h - - src/core/util/validation_errors.h - - src/core/util/work_serializer.h + - src/core/lib/event_engine/ref_counted_dns_resolver_interface.h + - src/core/lib/event_engine/resolved_address_internal.h + - src/core/lib/event_engine/shim.h + - src/core/lib/event_engine/tcp_socket_utils.h + - src/core/lib/event_engine/thread_pool/thread_count.h + - src/core/lib/event_engine/thread_pool/thread_pool.h + - src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h + - src/core/lib/event_engine/thready_event_engine/thready_event_engine.h + - src/core/lib/event_engine/time_util.h + - src/core/lib/event_engine/trace.h + - src/core/lib/event_engine/utils.h + - src/core/lib/event_engine/windows/grpc_polled_fd_windows.h + - src/core/lib/event_engine/windows/iocp.h + - src/core/lib/event_engine/windows/native_windows_dns_resolver.h + - src/core/lib/event_engine/windows/win_socket.h + - src/core/lib/event_engine/windows/windows_endpoint.h + - src/core/lib/event_engine/windows/windows_engine.h + - src/core/lib/event_engine/windows/windows_listener.h + - src/core/lib/event_engine/work_queue/basic_work_queue.h + - src/core/lib/event_engine/work_queue/work_queue.h + - src/core/lib/experiments/config.h + - src/core/lib/experiments/experiments.h - src/core/lib/iomgr/block_annotate.h - src/core/lib/iomgr/buffer_list.h - src/core/lib/iomgr/call_combiner.h @@ -4566,8 +4536,6 @@ libs: - src/core/lib/iomgr/event_engine_shims/tcp_client.h - src/core/lib/iomgr/exec_ctx.h - src/core/lib/iomgr/executor.h - - src/core/util/gethostname.h - - src/core/util/grpc_if_nametoindex.h - src/core/lib/iomgr/internal_errqueue.h - src/core/lib/iomgr/iocp_windows.h - src/core/lib/iomgr/iomgr.h @@ -4610,7 +4578,6 @@ libs: - src/core/lib/iomgr/vsock.h - src/core/lib/iomgr/wakeup_fd_pipe.h - src/core/lib/iomgr/wakeup_fd_posix.h - - src/core/util/matchers.h - src/core/lib/promise/activity.h - src/core/lib/promise/all_ok.h - src/core/lib/promise/arena_promise.h @@ -4716,7 +4683,6 @@ libs: - src/core/lib/transport/timeout_encoding.h - src/core/lib/transport/transport.h - src/core/lib/transport/transport_fwd.h - - src/core/util/uri.h - src/core/load_balancing/backend_metric_data.h - src/core/load_balancing/lb_policy.h - src/core/load_balancing/lb_policy_factory.h @@ -4741,12 +4707,46 @@ libs: - src/core/tsi/transport_security.h - src/core/tsi/transport_security_grpc.h - src/core/tsi/transport_security_interface.h + - src/core/util/atomic_utils.h - src/core/util/avl.h + - src/core/util/backoff.h + - src/core/util/bitset.h + - src/core/util/chunked_vector.h + - src/core/util/cpp_impl_of.h + - src/core/util/down_cast.h + - src/core/util/dual_ref_counted.h + - src/core/util/dump_args.h + - src/core/util/event_log.h + - src/core/util/gethostname.h + - src/core/util/grpc_if_nametoindex.h + - src/core/util/if_list.h - src/core/util/json/json.h - src/core/util/json/json_args.h - src/core/util/json/json_reader.h - src/core/util/json/json_writer.h + - src/core/util/load_file.h + - src/core/util/manual_constructor.h + - src/core/util/match.h + - src/core/util/matchers.h + - src/core/util/notification.h + - src/core/util/orphanable.h + - src/core/util/overload.h + - src/core/util/packed_table.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h + - src/core/util/ref_counted_string.h + - src/core/util/sorted_pack.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/table.h + - src/core/util/time.h + - src/core/util/time_averaged_stats.h + - src/core/util/type_list.h + - src/core/util/unique_type_name.h + - src/core/util/uri.h + - src/core/util/validation_errors.h + - src/core/util/work_serializer.h - third_party/upb/upb/generated_code_support.h - third_party/upb/upb/mini_descriptor/build_enum.h - third_party/upb/upb/mini_descriptor/decode.h @@ -4784,7 +4784,6 @@ libs: - src/core/handshaker/security/tsi_error.cc - src/core/lib/address_utils/parse_address.cc - src/core/lib/address_utils/sockaddr_utils.cc - - src/core/util/backoff.cc - src/core/lib/channel/channel_args.cc - src/core/lib/channel/channel_args_preconditioning.cc - src/core/lib/channel/channel_stack.cc @@ -4798,7 +4797,6 @@ libs: - src/core/lib/compression/compression_internal.cc - src/core/lib/compression/message_compress.cc - src/core/lib/config/core_configuration.cc - - src/core/util/event_log.cc - src/core/lib/debug/trace.cc - src/core/lib/event_engine/ares_resolver.cc - src/core/lib/event_engine/cf_engine/cf_engine.cc @@ -4849,15 +4847,6 @@ libs: - src/core/lib/event_engine/work_queue/basic_work_queue.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/util/dump_args.cc - - src/core/util/load_file.cc - - src/core/util/per_cpu.cc - - src/core/util/ref_counted_string.cc - - src/core/util/status_helper.cc - - src/core/util/time.cc - - src/core/util/time_averaged_stats.cc - - src/core/util/validation_errors.cc - - src/core/util/work_serializer.cc - src/core/lib/iomgr/buffer_list.cc - src/core/lib/iomgr/call_combiner.cc - src/core/lib/iomgr/cfstream_handle.cc @@ -4882,11 +4871,6 @@ libs: - src/core/lib/iomgr/executor.cc - src/core/lib/iomgr/fork_posix.cc - src/core/lib/iomgr/fork_windows.cc - - src/core/util/gethostname_fallback.cc - - src/core/util/gethostname_host_name_max.cc - - src/core/util/gethostname_sysconf.cc - - src/core/util/grpc_if_nametoindex_posix.cc - - src/core/util/grpc_if_nametoindex_unsupported.cc - src/core/lib/iomgr/internal_errqueue.cc - src/core/lib/iomgr/iocp_windows.cc - src/core/lib/iomgr/iomgr.cc @@ -4935,7 +4919,6 @@ libs: - src/core/lib/iomgr/wakeup_fd_nospecial.cc - src/core/lib/iomgr/wakeup_fd_pipe.cc - src/core/lib/iomgr/wakeup_fd_posix.cc - - src/core/util/matchers.cc - src/core/lib/promise/activity.cc - src/core/lib/promise/party.cc - src/core/lib/promise/trace.cc @@ -5017,7 +5000,6 @@ libs: - src/core/lib/transport/timeout_encoding.cc - src/core/lib/transport/transport.cc - src/core/lib/transport/transport_op_string.cc - - src/core/util/uri.cc - src/core/load_balancing/lb_policy.cc - src/core/load_balancing/lb_policy_registry.cc - src/core/resolver/endpoint_addresses.cc @@ -5032,8 +5014,26 @@ libs: - src/core/tsi/alts/handshaker/transport_security_common_api.cc - src/core/tsi/transport_security.cc - src/core/tsi/transport_security_grpc.cc + - src/core/util/backoff.cc + - src/core/util/dump_args.cc + - src/core/util/event_log.cc + - src/core/util/gethostname_fallback.cc + - src/core/util/gethostname_host_name_max.cc + - src/core/util/gethostname_sysconf.cc + - src/core/util/grpc_if_nametoindex_posix.cc + - src/core/util/grpc_if_nametoindex_unsupported.cc - src/core/util/json/json_reader.cc - src/core/util/json/json_writer.cc + - src/core/util/load_file.cc + - src/core/util/matchers.cc + - src/core/util/per_cpu.cc + - src/core/util/ref_counted_string.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc + - src/core/util/time_averaged_stats.cc + - src/core/util/uri.cc + - src/core/util/validation_errors.cc + - src/core/util/work_serializer.cc - third_party/upb/upb/mini_descriptor/build_enum.c - third_party/upb/upb/mini_descriptor/decode.c - third_party/upb/upb/mini_descriptor/internal/base92.c @@ -5244,12 +5244,6 @@ targets: headers: - src/core/lib/debug/trace.h - src/core/lib/event_engine/event_engine_context.h - - src/core/util/atomic_utils.h - - src/core/util/bitset.h - - src/core/util/down_cast.h - - src/core/util/orphanable.h - - src/core/util/ref_counted.h - - src/core/util/ref_counted_ptr.h - src/core/lib/promise/activity.h - src/core/lib/promise/context.h - src/core/lib/promise/detail/basic_seq.h @@ -5265,6 +5259,12 @@ targets: - src/core/lib/promise/seq.h - src/core/lib/promise/trace.h - src/core/lib/promise/wait_set.h + - src/core/util/atomic_utils.h + - src/core/util/bitset.h + - src/core/util/down_cast.h + - src/core/util/orphanable.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - test/core/promise/test_wakeup_schedulers.h src: - src/core/lib/debug/trace.cc @@ -5398,7 +5398,6 @@ targets: language: c++ headers: - src/core/lib/debug/trace.h - - src/core/util/bitset.h - src/core/lib/promise/all_ok.h - src/core/lib/promise/detail/join_state.h - src/core/lib/promise/detail/promise_like.h @@ -5407,6 +5406,7 @@ targets: - src/core/lib/promise/poll.h - src/core/lib/promise/status_flag.h - src/core/lib/promise/trace.h + - src/core/util/bitset.h src: - src/core/lib/debug/trace.cc - src/core/lib/promise/trace.cc @@ -5752,10 +5752,10 @@ targets: language: c++ headers: - src/core/util/atomic_utils.h + - src/core/util/avl.h - src/core/util/down_cast.h - src/core/util/ref_counted.h - src/core/util/ref_counted_ptr.h - - src/core/util/avl.h src: - test/core/avl/avl_test.cc deps: @@ -6389,25 +6389,6 @@ targets: - src/core/lib/event_engine/event_engine_context.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/util/atomic_utils.h - - src/core/util/bitset.h - - src/core/util/chunked_vector.h - - src/core/util/cpp_impl_of.h - - src/core/util/down_cast.h - - src/core/util/dual_ref_counted.h - - src/core/util/dump_args.h - - src/core/util/if_list.h - - src/core/util/manual_constructor.h - - src/core/util/orphanable.h - - src/core/util/packed_table.h - - src/core/util/ref_counted.h - - src/core/util/ref_counted_ptr.h - - src/core/util/ref_counted_string.h - - src/core/util/sorted_pack.h - - src/core/util/status_helper.h - - src/core/util/table.h - - src/core/util/time.h - - src/core/util/type_list.h - src/core/lib/iomgr/closure.h - src/core/lib/iomgr/combiner.h - src/core/lib/iomgr/error.h @@ -6459,8 +6440,27 @@ targets: - src/core/lib/transport/simple_slice_based_metadata.h - src/core/lib/transport/status_conversion.h - src/core/lib/transport/timeout_encoding.h + - src/core/util/atomic_utils.h - src/core/util/avl.h + - src/core/util/bitset.h + - src/core/util/chunked_vector.h + - src/core/util/cpp_impl_of.h + - src/core/util/down_cast.h + - src/core/util/dual_ref_counted.h + - src/core/util/dump_args.h + - src/core/util/if_list.h + - src/core/util/manual_constructor.h + - src/core/util/orphanable.h + - src/core/util/packed_table.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h + - src/core/util/ref_counted_string.h + - src/core/util/sorted_pack.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/table.h + - src/core/util/time.h + - src/core/util/type_list.h - test/core/promise/poll_matcher.h - third_party/upb/upb/generated_code_support.h - third_party/upb/upb/mini_descriptor/build_enum.h @@ -6490,10 +6490,6 @@ targets: - src/core/lib/debug/trace.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/util/dump_args.cc - - src/core/util/ref_counted_string.cc - - src/core/util/status_helper.cc - - src/core/util/time.cc - src/core/lib/iomgr/closure.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/error.cc @@ -6525,6 +6521,10 @@ targets: - src/core/lib/transport/parsed_metadata.cc - src/core/lib/transport/status_conversion.cc - src/core/lib/transport/timeout_encoding.cc + - src/core/util/dump_args.cc + - src/core/util/ref_counted_string.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc - test/core/transport/call_filters_test.cc - third_party/upb/upb/mini_descriptor/build_enum.c - third_party/upb/upb/mini_descriptor/decode.c @@ -7687,17 +7687,6 @@ targets: - src/core/lib/event_engine/event_engine_context.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/util/atomic_utils.h - - src/core/util/bitset.h - - src/core/util/chunked_vector.h - - src/core/util/cpp_impl_of.h - - src/core/util/down_cast.h - - src/core/util/manual_constructor.h - - src/core/util/orphanable.h - - src/core/util/ref_counted.h - - src/core/util/ref_counted_ptr.h - - src/core/util/status_helper.h - - src/core/util/time.h - src/core/lib/iomgr/closure.h - src/core/lib/iomgr/combiner.h - src/core/lib/iomgr/error.h @@ -7730,7 +7719,18 @@ targets: - src/core/lib/slice/slice_internal.h - src/core/lib/slice/slice_refcount.h - src/core/lib/slice/slice_string_helpers.h + - src/core/util/atomic_utils.h + - src/core/util/bitset.h + - src/core/util/chunked_vector.h + - src/core/util/cpp_impl_of.h + - src/core/util/down_cast.h + - src/core/util/manual_constructor.h + - src/core/util/orphanable.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/time.h - third_party/upb/upb/generated_code_support.h - third_party/upb/upb/mini_descriptor/build_enum.h - third_party/upb/upb/mini_descriptor/decode.h @@ -7756,8 +7756,6 @@ targets: - src/core/lib/debug/trace.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/util/status_helper.cc - - src/core/util/time.cc - src/core/lib/iomgr/closure.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/error.cc @@ -7777,6 +7775,8 @@ targets: - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_refcount.cc - src/core/lib/slice/slice_string_helpers.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc - test/core/gprpp/chunked_vector_test.cc - third_party/upb/upb/mini_descriptor/build_enum.c - third_party/upb/upb/mini_descriptor/decode.c @@ -8421,8 +8421,8 @@ targets: build: test language: c++ headers: - - src/core/util/down_cast.h - src/core/lib/promise/context.h + - src/core/util/down_cast.h src: - test/core/promise/context_test.cc deps: @@ -8990,7 +8990,9 @@ targets: headers: - src/core/lib/channel/channel_args.h - src/core/lib/event_engine/channel_args_endpoint_config.h + - src/core/lib/surface/channel_stack_type.h - src/core/util/atomic_utils.h + - src/core/util/avl.h - src/core/util/down_cast.h - src/core/util/dual_ref_counted.h - src/core/util/orphanable.h @@ -8998,14 +9000,12 @@ targets: - src/core/util/ref_counted_ptr.h - src/core/util/ref_counted_string.h - src/core/util/time.h - - src/core/lib/surface/channel_stack_type.h - - src/core/util/avl.h src: - src/core/lib/channel/channel_args.cc - src/core/lib/event_engine/channel_args_endpoint_config.cc + - src/core/lib/surface/channel_stack_type.cc - src/core/util/ref_counted_string.cc - src/core/util/time.cc - - src/core/lib/surface/channel_stack_type.cc - test/core/event_engine/endpoint_config_test.cc deps: - gtest @@ -9231,15 +9231,6 @@ targets: - src/core/lib/event_engine/event_engine_context.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/util/atomic_utils.h - - src/core/util/bitset.h - - src/core/util/down_cast.h - - src/core/util/manual_constructor.h - - src/core/util/orphanable.h - - src/core/util/ref_counted.h - - src/core/util/ref_counted_ptr.h - - src/core/util/status_helper.h - - src/core/util/time.h - src/core/lib/iomgr/closure.h - src/core/lib/iomgr/combiner.h - src/core/lib/iomgr/error.h @@ -9258,7 +9249,16 @@ targets: - src/core/lib/slice/slice_internal.h - src/core/lib/slice/slice_refcount.h - src/core/lib/slice/slice_string_helpers.h + - src/core/util/atomic_utils.h + - src/core/util/bitset.h + - src/core/util/down_cast.h + - src/core/util/manual_constructor.h + - src/core/util/orphanable.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/time.h - third_party/upb/upb/generated_code_support.h - third_party/upb/upb/mini_descriptor/build_enum.h - third_party/upb/upb/mini_descriptor/decode.h @@ -9284,8 +9284,6 @@ targets: - src/core/lib/debug/trace.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/util/status_helper.cc - - src/core/util/time.cc - src/core/lib/iomgr/closure.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/error.cc @@ -9297,6 +9295,8 @@ targets: - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_refcount.cc - src/core/lib/slice/slice_string_helpers.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc - test/core/promise/exec_ctx_wakeup_scheduler_test.cc - third_party/upb/upb/mini_descriptor/build_enum.c - third_party/upb/upb/mini_descriptor/decode.c @@ -9842,16 +9842,6 @@ targets: - src/core/lib/event_engine/event_engine_context.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/util/atomic_utils.h - - src/core/util/bitset.h - - src/core/util/cpp_impl_of.h - - src/core/util/down_cast.h - - src/core/util/manual_constructor.h - - src/core/util/orphanable.h - - src/core/util/ref_counted.h - - src/core/util/ref_counted_ptr.h - - src/core/util/status_helper.h - - src/core/util/time.h - src/core/lib/iomgr/closure.h - src/core/lib/iomgr/combiner.h - src/core/lib/iomgr/error.h @@ -9886,7 +9876,17 @@ targets: - src/core/lib/slice/slice_string_helpers.h - src/core/lib/transport/bdp_estimator.h - src/core/lib/transport/http2_errors.h + - src/core/util/atomic_utils.h + - src/core/util/bitset.h + - src/core/util/cpp_impl_of.h + - src/core/util/down_cast.h + - src/core/util/manual_constructor.h + - src/core/util/orphanable.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/time.h - third_party/upb/upb/generated_code_support.h - third_party/upb/upb/mini_descriptor/build_enum.h - third_party/upb/upb/mini_descriptor/decode.h @@ -9915,8 +9915,6 @@ targets: - src/core/lib/debug/trace.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/util/status_helper.cc - - src/core/util/time.cc - src/core/lib/iomgr/closure.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/error.cc @@ -9937,6 +9935,8 @@ targets: - src/core/lib/slice/slice_refcount.cc - src/core/lib/slice/slice_string_helpers.cc - src/core/lib/transport/bdp_estimator.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc - test/core/transport/chttp2/flow_control_test.cc - third_party/upb/upb/mini_descriptor/build_enum.c - third_party/upb/upb/mini_descriptor/decode.c @@ -9965,24 +9965,14 @@ targets: build: test language: c++ headers: - - src/core/ext/upb-gen/google/protobuf/any.upb.h - - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h - - src/core/ext/upb-gen/google/rpc/status.upb.h - - src/core/ext/upb-gen/google/rpc/status.upb_minitable.h - - src/core/lib/debug/trace.h - - src/core/lib/event_engine/event_engine_context.h - - src/core/lib/experiments/config.h - - src/core/lib/experiments/experiments.h - - src/core/util/atomic_utils.h - - src/core/util/bitset.h - - src/core/util/cpp_impl_of.h - - src/core/util/down_cast.h - - src/core/util/manual_constructor.h - - src/core/util/orphanable.h - - src/core/util/ref_counted.h - - src/core/util/ref_counted_ptr.h - - src/core/util/status_helper.h - - src/core/util/time.h + - src/core/ext/upb-gen/google/protobuf/any.upb.h + - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h + - src/core/ext/upb-gen/google/rpc/status.upb.h + - src/core/ext/upb-gen/google/rpc/status.upb_minitable.h + - src/core/lib/debug/trace.h + - src/core/lib/event_engine/event_engine_context.h + - src/core/lib/experiments/config.h + - src/core/lib/experiments/experiments.h - src/core/lib/iomgr/closure.h - src/core/lib/iomgr/combiner.h - src/core/lib/iomgr/error.h @@ -10024,7 +10014,17 @@ targets: - src/core/lib/slice/slice_internal.h - src/core/lib/slice/slice_refcount.h - src/core/lib/slice/slice_string_helpers.h + - src/core/util/atomic_utils.h + - src/core/util/bitset.h + - src/core/util/cpp_impl_of.h + - src/core/util/down_cast.h + - src/core/util/manual_constructor.h + - src/core/util/orphanable.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/time.h - test/core/promise/test_wakeup_schedulers.h - third_party/upb/upb/generated_code_support.h - third_party/upb/upb/mini_descriptor/build_enum.h @@ -10051,8 +10051,6 @@ targets: - src/core/lib/debug/trace.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/util/status_helper.cc - - src/core/util/time.cc - src/core/lib/iomgr/closure.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/error.cc @@ -10072,6 +10070,8 @@ targets: - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_refcount.cc - src/core/lib/slice/slice_string_helpers.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc - test/core/promise/for_each_test.cc - third_party/upb/upb/mini_descriptor/build_enum.c - third_party/upb/upb/mini_descriptor/decode.c @@ -11582,11 +11582,6 @@ targets: headers: - src/core/lib/debug/trace.h - src/core/lib/event_engine/event_engine_context.h - - src/core/util/atomic_utils.h - - src/core/util/down_cast.h - - src/core/util/orphanable.h - - src/core/util/ref_counted.h - - src/core/util/ref_counted_ptr.h - src/core/lib/promise/activity.h - src/core/lib/promise/context.h - src/core/lib/promise/detail/basic_seq.h @@ -11598,6 +11593,11 @@ targets: - src/core/lib/promise/poll.h - src/core/lib/promise/seq.h - src/core/lib/promise/trace.h + - src/core/util/atomic_utils.h + - src/core/util/down_cast.h + - src/core/util/orphanable.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - test/core/promise/test_wakeup_schedulers.h src: - src/core/lib/debug/trace.cc @@ -11636,7 +11636,6 @@ targets: - src/core/handshaker/proxy_mapper_registry.h - src/core/lib/address_utils/parse_address.h - src/core/lib/address_utils/sockaddr_utils.h - - src/core/util/backoff.h - src/core/lib/channel/call_finalization.h - src/core/lib/channel/channel_args.h - src/core/lib/channel/channel_args_preconditioning.h @@ -11652,7 +11651,6 @@ targets: - src/core/lib/compression/compression_internal.h - src/core/lib/compression/message_compress.h - src/core/lib/config/core_configuration.h - - src/core/util/event_log.h - src/core/lib/debug/trace.h - src/core/lib/event_engine/ares_resolver.h - src/core/lib/event_engine/cf_engine/cf_engine.h @@ -11719,34 +11717,6 @@ targets: - src/core/lib/event_engine/work_queue/work_queue.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/util/atomic_utils.h - - src/core/util/bitset.h - - src/core/util/chunked_vector.h - - src/core/util/cpp_impl_of.h - - src/core/util/down_cast.h - - src/core/util/dual_ref_counted.h - - src/core/util/dump_args.h - - src/core/util/if_list.h - - src/core/util/load_file.h - - src/core/util/manual_constructor.h - - src/core/util/match.h - - src/core/util/notification.h - - src/core/util/orphanable.h - - src/core/util/overload.h - - src/core/util/packed_table.h - - src/core/util/per_cpu.h - - src/core/util/ref_counted.h - - src/core/util/ref_counted_ptr.h - - src/core/util/ref_counted_string.h - - src/core/util/sorted_pack.h - - src/core/util/status_helper.h - - src/core/util/table.h - - src/core/util/time.h - - src/core/util/time_averaged_stats.h - - src/core/util/type_list.h - - src/core/util/unique_type_name.h - - src/core/util/validation_errors.h - - src/core/util/work_serializer.h - src/core/lib/iomgr/block_annotate.h - src/core/lib/iomgr/buffer_list.h - src/core/lib/iomgr/call_combiner.h @@ -11768,8 +11738,6 @@ targets: - src/core/lib/iomgr/event_engine_shims/tcp_client.h - src/core/lib/iomgr/exec_ctx.h - src/core/lib/iomgr/executor.h - - src/core/util/gethostname.h - - src/core/util/grpc_if_nametoindex.h - src/core/lib/iomgr/internal_errqueue.h - src/core/lib/iomgr/iocp_windows.h - src/core/lib/iomgr/iomgr.h @@ -11895,7 +11863,6 @@ targets: - src/core/lib/transport/timeout_encoding.h - src/core/lib/transport/transport.h - src/core/lib/transport/transport_fwd.h - - src/core/util/uri.h - src/core/load_balancing/backend_metric_data.h - src/core/load_balancing/lb_policy.h - src/core/load_balancing/lb_policy_factory.h @@ -11917,11 +11884,44 @@ targets: - src/core/telemetry/stats_data.h - src/core/telemetry/tcp_tracer.h - src/core/tsi/alts/handshaker/transport_security_common_api.h + - src/core/util/atomic_utils.h - src/core/util/avl.h + - src/core/util/backoff.h + - src/core/util/bitset.h + - src/core/util/chunked_vector.h + - src/core/util/cpp_impl_of.h + - src/core/util/down_cast.h + - src/core/util/dual_ref_counted.h + - src/core/util/dump_args.h + - src/core/util/event_log.h + - src/core/util/gethostname.h + - src/core/util/grpc_if_nametoindex.h + - src/core/util/if_list.h - src/core/util/json/json.h - src/core/util/json/json_args.h - src/core/util/json/json_writer.h + - src/core/util/load_file.h + - src/core/util/manual_constructor.h + - src/core/util/match.h + - src/core/util/notification.h + - src/core/util/orphanable.h + - src/core/util/overload.h + - src/core/util/packed_table.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h + - src/core/util/ref_counted_string.h + - src/core/util/sorted_pack.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/table.h + - src/core/util/time.h + - src/core/util/time_averaged_stats.h + - src/core/util/type_list.h + - src/core/util/unique_type_name.h + - src/core/util/uri.h + - src/core/util/validation_errors.h + - src/core/util/work_serializer.h - test/core/promise/poll_matcher.h - third_party/upb/upb/generated_code_support.h - third_party/upb/upb/mini_descriptor/build_enum.h @@ -11955,7 +11955,6 @@ targets: - src/core/handshaker/proxy_mapper_registry.cc - src/core/lib/address_utils/parse_address.cc - src/core/lib/address_utils/sockaddr_utils.cc - - src/core/util/backoff.cc - src/core/lib/channel/channel_args.cc - src/core/lib/channel/channel_args_preconditioning.cc - src/core/lib/channel/channel_stack.cc @@ -11969,7 +11968,6 @@ targets: - src/core/lib/compression/compression_internal.cc - src/core/lib/compression/message_compress.cc - src/core/lib/config/core_configuration.cc - - src/core/util/event_log.cc - src/core/lib/debug/trace.cc - src/core/lib/event_engine/ares_resolver.cc - src/core/lib/event_engine/cf_engine/cf_engine.cc @@ -12020,15 +12018,6 @@ targets: - src/core/lib/event_engine/work_queue/basic_work_queue.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/util/dump_args.cc - - src/core/util/load_file.cc - - src/core/util/per_cpu.cc - - src/core/util/ref_counted_string.cc - - src/core/util/status_helper.cc - - src/core/util/time.cc - - src/core/util/time_averaged_stats.cc - - src/core/util/validation_errors.cc - - src/core/util/work_serializer.cc - src/core/lib/iomgr/buffer_list.cc - src/core/lib/iomgr/call_combiner.cc - src/core/lib/iomgr/cfstream_handle.cc @@ -12053,11 +12042,6 @@ targets: - src/core/lib/iomgr/executor.cc - src/core/lib/iomgr/fork_posix.cc - src/core/lib/iomgr/fork_windows.cc - - src/core/util/gethostname_fallback.cc - - src/core/util/gethostname_host_name_max.cc - - src/core/util/gethostname_sysconf.cc - - src/core/util/grpc_if_nametoindex_posix.cc - - src/core/util/grpc_if_nametoindex_unsupported.cc - src/core/lib/iomgr/internal_errqueue.cc - src/core/lib/iomgr/iocp_windows.cc - src/core/lib/iomgr/iomgr.cc @@ -12164,7 +12148,6 @@ targets: - src/core/lib/transport/timeout_encoding.cc - src/core/lib/transport/transport.cc - src/core/lib/transport/transport_op_string.cc - - src/core/util/uri.cc - src/core/load_balancing/lb_policy.cc - src/core/load_balancing/lb_policy_registry.cc - src/core/resolver/endpoint_addresses.cc @@ -12177,7 +12160,24 @@ targets: - src/core/telemetry/stats.cc - src/core/telemetry/stats_data.cc - src/core/tsi/alts/handshaker/transport_security_common_api.cc + - src/core/util/backoff.cc + - src/core/util/dump_args.cc + - src/core/util/event_log.cc + - src/core/util/gethostname_fallback.cc + - src/core/util/gethostname_host_name_max.cc + - src/core/util/gethostname_sysconf.cc + - src/core/util/grpc_if_nametoindex_posix.cc + - src/core/util/grpc_if_nametoindex_unsupported.cc - src/core/util/json/json_writer.cc + - src/core/util/load_file.cc + - src/core/util/per_cpu.cc + - src/core/util/ref_counted_string.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc + - src/core/util/time_averaged_stats.cc + - src/core/util/uri.cc + - src/core/util/validation_errors.cc + - src/core/util/work_serializer.cc - test/core/transport/interception_chain_test.cc - third_party/upb/upb/mini_descriptor/build_enum.c - third_party/upb/upb/mini_descriptor/decode.c @@ -12222,16 +12222,6 @@ targets: - src/core/lib/event_engine/event_engine_context.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/util/atomic_utils.h - - src/core/util/bitset.h - - src/core/util/cpp_impl_of.h - - src/core/util/down_cast.h - - src/core/util/manual_constructor.h - - src/core/util/orphanable.h - - src/core/util/ref_counted.h - - src/core/util/ref_counted_ptr.h - - src/core/util/status_helper.h - - src/core/util/time.h - src/core/lib/iomgr/closure.h - src/core/lib/iomgr/combiner.h - src/core/lib/iomgr/error.h @@ -12265,7 +12255,17 @@ targets: - src/core/lib/slice/slice_internal.h - src/core/lib/slice/slice_refcount.h - src/core/lib/slice/slice_string_helpers.h + - src/core/util/atomic_utils.h + - src/core/util/bitset.h + - src/core/util/cpp_impl_of.h + - src/core/util/down_cast.h + - src/core/util/manual_constructor.h + - src/core/util/orphanable.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/time.h - test/core/promise/test_context.h - third_party/upb/upb/generated_code_support.h - third_party/upb/upb/mini_descriptor/build_enum.h @@ -12292,8 +12292,6 @@ targets: - src/core/lib/debug/trace.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/util/status_helper.cc - - src/core/util/time.cc - src/core/lib/iomgr/closure.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/error.cc @@ -12313,6 +12311,8 @@ targets: - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_refcount.cc - src/core/lib/slice/slice_string_helpers.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc - test/core/promise/interceptor_list_test.cc - third_party/upb/upb/mini_descriptor/build_enum.c - third_party/upb/upb/mini_descriptor/decode.c @@ -12486,13 +12486,13 @@ targets: language: c++ headers: - src/core/lib/debug/trace.h - - src/core/util/bitset.h - src/core/lib/promise/detail/join_state.h - src/core/lib/promise/detail/promise_like.h - src/core/lib/promise/join.h - src/core/lib/promise/map.h - src/core/lib/promise/poll.h - src/core/lib/promise/trace.h + - src/core/util/bitset.h src: - src/core/lib/debug/trace.cc - src/core/lib/promise/trace.cc @@ -12730,12 +12730,6 @@ targets: headers: - src/core/lib/debug/trace.h - src/core/lib/event_engine/event_engine_context.h - - src/core/util/atomic_utils.h - - src/core/util/bitset.h - - src/core/util/down_cast.h - - src/core/util/orphanable.h - - src/core/util/ref_counted.h - - src/core/util/ref_counted_ptr.h - src/core/lib/promise/activity.h - src/core/lib/promise/context.h - src/core/lib/promise/detail/basic_seq.h @@ -12750,6 +12744,12 @@ targets: - src/core/lib/promise/poll.h - src/core/lib/promise/seq.h - src/core/lib/promise/trace.h + - src/core/util/atomic_utils.h + - src/core/util/bitset.h + - src/core/util/down_cast.h + - src/core/util/orphanable.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - test/core/promise/test_wakeup_schedulers.h src: - src/core/lib/debug/trace.cc @@ -12916,16 +12916,6 @@ targets: - src/core/lib/event_engine/event_engine_context.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/util/atomic_utils.h - - src/core/util/bitset.h - - src/core/util/cpp_impl_of.h - - src/core/util/down_cast.h - - src/core/util/manual_constructor.h - - src/core/util/orphanable.h - - src/core/util/ref_counted.h - - src/core/util/ref_counted_ptr.h - - src/core/util/status_helper.h - - src/core/util/time.h - src/core/lib/iomgr/closure.h - src/core/lib/iomgr/combiner.h - src/core/lib/iomgr/error.h @@ -12967,7 +12957,17 @@ targets: - src/core/lib/slice/slice_internal.h - src/core/lib/slice/slice_refcount.h - src/core/lib/slice/slice_string_helpers.h + - src/core/util/atomic_utils.h + - src/core/util/bitset.h + - src/core/util/cpp_impl_of.h + - src/core/util/down_cast.h + - src/core/util/manual_constructor.h + - src/core/util/orphanable.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/time.h - test/core/promise/test_wakeup_schedulers.h - third_party/upb/upb/generated_code_support.h - third_party/upb/upb/mini_descriptor/build_enum.h @@ -12994,8 +12994,6 @@ targets: - src/core/lib/debug/trace.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/util/status_helper.cc - - src/core/util/time.cc - src/core/lib/iomgr/closure.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/error.cc @@ -13015,6 +13013,8 @@ targets: - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_refcount.cc - src/core/lib/slice/slice_string_helpers.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc - test/core/promise/map_pipe_test.cc - third_party/upb/upb/mini_descriptor/build_enum.c - third_party/upb/upb/mini_descriptor/decode.c @@ -13522,11 +13522,6 @@ targets: language: c++ headers: - src/core/lib/event_engine/event_engine_context.h - - src/core/util/atomic_utils.h - - src/core/util/down_cast.h - - src/core/util/orphanable.h - - src/core/util/ref_counted.h - - src/core/util/ref_counted_ptr.h - src/core/lib/promise/activity.h - src/core/lib/promise/context.h - src/core/lib/promise/detail/promise_factory.h @@ -13536,6 +13531,11 @@ targets: - src/core/lib/promise/poll.h - src/core/lib/promise/promise.h - src/core/lib/promise/wait_set.h + - src/core/util/atomic_utils.h + - src/core/util/down_cast.h + - src/core/util/orphanable.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h src: - src/core/lib/promise/activity.cc - test/core/promise/mpsc_test.cc @@ -13817,12 +13817,6 @@ targets: language: c++ headers: - src/core/lib/event_engine/event_engine_context.h - - src/core/util/atomic_utils.h - - src/core/util/down_cast.h - - src/core/util/notification.h - - src/core/util/orphanable.h - - src/core/util/ref_counted.h - - src/core/util/ref_counted_ptr.h - src/core/lib/promise/activity.h - src/core/lib/promise/context.h - src/core/lib/promise/detail/promise_factory.h @@ -13832,6 +13826,12 @@ targets: - src/core/lib/promise/map.h - src/core/lib/promise/observable.h - src/core/lib/promise/poll.h + - src/core/util/atomic_utils.h + - src/core/util/down_cast.h + - src/core/util/notification.h + - src/core/util/orphanable.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - test/core/promise/poll_matcher.h src: - src/core/lib/promise/activity.cc @@ -14157,10 +14157,6 @@ targets: - src/core/lib/debug/trace.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/util/bitset.h - - src/core/util/manual_constructor.h - - src/core/util/status_helper.h - - src/core/util/time.h - src/core/lib/iomgr/closure.h - src/core/lib/iomgr/combiner.h - src/core/lib/iomgr/error.h @@ -14173,7 +14169,11 @@ targets: - src/core/lib/slice/slice_internal.h - src/core/lib/slice/slice_refcount.h - src/core/lib/slice/slice_string_helpers.h + - src/core/util/bitset.h + - src/core/util/manual_constructor.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/time.h - third_party/upb/upb/generated_code_support.h - third_party/upb/upb/mini_descriptor/build_enum.h - third_party/upb/upb/mini_descriptor/decode.h @@ -14199,8 +14199,6 @@ targets: - src/core/lib/debug/trace.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/util/status_helper.cc - - src/core/util/time.cc - src/core/lib/iomgr/closure.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/error.cc @@ -14212,6 +14210,8 @@ targets: - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_refcount.cc - src/core/lib/slice/slice_string_helpers.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc - test/core/resource_quota/periodic_update_test.cc - third_party/upb/upb/mini_descriptor/build_enum.c - third_party/upb/upb/mini_descriptor/decode.c @@ -14735,12 +14735,6 @@ targets: headers: - src/core/lib/debug/trace.h - src/core/lib/event_engine/event_engine_context.h - - src/core/util/atomic_utils.h - - src/core/util/bitset.h - - src/core/util/down_cast.h - - src/core/util/orphanable.h - - src/core/util/ref_counted.h - - src/core/util/ref_counted_ptr.h - src/core/lib/promise/activity.h - src/core/lib/promise/context.h - src/core/lib/promise/detail/basic_seq.h @@ -14756,6 +14750,12 @@ targets: - src/core/lib/promise/promise_mutex.h - src/core/lib/promise/seq.h - src/core/lib/promise/trace.h + - src/core/util/atomic_utils.h + - src/core/util/bitset.h + - src/core/util/down_cast.h + - src/core/util/orphanable.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - test/core/promise/test_wakeup_schedulers.h src: - src/core/lib/debug/trace.cc @@ -19760,11 +19760,11 @@ targets: build: test language: c++ headers: + - src/core/lib/resource_quota/thread_quota.h - src/core/util/atomic_utils.h - src/core/util/down_cast.h - src/core/util/ref_counted.h - src/core/util/ref_counted_ptr.h - - src/core/lib/resource_quota/thread_quota.h src: - src/core/lib/resource_quota/thread_quota.cc - test/core/resource_quota/thread_quota_test.cc @@ -20259,7 +20259,6 @@ targets: language: c++ headers: - src/core/lib/debug/trace.h - - src/core/util/bitset.h - src/core/lib/promise/detail/join_state.h - src/core/lib/promise/detail/promise_like.h - src/core/lib/promise/detail/status.h @@ -20268,6 +20267,7 @@ targets: - src/core/lib/promise/status_flag.h - src/core/lib/promise/trace.h - src/core/lib/promise/try_join.h + - src/core/util/bitset.h src: - src/core/lib/debug/trace.cc - src/core/lib/promise/trace.cc @@ -20401,12 +20401,6 @@ targets: language: c++ headers: - src/core/lib/event_engine/event_engine_context.h - - src/core/util/atomic_utils.h - - src/core/util/down_cast.h - - src/core/util/notification.h - - src/core/util/orphanable.h - - src/core/util/ref_counted.h - - src/core/util/ref_counted_ptr.h - src/core/lib/promise/activity.h - src/core/lib/promise/context.h - src/core/lib/promise/detail/promise_factory.h @@ -20415,6 +20409,12 @@ targets: - src/core/lib/promise/map.h - src/core/lib/promise/poll.h - src/core/lib/promise/wait_for_callback.h + - src/core/util/atomic_utils.h + - src/core/util/down_cast.h + - src/core/util/notification.h + - src/core/util/orphanable.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - test/core/promise/test_wakeup_schedulers.h src: - src/core/lib/promise/activity.cc diff --git a/config.m4 b/config.m4 index b75f5ff4ca4..bf353777ae3 100644 --- a/config.m4 +++ b/config.m4 @@ -443,8 +443,6 @@ if test "$PHP_GRPC" != "no"; then src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc \ src/core/lib/address_utils/parse_address.cc \ src/core/lib/address_utils/sockaddr_utils.cc \ - src/core/util/backoff.cc \ - src/core/util/random_early_detection.cc \ src/core/lib/channel/channel_args.cc \ src/core/lib/channel/channel_args_preconditioning.cc \ src/core/lib/channel/channel_stack.cc \ @@ -461,7 +459,6 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/config/config_vars_non_generated.cc \ src/core/lib/config/core_configuration.cc \ src/core/lib/config/load_config.cc \ - src/core/util/event_log.cc \ src/core/lib/debug/trace.cc \ src/core/lib/event_engine/ares_resolver.cc \ src/core/lib/event_engine/cf_engine/cf_engine.cc \ @@ -513,33 +510,6 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/event_engine/work_queue/basic_work_queue.cc \ src/core/lib/experiments/config.cc \ src/core/lib/experiments/experiments.cc \ - src/core/util/crash.cc \ - src/core/util/dump_args.cc \ - src/core/util/examine_stack.cc \ - src/core/util/fork.cc \ - src/core/util/host_port.cc \ - src/core/util/linux/env.cc \ - src/core/util/load_file.cc \ - src/core/util/mpscq.cc \ - src/core/util/per_cpu.cc \ - src/core/util/posix/directory_reader.cc \ - src/core/util/posix/env.cc \ - src/core/util/posix/stat.cc \ - src/core/util/posix/thd.cc \ - src/core/util/ref_counted_string.cc \ - src/core/util/status_helper.cc \ - src/core/util/strerror.cc \ - src/core/util/tchar.cc \ - src/core/util/time.cc \ - src/core/util/time_averaged_stats.cc \ - src/core/util/time_util.cc \ - src/core/util/uuid_v4.cc \ - src/core/util/validation_errors.cc \ - src/core/util/windows/directory_reader.cc \ - src/core/util/windows/env.cc \ - src/core/util/windows/stat.cc \ - src/core/util/windows/thd.cc \ - src/core/util/work_serializer.cc \ src/core/lib/iomgr/buffer_list.cc \ src/core/lib/iomgr/call_combiner.cc \ src/core/lib/iomgr/cfstream_handle.cc \ @@ -564,11 +534,6 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/iomgr/executor.cc \ src/core/lib/iomgr/fork_posix.cc \ src/core/lib/iomgr/fork_windows.cc \ - src/core/util/gethostname_fallback.cc \ - src/core/util/gethostname_host_name_max.cc \ - src/core/util/gethostname_sysconf.cc \ - src/core/util/grpc_if_nametoindex_posix.cc \ - src/core/util/grpc_if_nametoindex_unsupported.cc \ src/core/lib/iomgr/internal_errqueue.cc \ src/core/lib/iomgr/iocp_windows.cc \ src/core/lib/iomgr/iomgr.cc \ @@ -617,7 +582,6 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/iomgr/wakeup_fd_nospecial.cc \ src/core/lib/iomgr/wakeup_fd_pipe.cc \ src/core/lib/iomgr/wakeup_fd_posix.cc \ - src/core/util/matchers.cc \ src/core/lib/promise/activity.cc \ src/core/lib/promise/party.cc \ src/core/lib/promise/sleep.cc \ @@ -736,7 +700,6 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/transport/timeout_encoding.cc \ src/core/lib/transport/transport.cc \ src/core/lib/transport/transport_op_string.cc \ - src/core/util/uri.cc \ src/core/load_balancing/address_filtering.cc \ src/core/load_balancing/backend_metric_parser.cc \ src/core/load_balancing/child_policy_handler.cc \ @@ -832,6 +795,19 @@ if test "$PHP_GRPC" != "no"; then src/core/util/alloc.cc \ src/core/util/android/log.cc \ src/core/util/atm.cc \ + src/core/util/backoff.cc \ + src/core/util/crash.cc \ + src/core/util/dump_args.cc \ + src/core/util/event_log.cc \ + src/core/util/examine_stack.cc \ + src/core/util/fork.cc \ + src/core/util/gethostname_fallback.cc \ + src/core/util/gethostname_host_name_max.cc \ + src/core/util/gethostname_sysconf.cc \ + src/core/util/gpr_time.cc \ + src/core/util/grpc_if_nametoindex_posix.cc \ + src/core/util/grpc_if_nametoindex_unsupported.cc \ + src/core/util/host_port.cc \ src/core/util/http_client/format_request.cc \ src/core/util/http_client/httpcli.cc \ src/core/util/http_client/httpcli_security_connector.cc \ @@ -842,27 +818,51 @@ if test "$PHP_GRPC" != "no"; then src/core/util/json/json_util.cc \ src/core/util/json/json_writer.cc \ src/core/util/linux/cpu.cc \ + src/core/util/linux/env.cc \ src/core/util/linux/log.cc \ + src/core/util/load_file.cc \ src/core/util/log.cc \ + src/core/util/matchers.cc \ + src/core/util/mpscq.cc \ src/core/util/msys/tmpfile.cc \ + src/core/util/per_cpu.cc \ src/core/util/posix/cpu.cc \ + src/core/util/posix/directory_reader.cc \ + src/core/util/posix/env.cc \ src/core/util/posix/log.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/random_early_detection.cc \ + src/core/util/ref_counted_string.cc \ + src/core/util/status_helper.cc \ + src/core/util/strerror.cc \ src/core/util/string.cc \ src/core/util/sync.cc \ src/core/util/sync_abseil.cc \ + src/core/util/tchar.cc \ src/core/util/time.cc \ + src/core/util/time_averaged_stats.cc \ src/core/util/time_precise.cc \ + src/core/util/time_util.cc \ + src/core/util/uri.cc \ + src/core/util/uuid_v4.cc \ + src/core/util/validation_errors.cc \ src/core/util/windows/cpu.cc \ + src/core/util/windows/directory_reader.cc \ + src/core/util/windows/env.cc \ src/core/util/windows/log.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 \ + src/core/util/work_serializer.cc \ src/core/xds/grpc/certificate_provider_store.cc \ src/core/xds/grpc/file_watcher_certificate_provider_factory.cc \ src/core/xds/grpc/xds_audit_logger_registry.cc \ @@ -1517,7 +1517,6 @@ if test "$PHP_GRPC" != "no"; then PHP_ADD_BUILD_DIR($ext_builddir/src/core/handshaker/security) PHP_ADD_BUILD_DIR($ext_builddir/src/core/handshaker/tcp_connect) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/address_utils) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/util) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/channel) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/compression) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/config) @@ -1530,13 +1529,8 @@ if test "$PHP_GRPC" != "no"; then PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/event_engine/windows) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/event_engine/work_queue) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/experiments) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/util) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/util/linux) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/util/posix) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/util/windows) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/iomgr) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/iomgr/event_engine_shims) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/util) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/promise) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/resource_quota) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/authorization) @@ -1569,7 +1563,6 @@ if test "$PHP_GRPC" != "no"; then PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/slice) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/surface) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/transport) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/uri) PHP_ADD_BUILD_DIR($ext_builddir/src/core/load_balancing) PHP_ADD_BUILD_DIR($ext_builddir/src/core/load_balancing/grpclb) PHP_ADD_BUILD_DIR($ext_builddir/src/core/load_balancing/outlier_detection) diff --git a/config.w32 b/config.w32 index 85a32dc6704..26cd8ca0a56 100644 --- a/config.w32 +++ b/config.w32 @@ -408,8 +408,6 @@ if (PHP_GRPC != "no") { "src\\core\\handshaker\\tcp_connect\\tcp_connect_handshaker.cc " + "src\\core\\lib\\address_utils\\parse_address.cc " + "src\\core\\lib\\address_utils\\sockaddr_utils.cc " + - "src\\core\\lib\\backoff\\backoff.cc " + - "src\\core\\lib\\backoff\\random_early_detection.cc " + "src\\core\\lib\\channel\\channel_args.cc " + "src\\core\\lib\\channel\\channel_args_preconditioning.cc " + "src\\core\\lib\\channel\\channel_stack.cc " + @@ -426,7 +424,6 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\config\\config_vars_non_generated.cc " + "src\\core\\lib\\config\\core_configuration.cc " + "src\\core\\lib\\config\\load_config.cc " + - "src\\core\\lib\\debug\\event_log.cc " + "src\\core\\lib\\debug\\trace.cc " + "src\\core\\lib\\event_engine\\ares_resolver.cc " + "src\\core\\lib\\event_engine\\cf_engine\\cf_engine.cc " + @@ -478,33 +475,6 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\event_engine\\work_queue\\basic_work_queue.cc " + "src\\core\\lib\\experiments\\config.cc " + "src\\core\\lib\\experiments\\experiments.cc " + - "src\\core\\lib\\gprpp\\crash.cc " + - "src\\core\\lib\\gprpp\\dump_args.cc " + - "src\\core\\lib\\gprpp\\examine_stack.cc " + - "src\\core\\lib\\gprpp\\fork.cc " + - "src\\core\\lib\\gprpp\\host_port.cc " + - "src\\core\\lib\\gprpp\\linux\\env.cc " + - "src\\core\\lib\\gprpp\\load_file.cc " + - "src\\core\\lib\\gprpp\\mpscq.cc " + - "src\\core\\lib\\gprpp\\per_cpu.cc " + - "src\\core\\lib\\gprpp\\posix\\directory_reader.cc " + - "src\\core\\lib\\gprpp\\posix\\env.cc " + - "src\\core\\lib\\gprpp\\posix\\stat.cc " + - "src\\core\\lib\\gprpp\\posix\\thd.cc " + - "src\\core\\lib\\gprpp\\ref_counted_string.cc " + - "src\\core\\lib\\gprpp\\status_helper.cc " + - "src\\core\\lib\\gprpp\\strerror.cc " + - "src\\core\\lib\\gprpp\\tchar.cc " + - "src\\core\\lib\\gprpp\\time.cc " + - "src\\core\\lib\\gprpp\\time_averaged_stats.cc " + - "src\\core\\lib\\gprpp\\time_util.cc " + - "src\\core\\lib\\gprpp\\uuid_v4.cc " + - "src\\core\\lib\\gprpp\\validation_errors.cc " + - "src\\core\\lib\\gprpp\\windows\\directory_reader.cc " + - "src\\core\\lib\\gprpp\\windows\\env.cc " + - "src\\core\\lib\\gprpp\\windows\\stat.cc " + - "src\\core\\lib\\gprpp\\windows\\thd.cc " + - "src\\core\\lib\\gprpp\\work_serializer.cc " + "src\\core\\lib\\iomgr\\buffer_list.cc " + "src\\core\\lib\\iomgr\\call_combiner.cc " + "src\\core\\lib\\iomgr\\cfstream_handle.cc " + @@ -529,11 +499,6 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\iomgr\\executor.cc " + "src\\core\\lib\\iomgr\\fork_posix.cc " + "src\\core\\lib\\iomgr\\fork_windows.cc " + - "src\\core\\lib\\iomgr\\gethostname_fallback.cc " + - "src\\core\\lib\\iomgr\\gethostname_host_name_max.cc " + - "src\\core\\lib\\iomgr\\gethostname_sysconf.cc " + - "src\\core\\lib\\iomgr\\grpc_if_nametoindex_posix.cc " + - "src\\core\\lib\\iomgr\\grpc_if_nametoindex_unsupported.cc " + "src\\core\\lib\\iomgr\\internal_errqueue.cc " + "src\\core\\lib\\iomgr\\iocp_windows.cc " + "src\\core\\lib\\iomgr\\iomgr.cc " + @@ -582,7 +547,6 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\iomgr\\wakeup_fd_nospecial.cc " + "src\\core\\lib\\iomgr\\wakeup_fd_pipe.cc " + "src\\core\\lib\\iomgr\\wakeup_fd_posix.cc " + - "src\\core\\lib\\matchers\\matchers.cc " + "src\\core\\lib\\promise\\activity.cc " + "src\\core\\lib\\promise\\party.cc " + "src\\core\\lib\\promise\\sleep.cc " + @@ -701,7 +665,6 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\transport\\timeout_encoding.cc " + "src\\core\\lib\\transport\\transport.cc " + "src\\core\\lib\\transport\\transport_op_string.cc " + - "src\\core\\lib\\uri\\uri_parser.cc " + "src\\core\\load_balancing\\address_filtering.cc " + "src\\core\\load_balancing\\backend_metric_parser.cc " + "src\\core\\load_balancing\\child_policy_handler.cc " + @@ -797,6 +760,19 @@ if (PHP_GRPC != "no") { "src\\core\\util\\alloc.cc " + "src\\core\\util\\android\\log.cc " + "src\\core\\util\\atm.cc " + + "src\\core\\util\\backoff.cc " + + "src\\core\\util\\crash.cc " + + "src\\core\\util\\dump_args.cc " + + "src\\core\\util\\event_log.cc " + + "src\\core\\util\\examine_stack.cc " + + "src\\core\\util\\fork.cc " + + "src\\core\\util\\gethostname_fallback.cc " + + "src\\core\\util\\gethostname_host_name_max.cc " + + "src\\core\\util\\gethostname_sysconf.cc " + + "src\\core\\util\\gpr_time.cc " + + "src\\core\\util\\grpc_if_nametoindex_posix.cc " + + "src\\core\\util\\grpc_if_nametoindex_unsupported.cc " + + "src\\core\\util\\host_port.cc " + "src\\core\\util\\http_client\\format_request.cc " + "src\\core\\util\\http_client\\httpcli.cc " + "src\\core\\util\\http_client\\httpcli_security_connector.cc " + @@ -807,27 +783,51 @@ if (PHP_GRPC != "no") { "src\\core\\util\\json\\json_util.cc " + "src\\core\\util\\json\\json_writer.cc " + "src\\core\\util\\linux\\cpu.cc " + + "src\\core\\util\\linux\\env.cc " + "src\\core\\util\\linux\\log.cc " + + "src\\core\\util\\load_file.cc " + "src\\core\\util\\log.cc " + + "src\\core\\util\\matchers.cc " + + "src\\core\\util\\mpscq.cc " + "src\\core\\util\\msys\\tmpfile.cc " + + "src\\core\\util\\per_cpu.cc " + "src\\core\\util\\posix\\cpu.cc " + + "src\\core\\util\\posix\\directory_reader.cc " + + "src\\core\\util\\posix\\env.cc " + "src\\core\\util\\posix\\log.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\\random_early_detection.cc " + + "src\\core\\util\\ref_counted_string.cc " + + "src\\core\\util\\status_helper.cc " + + "src\\core\\util\\strerror.cc " + "src\\core\\util\\string.cc " + "src\\core\\util\\sync.cc " + "src\\core\\util\\sync_abseil.cc " + + "src\\core\\util\\tchar.cc " + "src\\core\\util\\time.cc " + + "src\\core\\util\\time_averaged_stats.cc " + "src\\core\\util\\time_precise.cc " + + "src\\core\\util\\time_util.cc " + + "src\\core\\util\\uri.cc " + + "src\\core\\util\\uuid_v4.cc " + + "src\\core\\util\\validation_errors.cc " + "src\\core\\util\\windows\\cpu.cc " + + "src\\core\\util\\windows\\directory_reader.cc " + + "src\\core\\util\\windows\\env.cc " + "src\\core\\util\\windows\\log.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 " + + "src\\core\\util\\work_serializer.cc " + "src\\core\\xds\\grpc\\certificate_provider_store.cc " + "src\\core\\xds\\grpc\\file_watcher_certificate_provider_factory.cc " + "src\\core\\xds\\grpc\\xds_audit_logger_registry.cc " + @@ -1654,7 +1654,6 @@ if (PHP_GRPC != "no") { FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\handshaker\\tcp_connect"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\address_utils"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\backoff"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\channel"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\compression"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\config"); @@ -1667,13 +1666,8 @@ if (PHP_GRPC != "no") { FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\event_engine\\windows"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\event_engine\\work_queue"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\experiments"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gprpp"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gprpp\\linux"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gprpp\\posix"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gprpp\\windows"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\iomgr"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\iomgr\\event_engine_shims"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\matchers"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\promise"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\resource_quota"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security"); @@ -1707,7 +1701,6 @@ if (PHP_GRPC != "no") { FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\slice"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\surface"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\transport"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\uri"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\load_balancing"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\load_balancing\\grpclb"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\load_balancing\\outlier_detection"); diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index b1389d7f303..3a1adb942ff 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -872,8 +872,6 @@ Pod::Spec.new do |s| 'src/core/handshaker/tcp_connect/tcp_connect_handshaker.h', 'src/core/lib/address_utils/parse_address.h', 'src/core/lib/address_utils/sockaddr_utils.h', - 'src/core/util/backoff.h', - 'src/core/util/random_early_detection.h', 'src/core/lib/channel/call_finalization.h', 'src/core/lib/channel/channel_args.h', 'src/core/lib/channel/channel_args_preconditioning.h', @@ -891,7 +889,6 @@ Pod::Spec.new do |s| 'src/core/lib/config/config_vars.h', 'src/core/lib/config/core_configuration.h', 'src/core/lib/config/load_config.h', - 'src/core/util/event_log.h', 'src/core/lib/debug/trace.h', 'src/core/lib/event_engine/ares_resolver.h', 'src/core/lib/event_engine/cf_engine/cf_engine.h', @@ -959,54 +956,6 @@ Pod::Spec.new do |s| 'src/core/lib/event_engine/work_queue/work_queue.h', 'src/core/lib/experiments/config.h', 'src/core/lib/experiments/experiments.h', - 'src/core/util/atomic_utils.h', - 'src/core/util/bitset.h', - 'src/core/util/chunked_vector.h', - 'src/core/util/construct_destruct.h', - 'src/core/util/cpp_impl_of.h', - 'src/core/util/crash.h', - 'src/core/util/debug_location.h', - 'src/core/util/directory_reader.h', - 'src/core/util/down_cast.h', - 'src/core/util/dual_ref_counted.h', - 'src/core/util/dump_args.h', - 'src/core/util/env.h', - 'src/core/util/examine_stack.h', - 'src/core/util/fork.h', - 'src/core/util/host_port.h', - 'src/core/util/if_list.h', - 'src/core/util/load_file.h', - 'src/core/util/manual_constructor.h', - 'src/core/util/match.h', - 'src/core/util/memory.h', - 'src/core/util/mpscq.h', - 'src/core/util/no_destruct.h', - 'src/core/util/notification.h', - 'src/core/util/orphanable.h', - 'src/core/util/overload.h', - 'src/core/util/packed_table.h', - 'src/core/util/per_cpu.h', - 'src/core/util/ref_counted.h', - 'src/core/util/ref_counted_ptr.h', - 'src/core/util/ref_counted_string.h', - 'src/core/util/single_set_ptr.h', - 'src/core/util/sorted_pack.h', - 'src/core/util/stat.h', - 'src/core/util/status_helper.h', - 'src/core/util/strerror.h', - 'src/core/util/sync.h', - 'src/core/util/table.h', - 'src/core/util/tchar.h', - 'src/core/util/thd.h', - 'src/core/util/time.h', - 'src/core/util/time_averaged_stats.h', - 'src/core/util/time_util.h', - 'src/core/util/type_list.h', - 'src/core/util/unique_type_name.h', - 'src/core/util/uuid_v4.h', - 'src/core/util/validation_errors.h', - 'src/core/util/work_serializer.h', - 'src/core/util/xxhash_inline.h', 'src/core/lib/iomgr/block_annotate.h', 'src/core/lib/iomgr/buffer_list.h', 'src/core/lib/iomgr/call_combiner.h', @@ -1028,8 +977,6 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/event_engine_shims/tcp_client.h', 'src/core/lib/iomgr/exec_ctx.h', 'src/core/lib/iomgr/executor.h', - 'src/core/util/gethostname.h', - 'src/core/util/grpc_if_nametoindex.h', 'src/core/lib/iomgr/internal_errqueue.h', 'src/core/lib/iomgr/iocp_windows.h', 'src/core/lib/iomgr/iomgr.h', @@ -1072,7 +1019,6 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/vsock.h', 'src/core/lib/iomgr/wakeup_fd_pipe.h', 'src/core/lib/iomgr/wakeup_fd_posix.h', - 'src/core/util/matchers.h', 'src/core/lib/promise/activity.h', 'src/core/lib/promise/all_ok.h', 'src/core/lib/promise/arena_promise.h', @@ -1213,7 +1159,6 @@ Pod::Spec.new do |s| 'src/core/lib/transport/timeout_encoding.h', 'src/core/lib/transport/transport.h', 'src/core/lib/transport/transport_fwd.h', - 'src/core/util/uri.h', 'src/core/load_balancing/address_filtering.h', 'src/core/load_balancing/backend_metric_data.h', 'src/core/load_balancing/backend_metric_parser.h', @@ -1304,11 +1249,31 @@ Pod::Spec.new do |s| 'src/core/tsi/transport_security_grpc.h', 'src/core/tsi/transport_security_interface.h', 'src/core/util/alloc.h', + 'src/core/util/atomic_utils.h', 'src/core/util/avl.h', + 'src/core/util/backoff.h', + 'src/core/util/bitset.h', + 'src/core/util/chunked_vector.h', + 'src/core/util/construct_destruct.h', + 'src/core/util/cpp_impl_of.h', + 'src/core/util/crash.h', + 'src/core/util/debug_location.h', + 'src/core/util/directory_reader.h', + 'src/core/util/down_cast.h', + 'src/core/util/dual_ref_counted.h', + 'src/core/util/dump_args.h', + 'src/core/util/env.h', + 'src/core/util/event_log.h', + 'src/core/util/examine_stack.h', + 'src/core/util/fork.h', + 'src/core/util/gethostname.h', + 'src/core/util/grpc_if_nametoindex.h', + 'src/core/util/host_port.h', 'src/core/util/http_client/format_request.h', 'src/core/util/http_client/httpcli.h', 'src/core/util/http_client/httpcli_ssl_credentials.h', 'src/core/util/http_client/parser.h', + 'src/core/util/if_list.h', 'src/core/util/json/json.h', 'src/core/util/json/json_args.h', 'src/core/util/json/json_channel_args.h', @@ -1316,11 +1281,46 @@ Pod::Spec.new do |s| 'src/core/util/json/json_reader.h', 'src/core/util/json/json_util.h', 'src/core/util/json/json_writer.h', + 'src/core/util/load_file.h', + 'src/core/util/manual_constructor.h', + 'src/core/util/match.h', + 'src/core/util/matchers.h', + 'src/core/util/memory.h', + 'src/core/util/mpscq.h', + 'src/core/util/no_destruct.h', + 'src/core/util/notification.h', + 'src/core/util/orphanable.h', + 'src/core/util/overload.h', + 'src/core/util/packed_table.h', + 'src/core/util/per_cpu.h', + 'src/core/util/random_early_detection.h', + 'src/core/util/ref_counted.h', + 'src/core/util/ref_counted_ptr.h', + 'src/core/util/ref_counted_string.h', + 'src/core/util/single_set_ptr.h', + 'src/core/util/sorted_pack.h', 'src/core/util/spinlock.h', + 'src/core/util/stat.h', + 'src/core/util/status_helper.h', + 'src/core/util/strerror.h', 'src/core/util/string.h', + 'src/core/util/sync.h', + 'src/core/util/table.h', + 'src/core/util/tchar.h', + 'src/core/util/thd.h', + 'src/core/util/time.h', + 'src/core/util/time_averaged_stats.h', 'src/core/util/time_precise.h', + 'src/core/util/time_util.h', 'src/core/util/tmpfile.h', + 'src/core/util/type_list.h', + 'src/core/util/unique_type_name.h', + 'src/core/util/uri.h', 'src/core/util/useful.h', + 'src/core/util/uuid_v4.h', + 'src/core/util/validation_errors.h', + 'src/core/util/work_serializer.h', + 'src/core/util/xxhash_inline.h', 'src/core/xds/grpc/certificate_provider_store.h', 'src/core/xds/grpc/file_watcher_certificate_provider_factory.h', 'src/core/xds/grpc/upb_utils.h', @@ -2147,8 +2147,6 @@ Pod::Spec.new do |s| 'src/core/handshaker/tcp_connect/tcp_connect_handshaker.h', 'src/core/lib/address_utils/parse_address.h', 'src/core/lib/address_utils/sockaddr_utils.h', - 'src/core/util/backoff.h', - 'src/core/util/random_early_detection.h', 'src/core/lib/channel/call_finalization.h', 'src/core/lib/channel/channel_args.h', 'src/core/lib/channel/channel_args_preconditioning.h', @@ -2166,7 +2164,6 @@ Pod::Spec.new do |s| 'src/core/lib/config/config_vars.h', 'src/core/lib/config/core_configuration.h', 'src/core/lib/config/load_config.h', - 'src/core/util/event_log.h', 'src/core/lib/debug/trace.h', 'src/core/lib/event_engine/ares_resolver.h', 'src/core/lib/event_engine/cf_engine/cf_engine.h', @@ -2234,54 +2231,6 @@ Pod::Spec.new do |s| 'src/core/lib/event_engine/work_queue/work_queue.h', 'src/core/lib/experiments/config.h', 'src/core/lib/experiments/experiments.h', - 'src/core/util/atomic_utils.h', - 'src/core/util/bitset.h', - 'src/core/util/chunked_vector.h', - 'src/core/util/construct_destruct.h', - 'src/core/util/cpp_impl_of.h', - 'src/core/util/crash.h', - 'src/core/util/debug_location.h', - 'src/core/util/directory_reader.h', - 'src/core/util/down_cast.h', - 'src/core/util/dual_ref_counted.h', - 'src/core/util/dump_args.h', - 'src/core/util/env.h', - 'src/core/util/examine_stack.h', - 'src/core/util/fork.h', - 'src/core/util/host_port.h', - 'src/core/util/if_list.h', - 'src/core/util/load_file.h', - 'src/core/util/manual_constructor.h', - 'src/core/util/match.h', - 'src/core/util/memory.h', - 'src/core/util/mpscq.h', - 'src/core/util/no_destruct.h', - 'src/core/util/notification.h', - 'src/core/util/orphanable.h', - 'src/core/util/overload.h', - 'src/core/util/packed_table.h', - 'src/core/util/per_cpu.h', - 'src/core/util/ref_counted.h', - 'src/core/util/ref_counted_ptr.h', - 'src/core/util/ref_counted_string.h', - 'src/core/util/single_set_ptr.h', - 'src/core/util/sorted_pack.h', - 'src/core/util/stat.h', - 'src/core/util/status_helper.h', - 'src/core/util/strerror.h', - 'src/core/util/sync.h', - 'src/core/util/table.h', - 'src/core/util/tchar.h', - 'src/core/util/thd.h', - 'src/core/util/time.h', - 'src/core/util/time_averaged_stats.h', - 'src/core/util/time_util.h', - 'src/core/util/type_list.h', - 'src/core/util/unique_type_name.h', - 'src/core/util/uuid_v4.h', - 'src/core/util/validation_errors.h', - 'src/core/util/work_serializer.h', - 'src/core/util/xxhash_inline.h', 'src/core/lib/iomgr/block_annotate.h', 'src/core/lib/iomgr/buffer_list.h', 'src/core/lib/iomgr/call_combiner.h', @@ -2303,8 +2252,6 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/event_engine_shims/tcp_client.h', 'src/core/lib/iomgr/exec_ctx.h', 'src/core/lib/iomgr/executor.h', - 'src/core/util/gethostname.h', - 'src/core/util/grpc_if_nametoindex.h', 'src/core/lib/iomgr/internal_errqueue.h', 'src/core/lib/iomgr/iocp_windows.h', 'src/core/lib/iomgr/iomgr.h', @@ -2347,7 +2294,6 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/vsock.h', 'src/core/lib/iomgr/wakeup_fd_pipe.h', 'src/core/lib/iomgr/wakeup_fd_posix.h', - 'src/core/util/matchers.h', 'src/core/lib/promise/activity.h', 'src/core/lib/promise/all_ok.h', 'src/core/lib/promise/arena_promise.h', @@ -2488,7 +2434,6 @@ Pod::Spec.new do |s| 'src/core/lib/transport/timeout_encoding.h', 'src/core/lib/transport/transport.h', 'src/core/lib/transport/transport_fwd.h', - 'src/core/util/uri.h', 'src/core/load_balancing/address_filtering.h', 'src/core/load_balancing/backend_metric_data.h', 'src/core/load_balancing/backend_metric_parser.h', @@ -2579,11 +2524,31 @@ Pod::Spec.new do |s| 'src/core/tsi/transport_security_grpc.h', 'src/core/tsi/transport_security_interface.h', 'src/core/util/alloc.h', + 'src/core/util/atomic_utils.h', 'src/core/util/avl.h', + 'src/core/util/backoff.h', + 'src/core/util/bitset.h', + 'src/core/util/chunked_vector.h', + 'src/core/util/construct_destruct.h', + 'src/core/util/cpp_impl_of.h', + 'src/core/util/crash.h', + 'src/core/util/debug_location.h', + 'src/core/util/directory_reader.h', + 'src/core/util/down_cast.h', + 'src/core/util/dual_ref_counted.h', + 'src/core/util/dump_args.h', + 'src/core/util/env.h', + 'src/core/util/event_log.h', + 'src/core/util/examine_stack.h', + 'src/core/util/fork.h', + 'src/core/util/gethostname.h', + 'src/core/util/grpc_if_nametoindex.h', + 'src/core/util/host_port.h', 'src/core/util/http_client/format_request.h', 'src/core/util/http_client/httpcli.h', 'src/core/util/http_client/httpcli_ssl_credentials.h', 'src/core/util/http_client/parser.h', + 'src/core/util/if_list.h', 'src/core/util/json/json.h', 'src/core/util/json/json_args.h', 'src/core/util/json/json_channel_args.h', @@ -2591,11 +2556,46 @@ Pod::Spec.new do |s| 'src/core/util/json/json_reader.h', 'src/core/util/json/json_util.h', 'src/core/util/json/json_writer.h', + 'src/core/util/load_file.h', + 'src/core/util/manual_constructor.h', + 'src/core/util/match.h', + 'src/core/util/matchers.h', + 'src/core/util/memory.h', + 'src/core/util/mpscq.h', + 'src/core/util/no_destruct.h', + 'src/core/util/notification.h', + 'src/core/util/orphanable.h', + 'src/core/util/overload.h', + 'src/core/util/packed_table.h', + 'src/core/util/per_cpu.h', + 'src/core/util/random_early_detection.h', + 'src/core/util/ref_counted.h', + 'src/core/util/ref_counted_ptr.h', + 'src/core/util/ref_counted_string.h', + 'src/core/util/single_set_ptr.h', + 'src/core/util/sorted_pack.h', 'src/core/util/spinlock.h', + 'src/core/util/stat.h', + 'src/core/util/status_helper.h', + 'src/core/util/strerror.h', 'src/core/util/string.h', + 'src/core/util/sync.h', + 'src/core/util/table.h', + 'src/core/util/tchar.h', + 'src/core/util/thd.h', + 'src/core/util/time.h', + 'src/core/util/time_averaged_stats.h', 'src/core/util/time_precise.h', + 'src/core/util/time_util.h', 'src/core/util/tmpfile.h', + 'src/core/util/type_list.h', + 'src/core/util/unique_type_name.h', + 'src/core/util/uri.h', 'src/core/util/useful.h', + 'src/core/util/uuid_v4.h', + 'src/core/util/validation_errors.h', + 'src/core/util/work_serializer.h', + 'src/core/util/xxhash_inline.h', 'src/core/xds/grpc/certificate_provider_store.h', 'src/core/xds/grpc/file_watcher_certificate_provider_factory.h', 'src/core/xds/grpc/upb_utils.h', diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index ae387ec590e..b89bbe034a0 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -1209,10 +1209,6 @@ Pod::Spec.new do |s| 'src/core/lib/address_utils/parse_address.h', 'src/core/lib/address_utils/sockaddr_utils.cc', 'src/core/lib/address_utils/sockaddr_utils.h', - 'src/core/util/backoff.cc', - 'src/core/util/backoff.h', - 'src/core/util/random_early_detection.cc', - 'src/core/util/random_early_detection.h', 'src/core/lib/channel/call_finalization.h', 'src/core/lib/channel/channel_args.cc', 'src/core/lib/channel/channel_args.h', @@ -1246,8 +1242,6 @@ Pod::Spec.new do |s| 'src/core/lib/config/core_configuration.h', 'src/core/lib/config/load_config.cc', 'src/core/lib/config/load_config.h', - 'src/core/util/event_log.cc', - 'src/core/util/event_log.h', 'src/core/lib/debug/trace.cc', 'src/core/lib/debug/trace.h', 'src/core/lib/event_engine/ares_resolver.cc', @@ -1366,81 +1360,6 @@ Pod::Spec.new do |s| 'src/core/lib/experiments/config.h', 'src/core/lib/experiments/experiments.cc', 'src/core/lib/experiments/experiments.h', - 'src/core/util/atomic_utils.h', - 'src/core/util/bitset.h', - 'src/core/util/chunked_vector.h', - 'src/core/util/construct_destruct.h', - 'src/core/util/cpp_impl_of.h', - 'src/core/util/crash.cc', - 'src/core/util/crash.h', - 'src/core/util/debug_location.h', - 'src/core/util/directory_reader.h', - 'src/core/util/down_cast.h', - 'src/core/util/dual_ref_counted.h', - 'src/core/util/dump_args.cc', - 'src/core/util/dump_args.h', - 'src/core/util/env.h', - 'src/core/util/examine_stack.cc', - 'src/core/util/examine_stack.h', - 'src/core/util/fork.cc', - 'src/core/util/fork.h', - 'src/core/util/host_port.cc', - 'src/core/util/host_port.h', - 'src/core/util/if_list.h', - 'src/core/util/linux/env.cc', - 'src/core/util/load_file.cc', - 'src/core/util/load_file.h', - 'src/core/util/manual_constructor.h', - 'src/core/util/match.h', - 'src/core/util/memory.h', - 'src/core/util/mpscq.cc', - 'src/core/util/mpscq.h', - 'src/core/util/no_destruct.h', - 'src/core/util/notification.h', - 'src/core/util/orphanable.h', - 'src/core/util/overload.h', - 'src/core/util/packed_table.h', - 'src/core/util/per_cpu.cc', - 'src/core/util/per_cpu.h', - 'src/core/util/posix/directory_reader.cc', - 'src/core/util/posix/env.cc', - 'src/core/util/posix/stat.cc', - 'src/core/util/posix/thd.cc', - 'src/core/util/ref_counted.h', - 'src/core/util/ref_counted_ptr.h', - 'src/core/util/ref_counted_string.cc', - 'src/core/util/ref_counted_string.h', - 'src/core/util/single_set_ptr.h', - 'src/core/util/sorted_pack.h', - 'src/core/util/stat.h', - 'src/core/util/status_helper.cc', - 'src/core/util/status_helper.h', - 'src/core/util/strerror.cc', - 'src/core/util/strerror.h', - 'src/core/util/sync.h', - 'src/core/util/table.h', - 'src/core/util/tchar.cc', - 'src/core/util/tchar.h', - 'src/core/util/thd.h', - 'src/core/util/time.cc', - 'src/core/util/time.h', - 'src/core/util/time_averaged_stats.cc', - 'src/core/util/time_averaged_stats.h', - 'src/core/util/time_util.cc', - 'src/core/util/time_util.h', - 'src/core/util/type_list.h', - 'src/core/util/unique_type_name.h', - 'src/core/util/uuid_v4.cc', - 'src/core/util/uuid_v4.h', - 'src/core/util/validation_errors.cc', - 'src/core/util/validation_errors.h', - 'src/core/util/windows/directory_reader.cc', - 'src/core/util/windows/env.cc', - 'src/core/util/windows/stat.cc', - 'src/core/util/windows/thd.cc', - 'src/core/util/work_serializer.cc', - 'src/core/util/work_serializer.h', - 'src/core/util/xxhash_inline.h', 'src/core/lib/iomgr/block_annotate.h', 'src/core/lib/iomgr/buffer_list.cc', 'src/core/lib/iomgr/buffer_list.h', @@ -1486,13 +1405,6 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/executor.h', 'src/core/lib/iomgr/fork_posix.cc', 'src/core/lib/iomgr/fork_windows.cc', - 'src/core/util/gethostname.h', - 'src/core/util/gethostname_fallback.cc', - 'src/core/util/gethostname_host_name_max.cc', - 'src/core/util/gethostname_sysconf.cc', - 'src/core/util/grpc_if_nametoindex.h', - 'src/core/util/grpc_if_nametoindex_posix.cc', - 'src/core/util/grpc_if_nametoindex_unsupported.cc', 'src/core/lib/iomgr/internal_errqueue.cc', 'src/core/lib/iomgr/internal_errqueue.h', 'src/core/lib/iomgr/iocp_windows.cc', @@ -1583,8 +1495,6 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/wakeup_fd_pipe.h', 'src/core/lib/iomgr/wakeup_fd_posix.cc', 'src/core/lib/iomgr/wakeup_fd_posix.h', - 'src/core/util/matchers.cc', - 'src/core/util/matchers.h', 'src/core/lib/promise/activity.cc', 'src/core/lib/promise/activity.h', 'src/core/lib/promise/all_ok.h', @@ -1843,8 +1753,6 @@ Pod::Spec.new do |s| 'src/core/lib/transport/transport.h', 'src/core/lib/transport/transport_fwd.h', 'src/core/lib/transport/transport_op_string.cc', - 'src/core/util/uri.cc', - 'src/core/util/uri.h', 'src/core/load_balancing/address_filtering.cc', 'src/core/load_balancing/address_filtering.h', 'src/core/load_balancing/backend_metric_data.h', @@ -2030,7 +1938,39 @@ Pod::Spec.new do |s| 'src/core/util/alloc.h', 'src/core/util/android/log.cc', 'src/core/util/atm.cc', + 'src/core/util/atomic_utils.h', 'src/core/util/avl.h', + 'src/core/util/backoff.cc', + 'src/core/util/backoff.h', + 'src/core/util/bitset.h', + 'src/core/util/chunked_vector.h', + 'src/core/util/construct_destruct.h', + 'src/core/util/cpp_impl_of.h', + 'src/core/util/crash.cc', + 'src/core/util/crash.h', + 'src/core/util/debug_location.h', + 'src/core/util/directory_reader.h', + 'src/core/util/down_cast.h', + 'src/core/util/dual_ref_counted.h', + 'src/core/util/dump_args.cc', + 'src/core/util/dump_args.h', + 'src/core/util/env.h', + 'src/core/util/event_log.cc', + 'src/core/util/event_log.h', + 'src/core/util/examine_stack.cc', + 'src/core/util/examine_stack.h', + 'src/core/util/fork.cc', + 'src/core/util/fork.h', + 'src/core/util/gethostname.h', + 'src/core/util/gethostname_fallback.cc', + 'src/core/util/gethostname_host_name_max.cc', + 'src/core/util/gethostname_sysconf.cc', + 'src/core/util/gpr_time.cc', + 'src/core/util/grpc_if_nametoindex.h', + 'src/core/util/grpc_if_nametoindex_posix.cc', + 'src/core/util/grpc_if_nametoindex_unsupported.cc', + 'src/core/util/host_port.cc', + 'src/core/util/host_port.h', 'src/core/util/http_client/format_request.cc', 'src/core/util/http_client/format_request.h', 'src/core/util/http_client/httpcli.cc', @@ -2039,6 +1979,7 @@ Pod::Spec.new do |s| 'src/core/util/http_client/httpcli_ssl_credentials.h', 'src/core/util/http_client/parser.cc', 'src/core/util/http_client/parser.h', + 'src/core/util/if_list.h', 'src/core/util/iphone/cpu.cc', 'src/core/util/json/json.h', 'src/core/util/json/json_args.h', @@ -2052,32 +1993,91 @@ Pod::Spec.new do |s| 'src/core/util/json/json_writer.cc', 'src/core/util/json/json_writer.h', 'src/core/util/linux/cpu.cc', + 'src/core/util/linux/env.cc', 'src/core/util/linux/log.cc', + 'src/core/util/load_file.cc', + 'src/core/util/load_file.h', 'src/core/util/log.cc', + 'src/core/util/manual_constructor.h', + 'src/core/util/match.h', + 'src/core/util/matchers.cc', + 'src/core/util/matchers.h', + 'src/core/util/memory.h', + 'src/core/util/mpscq.cc', + 'src/core/util/mpscq.h', 'src/core/util/msys/tmpfile.cc', + 'src/core/util/no_destruct.h', + 'src/core/util/notification.h', + 'src/core/util/orphanable.h', + 'src/core/util/overload.h', + 'src/core/util/packed_table.h', + 'src/core/util/per_cpu.cc', + 'src/core/util/per_cpu.h', 'src/core/util/posix/cpu.cc', + 'src/core/util/posix/directory_reader.cc', + 'src/core/util/posix/env.cc', 'src/core/util/posix/log.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/random_early_detection.cc', + 'src/core/util/random_early_detection.h', + 'src/core/util/ref_counted.h', + 'src/core/util/ref_counted_ptr.h', + 'src/core/util/ref_counted_string.cc', + 'src/core/util/ref_counted_string.h', + 'src/core/util/single_set_ptr.h', + 'src/core/util/sorted_pack.h', 'src/core/util/spinlock.h', + 'src/core/util/stat.h', + 'src/core/util/status_helper.cc', + 'src/core/util/status_helper.h', + 'src/core/util/strerror.cc', + 'src/core/util/strerror.h', 'src/core/util/string.cc', 'src/core/util/string.h', 'src/core/util/sync.cc', + 'src/core/util/sync.h', 'src/core/util/sync_abseil.cc', + 'src/core/util/table.h', + 'src/core/util/tchar.cc', + 'src/core/util/tchar.h', + 'src/core/util/thd.h', 'src/core/util/time.cc', + 'src/core/util/time.h', + 'src/core/util/time_averaged_stats.cc', + 'src/core/util/time_averaged_stats.h', 'src/core/util/time_precise.cc', 'src/core/util/time_precise.h', + 'src/core/util/time_util.cc', + 'src/core/util/time_util.h', 'src/core/util/tmpfile.h', + 'src/core/util/type_list.h', + 'src/core/util/unique_type_name.h', + 'src/core/util/uri.cc', + 'src/core/util/uri.h', 'src/core/util/useful.h', + 'src/core/util/uuid_v4.cc', + 'src/core/util/uuid_v4.h', + 'src/core/util/validation_errors.cc', + 'src/core/util/validation_errors.h', 'src/core/util/windows/cpu.cc', + 'src/core/util/windows/directory_reader.cc', + 'src/core/util/windows/env.cc', 'src/core/util/windows/log.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', + 'src/core/util/work_serializer.cc', + 'src/core/util/work_serializer.h', + 'src/core/util/xxhash_inline.h', 'src/core/xds/grpc/certificate_provider_store.cc', 'src/core/xds/grpc/certificate_provider_store.h', 'src/core/xds/grpc/file_watcher_certificate_provider_factory.cc', @@ -2930,8 +2930,6 @@ Pod::Spec.new do |s| 'src/core/handshaker/tcp_connect/tcp_connect_handshaker.h', 'src/core/lib/address_utils/parse_address.h', 'src/core/lib/address_utils/sockaddr_utils.h', - 'src/core/util/backoff.h', - 'src/core/util/random_early_detection.h', 'src/core/lib/channel/call_finalization.h', 'src/core/lib/channel/channel_args.h', 'src/core/lib/channel/channel_args_preconditioning.h', @@ -2949,7 +2947,6 @@ Pod::Spec.new do |s| 'src/core/lib/config/config_vars.h', 'src/core/lib/config/core_configuration.h', 'src/core/lib/config/load_config.h', - 'src/core/util/event_log.h', 'src/core/lib/debug/trace.h', 'src/core/lib/event_engine/ares_resolver.h', 'src/core/lib/event_engine/cf_engine/cf_engine.h', @@ -3017,54 +3014,6 @@ Pod::Spec.new do |s| 'src/core/lib/event_engine/work_queue/work_queue.h', 'src/core/lib/experiments/config.h', 'src/core/lib/experiments/experiments.h', - 'src/core/util/atomic_utils.h', - 'src/core/util/bitset.h', - 'src/core/util/chunked_vector.h', - 'src/core/util/construct_destruct.h', - 'src/core/util/cpp_impl_of.h', - 'src/core/util/crash.h', - 'src/core/util/debug_location.h', - 'src/core/util/directory_reader.h', - 'src/core/util/down_cast.h', - 'src/core/util/dual_ref_counted.h', - 'src/core/util/dump_args.h', - 'src/core/util/env.h', - 'src/core/util/examine_stack.h', - 'src/core/util/fork.h', - 'src/core/util/host_port.h', - 'src/core/util/if_list.h', - 'src/core/util/load_file.h', - 'src/core/util/manual_constructor.h', - 'src/core/util/match.h', - 'src/core/util/memory.h', - 'src/core/util/mpscq.h', - 'src/core/util/no_destruct.h', - 'src/core/util/notification.h', - 'src/core/util/orphanable.h', - 'src/core/util/overload.h', - 'src/core/util/packed_table.h', - 'src/core/util/per_cpu.h', - 'src/core/util/ref_counted.h', - 'src/core/util/ref_counted_ptr.h', - 'src/core/util/ref_counted_string.h', - 'src/core/util/single_set_ptr.h', - 'src/core/util/sorted_pack.h', - 'src/core/util/stat.h', - 'src/core/util/status_helper.h', - 'src/core/util/strerror.h', - 'src/core/util/sync.h', - 'src/core/util/table.h', - 'src/core/util/tchar.h', - 'src/core/util/thd.h', - 'src/core/util/time.h', - 'src/core/util/time_averaged_stats.h', - 'src/core/util/time_util.h', - 'src/core/util/type_list.h', - 'src/core/util/unique_type_name.h', - 'src/core/util/uuid_v4.h', - 'src/core/util/validation_errors.h', - 'src/core/util/work_serializer.h', - 'src/core/util/xxhash_inline.h', 'src/core/lib/iomgr/block_annotate.h', 'src/core/lib/iomgr/buffer_list.h', 'src/core/lib/iomgr/call_combiner.h', @@ -3086,8 +3035,6 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/event_engine_shims/tcp_client.h', 'src/core/lib/iomgr/exec_ctx.h', 'src/core/lib/iomgr/executor.h', - 'src/core/util/gethostname.h', - 'src/core/util/grpc_if_nametoindex.h', 'src/core/lib/iomgr/internal_errqueue.h', 'src/core/lib/iomgr/iocp_windows.h', 'src/core/lib/iomgr/iomgr.h', @@ -3130,7 +3077,6 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/vsock.h', 'src/core/lib/iomgr/wakeup_fd_pipe.h', 'src/core/lib/iomgr/wakeup_fd_posix.h', - 'src/core/util/matchers.h', 'src/core/lib/promise/activity.h', 'src/core/lib/promise/all_ok.h', 'src/core/lib/promise/arena_promise.h', @@ -3271,7 +3217,6 @@ Pod::Spec.new do |s| 'src/core/lib/transport/timeout_encoding.h', 'src/core/lib/transport/transport.h', 'src/core/lib/transport/transport_fwd.h', - 'src/core/util/uri.h', 'src/core/load_balancing/address_filtering.h', 'src/core/load_balancing/backend_metric_data.h', 'src/core/load_balancing/backend_metric_parser.h', @@ -3362,11 +3307,31 @@ Pod::Spec.new do |s| 'src/core/tsi/transport_security_grpc.h', 'src/core/tsi/transport_security_interface.h', 'src/core/util/alloc.h', + 'src/core/util/atomic_utils.h', 'src/core/util/avl.h', + 'src/core/util/backoff.h', + 'src/core/util/bitset.h', + 'src/core/util/chunked_vector.h', + 'src/core/util/construct_destruct.h', + 'src/core/util/cpp_impl_of.h', + 'src/core/util/crash.h', + 'src/core/util/debug_location.h', + 'src/core/util/directory_reader.h', + 'src/core/util/down_cast.h', + 'src/core/util/dual_ref_counted.h', + 'src/core/util/dump_args.h', + 'src/core/util/env.h', + 'src/core/util/event_log.h', + 'src/core/util/examine_stack.h', + 'src/core/util/fork.h', + 'src/core/util/gethostname.h', + 'src/core/util/grpc_if_nametoindex.h', + 'src/core/util/host_port.h', 'src/core/util/http_client/format_request.h', 'src/core/util/http_client/httpcli.h', 'src/core/util/http_client/httpcli_ssl_credentials.h', 'src/core/util/http_client/parser.h', + 'src/core/util/if_list.h', 'src/core/util/json/json.h', 'src/core/util/json/json_args.h', 'src/core/util/json/json_channel_args.h', @@ -3374,11 +3339,46 @@ Pod::Spec.new do |s| 'src/core/util/json/json_reader.h', 'src/core/util/json/json_util.h', 'src/core/util/json/json_writer.h', + 'src/core/util/load_file.h', + 'src/core/util/manual_constructor.h', + 'src/core/util/match.h', + 'src/core/util/matchers.h', + 'src/core/util/memory.h', + 'src/core/util/mpscq.h', + 'src/core/util/no_destruct.h', + 'src/core/util/notification.h', + 'src/core/util/orphanable.h', + 'src/core/util/overload.h', + 'src/core/util/packed_table.h', + 'src/core/util/per_cpu.h', + 'src/core/util/random_early_detection.h', + 'src/core/util/ref_counted.h', + 'src/core/util/ref_counted_ptr.h', + 'src/core/util/ref_counted_string.h', + 'src/core/util/single_set_ptr.h', + 'src/core/util/sorted_pack.h', 'src/core/util/spinlock.h', + 'src/core/util/stat.h', + 'src/core/util/status_helper.h', + 'src/core/util/strerror.h', 'src/core/util/string.h', + 'src/core/util/sync.h', + 'src/core/util/table.h', + 'src/core/util/tchar.h', + 'src/core/util/thd.h', + 'src/core/util/time.h', + 'src/core/util/time_averaged_stats.h', 'src/core/util/time_precise.h', + 'src/core/util/time_util.h', 'src/core/util/tmpfile.h', + 'src/core/util/type_list.h', + 'src/core/util/unique_type_name.h', + 'src/core/util/uri.h', 'src/core/util/useful.h', + 'src/core/util/uuid_v4.h', + 'src/core/util/validation_errors.h', + 'src/core/util/work_serializer.h', + 'src/core/util/xxhash_inline.h', 'src/core/xds/grpc/certificate_provider_store.h', 'src/core/xds/grpc/file_watcher_certificate_provider_factory.h', 'src/core/xds/grpc/upb_utils.h', diff --git a/grpc.gemspec b/grpc.gemspec index 845e8a42004..28e59dc9149 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -1096,10 +1096,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/address_utils/parse_address.h ) s.files += %w( src/core/lib/address_utils/sockaddr_utils.cc ) s.files += %w( src/core/lib/address_utils/sockaddr_utils.h ) - s.files += %w( src/core/util/backoff.cc ) - s.files += %w( src/core/util/backoff.h ) - s.files += %w( src/core/util/random_early_detection.cc ) - s.files += %w( src/core/util/random_early_detection.h ) s.files += %w( src/core/lib/channel/call_finalization.h ) s.files += %w( src/core/lib/channel/channel_args.cc ) s.files += %w( src/core/lib/channel/channel_args.h ) @@ -1133,8 +1129,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/config/core_configuration.h ) s.files += %w( src/core/lib/config/load_config.cc ) s.files += %w( src/core/lib/config/load_config.h ) - s.files += %w( src/core/util/event_log.cc ) - s.files += %w( src/core/util/event_log.h ) s.files += %w( src/core/lib/debug/trace.cc ) s.files += %w( src/core/lib/debug/trace.h ) s.files += %w( src/core/lib/event_engine/ares_resolver.cc ) @@ -1253,81 +1247,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/experiments/config.h ) s.files += %w( src/core/lib/experiments/experiments.cc ) s.files += %w( src/core/lib/experiments/experiments.h ) - s.files += %w( src/core/util/atomic_utils.h ) - s.files += %w( src/core/util/bitset.h ) - s.files += %w( src/core/util/chunked_vector.h ) - s.files += %w( src/core/util/construct_destruct.h ) - s.files += %w( src/core/util/cpp_impl_of.h ) - s.files += %w( src/core/util/crash.cc ) - s.files += %w( src/core/util/crash.h ) - s.files += %w( src/core/util/debug_location.h ) - s.files += %w( src/core/util/directory_reader.h ) - s.files += %w( src/core/util/down_cast.h ) - s.files += %w( src/core/util/dual_ref_counted.h ) - s.files += %w( src/core/util/dump_args.cc ) - s.files += %w( src/core/util/dump_args.h ) - s.files += %w( src/core/util/env.h ) - s.files += %w( src/core/util/examine_stack.cc ) - s.files += %w( src/core/util/examine_stack.h ) - s.files += %w( src/core/util/fork.cc ) - s.files += %w( src/core/util/fork.h ) - s.files += %w( src/core/util/host_port.cc ) - s.files += %w( src/core/util/host_port.h ) - s.files += %w( src/core/util/if_list.h ) - s.files += %w( src/core/util/linux/env.cc ) - s.files += %w( src/core/util/load_file.cc ) - s.files += %w( src/core/util/load_file.h ) - s.files += %w( src/core/util/manual_constructor.h ) - s.files += %w( src/core/util/match.h ) - s.files += %w( src/core/util/memory.h ) - s.files += %w( src/core/util/mpscq.cc ) - s.files += %w( src/core/util/mpscq.h ) - s.files += %w( src/core/util/no_destruct.h ) - s.files += %w( src/core/util/notification.h ) - s.files += %w( src/core/util/orphanable.h ) - s.files += %w( src/core/util/overload.h ) - s.files += %w( src/core/util/packed_table.h ) - s.files += %w( src/core/util/per_cpu.cc ) - s.files += %w( src/core/util/per_cpu.h ) - s.files += %w( src/core/util/posix/directory_reader.cc ) - s.files += %w( src/core/util/posix/env.cc ) - s.files += %w( src/core/util/posix/stat.cc ) - s.files += %w( src/core/util/posix/thd.cc ) - s.files += %w( src/core/util/ref_counted.h ) - s.files += %w( src/core/util/ref_counted_ptr.h ) - s.files += %w( src/core/util/ref_counted_string.cc ) - s.files += %w( src/core/util/ref_counted_string.h ) - s.files += %w( src/core/util/single_set_ptr.h ) - s.files += %w( src/core/util/sorted_pack.h ) - s.files += %w( src/core/util/stat.h ) - s.files += %w( src/core/util/status_helper.cc ) - s.files += %w( src/core/util/status_helper.h ) - s.files += %w( src/core/util/strerror.cc ) - s.files += %w( src/core/util/strerror.h ) - s.files += %w( src/core/util/sync.h ) - s.files += %w( src/core/util/table.h ) - s.files += %w( src/core/util/tchar.cc ) - s.files += %w( src/core/util/tchar.h ) - s.files += %w( src/core/util/thd.h ) - s.files += %w( src/core/util/time.cc ) - s.files += %w( src/core/util/time.h ) - s.files += %w( src/core/util/time_averaged_stats.cc ) - s.files += %w( src/core/util/time_averaged_stats.h ) - s.files += %w( src/core/util/time_util.cc ) - s.files += %w( src/core/util/time_util.h ) - s.files += %w( src/core/util/type_list.h ) - s.files += %w( src/core/util/unique_type_name.h ) - s.files += %w( src/core/util/uuid_v4.cc ) - s.files += %w( src/core/util/uuid_v4.h ) - s.files += %w( src/core/util/validation_errors.cc ) - s.files += %w( src/core/util/validation_errors.h ) - s.files += %w( src/core/util/windows/directory_reader.cc ) - s.files += %w( src/core/util/windows/env.cc ) - s.files += %w( src/core/util/windows/stat.cc ) - s.files += %w( src/core/util/windows/thd.cc ) - s.files += %w( src/core/util/work_serializer.cc ) - s.files += %w( src/core/util/work_serializer.h ) - s.files += %w( src/core/util/xxhash_inline.h ) s.files += %w( src/core/lib/iomgr/block_annotate.h ) s.files += %w( src/core/lib/iomgr/buffer_list.cc ) s.files += %w( src/core/lib/iomgr/buffer_list.h ) @@ -1373,13 +1292,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/iomgr/executor.h ) s.files += %w( src/core/lib/iomgr/fork_posix.cc ) s.files += %w( src/core/lib/iomgr/fork_windows.cc ) - s.files += %w( src/core/util/gethostname.h ) - s.files += %w( src/core/util/gethostname_fallback.cc ) - s.files += %w( src/core/util/gethostname_host_name_max.cc ) - s.files += %w( src/core/util/gethostname_sysconf.cc ) - s.files += %w( src/core/util/grpc_if_nametoindex.h ) - s.files += %w( src/core/util/grpc_if_nametoindex_posix.cc ) - s.files += %w( src/core/util/grpc_if_nametoindex_unsupported.cc ) s.files += %w( src/core/lib/iomgr/internal_errqueue.cc ) s.files += %w( src/core/lib/iomgr/internal_errqueue.h ) s.files += %w( src/core/lib/iomgr/iocp_windows.cc ) @@ -1470,8 +1382,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/iomgr/wakeup_fd_pipe.h ) s.files += %w( src/core/lib/iomgr/wakeup_fd_posix.cc ) s.files += %w( src/core/lib/iomgr/wakeup_fd_posix.h ) - s.files += %w( src/core/util/matchers.cc ) - s.files += %w( src/core/util/matchers.h ) s.files += %w( src/core/lib/promise/activity.cc ) s.files += %w( src/core/lib/promise/activity.h ) s.files += %w( src/core/lib/promise/all_ok.h ) @@ -1730,8 +1640,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/transport/transport.h ) s.files += %w( src/core/lib/transport/transport_fwd.h ) s.files += %w( src/core/lib/transport/transport_op_string.cc ) - s.files += %w( src/core/util/uri.cc ) - s.files += %w( src/core/util/uri.h ) s.files += %w( src/core/load_balancing/address_filtering.cc ) s.files += %w( src/core/load_balancing/address_filtering.h ) s.files += %w( src/core/load_balancing/backend_metric_data.h ) @@ -1917,7 +1825,39 @@ Gem::Specification.new do |s| s.files += %w( src/core/util/alloc.h ) s.files += %w( src/core/util/android/log.cc ) s.files += %w( src/core/util/atm.cc ) + s.files += %w( src/core/util/atomic_utils.h ) s.files += %w( src/core/util/avl.h ) + s.files += %w( src/core/util/backoff.cc ) + s.files += %w( src/core/util/backoff.h ) + s.files += %w( src/core/util/bitset.h ) + s.files += %w( src/core/util/chunked_vector.h ) + s.files += %w( src/core/util/construct_destruct.h ) + s.files += %w( src/core/util/cpp_impl_of.h ) + s.files += %w( src/core/util/crash.cc ) + s.files += %w( src/core/util/crash.h ) + s.files += %w( src/core/util/debug_location.h ) + s.files += %w( src/core/util/directory_reader.h ) + s.files += %w( src/core/util/down_cast.h ) + s.files += %w( src/core/util/dual_ref_counted.h ) + s.files += %w( src/core/util/dump_args.cc ) + s.files += %w( src/core/util/dump_args.h ) + s.files += %w( src/core/util/env.h ) + s.files += %w( src/core/util/event_log.cc ) + s.files += %w( src/core/util/event_log.h ) + s.files += %w( src/core/util/examine_stack.cc ) + s.files += %w( src/core/util/examine_stack.h ) + s.files += %w( src/core/util/fork.cc ) + s.files += %w( src/core/util/fork.h ) + s.files += %w( src/core/util/gethostname.h ) + s.files += %w( src/core/util/gethostname_fallback.cc ) + s.files += %w( src/core/util/gethostname_host_name_max.cc ) + s.files += %w( src/core/util/gethostname_sysconf.cc ) + s.files += %w( src/core/util/gpr_time.cc ) + s.files += %w( src/core/util/grpc_if_nametoindex.h ) + s.files += %w( src/core/util/grpc_if_nametoindex_posix.cc ) + s.files += %w( src/core/util/grpc_if_nametoindex_unsupported.cc ) + s.files += %w( src/core/util/host_port.cc ) + s.files += %w( src/core/util/host_port.h ) s.files += %w( src/core/util/http_client/format_request.cc ) s.files += %w( src/core/util/http_client/format_request.h ) s.files += %w( src/core/util/http_client/httpcli.cc ) @@ -1926,6 +1866,7 @@ Gem::Specification.new do |s| s.files += %w( src/core/util/http_client/httpcli_ssl_credentials.h ) s.files += %w( src/core/util/http_client/parser.cc ) s.files += %w( src/core/util/http_client/parser.h ) + s.files += %w( src/core/util/if_list.h ) s.files += %w( src/core/util/iphone/cpu.cc ) s.files += %w( src/core/util/json/json.h ) s.files += %w( src/core/util/json/json_args.h ) @@ -1939,32 +1880,91 @@ Gem::Specification.new do |s| s.files += %w( src/core/util/json/json_writer.cc ) s.files += %w( src/core/util/json/json_writer.h ) s.files += %w( src/core/util/linux/cpu.cc ) + s.files += %w( src/core/util/linux/env.cc ) s.files += %w( src/core/util/linux/log.cc ) + s.files += %w( src/core/util/load_file.cc ) + s.files += %w( src/core/util/load_file.h ) s.files += %w( src/core/util/log.cc ) + s.files += %w( src/core/util/manual_constructor.h ) + s.files += %w( src/core/util/match.h ) + s.files += %w( src/core/util/matchers.cc ) + s.files += %w( src/core/util/matchers.h ) + s.files += %w( src/core/util/memory.h ) + s.files += %w( src/core/util/mpscq.cc ) + s.files += %w( src/core/util/mpscq.h ) s.files += %w( src/core/util/msys/tmpfile.cc ) + s.files += %w( src/core/util/no_destruct.h ) + s.files += %w( src/core/util/notification.h ) + s.files += %w( src/core/util/orphanable.h ) + s.files += %w( src/core/util/overload.h ) + s.files += %w( src/core/util/packed_table.h ) + s.files += %w( src/core/util/per_cpu.cc ) + s.files += %w( src/core/util/per_cpu.h ) s.files += %w( src/core/util/posix/cpu.cc ) + s.files += %w( src/core/util/posix/directory_reader.cc ) + s.files += %w( src/core/util/posix/env.cc ) s.files += %w( src/core/util/posix/log.cc ) + s.files += %w( src/core/util/posix/stat.cc ) s.files += %w( src/core/util/posix/string.cc ) s.files += %w( src/core/util/posix/sync.cc ) + s.files += %w( src/core/util/posix/thd.cc ) s.files += %w( src/core/util/posix/time.cc ) s.files += %w( src/core/util/posix/tmpfile.cc ) + s.files += %w( src/core/util/random_early_detection.cc ) + s.files += %w( src/core/util/random_early_detection.h ) + s.files += %w( src/core/util/ref_counted.h ) + s.files += %w( src/core/util/ref_counted_ptr.h ) + s.files += %w( src/core/util/ref_counted_string.cc ) + s.files += %w( src/core/util/ref_counted_string.h ) + s.files += %w( src/core/util/single_set_ptr.h ) + s.files += %w( src/core/util/sorted_pack.h ) s.files += %w( src/core/util/spinlock.h ) + s.files += %w( src/core/util/stat.h ) + s.files += %w( src/core/util/status_helper.cc ) + s.files += %w( src/core/util/status_helper.h ) + s.files += %w( src/core/util/strerror.cc ) + s.files += %w( src/core/util/strerror.h ) s.files += %w( src/core/util/string.cc ) s.files += %w( src/core/util/string.h ) s.files += %w( src/core/util/sync.cc ) + s.files += %w( src/core/util/sync.h ) s.files += %w( src/core/util/sync_abseil.cc ) + s.files += %w( src/core/util/table.h ) + s.files += %w( src/core/util/tchar.cc ) + s.files += %w( src/core/util/tchar.h ) + s.files += %w( src/core/util/thd.h ) s.files += %w( src/core/util/time.cc ) + s.files += %w( src/core/util/time.h ) + s.files += %w( src/core/util/time_averaged_stats.cc ) + s.files += %w( src/core/util/time_averaged_stats.h ) s.files += %w( src/core/util/time_precise.cc ) s.files += %w( src/core/util/time_precise.h ) + s.files += %w( src/core/util/time_util.cc ) + s.files += %w( src/core/util/time_util.h ) s.files += %w( src/core/util/tmpfile.h ) + s.files += %w( src/core/util/type_list.h ) + s.files += %w( src/core/util/unique_type_name.h ) + s.files += %w( src/core/util/uri.cc ) + s.files += %w( src/core/util/uri.h ) s.files += %w( src/core/util/useful.h ) + s.files += %w( src/core/util/uuid_v4.cc ) + s.files += %w( src/core/util/uuid_v4.h ) + s.files += %w( src/core/util/validation_errors.cc ) + s.files += %w( src/core/util/validation_errors.h ) s.files += %w( src/core/util/windows/cpu.cc ) + s.files += %w( src/core/util/windows/directory_reader.cc ) + s.files += %w( src/core/util/windows/env.cc ) s.files += %w( src/core/util/windows/log.cc ) + s.files += %w( src/core/util/windows/stat.cc ) s.files += %w( src/core/util/windows/string.cc ) s.files += %w( src/core/util/windows/string_util.cc ) s.files += %w( src/core/util/windows/sync.cc ) + s.files += %w( src/core/util/windows/thd.cc ) s.files += %w( src/core/util/windows/time.cc ) s.files += %w( src/core/util/windows/tmpfile.cc ) + s.files += %w( src/core/util/work_serializer.cc ) + s.files += %w( src/core/util/work_serializer.h ) + s.files += %w( src/core/util/xxhash_inline.h ) s.files += %w( src/core/xds/grpc/certificate_provider_store.cc ) s.files += %w( src/core/xds/grpc/certificate_provider_store.h ) s.files += %w( src/core/xds/grpc/file_watcher_certificate_provider_factory.cc ) diff --git a/package.xml b/package.xml index c17bf278384..946d4b076d9 100644 --- a/package.xml +++ b/package.xml @@ -1078,10 +1078,6 @@ - - - - @@ -1115,8 +1111,6 @@ - - @@ -1235,81 +1229,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1355,13 +1274,6 @@ - - - - - - - @@ -1452,8 +1364,6 @@ - - @@ -1712,8 +1622,6 @@ - - @@ -1899,7 +1807,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1908,6 +1848,7 @@ + @@ -1921,32 +1862,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/core/channelz/channel_trace.cc b/src/core/channelz/channel_trace.cc index 14aeb059b5d..ee1de5e87c5 100644 --- a/src/core/channelz/channel_trace.cc +++ b/src/core/channelz/channel_trace.cc @@ -28,10 +28,10 @@ #include #include "src/core/channelz/channelz.h" -#include "src/core/util/time.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/util/string.h" +#include "src/core/util/time.h" namespace grpc_core { namespace channelz { diff --git a/src/core/channelz/channel_trace.h b/src/core/channelz/channel_trace.h index eb9ef19e643..82ac733e4c7 100644 --- a/src/core/channelz/channel_trace.h +++ b/src/core/channelz/channel_trace.h @@ -28,9 +28,9 @@ #include #include +#include "src/core/util/json/json.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/sync.h" -#include "src/core/util/json/json.h" namespace grpc_core { namespace channelz { diff --git a/src/core/channelz/channelz.cc b/src/core/channelz/channelz.cc index 34fec2748cc..975cc396046 100644 --- a/src/core/channelz/channelz.cc +++ b/src/core/channelz/channelz.cc @@ -39,9 +39,9 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/transport/connectivity_state.h" -#include "src/core/util/uri.h" #include "src/core/util/json/json_writer.h" #include "src/core/util/string.h" +#include "src/core/util/uri.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/channelz/channelz.h b/src/core/channelz/channelz.h index e2527d002fa..6938ec99437 100644 --- a/src/core/channelz/channelz.h +++ b/src/core/channelz/channelz.h @@ -38,11 +38,11 @@ #include #include "src/core/channelz/channel_trace.h" +#include "src/core/util/json/json.h" #include "src/core/util/per_cpu.h" #include "src/core/util/ref_counted.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/sync.h" -#include "src/core/util/json/json.h" #include "src/core/util/time_precise.h" #include "src/core/util/useful.h" diff --git a/src/core/channelz/channelz_registry.cc b/src/core/channelz/channelz_registry.cc index 87194091e0e..9528af833b3 100644 --- a/src/core/channelz/channelz_registry.cc +++ b/src/core/channelz/channelz_registry.cc @@ -34,10 +34,10 @@ #include #include "src/core/channelz/channelz.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/sync.h" namespace grpc_core { namespace channelz { diff --git a/src/core/client_channel/backup_poller.cc b/src/core/client_channel/backup_poller.cc index 1d8234de626..d97b15c07f7 100644 --- a/src/core/client_channel/backup_poller.cc +++ b/src/core/client_channel/backup_poller.cc @@ -29,14 +29,14 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/util/memory.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/timer.h" +#include "src/core/util/memory.h" +#include "src/core/util/time.h" #define DEFAULT_POLL_INTERVAL_MS 5000 diff --git a/src/core/client_channel/client_channel.cc b/src/core/client_channel/client_channel.cc index 84626bea009..96f748af2d8 100644 --- a/src/core/client_channel/client_channel.cc +++ b/src/core/client_channel/client_channel.cc @@ -66,13 +66,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/crash.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/manual_constructor.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/sync.h" -#include "src/core/util/unique_type_name.h" -#include "src/core/util/work_serializer.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/promise/cancel_callback.h" @@ -108,8 +101,15 @@ #include "src/core/service_config/service_config_call_data.h" #include "src/core/service_config/service_config_impl.h" #include "src/core/telemetry/metrics.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" +#include "src/core/util/manual_constructor.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/sync.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/client_channel/client_channel.h b/src/core/client_channel/client_channel.h index 475b53d0d00..54b193d9d4d 100644 --- a/src/core/client_channel/client_channel.h +++ b/src/core/client_channel/client_channel.h @@ -27,13 +27,13 @@ #include "src/core/client_channel/config_selector.h" #include "src/core/client_channel/subchannel.h" #include "src/core/ext/filters/channel_idle/idle_filter_state.h" -#include "src/core/util/single_set_ptr.h" #include "src/core/lib/promise/observable.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/transport/metadata.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/resolver/resolver.h" #include "src/core/service_config/service_config.h" +#include "src/core/util/single_set_ptr.h" namespace grpc_core { diff --git a/src/core/client_channel/client_channel_factory.h b/src/core/client_channel/client_channel_factory.h index 1d07749535a..fee6cd9f628 100644 --- a/src/core/client_channel/client_channel_factory.h +++ b/src/core/client_channel/client_channel_factory.h @@ -23,8 +23,8 @@ #include "src/core/client_channel/subchannel.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/resolved_address.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/client_channel/client_channel_filter.cc b/src/core/client_channel/client_channel_filter.cc index 28bbd5322c9..d78664cf774 100644 --- a/src/core/client_channel/client_channel_filter.cc +++ b/src/core/client_channel/client_channel_filter.cc @@ -68,13 +68,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/crash.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/manual_constructor.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/sync.h" -#include "src/core/util/unique_type_name.h" -#include "src/core/util/work_serializer.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/iomgr/pollset_set.h" @@ -102,8 +95,15 @@ #include "src/core/resolver/resolver_registry.h" #include "src/core/service_config/service_config_call_data.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" +#include "src/core/util/manual_constructor.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/sync.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" +#include "src/core/util/work_serializer.h" // // Client channel filter diff --git a/src/core/client_channel/client_channel_filter.h b/src/core/client_channel/client_channel_filter.h index b21d3513c1f..637f879f8a7 100644 --- a/src/core/client_channel/client_channel_filter.h +++ b/src/core/client_channel/client_channel_filter.h @@ -47,12 +47,6 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/context.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" -#include "src/core/util/time.h" -#include "src/core/util/work_serializer.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" @@ -70,7 +64,13 @@ #include "src/core/resolver/resolver.h" #include "src/core/service_config/service_config.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #include "src/core/util/time_precise.h" +#include "src/core/util/work_serializer.h" // // Client channel filter diff --git a/src/core/client_channel/client_channel_internal.h b/src/core/client_channel/client_channel_internal.h index 62ca5a424b4..bea06c5d80f 100644 --- a/src/core/client_channel/client_channel_internal.h +++ b/src/core/client_channel/client_channel_internal.h @@ -27,12 +27,12 @@ #include #include "src/core/lib/channel/context.h" -#include "src/core/util/unique_type_name.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/transport/call_destination.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/service_config/service_config_call_data.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/unique_type_name.h" // // This file contains internal interfaces used to allow various plugins diff --git a/src/core/client_channel/client_channel_service_config.h b/src/core/client_channel/client_channel_service_config.h index d74f6d77fb0..e985b8e92e0 100644 --- a/src/core/client_channel/client_channel_service_config.h +++ b/src/core/client_channel/client_channel_service_config.h @@ -29,14 +29,14 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" -#include "src/core/util/validation_errors.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/service_config/service_config_parser.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { namespace internal { diff --git a/src/core/client_channel/config_selector.h b/src/core/client_channel/config_selector.h index c6b1ff30ede..6601f959ee4 100644 --- a/src/core/client_channel/config_selector.h +++ b/src/core/client_channel/config_selector.h @@ -33,12 +33,12 @@ #include "src/core/client_channel/client_channel_internal.h" #include "src/core/lib/channel/channel_fwd.h" -#include "src/core/util/ref_counted.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/service_config/service_config.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/useful.h" // Channel arg key for ConfigSelector. diff --git a/src/core/client_channel/connector.h b/src/core/client_channel/connector.h index 328255534d6..927b1024318 100644 --- a/src/core/client_channel/connector.h +++ b/src/core/client_channel/connector.h @@ -21,14 +21,14 @@ #include "src/core/channelz/channelz.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/client_channel/dynamic_filters.cc b/src/core/client_channel/dynamic_filters.cc index 2f0d1d85040..5da6680e215 100644 --- a/src/core/client_channel/dynamic_filters.cc +++ b/src/core/client_channel/dynamic_filters.cc @@ -33,10 +33,10 @@ #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack_builder_impl.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/status_helper.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/surface/lame_client.h" #include "src/core/util/alloc.h" +#include "src/core/util/status_helper.h" // Conversion between call and call stack. #define CALL_TO_CALL_STACK(call) \ diff --git a/src/core/client_channel/dynamic_filters.h b/src/core/client_channel/dynamic_filters.h index a540c056d91..3fd49a454a4 100644 --- a/src/core/client_channel/dynamic_filters.h +++ b/src/core/client_channel/dynamic_filters.h @@ -28,16 +28,16 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/context.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/ref_counted.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/core/util/time_precise.h" namespace grpc_core { diff --git a/src/core/client_channel/retry_filter.cc b/src/core/client_channel/retry_filter.cc index f7874f6dff5..455c7871a0a 100644 --- a/src/core/client_channel/retry_filter.cc +++ b/src/core/client_channel/retry_filter.cc @@ -33,11 +33,11 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/error.h" -#include "src/core/util/uri.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_call_data.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/uri.h" // // Retry filter diff --git a/src/core/client_channel/retry_filter.h b/src/core/client_channel/retry_filter.h index ae57ec31789..bd389aa2fc9 100644 --- a/src/core/client_channel/retry_filter.h +++ b/src/core/client_channel/retry_filter.h @@ -40,9 +40,9 @@ #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/context.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/useful.h" extern grpc_core::TraceFlag grpc_retry_trace; diff --git a/src/core/client_channel/retry_filter_legacy_call_data.cc b/src/core/client_channel/retry_filter_legacy_call_data.cc index fdc4ee98517..0dac512faf8 100644 --- a/src/core/client_channel/retry_filter_legacy_call_data.cc +++ b/src/core/client_channel/retry_filter_legacy_call_data.cc @@ -30,18 +30,10 @@ #include "src/core/client_channel/client_channel_internal.h" #include "src/core/client_channel/retry_service_config.h" #include "src/core/client_channel/retry_throttle.h" -#include "src/core/util/backoff.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/context.h" #include "src/core/lib/channel/status_util.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/construct_destruct.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" @@ -53,6 +45,14 @@ #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/backoff.h" +#include "src/core/util/construct_destruct.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/client_channel/retry_filter_legacy_call_data.h b/src/core/client_channel/retry_filter_legacy_call_data.h index 542d216b41e..c88e505998d 100644 --- a/src/core/client_channel/retry_filter_legacy_call_data.h +++ b/src/core/client_channel/retry_filter_legacy_call_data.h @@ -34,15 +34,9 @@ #include "src/core/client_channel/retry_filter.h" #include "src/core/client_channel/retry_service_config.h" #include "src/core/client_channel/retry_throttle.h" -#include "src/core/util/backoff.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/context.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" @@ -51,6 +45,12 @@ #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/backoff.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/client_channel/retry_service_config.h b/src/core/client_channel/retry_service_config.h index 479125b6321..237e3b93bcc 100644 --- a/src/core/client_channel/retry_service_config.h +++ b/src/core/client_channel/retry_service_config.h @@ -30,12 +30,12 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/status_util.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/time.h" -#include "src/core/util/validation_errors.h" #include "src/core/service_config/service_config_parser.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { namespace internal { diff --git a/src/core/client_channel/subchannel.cc b/src/core/client_channel/subchannel.cc index a8a3e2416a9..bb900e412a5 100644 --- a/src/core/client_channel/subchannel.cc +++ b/src/core/client_channel/subchannel.cc @@ -45,19 +45,12 @@ #include "src/core/client_channel/subchannel_pool_interface.h" #include "src/core/handshaker/proxy_mapper_registry.h" #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/util/backoff.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack_builder_impl.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/promise/cancel_callback.h" @@ -73,6 +66,13 @@ #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" #include "src/core/util/alloc.h" +#include "src/core/util/backoff.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/sync.h" #include "src/core/util/useful.h" // Backoff parameters. diff --git a/src/core/client_channel/subchannel.h b/src/core/client_channel/subchannel.h index d71b5eacc54..33f36ed4afa 100644 --- a/src/core/client_channel/subchannel.h +++ b/src/core/client_channel/subchannel.h @@ -33,19 +33,9 @@ #include "src/core/client_channel/connector.h" #include "src/core/client_channel/subchannel_pool_interface.h" -#include "src/core/util/backoff.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/context.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/dual_ref_counted.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" -#include "src/core/util/time.h" -#include "src/core/util/unique_type_name.h" -#include "src/core/util/work_serializer.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" @@ -58,7 +48,17 @@ #include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/backoff.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/dual_ref_counted.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #include "src/core/util/time_precise.h" +#include "src/core/util/unique_type_name.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/client_channel/subchannel_interface_internal.h b/src/core/client_channel/subchannel_interface_internal.h index 9f488d1d8c9..9d93984b598 100644 --- a/src/core/client_channel/subchannel_interface_internal.h +++ b/src/core/client_channel/subchannel_interface_internal.h @@ -20,8 +20,8 @@ #include #include "src/core/client_channel/subchannel.h" -#include "src/core/util/unique_type_name.h" #include "src/core/load_balancing/subchannel_interface.h" +#include "src/core/util/unique_type_name.h" namespace grpc_core { diff --git a/src/core/client_channel/subchannel_pool_interface.h b/src/core/client_channel/subchannel_pool_interface.h index c8b0f84b656..803faafc345 100644 --- a/src/core/client_channel/subchannel_pool_interface.h +++ b/src/core/client_channel/subchannel_pool_interface.h @@ -27,9 +27,9 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" +#include "src/core/lib/iomgr/resolved_address.h" #include "src/core/util/ref_counted.h" #include "src/core/util/ref_counted_ptr.h" -#include "src/core/lib/iomgr/resolved_address.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/client_channel/subchannel_stream_client.cc b/src/core/client_channel/subchannel_stream_client.cc index dad48421f48..9c7a0fedb3f 100644 --- a/src/core/client_channel/subchannel_stream_client.cc +++ b/src/core/client_channel/subchannel_stream_client.cc @@ -29,13 +29,13 @@ #include #include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/lib/transport/error_utils.h" #include "src/core/util/debug_location.h" #include "src/core/util/status_helper.h" #include "src/core/util/sync.h" #include "src/core/util/time.h" -#include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/lib/resource_quota/resource_quota.h" -#include "src/core/lib/transport/error_utils.h" #include "src/core/util/time_precise.h" #define SUBCHANNEL_STREAM_INITIAL_CONNECT_BACKOFF_SECONDS 1 diff --git a/src/core/client_channel/subchannel_stream_client.h b/src/core/client_channel/subchannel_stream_client.h index 8461b25cb87..3a8f4cbf815 100644 --- a/src/core/client_channel/subchannel_stream_client.h +++ b/src/core/client_channel/subchannel_stream_client.h @@ -33,11 +33,7 @@ #include #include "src/core/client_channel/subchannel.h" -#include "src/core/util/backoff.h" #include "src/core/lib/channel/context.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" @@ -49,6 +45,10 @@ #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/backoff.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc b/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc index 7747c290cc1..60a77bdd5d9 100644 --- a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc +++ b/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc @@ -36,12 +36,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/no_destruct.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/per_cpu.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -54,6 +48,12 @@ #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/http2_errors.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/per_cpu.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h b/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h index 230d71bb216..576b73c7bdf 100644 --- a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h +++ b/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h @@ -29,14 +29,14 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/single_set_ptr.h" -#include "src/core/util/time.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/single_set_ptr.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/ext/filters/fault_injection/fault_injection_filter.cc b/src/core/ext/filters/fault_injection/fault_injection_filter.cc index 2d5bd0fcc4e..7c69bd92abc 100644 --- a/src/core/ext/filters/fault_injection/fault_injection_filter.cc +++ b/src/core/ext/filters/fault_injection/fault_injection_filter.cc @@ -44,13 +44,13 @@ #include "src/core/lib/channel/status_util.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/time.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/sleep.h" #include "src/core/lib/promise/try_seq.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" #include "src/core/service_config/service_config_call_data.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/ext/filters/fault_injection/fault_injection_filter.h b/src/core/ext/filters/fault_injection/fault_injection_filter.h index f2837cf9baf..982d3b9087a 100644 --- a/src/core/ext/filters/fault_injection/fault_injection_filter.h +++ b/src/core/ext/filters/fault_injection/fault_injection_filter.h @@ -30,9 +30,9 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/util/sync.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h b/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h index d2981073bf1..0016c552c8e 100644 --- a/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h +++ b/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h @@ -33,12 +33,12 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/time.h" -#include "src/core/util/validation_errors.h" #include "src/core/service_config/service_config_parser.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" // Channel arg key for enabling parsing fault injection via method config. #define GRPC_ARG_PARSE_FAULT_INJECTION_METHOD_CONFIG \ diff --git a/src/core/ext/filters/logging/logging_filter.cc b/src/core/ext/filters/logging/logging_filter.cc index f14a520022e..a5e67fe2c4d 100644 --- a/src/core/ext/filters/logging/logging_filter.cc +++ b/src/core/ext/filters/logging/logging_filter.cc @@ -55,8 +55,6 @@ #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/context.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/host_port.h" -#include "src/core/util/time.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/promise/cancel_callback.h" #include "src/core/lib/promise/context.h" @@ -68,9 +66,11 @@ #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" -#include "src/core/util/uri.h" #include "src/core/resolver/resolver_registry.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/host_port.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" namespace grpc_core { diff --git a/src/core/ext/filters/message_size/message_size_filter.h b/src/core/ext/filters/message_size/message_size_filter.h index 37cc5044832..29e0281edca 100644 --- a/src/core/ext/filters/message_size/message_size_filter.h +++ b/src/core/ext/filters/message_size/message_size_filter.h @@ -33,13 +33,13 @@ #include "src/core/lib/channel/context.h" #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/validation_errors.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/transport/transport.h" #include "src/core/service_config/service_config_parser.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/ext/filters/rbac/rbac_service_config_parser.cc b/src/core/ext/filters/rbac/rbac_service_config_parser.cc index 1c54e0fa42c..56195fe4625 100644 --- a/src/core/ext/filters/rbac/rbac_service_config_parser.cc +++ b/src/core/ext/filters/rbac/rbac_service_config_parser.cc @@ -31,10 +31,10 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/matchers.h" #include "src/core/lib/security/authorization/audit_logging.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/matchers.h" namespace grpc_core { diff --git a/src/core/ext/filters/rbac/rbac_service_config_parser.h b/src/core/ext/filters/rbac/rbac_service_config_parser.h index 8ad2b9f844d..f9a4c29c34e 100644 --- a/src/core/ext/filters/rbac/rbac_service_config_parser.h +++ b/src/core/ext/filters/rbac/rbac_service_config_parser.h @@ -30,11 +30,11 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/validation_errors.h" #include "src/core/lib/security/authorization/grpc_authorization_engine.h" #include "src/core/lib/security/authorization/rbac_policy.h" #include "src/core/service_config/service_config_parser.h" #include "src/core/util/json/json.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/ext/filters/stateful_session/stateful_session_filter.cc b/src/core/ext/filters/stateful_session/stateful_session_filter.cc index 0dd482e54e1..93987fef309 100644 --- a/src/core/ext/filters/stateful_session/stateful_session_filter.cc +++ b/src/core/ext/filters/stateful_session/stateful_session_filter.cc @@ -44,8 +44,6 @@ #include "src/core/lib/channel/context.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/crash.h" -#include "src/core/util/time.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/map.h" #include "src/core/lib/promise/pipe.h" @@ -55,6 +53,8 @@ #include "src/core/lib/transport/transport.h" #include "src/core/resolver/xds/xds_resolver_attributes.h" #include "src/core/service_config/service_config_call_data.h" +#include "src/core/util/crash.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/ext/filters/stateful_session/stateful_session_filter.h b/src/core/ext/filters/stateful_session/stateful_session_filter.h index ba0389b055a..fd8cf65c07e 100644 --- a/src/core/ext/filters/stateful_session/stateful_session_filter.h +++ b/src/core/ext/filters/stateful_session/stateful_session_filter.h @@ -30,11 +30,11 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/util/ref_counted_string.h" -#include "src/core/util/unique_type_name.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/transport/transport.h" #include "src/core/service_config/service_config_call_data.h" +#include "src/core/util/ref_counted_string.h" +#include "src/core/util/unique_type_name.h" namespace grpc_core { diff --git a/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h b/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h index 57d5d41515b..edf6f55a79d 100644 --- a/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h +++ b/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h @@ -30,12 +30,12 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/time.h" -#include "src/core/util/validation_errors.h" #include "src/core/service_config/service_config_parser.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" // Channel arg key for enabling parsing fault injection via method config. #define GRPC_ARG_PARSE_STATEFUL_SESSION_METHOD_CONFIG \ diff --git a/src/core/ext/gcp/metadata_query.cc b/src/core/ext/gcp/metadata_query.cc index 0a3f78973ea..818f2f70523 100644 --- a/src/core/ext/gcp/metadata_query.cc +++ b/src/core/ext/gcp/metadata_query.cc @@ -37,10 +37,10 @@ #include #include "src/core/lib/debug/trace.h" +#include "src/core/lib/security/credentials/credentials.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/status_helper.h" #include "src/core/util/time.h" -#include "src/core/lib/security/credentials/credentials.h" #include "src/core/util/uri.h" namespace grpc_core { diff --git a/src/core/ext/gcp/metadata_query.h b/src/core/ext/gcp/metadata_query.h index c22c4a1fae4..f0d380cd687 100644 --- a/src/core/ext/gcp/metadata_query.h +++ b/src/core/ext/gcp/metadata_query.h @@ -24,13 +24,13 @@ #include -#include "src/core/util/orphanable.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/polling_entity.h" #include "src/core/util/http_client/httpcli.h" #include "src/core/util/http_client/parser.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/ext/transport/binder/transport/binder_transport.cc b/src/core/ext/transport/binder/transport/binder_transport.cc index 92d20f057c5..f591533543c 100644 --- a/src/core/ext/transport/binder/transport/binder_transport.cc +++ b/src/core/ext/transport/binder/transport/binder_transport.cc @@ -38,12 +38,12 @@ #include "src/core/ext/transport/binder/wire_format/wire_reader_impl.h" #include "src/core/ext/transport/binder/wire_format/wire_writer.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/crash.h" #ifndef NDEBUG static void grpc_binder_stream_ref(grpc_binder_stream* s, const char* reason) { diff --git a/src/core/ext/transport/binder/transport/binder_transport.h b/src/core/ext/transport/binder/transport/binder_transport.h index d38c757d705..da282a78bd1 100644 --- a/src/core/ext/transport/binder/transport/binder_transport.h +++ b/src/core/ext/transport/binder/transport/binder_transport.h @@ -32,9 +32,9 @@ #include "src/core/ext/transport/binder/wire_format/binder.h" #include "src/core/ext/transport/binder/wire_format/wire_reader.h" #include "src/core/ext/transport/binder/wire_format/wire_writer.h" -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/crash.h" struct grpc_binder_stream; diff --git a/src/core/ext/transport/binder/wire_format/wire_writer.h b/src/core/ext/transport/binder/wire_format/wire_writer.h index 2104ce047bb..81041c68c02 100644 --- a/src/core/ext/transport/binder/wire_format/wire_writer.h +++ b/src/core/ext/transport/binder/wire_format/wire_writer.h @@ -25,8 +25,8 @@ #include "src/core/ext/transport/binder/wire_format/binder.h" #include "src/core/ext/transport/binder/wire_format/transaction.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/combiner.h" +#include "src/core/util/sync.h" namespace grpc_binder { diff --git a/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc b/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc index a04f66c79a0..21601c79781 100644 --- a/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc +++ b/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc @@ -39,10 +39,6 @@ #include "src/core/lib/event_engine/extensions/chaotic_good_extension.h" #include "src/core/lib/event_engine/query_extensions.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/no_destruct.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" @@ -64,6 +60,10 @@ #include "src/core/lib/surface/channel_create.h" #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/transport/promise_endpoint.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" namespace grpc_core { namespace chaotic_good { diff --git a/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h b/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h index afb79cbd2ff..96003ed8e8a 100644 --- a/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h +++ b/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h @@ -31,9 +31,6 @@ #include "src/core/handshaker/handshaker.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/util/notification.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -45,6 +42,9 @@ #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/transport/promise_endpoint.h" +#include "src/core/util/notification.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" namespace grpc_core { namespace chaotic_good { diff --git a/src/core/ext/transport/chaotic_good/client_transport.cc b/src/core/ext/transport/chaotic_good/client_transport.cc index 06a214a7ccd..9024efdcb3b 100644 --- a/src/core/ext/transport/chaotic_good/client_transport.cc +++ b/src/core/ext/transport/chaotic_good/client_transport.cc @@ -35,8 +35,6 @@ #include "src/core/ext/transport/chaotic_good/frame.h" #include "src/core/ext/transport/chaotic_good/frame_header.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" -#include "src/core/util/match.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/all_ok.h" @@ -52,6 +50,8 @@ #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/transport/promise_endpoint.h" +#include "src/core/util/match.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { namespace chaotic_good { diff --git a/src/core/ext/transport/chaotic_good/client_transport.h b/src/core/ext/transport/chaotic_good/client_transport.h index 30903fe0dd4..20c63d19f50 100644 --- a/src/core/ext/transport/chaotic_good/client_transport.h +++ b/src/core/ext/transport/chaotic_good/client_transport.h @@ -43,7 +43,6 @@ #include "src/core/ext/transport/chaotic_good/frame_header.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" -#include "src/core/util/sync.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/for_each.h" @@ -61,6 +60,7 @@ #include "src/core/lib/transport/metadata_batch.h" // IWYU pragma: keep #include "src/core/lib/transport/promise_endpoint.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/sync.h" namespace grpc_core { namespace chaotic_good { diff --git a/src/core/ext/transport/chaotic_good/frame.cc b/src/core/ext/transport/chaotic_good/frame.cc index 9341e57dde7..b51cef1d941 100644 --- a/src/core/ext/transport/chaotic_good/frame.cc +++ b/src/core/ext/transport/chaotic_good/frame.cc @@ -29,13 +29,13 @@ #include #include "src/core/ext/transport/chaotic_good/frame_header.h" -#include "src/core/util/bitset.h" -#include "src/core/util/no_destruct.h" -#include "src/core/util/status_helper.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_buffer.h" +#include "src/core/util/bitset.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/status_helper.h" namespace grpc_core { namespace chaotic_good { diff --git a/src/core/ext/transport/chaotic_good/frame.h b/src/core/ext/transport/chaotic_good/frame.h index b34d0e650bb..7927e9a8d7c 100644 --- a/src/core/ext/transport/chaotic_good/frame.h +++ b/src/core/ext/transport/chaotic_good/frame.h @@ -28,11 +28,11 @@ #include "src/core/ext/transport/chaotic_good/frame_header.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" -#include "src/core/util/match.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/match.h" namespace grpc_core { namespace chaotic_good { diff --git a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc index 36366e9e1c1..efceddc1b46 100644 --- a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc +++ b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc @@ -45,11 +45,6 @@ #include "src/core/lib/event_engine/query_extensions.h" #include "src/core/lib/event_engine/resolved_address_internal.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/sync.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" #include "src/core/lib/promise/activity.h" @@ -69,6 +64,11 @@ #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/promise_endpoint.h" #include "src/core/server/server.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" namespace grpc_core { namespace chaotic_good { diff --git a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h index afb1552a5b0..e955ac3f34a 100644 --- a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h +++ b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h @@ -34,8 +34,6 @@ #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" #include "src/core/handshaker/handshaker.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/sync.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" @@ -46,6 +44,8 @@ #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/promise_endpoint.h" #include "src/core/server/server.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" namespace grpc_core { namespace chaotic_good { diff --git a/src/core/ext/transport/chaotic_good/server_transport.cc b/src/core/ext/transport/chaotic_good/server_transport.cc index 61cdc495897..8b5762d6af5 100644 --- a/src/core/ext/transport/chaotic_good/server_transport.cc +++ b/src/core/ext/transport/chaotic_good/server_transport.cc @@ -34,7 +34,6 @@ #include "src/core/ext/transport/chaotic_good/frame.h" #include "src/core/ext/transport/chaotic_good/frame_header.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/event_engine_wakeup_scheduler.h" @@ -47,6 +46,7 @@ #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/promise_endpoint.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { namespace chaotic_good { diff --git a/src/core/ext/transport/chaotic_good/server_transport.h b/src/core/ext/transport/chaotic_good/server_transport.h index 466fbe3ddfa..817b2b702c9 100644 --- a/src/core/ext/transport/chaotic_good/server_transport.h +++ b/src/core/ext/transport/chaotic_good/server_transport.h @@ -51,8 +51,6 @@ #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" #include "src/core/lib/event_engine/default_event_engine.h" // IWYU pragma: keep -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/if.h" @@ -74,6 +72,8 @@ #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/promise_endpoint.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" namespace grpc_core { namespace chaotic_good { diff --git a/src/core/ext/transport/chttp2/client/chttp2_connector.cc b/src/core/ext/transport/chttp2/client/chttp2_connector.cc index 1cc3de61871..3a92441ec31 100644 --- a/src/core/ext/transport/chttp2/client/chttp2_connector.cc +++ b/src/core/ext/transport/chttp2/client/chttp2_connector.cc @@ -55,11 +55,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/time.h" -#include "src/core/util/unique_type_name.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/resolved_address.h" @@ -73,6 +68,11 @@ #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/transport/transport.h" #include "src/core/resolver/resolver_registry.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" +#include "src/core/util/unique_type_name.h" #ifdef GPR_SUPPORT_CHANNELS_FROM_FD diff --git a/src/core/ext/transport/chttp2/client/chttp2_connector.h b/src/core/ext/transport/chttp2/client/chttp2_connector.h index 226cc317caa..bda6949eaab 100644 --- a/src/core/ext/transport/chttp2/client/chttp2_connector.h +++ b/src/core/ext/transport/chttp2/client/chttp2_connector.h @@ -27,11 +27,11 @@ #include "src/core/client_channel/connector.h" #include "src/core/handshaker/handshaker.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc index 2002464e733..80a1d52961a 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.cc +++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc @@ -61,13 +61,6 @@ #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/extensions/supports_fd.h" #include "src/core/lib/event_engine/query_extensions.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/sync.h" -#include "src/core/util/time.h" -#include "src/core/util/unique_type_name.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" @@ -87,8 +80,15 @@ #include "src/core/lib/surface/api_trace.h" #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/transport/transport.h" -#include "src/core/util/uri.h" #include "src/core/server/server.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/unique_type_name.h" +#include "src/core/util/uri.h" #ifdef GPR_SUPPORT_CHANNELS_FROM_FD #include "src/core/lib/iomgr/ev_posix.h" diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc index ac4881c902f..52757ebcb64 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc @@ -76,12 +76,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/context.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/bitset.h" -#include "src/core/util/crash.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/ref_counted.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -107,8 +101,14 @@ #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" #include "src/core/telemetry/tcp_tracer.h" +#include "src/core/util/bitset.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" #include "src/core/util/http_client/parser.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/status_helper.h" #include "src/core/util/string.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" #ifdef GRPC_POSIX_SOCKET_TCP diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.h b/src/core/ext/transport/chttp2/transport/chttp2_transport.h index 08476bf0c84..29d9a239e7b 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.h +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.h @@ -31,14 +31,14 @@ #include "src/core/ext/transport/chttp2/transport/flow_control.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/buffer_list.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/transport/transport.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" extern grpc_core::TraceFlag grpc_keepalive_trace; extern grpc_core::TraceFlag grpc_trace_http2_stream_state; diff --git a/src/core/ext/transport/chttp2/transport/flow_control.h b/src/core/ext/transport/chttp2/transport/flow_control.h index f62a0dde4ff..72ca7bd36a0 100644 --- a/src/core/ext/transport/chttp2/transport/flow_control.h +++ b/src/core/ext/transport/chttp2/transport/flow_control.h @@ -37,9 +37,9 @@ #include "src/core/ext/transport/chttp2/transport/http2_settings.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/time.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/transport/bdp_estimator.h" +#include "src/core/util/time.h" extern grpc_core::TraceFlag grpc_flowctl_trace; diff --git a/src/core/ext/transport/chttp2/transport/frame_data.cc b/src/core/ext/transport/chttp2/transport/frame_data.cc index 91c6a43ef20..97634d05d1e 100644 --- a/src/core/ext/transport/chttp2/transport/frame_data.cc +++ b/src/core/ext/transport/chttp2/transport/frame_data.cc @@ -30,10 +30,10 @@ #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/status_helper.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/status_helper.h" absl::Status grpc_chttp2_data_parser_begin_frame(uint8_t flags, uint32_t stream_id, diff --git a/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc b/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc index 6d4b6f36657..99e18edaccf 100644 --- a/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc +++ b/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc @@ -36,9 +36,9 @@ #include "src/core/ext/transport/chttp2/transport/ping_callbacks.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/status_helper.h" #include "src/core/lib/transport/http2_errors.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/status_helper.h" grpc_slice grpc_chttp2_rst_stream_create(uint32_t id, uint32_t code, grpc_transport_one_way_stats* stats) { diff --git a/src/core/ext/transport/chttp2/transport/frame_settings.cc b/src/core/ext/transport/chttp2/transport/frame_settings.cc index 909523dc3a1..6930f6fda00 100644 --- a/src/core/ext/transport/chttp2/transport/frame_settings.cc +++ b/src/core/ext/transport/chttp2/transport/frame_settings.cc @@ -37,9 +37,9 @@ #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/debug_location.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/debug_location.h" #include "src/core/util/useful.h" static uint8_t* fill_header(uint8_t* out, uint32_t length, uint8_t flags) { diff --git a/src/core/ext/transport/chttp2/transport/frame_settings.h b/src/core/ext/transport/chttp2/transport/frame_settings.h index e3ad2f89844..011862f5888 100644 --- a/src/core/ext/transport/chttp2/transport/frame_settings.h +++ b/src/core/ext/transport/chttp2/transport/frame_settings.h @@ -27,8 +27,8 @@ #include "src/core/ext/transport/chttp2/transport/http2_settings.h" #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" -#include "src/core/util/manual_constructor.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/manual_constructor.h" typedef enum { GRPC_CHTTP2_SPS_ID0, diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc index 42894ea8dbd..8fca1d2d734 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc @@ -35,9 +35,9 @@ #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" #include "src/core/ext/transport/chttp2/transport/varint.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/crash.h" #include "src/core/lib/surface/validate_metadata.h" #include "src/core/lib/transport/timeout_encoding.h" +#include "src/core/util/crash.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder.h b/src/core/ext/transport/chttp2/transport/hpack_encoder.h index 8286be4a073..6bda110dd1d 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_encoder.h +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.h @@ -35,13 +35,13 @@ #include "src/core/ext/transport/chttp2/transport/hpack_constants.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder_table.h" -#include "src/core/util/time.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/metadata_compression_traits.h" #include "src/core/lib/transport/timeout_encoding.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/transport/hpack_parse_result.cc b/src/core/ext/transport/chttp2/transport/hpack_parse_result.cc index ab5e859f76e..aa4b69623ad 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parse_result.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_parse_result.cc @@ -22,9 +22,9 @@ #include #include "src/core/ext/transport/chttp2/transport/hpack_constants.h" -#include "src/core/util/status_helper.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/status_helper.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/transport/hpack_parse_result.h b/src/core/ext/transport/chttp2/transport/hpack_parse_result.h index faf83186298..af5c00a98f4 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parse_result.h +++ b/src/core/ext/transport/chttp2/transport/hpack_parse_result.h @@ -30,11 +30,11 @@ #include #include +#include "src/core/lib/surface/validate_metadata.h" +#include "src/core/lib/transport/metadata_batch.h" #include "src/core/util/crash.h" #include "src/core/util/ref_counted.h" #include "src/core/util/ref_counted_ptr.h" -#include "src/core/lib/surface/validate_metadata.h" -#include "src/core/lib/transport/metadata_batch.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.cc b/src/core/ext/transport/chttp2/transport/hpack_parser.cc index b7d13497419..fad03e1b628 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parser.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_parser.cc @@ -45,7 +45,6 @@ #include "src/core/ext/transport/chttp2/transport/hpack_parse_result.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser_table.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/match.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_refcount.h" #include "src/core/lib/surface/validate_metadata.h" @@ -54,6 +53,7 @@ #include "src/core/telemetry/call_tracer.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/match.h" // IWYU pragma: no_include diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.h b/src/core/ext/transport/chttp2/transport/hpack_parser.h index a1b4c2797ed..b5e710f95dd 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parser.h +++ b/src/core/ext/transport/chttp2/transport/hpack_parser.h @@ -39,12 +39,12 @@ #include "src/core/ext/transport/chttp2/transport/hpack_parse_result.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser_table.h" #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" -#include "src/core/util/random_early_detection.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_refcount.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/random_early_detection.h" // IWYU pragma: no_include diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser_table.h b/src/core/ext/transport/chttp2/transport/hpack_parser_table.h index 618d76200f7..e982f7663ce 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parser_table.h +++ b/src/core/ext/transport/chttp2/transport/hpack_parser_table.h @@ -31,9 +31,9 @@ #include "src/core/ext/transport/chttp2/transport/hpack_constants.h" #include "src/core/ext/transport/chttp2/transport/hpack_parse_result.h" -#include "src/core/util/no_destruct.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/parsed_metadata.h" +#include "src/core/util/no_destruct.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/transport/internal.h b/src/core/ext/transport/chttp2/transport/internal.h index d688b9d3aa6..2491f4832e5 100644 --- a/src/core/ext/transport/chttp2/transport/internal.h +++ b/src/core/ext/transport/chttp2/transport/internal.h @@ -59,11 +59,6 @@ #include "src/core/ext/transport/chttp2/transport/write_size_policy.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/bitset.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/ref_counted.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/iomgr/endpoint.h" @@ -79,6 +74,11 @@ #include "src/core/lib/transport/transport.h" #include "src/core/telemetry/call_tracer.h" #include "src/core/telemetry/tcp_tracer.h" +#include "src/core/util/bitset.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" // Flag that this closure barrier may be covering a write in a pollset, and so // we should not complete this closure until we can prove that the write got diff --git a/src/core/ext/transport/chttp2/transport/parsing.cc b/src/core/ext/transport/chttp2/transport/parsing.cc index 5d600a6218c..f810133c4d7 100644 --- a/src/core/ext/transport/chttp2/transport/parsing.cc +++ b/src/core/ext/transport/chttp2/transport/parsing.cc @@ -59,12 +59,9 @@ #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" #include "src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.h" #include "src/core/ext/transport/chttp2/transport/ping_rate_policy.h" -#include "src/core/util/random_early_detection.h" #include "src/core/lib/channel/context.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/status_helper.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/iomgr/endpoint.h" @@ -76,6 +73,9 @@ #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/random_early_detection.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" using grpc_core::HPackParser; diff --git a/src/core/ext/transport/chttp2/transport/writing.cc b/src/core/ext/transport/chttp2/transport/writing.cc index d85dbc9c720..0fd626f7265 100644 --- a/src/core/ext/transport/chttp2/transport/writing.cc +++ b/src/core/ext/transport/chttp2/transport/writing.cc @@ -56,10 +56,6 @@ #include "src/core/ext/transport/chttp2/transport/write_size_policy.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/match.h" -#include "src/core/util/ref_counted.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -72,6 +68,10 @@ #include "src/core/telemetry/call_tracer.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/match.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" // IWYU pragma: no_include "src/core/util/orphanable.h" diff --git a/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc b/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc index 0e7824ccf20..1459449f6a1 100644 --- a/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc +++ b/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc @@ -28,12 +28,12 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/channel_create.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" GRPCAPI grpc_channel* grpc_cronet_secure_channel_create( void* engine, const char* target, const grpc_channel_args* args, diff --git a/src/core/ext/transport/cronet/transport/cronet_transport.cc b/src/core/ext/transport/cronet/transport/cronet_transport.cc index a369e55fa2c..6cdbec76b2f 100644 --- a/src/core/ext/transport/cronet/transport/cronet_transport.cc +++ b/src/core/ext/transport/cronet/transport/cronet_transport.cc @@ -47,9 +47,6 @@ #include "src/core/ext/transport/chttp2/transport/bin_encoder.h" #include "src/core/ext/transport/cronet/transport/cronet_status.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/crash.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/status_helper.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -61,6 +58,9 @@ #include "src/core/lib/surface/validate_metadata.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/status_helper.h" // IWYU pragma: no_include diff --git a/src/core/ext/transport/inproc/inproc_transport.cc b/src/core/ext/transport/inproc/inproc_transport.cc index 1aff8360702..033af985dee 100644 --- a/src/core/ext/transport/inproc/inproc_transport.cc +++ b/src/core/ext/transport/inproc/inproc_transport.cc @@ -25,13 +25,13 @@ #include "src/core/ext/transport/inproc/legacy_inproc_transport.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/crash.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/promise/try_seq.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/surface/channel_create.h" #include "src/core/lib/transport/transport.h" #include "src/core/server/server.h" +#include "src/core/util/crash.h" namespace grpc_core { diff --git a/src/core/ext/transport/inproc/legacy_inproc_transport.cc b/src/core/ext/transport/inproc/legacy_inproc_transport.cc index f3e7d85d2d6..1c71dbc2cc0 100644 --- a/src/core/ext/transport/inproc/legacy_inproc_transport.cc +++ b/src/core/ext/transport/inproc/legacy_inproc_transport.cc @@ -48,10 +48,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -68,6 +64,10 @@ #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" #include "src/core/server/server.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" #define INPROC_LOG(...) \ do { \ diff --git a/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc b/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc index b2a7bf2df6e..a79ce4c95a8 100644 --- a/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc +++ b/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc @@ -26,11 +26,11 @@ #include "src/core/handshaker/handshaker_factory.h" #include "src/core/handshaker/handshaker_registry.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/handshaker/handshaker.cc b/src/core/handshaker/handshaker.cc index 494da93bbbe..37447467504 100644 --- a/src/core/handshaker/handshaker.cc +++ b/src/core/handshaker/handshaker.cc @@ -36,10 +36,10 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/status_helper.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/status_helper.h" namespace grpc_core { diff --git a/src/core/handshaker/handshaker.h b/src/core/handshaker/handshaker.h index 2c0b9e1ff20..0f000cbaede 100644 --- a/src/core/handshaker/handshaker.h +++ b/src/core/handshaker/handshaker.h @@ -31,14 +31,14 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/ref_counted.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/tcp_server.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/handshaker/http_connect/http_connect_handshaker.cc b/src/core/handshaker/http_connect/http_connect_handshaker.cc index 5fc9922dbd4..7fa0236200f 100644 --- a/src/core/handshaker/http_connect/http_connect_handshaker.cc +++ b/src/core/handshaker/http_connect/http_connect_handshaker.cc @@ -41,18 +41,18 @@ #include "src/core/handshaker/handshaker_registry.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/tcp_server.h" +#include "src/core/util/debug_location.h" #include "src/core/util/http_client/format_request.h" #include "src/core/util/http_client/parser.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/string.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/handshaker/http_connect/http_proxy_mapper.cc b/src/core/handshaker/http_connect/http_proxy_mapper.cc index 12851e25317..ba6e41106d8 100644 --- a/src/core/handshaker/http_connect/http_proxy_mapper.cc +++ b/src/core/handshaker/http_connect/http_proxy_mapper.cc @@ -48,12 +48,12 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/iomgr/resolve_address.h" #include "src/core/util/env.h" #include "src/core/util/host_port.h" #include "src/core/util/memory.h" -#include "src/core/lib/iomgr/resolve_address.h" -#include "src/core/util/uri.h" #include "src/core/util/string.h" +#include "src/core/util/uri.h" namespace grpc_core { namespace { diff --git a/src/core/handshaker/security/secure_endpoint.cc b/src/core/handshaker/security/secure_endpoint.cc index c0af9e374ec..6048930046a 100644 --- a/src/core/handshaker/security/secure_endpoint.cc +++ b/src/core/handshaker/security/secure_endpoint.cc @@ -42,9 +42,6 @@ #include "src/core/handshaker/security/tsi_error.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -57,7 +54,10 @@ #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/tsi/transport_security_grpc.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/string.h" +#include "src/core/util/sync.h" #define STAGING_BUFFER_SIZE 8192 diff --git a/src/core/handshaker/security/security_handshaker.cc b/src/core/handshaker/security/security_handshaker.cc index abeb80bb0c2..ce1dc644306 100644 --- a/src/core/handshaker/security/security_handshaker.cc +++ b/src/core/handshaker/security/security_handshaker.cc @@ -51,10 +51,6 @@ #include "src/core/handshaker/security/tsi_error.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" -#include "src/core/util/unique_type_name.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -67,6 +63,10 @@ #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" #include "src/core/tsi/transport_security_grpc.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/unique_type_name.h" #define GRPC_INITIAL_HANDSHAKE_BUFFER_SIZE 256 diff --git a/src/core/handshaker/security/security_handshaker.h b/src/core/handshaker/security/security_handshaker.h index 17d234402b7..3e6096d6c47 100644 --- a/src/core/handshaker/security/security_handshaker.h +++ b/src/core/handshaker/security/security_handshaker.h @@ -27,9 +27,9 @@ #include "src/core/handshaker/handshaker.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc b/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc index 449ad012c23..36a2f881435 100644 --- a/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc +++ b/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc @@ -39,9 +39,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -52,6 +49,9 @@ #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/tcp_server.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" #include "src/core/util/uri.h" namespace grpc_core { diff --git a/src/core/lib/address_utils/parse_address.cc b/src/core/lib/address_utils/parse_address.cc index b6108fb6d83..c43b9654201 100644 --- a/src/core/lib/address_utils/parse_address.cc +++ b/src/core/lib/address_utils/parse_address.cc @@ -50,11 +50,11 @@ #include -#include "src/core/util/host_port.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/grpc_if_nametoindex.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils.h" +#include "src/core/util/grpc_if_nametoindex.h" +#include "src/core/util/host_port.h" +#include "src/core/util/status_helper.h" #include "src/core/util/string.h" // IWYU pragma: no_include diff --git a/src/core/lib/address_utils/sockaddr_utils.cc b/src/core/lib/address_utils/sockaddr_utils.cc index 16e7da2d3d7..db4180cdc62 100644 --- a/src/core/lib/address_utils/sockaddr_utils.cc +++ b/src/core/lib/address_utils/sockaddr_utils.cc @@ -38,11 +38,11 @@ #include -#include "src/core/util/crash.h" -#include "src/core/util/host_port.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils.h" +#include "src/core/util/crash.h" +#include "src/core/util/host_port.h" #include "src/core/util/uri.h" #ifdef GRPC_HAVE_UNIX_SOCKET diff --git a/src/core/lib/channel/channel_args.h b/src/core/lib/channel/channel_args.h index 68f8c9618a0..b28e41fb750 100644 --- a/src/core/lib/channel/channel_args.h +++ b/src/core/lib/channel/channel_args.h @@ -37,14 +37,14 @@ #include #include +#include "src/core/lib/surface/channel_stack_type.h" +#include "src/core/util/avl.h" #include "src/core/util/debug_location.h" #include "src/core/util/dual_ref_counted.h" #include "src/core/util/ref_counted.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/ref_counted_string.h" #include "src/core/util/time.h" -#include "src/core/lib/surface/channel_stack_type.h" -#include "src/core/util/avl.h" #include "src/core/util/useful.h" // TODO(hork): When we're ready to allow setting via a channel arg from the diff --git a/src/core/lib/channel/channel_stack.h b/src/core/lib/channel/channel_stack.h index 8523fab80b1..ef5e3cdde4c 100644 --- a/src/core/lib/channel/channel_stack.h +++ b/src/core/lib/channel/channel_stack.h @@ -61,9 +61,6 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/context.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/manual_constructor.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" @@ -73,6 +70,9 @@ #include "src/core/lib/transport/call_final_info.h" #include "src/core/lib/transport/transport.h" #include "src/core/telemetry/metrics.h" +#include "src/core/util/manual_constructor.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/core/util/time_precise.h" struct grpc_channel_element_args { diff --git a/src/core/lib/channel/channel_stack_builder.h b/src/core/lib/channel/channel_stack_builder.h index 6b88aca8b61..b6256c96bb6 100644 --- a/src/core/lib/channel/channel_stack_builder.h +++ b/src/core/lib/channel/channel_stack_builder.h @@ -25,8 +25,8 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/surface/channel_stack_type.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/channel/channel_stack_builder_impl.cc b/src/core/lib/channel/channel_stack_builder_impl.cc index 7dcdca90592..6ed601c8173 100644 --- a/src/core/lib/channel/channel_stack_builder_impl.cc +++ b/src/core/lib/channel/channel_stack_builder_impl.cc @@ -39,8 +39,6 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/no_destruct.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/promise/activity.h" @@ -51,6 +49,8 @@ #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/lib/channel/connected_channel.cc b/src/core/lib/channel/connected_channel.cc index 4a1fa16a94d..e5a76685a2a 100644 --- a/src/core/lib/channel/connected_channel.cc +++ b/src/core/lib/channel/connected_channel.cc @@ -44,10 +44,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" @@ -79,6 +75,10 @@ #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" #include "src/core/util/alloc.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" typedef struct connected_channel_channel_data { grpc_core::Transport* transport; diff --git a/src/core/lib/channel/promise_based_filter.cc b/src/core/lib/channel/promise_based_filter.cc index b48fadfeb76..693e072d770 100644 --- a/src/core/lib/channel/promise_based_filter.cc +++ b/src/core/lib/channel/promise_based_filter.cc @@ -33,12 +33,12 @@ #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/crash.h" -#include "src/core/util/manual_constructor.h" -#include "src/core/util/status_helper.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/promise/seq.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/crash.h" +#include "src/core/util/manual_constructor.h" +#include "src/core/util/status_helper.h" extern grpc_core::TraceFlag grpc_trace_channel; diff --git a/src/core/lib/channel/promise_based_filter.h b/src/core/lib/channel/promise_based_filter.h index 2c9ce728540..2cf11e4eb53 100644 --- a/src/core/lib/channel/promise_based_filter.h +++ b/src/core/lib/channel/promise_based_filter.h @@ -49,9 +49,6 @@ #include "src/core/lib/channel/context.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/event_engine_context.h" // IWYU pragma: keep -#include "src/core/util/debug_location.h" -#include "src/core/util/match.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" @@ -73,6 +70,9 @@ #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/match.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/lib/compression/compression_internal.h b/src/core/lib/compression/compression_internal.h index 7636180cc07..45a24faa998 100644 --- a/src/core/lib/compression/compression_internal.h +++ b/src/core/lib/compression/compression_internal.h @@ -30,8 +30,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/bitset.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/bitset.h" namespace grpc_core { diff --git a/src/core/lib/event_engine/ares_resolver.cc b/src/core/lib/event_engine/ares_resolver.cc index 5df39bac584..6918f71a277 100644 --- a/src/core/lib/event_engine/ares_resolver.cc +++ b/src/core/lib/event_engine/ares_resolver.cc @@ -68,12 +68,12 @@ #include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/grpc_polled_fd.h" #include "src/core/lib/event_engine/time_util.h" +#include "src/core/lib/iomgr/resolved_address.h" +#include "src/core/lib/iomgr/sockaddr.h" #include "src/core/util/debug_location.h" #include "src/core/util/host_port.h" #include "src/core/util/orphanable.h" #include "src/core/util/ref_counted_ptr.h" -#include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/lib/iomgr/sockaddr.h" #ifdef GRPC_POSIX_SOCKET_ARES_EV_DRIVER #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h" #endif diff --git a/src/core/lib/event_engine/cf_engine/cf_engine.h b/src/core/lib/event_engine/cf_engine/cf_engine.h index fafba5dbfd4..6529e649117 100644 --- a/src/core/lib/event_engine/cf_engine/cf_engine.h +++ b/src/core/lib/event_engine/cf_engine/cf_engine.h @@ -26,8 +26,8 @@ #include "src/core/lib/event_engine/posix_engine/lockfree_event.h" #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h" #include "src/core/lib/event_engine/posix_engine/timer_manager.h" -#include "src/core/util/sync.h" #include "src/core/lib/surface/init_internally.h" +#include "src/core/util/sync.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc b/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc index e281e86e555..bb4632fb41a 100644 --- a/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc +++ b/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc @@ -31,8 +31,8 @@ #include "src/core/lib/event_engine/poller.h" #include "src/core/lib/event_engine/time_util.h" -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/crash.h" // This polling engine is only relevant on linux kernels supporting epoll // epoll_create() or epoll_create1() diff --git a/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h b/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h index aaa2f79fd47..9fd9e050f32 100644 --- a/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h +++ b/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h @@ -30,8 +30,8 @@ #include "src/core/lib/event_engine/posix_engine/event_poller.h" #include "src/core/lib/event_engine/posix_engine/internal_errqueue.h" #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/sync.h" #ifdef GRPC_LINUX_EPOLL #include diff --git a/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc b/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc index 64a4325defa..a78c8e34ec7 100644 --- a/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc +++ b/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc @@ -38,8 +38,8 @@ #include "src/core/lib/event_engine/poller.h" #include "src/core/lib/event_engine/posix_engine/event_poller.h" #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h" -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/crash.h" #ifdef GRPC_POSIX_SOCKET_EV_POLL diff --git a/src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc b/src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc index ab480ef9cd4..7f11bbb05a0 100644 --- a/src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc +++ b/src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc @@ -25,8 +25,8 @@ #include "src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h" #include "src/core/lib/event_engine/posix_engine/ev_poll_posix.h" #include "src/core/lib/event_engine/posix_engine/event_poller.h" -#include "src/core/util/no_destruct.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/no_destruct.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h b/src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h index 9fe53ece2c5..7c9f8a5f742 100644 --- a/src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h +++ b/src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h @@ -20,8 +20,8 @@ #include #include -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/sync.h" #if GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER) diff --git a/src/core/lib/event_engine/posix_engine/posix_endpoint.cc b/src/core/lib/event_engine/posix_engine/posix_endpoint.cc index 57af77800bf..ce5ea54b501 100644 --- a/src/core/lib/event_engine/posix_engine/posix_endpoint.cc +++ b/src/core/lib/event_engine/posix_engine/posix_endpoint.cc @@ -46,6 +46,9 @@ #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/event_engine/trace.h" #include "src/core/lib/experiments/experiments.h" +#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/lib/slice/slice.h" #include "src/core/util/debug_location.h" #include "src/core/util/load_file.h" #include "src/core/util/ref_counted_ptr.h" @@ -53,9 +56,6 @@ #include "src/core/util/strerror.h" #include "src/core/util/sync.h" #include "src/core/util/time.h" -#include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/lib/resource_quota/resource_quota.h" -#include "src/core/lib/slice/slice.h" #ifdef GRPC_POSIX_SOCKET_TCP #ifdef GRPC_LINUX_ERRQUEUE diff --git a/src/core/lib/event_engine/posix_engine/posix_endpoint.h b/src/core/lib/event_engine/posix_engine/posix_endpoint.h index da6eb9db0df..2136a9d0ff0 100644 --- a/src/core/lib/event_engine/posix_engine/posix_endpoint.h +++ b/src/core/lib/event_engine/posix_engine/posix_endpoint.h @@ -46,11 +46,11 @@ #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h" #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h" #include "src/core/lib/event_engine/posix_engine/traced_buffer_list.h" +#include "src/core/lib/iomgr/port.h" +#include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/util/crash.h" #include "src/core/util/ref_counted.h" #include "src/core/util/sync.h" -#include "src/core/lib/iomgr/port.h" -#include "src/core/lib/resource_quota/memory_quota.h" #ifdef GRPC_POSIX_SOCKET_TCP diff --git a/src/core/lib/event_engine/posix_engine/posix_engine.h b/src/core/lib/event_engine/posix_engine/posix_engine.h index dbe2f5eb2fd..f2483d11653 100644 --- a/src/core/lib/event_engine/posix_engine/posix_engine.h +++ b/src/core/lib/event_engine/posix_engine/posix_engine.h @@ -39,10 +39,10 @@ #include "src/core/lib/event_engine/posix_engine/timer_manager.h" #include "src/core/lib/event_engine/ref_counted_dns_resolver_interface.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/surface/init_internally.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/sync.h" #ifdef GRPC_POSIX_SOCKET_TCP #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h" diff --git a/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc b/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc index 4666432692e..ef6fb645204 100644 --- a/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc +++ b/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc @@ -46,10 +46,10 @@ #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/event_engine/trace.h" +#include "src/core/lib/iomgr/socket_mutator.h" #include "src/core/util/status_helper.h" #include "src/core/util/strerror.h" #include "src/core/util/time.h" -#include "src/core/lib/iomgr/socket_mutator.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/posix_engine/posix_engine_listener.h b/src/core/lib/event_engine/posix_engine/posix_engine_listener.h index 39bfb057a01..f49e0ff500d 100644 --- a/src/core/lib/event_engine/posix_engine/posix_engine_listener.h +++ b/src/core/lib/event_engine/posix_engine/posix_engine_listener.h @@ -34,8 +34,8 @@ #include #include "src/core/lib/event_engine/posix.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/sync.h" #ifdef GRPC_POSIX_SOCKET_TCP #include "src/core/lib/event_engine/posix_engine/event_poller.h" diff --git a/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc b/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc index 5c2626a532f..18af98880bc 100644 --- a/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc +++ b/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc @@ -34,10 +34,10 @@ #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/util/crash.h" // IWYU pragma: keep -#include "src/core/util/status_helper.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/socket_mutator.h" +#include "src/core/util/crash.h" // IWYU pragma: keep +#include "src/core/util/status_helper.h" #define MIN_SAFE_ACCEPT_QUEUE_SIZE 100 diff --git a/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc b/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc index 063cac3390f..b1adb12460b 100644 --- a/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc +++ b/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc @@ -28,9 +28,9 @@ #include #include +#include "src/core/lib/iomgr/port.h" #include "src/core/util/crash.h" // IWYU pragma: keep #include "src/core/util/time.h" -#include "src/core/lib/iomgr/port.h" #include "src/core/util/useful.h" #ifdef GRPC_POSIX_SOCKET_UTILS_COMMON diff --git a/src/core/lib/event_engine/posix_engine/tcp_socket_utils.h b/src/core/lib/event_engine/posix_engine/tcp_socket_utils.h index 1f4e039de96..2f3ec9f0f82 100644 --- a/src/core/lib/event_engine/posix_engine/tcp_socket_utils.h +++ b/src/core/lib/event_engine/posix_engine/tcp_socket_utils.h @@ -30,10 +30,10 @@ #include #include -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/socket_mutator.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" #ifdef GRPC_POSIX_SOCKET_UTILS_COMMON #include diff --git a/src/core/lib/event_engine/posix_engine/traced_buffer_list.cc b/src/core/lib/event_engine/posix_engine/traced_buffer_list.cc index 66d3a21186b..8a990d64c21 100644 --- a/src/core/lib/event_engine/posix_engine/traced_buffer_list.cc +++ b/src/core/lib/event_engine/posix_engine/traced_buffer_list.cc @@ -28,8 +28,8 @@ #include #include -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/sync.h" #ifdef GRPC_LINUX_ERRQUEUE #include // IWYU pragma: keep diff --git a/src/core/lib/event_engine/posix_engine/traced_buffer_list.h b/src/core/lib/event_engine/posix_engine/traced_buffer_list.h index 47123d76c96..1df29a14243 100644 --- a/src/core/lib/event_engine/posix_engine/traced_buffer_list.h +++ b/src/core/lib/event_engine/posix_engine/traced_buffer_list.h @@ -25,8 +25,8 @@ #include #include "src/core/lib/event_engine/posix_engine/internal_errqueue.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/sync.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.cc b/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.cc index 6c4cbfdbd0c..d6efbd26671 100644 --- a/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.cc +++ b/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.cc @@ -18,8 +18,8 @@ #include -#include "src/core/util/crash.h" // IWYU pragma: keep #include "src/core/lib/iomgr/port.h" +#include "src/core/util/crash.h" // IWYU pragma: keep #ifdef GRPC_LINUX_EVENTFD diff --git a/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.cc b/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.cc index 22a7e1f6b9a..9f2a0959df3 100644 --- a/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.cc +++ b/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.cc @@ -19,8 +19,8 @@ #include -#include "src/core/util/crash.h" // IWYU pragma: keep #include "src/core/lib/iomgr/port.h" +#include "src/core/util/crash.h" // IWYU pragma: keep #ifdef GRPC_POSIX_WAKEUP_FD #include diff --git a/src/core/lib/event_engine/tcp_socket_utils.cc b/src/core/lib/event_engine/tcp_socket_utils.cc index 86341a23608..ce29d4852e5 100644 --- a/src/core/lib/event_engine/tcp_socket_utils.cc +++ b/src/core/lib/event_engine/tcp_socket_utils.cc @@ -60,9 +60,9 @@ #include +#include "src/core/lib/iomgr/resolved_address.h" #include "src/core/util/host_port.h" #include "src/core/util/status_helper.h" -#include "src/core/lib/iomgr/resolved_address.h" #include "src/core/util/uri.h" namespace grpc_event_engine { diff --git a/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc b/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc index 05903fdd5e8..0325188df01 100644 --- a/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc +++ b/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc @@ -36,12 +36,12 @@ #include #include -#include "src/core/util/backoff.h" #include "src/core/lib/event_engine/common_closures.h" #include "src/core/lib/event_engine/thread_local.h" #include "src/core/lib/event_engine/trace.h" #include "src/core/lib/event_engine/work_queue/basic_work_queue.h" #include "src/core/lib/event_engine/work_queue/work_queue.h" +#include "src/core/util/backoff.h" #include "src/core/util/crash.h" #include "src/core/util/env.h" #include "src/core/util/examine_stack.h" diff --git a/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h b/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h index 3c71c2d16c2..69beaa7cddd 100644 --- a/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h +++ b/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h @@ -32,11 +32,11 @@ #include #include -#include "src/core/util/backoff.h" #include "src/core/lib/event_engine/thread_pool/thread_count.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.h" #include "src/core/lib/event_engine/work_queue/basic_work_queue.h" #include "src/core/lib/event_engine/work_queue/work_queue.h" +#include "src/core/util/backoff.h" #include "src/core/util/notification.h" #include "src/core/util/sync.h" #include "src/core/util/time.h" diff --git a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc index 0e09235ab44..2b117625645 100644 --- a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc +++ b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc @@ -34,10 +34,10 @@ #include "src/core/lib/event_engine/grpc_polled_fd.h" #include "src/core/lib/event_engine/windows/grpc_polled_fd_windows.h" #include "src/core/lib/event_engine/windows/win_socket.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/sync.h" // TODO(apolcyn): remove this hack after fixing upstream. // Our grpc/c-ares code on Windows uses the ares_set_socket_functions API, diff --git a/src/core/lib/event_engine/windows/iocp.cc b/src/core/lib/event_engine/windows/iocp.cc index f0ef2f805fb..6339500b3a8 100644 --- a/src/core/lib/event_engine/windows/iocp.cc +++ b/src/core/lib/event_engine/windows/iocp.cc @@ -28,8 +28,8 @@ #include "src/core/lib/event_engine/trace.h" #include "src/core/lib/event_engine/windows/iocp.h" #include "src/core/lib/event_engine/windows/win_socket.h" -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/crash.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/windows/native_windows_dns_resolver.cc b/src/core/lib/event_engine/windows/native_windows_dns_resolver.cc index 2eba884d6fe..87f18442eb9 100644 --- a/src/core/lib/event_engine/windows/native_windows_dns_resolver.cc +++ b/src/core/lib/event_engine/windows/native_windows_dns_resolver.cc @@ -26,9 +26,9 @@ #include #include "src/core/lib/event_engine/windows/native_windows_dns_resolver.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/util/host_port.h" #include "src/core/util/status_helper.h" -#include "src/core/lib/iomgr/error.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/windows/win_socket.cc b/src/core/lib/event_engine/windows/win_socket.cc index 6d29283fa0e..7b8c544f3c6 100644 --- a/src/core/lib/event_engine/windows/win_socket.cc +++ b/src/core/lib/event_engine/windows/win_socket.cc @@ -23,9 +23,9 @@ #include "src/core/lib/event_engine/thread_pool/thread_pool.h" #include "src/core/lib/event_engine/trace.h" #include "src/core/lib/event_engine/windows/win_socket.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/util/debug_location.h" #include "src/core/util/sync.h" -#include "src/core/lib/iomgr/error.h" #if defined(__MSYS__) && defined(GPR_ARCH_64) // Nasty workaround for nasty bug when using the 64 bits msys compiler diff --git a/src/core/lib/event_engine/windows/windows_endpoint.cc b/src/core/lib/event_engine/windows/windows_endpoint.cc index edc0ea555d8..d605535894c 100644 --- a/src/core/lib/event_engine/windows/windows_endpoint.cc +++ b/src/core/lib/event_engine/windows/windows_endpoint.cc @@ -28,9 +28,9 @@ #include "src/core/lib/event_engine/thread_pool/thread_pool.h" #include "src/core/lib/event_engine/trace.h" #include "src/core/lib/event_engine/windows/windows_endpoint.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/util/debug_location.h" #include "src/core/util/status_helper.h" -#include "src/core/lib/iomgr/error.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/windows/windows_engine.cc b/src/core/lib/event_engine/windows/windows_engine.cc index 7ddd4869b8e..39cc04cb9da 100644 --- a/src/core/lib/event_engine/windows/windows_engine.cc +++ b/src/core/lib/event_engine/windows/windows_engine.cc @@ -42,10 +42,10 @@ #include "src/core/lib/event_engine/windows/windows_endpoint.h" #include "src/core/lib/event_engine/windows/windows_engine.h" #include "src/core/lib/event_engine/windows/windows_listener.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/util/crash.h" #include "src/core/util/sync.h" #include "src/core/util/time.h" -#include "src/core/lib/iomgr/error.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/windows/windows_engine.h b/src/core/lib/event_engine/windows/windows_engine.h index 6f6e19034ce..f35dfe6fca6 100644 --- a/src/core/lib/event_engine/windows/windows_engine.h +++ b/src/core/lib/event_engine/windows/windows_engine.h @@ -37,9 +37,9 @@ #include "src/core/lib/event_engine/thread_pool/thread_pool.h" #include "src/core/lib/event_engine/windows/iocp.h" #include "src/core/lib/event_engine/windows/windows_endpoint.h" +#include "src/core/lib/surface/init_internally.h" #include "src/core/util/sync.h" #include "src/core/util/time.h" -#include "src/core/lib/surface/init_internally.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/windows/windows_listener.cc b/src/core/lib/event_engine/windows/windows_listener.cc index 1cabba81ba4..e0ed99f8ab1 100644 --- a/src/core/lib/event_engine/windows/windows_listener.cc +++ b/src/core/lib/event_engine/windows/windows_listener.cc @@ -25,10 +25,10 @@ #include "src/core/lib/event_engine/windows/win_socket.h" #include "src/core/lib/event_engine/windows/windows_endpoint.h" #include "src/core/lib/event_engine/windows/windows_listener.h" -#include "src/core/util/crash.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/crash.h" +#include "src/core/util/sync.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/windows/windows_listener.h b/src/core/lib/event_engine/windows/windows_listener.h index eced3bafa4f..8e0a5bd0f95 100644 --- a/src/core/lib/event_engine/windows/windows_listener.h +++ b/src/core/lib/event_engine/windows/windows_listener.h @@ -29,8 +29,8 @@ #include "src/core/lib/event_engine/common_closures.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.h" #include "src/core/lib/event_engine/windows/iocp.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/sync.h" #ifdef GRPC_HAVE_UNIX_SOCKET // clang-format off diff --git a/src/core/lib/iomgr/buffer_list.cc b/src/core/lib/iomgr/buffer_list.cc index 2ea3d9a6523..0bba5c8f1d5 100644 --- a/src/core/lib/iomgr/buffer_list.cc +++ b/src/core/lib/iomgr/buffer_list.cc @@ -24,9 +24,9 @@ #include #include +#include "src/core/lib/iomgr/port.h" #include "src/core/util/crash.h" #include "src/core/util/sync.h" -#include "src/core/lib/iomgr/port.h" #ifdef GRPC_LINUX_ERRQUEUE #include diff --git a/src/core/lib/iomgr/buffer_list.h b/src/core/lib/iomgr/buffer_list.h index 19cacce9c63..6805c53c08d 100644 --- a/src/core/lib/iomgr/buffer_list.h +++ b/src/core/lib/iomgr/buffer_list.h @@ -24,10 +24,10 @@ #include #include -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/internal_errqueue.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/lib/iomgr/call_combiner.cc b/src/core/lib/iomgr/call_combiner.cc index b9810aacfb4..f520faef285 100644 --- a/src/core/lib/iomgr/call_combiner.cc +++ b/src/core/lib/iomgr/call_combiner.cc @@ -26,9 +26,9 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/crash.h" namespace grpc_core { diff --git a/src/core/lib/iomgr/call_combiner.h b/src/core/lib/iomgr/call_combiner.h index 230df63351a..093fbb57ee6 100644 --- a/src/core/lib/iomgr/call_combiner.h +++ b/src/core/lib/iomgr/call_combiner.h @@ -26,12 +26,12 @@ #include #include -#include "src/core/util/mpscq.h" -#include "src/core/util/ref_counted.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/dynamic_annotations.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/mpscq.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" // A simple, lock-free mechanism for serializing activity related to a // single call. This is similar to a combiner but is more lightweight. diff --git a/src/core/lib/iomgr/cfstream_handle.cc b/src/core/lib/iomgr/cfstream_handle.cc index c2ec9f8d350..8ba1ad3e953 100644 --- a/src/core/lib/iomgr/cfstream_handle.cc +++ b/src/core/lib/iomgr/cfstream_handle.cc @@ -18,8 +18,8 @@ #include -#include "src/core/util/memory.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/memory.h" #ifdef GRPC_CFSTREAM #import diff --git a/src/core/lib/iomgr/cfstream_handle.h b/src/core/lib/iomgr/cfstream_handle.h index 518407eb2d5..d373eadfd37 100644 --- a/src/core/lib/iomgr/cfstream_handle.h +++ b/src/core/lib/iomgr/cfstream_handle.h @@ -29,9 +29,9 @@ #ifdef GRPC_CFSTREAM #import -#include "src/core/util/memory.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/lockfree_event.h" +#include "src/core/util/memory.h" class GrpcLibraryInitHolder { public: diff --git a/src/core/lib/iomgr/closure.h b/src/core/lib/iomgr/closure.h index 7aa919720d7..90c5385700f 100644 --- a/src/core/lib/iomgr/closure.h +++ b/src/core/lib/iomgr/closure.h @@ -28,11 +28,11 @@ #include #include +#include "src/core/lib/iomgr/error.h" #include "src/core/util/crash.h" #include "src/core/util/debug_location.h" #include "src/core/util/manual_constructor.h" #include "src/core/util/mpscq.h" -#include "src/core/lib/iomgr/error.h" struct grpc_closure; typedef struct grpc_closure grpc_closure; diff --git a/src/core/lib/iomgr/combiner.cc b/src/core/lib/iomgr/combiner.cc index 7df6d16fbd5..9e414a6e19a 100644 --- a/src/core/lib/iomgr/combiner.cc +++ b/src/core/lib/iomgr/combiner.cc @@ -29,10 +29,10 @@ #include #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/crash.h" -#include "src/core/util/mpscq.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr_internal.h" +#include "src/core/util/crash.h" +#include "src/core/util/mpscq.h" grpc_core::DebugOnlyTraceFlag grpc_combiner_trace(false, "combiner"); diff --git a/src/core/lib/iomgr/endpoint_pair_posix.cc b/src/core/lib/iomgr/endpoint_pair_posix.cc index 3a1c0f349d4..4d43a25843c 100644 --- a/src/core/lib/iomgr/endpoint_pair_posix.cc +++ b/src/core/lib/iomgr/endpoint_pair_posix.cc @@ -37,12 +37,12 @@ #include #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/endpoint_pair.h" #include "src/core/lib/iomgr/socket_utils_posix.h" #include "src/core/lib/iomgr/tcp_posix.h" #include "src/core/lib/iomgr/unix_sockets_posix.h" #include "src/core/lib/resource_quota/api.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" static void create_sockets(int sv[2]) { diff --git a/src/core/lib/iomgr/endpoint_pair_windows.cc b/src/core/lib/iomgr/endpoint_pair_windows.cc index 79ee6d0b466..6e3ac73421f 100644 --- a/src/core/lib/iomgr/endpoint_pair_windows.cc +++ b/src/core/lib/iomgr/endpoint_pair_windows.cc @@ -30,11 +30,11 @@ #include #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/endpoint_pair.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_windows.h" #include "src/core/lib/iomgr/tcp_windows.h" +#include "src/core/util/crash.h" static void create_sockets(SOCKET sv[2]) { SOCKET svr_sock = INVALID_SOCKET; diff --git a/src/core/lib/iomgr/error.cc b/src/core/lib/iomgr/error.cc index df1bb836439..cd97ccedb3b 100644 --- a/src/core/lib/iomgr/error.cc +++ b/src/core/lib/iomgr/error.cc @@ -36,8 +36,8 @@ #endif #include "src/core/lib/debug/trace.h" -#include "src/core/util/strerror.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/strerror.h" #include "src/core/util/useful.h" grpc_core::DebugOnlyTraceFlag grpc_trace_error_refcount(false, diff --git a/src/core/lib/iomgr/error.h b/src/core/lib/iomgr/error.h index 3579fa00390..b6b607e6322 100644 --- a/src/core/lib/iomgr/error.h +++ b/src/core/lib/iomgr/error.h @@ -32,10 +32,10 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/util/crash.h" -#include "src/core/util/status_helper.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" #include "src/core/util/spinlock.h" +#include "src/core/util/status_helper.h" /// Opaque representation of an error. diff --git a/src/core/lib/iomgr/ev_apple.cc b/src/core/lib/iomgr/ev_apple.cc index d6c3ff6e832..db04d5dd246 100644 --- a/src/core/lib/iomgr/ev_apple.cc +++ b/src/core/lib/iomgr/ev_apple.cc @@ -35,9 +35,9 @@ #include "absl/time/time.h" +#include "src/core/lib/iomgr/ev_apple.h" #include "src/core/util/thd.h" #include "src/core/util/time_util.h" -#include "src/core/lib/iomgr/ev_apple.h" grpc_core::DebugOnlyTraceFlag grpc_apple_polling_trace(false, "apple_polling"); diff --git a/src/core/lib/iomgr/ev_epoll1_linux.cc b/src/core/lib/iomgr/ev_epoll1_linux.cc index 84bc79278dd..79a1a4a0cb9 100644 --- a/src/core/lib/iomgr/ev_epoll1_linux.cc +++ b/src/core/lib/iomgr/ev_epoll1_linux.cc @@ -21,8 +21,8 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/crash.h" // This polling engine is only relevant on linux kernels supporting epoll // epoll_create() or epoll_create1() @@ -49,8 +49,6 @@ #include #include -#include "src/core/util/manual_constructor.h" -#include "src/core/util/strerror.h" #include "src/core/lib/iomgr/block_annotate.h" #include "src/core/lib/iomgr/ev_epoll1_linux.h" #include "src/core/lib/iomgr/ev_posix.h" @@ -59,6 +57,8 @@ #include "src/core/lib/iomgr/wakeup_fd_posix.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/manual_constructor.h" +#include "src/core/util/strerror.h" #include "src/core/util/string.h" #include "src/core/util/useful.h" diff --git a/src/core/lib/iomgr/ev_poll_posix.cc b/src/core/lib/iomgr/ev_poll_posix.cc index 3884ced95e2..b63ecc24ad3 100644 --- a/src/core/lib/iomgr/ev_poll_posix.cc +++ b/src/core/lib/iomgr/ev_poll_posix.cc @@ -41,14 +41,14 @@ #include #include -#include "src/core/util/crash.h" -#include "src/core/util/thd.h" #include "src/core/lib/iomgr/block_annotate.h" #include "src/core/lib/iomgr/ev_poll_posix.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/wakeup_fd_posix.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/crash.h" +#include "src/core/util/thd.h" #include "src/core/util/useful.h" #define GRPC_POLLSET_KICK_BROADCAST ((grpc_pollset_worker*)1) diff --git a/src/core/lib/iomgr/ev_posix.cc b/src/core/lib/iomgr/ev_posix.cc index cee52af418d..318fe423727 100644 --- a/src/core/lib/iomgr/ev_posix.cc +++ b/src/core/lib/iomgr/ev_posix.cc @@ -35,11 +35,11 @@ #include "src/core/lib/config/config_vars.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/ev_epoll1_linux.h" #include "src/core/lib/iomgr/ev_poll_posix.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/internal_errqueue.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" grpc_core::DebugOnlyTraceFlag grpc_polling_trace( diff --git a/src/core/lib/iomgr/event_engine_shims/endpoint.cc b/src/core/lib/iomgr/event_engine_shims/endpoint.cc index e483c9533a8..a5bd4eb96fc 100644 --- a/src/core/lib/iomgr/event_engine_shims/endpoint.cc +++ b/src/core/lib/iomgr/event_engine_shims/endpoint.cc @@ -38,9 +38,6 @@ #include "src/core/lib/event_engine/shim.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/event_engine/trace.h" -#include "src/core/util/construct_destruct.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -49,7 +46,10 @@ #include "src/core/lib/iomgr/port.h" #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/util/construct_destruct.h" +#include "src/core/util/debug_location.h" #include "src/core/util/string.h" +#include "src/core/util/sync.h" extern grpc_core::TraceFlag grpc_tcp_trace; diff --git a/src/core/lib/iomgr/exec_ctx.cc b/src/core/lib/iomgr/exec_ctx.cc index 4b222cfa62c..71dbad44fab 100644 --- a/src/core/lib/iomgr/exec_ctx.cc +++ b/src/core/lib/iomgr/exec_ctx.cc @@ -25,9 +25,9 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/crash.h" static void exec_ctx_run(grpc_closure* closure) { #ifndef NDEBUG diff --git a/src/core/lib/iomgr/exec_ctx.h b/src/core/lib/iomgr/exec_ctx.h index 04b9e6e6cce..d2ab172d9c8 100644 --- a/src/core/lib/iomgr/exec_ctx.h +++ b/src/core/lib/iomgr/exec_ctx.h @@ -36,11 +36,11 @@ #include #include +#include "src/core/lib/iomgr/closure.h" #include "src/core/util/crash.h" #include "src/core/util/debug_location.h" #include "src/core/util/fork.h" #include "src/core/util/time.h" -#include "src/core/lib/iomgr/closure.h" #include "src/core/util/time_precise.h" #if !defined(_WIN32) || !defined(_DLL) diff --git a/src/core/lib/iomgr/executor.cc b/src/core/lib/iomgr/executor.cc index e466d42860d..86d7a1e9c76 100644 --- a/src/core/lib/iomgr/executor.cc +++ b/src/core/lib/iomgr/executor.cc @@ -28,10 +28,10 @@ #include #include -#include "src/core/util/crash.h" -#include "src/core/util/memory.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr_internal.h" +#include "src/core/util/crash.h" +#include "src/core/util/memory.h" #include "src/core/util/useful.h" #define MAX_DEPTH 2 diff --git a/src/core/lib/iomgr/executor.h b/src/core/lib/iomgr/executor.h index 6efc00340e8..b029fd503d3 100644 --- a/src/core/lib/iomgr/executor.h +++ b/src/core/lib/iomgr/executor.h @@ -21,9 +21,9 @@ #include -#include "src/core/util/thd.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/util/spinlock.h" +#include "src/core/util/thd.h" namespace grpc_core { diff --git a/src/core/lib/iomgr/fork_posix.cc b/src/core/lib/iomgr/fork_posix.cc index af7abd72ba5..79f72083330 100644 --- a/src/core/lib/iomgr/fork_posix.cc +++ b/src/core/lib/iomgr/fork_posix.cc @@ -32,14 +32,14 @@ #include #include -#include "src/core/util/crash.h" -#include "src/core/util/fork.h" -#include "src/core/util/thd.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/timer_manager.h" #include "src/core/lib/iomgr/wakeup_fd_posix.h" #include "src/core/lib/surface/init_internally.h" +#include "src/core/util/crash.h" +#include "src/core/util/fork.h" +#include "src/core/util/thd.h" // // NOTE: FORKING IS NOT GENERALLY SUPPORTED, THIS IS ONLY INTENDED TO WORK diff --git a/src/core/lib/iomgr/iocp_windows.cc b/src/core/lib/iomgr/iocp_windows.cc index ced11b2c652..b4c69f03d0b 100644 --- a/src/core/lib/iomgr/iocp_windows.cc +++ b/src/core/lib/iomgr/iocp_windows.cc @@ -33,14 +33,14 @@ #include #include -#include "src/core/util/crash.h" -#include "src/core/util/thd.h" #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/socket_windows.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/crash.h" +#include "src/core/util/thd.h" static ULONG g_iocp_kick_token; static OVERLAPPED g_iocp_custom_overlap; diff --git a/src/core/lib/iomgr/iomgr.cc b/src/core/lib/iomgr/iomgr.cc index 93cb362940b..1f7819cde32 100644 --- a/src/core/lib/iomgr/iomgr.cc +++ b/src/core/lib/iomgr/iomgr.cc @@ -29,8 +29,6 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/util/crash.h" -#include "src/core/util/thd.h" #include "src/core/lib/iomgr/buffer_list.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/executor.h" @@ -38,7 +36,9 @@ #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/iomgr/timer_manager.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" +#include "src/core/util/thd.h" #include "src/core/util/useful.h" static gpr_mu g_mu; diff --git a/src/core/lib/iomgr/iomgr_windows.cc b/src/core/lib/iomgr/iomgr_windows.cc index 1ab013f2de5..5029e4faf13 100644 --- a/src/core/lib/iomgr/iomgr_windows.cc +++ b/src/core/lib/iomgr/iomgr_windows.cc @@ -27,7 +27,6 @@ #include #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/pollset_windows.h" @@ -38,6 +37,7 @@ #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/tcp_server.h" #include "src/core/lib/iomgr/timer.h" +#include "src/core/util/crash.h" extern grpc_tcp_server_vtable grpc_windows_tcp_server_vtable; extern grpc_tcp_server_vtable grpc_windows_event_engine_tcp_server_vtable; diff --git a/src/core/lib/iomgr/lockfree_event.cc b/src/core/lib/iomgr/lockfree_event.cc index f2dcae0013e..8ff09d9dd3a 100644 --- a/src/core/lib/iomgr/lockfree_event.cc +++ b/src/core/lib/iomgr/lockfree_event.cc @@ -24,8 +24,8 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/crash.h" extern grpc_core::DebugOnlyTraceFlag grpc_polling_trace; diff --git a/src/core/lib/iomgr/pollset_windows.cc b/src/core/lib/iomgr/pollset_windows.cc index ed8d4ed2d16..f3114e6fdbf 100644 --- a/src/core/lib/iomgr/pollset_windows.cc +++ b/src/core/lib/iomgr/pollset_windows.cc @@ -24,12 +24,12 @@ #include -#include "src/core/util/crash.h" -#include "src/core/util/thd.h" #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/iomgr/pollset_windows.h" +#include "src/core/util/crash.h" +#include "src/core/util/thd.h" #define GRPC_POLLSET_KICK_BROADCAST ((grpc_pollset_worker*)1) diff --git a/src/core/lib/iomgr/resolve_address.h b/src/core/lib/iomgr/resolve_address.h index 41d8178e4df..c8c94b00c0b 100644 --- a/src/core/lib/iomgr/resolve_address.h +++ b/src/core/lib/iomgr/resolve_address.h @@ -28,11 +28,11 @@ #include #include "src/core/lib/event_engine/handle_containers.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/resolved_address.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/time.h" #define GRPC_MAX_SOCKADDR_SIZE 128 diff --git a/src/core/lib/iomgr/resolve_address_posix.cc b/src/core/lib/iomgr/resolve_address_posix.cc index 5277f9c6581..e10702d5044 100644 --- a/src/core/lib/iomgr/resolve_address_posix.cc +++ b/src/core/lib/iomgr/resolve_address_posix.cc @@ -30,9 +30,6 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/util/crash.h" -#include "src/core/util/host_port.h" -#include "src/core/util/thd.h" #include "src/core/lib/iomgr/block_annotate.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/executor.h" @@ -42,7 +39,10 @@ #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/unix_sockets_posix.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/util/crash.h" +#include "src/core/util/host_port.h" #include "src/core/util/string.h" +#include "src/core/util/thd.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/lib/iomgr/resolve_address_windows.cc b/src/core/lib/iomgr/resolve_address_windows.cc index 2aa3c0b241d..7a22c74a210 100644 --- a/src/core/lib/iomgr/resolve_address_windows.cc +++ b/src/core/lib/iomgr/resolve_address_windows.cc @@ -35,9 +35,6 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/util/crash.h" -#include "src/core/util/host_port.h" -#include "src/core/util/thd.h" #include "src/core/lib/iomgr/block_annotate.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/executor.h" @@ -46,7 +43,10 @@ #include "src/core/lib/iomgr/resolve_address_windows.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/util/crash.h" +#include "src/core/util/host_port.h" #include "src/core/util/string.h" +#include "src/core/util/thd.h" namespace grpc_core { namespace { diff --git a/src/core/lib/iomgr/sockaddr_utils_posix.cc b/src/core/lib/iomgr/sockaddr_utils_posix.cc index fd7d3145528..975624c8bf0 100644 --- a/src/core/lib/iomgr/sockaddr_utils_posix.cc +++ b/src/core/lib/iomgr/sockaddr_utils_posix.cc @@ -43,8 +43,8 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/sockaddr.h" +#include "src/core/util/crash.h" uint16_t grpc_htons(uint16_t hostshort) { return htons(hostshort); } diff --git a/src/core/lib/iomgr/socket_utils_common_posix.cc b/src/core/lib/iomgr/socket_utils_common_posix.cc index d70dd07295b..1c08fba7cac 100644 --- a/src/core/lib/iomgr/socket_utils_common_posix.cc +++ b/src/core/lib/iomgr/socket_utils_common_posix.cc @@ -52,9 +52,9 @@ #include #include "src/core/lib/address_utils/sockaddr_utils.h" +#include "src/core/lib/iomgr/sockaddr.h" #include "src/core/util/crash.h" #include "src/core/util/strerror.h" -#include "src/core/lib/iomgr/sockaddr.h" #include "src/core/util/string.h" // set a socket to use zerocopy diff --git a/src/core/lib/iomgr/socket_utils_linux.cc b/src/core/lib/iomgr/socket_utils_linux.cc index 4ff3e446350..2ba845f9dc8 100644 --- a/src/core/lib/iomgr/socket_utils_linux.cc +++ b/src/core/lib/iomgr/socket_utils_linux.cc @@ -27,9 +27,9 @@ #include -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils_posix.h" +#include "src/core/util/crash.h" int grpc_accept4(int sockfd, grpc_resolved_address* resolved_addr, int nonblock, int cloexec) { diff --git a/src/core/lib/iomgr/socket_utils_posix.cc b/src/core/lib/iomgr/socket_utils_posix.cc index 16ba895d0ef..80ec35451e6 100644 --- a/src/core/lib/iomgr/socket_utils_posix.cc +++ b/src/core/lib/iomgr/socket_utils_posix.cc @@ -30,16 +30,16 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils_posix.h" +#include "src/core/util/crash.h" #endif #ifdef GRPC_POSIX_SOCKET_TCP #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/util/strerror.h" #include "src/core/lib/iomgr/socket_utils_posix.h" +#include "src/core/util/strerror.h" using ::grpc_event_engine::experimental::EndpointConfig; diff --git a/src/core/lib/iomgr/socket_utils_windows.cc b/src/core/lib/iomgr/socket_utils_windows.cc index 569630b8133..28a21e17a7a 100644 --- a/src/core/lib/iomgr/socket_utils_windows.cc +++ b/src/core/lib/iomgr/socket_utils_windows.cc @@ -24,9 +24,9 @@ #include -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils.h" +#include "src/core/util/crash.h" uint16_t grpc_htons(uint16_t hostshort) { return htons(hostshort); } diff --git a/src/core/lib/iomgr/socket_windows.cc b/src/core/lib/iomgr/socket_windows.cc index ea7ae010de5..78088f6ba91 100644 --- a/src/core/lib/iomgr/socket_windows.cc +++ b/src/core/lib/iomgr/socket_windows.cc @@ -35,13 +35,13 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/iomgr/pollset_windows.h" #include "src/core/lib/iomgr/sockaddr_windows.h" #include "src/core/lib/iomgr/socket_windows.h" +#include "src/core/util/crash.h" static DWORD s_wsa_socket_flags; diff --git a/src/core/lib/iomgr/tcp_client_cfstream.cc b/src/core/lib/iomgr/tcp_client_cfstream.cc index 7540f643208..ab543bf3f58 100644 --- a/src/core/lib/iomgr/tcp_client_cfstream.cc +++ b/src/core/lib/iomgr/tcp_client_cfstream.cc @@ -34,8 +34,6 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/event_engine/shim.h" -#include "src/core/util/crash.h" -#include "src/core/util/host_port.h" #include "src/core/lib/iomgr/cfstream_handle.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint_cfstream.h" @@ -44,6 +42,8 @@ #include "src/core/lib/iomgr/event_engine_shims/tcp_client.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/timer.h" +#include "src/core/util/crash.h" +#include "src/core/util/host_port.h" extern grpc_core::TraceFlag grpc_tcp_trace; diff --git a/src/core/lib/iomgr/tcp_client_posix.cc b/src/core/lib/iomgr/tcp_client_posix.cc index 5961980488a..bd7e6809cc7 100644 --- a/src/core/lib/iomgr/tcp_client_posix.cc +++ b/src/core/lib/iomgr/tcp_client_posix.cc @@ -40,7 +40,6 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/event_engine/resolved_address_internal.h" #include "src/core/lib/event_engine/shim.h" -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/event_engine_shims/tcp_client.h" #include "src/core/lib/iomgr/executor.h" @@ -54,6 +53,7 @@ #include "src/core/lib/iomgr/unix_sockets_posix.h" #include "src/core/lib/iomgr/vsock.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" extern grpc_core::TraceFlag grpc_tcp_trace; diff --git a/src/core/lib/iomgr/tcp_client_windows.cc b/src/core/lib/iomgr/tcp_client_windows.cc index a3bacb73bd6..49107992c41 100644 --- a/src/core/lib/iomgr/tcp_client_windows.cc +++ b/src/core/lib/iomgr/tcp_client_windows.cc @@ -34,7 +34,6 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/event_engine/shim.h" -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/event_engine_shims/tcp_client.h" #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/sockaddr.h" @@ -45,6 +44,7 @@ #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/resource_quota/api.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" using ::grpc_event_engine::experimental::EndpointConfig; diff --git a/src/core/lib/iomgr/tcp_posix.cc b/src/core/lib/iomgr/tcp_posix.cc index 099acee3565..4819dd96e73 100644 --- a/src/core/lib/iomgr/tcp_posix.cc +++ b/src/core/lib/iomgr/tcp_posix.cc @@ -56,13 +56,8 @@ #include #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/util/event_log.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/crash.h" -#include "src/core/util/strerror.h" -#include "src/core/util/sync.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/buffer_list.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" @@ -76,7 +71,12 @@ #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/crash.h" +#include "src/core/util/event_log.h" +#include "src/core/util/strerror.h" #include "src/core/util/string.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" #ifndef SOL_TCP diff --git a/src/core/lib/iomgr/tcp_server_posix.cc b/src/core/lib/iomgr/tcp_server_posix.cc index e4fbc3f93f9..c50e107f3a4 100644 --- a/src/core/lib/iomgr/tcp_server_posix.cc +++ b/src/core/lib/iomgr/tcp_server_posix.cc @@ -62,7 +62,6 @@ #include "src/core/lib/event_engine/query_extensions.h" #include "src/core/lib/event_engine/resolved_address_internal.h" #include "src/core/lib/event_engine/shim.h" -#include "src/core/util/strerror.h" #include "src/core/lib/iomgr/event_engine_shims/closure.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -76,6 +75,7 @@ #include "src/core/lib/iomgr/unix_sockets_posix.h" #include "src/core/lib/iomgr/vsock.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/util/strerror.h" static std::atomic num_dropped_connections{0}; static constexpr grpc_core::Duration kRetryAcceptWaitTime{ diff --git a/src/core/lib/iomgr/tcp_server_utils_posix_common.cc b/src/core/lib/iomgr/tcp_server_utils_posix_common.cc index 74d7f26d201..89f114c9f6c 100644 --- a/src/core/lib/iomgr/tcp_server_utils_posix_common.cc +++ b/src/core/lib/iomgr/tcp_server_utils_posix_common.cc @@ -40,12 +40,12 @@ #include #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/tcp_server_utils_posix.h" #include "src/core/lib/iomgr/unix_sockets_posix.h" #include "src/core/lib/iomgr/vsock.h" +#include "src/core/util/crash.h" #define MIN_SAFE_ACCEPT_QUEUE_SIZE 100 diff --git a/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc b/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc index cf2f3a0a48d..a416a212ca5 100644 --- a/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc +++ b/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc @@ -38,10 +38,10 @@ #include #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/tcp_server_utils_posix.h" +#include "src/core/util/crash.h" // Return the listener in s with address addr or NULL. static grpc_tcp_listener* find_listener_with_addr(grpc_tcp_server* s, diff --git a/src/core/lib/iomgr/tcp_server_windows.cc b/src/core/lib/iomgr/tcp_server_windows.cc index a588adac64f..1103154cd5b 100644 --- a/src/core/lib/iomgr/tcp_server_windows.cc +++ b/src/core/lib/iomgr/tcp_server_windows.cc @@ -47,7 +47,6 @@ #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/event_engine/windows/windows_engine.h" #include "src/core/lib/event_engine/windows/windows_listener.h" -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/event_engine_shims/closure.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" @@ -61,6 +60,7 @@ #include "src/core/lib/resource_quota/api.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" #define MIN_SAFE_ACCEPT_QUEUE_SIZE 100 diff --git a/src/core/lib/iomgr/tcp_windows.cc b/src/core/lib/iomgr/tcp_windows.cc index a954caa8977..4ffec99bf70 100644 --- a/src/core/lib/iomgr/tcp_windows.cc +++ b/src/core/lib/iomgr/tcp_windows.cc @@ -33,7 +33,6 @@ #include #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/sockaddr_windows.h" @@ -43,6 +42,7 @@ #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_string_helpers.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" #include "src/core/util/useful.h" diff --git a/src/core/lib/iomgr/timer_generic.cc b/src/core/lib/iomgr/timer_generic.cc index 72d3f2605c3..974d663fc0b 100644 --- a/src/core/lib/iomgr/timer_generic.cc +++ b/src/core/lib/iomgr/timer_generic.cc @@ -31,15 +31,15 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/util/crash.h" -#include "src/core/util/manual_constructor.h" -#include "src/core/util/time.h" -#include "src/core/util/time_averaged_stats.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/iomgr/timer_heap.h" +#include "src/core/util/crash.h" +#include "src/core/util/manual_constructor.h" #include "src/core/util/spinlock.h" +#include "src/core/util/time.h" +#include "src/core/util/time_averaged_stats.h" #include "src/core/util/useful.h" #define INVALID_HEAP_INDEX 0xffffffffu diff --git a/src/core/lib/iomgr/timer_manager.cc b/src/core/lib/iomgr/timer_manager.cc index 44c833e143a..b37442e7b07 100644 --- a/src/core/lib/iomgr/timer_manager.cc +++ b/src/core/lib/iomgr/timer_manager.cc @@ -28,9 +28,9 @@ #include #include "src/core/lib/debug/trace.h" +#include "src/core/lib/iomgr/timer.h" #include "src/core/util/crash.h" #include "src/core/util/thd.h" -#include "src/core/lib/iomgr/timer.h" struct completed_thread { grpc_core::Thread thd; diff --git a/src/core/lib/iomgr/unix_sockets_posix.cc b/src/core/lib/iomgr/unix_sockets_posix.cc index 918f50708d6..b60198a8624 100644 --- a/src/core/lib/iomgr/unix_sockets_posix.cc +++ b/src/core/lib/iomgr/unix_sockets_posix.cc @@ -40,10 +40,10 @@ #include #include "src/core/lib/address_utils/parse_address.h" -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/unix_sockets_posix.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" void grpc_create_socketpair_if_unix(int sv[2]) { diff --git a/src/core/lib/iomgr/vsock.cc b/src/core/lib/iomgr/vsock.cc index cc04f87698b..764fbbaa9de 100644 --- a/src/core/lib/iomgr/vsock.cc +++ b/src/core/lib/iomgr/vsock.cc @@ -31,9 +31,9 @@ #include #include "src/core/lib/address_utils/parse_address.h" -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" absl::StatusOr> grpc_resolve_vsock_address( diff --git a/src/core/lib/iomgr/wakeup_fd_eventfd.cc b/src/core/lib/iomgr/wakeup_fd_eventfd.cc index e0700a178d8..0395e26f2b8 100644 --- a/src/core/lib/iomgr/wakeup_fd_eventfd.cc +++ b/src/core/lib/iomgr/wakeup_fd_eventfd.cc @@ -28,9 +28,9 @@ #include +#include "src/core/lib/iomgr/wakeup_fd_posix.h" #include "src/core/util/crash.h" #include "src/core/util/strerror.h" -#include "src/core/lib/iomgr/wakeup_fd_posix.h" static grpc_error_handle eventfd_create(grpc_wakeup_fd* fd_info) { fd_info->read_fd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC); diff --git a/src/core/lib/iomgr/wakeup_fd_pipe.cc b/src/core/lib/iomgr/wakeup_fd_pipe.cc index 36a979227db..21882130edc 100644 --- a/src/core/lib/iomgr/wakeup_fd_pipe.cc +++ b/src/core/lib/iomgr/wakeup_fd_pipe.cc @@ -28,11 +28,11 @@ #include -#include "src/core/util/crash.h" -#include "src/core/util/strerror.h" #include "src/core/lib/iomgr/socket_utils_posix.h" #include "src/core/lib/iomgr/wakeup_fd_pipe.h" #include "src/core/lib/iomgr/wakeup_fd_posix.h" +#include "src/core/util/crash.h" +#include "src/core/util/strerror.h" static grpc_error_handle pipe_init(grpc_wakeup_fd* fd_info) { int pipefd[2]; diff --git a/src/core/lib/promise/activity.h b/src/core/lib/promise/activity.h index 320c752cde7..ddb4f1d7038 100644 --- a/src/core/lib/promise/activity.h +++ b/src/core/lib/promise/activity.h @@ -33,14 +33,14 @@ #include #include "src/core/lib/event_engine/event_engine_context.h" -#include "src/core/util/construct_destruct.h" -#include "src/core/util/no_destruct.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/sync.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/detail/status.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/construct_destruct.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/lib/promise/arena_promise.h b/src/core/lib/promise/arena_promise.h index 86a076e2cae..7f4bb0de563 100644 --- a/src/core/lib/promise/arena_promise.h +++ b/src/core/lib/promise/arena_promise.h @@ -26,10 +26,10 @@ #include -#include "src/core/util/construct_destruct.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/poll.h" #include "src/core/lib/resource_quota/arena.h" +#include "src/core/util/construct_destruct.h" namespace grpc_core { diff --git a/src/core/lib/promise/detail/basic_seq.h b/src/core/lib/promise/detail/basic_seq.h index df0f8898b18..8cf3d1d1c9e 100644 --- a/src/core/lib/promise/detail/basic_seq.h +++ b/src/core/lib/promise/detail/basic_seq.h @@ -17,8 +17,8 @@ #include -#include "src/core/util/construct_destruct.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/construct_destruct.h" namespace grpc_core { namespace promise_detail { diff --git a/src/core/lib/promise/detail/join_state.h b/src/core/lib/promise/detail/join_state.h index 7786a5faab9..0c25b4d23a7 100644 --- a/src/core/lib/promise/detail/join_state.h +++ b/src/core/lib/promise/detail/join_state.h @@ -26,11 +26,11 @@ #include #include -#include "src/core/util/bitset.h" -#include "src/core/util/construct_destruct.h" #include "src/core/lib/promise/detail/promise_like.h" #include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/trace.h" +#include "src/core/util/bitset.h" +#include "src/core/util/construct_destruct.h" namespace grpc_core { namespace promise_detail { diff --git a/src/core/lib/promise/detail/seq_state.h b/src/core/lib/promise/detail/seq_state.h index 2dd6e0bf755..ad909492e72 100644 --- a/src/core/lib/promise/detail/seq_state.h +++ b/src/core/lib/promise/detail/seq_state.h @@ -29,12 +29,12 @@ #include #include -#include "src/core/util/construct_destruct.h" -#include "src/core/util/debug_location.h" #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/detail/promise_like.h" #include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/trace.h" +#include "src/core/util/construct_destruct.h" +#include "src/core/util/debug_location.h" // A sequence under some traits for some set of callables P, Fs. // P should be a promise-like object that yields a value. diff --git a/src/core/lib/promise/exec_ctx_wakeup_scheduler.h b/src/core/lib/promise/exec_ctx_wakeup_scheduler.h index 8cc979cd602..cc36e1ff747 100644 --- a/src/core/lib/promise/exec_ctx_wakeup_scheduler.h +++ b/src/core/lib/promise/exec_ctx_wakeup_scheduler.h @@ -19,10 +19,10 @@ #include -#include "src/core/util/debug_location.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/debug_location.h" namespace grpc_core { diff --git a/src/core/lib/promise/for_each.h b/src/core/lib/promise/for_each.h index ae12a2def16..58551648b58 100644 --- a/src/core/lib/promise/for_each.h +++ b/src/core/lib/promise/for_each.h @@ -27,13 +27,13 @@ #include #include -#include "src/core/util/construct_destruct.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/detail/status.h" #include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/status_flag.h" #include "src/core/lib/promise/trace.h" +#include "src/core/util/construct_destruct.h" namespace grpc_core { diff --git a/src/core/lib/promise/if.h b/src/core/lib/promise/if.h index 25d8959bcbe..4a5ec9f4126 100644 --- a/src/core/lib/promise/if.h +++ b/src/core/lib/promise/if.h @@ -23,10 +23,10 @@ #include -#include "src/core/util/construct_destruct.h" #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/detail/promise_like.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/construct_destruct.h" namespace grpc_core { diff --git a/src/core/lib/promise/inter_activity_latch.h b/src/core/lib/promise/inter_activity_latch.h index 5a9ff013720..d0315ff29ba 100644 --- a/src/core/lib/promise/inter_activity_latch.h +++ b/src/core/lib/promise/inter_activity_latch.h @@ -25,11 +25,11 @@ #include #include -#include "src/core/util/sync.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/trace.h" #include "src/core/lib/promise/wait_set.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/lib/promise/inter_activity_pipe.h b/src/core/lib/promise/inter_activity_pipe.h index 6e2940a68a7..f6a2144dadb 100644 --- a/src/core/lib/promise/inter_activity_pipe.h +++ b/src/core/lib/promise/inter_activity_pipe.h @@ -25,11 +25,11 @@ #include +#include "src/core/lib/promise/activity.h" +#include "src/core/lib/promise/poll.h" #include "src/core/util/ref_counted.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/sync.h" -#include "src/core/lib/promise/activity.h" -#include "src/core/lib/promise/poll.h" namespace grpc_core { diff --git a/src/core/lib/promise/interceptor_list.h b/src/core/lib/promise/interceptor_list.h index 77294a9c486..f133c618a38 100644 --- a/src/core/lib/promise/interceptor_list.h +++ b/src/core/lib/promise/interceptor_list.h @@ -30,13 +30,13 @@ #include #include -#include "src/core/util/construct_destruct.h" -#include "src/core/util/debug_location.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/trace.h" #include "src/core/lib/resource_quota/arena.h" +#include "src/core/util/construct_destruct.h" +#include "src/core/util/debug_location.h" namespace grpc_core { diff --git a/src/core/lib/promise/loop.h b/src/core/lib/promise/loop.h index e24ca254a29..de4188de287 100644 --- a/src/core/lib/promise/loop.h +++ b/src/core/lib/promise/loop.h @@ -23,9 +23,9 @@ #include -#include "src/core/util/construct_destruct.h" #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/construct_destruct.h" namespace grpc_core { diff --git a/src/core/lib/promise/mpsc.h b/src/core/lib/promise/mpsc.h index 46f08ce0562..269ada99d43 100644 --- a/src/core/lib/promise/mpsc.h +++ b/src/core/lib/promise/mpsc.h @@ -27,12 +27,12 @@ #include #include -#include "src/core/util/ref_counted.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/wait_set.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" // Multi producer single consumer inter-activity comms. diff --git a/src/core/lib/promise/observable.h b/src/core/lib/promise/observable.h index d7ad7d9c969..0f500d66317 100644 --- a/src/core/lib/promise/observable.h +++ b/src/core/lib/promise/observable.h @@ -21,9 +21,9 @@ #include -#include "src/core/util/sync.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/lib/promise/party.cc b/src/core/lib/promise/party.cc index 994aace5a3d..74a0fe097b6 100644 --- a/src/core/lib/promise/party.cc +++ b/src/core/lib/promise/party.cc @@ -23,14 +23,14 @@ #include #include -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/trace.h" +#include "src/core/util/sync.h" #ifdef GRPC_MAXIMIZE_THREADYNESS -#include "src/core/util/thd.h" // IWYU pragma: keep #include "src/core/lib/iomgr/exec_ctx.h" // IWYU pragma: keep +#include "src/core/util/thd.h" // IWYU pragma: keep #endif grpc_core::DebugOnlyTraceFlag grpc_trace_party_state(false, "party_state"); diff --git a/src/core/lib/promise/party.h b/src/core/lib/promise/party.h index 13ab4d3ab19..448136a54ba 100644 --- a/src/core/lib/promise/party.h +++ b/src/core/lib/promise/party.h @@ -31,16 +31,16 @@ #include #include -#include "src/core/util/construct_destruct.h" -#include "src/core/util/crash.h" -#include "src/core/util/ref_counted.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/trace.h" +#include "src/core/util/construct_destruct.h" +#include "src/core/util/crash.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" // Two implementations of party synchronization are provided: one using a single // atomic, the other using a mutex and a set of state variables. diff --git a/src/core/lib/promise/pipe.h b/src/core/lib/promise/pipe.h index 6168bf7267a..3e81723f2e9 100644 --- a/src/core/lib/promise/pipe.h +++ b/src/core/lib/promise/pipe.h @@ -31,8 +31,6 @@ #include #include -#include "src/core/util/debug_location.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/if.h" @@ -42,6 +40,8 @@ #include "src/core/lib/promise/seq.h" #include "src/core/lib/promise/trace.h" #include "src/core/lib/resource_quota/arena.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/promise/seq.h b/src/core/lib/promise/seq.h index da8a937e960..04ecfe2cbae 100644 --- a/src/core/lib/promise/seq.h +++ b/src/core/lib/promise/seq.h @@ -21,11 +21,11 @@ #include -#include "src/core/util/debug_location.h" #include "src/core/lib/promise/detail/basic_seq.h" #include "src/core/lib/promise/detail/promise_like.h" #include "src/core/lib/promise/detail/seq_state.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/debug_location.h" namespace grpc_core { diff --git a/src/core/lib/promise/sleep.cc b/src/core/lib/promise/sleep.cc index f43a757ce85..d31e2a82595 100644 --- a/src/core/lib/promise/sleep.cc +++ b/src/core/lib/promise/sleep.cc @@ -20,11 +20,11 @@ #include #include "src/core/lib/event_engine/event_engine_context.h" // IWYU pragma: keep -#include "src/core/util/time.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/lib/promise/sleep.h b/src/core/lib/promise/sleep.h index 770ebcd4a8d..0ae4232d7b7 100644 --- a/src/core/lib/promise/sleep.h +++ b/src/core/lib/promise/sleep.h @@ -23,9 +23,9 @@ #include #include -#include "src/core/util/time.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/lib/promise/wait_for_callback.h b/src/core/lib/promise/wait_for_callback.h index 8eae1e458b7..6aabfe57970 100644 --- a/src/core/lib/promise/wait_for_callback.h +++ b/src/core/lib/promise/wait_for_callback.h @@ -22,9 +22,9 @@ #include -#include "src/core/util/sync.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/lib/resource_quota/api.cc b/src/core/lib/resource_quota/api.cc index 792d93bf90a..113685e08f4 100644 --- a/src/core/lib/resource_quota/api.cc +++ b/src/core/lib/resource_quota/api.cc @@ -28,11 +28,11 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/resource_quota/thread_quota.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/resource_quota/arena.h b/src/core/lib/resource_quota/arena.h index 88a7a752b4b..46ee8f214a7 100644 --- a/src/core/lib/resource_quota/arena.h +++ b/src/core/lib/resource_quota/arena.h @@ -35,10 +35,10 @@ #include #include -#include "src/core/util/construct_destruct.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/util/alloc.h" +#include "src/core/util/construct_destruct.h" namespace grpc_core { diff --git a/src/core/lib/resource_quota/connection_quota.h b/src/core/lib/resource_quota/connection_quota.h index 7f05c7692c6..ac0aa6cdb29 100644 --- a/src/core/lib/resource_quota/connection_quota.h +++ b/src/core/lib/resource_quota/connection_quota.h @@ -22,10 +22,10 @@ #include +#include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/util/ref_counted.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/sync.h" -#include "src/core/lib/resource_quota/memory_quota.h" namespace grpc_core { diff --git a/src/core/lib/resource_quota/memory_quota.cc b/src/core/lib/resource_quota/memory_quota.cc index 3b6da6a6609..5588a31e216 100644 --- a/src/core/lib/resource_quota/memory_quota.cc +++ b/src/core/lib/resource_quota/memory_quota.cc @@ -34,7 +34,6 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/util/mpscq.h" #include "src/core/lib/promise/exec_ctx_wakeup_scheduler.h" #include "src/core/lib/promise/loop.h" #include "src/core/lib/promise/map.h" @@ -42,6 +41,7 @@ #include "src/core/lib/promise/seq.h" #include "src/core/lib/resource_quota/trace.h" #include "src/core/lib/slice/slice_refcount.h" +#include "src/core/util/mpscq.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/lib/resource_quota/memory_quota.h b/src/core/lib/resource_quota/memory_quota.h index ebf70f6e9c6..ec4c97577da 100644 --- a/src/core/lib/resource_quota/memory_quota.h +++ b/src/core/lib/resource_quota/memory_quota.h @@ -39,14 +39,14 @@ #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" -#include "src/core/util/time.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" #include "src/core/lib/resource_quota/periodic_update.h" #include "src/core/lib/resource_quota/trace.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/lib/resource_quota/resource_quota.h b/src/core/lib/resource_quota/resource_quota.h index 81ae3c332e6..0704a162eef 100644 --- a/src/core/lib/resource_quota/resource_quota.h +++ b/src/core/lib/resource_quota/resource_quota.h @@ -24,11 +24,11 @@ #include #include +#include "src/core/lib/resource_quota/memory_quota.h" +#include "src/core/lib/resource_quota/thread_quota.h" #include "src/core/util/cpp_impl_of.h" #include "src/core/util/ref_counted.h" #include "src/core/util/ref_counted_ptr.h" -#include "src/core/lib/resource_quota/memory_quota.h" -#include "src/core/lib/resource_quota/thread_quota.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/audit_logging.cc b/src/core/lib/security/authorization/audit_logging.cc index 6c19a1042fe..57243b8d68e 100644 --- a/src/core/lib/security/authorization/audit_logging.cc +++ b/src/core/lib/security/authorization/audit_logging.cc @@ -33,8 +33,8 @@ #include #include -#include "src/core/util/sync.h" #include "src/core/lib/security/authorization/stdout_logger.h" +#include "src/core/util/sync.h" namespace grpc_core { namespace experimental { diff --git a/src/core/lib/security/authorization/authorization_engine.h b/src/core/lib/security/authorization/authorization_engine.h index 34fe1bd2a34..4dca42bea85 100644 --- a/src/core/lib/security/authorization/authorization_engine.h +++ b/src/core/lib/security/authorization/authorization_engine.h @@ -19,8 +19,8 @@ #include -#include "src/core/util/ref_counted.h" #include "src/core/lib/security/authorization/evaluate_args.h" +#include "src/core/util/ref_counted.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/authorization_policy_provider.h b/src/core/lib/security/authorization/authorization_policy_provider.h index 55b097eedb5..6dfdc8fb875 100644 --- a/src/core/lib/security/authorization/authorization_policy_provider.h +++ b/src/core/lib/security/authorization/authorization_policy_provider.h @@ -21,9 +21,9 @@ #include #include +#include "src/core/lib/security/authorization/authorization_engine.h" #include "src/core/util/dual_ref_counted.h" #include "src/core/util/ref_counted_ptr.h" -#include "src/core/lib/security/authorization/authorization_engine.h" #include "src/core/util/useful.h" struct grpc_authorization_policy_provider diff --git a/src/core/lib/security/authorization/authorization_policy_provider_vtable.cc b/src/core/lib/security/authorization/authorization_policy_provider_vtable.cc index b7b88f12bed..315c655b0bc 100644 --- a/src/core/lib/security/authorization/authorization_policy_provider_vtable.cc +++ b/src/core/lib/security/authorization/authorization_policy_provider_vtable.cc @@ -16,8 +16,8 @@ #include #include -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/security/authorization/authorization_policy_provider.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/useful.h" namespace { diff --git a/src/core/lib/security/authorization/evaluate_args.cc b/src/core/lib/security/authorization/evaluate_args.cc index f45fcc9064d..b4aeb56bd3c 100644 --- a/src/core/lib/security/authorization/evaluate_args.cc +++ b/src/core/lib/security/authorization/evaluate_args.cc @@ -28,9 +28,9 @@ #include "src/core/handshaker/endpoint_info/endpoint_info_handshaker.h" #include "src/core/lib/address_utils/parse_address.h" -#include "src/core/util/host_port.h" #include "src/core/lib/security/credentials/tls/tls_utils.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/host_port.h" #include "src/core/util/uri.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc b/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc index b51c69a3752..96b03b46321 100644 --- a/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc +++ b/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc @@ -30,14 +30,14 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/util/load_file.h" -#include "src/core/util/status_helper.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/authorization/grpc_authorization_engine.h" #include "src/core/lib/security/authorization/rbac_policy.h" #include "src/core/lib/security/authorization/rbac_translator.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/load_file.h" +#include "src/core/util/status_helper.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/grpc_authorization_policy_provider.h b/src/core/lib/security/authorization/grpc_authorization_policy_provider.h index 03eaabddf23..f7e6aff40d7 100644 --- a/src/core/lib/security/authorization/grpc_authorization_policy_provider.h +++ b/src/core/lib/security/authorization/grpc_authorization_policy_provider.h @@ -28,12 +28,12 @@ #include #include -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" -#include "src/core/util/thd.h" #include "src/core/lib/security/authorization/authorization_engine.h" #include "src/core/lib/security/authorization/authorization_policy_provider.h" #include "src/core/lib/security/authorization/rbac_translator.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/thd.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/grpc_server_authz_filter.h b/src/core/lib/security/authorization/grpc_server_authz_filter.h index 51bc95149af..5bbf13bad30 100644 --- a/src/core/lib/security/authorization/grpc_server_authz_filter.h +++ b/src/core/lib/security/authorization/grpc_server_authz_filter.h @@ -23,12 +23,12 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/authorization/authorization_policy_provider.h" #include "src/core/lib/security/authorization/evaluate_args.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/matchers.h b/src/core/lib/security/authorization/matchers.h index f26b4412872..eaadd07b4e7 100644 --- a/src/core/lib/security/authorization/matchers.h +++ b/src/core/lib/security/authorization/matchers.h @@ -26,9 +26,9 @@ #include #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/util/matchers.h" #include "src/core/lib/security/authorization/evaluate_args.h" #include "src/core/lib/security/authorization/rbac_policy.h" +#include "src/core/util/matchers.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/rbac_translator.cc b/src/core/lib/security/authorization/rbac_translator.cc index c99daeb7340..d7c9331b0c1 100644 --- a/src/core/lib/security/authorization/rbac_translator.cc +++ b/src/core/lib/security/authorization/rbac_translator.cc @@ -37,10 +37,10 @@ #include #include -#include "src/core/util/matchers.h" #include "src/core/lib/security/authorization/audit_logging.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" +#include "src/core/util/matchers.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/lib/security/certificate_provider/certificate_provider_factory.h b/src/core/lib/security/certificate_provider/certificate_provider_factory.h index d3e5f71d79f..9da32e9233f 100644 --- a/src/core/lib/security/certificate_provider/certificate_provider_factory.h +++ b/src/core/lib/security/certificate_provider/certificate_provider_factory.h @@ -27,11 +27,11 @@ #include #include +#include "src/core/util/json/json.h" +#include "src/core/util/json/json_args.h" #include "src/core/util/ref_counted.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/validation_errors.h" -#include "src/core/util/json/json.h" -#include "src/core/util/json/json_args.h" namespace grpc_core { diff --git a/src/core/lib/security/context/security_context.cc b/src/core/lib/security/context/security_context.cc index 5463a4c9d8a..7fc0ef5b617 100644 --- a/src/core/lib/security/context/security_context.cc +++ b/src/core/lib/security/context/security_context.cc @@ -34,12 +34,12 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/context.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/surface/api_trace.h" #include "src/core/lib/surface/call.h" +#include "src/core/util/ref_counted_ptr.h" grpc_core::DebugOnlyTraceFlag grpc_trace_auth_context_refcount( false, "auth_context_refcount"); diff --git a/src/core/lib/security/context/security_context.h b/src/core/lib/security/context/security_context.h index cc141580054..9540278811e 100644 --- a/src/core/lib/security/context/security_context.h +++ b/src/core/lib/security/context/security_context.h @@ -33,11 +33,11 @@ #include #include "src/core/lib/debug/trace.h" +#include "src/core/lib/resource_quota/arena.h" +#include "src/core/lib/security/credentials/credentials.h" // IWYU pragma: keep #include "src/core/util/debug_location.h" #include "src/core/util/ref_counted.h" #include "src/core/util/ref_counted_ptr.h" -#include "src/core/lib/resource_quota/arena.h" -#include "src/core/lib/security/credentials/credentials.h" // IWYU pragma: keep #include "src/core/util/useful.h" extern grpc_core::DebugOnlyTraceFlag grpc_trace_auth_context_refcount; diff --git a/src/core/lib/security/credentials/alts/alts_credentials.h b/src/core/lib/security/credentials/alts/alts_credentials.h index 33743815026..3aa072789ff 100644 --- a/src/core/lib/security/credentials/alts/alts_credentials.h +++ b/src/core/lib/security/credentials/alts/alts_credentials.h @@ -25,10 +25,10 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/unique_type_name.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" // Main struct for grpc ALTS channel credential. diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc index 9aa21575bb1..bef61ff715e 100644 --- a/src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc +++ b/src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc @@ -22,8 +22,8 @@ #include -#include "src/core/util/crash.h" #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" +#include "src/core/util/crash.h" bool grpc_alts_is_running_on_gcp() { gpr_log(GPR_INFO, diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc index 106f87fc02d..dce9bdff53a 100644 --- a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc +++ b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc @@ -29,8 +29,8 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" +#include "src/core/util/crash.h" namespace grpc_core { namespace internal { diff --git a/src/core/lib/security/credentials/call_creds_util.cc b/src/core/lib/security/credentials/call_creds_util.cc index ea6b1315fca..8ed1e8bfccf 100644 --- a/src/core/lib/security/credentials/call_creds_util.cc +++ b/src/core/lib/security/credentials/call_creds_util.cc @@ -26,10 +26,10 @@ #include #include -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/channel_creds_registry.h b/src/core/lib/security/credentials/channel_creds_registry.h index f559c507be5..17771ff8d9e 100644 --- a/src/core/lib/security/credentials/channel_creds_registry.h +++ b/src/core/lib/security/credentials/channel_creds_registry.h @@ -26,11 +26,11 @@ #include +#include "src/core/util/json/json.h" +#include "src/core/util/json/json_args.h" #include "src/core/util/ref_counted.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/validation_errors.h" -#include "src/core/util/json/json.h" -#include "src/core/util/json/json_args.h" struct grpc_channel_credentials; diff --git a/src/core/lib/security/credentials/channel_creds_registry_init.cc b/src/core/lib/security/credentials/channel_creds_registry_init.cc index cc2078d9e0d..de2f7d143b9 100644 --- a/src/core/lib/security/credentials/channel_creds_registry_init.cc +++ b/src/core/lib/security/credentials/channel_creds_registry_init.cc @@ -31,9 +31,6 @@ #include #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" -#include "src/core/util/validation_errors.h" #include "src/core/lib/security/credentials/channel_creds_registry.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" @@ -44,6 +41,9 @@ #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/composite/composite_credentials.cc b/src/core/lib/security/credentials/composite/composite_credentials.cc index 6a7fa03e455..b5ec90d8844 100644 --- a/src/core/lib/security/credentials/composite/composite_credentials.cc +++ b/src/core/lib/security/credentials/composite/composite_credentials.cc @@ -30,10 +30,10 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/promise/try_seq.h" #include "src/core/lib/surface/api_trace.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/ref_counted_ptr.h" // // grpc_composite_channel_credentials diff --git a/src/core/lib/security/credentials/composite/composite_credentials.h b/src/core/lib/security/credentials/composite/composite_credentials.h index e094e1bac01..c2c7181d99c 100644 --- a/src/core/lib/security/credentials/composite/composite_credentials.h +++ b/src/core/lib/security/credentials/composite/composite_credentials.h @@ -33,12 +33,12 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/unique_type_name.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" // -- Composite channel credentials. -- diff --git a/src/core/lib/security/credentials/credentials.cc b/src/core/lib/security/credentials/credentials.cc index 27dd07ca541..6b557e08d18 100644 --- a/src/core/lib/security/credentials/credentials.cc +++ b/src/core/lib/security/credentials/credentials.cc @@ -28,9 +28,9 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/api_trace.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" // -- Common. -- diff --git a/src/core/lib/security/credentials/credentials.h b/src/core/lib/security/credentials/credentials.h index a05178a3558..7070ca00bca 100644 --- a/src/core/lib/security/credentials/credentials.h +++ b/src/core/lib/security/credentials/credentials.h @@ -36,14 +36,14 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/crash.h" -#include "src/core/util/ref_counted.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/unique_type_name.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/crash.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" // --- Constants. --- diff --git a/src/core/lib/security/credentials/external/aws_external_account_credentials.cc b/src/core/lib/security/credentials/external/aws_external_account_credentials.cc index ac5eb178327..a07e5f7ddfb 100644 --- a/src/core/lib/security/credentials/external/aws_external_account_credentials.cc +++ b/src/core/lib/security/credentials/external/aws_external_account_credentials.cc @@ -38,14 +38,14 @@ #include #include -#include "src/core/util/env.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/security/credentials/credentials.h" -#include "src/core/util/uri.h" +#include "src/core/util/env.h" #include "src/core/util/http_client/httpcli_ssl_credentials.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/uri.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/external/aws_external_account_credentials.h b/src/core/lib/security/credentials/external/aws_external_account_credentials.h index 2afa06296bf..d6063c8c3af 100644 --- a/src/core/lib/security/credentials/external/aws_external_account_credentials.h +++ b/src/core/lib/security/credentials/external/aws_external_account_credentials.h @@ -26,13 +26,13 @@ #include -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/credentials/external/aws_request_signer.h" #include "src/core/lib/security/credentials/external/external_account_credentials.h" #include "src/core/util/http_client/httpcli.h" #include "src/core/util/http_client/parser.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/external/external_account_credentials.cc b/src/core/lib/security/credentials/external/external_account_credentials.cc index a9e04ed806b..e7d22fc403c 100644 --- a/src/core/lib/security/credentials/external/external_account_credentials.cc +++ b/src/core/lib/security/credentials/external/external_account_credentials.cc @@ -45,17 +45,17 @@ #include #include -#include "src/core/util/status_helper.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/external/aws_external_account_credentials.h" #include "src/core/lib/security/credentials/external/file_external_account_credentials.h" #include "src/core/lib/security/credentials/external/url_external_account_credentials.h" #include "src/core/lib/security/util/json_util.h" -#include "src/core/util/uri.h" #include "src/core/util/http_client/httpcli_ssl_credentials.h" #include "src/core/util/http_client/parser.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/uri.h" #define EXTERNAL_ACCOUNT_CREDENTIALS_GRANT_TYPE \ "urn:ietf:params:oauth:grant-type:token-exchange" diff --git a/src/core/lib/security/credentials/external/external_account_credentials.h b/src/core/lib/security/credentials/external/external_account_credentials.h index ac9908f736f..57512a422a9 100644 --- a/src/core/lib/security/credentials/external/external_account_credentials.h +++ b/src/core/lib/security/credentials/external/external_account_credentials.h @@ -27,9 +27,6 @@ #include -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/polling_entity.h" @@ -37,6 +34,9 @@ #include "src/core/util/http_client/httpcli.h" #include "src/core/util/http_client/parser.h" #include "src/core/util/json/json.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/external/file_external_account_credentials.cc b/src/core/lib/security/credentials/external/file_external_account_credentials.cc index d394cd1a25f..1918786ddee 100644 --- a/src/core/lib/security/credentials/external/file_external_account_credentials.cc +++ b/src/core/lib/security/credentials/external/file_external_account_credentials.cc @@ -26,11 +26,11 @@ #include #include -#include "src/core/util/load_file.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" +#include "src/core/util/load_file.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/external/file_external_account_credentials.h b/src/core/lib/security/credentials/external/file_external_account_credentials.h index 8b20fc5afa7..bc46b8075bd 100644 --- a/src/core/lib/security/credentials/external/file_external_account_credentials.h +++ b/src/core/lib/security/credentials/external/file_external_account_credentials.h @@ -25,9 +25,9 @@ #include -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/credentials/external/external_account_credentials.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/external/url_external_account_credentials.h b/src/core/lib/security/credentials/external/url_external_account_credentials.h index 6adeac7e4a4..1ea7f50e89d 100644 --- a/src/core/lib/security/credentials/external/url_external_account_credentials.h +++ b/src/core/lib/security/credentials/external/url_external_account_credentials.h @@ -26,12 +26,12 @@ #include -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/credentials/external/external_account_credentials.h" -#include "src/core/util/uri.h" #include "src/core/util/http_client/httpcli.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/uri.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/fake/fake_credentials.cc b/src/core/lib/security/credentials/fake/fake_credentials.cc index 4efa3d49b5e..1e0f6f33eb4 100644 --- a/src/core/lib/security/credentials/fake/fake_credentials.cc +++ b/src/core/lib/security/credentials/fake/fake_credentials.cc @@ -28,11 +28,11 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/security/security_connector/fake/fake_security_connector.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/ref_counted_ptr.h" // -- Fake transport security credentials. -- diff --git a/src/core/lib/security/credentials/fake/fake_credentials.h b/src/core/lib/security/credentials/fake/fake_credentials.h index 27a9515e1d4..95149c3aed1 100644 --- a/src/core/lib/security/credentials/fake/fake_credentials.h +++ b/src/core/lib/security/credentials/fake/fake_credentials.h @@ -30,13 +30,13 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/unique_type_name.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" #define GRPC_ARG_FAKE_SECURITY_EXPECTED_TARGETS \ diff --git a/src/core/lib/security/credentials/google_default/credentials_generic.cc b/src/core/lib/security/credentials/google_default/credentials_generic.cc index 35848fa1727..c817767dfad 100644 --- a/src/core/lib/security/credentials/google_default/credentials_generic.cc +++ b/src/core/lib/security/credentials/google_default/credentials_generic.cc @@ -24,9 +24,9 @@ #include #include -#include "src/core/util/env.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/google_default/google_default_credentials.h" +#include "src/core/util/env.h" std::string grpc_get_well_known_google_credentials_file_path_impl(void) { auto base = grpc_core::GetEnv(GRPC_GOOGLE_CREDENTIALS_PATH_ENV_VAR); diff --git a/src/core/lib/security/credentials/google_default/google_default_credentials.cc b/src/core/lib/security/credentials/google_default/google_default_credentials.cc index 49c694e7a9a..95ab2e8fb5a 100644 --- a/src/core/lib/security/credentials/google_default/google_default_credentials.cc +++ b/src/core/lib/security/credentials/google_default/google_default_credentials.cc @@ -42,13 +42,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/env.h" -#include "src/core/util/load_file.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/sync.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -65,13 +58,20 @@ #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/surface/api_trace.h" #include "src/core/lib/transport/error_utils.h" -#include "src/core/util/uri.h" #include "src/core/load_balancing/grpclb/grpclb.h" #include "src/core/load_balancing/xds/xds_channel_args.h" +#include "src/core/util/env.h" #include "src/core/util/http_client/httpcli.h" #include "src/core/util/http_client/parser.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" +#include "src/core/util/load_file.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" using grpc_core::Json; diff --git a/src/core/lib/security/credentials/google_default/google_default_credentials.h b/src/core/lib/security/credentials/google_default/google_default_credentials.h index f2791f7956d..58f9ae40cdc 100644 --- a/src/core/lib/security/credentials/google_default/google_default_credentials.h +++ b/src/core/lib/security/credentials/google_default/google_default_credentials.h @@ -26,10 +26,10 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/unique_type_name.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" #define GRPC_GOOGLE_CLOUD_SDK_CONFIG_DIRECTORY "gcloud" diff --git a/src/core/lib/security/credentials/iam/iam_credentials.cc b/src/core/lib/security/credentials/iam/iam_credentials.cc index 2d946bda055..0ae40230ea7 100644 --- a/src/core/lib/security/credentials/iam/iam_credentials.cc +++ b/src/core/lib/security/credentials/iam/iam_credentials.cc @@ -31,11 +31,11 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/surface/api_trace.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/ref_counted_ptr.h" grpc_core::ArenaPromise> grpc_google_iam_credentials::GetRequestMetadata( diff --git a/src/core/lib/security/credentials/iam/iam_credentials.h b/src/core/lib/security/credentials/iam/iam_credentials.h index 129e4d34396..4797ef99f67 100644 --- a/src/core/lib/security/credentials/iam/iam_credentials.h +++ b/src/core/lib/security/credentials/iam/iam_credentials.h @@ -28,11 +28,11 @@ #include #include -#include "src/core/util/unique_type_name.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" class grpc_google_iam_credentials : public grpc_call_credentials { diff --git a/src/core/lib/security/credentials/insecure/insecure_credentials.h b/src/core/lib/security/credentials/insecure/insecure_credentials.h index 09c3fe7ad8a..9e89970f219 100644 --- a/src/core/lib/security/credentials/insecure/insecure_credentials.h +++ b/src/core/lib/security/credentials/insecure/insecure_credentials.h @@ -25,10 +25,10 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/unique_type_name.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/jwt/jwt_credentials.cc b/src/core/lib/security/credentials/jwt/jwt_credentials.cc index 69835b5fedd..55aa7a2f949 100644 --- a/src/core/lib/security/credentials/jwt/jwt_credentials.cc +++ b/src/core/lib/security/credentials/jwt/jwt_credentials.cc @@ -38,16 +38,16 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/security/credentials/call_creds_util.h" #include "src/core/lib/surface/api_trace.h" #include "src/core/lib/transport/metadata_batch.h" -#include "src/core/util/uri.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/uri.h" using grpc_core::Json; diff --git a/src/core/lib/security/credentials/jwt/jwt_credentials.h b/src/core/lib/security/credentials/jwt/jwt_credentials.h index 7dd2a542a7f..e862517b5ec 100644 --- a/src/core/lib/security/credentials/jwt/jwt_credentials.h +++ b/src/core/lib/security/credentials/jwt/jwt_credentials.h @@ -35,13 +35,13 @@ #include #include -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/unique_type_name.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/jwt/json_token.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" class grpc_service_account_jwt_access_credentials diff --git a/src/core/lib/security/credentials/jwt/jwt_verifier.cc b/src/core/lib/security/credentials/jwt/jwt_verifier.cc index 2a72f969f00..20f42dbc5f1 100644 --- a/src/core/lib/security/credentials/jwt/jwt_verifier.cc +++ b/src/core/lib/security/credentials/jwt/jwt_verifier.cc @@ -55,9 +55,6 @@ #include #include -#include "src/core/util/manual_constructor.h" -#include "src/core/util/memory.h" -#include "src/core/util/orphanable.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -66,13 +63,16 @@ #include "src/core/lib/security/credentials/credentials.h" // IWYU pragma: keep #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" -#include "src/core/util/uri.h" #include "src/core/tsi/ssl_types.h" #include "src/core/util/http_client/httpcli.h" #include "src/core/util/http_client/httpcli_ssl_credentials.h" #include "src/core/util/http_client/parser.h" #include "src/core/util/json/json_reader.h" +#include "src/core/util/manual_constructor.h" +#include "src/core/util/memory.h" +#include "src/core/util/orphanable.h" #include "src/core/util/string.h" +#include "src/core/util/uri.h" using grpc_core::Json; diff --git a/src/core/lib/security/credentials/jwt/jwt_verifier.h b/src/core/lib/security/credentials/jwt/jwt_verifier.h index 0c0fa0686fb..9ff8ca53831 100644 --- a/src/core/lib/security/credentials/jwt/jwt_verifier.h +++ b/src/core/lib/security/credentials/jwt/jwt_verifier.h @@ -24,9 +24,9 @@ #include #include -#include "src/core/util/time.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/util/json/json.h" +#include "src/core/util/time.h" // --- Constants. --- diff --git a/src/core/lib/security/credentials/local/local_credentials.h b/src/core/lib/security/credentials/local/local_credentials.h index 61fe220634f..e0a5d37f8c9 100644 --- a/src/core/lib/security/credentials/local/local_credentials.h +++ b/src/core/lib/security/credentials/local/local_credentials.h @@ -26,10 +26,10 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/unique_type_name.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" // Main class for grpc local channel credential. diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc index 5c267deab89..ebd222bca33 100644 --- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc +++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc @@ -47,10 +47,6 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/util/load_file.h" -#include "src/core/util/memory.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/status_helper.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/promise/context.h" @@ -60,10 +56,14 @@ #include "src/core/lib/surface/api_trace.h" #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/transport/metadata_batch.h" -#include "src/core/util/uri.h" #include "src/core/util/http_client/httpcli_ssl_credentials.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" +#include "src/core/util/load_file.h" +#include "src/core/util/memory.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/uri.h" using grpc_core::Json; diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.h b/src/core/lib/security/credentials/oauth2/oauth2_credentials.h index 1047251ae95..17a5f2e5a5e 100644 --- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.h +++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.h @@ -32,11 +32,6 @@ #include #include -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" -#include "src/core/util/unique_type_name.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/polling_entity.h" @@ -45,10 +40,15 @@ #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/transport.h" -#include "src/core/util/uri.h" #include "src/core/util/http_client/httpcli.h" #include "src/core/util/http_client/parser.h" #include "src/core/util/json/json.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" +#include "src/core/util/unique_type_name.h" +#include "src/core/util/uri.h" #include "src/core/util/useful.h" // Constants. diff --git a/src/core/lib/security/credentials/plugin/plugin_credentials.h b/src/core/lib/security/credentials/plugin/plugin_credentials.h index 3442632e5e6..9d4b99c1a5e 100644 --- a/src/core/lib/security/credentials/plugin/plugin_credentials.h +++ b/src/core/lib/security/credentials/plugin/plugin_credentials.h @@ -36,9 +36,6 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/util/ref_counted.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/unique_type_name.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/promise/poll.h" @@ -46,6 +43,9 @@ #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" extern grpc_core::TraceFlag grpc_plugin_credentials_trace; diff --git a/src/core/lib/security/credentials/ssl/ssl_credentials.h b/src/core/lib/security/credentials/ssl/ssl_credentials.h index a40e7c3887b..6fee445c3a3 100644 --- a/src/core/lib/security/credentials/ssl/ssl_credentials.h +++ b/src/core/lib/security/credentials/ssl/ssl_credentials.h @@ -30,12 +30,12 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/unique_type_name.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/security/security_connector/ssl/ssl_security_connector.h" #include "src/core/tsi/ssl_transport_security.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" class grpc_ssl_credentials : public grpc_channel_credentials { diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h b/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h index 6c8ff6908cd..f34e664d581 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h +++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h @@ -30,10 +30,10 @@ #include -#include "src/core/util/ref_counted.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/security_connector/ssl_utils.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/sync.h" struct grpc_tls_identity_pairs { grpc_core::PemKeyCertPairList pem_key_cert_pairs; diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc b/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc index e27770d7125..ae4167726c5 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc +++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc @@ -33,14 +33,14 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/util/load_file.h" -#include "src/core/util/stat.h" -#include "src/core/util/status_helper.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/surface/api_trace.h" +#include "src/core/util/load_file.h" +#include "src/core/util/stat.h" +#include "src/core/util/status_helper.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h b/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h index 2121642c735..40c958a8edc 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h +++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h @@ -33,13 +33,13 @@ #include #include +#include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h" +#include "src/core/lib/security/security_connector/ssl_utils.h" #include "src/core/util/ref_counted.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/sync.h" #include "src/core/util/thd.h" #include "src/core/util/unique_type_name.h" -#include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h" -#include "src/core/lib/security/security_connector/ssl_utils.h" #include "src/core/util/useful.h" // Interface for a grpc_tls_certificate_provider that handles the process to diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.cc b/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.cc index 9983371a8d4..71318143214 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.cc +++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.cc @@ -30,10 +30,10 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/util/host_port.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/security/credentials/tls/tls_utils.h" #include "src/core/lib/surface/api_trace.h" +#include "src/core/util/host_port.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc b/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc index 260a62d30ab..2b8f2469144 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc +++ b/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc @@ -28,10 +28,10 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/util/debug_location.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/api_trace.h" #include "src/core/tsi/ssl_transport_security.h" +#include "src/core/util/debug_location.h" /// -- Wrapper APIs declared in grpc_security.h -- * diff --git a/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.cc b/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.cc index 5c422057554..231efa320b3 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.cc +++ b/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.cc @@ -44,10 +44,10 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/util/directory_reader.h" -#include "src/core/util/load_file.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/directory_reader.h" +#include "src/core/util/load_file.h" namespace grpc_core { namespace experimental { diff --git a/src/core/lib/security/credentials/tls/tls_credentials.h b/src/core/lib/security/credentials/tls/tls_credentials.h index 1ccf2efda1e..fd78967d8f5 100644 --- a/src/core/lib/security/credentials/tls/tls_credentials.h +++ b/src/core/lib/security/credentials/tls/tls_credentials.h @@ -25,10 +25,10 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/unique_type_name.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" class TlsCredentials final : public grpc_channel_credentials { public: diff --git a/src/core/lib/security/credentials/xds/xds_credentials.h b/src/core/lib/security/credentials/xds/xds_credentials.h index 21d7ce6b3b6..554d7a57f26 100644 --- a/src/core/lib/security/credentials/xds/xds_credentials.h +++ b/src/core/lib/security/credentials/xds/xds_credentials.h @@ -34,12 +34,12 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/unique_type_name.h" -#include "src/core/util/matchers.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h" #include "src/core/lib/security/security_connector/security_connector.h" +#include "src/core/util/matchers.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" #include "src/core/xds/grpc/xds_certificate_provider.h" namespace grpc_core { diff --git a/src/core/lib/security/security_connector/alts/alts_security_connector.cc b/src/core/lib/security/security_connector/alts/alts_security_connector.cc index 14279e7a69d..fd4cb79d3b9 100644 --- a/src/core/lib/security/security_connector/alts/alts_security_connector.cc +++ b/src/core/lib/security/security_connector/alts/alts_security_connector.cc @@ -40,8 +40,6 @@ #include "src/core/handshaker/handshaker.h" #include "src/core/handshaker/security/security_handshaker.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -56,6 +54,8 @@ #include "src/core/lib/transport/transport.h" #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h" #include "src/core/tsi/transport_security.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" void grpc_alts_set_rpc_protocol_versions( grpc_gcp_rpc_protocol_versions* rpc_versions) { diff --git a/src/core/lib/security/security_connector/alts/alts_security_connector.h b/src/core/lib/security/security_connector/alts/alts_security_connector.h index 0e3bce8885d..5fe144a5e7d 100644 --- a/src/core/lib/security/security_connector/alts/alts_security_connector.h +++ b/src/core/lib/security/security_connector/alts/alts_security_connector.h @@ -23,10 +23,10 @@ #include #include -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/tsi/alts/handshaker/transport_security_common_api.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/ref_counted_ptr.h" #define GRPC_ALTS_TRANSPORT_SECURITY_TYPE "alts" diff --git a/src/core/lib/security/security_connector/fake/fake_security_connector.cc b/src/core/lib/security/security_connector/fake/fake_security_connector.cc index b32b7476959..9e83b54ba27 100644 --- a/src/core/lib/security/security_connector/fake/fake_security_connector.cc +++ b/src/core/lib/security/security_connector/fake/fake_security_connector.cc @@ -41,10 +41,6 @@ #include "src/core/handshaker/handshaker.h" #include "src/core/handshaker/security/security_handshaker.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/crash.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/host_port.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -58,6 +54,10 @@ #include "src/core/load_balancing/grpclb/grpclb.h" #include "src/core/tsi/fake_transport_security.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/host_port.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/string.h" #include "src/core/util/useful.h" diff --git a/src/core/lib/security/security_connector/fake/fake_security_connector.h b/src/core/lib/security/security_connector/fake/fake_security_connector.h index 8f2eb5c74d9..3801af09fbc 100644 --- a/src/core/lib/security/security_connector/fake/fake_security_connector.h +++ b/src/core/lib/security/security_connector/fake/fake_security_connector.h @@ -24,8 +24,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/security/security_connector/security_connector.h" +#include "src/core/util/ref_counted_ptr.h" // Creates a fake connector that emulates real channel security. grpc_core::RefCountedPtr diff --git a/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc b/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc index 6dc482d90cd..c40399cd4b2 100644 --- a/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc +++ b/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc @@ -28,12 +28,12 @@ #include "src/core/handshaker/security/security_handshaker.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/tsi/local_transport_security.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/security/security_connector/insecure/insecure_security_connector.h b/src/core/lib/security/security_connector/insecure/insecure_security_connector.h index 4ad79f16fb0..9fc962b92ca 100644 --- a/src/core/lib/security/security_connector/insecure/insecure_security_connector.h +++ b/src/core/lib/security/security_connector/insecure/insecure_security_connector.h @@ -31,7 +31,6 @@ #include "src/core/handshaker/handshaker.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -40,6 +39,7 @@ #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/security/security_connector/load_system_roots_supported.cc b/src/core/lib/security/security_connector/load_system_roots_supported.cc index ec1f9250458..c0c264ebd4e 100644 --- a/src/core/lib/security/security_connector/load_system_roots_supported.cc +++ b/src/core/lib/security/security_connector/load_system_roots_supported.cc @@ -38,10 +38,10 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/util/load_file.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/security_connector/load_system_roots.h" #include "src/core/lib/security/security_connector/load_system_roots_supported.h" +#include "src/core/util/load_file.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/lib/security/security_connector/local/local_security_connector.cc b/src/core/lib/security/security_connector/local/local_security_connector.cc index 0776450e817..e5f00ecf672 100644 --- a/src/core/lib/security/security_connector/local/local_security_connector.cc +++ b/src/core/lib/security/security_connector/local/local_security_connector.cc @@ -43,8 +43,6 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -59,10 +57,12 @@ #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/local/local_credentials.h" -#include "src/core/util/uri.h" #include "src/core/tsi/local_transport_security.h" #include "src/core/tsi/transport_security.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/uri.h" #define GRPC_UDS_URI_PATTERN "unix:" #define GRPC_ABSTRACT_UDS_URI_PATTERN "unix-abstract:" diff --git a/src/core/lib/security/security_connector/local/local_security_connector.h b/src/core/lib/security/security_connector/local/local_security_connector.h index adbef4661dd..3475d8f033a 100644 --- a/src/core/lib/security/security_connector/local/local_security_connector.h +++ b/src/core/lib/security/security_connector/local/local_security_connector.h @@ -24,8 +24,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/security/security_connector/security_connector.h" +#include "src/core/util/ref_counted_ptr.h" /// /// This method creates a local channel security connector. diff --git a/src/core/lib/security/security_connector/security_connector.cc b/src/core/lib/security/security_connector/security_connector.cc index 7e86bf68c1c..f9be7f494bc 100644 --- a/src/core/lib/security/security_connector/security_connector.cc +++ b/src/core/lib/security/security_connector/security_connector.cc @@ -28,8 +28,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/debug_location.h" #include "src/core/lib/security/credentials/credentials.h" +#include "src/core/util/debug_location.h" #include "src/core/util/useful.h" grpc_core::DebugOnlyTraceFlag grpc_trace_security_connector_refcount( diff --git a/src/core/lib/security/security_connector/security_connector.h b/src/core/lib/security/security_connector/security_connector.h index 4f4419cd9c8..80a0ff5e9eb 100644 --- a/src/core/lib/security/security_connector/security_connector.h +++ b/src/core/lib/security/security_connector/security_connector.h @@ -32,15 +32,15 @@ #include "src/core/handshaker/handshaker.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/ref_counted.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/unique_type_name.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" extern grpc_core::DebugOnlyTraceFlag grpc_trace_security_connector_refcount; diff --git a/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc b/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc index 25dba4ecac3..50dc105349c 100644 --- a/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc +++ b/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc @@ -38,10 +38,6 @@ #include "src/core/handshaker/handshaker.h" #include "src/core/handshaker/security/security_handshaker.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/host_port.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -56,6 +52,10 @@ #include "src/core/tsi/ssl_transport_security.h" #include "src/core/tsi/transport_security.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/host_port.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" namespace { grpc_error_handle ssl_check_peer( diff --git a/src/core/lib/security/security_connector/ssl/ssl_security_connector.h b/src/core/lib/security/security_connector/ssl/ssl_security_connector.h index 5cddd00cc40..5362e7503bc 100644 --- a/src/core/lib/security/security_connector/ssl/ssl_security_connector.h +++ b/src/core/lib/security/security_connector/ssl/ssl_security_connector.h @@ -26,9 +26,9 @@ #include #include -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/tsi/ssl_transport_security.h" +#include "src/core/util/ref_counted_ptr.h" struct grpc_ssl_config { tsi_ssl_pem_key_cert_pair* pem_key_cert_pair; diff --git a/src/core/lib/security/security_connector/ssl_utils.cc b/src/core/lib/security/security_connector/ssl_utils.cc index f1a800e7b10..c1c0e192cac 100644 --- a/src/core/lib/security/security_connector/ssl_utils.cc +++ b/src/core/lib/security/security_connector/ssl_utils.cc @@ -44,13 +44,13 @@ #include "src/core/ext/transport/chttp2/alpn/alpn.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/util/host_port.h" -#include "src/core/util/load_file.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/security_connector/load_system_roots.h" #include "src/core/tsi/ssl_transport_security.h" #include "src/core/tsi/transport_security.h" +#include "src/core/util/host_port.h" +#include "src/core/util/load_file.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/useful.h" // -- Constants. -- diff --git a/src/core/lib/security/security_connector/ssl_utils.h b/src/core/lib/security/security_connector/ssl_utils.h index 8f11b7ed65b..f60b679c763 100644 --- a/src/core/lib/security/security_connector/ssl_utils.h +++ b/src/core/lib/security/security_connector/ssl_utils.h @@ -35,12 +35,12 @@ #include #include -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/tsi/ssl/key_logging/ssl_key_logging.h" #include "src/core/tsi/ssl_transport_security.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/ref_counted_ptr.h" // --- Util --- diff --git a/src/core/lib/security/security_connector/tls/tls_security_connector.cc b/src/core/lib/security/security_connector/tls/tls_security_connector.cc index 05482d966f7..64a698b0138 100644 --- a/src/core/lib/security/security_connector/tls/tls_security_connector.cc +++ b/src/core/lib/security/security_connector/tls/tls_security_connector.cc @@ -39,9 +39,6 @@ #include "src/core/handshaker/security/security_handshaker.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/host_port.h" -#include "src/core/util/status_helper.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/security/context/security_context.h" @@ -50,6 +47,9 @@ #include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h" #include "src/core/lib/security/security_connector/ssl_utils.h" #include "src/core/tsi/ssl_transport_security.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/host_port.h" +#include "src/core/util/status_helper.h" namespace grpc_core { diff --git a/src/core/lib/security/security_connector/tls/tls_security_connector.h b/src/core/lib/security/security_connector/tls/tls_security_connector.h index 122f359c194..3c4e90436dc 100644 --- a/src/core/lib/security/security_connector/tls/tls_security_connector.h +++ b/src/core/lib/security/security_connector/tls/tls_security_connector.h @@ -34,8 +34,6 @@ #include "src/core/handshaker/handshaker.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -47,6 +45,8 @@ #include "src/core/tsi/ssl/key_logging/ssl_key_logging.h" #include "src/core/tsi/ssl_transport_security.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" using TlsSessionKeyLogger = tsi::TlsSessionKeyLoggerCache::TlsSessionKeyLogger; diff --git a/src/core/lib/security/transport/auth_filters.h b/src/core/lib/security/transport/auth_filters.h index 92860cef5b3..8ed330dcd1a 100644 --- a/src/core/lib/security/transport/auth_filters.h +++ b/src/core/lib/security/transport/auth_filters.h @@ -30,11 +30,11 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/security/transport/client_auth_filter.cc b/src/core/lib/security/transport/client_auth_filter.cc index 12fc061b965..323c9c95921 100644 --- a/src/core/lib/security/transport/client_auth_filter.cc +++ b/src/core/lib/security/transport/client_auth_filter.cc @@ -39,8 +39,6 @@ #include "src/core/lib/channel/context.h" #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/lib/channel/status_util.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/promise.h" @@ -53,6 +51,8 @@ #include "src/core/lib/security/transport/auth_filters.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" #define MAX_CREDENTIALS_METADATA_COUNT 4 diff --git a/src/core/lib/security/transport/server_auth_filter.cc b/src/core/lib/security/transport/server_auth_filter.cc index 13ede6f4d41..6a15b733ed9 100644 --- a/src/core/lib/security/transport/server_auth_filter.cc +++ b/src/core/lib/security/transport/server_auth_filter.cc @@ -41,9 +41,6 @@ #include "src/core/lib/channel/context.h" #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/status_helper.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/activity.h" @@ -60,6 +57,9 @@ #include "src/core/lib/surface/call_trace.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" namespace grpc_core { diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc index 997f63b1e85..59d00c6bbca 100644 --- a/src/core/lib/slice/slice.cc +++ b/src/core/lib/slice/slice.cc @@ -29,9 +29,9 @@ #include #include -#include "src/core/util/memory.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_refcount.h" +#include "src/core/util/memory.h" char* grpc_slice_to_c_string(grpc_slice slice) { char* out = static_cast(gpr_malloc(GRPC_SLICE_LENGTH(slice) + 1)); diff --git a/src/core/lib/slice/slice.h b/src/core/lib/slice/slice.h index e24d40a88b9..d24d796c34c 100644 --- a/src/core/lib/slice/slice.h +++ b/src/core/lib/slice/slice.h @@ -30,9 +30,9 @@ #include #include -#include "src/core/util/debug_location.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_refcount.h" +#include "src/core/util/debug_location.h" #include "src/core/util/string.h" // Herein lies grpc_core::Slice and its team of thin wrappers around grpc_slice. diff --git a/src/core/lib/surface/call.cc b/src/core/lib/surface/call.cc index 0c018b8d2d9..110ceea9552 100644 --- a/src/core/lib/surface/call.cc +++ b/src/core/lib/surface/call.cc @@ -63,14 +63,6 @@ #include "src/core/lib/channel/status_util.h" #include "src/core/lib/compression/compression_internal.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/bitset.h" -#include "src/core/util/cpp_impl_of.h" -#include "src/core/util/crash.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/ref_counted.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/polling_entity.h" @@ -105,6 +97,14 @@ #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" #include "src/core/util/alloc.h" +#include "src/core/util/bitset.h" +#include "src/core/util/cpp_impl_of.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/sync.h" #include "src/core/util/time_precise.h" #include "src/core/util/useful.h" diff --git a/src/core/lib/surface/call.h b/src/core/lib/surface/call.h index a6be2e8e572..664f3ffad99 100644 --- a/src/core/lib/surface/call.h +++ b/src/core/lib/surface/call.h @@ -38,8 +38,6 @@ #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/context.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" @@ -51,6 +49,8 @@ #include "src/core/lib/surface/channel.h" #include "src/core/lib/transport/transport.h" #include "src/core/server/server_interface.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/core/util/time_precise.h" typedef void (*grpc_ioreq_completion_func)(grpc_call* call, int success, diff --git a/src/core/lib/surface/channel.h b/src/core/lib/surface/channel.h index 1bbca616e0e..f4bccbc53bf 100644 --- a/src/core/lib/surface/channel.h +++ b/src/core/lib/surface/channel.h @@ -33,11 +33,6 @@ #include "src/core/channelz/channelz.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/cpp_impl_of.h" -#include "src/core/util/ref_counted.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/resource_quota.h" @@ -45,6 +40,11 @@ #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/call_arena_allocator.h" #include "src/core/lib/transport/connectivity_state.h" +#include "src/core/util/cpp_impl_of.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" // Forward declaration to avoid dependency loop. struct grpc_channel_stack; diff --git a/src/core/lib/surface/channel_create.h b/src/core/lib/surface/channel_create.h index ca7383af9b1..708811d14d2 100644 --- a/src/core/lib/surface/channel_create.h +++ b/src/core/lib/surface/channel_create.h @@ -24,9 +24,9 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/orphanable.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/channel_stack_type.h" +#include "src/core/util/orphanable.h" namespace grpc_core { diff --git a/src/core/lib/surface/channel_init.cc b/src/core/lib/surface/channel_init.cc index 67cb9d3b12f..891046c15be 100644 --- a/src/core/lib/surface/channel_init.cc +++ b/src/core/lib/surface/channel_init.cc @@ -38,9 +38,9 @@ #include "src/core/lib/channel/channel_stack_trace.h" #include "src/core/lib/debug/trace.h" +#include "src/core/lib/surface/channel_stack_type.h" #include "src/core/util/crash.h" #include "src/core/util/sync.h" -#include "src/core/lib/surface/channel_stack_type.h" namespace grpc_core { diff --git a/src/core/lib/surface/channel_init.h b/src/core/lib/surface/channel_init.h index dd350d03b9f..1036a439e78 100644 --- a/src/core/lib/surface/channel_init.h +++ b/src/core/lib/surface/channel_init.h @@ -35,10 +35,10 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack_builder.h" -#include "src/core/util/debug_location.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/call_filters.h" #include "src/core/lib/transport/interception_chain.h" +#include "src/core/util/debug_location.h" /// This module provides a way for plugins (and the grpc core library itself) /// to register mutators for channel stacks. diff --git a/src/core/lib/surface/completion_queue.cc b/src/core/lib/surface/completion_queue.cc index ba9b0366013..d4b49b29009 100644 --- a/src/core/lib/surface/completion_queue.cc +++ b/src/core/lib/surface/completion_queue.cc @@ -41,11 +41,6 @@ #include #include -#include "src/core/util/atomic_utils.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/ref_counted.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/executor.h" @@ -55,7 +50,12 @@ #include "src/core/lib/surface/event_string.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/atomic_utils.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted.h" #include "src/core/util/spinlock.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" #ifdef GPR_WINDOWS #include "src/core/lib/experiments/experiments.h" diff --git a/src/core/lib/surface/completion_queue.h b/src/core/lib/surface/completion_queue.h index 5ea43c6e189..fd7cb0d92b4 100644 --- a/src/core/lib/surface/completion_queue.h +++ b/src/core/lib/surface/completion_queue.h @@ -27,10 +27,10 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/util/manual_constructor.h" -#include "src/core/util/mpscq.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" +#include "src/core/util/manual_constructor.h" +#include "src/core/util/mpscq.h" // These trace flags default to 1. The corresponding lines are only traced // if grpc_api_trace is also truthy diff --git a/src/core/lib/surface/init.cc b/src/core/lib/surface/init.cc index 39ce8d6afcd..46e846bba7e 100644 --- a/src/core/lib/surface/init.cc +++ b/src/core/lib/surface/init.cc @@ -34,9 +34,6 @@ #include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/posix_engine/timer_manager.h" #include "src/core/lib/experiments/config.h" -#include "src/core/util/fork.h" -#include "src/core/util/sync.h" -#include "src/core/util/thd.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/timer_manager.h" @@ -47,6 +44,9 @@ #include "src/core/lib/surface/api_trace.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/surface/init_internally.h" +#include "src/core/util/fork.h" +#include "src/core/util/sync.h" +#include "src/core/util/thd.h" // Remnants of the old plugin system void grpc_resolver_dns_ares_init(void); diff --git a/src/core/lib/surface/lame_client.cc b/src/core/lib/surface/lame_client.cc index d453fcca7e4..5531303bb7e 100644 --- a/src/core/lib/surface/lame_client.cc +++ b/src/core/lib/surface/lame_client.cc @@ -36,9 +36,6 @@ #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/pipe.h" #include "src/core/lib/promise/promise.h" @@ -48,6 +45,9 @@ #include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" #include "src/core/util/useful.h" // Avoid some IWYU confusion: diff --git a/src/core/lib/surface/lame_client.h b/src/core/lib/surface/lame_client.h index b40f26b29af..173927fcc42 100644 --- a/src/core/lib/surface/lame_client.h +++ b/src/core/lib/surface/lame_client.h @@ -31,11 +31,11 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/sync.h" #define GRPC_ARG_LAME_FILTER_ERROR "grpc.lame_filter_error" diff --git a/src/core/lib/surface/legacy_channel.cc b/src/core/lib/surface/legacy_channel.cc index ede77376326..683c222f84b 100644 --- a/src/core/lib/surface/legacy_channel.cc +++ b/src/core/lib/surface/legacy_channel.cc @@ -37,11 +37,6 @@ #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack_builder_impl.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/crash.h" -#include "src/core/util/dual_ref_counted.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -57,6 +52,11 @@ #include "src/core/telemetry/metrics.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/crash.h" +#include "src/core/util/dual_ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/lib/surface/legacy_channel.h b/src/core/lib/surface/legacy_channel.h index fa54973b3af..ec9919dc585 100644 --- a/src/core/lib/surface/legacy_channel.h +++ b/src/core/lib/surface/legacy_channel.h @@ -32,8 +32,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" // IWYU pragma: keep -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/surface/channel.h" @@ -41,6 +39,8 @@ #include "src/core/lib/transport/call_arena_allocator.h" #include "src/core/lib/transport/transport.h" #include "src/core/telemetry/stats.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/lib/surface/validate_metadata.cc b/src/core/lib/surface/validate_metadata.cc index 46aaaa55bfe..3a68a673c04 100644 --- a/src/core/lib/surface/validate_metadata.cc +++ b/src/core/lib/surface/validate_metadata.cc @@ -24,9 +24,9 @@ #include #include -#include "src/core/util/bitset.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/bitset.h" namespace grpc_core { diff --git a/src/core/lib/surface/wait_for_cq_end_op.cc b/src/core/lib/surface/wait_for_cq_end_op.cc index f45000e4d82..e2c2a3af8aa 100644 --- a/src/core/lib/surface/wait_for_cq_end_op.cc +++ b/src/core/lib/surface/wait_for_cq_end_op.cc @@ -18,8 +18,8 @@ #include -#include "src/core/util/match.h" #include "src/core/lib/promise/trace.h" +#include "src/core/util/match.h" namespace grpc_core { Poll WaitForCqEndOp::operator()() { diff --git a/src/core/lib/transport/batch_builder.h b/src/core/lib/transport/batch_builder.h index 1e5fb73d631..9fd6e6a624d 100644 --- a/src/core/lib/transport/batch_builder.h +++ b/src/core/lib/transport/batch_builder.h @@ -33,8 +33,6 @@ #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/status_helper.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/promise/activity.h" @@ -48,6 +46,8 @@ #include "src/core/lib/surface/call_trace.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" namespace grpc_core { diff --git a/src/core/lib/transport/call_arena_allocator.h b/src/core/lib/transport/call_arena_allocator.h index c0907fe67f7..692c95693a8 100644 --- a/src/core/lib/transport/call_arena_allocator.h +++ b/src/core/lib/transport/call_arena_allocator.h @@ -22,9 +22,9 @@ #include -#include "src/core/util/ref_counted.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" +#include "src/core/util/ref_counted.h" namespace grpc_core { diff --git a/src/core/lib/transport/call_destination.h b/src/core/lib/transport/call_destination.h index 82719b698c2..5caf299d387 100644 --- a/src/core/lib/transport/call_destination.h +++ b/src/core/lib/transport/call_destination.h @@ -17,8 +17,8 @@ #include -#include "src/core/util/orphanable.h" #include "src/core/lib/transport/call_spine.h" +#include "src/core/util/orphanable.h" namespace grpc_core { diff --git a/src/core/lib/transport/call_filters.cc b/src/core/lib/transport/call_filters.cc index f11a96c210b..9acd31262bc 100644 --- a/src/core/lib/transport/call_filters.cc +++ b/src/core/lib/transport/call_filters.cc @@ -18,8 +18,8 @@ #include -#include "src/core/util/crash.h" #include "src/core/lib/transport/metadata.h" +#include "src/core/util/crash.h" namespace grpc_core { diff --git a/src/core/lib/transport/call_filters.h b/src/core/lib/transport/call_filters.h index 0eab480f9f8..c3e09a2e08e 100644 --- a/src/core/lib/transport/call_filters.h +++ b/src/core/lib/transport/call_filters.h @@ -23,9 +23,6 @@ #include -#include "src/core/util/dump_args.h" -#include "src/core/util/ref_counted.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/promise/latch.h" #include "src/core/lib/promise/map.h" #include "src/core/lib/promise/promise.h" @@ -33,6 +30,9 @@ #include "src/core/lib/transport/call_final_info.h" #include "src/core/lib/transport/message.h" #include "src/core/lib/transport/metadata.h" +#include "src/core/util/dump_args.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" // CallFilters tracks a list of filters that are attached to a call. // At a high level, a filter (for the purposes of this module) is a class diff --git a/src/core/lib/transport/call_spine.h b/src/core/lib/transport/call_spine.h index 6e6da6f3593..24918104b9b 100644 --- a/src/core/lib/transport/call_spine.h +++ b/src/core/lib/transport/call_spine.h @@ -21,7 +21,6 @@ #include #include "src/core/lib/channel/context.h" -#include "src/core/util/dual_ref_counted.h" #include "src/core/lib/promise/detail/status.h" #include "src/core/lib/promise/if.h" #include "src/core/lib/promise/latch.h" @@ -35,6 +34,7 @@ #include "src/core/lib/transport/call_filters.h" #include "src/core/lib/transport/message.h" #include "src/core/lib/transport/metadata.h" +#include "src/core/util/dual_ref_counted.h" namespace grpc_core { diff --git a/src/core/lib/transport/connectivity_state.cc b/src/core/lib/transport/connectivity_state.cc index 93c6df8d030..cc759e9409a 100644 --- a/src/core/lib/transport/connectivity_state.cc +++ b/src/core/lib/transport/connectivity_state.cc @@ -21,11 +21,11 @@ #include #include -#include "src/core/util/debug_location.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/transport/error_utils.cc b/src/core/lib/transport/error_utils.cc index 97804bcf4bc..4a59efe3deb 100644 --- a/src/core/lib/transport/error_utils.cc +++ b/src/core/lib/transport/error_utils.cc @@ -25,8 +25,8 @@ #include #include -#include "src/core/util/status_helper.h" #include "src/core/lib/transport/status_conversion.h" +#include "src/core/util/status_helper.h" static grpc_error_handle recursively_find_error_with_field( grpc_error_handle error, grpc_core::StatusIntProperty which) { diff --git a/src/core/lib/transport/error_utils.h b/src/core/lib/transport/error_utils.h index c32f085171d..9510081d004 100644 --- a/src/core/lib/transport/error_utils.h +++ b/src/core/lib/transport/error_utils.h @@ -26,9 +26,9 @@ #include #include -#include "src/core/util/time.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/transport/http2_errors.h" +#include "src/core/util/time.h" /// A utility function to get the status code and message to be returned /// to the application. If not set in the top-level message, looks diff --git a/src/core/lib/transport/interception_chain.cc b/src/core/lib/transport/interception_chain.cc index a008cadf0f8..19946e048db 100644 --- a/src/core/lib/transport/interception_chain.cc +++ b/src/core/lib/transport/interception_chain.cc @@ -18,11 +18,11 @@ #include -#include "src/core/util/match.h" #include "src/core/lib/transport/call_destination.h" #include "src/core/lib/transport/call_filters.h" #include "src/core/lib/transport/call_spine.h" #include "src/core/lib/transport/metadata.h" +#include "src/core/util/match.h" namespace grpc_core { diff --git a/src/core/lib/transport/interception_chain.h b/src/core/lib/transport/interception_chain.h index 125bfa707d7..62c4cbd09c7 100644 --- a/src/core/lib/transport/interception_chain.h +++ b/src/core/lib/transport/interception_chain.h @@ -20,11 +20,11 @@ #include -#include "src/core/util/ref_counted.h" #include "src/core/lib/transport/call_destination.h" #include "src/core/lib/transport/call_filters.h" #include "src/core/lib/transport/call_spine.h" #include "src/core/lib/transport/metadata.h" +#include "src/core/util/ref_counted.h" namespace grpc_core { diff --git a/src/core/lib/transport/metadata_batch.h b/src/core/lib/transport/metadata_batch.h index 5bbb92379ac..e2f80ad6595 100644 --- a/src/core/lib/transport/metadata_batch.h +++ b/src/core/lib/transport/metadata_batch.h @@ -41,17 +41,17 @@ #include "src/core/lib/compression/compression_internal.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/chunked_vector.h" -#include "src/core/util/if_list.h" -#include "src/core/util/packed_table.h" -#include "src/core/util/time.h" -#include "src/core/util/type_list.h" #include "src/core/lib/promise/poll.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/custom_metadata.h" #include "src/core/lib/transport/metadata_compression_traits.h" #include "src/core/lib/transport/parsed_metadata.h" #include "src/core/lib/transport/simple_slice_based_metadata.h" +#include "src/core/util/chunked_vector.h" +#include "src/core/util/if_list.h" +#include "src/core/util/packed_table.h" +#include "src/core/util/time.h" +#include "src/core/util/type_list.h" namespace grpc_core { diff --git a/src/core/lib/transport/parsed_metadata.h b/src/core/lib/transport/parsed_metadata.h index 8833ff8ba28..1ea9c9a2e4a 100644 --- a/src/core/lib/transport/parsed_metadata.h +++ b/src/core/lib/transport/parsed_metadata.h @@ -32,8 +32,8 @@ #include #include -#include "src/core/util/time.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/lib/transport/promise_endpoint.cc b/src/core/lib/transport/promise_endpoint.cc index 3872cfc38c5..b94864e4f87 100644 --- a/src/core/lib/transport/promise_endpoint.cc +++ b/src/core/lib/transport/promise_endpoint.cc @@ -29,8 +29,8 @@ #include #include -#include "src/core/util/sync.h" #include "src/core/lib/slice/slice_buffer.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/lib/transport/promise_endpoint.h b/src/core/lib/transport/promise_endpoint.h index 02252736083..cb80a1fffe2 100644 --- a/src/core/lib/transport/promise_endpoint.h +++ b/src/core/lib/transport/promise_endpoint.h @@ -39,7 +39,6 @@ #include "src/core/lib/event_engine/extensions/chaotic_good_extension.h" #include "src/core/lib/event_engine/query_extensions.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/cancel_callback.h" @@ -48,6 +47,7 @@ #include "src/core/lib/promise/poll.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_buffer.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/lib/transport/status_conversion.h b/src/core/lib/transport/status_conversion.h index 3c169873257..713321d4ea4 100644 --- a/src/core/lib/transport/status_conversion.h +++ b/src/core/lib/transport/status_conversion.h @@ -22,8 +22,8 @@ #include #include -#include "src/core/util/time.h" #include "src/core/lib/transport/http2_errors.h" +#include "src/core/util/time.h" // Conversion of grpc status codes to http2 error codes (for RST_STREAM) grpc_http2_error_code grpc_status_to_http2_error(grpc_status_code status); diff --git a/src/core/lib/transport/timeout_encoding.h b/src/core/lib/transport/timeout_encoding.h index 62f29ce7cfe..9957640a95b 100644 --- a/src/core/lib/transport/timeout_encoding.h +++ b/src/core/lib/transport/timeout_encoding.h @@ -25,8 +25,8 @@ #include -#include "src/core/util/time.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/lib/transport/transport.cc b/src/core/lib/transport/transport.cc index 370ae142d1d..e8d471ae989 100644 --- a/src/core/lib/transport/transport.cc +++ b/src/core/lib/transport/transport.cc @@ -32,13 +32,13 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/for_each.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/promise/try_seq.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/util/time.h" grpc_core::DebugOnlyTraceFlag grpc_trace_stream_refcount(false, "stream_refcount"); diff --git a/src/core/lib/transport/transport.h b/src/core/lib/transport/transport.h index 2f021ae6886..ec57eeea24c 100644 --- a/src/core/lib/transport/transport.h +++ b/src/core/lib/transport/transport.h @@ -41,8 +41,6 @@ #include "src/core/lib/channel/context.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" @@ -63,6 +61,8 @@ #include "src/core/lib/transport/metadata.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport_fwd.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" // Minimum and maximum protocol accepted versions. #define GRPC_PROTOCOL_VERSION_MAX_MAJOR 2 diff --git a/src/core/lib/transport/transport_op_string.cc b/src/core/lib/transport/transport_op_string.cc index 6e1f06af305..4f913c5737d 100644 --- a/src/core/lib/transport/transport_op_string.cc +++ b/src/core/lib/transport/transport_op_string.cc @@ -26,12 +26,12 @@ #include #include "src/core/lib/channel/channel_fwd.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/status_helper.h" #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/status_helper.h" // These routines are here to facilitate debugging - they produce string // representations of various transport data structures diff --git a/src/core/load_balancing/address_filtering.cc b/src/core/load_balancing/address_filtering.cc index 7905002873f..fe9834b170d 100644 --- a/src/core/load_balancing/address_filtering.cc +++ b/src/core/load_balancing/address_filtering.cc @@ -25,8 +25,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/resolved_address.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/load_balancing/address_filtering.h b/src/core/load_balancing/address_filtering.h index e14df20157c..7b7fda9ac74 100644 --- a/src/core/load_balancing/address_filtering.h +++ b/src/core/load_balancing/address_filtering.h @@ -27,9 +27,9 @@ #include +#include "src/core/resolver/endpoint_addresses.h" #include "src/core/util/ref_counted.h" #include "src/core/util/ref_counted_string.h" -#include "src/core/resolver/endpoint_addresses.h" // The resolver returns a flat list of addresses. When a hierarchy of // LB policies is in use, each leaf of the hierarchy will need a diff --git a/src/core/load_balancing/child_policy_handler.cc b/src/core/load_balancing/child_policy_handler.cc index d7ed6109beb..7f20903bced 100644 --- a/src/core/load_balancing/child_policy_handler.cc +++ b/src/core/load_balancing/child_policy_handler.cc @@ -30,13 +30,13 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/debug_location.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/transport/connectivity_state.h" #include "src/core/load_balancing/delegating_helper.h" #include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/load_balancing/subchannel_interface.h" +#include "src/core/util/debug_location.h" namespace grpc_core { diff --git a/src/core/load_balancing/child_policy_handler.h b/src/core/load_balancing/child_policy_handler.h index 8f8815fb3e5..79b056a4070 100644 --- a/src/core/load_balancing/child_policy_handler.h +++ b/src/core/load_balancing/child_policy_handler.h @@ -25,9 +25,9 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" +#include "src/core/load_balancing/lb_policy.h" #include "src/core/util/orphanable.h" #include "src/core/util/ref_counted_ptr.h" -#include "src/core/load_balancing/lb_policy.h" namespace grpc_core { diff --git a/src/core/load_balancing/delegating_helper.h b/src/core/load_balancing/delegating_helper.h index ae64ccefea9..0852319d8a9 100644 --- a/src/core/load_balancing/delegating_helper.h +++ b/src/core/load_balancing/delegating_helper.h @@ -28,12 +28,12 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/load_balancing/subchannel_interface.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/load_balancing/endpoint_list.cc b/src/core/load_balancing/endpoint_list.cc index 828fc01729d..3c0338eb61c 100644 --- a/src/core/load_balancing/endpoint_list.cc +++ b/src/core/load_balancing/endpoint_list.cc @@ -34,16 +34,16 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/load_balancing/delegating_helper.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/load_balancing/pick_first/pick_first.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/load_balancing/endpoint_list.h b/src/core/load_balancing/endpoint_list.h index 4a3a91a8129..f515f85ac69 100644 --- a/src/core/load_balancing/endpoint_list.h +++ b/src/core/load_balancing/endpoint_list.h @@ -31,14 +31,14 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/work_serializer.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/load_balancing/subchannel_interface.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/load_balancing/grpclb/client_load_reporting_filter.cc b/src/core/load_balancing/grpclb/client_load_reporting_filter.cc index 0021a5651fc..552b130e57e 100644 --- a/src/core/load_balancing/grpclb/client_load_reporting_filter.cc +++ b/src/core/load_balancing/grpclb/client_load_reporting_filter.cc @@ -28,7 +28,6 @@ #include #include "src/core/lib/channel/channel_stack.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/map.h" #include "src/core/lib/promise/pipe.h" @@ -36,6 +35,7 @@ #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" #include "src/core/load_balancing/grpclb/grpclb_client_stats.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/load_balancing/grpclb/grpclb.cc b/src/core/load_balancing/grpclb/grpclb.cc index a80831df444..ccda200bec5 100644 --- a/src/core/load_balancing/grpclb/grpclb.cc +++ b/src/core/load_balancing/grpclb/grpclb.cc @@ -96,20 +96,10 @@ #include "src/core/channelz/channelz.h" #include "src/core/client_channel/client_channel_filter.h" #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/util/backoff.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/crash.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/time.h" -#include "src/core/util/validation_errors.h" -#include "src/core/util/work_serializer.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -138,11 +128,21 @@ #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/fake/fake_resolver.h" #include "src/core/resolver/resolver.h" +#include "src/core/util/backoff.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" #include "src/core/util/string.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" +#include "src/core/util/validation_errors.h" +#include "src/core/util/work_serializer.h" #define GRPC_GRPCLB_INITIAL_CONNECT_BACKOFF_SECONDS 1 #define GRPC_GRPCLB_RECONNECT_BACKOFF_MULTIPLIER 1.6 diff --git a/src/core/load_balancing/grpclb/load_balancer_api.h b/src/core/load_balancing/grpclb/load_balancer_api.h index 5ecfbc831a9..ebfdd0c84d6 100644 --- a/src/core/load_balancing/grpclb/load_balancer_api.h +++ b/src/core/load_balancing/grpclb/load_balancer_api.h @@ -28,8 +28,8 @@ #include #include -#include "src/core/util/time.h" #include "src/core/load_balancing/grpclb/grpclb_client_stats.h" +#include "src/core/util/time.h" #define GRPC_GRPCLB_SERVICE_NAME_MAX_LENGTH 128 #define GRPC_GRPCLB_SERVER_IP_ADDRESS_MAX_SIZE 16 diff --git a/src/core/load_balancing/health_check_client.cc b/src/core/load_balancing/health_check_client.cc index f988eb2fbd7..af4bab7f61e 100644 --- a/src/core/load_balancing/health_check_client.cc +++ b/src/core/load_balancing/health_check_client.cc @@ -47,11 +47,6 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" -#include "src/core/util/work_serializer.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -61,6 +56,11 @@ #include "src/core/lib/transport/connectivity_state.h" #include "src/core/load_balancing/health_check_client_internal.h" #include "src/core/load_balancing/subchannel_interface.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/work_serializer.h" #include "src/proto/grpc/health/v1/health.upb.h" namespace grpc_core { diff --git a/src/core/load_balancing/health_check_client.h b/src/core/load_balancing/health_check_client.h index eef6e4ba494..9fe4c1cdf17 100644 --- a/src/core/load_balancing/health_check_client.h +++ b/src/core/load_balancing/health_check_client.h @@ -22,8 +22,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/work_serializer.h" #include "src/core/load_balancing/subchannel_interface.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/load_balancing/health_check_client_internal.h b/src/core/load_balancing/health_check_client_internal.h index 1ac15968ffe..cded2e1df8c 100644 --- a/src/core/load_balancing/health_check_client_internal.h +++ b/src/core/load_balancing/health_check_client_internal.h @@ -34,14 +34,14 @@ #include "src/core/client_channel/subchannel.h" #include "src/core/client_channel/subchannel_interface_internal.h" #include "src/core/client_channel/subchannel_stream_client.h" +#include "src/core/lib/iomgr/iomgr_fwd.h" +#include "src/core/lib/iomgr/pollset_set.h" +#include "src/core/load_balancing/subchannel_interface.h" #include "src/core/util/orphanable.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/sync.h" #include "src/core/util/unique_type_name.h" #include "src/core/util/work_serializer.h" -#include "src/core/lib/iomgr/iomgr_fwd.h" -#include "src/core/lib/iomgr/pollset_set.h" -#include "src/core/load_balancing/subchannel_interface.h" namespace grpc_core { diff --git a/src/core/load_balancing/lb_policy.h b/src/core/load_balancing/lb_policy.h index eca9b144cca..2f802d1f7e0 100644 --- a/src/core/load_balancing/lb_policy.h +++ b/src/core/load_balancing/lb_policy.h @@ -39,6 +39,12 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" +#include "src/core/lib/iomgr/iomgr_fwd.h" +#include "src/core/lib/iomgr/resolved_address.h" +#include "src/core/load_balancing/backend_metric_data.h" +#include "src/core/load_balancing/subchannel_interface.h" +#include "src/core/resolver/endpoint_addresses.h" +#include "src/core/telemetry/metrics.h" #include "src/core/util/debug_location.h" #include "src/core/util/dual_ref_counted.h" #include "src/core/util/orphanable.h" @@ -46,12 +52,6 @@ #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/sync.h" #include "src/core/util/work_serializer.h" -#include "src/core/lib/iomgr/iomgr_fwd.h" -#include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/load_balancing/backend_metric_data.h" -#include "src/core/load_balancing/subchannel_interface.h" -#include "src/core/resolver/endpoint_addresses.h" -#include "src/core/telemetry/metrics.h" namespace grpc_core { diff --git a/src/core/load_balancing/lb_policy_factory.h b/src/core/load_balancing/lb_policy_factory.h index 64d7041e1fb..d05d356b71d 100644 --- a/src/core/load_balancing/lb_policy_factory.h +++ b/src/core/load_balancing/lb_policy_factory.h @@ -22,10 +22,10 @@ #include -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/util/json/json.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/load_balancing/lb_policy_registry.h b/src/core/load_balancing/lb_policy_registry.h index d3730017077..e0587f4856a 100644 --- a/src/core/load_balancing/lb_policy_registry.h +++ b/src/core/load_balancing/lb_policy_registry.h @@ -25,11 +25,11 @@ #include -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/load_balancing/lb_policy_factory.h" #include "src/core/util/json/json.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/load_balancing/oob_backend_metric.cc b/src/core/load_balancing/oob_backend_metric.cc index e028dda7644..a26c54e467b 100644 --- a/src/core/load_balancing/oob_backend_metric.cc +++ b/src/core/load_balancing/oob_backend_metric.cc @@ -42,12 +42,6 @@ #include "src/core/client_channel/subchannel.h" #include "src/core/client_channel/subchannel_stream_client.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/memory.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -56,6 +50,12 @@ #include "src/core/lib/slice/slice.h" #include "src/core/load_balancing/backend_metric_parser.h" #include "src/core/load_balancing/oob_backend_metric_internal.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/memory.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/load_balancing/oob_backend_metric.h b/src/core/load_balancing/oob_backend_metric.h index a8bb0d823c3..1c594d8e93c 100644 --- a/src/core/load_balancing/oob_backend_metric.h +++ b/src/core/load_balancing/oob_backend_metric.h @@ -21,9 +21,9 @@ #include -#include "src/core/util/time.h" #include "src/core/load_balancing/backend_metric_data.h" #include "src/core/load_balancing/subchannel_interface.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/load_balancing/oob_backend_metric_internal.h b/src/core/load_balancing/oob_backend_metric_internal.h index fddafdc14a3..f39e852b01f 100644 --- a/src/core/load_balancing/oob_backend_metric_internal.h +++ b/src/core/load_balancing/oob_backend_metric_internal.h @@ -30,13 +30,13 @@ #include "src/core/client_channel/subchannel.h" #include "src/core/client_channel/subchannel_interface_internal.h" #include "src/core/client_channel/subchannel_stream_client.h" +#include "src/core/load_balancing/backend_metric_data.h" +#include "src/core/load_balancing/oob_backend_metric.h" #include "src/core/util/orphanable.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/sync.h" #include "src/core/util/time.h" #include "src/core/util/unique_type_name.h" -#include "src/core/load_balancing/backend_metric_data.h" -#include "src/core/load_balancing/oob_backend_metric.h" namespace grpc_core { diff --git a/src/core/load_balancing/outlier_detection/outlier_detection.cc b/src/core/load_balancing/outlier_detection/outlier_detection.cc index 5fb83db3305..22c10d55441 100644 --- a/src/core/load_balancing/outlier_detection/outlier_detection.cc +++ b/src/core/load_balancing/outlier_detection/outlier_detection.cc @@ -50,14 +50,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" -#include "src/core/util/unique_type_name.h" -#include "src/core/util/validation_errors.h" -#include "src/core/util/work_serializer.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/pollset_set.h" @@ -71,7 +63,15 @@ #include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/load_balancing/subchannel_interface.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/unique_type_name.h" +#include "src/core/util/validation_errors.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/load_balancing/outlier_detection/outlier_detection.h b/src/core/load_balancing/outlier_detection/outlier_detection.h index 959e912d147..d862941e1fa 100644 --- a/src/core/load_balancing/outlier_detection/outlier_detection.h +++ b/src/core/load_balancing/outlier_detection/outlier_detection.h @@ -23,11 +23,11 @@ #include -#include "src/core/util/time.h" -#include "src/core/util/validation_errors.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/load_balancing/pick_first/pick_first.cc b/src/core/load_balancing/pick_first/pick_first.cc index 65fc3e63792..8f72d44d91c 100644 --- a/src/core/load_balancing/pick_first/pick_first.cc +++ b/src/core/load_balancing/pick_first/pick_first.cc @@ -46,12 +46,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/crash.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" -#include "src/core/util/work_serializer.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/resolved_address.h" @@ -62,10 +56,16 @@ #include "src/core/load_balancing/subchannel_interface.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/telemetry/metrics.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/load_balancing/priority/priority.cc b/src/core/load_balancing/priority/priority.cc index 57cb423419a..144419de650 100644 --- a/src/core/load_balancing/priority/priority.cc +++ b/src/core/load_balancing/priority/priority.cc @@ -42,13 +42,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/ref_counted_string.h" -#include "src/core/util/time.h" -#include "src/core/util/validation_errors.h" -#include "src/core/util/work_serializer.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/transport/connectivity_state.h" @@ -59,9 +52,16 @@ #include "src/core/load_balancing/lb_policy_factory.h" #include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/ref_counted_string.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/load_balancing/ring_hash/ring_hash.cc b/src/core/load_balancing/ring_hash/ring_hash.cc index 691da0706be..0c28bb0dff6 100644 --- a/src/core/load_balancing/ring_hash/ring_hash.cc +++ b/src/core/load_balancing/ring_hash/ring_hash.cc @@ -47,14 +47,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/crash.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/unique_type_name.h" -#include "src/core/util/work_serializer.h" -#include "src/core/util/xxhash_inline.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -67,7 +59,15 @@ #include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/load_balancing/pick_first/pick_first.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" +#include "src/core/util/work_serializer.h" +#include "src/core/util/xxhash_inline.h" namespace grpc_core { diff --git a/src/core/load_balancing/ring_hash/ring_hash.h b/src/core/load_balancing/ring_hash/ring_hash.h index 030a207cd31..da7e83b215a 100644 --- a/src/core/load_balancing/ring_hash/ring_hash.h +++ b/src/core/load_balancing/ring_hash/ring_hash.h @@ -21,12 +21,12 @@ #include -#include "src/core/util/unique_type_name.h" -#include "src/core/util/validation_errors.h" #include "src/core/service_config/service_config_call_data.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/unique_type_name.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/load_balancing/rls/rls.cc b/src/core/load_balancing/rls/rls.cc index 43c739d1ad6..f5ddcf8366e 100644 --- a/src/core/load_balancing/rls/rls.cc +++ b/src/core/load_balancing/rls/rls.cc @@ -68,21 +68,9 @@ #include "src/core/channelz/channelz.h" #include "src/core/client_channel/client_channel_filter.h" -#include "src/core/util/backoff.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/dual_ref_counted.h" -#include "src/core/util/match.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/sync.h" -#include "src/core/util/time.h" -#include "src/core/util/uuid_v4.h" -#include "src/core/util/validation_errors.h" -#include "src/core/util/work_serializer.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -103,10 +91,22 @@ #include "src/core/resolver/resolver_registry.h" #include "src/core/service_config/service_config_impl.h" #include "src/core/telemetry/metrics.h" +#include "src/core/util/backoff.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/dual_ref_counted.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/match.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/uuid_v4.h" +#include "src/core/util/validation_errors.h" +#include "src/core/util/work_serializer.h" #include "src/proto/grpc/lookup/v1/rls.upb.h" using ::grpc_event_engine::experimental::EventEngine; diff --git a/src/core/load_balancing/round_robin/round_robin.cc b/src/core/load_balancing/round_robin/round_robin.cc index fe039ce5818..6a9dc462e3c 100644 --- a/src/core/load_balancing/round_robin/round_robin.cc +++ b/src/core/load_balancing/round_robin/round_robin.cc @@ -40,16 +40,16 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/work_serializer.h" #include "src/core/lib/transport/connectivity_state.h" #include "src/core/load_balancing/endpoint_list.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/load_balancing/lb_policy_factory.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/load_balancing/subchannel_interface.h b/src/core/load_balancing/subchannel_interface.h index 2e0fed6607c..9de8a9c7302 100644 --- a/src/core/load_balancing/subchannel_interface.h +++ b/src/core/load_balancing/subchannel_interface.h @@ -25,9 +25,9 @@ #include #include +#include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/util/dual_ref_counted.h" #include "src/core/util/ref_counted_ptr.h" -#include "src/core/lib/iomgr/iomgr_fwd.h" namespace grpc_core { diff --git a/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc b/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc index 3fe22e29ad8..c9acde5a63d 100644 --- a/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc +++ b/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc @@ -48,14 +48,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" -#include "src/core/util/time.h" -#include "src/core/util/validation_errors.h" -#include "src/core/util/work_serializer.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/transport/connectivity_state.h" @@ -71,9 +63,17 @@ #include "src/core/telemetry/metrics.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/load_balancing/weighted_target/weighted_target.cc b/src/core/load_balancing/weighted_target/weighted_target.cc index a84affe2193..c57470b308b 100644 --- a/src/core/load_balancing/weighted_target/weighted_target.cc +++ b/src/core/load_balancing/weighted_target/weighted_target.cc @@ -45,13 +45,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" -#include "src/core/util/time.h" -#include "src/core/util/validation_errors.h" -#include "src/core/util/work_serializer.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/transport/connectivity_state.h" @@ -62,9 +55,16 @@ #include "src/core/load_balancing/lb_policy_factory.h" #include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" +#include "src/core/util/work_serializer.h" // IWYU pragma: no_include diff --git a/src/core/load_balancing/xds/cds.cc b/src/core/load_balancing/xds/cds.cc index 724dd400416..f38b687ee6f 100644 --- a/src/core/load_balancing/xds/cds.cc +++ b/src/core/load_balancing/xds/cds.cc @@ -40,14 +40,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/env.h" -#include "src/core/util/match.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" -#include "src/core/util/unique_type_name.h" -#include "src/core/util/work_serializer.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/load_balancing/address_filtering.h" #include "src/core/load_balancing/delegating_helper.h" @@ -57,10 +49,18 @@ #include "src/core/load_balancing/outlier_detection/outlier_detection.h" #include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/core/resolver/xds/xds_dependency_manager.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/env.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/match.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" +#include "src/core/util/unique_type_name.h" +#include "src/core/util/work_serializer.h" #include "src/core/xds/grpc/xds_cluster.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_health_status.h" diff --git a/src/core/load_balancing/xds/xds_cluster_impl.cc b/src/core/load_balancing/xds/xds_cluster_impl.cc index 2169825a619..3d9c3820a34 100644 --- a/src/core/load_balancing/xds/xds_cluster_impl.cc +++ b/src/core/load_balancing/xds/xds_cluster_impl.cc @@ -41,14 +41,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/match.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/ref_counted_string.h" -#include "src/core/util/sync.h" -#include "src/core/util/validation_errors.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/security/credentials/xds/xds_credentials.h" @@ -64,9 +56,17 @@ #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/xds/xds_dependency_manager.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/match.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/ref_counted_string.h" +#include "src/core/util/sync.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_client_grpc.h" #include "src/core/xds/grpc/xds_endpoint.h" diff --git a/src/core/load_balancing/xds/xds_cluster_manager.cc b/src/core/load_balancing/xds/xds_cluster_manager.cc index c036bdb6803..45f1459c595 100644 --- a/src/core/load_balancing/xds/xds_cluster_manager.cc +++ b/src/core/load_balancing/xds/xds_cluster_manager.cc @@ -41,12 +41,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" -#include "src/core/util/validation_errors.h" -#include "src/core/util/work_serializer.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/transport/connectivity_state.h" @@ -57,9 +51,15 @@ #include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/xds/xds_resolver_attributes.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/load_balancing/xds/xds_override_host.cc b/src/core/load_balancing/xds/xds_override_host.cc index 59fafe0d0bf..ce5d72acddc 100644 --- a/src/core/load_balancing/xds/xds_override_host.cc +++ b/src/core/load_balancing/xds/xds_override_host.cc @@ -56,14 +56,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/match.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/ref_counted_string.h" -#include "src/core/util/sync.h" -#include "src/core/util/validation_errors.h" -#include "src/core/util/work_serializer.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -79,9 +71,17 @@ #include "src/core/load_balancing/subchannel_interface.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/xds/xds_dependency_manager.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/match.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/ref_counted_string.h" +#include "src/core/util/sync.h" +#include "src/core/util/validation_errors.h" +#include "src/core/util/work_serializer.h" #include "src/core/xds/grpc/xds_health_status.h" namespace grpc_core { diff --git a/src/core/load_balancing/xds/xds_override_host.h b/src/core/load_balancing/xds/xds_override_host.h index 6a8d72713d4..387a5036491 100644 --- a/src/core/load_balancing/xds/xds_override_host.h +++ b/src/core/load_balancing/xds/xds_override_host.h @@ -21,12 +21,12 @@ #include -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/validation_errors.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/load_balancing/xds/xds_wrr_locality.cc b/src/core/load_balancing/xds/xds_wrr_locality.cc index d4f206fad9f..f87744f8b95 100644 --- a/src/core/load_balancing/xds/xds_wrr_locality.cc +++ b/src/core/load_balancing/xds/xds_wrr_locality.cc @@ -34,11 +34,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/ref_counted_string.h" -#include "src/core/util/validation_errors.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/load_balancing/delegating_helper.h" #include "src/core/load_balancing/lb_policy.h" @@ -46,10 +41,15 @@ #include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/ref_counted_string.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/xds_client/xds_client_stats.h" namespace grpc_core { diff --git a/src/core/resolver/binder/binder_resolver.cc b/src/core/resolver/binder/binder_resolver.cc index b66739d3b13..253fb0e1253 100644 --- a/src/core/resolver/binder/binder_resolver.cc +++ b/src/core/resolver/binder/binder_resolver.cc @@ -18,8 +18,8 @@ #include -#include "src/core/util/status_helper.h" #include "src/core/lib/iomgr/port.h" // IWYU pragma: keep +#include "src/core/util/status_helper.h" #ifdef GRPC_HAVE_UNIX_SOCKET @@ -47,13 +47,13 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/orphanable.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/util/uri.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/uri.h" namespace grpc_core { namespace { diff --git a/src/core/resolver/dns/c_ares/dns_resolver_ares.cc b/src/core/resolver/dns/c_ares/dns_resolver_ares.cc index 5aeb8471991..c2ce1d57338 100644 --- a/src/core/resolver/dns/c_ares/dns_resolver_ares.cc +++ b/src/core/resolver/dns/c_ares/dns_resolver_ares.cc @@ -39,22 +39,22 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/sync.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/util/uri.h" #include "src/core/resolver/dns/event_engine/service_config_helper.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" #include "src/core/service_config/service_config.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" #if GRPC_ARES == 1 @@ -62,7 +62,6 @@ #include "absl/strings/str_cat.h" -#include "src/core/util/backoff.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" #include "src/core/lib/iomgr/resolve_address.h" @@ -72,6 +71,7 @@ #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/polling_resolver.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/backoff.h" #define GRPC_DNS_INITIAL_CONNECT_BACKOFF_SECONDS 1 #define GRPC_DNS_RECONNECT_BACKOFF_MULTIPLIER 1.6 diff --git a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h index 2c9973bd738..5a75c6c7431 100644 --- a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h +++ b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h @@ -27,11 +27,11 @@ #include -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc index 1736b4dd05e..d937a1443ca 100644 --- a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc +++ b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc @@ -41,7 +41,6 @@ #include -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/ev_posix.h" @@ -49,6 +48,7 @@ #include "src/core/lib/iomgr/socket_utils_posix.h" #include "src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h" #include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc index 45a7eae7636..c04635b05cd 100644 --- a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc +++ b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc @@ -39,8 +39,6 @@ #include #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/util/crash.h" -#include "src/core/util/memory.h" #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/sockaddr_windows.h" #include "src/core/lib/iomgr/socket_windows.h" @@ -49,6 +47,8 @@ #include "src/core/lib/slice/slice_internal.h" #include "src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h" #include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h" +#include "src/core/util/crash.h" +#include "src/core/util/memory.h" #include "src/core/util/string.h" // TODO(apolcyn): remove this hack after fixing upstream. diff --git a/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc b/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc index 1900d1ad8b6..08940a5f52d 100644 --- a/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc +++ b/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc @@ -25,8 +25,8 @@ #include #include -#include "src/core/util/status_helper.h" #include "src/core/lib/iomgr/sockaddr.h" +#include "src/core/util/status_helper.h" // IWYU pragma: no_include // IWYU pragma: no_include @@ -61,9 +61,6 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/host_port.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/nameser.h" // IWYU pragma: keep @@ -71,7 +68,10 @@ #include "src/core/lib/iomgr/timer.h" #include "src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h" #include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/host_port.h" #include "src/core/util/string.h" +#include "src/core/util/time.h" using grpc_core::EndpointAddresses; using grpc_core::EndpointAddressesList; diff --git a/src/core/resolver/dns/c_ares/grpc_ares_wrapper.h b/src/core/resolver/dns/c_ares/grpc_ares_wrapper.h index 8364a058890..fbcc87316f1 100644 --- a/src/core/resolver/dns/c_ares/grpc_ares_wrapper.h +++ b/src/core/resolver/dns/c_ares/grpc_ares_wrapper.h @@ -31,11 +31,11 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/sync.h" #define GRPC_DNS_ARES_DEFAULT_QUERY_TIMEOUT_MS 120000 diff --git a/src/core/resolver/dns/dns_resolver_plugin.cc b/src/core/resolver/dns/dns_resolver_plugin.cc index dac7c6d3bb4..e5912492f31 100644 --- a/src/core/resolver/dns/dns_resolver_plugin.cc +++ b/src/core/resolver/dns/dns_resolver_plugin.cc @@ -23,11 +23,11 @@ #include "src/core/lib/config/config_vars.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/crash.h" #include "src/core/resolver/dns/c_ares/dns_resolver_ares.h" #include "src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h" #include "src/core/resolver/dns/native/dns_resolver.h" #include "src/core/resolver/resolver_factory.h" +#include "src/core/util/crash.h" namespace grpc_core { diff --git a/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc b/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc index f6290e2d1ba..1d0c2b19d16 100644 --- a/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc +++ b/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc @@ -39,15 +39,9 @@ #include #include -#include "src/core/util/backoff.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/resolved_address_internal.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" -#include "src/core/util/time.h" -#include "src/core/util/validation_errors.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/load_balancing/grpclb/grpclb_balancer_addresses.h" @@ -58,6 +52,12 @@ #include "src/core/resolver/resolver_factory.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/backoff.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" // IWYU pragma: no_include diff --git a/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h b/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h index ae0c06d2e6d..555e91fedef 100644 --- a/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h +++ b/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h @@ -17,10 +17,10 @@ #include -#include "src/core/util/orphanable.h" -#include "src/core/util/uri.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/uri.h" namespace grpc_core { diff --git a/src/core/resolver/dns/event_engine/service_config_helper.cc b/src/core/resolver/dns/event_engine/service_config_helper.cc index ca8ee6b813d..ba0b910e327 100644 --- a/src/core/resolver/dns/event_engine/service_config_helper.cc +++ b/src/core/resolver/dns/event_engine/service_config_helper.cc @@ -23,13 +23,13 @@ #include -#include "src/core/util/status_helper.h" #include "src/core/util/gethostname.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/status_helper.h" namespace grpc_core { diff --git a/src/core/resolver/dns/native/dns_resolver.cc b/src/core/resolver/dns/native/dns_resolver.cc index c8f33efe05f..068e5de8ef5 100644 --- a/src/core/resolver/dns/native/dns_resolver.cc +++ b/src/core/resolver/dns/native/dns_resolver.cc @@ -32,21 +32,21 @@ #include #include -#include "src/core/util/backoff.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/util/uri.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/polling_resolver.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" +#include "src/core/util/backoff.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" #define GRPC_DNS_INITIAL_CONNECT_BACKOFF_SECONDS 1 #define GRPC_DNS_RECONNECT_BACKOFF_MULTIPLIER 1.6 diff --git a/src/core/resolver/fake/fake_resolver.cc b/src/core/resolver/fake/fake_resolver.cc index d57698689b1..f54a26dff88 100644 --- a/src/core/resolver/fake/fake_resolver.cc +++ b/src/core/resolver/fake/fake_resolver.cc @@ -31,12 +31,12 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" +#include "src/core/resolver/resolver_factory.h" #include "src/core/util/debug_location.h" #include "src/core/util/orphanable.h" -#include "src/core/util/work_serializer.h" #include "src/core/util/uri.h" -#include "src/core/resolver/resolver_factory.h" #include "src/core/util/useful.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/resolver/fake/fake_resolver.h b/src/core/resolver/fake/fake_resolver.h index 4fcdd9894fd..5126c741577 100644 --- a/src/core/resolver/fake/fake_resolver.h +++ b/src/core/resolver/fake/fake_resolver.h @@ -27,11 +27,11 @@ #include #include +#include "src/core/resolver/resolver.h" #include "src/core/util/notification.h" #include "src/core/util/ref_counted.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/sync.h" -#include "src/core/resolver/resolver.h" #include "src/core/util/useful.h" #define GRPC_ARG_FAKE_RESOLVER_RESPONSE_GENERATOR \ diff --git a/src/core/resolver/google_c2p/google_c2p_resolver.cc b/src/core/resolver/google_c2p/google_c2p_resolver.cc index d25334733e0..c80db081754 100644 --- a/src/core/resolver/google_c2p/google_c2p_resolver.cc +++ b/src/core/resolver/google_c2p/google_c2p_resolver.cc @@ -36,21 +36,21 @@ #include "src/core/ext/gcp/metadata_query.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/env.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" -#include "src/core/util/work_serializer.h" #include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" -#include "src/core/util/uri.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" #include "src/core/resolver/resolver_registry.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/env.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" +#include "src/core/util/work_serializer.h" #include "src/core/xds/grpc/xds_client_grpc.h" #include "src/core/xds/xds_client/xds_bootstrap.h" diff --git a/src/core/resolver/polling_resolver.cc b/src/core/resolver/polling_resolver.cc index f8ad0c3b0d1..e15c35c7532 100644 --- a/src/core/resolver/polling_resolver.cc +++ b/src/core/resolver/polling_resolver.cc @@ -32,15 +32,15 @@ #include #include -#include "src/core/util/backoff.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/work_serializer.h" #include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/util/uri.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/service_config/service_config.h" +#include "src/core/util/backoff.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/uri.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/resolver/polling_resolver.h b/src/core/resolver/polling_resolver.h index 80e686472dd..2faa5f5e486 100644 --- a/src/core/resolver/polling_resolver.h +++ b/src/core/resolver/polling_resolver.h @@ -26,15 +26,15 @@ #include #include -#include "src/core/util/backoff.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/time.h" -#include "src/core/util/work_serializer.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" +#include "src/core/util/backoff.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/time.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/resolver/resolver.h b/src/core/resolver/resolver.h index 27cd703dcf8..516807ee1d7 100644 --- a/src/core/resolver/resolver.h +++ b/src/core/resolver/resolver.h @@ -27,11 +27,11 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/server_address.h" // IWYU pragma: keep #include "src/core/service_config/service_config.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" extern grpc_core::DebugOnlyTraceFlag grpc_trace_resolver_refcount; diff --git a/src/core/resolver/resolver_factory.h b/src/core/resolver/resolver_factory.h index 71f64e0eb78..831b67c5cfc 100644 --- a/src/core/resolver/resolver_factory.h +++ b/src/core/resolver/resolver_factory.h @@ -26,10 +26,10 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/orphanable.h" #include "src/core/lib/iomgr/iomgr_fwd.h" -#include "src/core/util/uri.h" #include "src/core/resolver/resolver.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/uri.h" namespace grpc_core { diff --git a/src/core/resolver/resolver_registry.h b/src/core/resolver/resolver_registry.h index 66fe2689010..5e1d87fbf6b 100644 --- a/src/core/resolver/resolver_registry.h +++ b/src/core/resolver/resolver_registry.h @@ -27,11 +27,11 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/orphanable.h" #include "src/core/lib/iomgr/iomgr_fwd.h" -#include "src/core/util/uri.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/uri.h" namespace grpc_core { diff --git a/src/core/resolver/sockaddr/sockaddr_resolver.cc b/src/core/resolver/sockaddr/sockaddr_resolver.cc index ed9e5116116..ad2976ece26 100644 --- a/src/core/resolver/sockaddr/sockaddr_resolver.cc +++ b/src/core/resolver/sockaddr/sockaddr_resolver.cc @@ -29,13 +29,13 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/orphanable.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/util/uri.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/uri.h" namespace grpc_core { diff --git a/src/core/resolver/xds/xds_dependency_manager.cc b/src/core/resolver/xds/xds_dependency_manager.cc index 125bbf9f388..28cc3ed149c 100644 --- a/src/core/resolver/xds/xds_dependency_manager.cc +++ b/src/core/resolver/xds/xds_dependency_manager.cc @@ -24,10 +24,10 @@ #include #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/match.h" #include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/core/resolver/fake/fake_resolver.h" #include "src/core/resolver/xds/xds_resolver_trace.h" +#include "src/core/util/match.h" #include "src/core/xds/grpc/xds_routing.h" namespace grpc_core { diff --git a/src/core/resolver/xds/xds_dependency_manager.h b/src/core/resolver/xds/xds_dependency_manager.h index 576cf7d788d..fc2dd9e24dd 100644 --- a/src/core/resolver/xds/xds_dependency_manager.h +++ b/src/core/resolver/xds/xds_dependency_manager.h @@ -23,8 +23,8 @@ #include -#include "src/core/util/ref_counted.h" #include "src/core/resolver/resolver.h" +#include "src/core/util/ref_counted.h" #include "src/core/xds/grpc/xds_client_grpc.h" #include "src/core/xds/grpc/xds_cluster.h" #include "src/core/xds/grpc/xds_endpoint.h" diff --git a/src/core/resolver/xds/xds_resolver.cc b/src/core/resolver/xds/xds_resolver.cc index 59026345fc8..0d1f27859ab 100644 --- a/src/core/resolver/xds/xds_resolver.cc +++ b/src/core/resolver/xds/xds_resolver.cc @@ -59,15 +59,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/dual_ref_counted.h" -#include "src/core/util/match.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" -#include "src/core/util/work_serializer.h" -#include "src/core/util/xxhash_inline.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/promise/arena_promise.h" @@ -76,7 +67,6 @@ #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" -#include "src/core/util/uri.h" #include "src/core/load_balancing/ring_hash/ring_hash.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/resolver.h" @@ -86,6 +76,16 @@ #include "src/core/resolver/xds/xds_resolver_trace.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/dual_ref_counted.h" +#include "src/core/util/match.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" +#include "src/core/util/work_serializer.h" +#include "src/core/util/xxhash_inline.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_client_grpc.h" #include "src/core/xds/grpc/xds_http_filters.h" diff --git a/src/core/resolver/xds/xds_resolver_attributes.h b/src/core/resolver/xds/xds_resolver_attributes.h index fe15871a869..bf9af9ea36b 100644 --- a/src/core/resolver/xds/xds_resolver_attributes.h +++ b/src/core/resolver/xds/xds_resolver_attributes.h @@ -21,8 +21,8 @@ #include -#include "src/core/util/unique_type_name.h" #include "src/core/service_config/service_config_call_data.h" +#include "src/core/util/unique_type_name.h" namespace grpc_core { diff --git a/src/core/server/server.cc b/src/core/server/server.cc index d4271fa11fe..2adc83d4fe1 100644 --- a/src/core/server/server.cc +++ b/src/core/server/server.cc @@ -53,11 +53,6 @@ #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/crash.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/mpscq.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/status_helper.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/promise/activity.h" @@ -83,6 +78,11 @@ #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/transport/interception_chain.h" #include "src/core/telemetry/stats.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/mpscq.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/status_helper.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/server/server.h b/src/core/server/server.h index 2948fa07985..bce7611d3bf 100644 --- a/src/core/server/server.h +++ b/src/core/server/server.h @@ -46,17 +46,10 @@ #include #include "src/core/channelz/channelz.h" -#include "src/core/util/random_early_detection.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/cpp_impl_of.h" -#include "src/core/util/dual_ref_counted.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" @@ -70,6 +63,13 @@ #include "src/core/lib/transport/transport.h" #include "src/core/server/server_interface.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/cpp_impl_of.h" +#include "src/core/util/dual_ref_counted.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/random_early_detection.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #define GRPC_ARG_SERVER_MAX_PENDING_REQUESTS "grpc.server.max_pending_requests" #define GRPC_ARG_SERVER_MAX_PENDING_REQUESTS_HARD_LIMIT \ diff --git a/src/core/server/server_config_selector.h b/src/core/server/server_config_selector.h index eb3f361b3a7..4d766419809 100644 --- a/src/core/server/server_config_selector.h +++ b/src/core/server/server_config_selector.h @@ -24,12 +24,12 @@ #include -#include "src/core/util/dual_ref_counted.h" -#include "src/core/util/ref_counted.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_parser.h" +#include "src/core/util/dual_ref_counted.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/server/server_config_selector_filter.cc b/src/core/server/server_config_selector_filter.cc index 5d0532012b8..4a2a85f7388 100644 --- a/src/core/server/server_config_selector_filter.cc +++ b/src/core/server/server_config_selector_filter.cc @@ -31,9 +31,6 @@ #include "src/core/lib/channel/context.h" #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/lib/event_engine/event_engine_context.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/sync.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/promise.h" @@ -43,6 +40,9 @@ #include "src/core/server/server_config_selector.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_call_data.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/server/xds_server_config_fetcher.cc b/src/core/server/xds_server_config_fetcher.cc index 417c87710ac..9ae0d8cb8f2 100644 --- a/src/core/server/xds_server_config_fetcher.cc +++ b/src/core/server/xds_server_config_fetcher.cc @@ -54,12 +54,6 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/host_port.h" -#include "src/core/util/match.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" -#include "src/core/util/unique_type_name.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr_fwd.h" @@ -72,13 +66,19 @@ #include "src/core/lib/security/credentials/xds/xds_credentials.h" #include "src/core/lib/surface/api_trace.h" #include "src/core/lib/transport/metadata_batch.h" -#include "src/core/util/uri.h" #include "src/core/server/server.h" #include "src/core/server/server_config_selector.h" #include "src/core/server/server_config_selector_filter.h" #include "src/core/server/xds_channel_stack_modifier.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/host_port.h" +#include "src/core/util/match.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/unique_type_name.h" +#include "src/core/util/uri.h" #include "src/core/xds/grpc/certificate_provider_store.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_certificate_provider.h" diff --git a/src/core/service_config/service_config.h b/src/core/service_config/service_config.h index ceb468df79e..f9c43c35011 100644 --- a/src/core/service_config/service_config.h +++ b/src/core/service_config/service_config.h @@ -24,8 +24,8 @@ #include #include -#include "src/core/util/ref_counted.h" #include "src/core/service_config/service_config_parser.h" +#include "src/core/util/ref_counted.h" #include "src/core/util/useful.h" // The main purpose of the code here is to parse the service config in diff --git a/src/core/service_config/service_config_call_data.h b/src/core/service_config/service_config_call_data.h index 0d62425aa66..34ac4656bf5 100644 --- a/src/core/service_config/service_config_call_data.h +++ b/src/core/service_config/service_config_call_data.h @@ -25,12 +25,12 @@ #include #include "src/core/lib/channel/context.h" -#include "src/core/util/chunked_vector.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/unique_type_name.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_parser.h" +#include "src/core/util/chunked_vector.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" namespace grpc_core { diff --git a/src/core/service_config/service_config_channel_arg_filter.cc b/src/core/service_config/service_config_channel_arg_filter.cc index 1593cbce280..032c584c159 100644 --- a/src/core/service_config/service_config_channel_arg_filter.cc +++ b/src/core/service_config/service_config_channel_arg_filter.cc @@ -38,7 +38,6 @@ #include "src/core/lib/channel/context.h" #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/resource_quota/arena.h" @@ -49,6 +48,7 @@ #include "src/core/service_config/service_config_call_data.h" #include "src/core/service_config/service_config_impl.h" #include "src/core/service_config/service_config_parser.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/service_config/service_config_impl.cc b/src/core/service_config/service_config_impl.cc index af0786b568f..a52442e09ec 100644 --- a/src/core/service_config/service_config_impl.cc +++ b/src/core/service_config/service_config_impl.cc @@ -29,8 +29,6 @@ #include #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/memory.h" -#include "src/core/util/validation_errors.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/service_config/service_config_parser.h" @@ -39,6 +37,8 @@ #include "src/core/util/json/json_object_loader.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/memory.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/service_config/service_config_impl.h b/src/core/service_config/service_config_impl.h index bea26f01b95..fc2e69a80d2 100644 --- a/src/core/service_config/service_config_impl.h +++ b/src/core/service_config/service_config_impl.h @@ -33,12 +33,12 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/validation_errors.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_parser.h" #include "src/core/util/json/json.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/validation_errors.h" // The main purpose of the code here is to parse the service config in // JSON form, which will look like this: diff --git a/src/core/service_config/service_config_parser.h b/src/core/service_config/service_config_parser.h index 46e6ef6dba8..caac10a4bc8 100644 --- a/src/core/service_config/service_config_parser.h +++ b/src/core/service_config/service_config_parser.h @@ -29,8 +29,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/validation_errors.h" #include "src/core/util/json/json.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/telemetry/call_tracer.h b/src/core/telemetry/call_tracer.h index 76515d03688..96424bae275 100644 --- a/src/core/telemetry/call_tracer.h +++ b/src/core/telemetry/call_tracer.h @@ -31,7 +31,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/context.h" -#include "src/core/util/ref_counted_string.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/resource_quota/arena.h" @@ -39,6 +38,7 @@ #include "src/core/lib/transport/call_final_info.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/telemetry/tcp_tracer.h" +#include "src/core/util/ref_counted_string.h" namespace grpc_core { diff --git a/src/core/telemetry/metrics.h b/src/core/telemetry/metrics.h index 59dfe6c7125..81049b54646 100644 --- a/src/core/telemetry/metrics.h +++ b/src/core/telemetry/metrics.h @@ -31,11 +31,11 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/context.h" +#include "src/core/lib/slice/slice.h" +#include "src/core/telemetry/call_tracer.h" #include "src/core/util/no_destruct.h" #include "src/core/util/sync.h" #include "src/core/util/time.h" -#include "src/core/lib/slice/slice.h" -#include "src/core/telemetry/call_tracer.h" namespace grpc_core { diff --git a/src/core/telemetry/stats.h b/src/core/telemetry/stats.h index 2615c651389..8d783dea5d7 100644 --- a/src/core/telemetry/stats.h +++ b/src/core/telemetry/stats.h @@ -29,9 +29,9 @@ #include -#include "src/core/util/no_destruct.h" #include "src/core/telemetry/histogram_view.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/no_destruct.h" namespace grpc_core { diff --git a/src/core/telemetry/stats_data.h b/src/core/telemetry/stats_data.h index 55c9bec1a0d..e71123b036c 100644 --- a/src/core/telemetry/stats_data.h +++ b/src/core/telemetry/stats_data.h @@ -26,8 +26,8 @@ #include -#include "src/core/util/per_cpu.h" #include "src/core/telemetry/histogram_view.h" +#include "src/core/util/per_cpu.h" namespace grpc_core { class HistogramCollector_100000_20; diff --git a/src/core/tsi/alts/frame_protector/alts_frame_protector.cc b/src/core/tsi/alts/frame_protector/alts_frame_protector.cc index de709d5cf4a..ee88688e4bb 100644 --- a/src/core/tsi/alts/frame_protector/alts_frame_protector.cc +++ b/src/core/tsi/alts/frame_protector/alts_frame_protector.cc @@ -30,11 +30,11 @@ #include #include -#include "src/core/util/memory.h" #include "src/core/tsi/alts/crypt/gsec.h" #include "src/core/tsi/alts/frame_protector/alts_crypter.h" #include "src/core/tsi/alts/frame_protector/frame_handler.h" #include "src/core/tsi/transport_security.h" +#include "src/core/util/memory.h" constexpr size_t kMinFrameLength = 1024; constexpr size_t kDefaultFrameLength = 16 * 1024; diff --git a/src/core/tsi/alts/handshaker/alts_handshaker_client.cc b/src/core/tsi/alts/handshaker/alts_handshaker_client.cc index 18c3d7665e5..73295500c4b 100644 --- a/src/core/tsi/alts/handshaker/alts_handshaker_client.cc +++ b/src/core/tsi/alts/handshaker/alts_handshaker_client.cc @@ -30,15 +30,15 @@ #include #include -#include "src/core/util/crash.h" -#include "src/core/util/env.h" -#include "src/core/util/sync.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/surface/call.h" #include "src/core/lib/surface/channel.h" #include "src/core/tsi/alts/handshaker/alts_shared_resource.h" #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h" #include "src/core/tsi/alts/handshaker/alts_tsi_utils.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" +#include "src/core/util/sync.h" #define TSI_ALTS_INITIAL_BUFFER_SIZE 256 diff --git a/src/core/tsi/alts/handshaker/alts_shared_resource.cc b/src/core/tsi/alts/handshaker/alts_shared_resource.cc index 9b31497aba7..b24cade96a0 100644 --- a/src/core/tsi/alts/handshaker/alts_shared_resource.cc +++ b/src/core/tsi/alts/handshaker/alts_shared_resource.cc @@ -24,8 +24,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/crash.h" #include "src/core/tsi/alts/handshaker/alts_handshaker_client.h" +#include "src/core/util/crash.h" static alts_shared_resource_dedicated g_alts_resource_dedicated; diff --git a/src/core/tsi/alts/handshaker/alts_shared_resource.h b/src/core/tsi/alts/handshaker/alts_shared_resource.h index aa130b128e7..11d6b606578 100644 --- a/src/core/tsi/alts/handshaker/alts_shared_resource.h +++ b/src/core/tsi/alts/handshaker/alts_shared_resource.h @@ -23,9 +23,9 @@ #include #include -#include "src/core/util/thd.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/surface/completion_queue.h" +#include "src/core/util/thd.h" /// /// Main struct containing ALTS shared resources used when diff --git a/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc b/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc index df199907703..549d446af8b 100644 --- a/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc +++ b/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc @@ -35,8 +35,6 @@ #include #include -#include "src/core/util/memory.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/channel.h" @@ -44,6 +42,8 @@ #include "src/core/tsi/alts/handshaker/alts_handshaker_client.h" #include "src/core/tsi/alts/handshaker/alts_shared_resource.h" #include "src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h" +#include "src/core/util/memory.h" +#include "src/core/util/sync.h" // Main struct for ALTS TSI handshaker. struct alts_tsi_handshaker { diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc index bada7631a03..782c6de1b5b 100644 --- a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc +++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc @@ -27,11 +27,11 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h" #include "src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h" +#include "src/core/util/crash.h" // Main struct for alts_grpc_integrity_only_record_protocol. typedef struct alts_grpc_integrity_only_record_protocol { diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc index 4c4f42c3d4f..70964071342 100644 --- a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc +++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc @@ -24,11 +24,11 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h" #include "src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h" +#include "src/core/util/crash.h" // Privacy-integrity alts_grpc_record_protocol object uses the same struct // defined in alts_grpc_record_protocol_common.h. diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc index e9debed56bc..2acfb8ac80a 100644 --- a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc +++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc @@ -26,9 +26,9 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" const size_t kInitialIovecBufferSize = 8; diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc b/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc index 84bd4141d27..89e66991d28 100644 --- a/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc +++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc @@ -25,8 +25,8 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/tsi/alts/frame_protector/alts_counter.h" +#include "src/core/util/crash.h" struct alts_iovec_record_protocol { alts_counter* ctr; diff --git a/src/core/tsi/fake_transport_security.cc b/src/core/tsi/fake_transport_security.cc index a6b7e161731..b9a358a83ea 100644 --- a/src/core/tsi/fake_transport_security.cc +++ b/src/core/tsi/fake_transport_security.cc @@ -28,11 +28,11 @@ #include #include -#include "src/core/util/crash.h" -#include "src/core/util/memory.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/tsi/transport_security_grpc.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/crash.h" +#include "src/core/util/memory.h" // --- Constants. --- #define TSI_FAKE_FRAME_HEADER_SIZE 4 diff --git a/src/core/tsi/local_transport_security.cc b/src/core/tsi/local_transport_security.cc index ccea7eed29a..bb25a25db41 100644 --- a/src/core/tsi/local_transport_security.cc +++ b/src/core/tsi/local_transport_security.cc @@ -28,9 +28,9 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/tsi/transport_security_grpc.h" +#include "src/core/util/crash.h" namespace { diff --git a/src/core/tsi/ssl/key_logging/ssl_key_logging.cc b/src/core/tsi/ssl/key_logging/ssl_key_logging.cc index 9d2b5cab130..05ad8572d8c 100644 --- a/src/core/tsi/ssl/key_logging/ssl_key_logging.cc +++ b/src/core/tsi/ssl/key_logging/ssl_key_logging.cc @@ -21,10 +21,10 @@ #include #include -#include "src/core/util/crash.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" +#include "src/core/util/sync.h" using TlsSessionKeyLogger = tsi::TlsSessionKeyLoggerCache::TlsSessionKeyLogger; diff --git a/src/core/tsi/ssl/session_cache/ssl_session_cache.cc b/src/core/tsi/ssl/session_cache/ssl_session_cache.cc index 03c027906b1..77e5d416ae9 100644 --- a/src/core/tsi/ssl/session_cache/ssl_session_cache.cc +++ b/src/core/tsi/ssl/session_cache/ssl_session_cache.cc @@ -25,10 +25,10 @@ #include #include -#include "src/core/util/crash.h" -#include "src/core/util/sync.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/tsi/ssl/session_cache/ssl_session.h" +#include "src/core/util/crash.h" +#include "src/core/util/sync.h" namespace tsi { diff --git a/src/core/tsi/ssl/session_cache/ssl_session_cache.h b/src/core/tsi/ssl/session_cache/ssl_session_cache.h index bc820c21210..024262c9c90 100644 --- a/src/core/tsi/ssl/session_cache/ssl_session_cache.h +++ b/src/core/tsi/ssl/session_cache/ssl_session_cache.h @@ -28,11 +28,11 @@ #include #include +#include "src/core/tsi/ssl/session_cache/ssl_session.h" #include "src/core/util/cpp_impl_of.h" #include "src/core/util/memory.h" #include "src/core/util/ref_counted.h" #include "src/core/util/sync.h" -#include "src/core/tsi/ssl/session_cache/ssl_session.h" /// Cache for SSL sessions for sessions resumption. /// diff --git a/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc b/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc index 2cc57c55bc1..ad78488415b 100644 --- a/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc +++ b/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc @@ -19,8 +19,8 @@ #include -#include "src/core/util/crash.h" #include "src/core/tsi/ssl/session_cache/ssl_session.h" +#include "src/core/util/crash.h" #ifndef OPENSSL_IS_BORINGSSL diff --git a/src/core/tsi/ssl_transport_security.cc b/src/core/tsi/ssl_transport_security.cc index 810eeb91074..18224441626 100644 --- a/src/core/tsi/ssl_transport_security.cc +++ b/src/core/tsi/ssl_transport_security.cc @@ -60,13 +60,13 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h" #include "src/core/tsi/ssl/key_logging/ssl_key_logging.h" #include "src/core/tsi/ssl/session_cache/ssl_session_cache.h" #include "src/core/tsi/ssl_transport_security_utils.h" #include "src/core/tsi/ssl_types.h" #include "src/core/tsi/transport_security.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" // --- Constants. --- diff --git a/src/core/util/atomic_utils.h b/src/core/util/atomic_utils.h index b01b8c89c24..bdf647159aa 100644 --- a/src/core/util/atomic_utils.h +++ b/src/core/util/atomic_utils.h @@ -19,10 +19,10 @@ #ifndef GRPC_SRC_CORE_UTIL_ATOMIC_UTILS_H #define GRPC_SRC_CORE_UTIL_ATOMIC_UTILS_H -#include - #include +#include + namespace grpc_core { // Atomically increment a counter only if the counter value is not zero. diff --git a/src/core/util/backoff.cc b/src/core/util/backoff.cc index 663b13d4106..f121fe45463 100644 --- a/src/core/util/backoff.cc +++ b/src/core/util/backoff.cc @@ -16,12 +16,12 @@ // // +#include + #include "src/core/util/backoff.h" #include -#include - namespace grpc_core { BackOff::BackOff(const Options& options) : options_(options) { Reset(); } diff --git a/src/core/util/backoff.h b/src/core/util/backoff.h index 5059d878e95..73235b981a0 100644 --- a/src/core/util/backoff.h +++ b/src/core/util/backoff.h @@ -19,10 +19,10 @@ #ifndef GRPC_SRC_CORE_UTIL_BACKOFF_H #define GRPC_SRC_CORE_UTIL_BACKOFF_H -#include "absl/random/random.h" - #include +#include "absl/random/random.h" + #include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/util/bitset.h b/src/core/util/bitset.h index 83acd192e09..0fa3d271d0b 100644 --- a/src/core/util/bitset.h +++ b/src/core/util/bitset.h @@ -15,13 +15,13 @@ #ifndef GRPC_SRC_CORE_UTIL_BITSET_H #define GRPC_SRC_CORE_UTIL_BITSET_H +#include + #include #include #include -#include - #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/util/chunked_vector.h b/src/core/util/chunked_vector.h index bdbe2043f94..b377910389d 100644 --- a/src/core/util/chunked_vector.h +++ b/src/core/util/chunked_vector.h @@ -15,6 +15,8 @@ #ifndef GRPC_SRC_CORE_UTIL_CHUNKED_VECTOR_H #define GRPC_SRC_CORE_UTIL_CHUNKED_VECTOR_H +#include + #include #include #include @@ -22,10 +24,9 @@ #include "absl/log/check.h" #include -#include -#include "src/core/util/manual_constructor.h" #include "src/core/lib/resource_quota/arena.h" +#include "src/core/util/manual_constructor.h" namespace grpc_core { diff --git a/src/core/util/construct_destruct.h b/src/core/util/construct_destruct.h index ae108e024c0..d130d87a590 100644 --- a/src/core/util/construct_destruct.h +++ b/src/core/util/construct_destruct.h @@ -15,11 +15,11 @@ #ifndef GRPC_SRC_CORE_UTIL_CONSTRUCT_DESTRUCT_H #define GRPC_SRC_CORE_UTIL_CONSTRUCT_DESTRUCT_H +#include + #include #include -#include - namespace grpc_core { // Call the destructor of p without having to name the type of p. diff --git a/src/core/util/crash.cc b/src/core/util/crash.cc index 992f3390870..10a04e8f267 100644 --- a/src/core/util/crash.cc +++ b/src/core/util/crash.cc @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include "src/core/util/crash.h" #include @@ -22,7 +24,6 @@ #include "absl/strings/str_cat.h" #include -#include namespace grpc_core { diff --git a/src/core/util/crash.h b/src/core/util/crash.h index b34cf396001..9d0b19a5d0a 100644 --- a/src/core/util/crash.h +++ b/src/core/util/crash.h @@ -15,10 +15,10 @@ #ifndef GRPC_SRC_CORE_UTIL_CRASH_H #define GRPC_SRC_CORE_UTIL_CRASH_H -#include "absl/strings/string_view.h" - #include +#include "absl/strings/string_view.h" + #include "src/core/util/debug_location.h" namespace grpc_core { diff --git a/src/core/util/debug_location.h b/src/core/util/debug_location.h index b38242b31c2..765e6e007fa 100644 --- a/src/core/util/debug_location.h +++ b/src/core/util/debug_location.h @@ -19,10 +19,10 @@ #ifndef GRPC_SRC_CORE_UTIL_DEBUG_LOCATION_H #define GRPC_SRC_CORE_UTIL_DEBUG_LOCATION_H -#include - #include +#include + #if defined(__has_builtin) #if __has_builtin(__builtin_FILE) #define GRPC_DEFAULT_FILE __builtin_FILE() diff --git a/src/core/util/directory_reader.h b/src/core/util/directory_reader.h index 082aa21fcc1..9b3be1a8838 100644 --- a/src/core/util/directory_reader.h +++ b/src/core/util/directory_reader.h @@ -19,14 +19,14 @@ #ifndef GRPC_SRC_CORE_UTIL_DIRECTORY_READER_H #define GRPC_SRC_CORE_UTIL_DIRECTORY_READER_H +#include + #include #include "absl/functional/function_ref.h" #include "absl/status/status.h" #include "absl/strings/string_view.h" -#include - namespace grpc_core { class DirectoryReader { diff --git a/src/core/util/down_cast.h b/src/core/util/down_cast.h index a38433ff1bb..d4e06cbc014 100644 --- a/src/core/util/down_cast.h +++ b/src/core/util/down_cast.h @@ -15,13 +15,14 @@ #ifndef GRPC_SRC_CORE_UTIL_DOWN_CAST_H #define GRPC_SRC_CORE_UTIL_DOWN_CAST_H +#include + #include #include "absl/base/config.h" #include "absl/log/check.h" #include -#include namespace grpc_core { diff --git a/src/core/util/dual_ref_counted.h b/src/core/util/dual_ref_counted.h index 6d2b89227a7..008a2193870 100644 --- a/src/core/util/dual_ref_counted.h +++ b/src/core/util/dual_ref_counted.h @@ -17,13 +17,14 @@ #ifndef GRPC_SRC_CORE_UTIL_DUAL_REF_COUNTED_H #define GRPC_SRC_CORE_UTIL_DUAL_REF_COUNTED_H +#include + #include #include #include "absl/log/check.h" #include -#include #include "src/core/util/debug_location.h" #include "src/core/util/down_cast.h" diff --git a/src/core/util/env.h b/src/core/util/env.h index e48c399b5ca..558941deb09 100644 --- a/src/core/util/env.h +++ b/src/core/util/env.h @@ -19,12 +19,12 @@ #ifndef GRPC_SRC_CORE_UTIL_ENV_H #define GRPC_SRC_CORE_UTIL_ENV_H +#include + #include #include "absl/types/optional.h" -#include - namespace grpc_core { // Gets the environment variable value with the specified name. */ diff --git a/src/core/util/event_log.cc b/src/core/util/event_log.cc index 1c2b9b9a061..ce0b0b7319c 100644 --- a/src/core/util/event_log.cc +++ b/src/core/util/event_log.cc @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include "src/core/util/event_log.h" #include @@ -22,7 +24,6 @@ #include "absl/strings/str_join.h" #include -#include namespace grpc_core { diff --git a/src/core/util/event_log.h b/src/core/util/event_log.h index 7dd5fa7a284..f77967d57f2 100644 --- a/src/core/util/event_log.h +++ b/src/core/util/event_log.h @@ -15,6 +15,8 @@ #ifndef GRPC_SRC_CORE_UTIL_EVENT_LOG_H #define GRPC_SRC_CORE_UTIL_EVENT_LOG_H +#include + #include #include @@ -25,8 +27,6 @@ #include "absl/strings/string_view.h" #include "absl/types/span.h" -#include - #include "src/core/util/per_cpu.h" #include "src/core/util/sync.h" #include "src/core/util/time_precise.h" diff --git a/src/core/util/examine_stack.cc b/src/core/util/examine_stack.cc index a47f12472ca..96799b2a30c 100644 --- a/src/core/util/examine_stack.cc +++ b/src/core/util/examine_stack.cc @@ -16,10 +16,10 @@ // // -#include "src/core/util/examine_stack.h" - #include +#include "src/core/util/examine_stack.h" + namespace grpc_core { gpr_current_stack_trace_func g_current_stack_trace_provider = nullptr; diff --git a/src/core/util/examine_stack.h b/src/core/util/examine_stack.h index 2486bda33b6..b5abb9f15ef 100644 --- a/src/core/util/examine_stack.h +++ b/src/core/util/examine_stack.h @@ -19,12 +19,12 @@ #ifndef GRPC_SRC_CORE_UTIL_EXAMINE_STACK_H #define GRPC_SRC_CORE_UTIL_EXAMINE_STACK_H +#include + #include #include "absl/types/optional.h" -#include - namespace grpc_core { typedef std::string (*gpr_current_stack_trace_func)(); diff --git a/src/core/util/fork.cc b/src/core/util/fork.cc index ffce0a04d15..35b211b42ff 100644 --- a/src/core/util/fork.cc +++ b/src/core/util/fork.cc @@ -16,12 +16,13 @@ // // +#include + #include "src/core/util/fork.h" #include #include -#include #include #include diff --git a/src/core/util/fork.h b/src/core/util/fork.h index 6e5566cc510..047d35a4b0c 100644 --- a/src/core/util/fork.h +++ b/src/core/util/fork.h @@ -19,11 +19,11 @@ #ifndef GRPC_SRC_CORE_UTIL_FORK_H #define GRPC_SRC_CORE_UTIL_FORK_H +#include + #include #include -#include - // // NOTE: FORKING IS NOT GENERALLY SUPPORTED, THIS IS ONLY INTENDED TO WORK // AROUND VERY SPECIFIC USE CASES. diff --git a/src/core/util/gethostname_fallback.cc b/src/core/util/gethostname_fallback.cc index 563bcc32bc5..6a5ec05d777 100644 --- a/src/core/util/gethostname_fallback.cc +++ b/src/core/util/gethostname_fallback.cc @@ -18,8 +18,8 @@ #include -#include "src/core/util/gethostname.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/gethostname.h" #ifdef GRPC_GETHOSTNAME_FALLBACK diff --git a/src/core/util/gethostname_host_name_max.cc b/src/core/util/gethostname_host_name_max.cc index a39670565bf..def6984395d 100644 --- a/src/core/util/gethostname_host_name_max.cc +++ b/src/core/util/gethostname_host_name_max.cc @@ -18,8 +18,8 @@ #include -#include "src/core/util/gethostname.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/gethostname.h" #ifdef GRPC_POSIX_HOST_NAME_MAX diff --git a/src/core/util/gethostname_sysconf.cc b/src/core/util/gethostname_sysconf.cc index 326e9b03491..414a02118a0 100644 --- a/src/core/util/gethostname_sysconf.cc +++ b/src/core/util/gethostname_sysconf.cc @@ -18,8 +18,8 @@ #include -#include "src/core/util/gethostname.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/gethostname.h" #ifdef GRPC_POSIX_SYSCONF diff --git a/src/core/util/grpc_if_nametoindex.h b/src/core/util/grpc_if_nametoindex.h index 1ce1d323b41..ad1f3fcc224 100644 --- a/src/core/util/grpc_if_nametoindex.h +++ b/src/core/util/grpc_if_nametoindex.h @@ -19,10 +19,10 @@ #ifndef GRPC_SRC_CORE_UTIL_GRPC_IF_NAMETOINDEX_H #define GRPC_SRC_CORE_UTIL_GRPC_IF_NAMETOINDEX_H -#include - #include +#include + // Returns the interface index corresponding to the interface "name" provided. // Returns non-zero upon success, and zero upon failure. uint32_t grpc_if_nametoindex(char* name); diff --git a/src/core/util/host_port.cc b/src/core/util/host_port.cc index 49491c901e0..09c0bed006e 100644 --- a/src/core/util/host_port.cc +++ b/src/core/util/host_port.cc @@ -16,6 +16,8 @@ // // +#include + #include "src/core/util/host_port.h" #include @@ -25,7 +27,6 @@ #include "absl/strings/string_view.h" #include -#include namespace grpc_core { diff --git a/src/core/util/host_port.h b/src/core/util/host_port.h index 38a6f438ae8..2d7d2c9e43a 100644 --- a/src/core/util/host_port.h +++ b/src/core/util/host_port.h @@ -19,12 +19,12 @@ #ifndef GRPC_SRC_CORE_UTIL_HOST_PORT_H #define GRPC_SRC_CORE_UTIL_HOST_PORT_H +#include + #include #include "absl/strings/string_view.h" -#include - namespace grpc_core { // Given a host and port, creates a newly-allocated string of the form diff --git a/src/core/util/http_client/httpcli.cc b/src/core/util/http_client/httpcli.cc index 651fa7bc184..66046b0fc42 100644 --- a/src/core/util/http_client/httpcli.cc +++ b/src/core/util/http_client/httpcli.cc @@ -41,7 +41,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/status_helper.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/pollset_set.h" @@ -53,6 +52,7 @@ #include "src/core/lib/transport/error_utils.h" #include "src/core/util/http_client/format_request.h" #include "src/core/util/http_client/parser.h" +#include "src/core/util/status_helper.h" namespace grpc_core { diff --git a/src/core/util/http_client/httpcli.h b/src/core/util/http_client/httpcli.h index 6ca8d735061..f26b4112d40 100644 --- a/src/core/util/http_client/httpcli.h +++ b/src/core/util/http_client/httpcli.h @@ -36,11 +36,6 @@ #include #include "src/core/handshaker/handshaker.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -51,8 +46,13 @@ #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/resource_quota/resource_quota.h" -#include "src/core/util/uri.h" +#include "src/core/util/debug_location.h" #include "src/core/util/http_client/parser.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" // User agent this library reports #define GRPC_HTTPCLI_USER_AGENT "grpc-httpcli/0.0" diff --git a/src/core/util/http_client/httpcli_security_connector.cc b/src/core/util/http_client/httpcli_security_connector.cc index 25e2b645b62..906f5f63a8e 100644 --- a/src/core/util/http_client/httpcli_security_connector.cc +++ b/src/core/util/http_client/httpcli_security_connector.cc @@ -39,9 +39,6 @@ #include "src/core/handshaker/handshaker.h" #include "src/core/handshaker/security/security_handshaker.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/unique_type_name.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -54,6 +51,9 @@ #include "src/core/lib/security/security_connector/ssl_utils.h" #include "src/core/tsi/ssl_transport_security.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" namespace grpc_core { diff --git a/src/core/util/json/json_object_loader.h b/src/core/util/json/json_object_loader.h index bece2a5afa3..1c1e8c565e1 100644 --- a/src/core/util/json/json_object_loader.h +++ b/src/core/util/json/json_object_loader.h @@ -32,12 +32,12 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" +#include "src/core/util/json/json.h" +#include "src/core/util/json/json_args.h" #include "src/core/util/no_destruct.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/time.h" #include "src/core/util/validation_errors.h" -#include "src/core/util/json/json.h" -#include "src/core/util/json/json_args.h" // Provides a means to load JSON objects into C++ objects, with the aim of // minimizing object code size. diff --git a/src/core/util/json/json_reader.cc b/src/core/util/json/json_reader.cc index 631eb4d97b9..c15bdfe210f 100644 --- a/src/core/util/json/json_reader.cc +++ b/src/core/util/json/json_reader.cc @@ -38,8 +38,8 @@ #include #include -#include "src/core/util/match.h" #include "src/core/util/json/json.h" +#include "src/core/util/match.h" #define GRPC_JSON_MAX_DEPTH 255 #define GRPC_JSON_MAX_ERRORS 16 diff --git a/src/core/util/json/json_util.cc b/src/core/util/json/json_util.cc index 85ebc142d7e..88fdbb6755c 100644 --- a/src/core/util/json/json_util.cc +++ b/src/core/util/json/json_util.cc @@ -20,10 +20,10 @@ #include "src/core/util/json/json_util.h" -#include "src/core/util/no_destruct.h" -#include "src/core/util/validation_errors.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/util/json/json_util.h b/src/core/util/json/json_util.h index 450bdcefa79..a8abf9efb88 100644 --- a/src/core/util/json/json_util.h +++ b/src/core/util/json/json_util.h @@ -32,9 +32,9 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/error.h" #include "src/core/util/json/json.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/util/linux/env.cc b/src/core/util/linux/env.cc index d2b8e2b29e6..ff1635f7a62 100644 --- a/src/core/util/linux/env.cc +++ b/src/core/util/linux/env.cc @@ -21,12 +21,12 @@ #define _GNU_SOURCE #endif +#include + #include #include "absl/types/optional.h" -#include - #ifdef GPR_LINUX_ENV #include diff --git a/src/core/util/load_file.cc b/src/core/util/load_file.cc index 455c58f3004..16a62aa98be 100644 --- a/src/core/util/load_file.cc +++ b/src/core/util/load_file.cc @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include "src/core/util/load_file.h" #include @@ -25,7 +27,6 @@ #include #include #include -#include namespace grpc_core { diff --git a/src/core/util/load_file.h b/src/core/util/load_file.h index 78955ae1aea..5d3f7aa784f 100644 --- a/src/core/util/load_file.h +++ b/src/core/util/load_file.h @@ -15,12 +15,12 @@ #ifndef GRPC_SRC_CORE_UTIL_LOAD_FILE_H #define GRPC_SRC_CORE_UTIL_LOAD_FILE_H +#include + #include #include "absl/status/statusor.h" -#include - #include "src/core/lib/slice/slice.h" namespace grpc_core { diff --git a/src/core/util/manual_constructor.h b/src/core/util/manual_constructor.h index d7a50683bd6..38d4695753f 100644 --- a/src/core/util/manual_constructor.h +++ b/src/core/util/manual_constructor.h @@ -21,12 +21,12 @@ // manually construct a region of memory with some type +#include + #include #include -#include - #include "src/core/util/construct_destruct.h" namespace grpc_core { diff --git a/src/core/util/match.h b/src/core/util/match.h index 186b7edeb2a..69b91f2fc9b 100644 --- a/src/core/util/match.h +++ b/src/core/util/match.h @@ -15,12 +15,12 @@ #ifndef GRPC_SRC_CORE_UTIL_MATCH_H #define GRPC_SRC_CORE_UTIL_MATCH_H +#include + #include #include "absl/types/variant.h" -#include - #include "src/core/util/overload.h" namespace grpc_core { diff --git a/src/core/util/matchers.cc b/src/core/util/matchers.cc index d5da0c0a54b..a0a8b786bec 100644 --- a/src/core/util/matchers.cc +++ b/src/core/util/matchers.cc @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include "src/core/util/matchers.h" #include @@ -23,8 +25,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" -#include - namespace grpc_core { // diff --git a/src/core/util/matchers.h b/src/core/util/matchers.h index 03b9b81813d..69992106b45 100644 --- a/src/core/util/matchers.h +++ b/src/core/util/matchers.h @@ -15,6 +15,8 @@ #ifndef GRPC_SRC_CORE_UTIL_MATCHERS_H #define GRPC_SRC_CORE_UTIL_MATCHERS_H +#include + #include #include @@ -25,8 +27,6 @@ #include "absl/types/optional.h" #include "re2/re2.h" -#include - namespace grpc_core { class StringMatcher { diff --git a/src/core/util/memory.h b/src/core/util/memory.h index fe3f5850b00..eae0aaa4b83 100644 --- a/src/core/util/memory.h +++ b/src/core/util/memory.h @@ -19,11 +19,12 @@ #ifndef GRPC_SRC_CORE_UTIL_MEMORY_H #define GRPC_SRC_CORE_UTIL_MEMORY_H +#include + #include #include #include -#include namespace grpc_core { diff --git a/src/core/util/mpscq.cc b/src/core/util/mpscq.cc index fd998e8c905..45258346443 100644 --- a/src/core/util/mpscq.cc +++ b/src/core/util/mpscq.cc @@ -16,10 +16,10 @@ // // -#include "src/core/util/mpscq.h" - #include +#include "src/core/util/mpscq.h" + namespace grpc_core { // diff --git a/src/core/util/mpscq.h b/src/core/util/mpscq.h index e6ae70665b9..0e3e279d080 100644 --- a/src/core/util/mpscq.h +++ b/src/core/util/mpscq.h @@ -19,12 +19,13 @@ #ifndef GRPC_SRC_CORE_UTIL_MPSCQ_H #define GRPC_SRC_CORE_UTIL_MPSCQ_H +#include + #include #include "absl/log/check.h" #include -#include #include "src/core/util/sync.h" diff --git a/src/core/util/no_destruct.h b/src/core/util/no_destruct.h index e07f1f0cbf0..4ba0161161f 100644 --- a/src/core/util/no_destruct.h +++ b/src/core/util/no_destruct.h @@ -15,11 +15,11 @@ #ifndef GRPC_SRC_CORE_UTIL_NO_DESTRUCT_H #define GRPC_SRC_CORE_UTIL_NO_DESTRUCT_H +#include + #include #include -#include - #include "src/core/util/construct_destruct.h" namespace grpc_core { diff --git a/src/core/util/notification.h b/src/core/util/notification.h index 49395dbde48..45acff0fda7 100644 --- a/src/core/util/notification.h +++ b/src/core/util/notification.h @@ -15,11 +15,11 @@ #ifndef GRPC_SRC_CORE_UTIL_NOTIFICATION_H #define GRPC_SRC_CORE_UTIL_NOTIFICATION_H +#include + #include "absl/time/clock.h" #include "absl/time/time.h" -#include - #include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/util/orphanable.h b/src/core/util/orphanable.h index 2b3217ff23f..82ad20c52e5 100644 --- a/src/core/util/orphanable.h +++ b/src/core/util/orphanable.h @@ -19,12 +19,12 @@ #ifndef GRPC_SRC_CORE_UTIL_ORPHANABLE_H #define GRPC_SRC_CORE_UTIL_ORPHANABLE_H +#include + #include #include #include -#include - #include "src/core/util/debug_location.h" #include "src/core/util/down_cast.h" #include "src/core/util/ref_counted.h" diff --git a/src/core/util/overload.h b/src/core/util/overload.h index dd5fdb0ab8f..373a34c1210 100644 --- a/src/core/util/overload.h +++ b/src/core/util/overload.h @@ -15,10 +15,10 @@ #ifndef GRPC_SRC_CORE_UTIL_OVERLOAD_H #define GRPC_SRC_CORE_UTIL_OVERLOAD_H -#include - #include +#include + namespace grpc_core { template diff --git a/src/core/util/per_cpu.cc b/src/core/util/per_cpu.cc index 13098726bc7..8412f399173 100644 --- a/src/core/util/per_cpu.cc +++ b/src/core/util/per_cpu.cc @@ -12,10 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include "src/core/util/per_cpu.h" #include -#include #include "src/core/util/useful.h" diff --git a/src/core/util/per_cpu.h b/src/core/util/per_cpu.h index 40b6b5a5c01..492ea2832b4 100644 --- a/src/core/util/per_cpu.h +++ b/src/core/util/per_cpu.h @@ -15,6 +15,8 @@ #ifndef GRPC_SRC_CORE_UTIL_PER_CPU_H #define GRPC_SRC_CORE_UTIL_PER_CPU_H +#include + #include #include @@ -23,7 +25,6 @@ #include #include -#include // Sharded collections of objects // This used to be per-cpu, now it's much less so - but still a way to limit diff --git a/src/core/util/posix/directory_reader.cc b/src/core/util/posix/directory_reader.cc index b8fd3642f1f..d889c7b6c44 100644 --- a/src/core/util/posix/directory_reader.cc +++ b/src/core/util/posix/directory_reader.cc @@ -16,14 +16,14 @@ // // +#include + #include #include "absl/functional/function_ref.h" #include "absl/status/status.h" #include "absl/strings/string_view.h" -#include - #if defined(GPR_LINUX) || defined(GPR_ANDROID) || defined(GPR_FREEBSD) || \ defined(GPR_APPLE) diff --git a/src/core/util/posix/stat.cc b/src/core/util/posix/stat.cc index d00d6028385..293df2ecccf 100644 --- a/src/core/util/posix/stat.cc +++ b/src/core/util/posix/stat.cc @@ -14,10 +14,10 @@ // limitations under the License. // -#include - #include +#include + // IWYU pragma: no_include #include "absl/status/status.h" diff --git a/src/core/util/posix/thd.cc b/src/core/util/posix/thd.cc index 08492369379..9474a7ef44e 100644 --- a/src/core/util/posix/thd.cc +++ b/src/core/util/posix/thd.cc @@ -18,13 +18,13 @@ // Posix implementation for gpr threads. +#include + #include #include #include -#include - #ifdef GPR_POSIX_SYNC #include diff --git a/src/core/util/random_early_detection.cc b/src/core/util/random_early_detection.cc index 33514444154..882a7d530e9 100644 --- a/src/core/util/random_early_detection.cc +++ b/src/core/util/random_early_detection.cc @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include "src/core/util/random_early_detection.h" #include "absl/random/distributions.h" -#include - namespace grpc_core { bool RandomEarlyDetection::Reject(uint64_t size, absl::BitGenRef bitsrc) const { diff --git a/src/core/util/random_early_detection.h b/src/core/util/random_early_detection.h index 062c0c4e73e..fb2ea8f51a4 100644 --- a/src/core/util/random_early_detection.h +++ b/src/core/util/random_early_detection.h @@ -15,14 +15,14 @@ #ifndef GRPC_SRC_CORE_UTIL_RANDOM_EARLY_DETECTION_H #define GRPC_SRC_CORE_UTIL_RANDOM_EARLY_DETECTION_H +#include + #include #include #include "absl/random/bit_gen_ref.h" -#include - namespace grpc_core { // Implements the random early detection algorithm - allows items to be rejected diff --git a/src/core/util/ref_counted.h b/src/core/util/ref_counted.h index 00da2b64ba3..b3fa9b5b763 100644 --- a/src/core/util/ref_counted.h +++ b/src/core/util/ref_counted.h @@ -19,6 +19,8 @@ #ifndef GRPC_SRC_CORE_UTIL_REF_COUNTED_H #define GRPC_SRC_CORE_UTIL_REF_COUNTED_H +#include + #include #include #include @@ -26,7 +28,6 @@ #include "absl/log/check.h" #include -#include #include "src/core/util/atomic_utils.h" #include "src/core/util/debug_location.h" diff --git a/src/core/util/ref_counted_ptr.h b/src/core/util/ref_counted_ptr.h index 5cfb62ea392..28829bc0d20 100644 --- a/src/core/util/ref_counted_ptr.h +++ b/src/core/util/ref_counted_ptr.h @@ -19,6 +19,8 @@ #ifndef GRPC_SRC_CORE_UTIL_REF_COUNTED_PTR_H #define GRPC_SRC_CORE_UTIL_REF_COUNTED_PTR_H +#include + #include #include @@ -27,8 +29,6 @@ #include "absl/hash/hash.h" -#include - #include "src/core/util/debug_location.h" #include "src/core/util/down_cast.h" diff --git a/src/core/util/ref_counted_string.cc b/src/core/util/ref_counted_string.cc index 84fb0d6cb60..2b3f6f66b36 100644 --- a/src/core/util/ref_counted_string.cc +++ b/src/core/util/ref_counted_string.cc @@ -14,6 +14,8 @@ // limitations under the License. // +#include + #include "src/core/util/ref_counted_string.h" #include @@ -21,7 +23,6 @@ #include #include -#include namespace grpc_core { diff --git a/src/core/util/ref_counted_string.h b/src/core/util/ref_counted_string.h index b135683b99f..ed3e93089ae 100644 --- a/src/core/util/ref_counted_string.h +++ b/src/core/util/ref_counted_string.h @@ -17,14 +17,14 @@ #ifndef GRPC_SRC_CORE_UTIL_REF_COUNTED_STRING_H #define GRPC_SRC_CORE_UTIL_REF_COUNTED_STRING_H +#include + #include #include #include "absl/strings/string_view.h" -#include - #include "src/core/util/ref_counted.h" #include "src/core/util/ref_counted_ptr.h" diff --git a/src/core/util/single_set_ptr.h b/src/core/util/single_set_ptr.h index 3b6fcb97f08..58e1f92a304 100644 --- a/src/core/util/single_set_ptr.h +++ b/src/core/util/single_set_ptr.h @@ -15,13 +15,14 @@ #ifndef GRPC_SRC_CORE_UTIL_SINGLE_SET_PTR_H #define GRPC_SRC_CORE_UTIL_SINGLE_SET_PTR_H +#include + #include #include #include "absl/log/check.h" #include -#include namespace grpc_core { diff --git a/src/core/util/sorted_pack.h b/src/core/util/sorted_pack.h index 6afdf6d76fa..bb0d2415a15 100644 --- a/src/core/util/sorted_pack.h +++ b/src/core/util/sorted_pack.h @@ -15,10 +15,10 @@ #ifndef GRPC_SRC_CORE_UTIL_SORTED_PACK_H #define GRPC_SRC_CORE_UTIL_SORTED_PACK_H -#include - #include +#include + #include "src/core/util/type_list.h" namespace grpc_core { diff --git a/src/core/util/stat.h b/src/core/util/stat.h index 08fb01ead02..e947c0a5de9 100644 --- a/src/core/util/stat.h +++ b/src/core/util/stat.h @@ -17,12 +17,12 @@ #ifndef GRPC_SRC_CORE_UTIL_STAT_H #define GRPC_SRC_CORE_UTIL_STAT_H +#include + #include #include "absl/status/status.h" -#include - namespace grpc_core { // Gets the last-modified timestamp of a file or a directory. diff --git a/src/core/util/status_helper.cc b/src/core/util/status_helper.cc index fc7fe4f000b..2f672bb9b07 100644 --- a/src/core/util/status_helper.cc +++ b/src/core/util/status_helper.cc @@ -16,6 +16,8 @@ // // +#include + #include "src/core/util/status_helper.h" #include @@ -36,7 +38,6 @@ #include "upb/mem/arena.hpp" #include -#include #include "src/core/lib/slice/percent_encoding.h" #include "src/core/lib/slice/slice.h" diff --git a/src/core/util/status_helper.h b/src/core/util/status_helper.h index 432d0eb59e6..0a59f1ab149 100644 --- a/src/core/util/status_helper.h +++ b/src/core/util/status_helper.h @@ -19,6 +19,8 @@ #ifndef GRPC_SRC_CORE_UTIL_STATUS_HELPER_H #define GRPC_SRC_CORE_UTIL_STATUS_HELPER_H +#include + #include #include @@ -29,8 +31,6 @@ #include "absl/time/time.h" #include "absl/types/optional.h" -#include - #include "src/core/util/debug_location.h" extern "C" { diff --git a/src/core/util/strerror.cc b/src/core/util/strerror.cc index fb18a65068d..868acee2c06 100644 --- a/src/core/util/strerror.cc +++ b/src/core/util/strerror.cc @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include "src/core/util/strerror.h" #include #include "absl/strings/str_format.h" -#include - namespace grpc_core { #ifdef GPR_WINDOWS diff --git a/src/core/util/strerror.h b/src/core/util/strerror.h index 0c8c13a2ae8..24f285b6d76 100644 --- a/src/core/util/strerror.h +++ b/src/core/util/strerror.h @@ -15,10 +15,10 @@ #ifndef GRPC_SRC_CORE_UTIL_STRERROR_H #define GRPC_SRC_CORE_UTIL_STRERROR_H -#include - #include +#include + namespace grpc_core { // Returns a string describing the posix error code. diff --git a/src/core/util/subprocess_windows.cc b/src/core/util/subprocess_windows.cc index 2034402d90d..c638db77850 100644 --- a/src/core/util/subprocess_windows.cc +++ b/src/core/util/subprocess_windows.cc @@ -31,9 +31,9 @@ #include #include "src/core/util/crash.h" -#include "src/core/util/tchar.h" #include "src/core/util/string.h" #include "src/core/util/subprocess.h" +#include "src/core/util/tchar.h" struct gpr_subprocess { PROCESS_INFORMATION pi; diff --git a/src/core/util/sync.h b/src/core/util/sync.h index 2b85b3d335a..5ab76c0479a 100644 --- a/src/core/util/sync.h +++ b/src/core/util/sync.h @@ -19,12 +19,13 @@ #ifndef GRPC_SRC_CORE_UTIL_SYNC_H #define GRPC_SRC_CORE_UTIL_SYNC_H +#include + #include "absl/base/thread_annotations.h" #include "absl/log/check.h" #include "absl/synchronization/mutex.h" #include -#include #include #ifndef GPR_ABSEIL_SYNC diff --git a/src/core/util/table.h b/src/core/util/table.h index ddd88d3fcb0..70703c9ee19 100644 --- a/src/core/util/table.h +++ b/src/core/util/table.h @@ -15,6 +15,8 @@ #ifndef GRPC_SRC_CORE_UTIL_TABLE_H #define GRPC_SRC_CORE_UTIL_TABLE_H +#include + #include #include @@ -25,8 +27,6 @@ #include "absl/meta/type_traits.h" #include "absl/utility/utility.h" -#include - #include "src/core/util/bitset.h" namespace grpc_core { diff --git a/src/core/util/tchar.cc b/src/core/util/tchar.cc index ee9634be76a..f558b4cbc1d 100644 --- a/src/core/util/tchar.cc +++ b/src/core/util/tchar.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/util/tchar.h" - #include +#include "src/core/util/tchar.h" + #ifdef GPR_WINDOWS namespace grpc_core { diff --git a/src/core/util/thd.h b/src/core/util/thd.h index 493e113fba1..1acfa1ce154 100644 --- a/src/core/util/thd.h +++ b/src/core/util/thd.h @@ -21,6 +21,8 @@ /// Internal thread interface. +#include + #include #include @@ -30,7 +32,6 @@ #include "absl/log/check.h" #include -#include #include namespace grpc_core { diff --git a/src/core/util/time.cc b/src/core/util/time.cc index b1f10b78f17..6cdb1e5b655 100644 --- a/src/core/util/time.cc +++ b/src/core/util/time.cc @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include "src/core/util/time.h" #include @@ -24,7 +26,6 @@ #include "absl/strings/str_format.h" #include -#include #include #include "src/core/util/no_destruct.h" diff --git a/src/core/util/time.h b/src/core/util/time.h index 228339d5e83..cc94d636328 100644 --- a/src/core/util/time.h +++ b/src/core/util/time.h @@ -15,6 +15,8 @@ #ifndef GRPC_SRC_CORE_UTIL_TIME_H #define GRPC_SRC_CORE_UTIL_TIME_H +#include + #include #include @@ -24,7 +26,6 @@ #include "absl/types/optional.h" #include -#include #include #include "src/core/util/time_precise.h" diff --git a/src/core/util/time_averaged_stats.cc b/src/core/util/time_averaged_stats.cc index caf52f72751..dc6db49a011 100644 --- a/src/core/util/time_averaged_stats.cc +++ b/src/core/util/time_averaged_stats.cc @@ -16,10 +16,10 @@ // // -#include "src/core/util/time_averaged_stats.h" - #include +#include "src/core/util/time_averaged_stats.h" + namespace grpc_core { TimeAveragedStats::TimeAveragedStats(double init_avg, double regress_weight, diff --git a/src/core/util/time_util.cc b/src/core/util/time_util.cc index 5ac7ef5b8db..314fee78d98 100644 --- a/src/core/util/time_util.cc +++ b/src/core/util/time_util.cc @@ -14,6 +14,8 @@ // limitations under the License. // +#include + #include "src/core/util/time_util.h" #include @@ -22,7 +24,6 @@ #include "absl/log/check.h" #include -#include #include namespace grpc_core { diff --git a/src/core/util/time_util.h b/src/core/util/time_util.h index f29f87d2e4b..61ad6d11a5b 100644 --- a/src/core/util/time_util.h +++ b/src/core/util/time_util.h @@ -17,9 +17,10 @@ #ifndef GRPC_SRC_CORE_UTIL_TIME_UTIL_H #define GRPC_SRC_CORE_UTIL_TIME_UTIL_H +#include + #include "absl/time/time.h" -#include #include namespace grpc_core { diff --git a/src/core/util/unique_type_name.h b/src/core/util/unique_type_name.h index e64fbe33e03..9835f41d2eb 100644 --- a/src/core/util/unique_type_name.h +++ b/src/core/util/unique_type_name.h @@ -17,12 +17,12 @@ #ifndef GRPC_SRC_CORE_UTIL_UNIQUE_TYPE_NAME_H #define GRPC_SRC_CORE_UTIL_UNIQUE_TYPE_NAME_H +#include + #include #include "absl/strings/string_view.h" -#include - #include "src/core/util/useful.h" // Provides a type name that is unique by instance rather than by diff --git a/src/core/util/uri.cc b/src/core/util/uri.cc index f0d6757e585..c45a65cd47a 100644 --- a/src/core/util/uri.cc +++ b/src/core/util/uri.cc @@ -14,6 +14,8 @@ // limitations under the License. // +#include + #include "src/core/util/uri.h" #include @@ -37,7 +39,6 @@ #include "absl/strings/strip.h" #include -#include namespace grpc_core { diff --git a/src/core/util/uri.h b/src/core/util/uri.h index 19fc6c7487d..14e9274eaa8 100644 --- a/src/core/util/uri.h +++ b/src/core/util/uri.h @@ -17,6 +17,8 @@ #ifndef GRPC_SRC_CORE_UTIL_URI_H #define GRPC_SRC_CORE_UTIL_URI_H +#include + #include #include #include @@ -24,8 +26,6 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" -#include - namespace grpc_core { class URI { diff --git a/src/core/util/uuid_v4.cc b/src/core/util/uuid_v4.cc index 13781805d28..b0847a8d33e 100644 --- a/src/core/util/uuid_v4.cc +++ b/src/core/util/uuid_v4.cc @@ -16,12 +16,12 @@ // // +#include + #include "src/core/util/uuid_v4.h" #include "absl/strings/str_format.h" -#include - namespace grpc_core { std::string GenerateUUIDv4(uint64_t hi, uint64_t lo) { diff --git a/src/core/util/uuid_v4.h b/src/core/util/uuid_v4.h index 671cd798303..e7bf52c6409 100644 --- a/src/core/util/uuid_v4.h +++ b/src/core/util/uuid_v4.h @@ -19,12 +19,12 @@ #ifndef GRPC_SRC_CORE_UTIL_UUID_V4_H #define GRPC_SRC_CORE_UTIL_UUID_V4_H +#include + #include #include -#include - namespace grpc_core { // Generates string in the UUIDv4 form. \a hi and \a lo are expected to be diff --git a/src/core/util/validation_errors.cc b/src/core/util/validation_errors.cc index f7085300b7e..e24f7644c82 100644 --- a/src/core/util/validation_errors.cc +++ b/src/core/util/validation_errors.cc @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include "src/core/util/validation_errors.h" #include @@ -24,7 +26,6 @@ #include "absl/strings/strip.h" #include -#include namespace grpc_core { diff --git a/src/core/util/validation_errors.h b/src/core/util/validation_errors.h index eb7f4094aa0..5c075c12cce 100644 --- a/src/core/util/validation_errors.h +++ b/src/core/util/validation_errors.h @@ -15,6 +15,8 @@ #ifndef GRPC_SRC_CORE_UTIL_VALIDATION_ERRORS_H #define GRPC_SRC_CORE_UTIL_VALIDATION_ERRORS_H +#include + #include #include @@ -25,8 +27,6 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" -#include - namespace grpc_core { // Tracks errors that occur during validation of a data structure (e.g., diff --git a/src/core/util/windows/string_util.cc b/src/core/util/windows/string_util.cc index 8a0a40a3a6e..105ce0636c9 100644 --- a/src/core/util/windows/string_util.cc +++ b/src/core/util/windows/string_util.cc @@ -36,8 +36,8 @@ #include #include -#include "src/core/util/tchar.h" #include "src/core/util/string.h" +#include "src/core/util/tchar.h" char* gpr_format_message(int messageid) { LPTSTR tmessage; diff --git a/src/core/util/work_serializer.cc b/src/core/util/work_serializer.cc index 27cce840105..c2634af6aef 100644 --- a/src/core/util/work_serializer.cc +++ b/src/core/util/work_serializer.cc @@ -14,6 +14,8 @@ // limitations under the License. // +#include + #include "src/core/util/work_serializer.h" #include @@ -32,17 +34,16 @@ #include #include -#include #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" +#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/telemetry/stats.h" +#include "src/core/telemetry/stats_data.h" #include "src/core/util/debug_location.h" #include "src/core/util/mpscq.h" #include "src/core/util/orphanable.h" #include "src/core/util/sync.h" -#include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/telemetry/stats.h" -#include "src/core/telemetry/stats_data.h" namespace grpc_core { diff --git a/src/core/util/work_serializer.h b/src/core/util/work_serializer.h index 712e163b865..780fa4fb05e 100644 --- a/src/core/util/work_serializer.h +++ b/src/core/util/work_serializer.h @@ -17,13 +17,14 @@ #ifndef GRPC_SRC_CORE_UTIL_WORK_SERIALIZER_H #define GRPC_SRC_CORE_UTIL_WORK_SERIALIZER_H +#include + #include #include #include "absl/base/thread_annotations.h" #include -#include #include "src/core/util/debug_location.h" #include "src/core/util/orphanable.h" diff --git a/src/core/xds/grpc/certificate_provider_store.h b/src/core/xds/grpc/certificate_provider_store.h index 11a9ca7aec1..239d5ca74af 100644 --- a/src/core/xds/grpc/certificate_provider_store.h +++ b/src/core/xds/grpc/certificate_provider_store.h @@ -29,18 +29,18 @@ #include #include -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" -#include "src/core/util/unique_type_name.h" -#include "src/core/util/validation_errors.h" #include "src/core/lib/security/certificate_provider/certificate_provider_factory.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/xds/grpc/file_watcher_certificate_provider_factory.h b/src/core/xds/grpc/file_watcher_certificate_provider_factory.h index 6b0428632b4..493e993648c 100644 --- a/src/core/xds/grpc/file_watcher_certificate_provider_factory.h +++ b/src/core/xds/grpc/file_watcher_certificate_provider_factory.h @@ -26,13 +26,13 @@ #include #include -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" -#include "src/core/util/validation_errors.h" #include "src/core/lib/security/certificate_provider/certificate_provider_factory.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_audit_logger_registry.cc b/src/core/xds/grpc/xds_audit_logger_registry.cc index 3545a2d470a..5400ef8b2aa 100644 --- a/src/core/xds/grpc/xds_audit_logger_registry.cc +++ b/src/core/xds/grpc/xds_audit_logger_registry.cc @@ -28,9 +28,9 @@ #include +#include "src/core/lib/security/authorization/audit_logging.h" #include "src/core/util/match.h" #include "src/core/util/validation_errors.h" -#include "src/core/lib/security/authorization/audit_logging.h" #include "src/core/xds/grpc/xds_common_types.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_audit_logger_registry.h b/src/core/xds/grpc/xds_audit_logger_registry.h index 17b846e0eb6..92f7aadd302 100644 --- a/src/core/xds/grpc/xds_audit_logger_registry.h +++ b/src/core/xds/grpc/xds_audit_logger_registry.h @@ -25,8 +25,8 @@ #include -#include "src/core/util/validation_errors.h" #include "src/core/util/json/json.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/xds_client/xds_resource_type.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_bootstrap_grpc.cc b/src/core/xds/grpc/xds_bootstrap_grpc.cc index d8b0d36f796..1bb9fa8432c 100644 --- a/src/core/xds/grpc/xds_bootstrap_grpc.cc +++ b/src/core/xds/grpc/xds_bootstrap_grpc.cc @@ -37,13 +37,13 @@ #include #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/env.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/security/credentials/channel_creds_registry.h" +#include "src/core/util/env.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_object_loader.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/string.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_bootstrap_grpc.h b/src/core/xds/grpc/xds_bootstrap_grpc.h index ffcba417e6e..d5a6b916f94 100644 --- a/src/core/xds/grpc/xds_bootstrap_grpc.h +++ b/src/core/xds/grpc/xds_bootstrap_grpc.h @@ -29,12 +29,12 @@ #include -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/validation_errors.h" #include "src/core/lib/security/credentials/channel_creds_registry.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/certificate_provider_store.h" #include "src/core/xds/grpc/xds_audit_logger_registry.h" #include "src/core/xds/grpc/xds_cluster_specifier_plugin.h" diff --git a/src/core/xds/grpc/xds_certificate_provider.h b/src/core/xds/grpc/xds_certificate_provider.h index 0d5602d96e7..338e44062f7 100644 --- a/src/core/xds/grpc/xds_certificate_provider.h +++ b/src/core/xds/grpc/xds_certificate_provider.h @@ -31,12 +31,12 @@ #include #include +#include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h" +#include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" +#include "src/core/util/matchers.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/sync.h" #include "src/core/util/unique_type_name.h" -#include "src/core/util/matchers.h" -#include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h" -#include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_client_grpc.cc b/src/core/xds/grpc/xds_client_grpc.cc index c781e99fd08..ab82a6c0c15 100644 --- a/src/core/xds/grpc/xds_client_grpc.cc +++ b/src/core/xds/grpc/xds_client_grpc.cc @@ -43,6 +43,12 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/default_event_engine.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/slice/slice.h" +#include "src/core/lib/slice/slice_internal.h" +#include "src/core/lib/transport/error_utils.h" +#include "src/core/telemetry/metrics.h" #include "src/core/util/debug_location.h" #include "src/core/util/env.h" #include "src/core/util/load_file.h" @@ -50,12 +56,6 @@ #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/sync.h" #include "src/core/util/time.h" -#include "src/core/lib/iomgr/error.h" -#include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/lib/slice/slice.h" -#include "src/core/lib/slice/slice_internal.h" -#include "src/core/lib/transport/error_utils.h" -#include "src/core/telemetry/metrics.h" #include "src/core/xds/grpc/upb_utils.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_transport_grpc.h" diff --git a/src/core/xds/grpc/xds_client_grpc.h b/src/core/xds/grpc/xds_client_grpc.h index 94874449434..3093bcab198 100644 --- a/src/core/xds/grpc/xds_client_grpc.h +++ b/src/core/xds/grpc/xds_client_grpc.h @@ -26,11 +26,11 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/telemetry/metrics.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/useful.h" #include "src/core/xds/grpc/certificate_provider_store.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" diff --git a/src/core/xds/grpc/xds_cluster.cc b/src/core/xds/grpc/xds_cluster.cc index f7df3774c34..06005c718c1 100644 --- a/src/core/xds/grpc/xds_cluster.cc +++ b/src/core/xds/grpc/xds_cluster.cc @@ -58,14 +58,14 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" +#include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/util/host_port.h" +#include "src/core/util/json/json_writer.h" #include "src/core/util/match.h" +#include "src/core/util/matchers.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/time.h" #include "src/core/util/validation_errors.h" -#include "src/core/util/matchers.h" -#include "src/core/load_balancing/lb_policy_registry.h" -#include "src/core/util/json/json_writer.h" #include "src/core/xds/grpc/upb_utils.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_lb_policy_registry.h" diff --git a/src/core/xds/grpc/xds_cluster_specifier_plugin.h b/src/core/xds/grpc/xds_cluster_specifier_plugin.h index 37c6b36a22a..4735ab749bc 100644 --- a/src/core/xds/grpc/xds_cluster_specifier_plugin.h +++ b/src/core/xds/grpc/xds_cluster_specifier_plugin.h @@ -27,8 +27,8 @@ #include -#include "src/core/util/validation_errors.h" #include "src/core/util/json/json.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_common_types.h b/src/core/xds/grpc/xds_common_types.h index e76ffc6bfdf..0330fbae4a1 100644 --- a/src/core/xds/grpc/xds_common_types.h +++ b/src/core/xds/grpc/xds_common_types.h @@ -29,10 +29,10 @@ #include +#include "src/core/util/json/json.h" +#include "src/core/util/matchers.h" #include "src/core/util/time.h" #include "src/core/util/validation_errors.h" -#include "src/core/util/matchers.h" -#include "src/core/util/json/json.h" #include "src/core/xds/xds_client/xds_resource_type.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_endpoint.cc b/src/core/xds/grpc/xds_endpoint.cc index 76ef8daa8cf..e1707e78d38 100644 --- a/src/core/xds/grpc/xds_endpoint.cc +++ b/src/core/xds/grpc/xds_endpoint.cc @@ -47,10 +47,10 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/env.h" -#include "src/core/util/validation_errors.h" #include "src/core/lib/iomgr/resolved_address.h" +#include "src/core/util/env.h" #include "src/core/util/string.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/upb_utils.h" #include "src/core/xds/grpc/xds_health_status.h" #include "src/core/xds/xds_client/xds_resource_type.h" diff --git a/src/core/xds/grpc/xds_endpoint.h b/src/core/xds/grpc/xds_endpoint.h index 778ed925f3b..01d1a5ecc1c 100644 --- a/src/core/xds/grpc/xds_endpoint.h +++ b/src/core/xds/grpc/xds_endpoint.h @@ -33,10 +33,10 @@ #include +#include "src/core/resolver/endpoint_addresses.h" #include "src/core/util/ref_counted.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/sync.h" -#include "src/core/resolver/endpoint_addresses.h" #include "src/core/xds/xds_client/xds_client.h" #include "src/core/xds/xds_client/xds_client_stats.h" #include "src/core/xds/xds_client/xds_resource_type.h" diff --git a/src/core/xds/grpc/xds_http_fault_filter.cc b/src/core/xds/grpc/xds_http_fault_filter.cc index 1136a94fb43..4fac2aae0d7 100644 --- a/src/core/xds/grpc/xds_http_fault_filter.cc +++ b/src/core/xds/grpc/xds_http_fault_filter.cc @@ -39,11 +39,11 @@ #include "src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/status_util.h" -#include "src/core/util/time.h" -#include "src/core/util/validation_errors.h" #include "src/core/lib/transport/status_conversion.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_http_filters.h" diff --git a/src/core/xds/grpc/xds_http_filters.h b/src/core/xds/grpc/xds_http_filters.h index 7ff07f063fd..be24879c02b 100644 --- a/src/core/xds/grpc/xds_http_filters.h +++ b/src/core/xds/grpc/xds_http_filters.h @@ -34,9 +34,9 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" -#include "src/core/util/validation_errors.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/xds_client/xds_resource_type.h" diff --git a/src/core/xds/grpc/xds_http_stateful_session_filter.cc b/src/core/xds/grpc/xds_http_stateful_session_filter.cc index 3f0a821cb05..03f67047ba7 100644 --- a/src/core/xds/grpc/xds_http_stateful_session_filter.cc +++ b/src/core/xds/grpc/xds_http_stateful_session_filter.cc @@ -35,10 +35,10 @@ #include "src/core/ext/filters/stateful_session/stateful_session_filter.h" #include "src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/time.h" -#include "src/core/util/validation_errors.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/upb_utils.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_http_filters.h" diff --git a/src/core/xds/grpc/xds_lb_policy_registry.cc b/src/core/xds/grpc/xds_lb_policy_registry.cc index 1265bd562e6..526cf6fdf93 100644 --- a/src/core/xds/grpc/xds_lb_policy_registry.cc +++ b/src/core/xds/grpc/xds_lb_policy_registry.cc @@ -36,9 +36,9 @@ #include #include "src/core/lib/config/core_configuration.h" +#include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/util/time.h" #include "src/core/util/validation_errors.h" -#include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/xds/grpc/xds_common_types.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_lb_policy_registry.h b/src/core/xds/grpc/xds_lb_policy_registry.h index 2c5eb002291..2396cb8a88d 100644 --- a/src/core/xds/grpc/xds_lb_policy_registry.h +++ b/src/core/xds/grpc/xds_lb_policy_registry.h @@ -25,8 +25,8 @@ #include -#include "src/core/util/validation_errors.h" #include "src/core/util/json/json.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/xds_client/xds_resource_type.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_listener.cc b/src/core/xds/grpc/xds_listener.cc index 0d43f5de7bf..d72c7f43779 100644 --- a/src/core/xds/grpc/xds_listener.cc +++ b/src/core/xds/grpc/xds_listener.cc @@ -50,11 +50,11 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/debug/trace.h" +#include "src/core/lib/iomgr/sockaddr.h" #include "src/core/util/host_port.h" #include "src/core/util/match.h" -#include "src/core/util/validation_errors.h" -#include "src/core/lib/iomgr/sockaddr.h" #include "src/core/util/matchers.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/upb_utils.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/xds_client/xds_resource_type.h" diff --git a/src/core/xds/grpc/xds_listener.h b/src/core/xds/grpc/xds_listener.h index 9e35e16aeff..0794810c0db 100644 --- a/src/core/xds/grpc/xds_listener.h +++ b/src/core/xds/grpc/xds_listener.h @@ -36,8 +36,8 @@ #include -#include "src/core/util/time.h" #include "src/core/lib/iomgr/resolved_address.h" +#include "src/core/util/time.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_http_filters.h" diff --git a/src/core/xds/grpc/xds_route_config.cc b/src/core/xds/grpc/xds_route_config.cc index da9c65e6c2c..8f5729c4ab2 100644 --- a/src/core/xds/grpc/xds_route_config.cc +++ b/src/core/xds/grpc/xds_route_config.cc @@ -61,15 +61,15 @@ #include "src/core/lib/channel/status_util.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/env.h" -#include "src/core/util/match.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" -#include "src/core/util/matchers.h" #include "src/core/load_balancing/lb_policy_registry.h" +#include "src/core/util/env.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/match.h" +#include "src/core/util/matchers.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/string.h" +#include "src/core/util/time.h" #include "src/core/xds/grpc/upb_utils.h" #include "src/core/xds/grpc/xds_cluster_specifier_plugin.h" #include "src/core/xds/grpc/xds_common_types.h" diff --git a/src/core/xds/grpc/xds_route_config.h b/src/core/xds/grpc/xds_route_config.h index 9573d9c63d4..a6f5ac1321d 100644 --- a/src/core/xds/grpc/xds_route_config.h +++ b/src/core/xds/grpc/xds_route_config.h @@ -36,9 +36,9 @@ #include #include "src/core/lib/channel/status_util.h" +#include "src/core/util/matchers.h" #include "src/core/util/time.h" #include "src/core/util/validation_errors.h" -#include "src/core/util/matchers.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_cluster_specifier_plugin.h" #include "src/core/xds/grpc/xds_http_filters.h" diff --git a/src/core/xds/grpc/xds_transport_grpc.cc b/src/core/xds/grpc/xds_transport_grpc.cc index fb4cd776e13..ebcf4a582b9 100644 --- a/src/core/xds/grpc/xds_transport_grpc.cc +++ b/src/core/xds/grpc/xds_transport_grpc.cc @@ -43,10 +43,6 @@ #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset_set.h" @@ -59,6 +55,10 @@ #include "src/core/lib/surface/init_internally.h" #include "src/core/lib/surface/lame_client.h" #include "src/core/lib/transport/connectivity_state.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/xds_client/xds_bootstrap.h" diff --git a/src/core/xds/grpc/xds_transport_grpc.h b/src/core/xds/grpc/xds_transport_grpc.h index aabd080aebf..3ed89cb08d8 100644 --- a/src/core/xds/grpc/xds_transport_grpc.h +++ b/src/core/xds/grpc/xds_transport_grpc.h @@ -29,12 +29,12 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/surface/channel.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/xds/xds_client/xds_bootstrap.h" #include "src/core/xds/xds_client/xds_transport.h" diff --git a/src/core/xds/xds_client/xds_client.cc b/src/core/xds/xds_client/xds_client.cc index 5290d8affc9..696eb09ead1 100644 --- a/src/core/xds/xds_client/xds_client.cc +++ b/src/core/xds/xds_client/xds_client.cc @@ -46,12 +46,12 @@ #include #include +#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/util/backoff.h" #include "src/core/util/debug_location.h" #include "src/core/util/orphanable.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/sync.h" -#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/util/uri.h" #include "src/core/xds/grpc/upb_utils.h" #include "src/core/xds/xds_client/xds_api.h" diff --git a/src/core/xds/xds_client/xds_client.h b/src/core/xds/xds_client/xds_client.h index b280c1fe566..e37967e7267 100644 --- a/src/core/xds/xds_client/xds_client.h +++ b/src/core/xds/xds_client/xds_client.h @@ -40,8 +40,8 @@ #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/sync.h" #include "src/core/util/time.h" -#include "src/core/util/work_serializer.h" #include "src/core/util/uri.h" +#include "src/core/util/work_serializer.h" #include "src/core/xds/xds_client/xds_api.h" #include "src/core/xds/xds_client/xds_bootstrap.h" #include "src/core/xds/xds_client/xds_client_stats.h" diff --git a/src/core/xds/xds_client/xds_client_stats.h b/src/core/xds/xds_client/xds_client_stats.h index ae8db5df6bf..de9f924120d 100644 --- a/src/core/xds/xds_client/xds_client_stats.h +++ b/src/core/xds/xds_client/xds_client_stats.h @@ -31,12 +31,12 @@ #include +#include "src/core/resolver/endpoint_addresses.h" +#include "src/core/telemetry/call_tracer.h" #include "src/core/util/per_cpu.h" #include "src/core/util/ref_counted.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/sync.h" -#include "src/core/resolver/endpoint_addresses.h" -#include "src/core/telemetry/call_tracer.h" #include "src/core/util/useful.h" #include "src/core/xds/xds_client/xds_bootstrap.h" diff --git a/src/cpp/client/secure_credentials.cc b/src/cpp/client/secure_credentials.cc index 643e2a4ab1b..5c1804fbc66 100644 --- a/src/cpp/client/secure_credentials.cc +++ b/src/cpp/client/secure_credentials.cc @@ -47,11 +47,11 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/util/env.h" -#include "src/core/util/load_file.h" #include "src/core/lib/security/util/json_util.h" +#include "src/core/util/env.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" +#include "src/core/util/load_file.h" #include "src/cpp/common/secure_auth_context.h" #include "src/cpp/server/thread_pool_interface.h" diff --git a/src/cpp/common/alarm.cc b/src/cpp/common/alarm.cc index ee37668c7e5..91237dfc300 100644 --- a/src/cpp/common/alarm.cc +++ b/src/cpp/common/alarm.cc @@ -34,10 +34,10 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/completion_queue.h" +#include "src/core/util/time.h" namespace grpc { diff --git a/src/cpp/common/secure_auth_context.h b/src/cpp/common/secure_auth_context.h index 1b82e21affe..8da3e971c22 100644 --- a/src/cpp/common/secure_auth_context.h +++ b/src/cpp/common/secure_auth_context.h @@ -26,8 +26,8 @@ #include #include -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/security/context/security_context.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc { diff --git a/src/cpp/common/secure_create_auth_context.cc b/src/cpp/common/secure_create_auth_context.cc index c812a6a9a28..8492655b4aa 100644 --- a/src/cpp/common/secure_create_auth_context.cc +++ b/src/cpp/common/secure_create_auth_context.cc @@ -21,8 +21,8 @@ #include #include -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/security/context/security_context.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/cpp/common/secure_auth_context.h" namespace grpc { diff --git a/src/cpp/common/validate_service_config.cc b/src/cpp/common/validate_service_config.cc index ff515088fdd..f8f662d87b3 100644 --- a/src/cpp/common/validate_service_config.cc +++ b/src/cpp/common/validate_service_config.cc @@ -25,9 +25,9 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc { namespace experimental { diff --git a/src/cpp/ext/csm/metadata_exchange.cc b/src/cpp/ext/csm/metadata_exchange.cc index 14320ed4f5c..bd922460fb9 100644 --- a/src/cpp/ext/csm/metadata_exchange.cc +++ b/src/cpp/ext/csm/metadata_exchange.cc @@ -39,14 +39,14 @@ #include #include -#include "src/core/util/env.h" -#include "src/core/util/load_file.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/env.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" #include "src/core/util/json/json_reader.h" +#include "src/core/util/load_file.h" #include "src/cpp/ext/otel/key_value_iterable.h" namespace grpc { diff --git a/src/cpp/ext/filters/census/client_filter.cc b/src/cpp/ext/filters/census/client_filter.cc index e68032b5be6..e1fd5f002d8 100644 --- a/src/cpp/ext/filters/census/client_filter.cc +++ b/src/cpp/ext/filters/census/client_filter.cc @@ -54,7 +54,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/context.h" -#include "src/core/util/sync.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/slice/slice.h" @@ -63,6 +62,7 @@ #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" #include "src/core/telemetry/tcp_tracer.h" +#include "src/core/util/sync.h" #include "src/cpp/ext/filters/census/context.h" #include "src/cpp/ext/filters/census/grpc_plugin.h" #include "src/cpp/ext/filters/census/measures.h" diff --git a/src/cpp/ext/filters/census/open_census_call_tracer.h b/src/cpp/ext/filters/census/open_census_call_tracer.h index 51706df2e51..8431818131d 100644 --- a/src/cpp/ext/filters/census/open_census_call_tracer.h +++ b/src/cpp/ext/filters/census/open_census_call_tracer.h @@ -38,7 +38,6 @@ #include #include "src/core/lib/channel/context.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/slice/slice.h" @@ -47,6 +46,7 @@ #include "src/core/lib/transport/transport.h" #include "src/core/telemetry/call_tracer.h" #include "src/core/telemetry/tcp_tracer.h" +#include "src/core/util/sync.h" // TODO(yashykt): This might not be the right place for this channel arg, but we // don't have a better place for this right now. diff --git a/src/cpp/ext/gcp/environment_autodetect.cc b/src/cpp/ext/gcp/environment_autodetect.cc index f7cf590b125..ee54a5d760e 100644 --- a/src/cpp/ext/gcp/environment_autodetect.cc +++ b/src/cpp/ext/gcp/environment_autodetect.cc @@ -36,12 +36,6 @@ #include "src/core/ext/gcp/metadata_query.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/util/crash.h" -#include "src/core/util/env.h" -#include "src/core/util/load_file.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -49,6 +43,12 @@ #include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" +#include "src/core/util/load_file.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" namespace grpc { namespace internal { diff --git a/src/cpp/ext/gcp/observability_config.cc b/src/cpp/ext/gcp/observability_config.cc index 1eee36dca56..f6ffcf94d6a 100644 --- a/src/cpp/ext/gcp/observability_config.cc +++ b/src/cpp/ext/gcp/observability_config.cc @@ -32,15 +32,15 @@ #include #include -#include "src/core/util/env.h" -#include "src/core/util/load_file.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/validation_errors.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/util/env.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" +#include "src/core/util/load_file.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/validation_errors.h" namespace grpc { namespace internal { diff --git a/src/cpp/ext/gcp/observability_config.h b/src/cpp/ext/gcp/observability_config.h index db1dc7c634b..5fb18f3fae6 100644 --- a/src/cpp/ext/gcp/observability_config.h +++ b/src/cpp/ext/gcp/observability_config.h @@ -29,10 +29,10 @@ #include -#include "src/core/util/validation_errors.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/validation_errors.h" namespace grpc { namespace internal { diff --git a/src/cpp/ext/gcp/observability_logging_sink.cc b/src/cpp/ext/gcp/observability_logging_sink.cc index af90090e6cd..0a370d87606 100644 --- a/src/cpp/ext/gcp/observability_logging_sink.cc +++ b/src/cpp/ext/gcp/observability_logging_sink.cc @@ -44,9 +44,9 @@ #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/util/env.h" +#include "src/core/util/json/json.h" #include "src/core/util/time.h" #include "src/core/util/uuid_v4.h" -#include "src/core/util/json/json.h" #include "src/cpp/ext/filters/census/open_census_call_tracer.h" // IWYU pragma: no_include "google/protobuf/struct.pb.h" diff --git a/src/cpp/ext/otel/otel_client_call_tracer.cc b/src/cpp/ext/otel/otel_client_call_tracer.cc index 91fb473188b..cba626113b3 100644 --- a/src/cpp/ext/otel/otel_client_call_tracer.cc +++ b/src/cpp/ext/otel/otel_client_call_tracer.cc @@ -48,13 +48,13 @@ #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/context.h" #include "src/core/lib/channel/status_util.h" -#include "src/core/util/sync.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/telemetry/tcp_tracer.h" +#include "src/core/util/sync.h" #include "src/cpp/ext/otel/key_value_iterable.h" #include "src/cpp/ext/otel/otel_plugin.h" diff --git a/src/cpp/ext/otel/otel_client_call_tracer.h b/src/cpp/ext/otel/otel_client_call_tracer.h index 302de1df4c8..4efbeb93c3d 100644 --- a/src/cpp/ext/otel/otel_client_call_tracer.h +++ b/src/cpp/ext/otel/otel_client_call_tracer.h @@ -32,7 +32,6 @@ #include #include -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/slice/slice.h" @@ -41,6 +40,7 @@ #include "src/core/lib/transport/transport.h" #include "src/core/telemetry/call_tracer.h" #include "src/core/telemetry/tcp_tracer.h" +#include "src/core/util/sync.h" #include "src/cpp/ext/otel/otel_plugin.h" namespace grpc { diff --git a/src/cpp/ext/otel/otel_plugin.cc b/src/cpp/ext/otel/otel_plugin.cc index f911052fff6..bb65d782f96 100644 --- a/src/cpp/ext/otel/otel_plugin.cc +++ b/src/cpp/ext/otel/otel_plugin.cc @@ -38,9 +38,9 @@ #include "src/core/client_channel/client_channel_filter.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/match.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/match.h" #include "src/cpp/ext/otel/key_value_iterable.h" #include "src/cpp/ext/otel/otel_client_call_tracer.h" #include "src/cpp/ext/otel/otel_server_call_tracer.h" diff --git a/src/cpp/server/external_connection_acceptor_impl.h b/src/cpp/server/external_connection_acceptor_impl.h index 36176b2e7ea..3e23eb8a0c0 100644 --- a/src/cpp/server/external_connection_acceptor_impl.h +++ b/src/cpp/server/external_connection_acceptor_impl.h @@ -26,8 +26,8 @@ #include #include -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/tcp_server.h" +#include "src/core/util/sync.h" namespace grpc { namespace internal { diff --git a/src/cpp/server/orca/orca_service.cc b/src/cpp/server/orca/orca_service.cc index 0e0d32f0bbb..90036b16bc6 100644 --- a/src/cpp/server/orca/orca_service.cc +++ b/src/cpp/server/orca/orca_service.cc @@ -46,12 +46,12 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" +#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/load_balancing/backend_metric_data.h" #include "src/core/util/debug_location.h" #include "src/core/util/ref_counted.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/time.h" -#include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/load_balancing/backend_metric_data.h" #include "src/cpp/server/backend_metric_recorder.h" namespace grpc { diff --git a/src/cpp/server/server_cc.cc b/src/cpp/server/server_cc.cc index 4474d448ecb..f3ee541291e 100644 --- a/src/cpp/server/server_cc.cc +++ b/src/cpp/server/server_cc.cc @@ -69,12 +69,12 @@ #include #include "src/core/ext/transport/inproc/inproc_transport.h" -#include "src/core/util/manual_constructor.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/resource_quota/api.h" #include "src/core/lib/surface/completion_queue.h" #include "src/core/server/server.h" +#include "src/core/util/manual_constructor.h" #include "src/cpp/client/create_channel_internal.h" #include "src/cpp/server/external_connection_acceptor_impl.h" #include "src/cpp/server/health/default_health_check_service.h" diff --git a/src/cpp/server/server_context.cc b/src/cpp/server/server_context.cc index 093e044e6de..709e2f8cb15 100644 --- a/src/cpp/server/server_context.cc +++ b/src/cpp/server/server_context.cc @@ -57,11 +57,11 @@ #include #include "src/core/lib/channel/context.h" +#include "src/core/lib/resource_quota/arena.h" +#include "src/core/lib/surface/call.h" #include "src/core/util/crash.h" #include "src/core/util/ref_counted.h" #include "src/core/util/sync.h" -#include "src/core/lib/resource_quota/arena.h" -#include "src/core/lib/surface/call.h" #include "src/cpp/server/backend_metric_recorder.h" namespace grpc { diff --git a/src/cpp/thread_manager/thread_manager.cc b/src/cpp/thread_manager/thread_manager.cc index 02943266c32..3128e1c6f41 100644 --- a/src/cpp/thread_manager/thread_manager.cc +++ b/src/cpp/thread_manager/thread_manager.cc @@ -24,10 +24,10 @@ #include "absl/log/log.h" #include "absl/strings/str_format.h" +#include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/util/crash.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/thd.h" -#include "src/core/lib/resource_quota/resource_quota.h" namespace grpc { diff --git a/src/cpp/thread_manager/thread_manager.h b/src/cpp/thread_manager/thread_manager.h index e9fbefaa607..2c201bc6098 100644 --- a/src/cpp/thread_manager/thread_manager.h +++ b/src/cpp/thread_manager/thread_manager.h @@ -21,10 +21,10 @@ #include -#include "src/core/util/sync.h" -#include "src/core/util/thd.h" #include "src/core/lib/resource_quota/api.h" #include "src/core/lib/resource_quota/thread_quota.h" +#include "src/core/util/sync.h" +#include "src/core/util/thd.h" namespace grpc { diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 6c100a705d6..be48b291b8a 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -417,8 +417,6 @@ CORE_SOURCE_FILES = [ 'src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc', 'src/core/lib/address_utils/parse_address.cc', 'src/core/lib/address_utils/sockaddr_utils.cc', - 'src/core/util/backoff.cc', - 'src/core/util/random_early_detection.cc', 'src/core/lib/channel/channel_args.cc', 'src/core/lib/channel/channel_args_preconditioning.cc', 'src/core/lib/channel/channel_stack.cc', @@ -435,7 +433,6 @@ CORE_SOURCE_FILES = [ 'src/core/lib/config/config_vars_non_generated.cc', 'src/core/lib/config/core_configuration.cc', 'src/core/lib/config/load_config.cc', - 'src/core/util/event_log.cc', 'src/core/lib/debug/trace.cc', 'src/core/lib/event_engine/ares_resolver.cc', 'src/core/lib/event_engine/cf_engine/cf_engine.cc', @@ -487,33 +484,6 @@ CORE_SOURCE_FILES = [ 'src/core/lib/event_engine/work_queue/basic_work_queue.cc', 'src/core/lib/experiments/config.cc', 'src/core/lib/experiments/experiments.cc', - 'src/core/util/crash.cc', - 'src/core/util/dump_args.cc', - 'src/core/util/examine_stack.cc', - 'src/core/util/fork.cc', - 'src/core/util/host_port.cc', - 'src/core/util/linux/env.cc', - 'src/core/util/load_file.cc', - 'src/core/util/mpscq.cc', - 'src/core/util/per_cpu.cc', - 'src/core/util/posix/directory_reader.cc', - 'src/core/util/posix/env.cc', - 'src/core/util/posix/stat.cc', - 'src/core/util/posix/thd.cc', - 'src/core/util/ref_counted_string.cc', - 'src/core/util/status_helper.cc', - 'src/core/util/strerror.cc', - 'src/core/util/tchar.cc', - 'src/core/util/time.cc', - 'src/core/util/time_averaged_stats.cc', - 'src/core/util/time_util.cc', - 'src/core/util/uuid_v4.cc', - 'src/core/util/validation_errors.cc', - 'src/core/util/windows/directory_reader.cc', - 'src/core/util/windows/env.cc', - 'src/core/util/windows/stat.cc', - 'src/core/util/windows/thd.cc', - 'src/core/util/work_serializer.cc', 'src/core/lib/iomgr/buffer_list.cc', 'src/core/lib/iomgr/call_combiner.cc', 'src/core/lib/iomgr/cfstream_handle.cc', @@ -538,11 +508,6 @@ CORE_SOURCE_FILES = [ 'src/core/lib/iomgr/executor.cc', 'src/core/lib/iomgr/fork_posix.cc', 'src/core/lib/iomgr/fork_windows.cc', - 'src/core/util/gethostname_fallback.cc', - 'src/core/util/gethostname_host_name_max.cc', - 'src/core/util/gethostname_sysconf.cc', - 'src/core/util/grpc_if_nametoindex_posix.cc', - 'src/core/util/grpc_if_nametoindex_unsupported.cc', 'src/core/lib/iomgr/internal_errqueue.cc', 'src/core/lib/iomgr/iocp_windows.cc', 'src/core/lib/iomgr/iomgr.cc', @@ -591,7 +556,6 @@ CORE_SOURCE_FILES = [ 'src/core/lib/iomgr/wakeup_fd_nospecial.cc', 'src/core/lib/iomgr/wakeup_fd_pipe.cc', 'src/core/lib/iomgr/wakeup_fd_posix.cc', - 'src/core/util/matchers.cc', 'src/core/lib/promise/activity.cc', 'src/core/lib/promise/party.cc', 'src/core/lib/promise/sleep.cc', @@ -710,7 +674,6 @@ CORE_SOURCE_FILES = [ 'src/core/lib/transport/timeout_encoding.cc', 'src/core/lib/transport/transport.cc', 'src/core/lib/transport/transport_op_string.cc', - 'src/core/util/uri.cc', 'src/core/load_balancing/address_filtering.cc', 'src/core/load_balancing/backend_metric_parser.cc', 'src/core/load_balancing/child_policy_handler.cc', @@ -806,6 +769,19 @@ CORE_SOURCE_FILES = [ 'src/core/util/alloc.cc', 'src/core/util/android/log.cc', 'src/core/util/atm.cc', + 'src/core/util/backoff.cc', + 'src/core/util/crash.cc', + 'src/core/util/dump_args.cc', + 'src/core/util/event_log.cc', + 'src/core/util/examine_stack.cc', + 'src/core/util/fork.cc', + 'src/core/util/gethostname_fallback.cc', + 'src/core/util/gethostname_host_name_max.cc', + 'src/core/util/gethostname_sysconf.cc', + 'src/core/util/gpr_time.cc', + 'src/core/util/grpc_if_nametoindex_posix.cc', + 'src/core/util/grpc_if_nametoindex_unsupported.cc', + 'src/core/util/host_port.cc', 'src/core/util/http_client/format_request.cc', 'src/core/util/http_client/httpcli.cc', 'src/core/util/http_client/httpcli_security_connector.cc', @@ -816,27 +792,51 @@ CORE_SOURCE_FILES = [ 'src/core/util/json/json_util.cc', 'src/core/util/json/json_writer.cc', 'src/core/util/linux/cpu.cc', + 'src/core/util/linux/env.cc', 'src/core/util/linux/log.cc', + 'src/core/util/load_file.cc', 'src/core/util/log.cc', + 'src/core/util/matchers.cc', + 'src/core/util/mpscq.cc', 'src/core/util/msys/tmpfile.cc', + 'src/core/util/per_cpu.cc', 'src/core/util/posix/cpu.cc', + 'src/core/util/posix/directory_reader.cc', + 'src/core/util/posix/env.cc', 'src/core/util/posix/log.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/random_early_detection.cc', + 'src/core/util/ref_counted_string.cc', + 'src/core/util/status_helper.cc', + 'src/core/util/strerror.cc', 'src/core/util/string.cc', 'src/core/util/sync.cc', 'src/core/util/sync_abseil.cc', + 'src/core/util/tchar.cc', 'src/core/util/time.cc', + 'src/core/util/time_averaged_stats.cc', 'src/core/util/time_precise.cc', + 'src/core/util/time_util.cc', + 'src/core/util/uri.cc', + 'src/core/util/uuid_v4.cc', + 'src/core/util/validation_errors.cc', 'src/core/util/windows/cpu.cc', + 'src/core/util/windows/directory_reader.cc', + 'src/core/util/windows/env.cc', 'src/core/util/windows/log.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', + 'src/core/util/work_serializer.cc', 'src/core/xds/grpc/certificate_provider_store.cc', 'src/core/xds/grpc/file_watcher_certificate_provider_factory.cc', 'src/core/xds/grpc/xds_audit_logger_registry.cc', diff --git a/src/python/grpcio_observability/observability_lib_deps.py b/src/python/grpcio_observability/observability_lib_deps.py index a3d52abc550..e2ea2dff201 100644 --- a/src/python/grpcio_observability/observability_lib_deps.py +++ b/src/python/grpcio_observability/observability_lib_deps.py @@ -20,49 +20,49 @@ CC_FILES=[ 'grpc_root/src/core/lib/config/load_config.cc', 'grpc_root/src/core/lib/debug/trace.cc', 'grpc_root/src/core/lib/event_engine/thread_local.cc', - 'grpc_root/src/core/util/crash.cc', - 'grpc_root/src/core/util/examine_stack.cc', - 'grpc_root/src/core/util/fork.cc', - 'grpc_root/src/core/util/host_port.cc', - 'grpc_root/src/core/util/linux/env.cc', - 'grpc_root/src/core/util/mpscq.cc', - 'grpc_root/src/core/util/posix/env.cc', - 'grpc_root/src/core/util/posix/stat.cc', - 'grpc_root/src/core/util/posix/thd.cc', - 'grpc_root/src/core/util/ref_counted_string.cc', - 'grpc_root/src/core/util/strerror.cc', - 'grpc_root/src/core/util/tchar.cc', - 'grpc_root/src/core/util/time_util.cc', - 'grpc_root/src/core/util/windows/env.cc', - 'grpc_root/src/core/util/windows/stat.cc', - 'grpc_root/src/core/util/windows/thd.cc', 'grpc_root/src/core/lib/slice/slice.cc', 'grpc_root/src/core/lib/slice/slice_refcount.cc', 'grpc_root/src/core/lib/slice/slice_string_helpers.cc', 'grpc_root/src/core/util/alloc.cc', 'grpc_root/src/core/util/android/log.cc', 'grpc_root/src/core/util/atm.cc', + 'grpc_root/src/core/util/crash.cc', + 'grpc_root/src/core/util/examine_stack.cc', + 'grpc_root/src/core/util/fork.cc', + 'grpc_root/src/core/util/gpr_time.cc', + 'grpc_root/src/core/util/host_port.cc', 'grpc_root/src/core/util/iphone/cpu.cc', 'grpc_root/src/core/util/linux/cpu.cc', + 'grpc_root/src/core/util/linux/env.cc', 'grpc_root/src/core/util/linux/log.cc', 'grpc_root/src/core/util/log.cc', + 'grpc_root/src/core/util/mpscq.cc', 'grpc_root/src/core/util/msys/tmpfile.cc', 'grpc_root/src/core/util/posix/cpu.cc', + 'grpc_root/src/core/util/posix/env.cc', 'grpc_root/src/core/util/posix/log.cc', + 'grpc_root/src/core/util/posix/stat.cc', 'grpc_root/src/core/util/posix/string.cc', 'grpc_root/src/core/util/posix/sync.cc', + 'grpc_root/src/core/util/posix/thd.cc', 'grpc_root/src/core/util/posix/time.cc', 'grpc_root/src/core/util/posix/tmpfile.cc', + 'grpc_root/src/core/util/ref_counted_string.cc', + 'grpc_root/src/core/util/strerror.cc', 'grpc_root/src/core/util/string.cc', 'grpc_root/src/core/util/sync.cc', 'grpc_root/src/core/util/sync_abseil.cc', - 'grpc_root/src/core/util/time.cc', + 'grpc_root/src/core/util/tchar.cc', 'grpc_root/src/core/util/time_precise.cc', + 'grpc_root/src/core/util/time_util.cc', 'grpc_root/src/core/util/windows/cpu.cc', + 'grpc_root/src/core/util/windows/env.cc', 'grpc_root/src/core/util/windows/log.cc', + 'grpc_root/src/core/util/windows/stat.cc', 'grpc_root/src/core/util/windows/string.cc', 'grpc_root/src/core/util/windows/string_util.cc', 'grpc_root/src/core/util/windows/sync.cc', + 'grpc_root/src/core/util/windows/thd.cc', 'grpc_root/src/core/util/windows/time.cc', 'grpc_root/src/core/util/windows/tmpfile.cc', 'third_party/abseil-cpp/absl/base/internal/cycleclock.cc', diff --git a/test/core/address_utils/parse_address_with_named_scope_id_test.cc b/test/core/address_utils/parse_address_with_named_scope_id_test.cc index fd78e274654..ea3ec004c3a 100644 --- a/test/core/address_utils/parse_address_with_named_scope_id_test.cc +++ b/test/core/address_utils/parse_address_with_named_scope_id_test.cc @@ -37,11 +37,11 @@ #include #include "src/core/lib/address_utils/parse_address.h" -#include "src/core/util/crash.h" -#include "src/core/util/host_port.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/iomgr/sockaddr.h" +#include "src/core/util/crash.h" +#include "src/core/util/host_port.h" #include "src/core/util/uri.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/backoff/backoff_test.cc b/test/core/backoff/backoff_test.cc index fefd91a511f..514536dea36 100644 --- a/test/core/backoff/backoff_test.cc +++ b/test/core/backoff/backoff_test.cc @@ -25,8 +25,8 @@ #include -#include "src/core/util/time.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/time.h" #include "test/core/test_util/test_config.h" namespace grpc { diff --git a/test/core/bad_client/bad_client.cc b/test/core/bad_client/bad_client.cc index ca0621d98f0..f19acddc6fb 100644 --- a/test/core/bad_client/bad_client.cc +++ b/test/core/bad_client/bad_client.cc @@ -35,7 +35,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/thd.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/endpoint_pair.h" @@ -45,6 +44,7 @@ #include "src/core/lib/transport/transport.h" #include "src/core/server/server.h" #include "src/core/util/string.h" +#include "src/core/util/thd.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/bad_connection/close_fd_test.cc b/test/core/bad_connection/close_fd_test.cc index e58be9eca14..d55408f7af6 100644 --- a/test/core/bad_connection/close_fd_test.cc +++ b/test/core/bad_connection/close_fd_test.cc @@ -36,7 +36,6 @@ #include "src/core/channelz/channelz.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -44,6 +43,7 @@ #include "src/core/lib/surface/channel_create.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" // This test won't work except with posix sockets enabled #ifdef GRPC_POSIX_SOCKET_TCP @@ -56,11 +56,11 @@ #include #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/endpoint_pair.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/completion_queue.h" #include "src/core/server/server.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/call/yodel/yodel_test.h b/test/core/call/yodel/yodel_test.h index b554d8137f2..20a257d28f4 100644 --- a/test/core/call/yodel/yodel_test.h +++ b/test/core/call/yodel/yodel_test.h @@ -23,13 +23,13 @@ #include -#include "src/core/util/debug_location.h" #include "src/core/lib/promise/cancel_callback.h" #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/transport/call_arena_allocator.h" #include "src/core/lib/transport/call_spine.h" #include "src/core/lib/transport/metadata.h" +#include "src/core/util/debug_location.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/channel/call_finalization_test.cc b/test/core/channel/call_finalization_test.cc index a732975f4f8..9e7ba84794d 100644 --- a/test/core/channel/call_finalization_test.cc +++ b/test/core/channel/call_finalization_test.cc @@ -22,9 +22,9 @@ #include -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/promise/test_context.h" namespace grpc_core { diff --git a/test/core/channel/channel_args_test.cc b/test/core/channel/channel_args_test.cc index f4a77850c44..bb19b352e21 100644 --- a/test/core/channel/channel_args_test.cc +++ b/test/core/channel/channel_args_test.cc @@ -30,10 +30,10 @@ #include #include +#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/util/notification.h" #include "src/core/util/ref_counted.h" #include "src/core/util/ref_counted_ptr.h" -#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/util/useful.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/channel/channel_stack_test.cc b/test/core/channel/channel_stack_test.cc index ebd142d1ff3..bbb00dad7e3 100644 --- a/test/core/channel/channel_stack_test.cc +++ b/test/core/channel/channel_stack_test.cc @@ -27,8 +27,8 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/status_helper.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/status_helper.h" #include "test/core/test_util/test_config.h" static grpc_error_handle channel_init_func(grpc_channel_element* elem, diff --git a/test/core/channel/server_call_tracer_factory_test.cc b/test/core/channel/server_call_tracer_factory_test.cc index 225f6f8007b..821087f9d93 100644 --- a/test/core/channel/server_call_tracer_factory_test.cc +++ b/test/core/channel/server_call_tracer_factory_test.cc @@ -17,9 +17,9 @@ #include "gtest/gtest.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/crash.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/crash.h" namespace grpc_core { namespace { diff --git a/test/core/channelz/channelz_test.cc b/test/core/channelz/channelz_test.cc index 58d7fbc19be..a43950eefbb 100644 --- a/test/core/channelz/channelz_test.cc +++ b/test/core/channelz/channelz_test.cc @@ -42,12 +42,12 @@ #include "src/core/channelz/channelz_registry.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/util/notification.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/channel.h" #include "src/core/server/server.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" +#include "src/core/util/notification.h" #include "src/core/util/useful.h" #include "test/core/event_engine/event_engine_test_utils.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/client_channel/client_channel_service_config_test.cc b/test/core/client_channel/client_channel_service_config_test.cc index 90d5a9688fc..28ffddf7f31 100644 --- a/test/core/client_channel/client_channel_service_config_test.cc +++ b/test/core/client_channel/client_channel_service_config_test.cc @@ -25,10 +25,10 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/time.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" #include "src/core/service_config/service_config_parser.h" +#include "src/core/util/time.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/client_channel/retry_service_config_test.cc b/test/core/client_channel/retry_service_config_test.cc index a4fd1e61237..f06b25c35cc 100644 --- a/test/core/client_channel/retry_service_config_test.cc +++ b/test/core/client_channel/retry_service_config_test.cc @@ -27,11 +27,11 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" #include "src/core/service_config/service_config_parser.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/end2end/bad_server_response_test.cc b/test/core/end2end/bad_server_response_test.cc index 74f775d7b22..de6fbe4b6ec 100644 --- a/test/core/end2end/bad_server_response_test.cc +++ b/test/core/end2end/bad_server_response_test.cc @@ -40,10 +40,6 @@ #include #include "src/core/lib/event_engine/shim.h" -#include "src/core/util/host_port.h" -#include "src/core/util/notification.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/thd.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -51,7 +47,11 @@ #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/tcp_server.h" #include "src/core/lib/slice/slice_string_helpers.h" +#include "src/core/util/host_port.h" +#include "src/core/util/notification.h" +#include "src/core/util/status_helper.h" #include "src/core/util/string.h" +#include "src/core/util/thd.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/connection_refused_test.cc b/test/core/end2end/connection_refused_test.cc index 408bea360b4..31221267d85 100644 --- a/test/core/end2end/connection_refused_test.cc +++ b/test/core/end2end/connection_refused_test.cc @@ -33,8 +33,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/host_port.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/host_port.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/cq_verifier.cc b/test/core/end2end/cq_verifier.cc index 4665e4e6ccb..b7b6ac3271b 100644 --- a/test/core/end2end/cq_verifier.cc +++ b/test/core/end2end/cq_verifier.cc @@ -45,10 +45,10 @@ #include #include "src/core/lib/compression/message_compress.h" +#include "src/core/lib/surface/event_string.h" #include "src/core/util/crash.h" #include "src/core/util/debug_location.h" #include "src/core/util/match.h" -#include "src/core/lib/surface/event_string.h" #include "test/core/test_util/test_config.h" // a set of metadata we expect to find on an event diff --git a/test/core/end2end/dualstack_socket_test.cc b/test/core/end2end/dualstack_socket_test.cc index 595b0bd4deb..44fc736e5ca 100644 --- a/test/core/end2end/dualstack_socket_test.cc +++ b/test/core/end2end/dualstack_socket_test.cc @@ -50,11 +50,11 @@ #include #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/util/host_port.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/socket_utils_posix.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/util/host_port.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/end2end_test_fuzzer.cc b/test/core/end2end/end2end_test_fuzzer.cc index 5d772d65ed4..322bfc99a18 100644 --- a/test/core/end2end/end2end_test_fuzzer.cc +++ b/test/core/end2end/end2end_test_fuzzer.cc @@ -34,10 +34,10 @@ #include "src/core/lib/config/config_vars.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/config.h" -#include "src/core/util/env.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/timer_manager.h" +#include "src/core/util/env.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/fixtures/h2_tls_common.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" diff --git a/test/core/end2end/end2end_test_suites.cc b/test/core/end2end/end2end_test_suites.cc index 89d5fa3a64c..e73034ddc9c 100644 --- a/test/core/end2end/end2end_test_suites.cc +++ b/test/core/end2end/end2end_test_suites.cc @@ -50,14 +50,14 @@ #include "src/core/ext/transport/chaotic_good/server/chaotic_good_server.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/env.h" -#include "src/core/util/host_port.h" -#include "src/core/util/no_destruct.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" +#include "src/core/util/env.h" +#include "src/core/util/host_port.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/sync.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/fixtures/h2_oauth2_common.h" #include "test/core/end2end/fixtures/h2_ssl_cred_reload_fixture.h" diff --git a/test/core/end2end/end2end_tests.h b/test/core/end2end/end2end_tests.h index b808d4b8a99..982f21e679c 100644 --- a/test/core/end2end/end2end_tests.h +++ b/test/core/end2end/end2end_tests.h @@ -54,13 +54,13 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/bitset.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/time.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/surface/call_test_only.h" #include "src/core/lib/surface/channel.h" +#include "src/core/util/bitset.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/time.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/event_engine/event_engine_test_utils.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/fixtures/http_proxy_fixture.cc b/test/core/end2end/fixtures/http_proxy_fixture.cc index 75929a6c03f..70a4b9ca561 100644 --- a/test/core/end2end/fixtures/http_proxy_fixture.cc +++ b/test/core/end2end/fixtures/http_proxy_fixture.cc @@ -46,11 +46,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/util/host_port.h" -#include "src/core/util/memory.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/thd.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/iomgr/endpoint.h" @@ -64,7 +59,12 @@ #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/tcp_server.h" +#include "src/core/util/host_port.h" #include "src/core/util/http_client/parser.h" +#include "src/core/util/memory.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/thd.h" +#include "src/core/util/time.h" #include "test/core/test_util/port.h" struct grpc_end2end_http_proxy { diff --git a/test/core/end2end/fixtures/proxy.cc b/test/core/end2end/fixtures/proxy.cc index e5f2c132052..bcc5e80cedb 100644 --- a/test/core/end2end/fixtures/proxy.cc +++ b/test/core/end2end/fixtures/proxy.cc @@ -36,10 +36,10 @@ #include #include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/surface/call.h" #include "src/core/util/crash.h" #include "src/core/util/host_port.h" #include "src/core/util/thd.h" -#include "src/core/lib/surface/call.h" #include "test/core/test_util/port.h" struct grpc_end2end_proxy { diff --git a/test/core/end2end/fixtures/sockpair_fixture.h b/test/core/end2end/fixtures/sockpair_fixture.h index 9b40ad304b5..61cbc7a1059 100644 --- a/test/core/end2end/fixtures/sockpair_fixture.h +++ b/test/core/end2end/fixtures/sockpair_fixture.h @@ -33,7 +33,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/endpoint_pair.h" #include "src/core/lib/iomgr/error.h" @@ -44,6 +43,7 @@ #include "src/core/lib/surface/completion_queue.h" #include "src/core/lib/transport/transport.h" #include "src/core/server/server.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/fuzzers/api_fuzzer.cc b/test/core/end2end/fuzzers/api_fuzzer.cc index 453d5d583ce..4014c4e4f1a 100644 --- a/test/core/end2end/fuzzers/api_fuzzer.cc +++ b/test/core/end2end/fuzzers/api_fuzzer.cc @@ -50,10 +50,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/config.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/env.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr_fwd.h" @@ -61,6 +57,10 @@ #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/env.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/libfuzzer/libfuzzer_macro.h" #include "test/core/end2end/data/ssl_test_data.h" #include "test/core/end2end/fuzzers/api_fuzzer.pb.h" diff --git a/test/core/end2end/fuzzers/client_fuzzer.cc b/test/core/end2end/fuzzers/client_fuzzer.cc index 80bf05b193d..a78d6f7b63c 100644 --- a/test/core/end2end/fuzzers/client_fuzzer.cc +++ b/test/core/end2end/fuzzers/client_fuzzer.cc @@ -28,14 +28,14 @@ #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/experiments/config.h" -#include "src/core/util/env.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/channel_create.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/env.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/libfuzzer/libfuzzer_macro.h" #include "test/core/end2end/fuzzers/api_fuzzer.pb.h" #include "test/core/end2end/fuzzers/fuzzer_input.pb.h" diff --git a/test/core/end2end/fuzzers/fuzzing_common.cc b/test/core/end2end/fuzzers/fuzzing_common.cc index af3af8eb97c..820af4ab182 100644 --- a/test/core/end2end/fuzzers/fuzzing_common.cc +++ b/test/core/end2end/fuzzers/fuzzing_common.cc @@ -38,13 +38,13 @@ #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/config.h" -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/timer_manager.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/surface/channel.h" +#include "src/core/util/crash.h" #include "test/core/end2end/fuzzers/api_fuzzer.pb.h" namespace grpc_core { diff --git a/test/core/end2end/fuzzers/fuzzing_common.h b/test/core/end2end/fuzzers/fuzzing_common.h index 2a8169aea4f..c96b347cbd6 100644 --- a/test/core/end2end/fuzzers/fuzzing_common.h +++ b/test/core/end2end/fuzzers/fuzzing_common.h @@ -34,9 +34,9 @@ #include #include +#include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/time.h" -#include "src/core/lib/resource_quota/resource_quota.h" #include "test/core/end2end/fuzzers/api_fuzzer.pb.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h" diff --git a/test/core/end2end/fuzzers/network_input.h b/test/core/end2end/fuzzers/network_input.h index 237203f6d98..072d5851fc4 100644 --- a/test/core/end2end/fuzzers/network_input.h +++ b/test/core/end2end/fuzzers/network_input.h @@ -15,8 +15,8 @@ #ifndef GRPC_TEST_CORE_END2END_FUZZERS_NETWORK_INPUT_H #define GRPC_TEST_CORE_END2END_FUZZERS_NETWORK_INPUT_H -#include "src/core/util/time.h" #include "src/core/lib/iomgr/endpoint.h" +#include "src/core/util/time.h" #include "test/core/end2end/fuzzers/fuzzer_input.pb.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" #include "test/core/test_util/fuzzing_channel_args.h" diff --git a/test/core/end2end/fuzzers/server_fuzzer.cc b/test/core/end2end/fuzzers/server_fuzzer.cc index 5ba4a189b42..a295e0d3142 100644 --- a/test/core/end2end/fuzzers/server_fuzzer.cc +++ b/test/core/end2end/fuzzers/server_fuzzer.cc @@ -24,8 +24,8 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/experiments/config.h" -#include "src/core/util/env.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/env.h" #include "test/core/end2end/fuzzers/api_fuzzer.pb.h" #include "test/core/end2end/fuzzers/fuzzer_input.pb.h" #include "test/core/end2end/fuzzers/fuzzing_common.h" diff --git a/test/core/end2end/goaway_server_test.cc b/test/core/end2end/goaway_server_test.cc index 9f5bb8f002f..2ebc094e210 100644 --- a/test/core/end2end/goaway_server_test.cc +++ b/test/core/end2end/goaway_server_test.cc @@ -47,8 +47,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -60,6 +58,8 @@ #include "src/core/lib/iomgr/socket_utils.h" #include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/time.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/h2_ssl_session_reuse_test.cc b/test/core/end2end/h2_ssl_session_reuse_test.cc index 9def9b0bd67..488f7bfc77b 100644 --- a/test/core/end2end/h2_ssl_session_reuse_test.cc +++ b/test/core/end2end/h2_ssl_session_reuse_test.cc @@ -38,9 +38,9 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/util/host_port.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/host_port.h" #include "src/core/util/useful.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/port.h" diff --git a/test/core/end2end/h2_tls_peer_property_external_verifier_test.cc b/test/core/end2end/h2_tls_peer_property_external_verifier_test.cc index b0dc7985879..8535e9b4fc0 100644 --- a/test/core/end2end/h2_tls_peer_property_external_verifier_test.cc +++ b/test/core/end2end/h2_tls_peer_property_external_verifier_test.cc @@ -38,9 +38,9 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/util/host_port.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/host_port.h" #include "src/core/util/useful.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/port.h" diff --git a/test/core/end2end/no_server_test.cc b/test/core/end2end/no_server_test.cc index df8e95b3a4f..e9dcc040d50 100644 --- a/test/core/end2end/no_server_test.cc +++ b/test/core/end2end/no_server_test.cc @@ -35,12 +35,12 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/fake/fake_resolver.h" #include "src/core/resolver/resolver.h" #include "src/core/service_config/service_config.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/tests/binary_metadata.cc b/test/core/end2end/tests/binary_metadata.cc index b95d637def0..dd9f0592f0a 100644 --- a/test/core/end2end/tests/binary_metadata.cc +++ b/test/core/end2end/tests/binary_metadata.cc @@ -24,8 +24,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/time.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/call_creds.cc b/test/core/end2end/tests/call_creds.cc index 0764214561b..dc673d5f250 100644 --- a/test/core/end2end/tests/call_creds.cc +++ b/test/core/end2end/tests/call_creds.cc @@ -28,8 +28,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/time.h" #include "src/core/lib/security/credentials/credentials.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/channelz.cc b/test/core/end2end/tests/channelz.cc index a4a622f56c7..85a136e6ba8 100644 --- a/test/core/end2end/tests/channelz.cc +++ b/test/core/end2end/tests/channelz.cc @@ -27,9 +27,9 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/time.h" #include "src/core/lib/surface/channel.h" #include "src/core/server/server.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" using testing::HasSubstr; diff --git a/test/core/end2end/tests/filter_causes_close.cc b/test/core/end2end/tests/filter_causes_close.cc index b0e5f4a1b3f..71d003e2a82 100644 --- a/test/core/end2end/tests/filter_causes_close.cc +++ b/test/core/end2end/tests/filter_causes_close.cc @@ -29,9 +29,6 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/promise/arena_promise.h" @@ -39,6 +36,9 @@ #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/filter_context.cc b/test/core/end2end/tests/filter_context.cc index bfcda4910c2..1735c061375 100644 --- a/test/core/end2end/tests/filter_context.cc +++ b/test/core/end2end/tests/filter_context.cc @@ -31,11 +31,11 @@ #include "src/core/lib/channel/context.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/filter_init_fails.cc b/test/core/end2end/tests/filter_init_fails.cc index 99b4ac62539..ca3def1271b 100644 --- a/test/core/end2end/tests/filter_init_fails.cc +++ b/test/core/end2end/tests/filter_init_fails.cc @@ -30,8 +30,6 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/promise/arena_promise.h" @@ -39,6 +37,8 @@ #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" using ::testing::AnyOf; diff --git a/test/core/end2end/tests/grpc_authz.cc b/test/core/end2end/tests/grpc_authz.cc index 5d658c00f47..1322d1f347d 100644 --- a/test/core/end2end/tests/grpc_authz.cc +++ b/test/core/end2end/tests/grpc_authz.cc @@ -25,10 +25,10 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/notification.h" -#include "src/core/util/time.h" #include "src/core/lib/security/authorization/authorization_policy_provider.h" #include "src/core/lib/security/authorization/grpc_authorization_policy_provider.h" +#include "src/core/util/notification.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/end2end/tests/http2_stats.cc b/test/core/end2end/tests/http2_stats.cc index d2f60c800bb..a2a2864299b 100644 --- a/test/core/end2end/tests/http2_stats.cc +++ b/test/core/end2end/tests/http2_stats.cc @@ -35,9 +35,6 @@ #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/notification.h" -#include "src/core/util/sync.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/promise/context.h" @@ -50,6 +47,9 @@ #include "src/core/telemetry/call_tracer.h" #include "src/core/telemetry/metrics.h" #include "src/core/telemetry/tcp_tracer.h" +#include "src/core/util/notification.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/test_util/fake_stats_plugin.h" diff --git a/test/core/end2end/tests/invoke_large_request.cc b/test/core/end2end/tests/invoke_large_request.cc index 4181b4caaa1..809fe8bd1e3 100644 --- a/test/core/end2end/tests/invoke_large_request.cc +++ b/test/core/end2end/tests/invoke_large_request.cc @@ -26,8 +26,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/time.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/keepalive_timeout.cc b/test/core/end2end/tests/keepalive_timeout.cc index 4c1a1133d28..9c94b653c84 100644 --- a/test/core/end2end/tests/keepalive_timeout.cc +++ b/test/core/end2end/tests/keepalive_timeout.cc @@ -27,8 +27,8 @@ #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/payload.cc b/test/core/end2end/tests/payload.cc index a3f46c647de..fc3448dcb3b 100644 --- a/test/core/end2end/tests/payload.cc +++ b/test/core/end2end/tests/payload.cc @@ -22,8 +22,8 @@ #include -#include "src/core/util/time.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/ping_pong_streaming.cc b/test/core/end2end/tests/ping_pong_streaming.cc index 445422c8713..ddd666ec432 100644 --- a/test/core/end2end/tests/ping_pong_streaming.cc +++ b/test/core/end2end/tests/ping_pong_streaming.cc @@ -20,8 +20,8 @@ #include -#include "src/core/util/time.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/request_with_flags.cc b/test/core/end2end/tests/request_with_flags.cc index 277fee4eb36..9607aed5171 100644 --- a/test/core/end2end/tests/request_with_flags.cc +++ b/test/core/end2end/tests/request_with_flags.cc @@ -30,8 +30,8 @@ #include #include -#include "src/core/util/time.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/time.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/resource_quota_server.cc b/test/core/end2end/tests/resource_quota_server.cc index dd46020ca93..4b25143b5ec 100644 --- a/test/core/end2end/tests/resource_quota_server.cc +++ b/test/core/end2end/tests/resource_quota_server.cc @@ -31,9 +31,9 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/experiments/experiments.h" +#include "src/core/lib/slice/slice.h" #include "src/core/util/crash.h" #include "src/core/util/time.h" -#include "src/core/lib/slice/slice.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc b/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc index 777f52ff7d4..1f8037891d8 100644 --- a/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc +++ b/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc @@ -32,13 +32,13 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/tests/retry_lb_drop.cc b/test/core/end2end/tests/retry_lb_drop.cc index 97a03bc68c2..72950e53a18 100644 --- a/test/core/end2end/tests/retry_lb_drop.cc +++ b/test/core/end2end/tests/retry_lb_drop.cc @@ -32,12 +32,12 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/load_balancing/lb_policy_factory.h" #include "src/core/util/json/json.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/test_util/test_lb_policies.h" diff --git a/test/core/end2end/tests/retry_recv_message_replay.cc b/test/core/end2end/tests/retry_recv_message_replay.cc index cddb1da2232..86583851219 100644 --- a/test/core/end2end/tests/retry_recv_message_replay.cc +++ b/test/core/end2end/tests/retry_recv_message_replay.cc @@ -30,13 +30,13 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc b/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc index 211ad62a409..e5c9a590702 100644 --- a/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc +++ b/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc @@ -28,13 +28,13 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_send_op_fails.cc b/test/core/end2end/tests/retry_send_op_fails.cc index c571b6c74c5..d19abdc0fa5 100644 --- a/test/core/end2end/tests/retry_send_op_fails.cc +++ b/test/core/end2end/tests/retry_send_op_fails.cc @@ -30,13 +30,13 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_streaming.cc b/test/core/end2end/tests/retry_streaming.cc index 0b48e7b00fb..57b081803ac 100644 --- a/test/core/end2end/tests/retry_streaming.cc +++ b/test/core/end2end/tests/retry_streaming.cc @@ -27,8 +27,8 @@ #include "src/core/channelz/channelz.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/time.h" #include "src/core/lib/surface/channel.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" using testing::HasSubstr; diff --git a/test/core/end2end/tests/retry_transparent_goaway.cc b/test/core/end2end/tests/retry_transparent_goaway.cc index afad5953fc5..4681207783f 100644 --- a/test/core/end2end/tests/retry_transparent_goaway.cc +++ b/test/core/end2end/tests/retry_transparent_goaway.cc @@ -27,14 +27,14 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_transparent_not_sent_on_wire.cc b/test/core/end2end/tests/retry_transparent_not_sent_on_wire.cc index 0f1d32d70e5..7b5a70ce8cc 100644 --- a/test/core/end2end/tests/retry_transparent_not_sent_on_wire.cc +++ b/test/core/end2end/tests/retry_transparent_not_sent_on_wire.cc @@ -29,14 +29,14 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/simple_request.cc b/test/core/end2end/tests/simple_request.cc index b964edf0dda..f20637ebbbb 100644 --- a/test/core/end2end/tests/simple_request.cc +++ b/test/core/end2end/tests/simple_request.cc @@ -30,9 +30,9 @@ #include -#include "src/core/util/time.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" using testing::HasSubstr; diff --git a/test/core/end2end/tests/timeout_before_request_call.cc b/test/core/end2end/tests/timeout_before_request_call.cc index e3895f3e27b..f20164f19b5 100644 --- a/test/core/end2end/tests/timeout_before_request_call.cc +++ b/test/core/end2end/tests/timeout_before_request_call.cc @@ -24,8 +24,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/time.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/event_engine/event_engine_test_utils.cc b/test/core/event_engine/event_engine_test_utils.cc index 71b43e4d086..bccd0d7526f 100644 --- a/test/core/event_engine/event_engine_test_utils.cc +++ b/test/core/event_engine/event_engine_test_utils.cc @@ -38,9 +38,9 @@ #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" +#include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/util/notification.h" #include "src/core/util/time.h" -#include "src/core/lib/resource_quota/memory_quota.h" #include "test/core/test_util/build.h" // IWYU pragma: no_include diff --git a/test/core/event_engine/event_engine_test_utils.h b/test/core/event_engine/event_engine_test_utils.h index 7e85e36802d..0d24c25ac0a 100644 --- a/test/core/event_engine/event_engine_test_utils.h +++ b/test/core/event_engine/event_engine_test_utils.h @@ -31,9 +31,9 @@ #include #include +#include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/util/notification.h" #include "src/core/util/sync.h" -#include "src/core/lib/resource_quota/memory_quota.h" using EventEngineFactory = std::function< std::unique_ptr()>; diff --git a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc index 93097b7a6a8..e7dbf8a0169 100644 --- a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc +++ b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc @@ -32,9 +32,9 @@ #include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/port.h" #include "src/core/telemetry/stats.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h" #include "test/core/test_util/port.h" diff --git a/test/core/event_engine/posix/event_poller_posix_test.cc b/test/core/event_engine/posix/event_poller_posix_test.cc index 42d40d04cf6..673c4f9c78a 100644 --- a/test/core/event_engine/posix/event_poller_posix_test.cc +++ b/test/core/event_engine/posix/event_poller_posix_test.cc @@ -35,8 +35,8 @@ #include "src/core/lib/event_engine/poller.h" #include "src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h" #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/ref_counted_ptr.h" // IWYU pragma: no_include // IWYU pragma: no_include diff --git a/test/core/event_engine/posix/posix_endpoint_test.cc b/test/core/event_engine/posix/posix_endpoint_test.cc index b3f157ec4c9..a8ec3af12c5 100644 --- a/test/core/event_engine/posix/posix_endpoint_test.cc +++ b/test/core/event_engine/posix/posix_endpoint_test.cc @@ -45,10 +45,10 @@ #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h" #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" +#include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/util/dual_ref_counted.h" #include "src/core/util/notification.h" #include "src/core/util/ref_counted_ptr.h" -#include "src/core/lib/resource_quota/resource_quota.h" #include "test/core/event_engine/event_engine_test_utils.h" #include "test/core/event_engine/posix/posix_engine_test_utils.h" #include "test/core/event_engine/test_suite/posix/oracle_event_engine_posix.h" diff --git a/test/core/event_engine/posix/posix_event_engine_connect_test.cc b/test/core/event_engine/posix/posix_event_engine_connect_test.cc index 03c08519931..989e6c9f341 100644 --- a/test/core/event_engine/posix/posix_event_engine_connect_test.cc +++ b/test/core/event_engine/posix/posix_event_engine_connect_test.cc @@ -43,10 +43,10 @@ #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/posix_engine/posix_engine.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/util/crash.h" -#include "src/core/util/notification.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/crash.h" +#include "src/core/util/notification.h" #include "test/core/event_engine/event_engine_test_utils.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/event_engine/posix/traced_buffer_list_test.cc b/test/core/event_engine/posix/traced_buffer_list_test.cc index 05a98c24a92..840d9f80adc 100644 --- a/test/core/event_engine/posix/traced_buffer_list_test.cc +++ b/test/core/event_engine/posix/traced_buffer_list_test.cc @@ -25,9 +25,9 @@ #include #include -#include "src/core/util/time.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" #ifdef GRPC_LINUX_ERRQUEUE diff --git a/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.cc b/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.cc index e17213606c3..c6242da1543 100644 --- a/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.cc +++ b/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.cc @@ -35,9 +35,9 @@ #include #include "src/core/lib/address_utils/sockaddr_utils.h" +#include "src/core/lib/iomgr/resolved_address.h" #include "src/core/util/crash.h" #include "src/core/util/strerror.h" -#include "src/core/lib/iomgr/resolved_address.h" namespace grpc_event_engine { namespace experimental { diff --git a/test/core/event_engine/test_suite/tests/client_test.cc b/test/core/event_engine/test_suite/tests/client_test.cc index 728f76ee440..4c0d364f0f4 100644 --- a/test/core/event_engine/test_suite/tests/client_test.cc +++ b/test/core/event_engine/test_suite/tests/client_test.cc @@ -38,10 +38,10 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/util/notification.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/notification.h" #include "test/core/event_engine/event_engine_test_utils.h" #include "test/core/event_engine/test_suite/event_engine_test_framework.h" #include "test/core/test_util/port.h" diff --git a/test/core/event_engine/test_suite/tests/dns_test.cc b/test/core/event_engine/test_suite/tests/dns_test.cc index 81fee2fddd9..b6f42d0031c 100644 --- a/test/core/event_engine/test_suite/tests/dns_test.cc +++ b/test/core/event_engine/test_suite/tests/dns_test.cc @@ -37,9 +37,9 @@ #include "src/core/lib/config/config_vars.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" +#include "src/core/lib/iomgr/sockaddr.h" #include "src/core/util/crash.h" // IWYU pragma: keep #include "src/core/util/notification.h" -#include "src/core/lib/iomgr/sockaddr.h" #include "test/core/event_engine/test_suite/event_engine_test_framework.h" #include "test/core/test_util/fake_udp_and_tcp_server.h" #include "test/core/test_util/port.h" diff --git a/test/core/event_engine/test_suite/tests/server_test.cc b/test/core/event_engine/test_suite/tests/server_test.cc index 997eb9c1023..107042cc391 100644 --- a/test/core/event_engine/test_suite/tests/server_test.cc +++ b/test/core/event_engine/test_suite/tests/server_test.cc @@ -38,10 +38,10 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/util/notification.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/notification.h" #include "test/core/event_engine/event_engine_test_utils.h" #include "test/core/event_engine/test_suite/event_engine_test_framework.h" #include "test/core/test_util/port.h" diff --git a/test/core/event_engine/test_suite/tools/echo_client.cc b/test/core/event_engine/test_suite/tools/echo_client.cc index 67a3c67ce9a..76749f58309 100644 --- a/test/core/event_engine/test_suite/tools/echo_client.cc +++ b/test/core/event_engine/test_suite/tools/echo_client.cc @@ -53,9 +53,9 @@ #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/util/notification.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/resolver/resolver_registry.h" +#include "src/core/util/notification.h" extern absl::AnyInvocable< std::unique_ptr(void)> diff --git a/test/core/event_engine/windows/iocp_test.cc b/test/core/event_engine/windows/iocp_test.cc index bd17f699418..b5ee504c643 100644 --- a/test/core/event_engine/windows/iocp_test.cc +++ b/test/core/event_engine/windows/iocp_test.cc @@ -32,8 +32,8 @@ #include "src/core/lib/event_engine/thread_pool/thread_pool.h" #include "src/core/lib/event_engine/windows/iocp.h" #include "src/core/lib/event_engine/windows/win_socket.h" -#include "src/core/util/notification.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/notification.h" #include "test/core/event_engine/windows/create_sockpair.h" namespace { diff --git a/test/core/event_engine/windows/win_socket_test.cc b/test/core/event_engine/windows/win_socket_test.cc index 7f0757f0b30..daa3c5360f5 100644 --- a/test/core/event_engine/windows/win_socket_test.cc +++ b/test/core/event_engine/windows/win_socket_test.cc @@ -27,8 +27,8 @@ #include "src/core/lib/event_engine/thread_pool/thread_pool.h" #include "src/core/lib/event_engine/windows/iocp.h" #include "src/core/lib/event_engine/windows/win_socket.h" -#include "src/core/util/notification.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/notification.h" #include "test/core/event_engine/windows/create_sockpair.h" namespace { diff --git a/test/core/event_engine/windows/windows_endpoint_test.cc b/test/core/event_engine/windows/windows_endpoint_test.cc index c401e3dbf9e..9ada4bbf471 100644 --- a/test/core/event_engine/windows/windows_endpoint_test.cc +++ b/test/core/event_engine/windows/windows_endpoint_test.cc @@ -28,8 +28,8 @@ #include "src/core/lib/event_engine/windows/iocp.h" #include "src/core/lib/event_engine/windows/windows_endpoint.h" #include "src/core/lib/event_engine/windows/windows_engine.h" -#include "src/core/util/notification.h" #include "src/core/lib/resource_quota/memory_quota.h" +#include "src/core/util/notification.h" #include "test/core/event_engine/windows/create_sockpair.h" namespace grpc_event_engine { diff --git a/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc b/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc index 127c24c7308..42ea91b1cf8 100644 --- a/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc +++ b/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc @@ -34,13 +34,13 @@ #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/experiments/config.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/work_serializer.h" -#include "src/core/util/uri.h" #include "src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/uri.h" +#include "src/core/util/work_serializer.h" #include "src/libfuzzer/libfuzzer_macro.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h" diff --git a/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc b/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc index 1356a2039fb..369ebcc468d 100644 --- a/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc +++ b/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc @@ -28,11 +28,11 @@ #include #include -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/security/authorization/audit_logging.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/filters/client_auth_filter_test.cc b/test/core/filters/client_auth_filter_test.cc index 6e0f4bdde5f..92171871f2e 100644 --- a/test/core/filters/client_auth_filter_test.cc +++ b/test/core/filters/client_auth_filter_test.cc @@ -28,8 +28,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/unique_type_name.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/security/context/security_context.h" @@ -39,6 +37,8 @@ #include "src/core/lib/security/transport/auth_filters.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" #include "test/core/filters/filter_test.h" diff --git a/test/core/filters/filter_test.cc b/test/core/filters/filter_test.cc index 3c813052fc2..beb0e5df783 100644 --- a/test/core/filters/filter_test.cc +++ b/test/core/filters/filter_test.cc @@ -30,7 +30,6 @@ #include "src/core/lib/channel/call_finalization.h" #include "src/core/lib/channel/context.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/timer_manager.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/arena_promise.h" @@ -40,6 +39,7 @@ #include "src/core/lib/promise/seq.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/crash.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h" using grpc_event_engine::experimental::FuzzingEventEngine; diff --git a/test/core/filters/filter_test.h b/test/core/filters/filter_test.h index 08784f16741..c07eaabf857 100644 --- a/test/core/filters/filter_test.h +++ b/test/core/filters/filter_test.h @@ -38,13 +38,13 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" #include "test/core/filters/filter_test.h" diff --git a/test/core/gprpp/chunked_vector_fuzzer.cc b/test/core/gprpp/chunked_vector_fuzzer.cc index c5c055c9948..3d4c55015e6 100644 --- a/test/core/gprpp/chunked_vector_fuzzer.cc +++ b/test/core/gprpp/chunked_vector_fuzzer.cc @@ -25,11 +25,11 @@ #include #include -#include "src/core/util/chunked_vector.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/chunked_vector.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/libfuzzer/libfuzzer_macro.h" #include "test/core/gprpp/chunked_vector_fuzzer.pb.h" diff --git a/test/core/gprpp/chunked_vector_test.cc b/test/core/gprpp/chunked_vector_test.cc index c1e8d9b483d..82f10436edc 100644 --- a/test/core/gprpp/chunked_vector_test.cc +++ b/test/core/gprpp/chunked_vector_test.cc @@ -21,9 +21,9 @@ #include -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { namespace testing { diff --git a/test/core/gprpp/work_serializer_test.cc b/test/core/gprpp/work_serializer_test.cc index a7b12a18eb7..773255725bb 100644 --- a/test/core/gprpp/work_serializer_test.cc +++ b/test/core/gprpp/work_serializer_test.cc @@ -37,12 +37,12 @@ #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/notification.h" -#include "src/core/util/thd.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/telemetry/histogram_view.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/notification.h" +#include "src/core/util/thd.h" #include "test/core/event_engine/event_engine_test_utils.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/handshake/readahead_handshaker_server_ssl.cc b/test/core/handshake/readahead_handshaker_server_ssl.cc index da2dc822af2..b1d6d728218 100644 --- a/test/core/handshake/readahead_handshaker_server_ssl.cc +++ b/test/core/handshake/readahead_handshaker_server_ssl.cc @@ -27,12 +27,12 @@ #include "src/core/handshaker/handshaker_registry.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/tcp_server.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/handshake/server_ssl_common.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/handshake/server_ssl_common.cc b/test/core/handshake/server_ssl_common.cc index 70aae783473..7a8910fac34 100644 --- a/test/core/handshake/server_ssl_common.cc +++ b/test/core/handshake/server_ssl_common.cc @@ -46,10 +46,10 @@ #include #include +#include "src/core/lib/iomgr/error.h" #include "src/core/util/crash.h" #include "src/core/util/sync.h" #include "src/core/util/thd.h" -#include "src/core/lib/iomgr/error.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/http/httpcli_test.cc b/test/core/http/httpcli_test.cc index 1adf98bfdc0..0f9b26ab912 100644 --- a/test/core/http/httpcli_test.cc +++ b/test/core/http/httpcli_test.cc @@ -43,14 +43,14 @@ #include #include -#include "src/core/util/status_helper.h" -#include "src/core/util/time.h" -#include "src/core/util/time_util.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h" +#include "src/core/util/status_helper.h" #include "src/core/util/subprocess.h" +#include "src/core/util/time.h" +#include "src/core/util/time_util.h" #include "test/core/http/httpcli_test_util.h" #include "test/core/test_util/fake_udp_and_tcp_server.h" #include "test/core/test_util/port.h" diff --git a/test/core/http/httpscli_test.cc b/test/core/http/httpscli_test.cc index dd277bcb014..11596745a6d 100644 --- a/test/core/http/httpscli_test.cc +++ b/test/core/http/httpscli_test.cc @@ -42,11 +42,6 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/sync.h" -#include "src/core/util/time.h" -#include "src/core/util/time_util.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -54,11 +49,16 @@ #include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/security/credentials/credentials.h" // IWYU pragma: keep -#include "src/core/util/uri.h" #include "src/core/util/http_client/httpcli.h" #include "src/core/util/http_client/httpcli_ssl_credentials.h" #include "src/core/util/http_client/parser.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/status_helper.h" #include "src/core/util/subprocess.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/time_util.h" +#include "src/core/util/uri.h" #include "test/core/http/httpcli_test_util.h" #include "test/core/test_util/fake_udp_and_tcp_server.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/iomgr/buffer_list_test.cc b/test/core/iomgr/buffer_list_test.cc index db7b45db1af..d6620314c29 100644 --- a/test/core/iomgr/buffer_list_test.cc +++ b/test/core/iomgr/buffer_list_test.cc @@ -25,10 +25,10 @@ #include #include -#include "src/core/util/time.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/internal_errqueue.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" #ifdef GRPC_LINUX_ERRQUEUE diff --git a/test/core/iomgr/endpoint_pair_test.cc b/test/core/iomgr/endpoint_pair_test.cc index ee2224150e7..76518fa5cd0 100644 --- a/test/core/iomgr/endpoint_pair_test.cc +++ b/test/core/iomgr/endpoint_pair_test.cc @@ -35,9 +35,9 @@ #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/shim.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/util/notification.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" #include "src/core/lib/resource_quota/memory_quota.h" +#include "src/core/util/notification.h" #include "src/core/util/useful.h" #include "test/core/iomgr/endpoint_tests.h" #include "test/core/test_util/port.h" diff --git a/test/core/iomgr/endpoint_tests.cc b/test/core/iomgr/endpoint_tests.cc index 5b59d4699fc..0171dbf5bb7 100644 --- a/test/core/iomgr/endpoint_tests.cc +++ b/test/core/iomgr/endpoint_tests.cc @@ -29,10 +29,10 @@ #include #include -#include "src/core/util/crash.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/iomgr/fd_conservation_posix_test.cc b/test/core/iomgr/fd_conservation_posix_test.cc index 1f92a773438..47376616b32 100644 --- a/test/core/iomgr/fd_conservation_posix_test.cc +++ b/test/core/iomgr/fd_conservation_posix_test.cc @@ -23,9 +23,9 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/endpoint_pair.h" #include "src/core/lib/iomgr/iomgr.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" int main(int argc, char** argv) { diff --git a/test/core/iomgr/fd_posix_test.cc b/test/core/iomgr/fd_posix_test.cc index dad10bdb71b..d505f127ef6 100644 --- a/test/core/iomgr/fd_posix_test.cc +++ b/test/core/iomgr/fd_posix_test.cc @@ -44,11 +44,11 @@ #include #include -#include "src/core/util/crash.h" -#include "src/core/util/strerror.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/socket_utils_posix.h" +#include "src/core/util/crash.h" +#include "src/core/util/strerror.h" static gpr_mu* g_mu; static grpc_pollset* g_pollset; diff --git a/test/core/iomgr/grpc_ipv6_loopback_available_test.cc b/test/core/iomgr/grpc_ipv6_loopback_available_test.cc index 87f15cd5439..74482750f12 100644 --- a/test/core/iomgr/grpc_ipv6_loopback_available_test.cc +++ b/test/core/iomgr/grpc_ipv6_loopback_available_test.cc @@ -21,8 +21,8 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" #ifdef GPR_WINDOWS diff --git a/test/core/iomgr/pollset_windows_starvation_test.cc b/test/core/iomgr/pollset_windows_starvation_test.cc index d9f8d36a4ac..b0c608fdd0d 100644 --- a/test/core/iomgr/pollset_windows_starvation_test.cc +++ b/test/core/iomgr/pollset_windows_starvation_test.cc @@ -20,13 +20,13 @@ #include #include -#include "src/core/util/thd.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/iomgr/pollset_windows.h" #include "src/core/lib/surface/init.h" +#include "src/core/util/thd.h" #include "test/core/test_util/test_config.h" #if defined(GRPC_WINSOCK_SOCKET) diff --git a/test/core/iomgr/resolve_address_posix_test.cc b/test/core/iomgr/resolve_address_posix_test.cc index 74e8a159f8e..1c0eecfa04c 100644 --- a/test/core/iomgr/resolve_address_posix_test.cc +++ b/test/core/iomgr/resolve_address_posix_test.cc @@ -35,15 +35,15 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/util/crash.h" -#include "src/core/util/env.h" -#include "src/core/util/thd.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/iomgr/resolve_address.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" #include "src/core/util/string.h" +#include "src/core/util/thd.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" #include "test/core/test_util/cmdline.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/iomgr/resolve_address_test.cc b/test/core/iomgr/resolve_address_test.cc index 49277799f82..78bc8eebab2 100644 --- a/test/core/iomgr/resolve_address_test.cc +++ b/test/core/iomgr/resolve_address_test.cc @@ -35,14 +35,14 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/util/crash.h" -#include "src/core/util/sync.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #include "test/core/test_util/cmdline.h" #include "test/core/test_util/fake_udp_and_tcp_server.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/iomgr/socket_utils_test.cc b/test/core/iomgr/socket_utils_test.cc index 225ccb57c0e..3fcb4900c8b 100644 --- a/test/core/iomgr/socket_utils_test.cc +++ b/test/core/iomgr/socket_utils_test.cc @@ -34,9 +34,9 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/socket_mutator.h" #include "src/core/lib/iomgr/socket_utils_posix.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/iomgr/tcp_client_posix_test.cc b/test/core/iomgr/tcp_client_posix_test.cc index 3d3806fc26d..54f3a02508b 100644 --- a/test/core/iomgr/tcp_client_posix_test.cc +++ b/test/core/iomgr/tcp_client_posix_test.cc @@ -20,8 +20,8 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/time.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" @@ -43,13 +43,13 @@ #include #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/socket_utils_posix.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/resource_quota/api.h" +#include "src/core/util/crash.h" static grpc_pollset_set* g_pollset_set; static gpr_mu* g_mu; diff --git a/test/core/iomgr/tcp_posix_test.cc b/test/core/iomgr/tcp_posix_test.cc index 1591ed283cf..897df84cf3e 100644 --- a/test/core/iomgr/tcp_posix_test.cc +++ b/test/core/iomgr/tcp_posix_test.cc @@ -19,9 +19,9 @@ #include "absl/time/time.h" #include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/iomgr/port.h" #include "src/core/util/notification.h" #include "src/core/util/time.h" -#include "src/core/lib/iomgr/port.h" // This test won't work except with posix sockets enabled #ifdef GRPC_POSIX_SOCKET_TCP @@ -47,7 +47,6 @@ #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/posix.h" #include "src/core/lib/event_engine/shim.h" -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/buffer_list.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" @@ -55,6 +54,7 @@ #include "src/core/lib/iomgr/socket_utils_posix.h" #include "src/core/lib/iomgr/tcp_posix.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" #include "test/core/iomgr/endpoint_tests.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/iomgr/tcp_server_posix_test.cc b/test/core/iomgr/tcp_server_posix_test.cc index b04b3c7d7ec..693a99bdff2 100644 --- a/test/core/iomgr/tcp_server_posix_test.cc +++ b/test/core/iomgr/tcp_server_posix_test.cc @@ -19,8 +19,8 @@ #include #include "src/core/lib/event_engine/shim.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/time.h" #include "test/core/test_util/test_config.h" // This test won't work except with posix sockets enabled @@ -51,14 +51,14 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/util/crash.h" -#include "src/core/util/memory.h" -#include "src/core/util/strerror.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/tcp_server.h" #include "src/core/lib/resource_quota/api.h" +#include "src/core/util/crash.h" +#include "src/core/util/memory.h" +#include "src/core/util/strerror.h" #include "test/core/test_util/port.h" #define LOG_TEST(x) LOG(INFO) << #x diff --git a/test/core/iomgr/timer_heap_test.cc b/test/core/iomgr/timer_heap_test.cc index 4bf9b0d7080..3e2b907e7b5 100644 --- a/test/core/iomgr/timer_heap_test.cc +++ b/test/core/iomgr/timer_heap_test.cc @@ -27,8 +27,8 @@ #include -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/iomgr/timer_list_test.cc b/test/core/iomgr/timer_list_test.cc index 9baf8301ac9..cb45372fd8f 100644 --- a/test/core/iomgr/timer_list_test.cc +++ b/test/core/iomgr/timer_list_test.cc @@ -27,11 +27,11 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/util/crash.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/timer.h" +#include "src/core/util/crash.h" +#include "src/core/util/time.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tracer_util.h" diff --git a/test/core/json/json_object_loader_test.cc b/test/core/json/json_object_loader_test.cc index 44e96bf1f9a..aad3567f86b 100644 --- a/test/core/json/json_object_loader_test.cc +++ b/test/core/json/json_object_loader_test.cc @@ -22,10 +22,10 @@ #include -#include "src/core/util/ref_counted.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { namespace { diff --git a/test/core/load_balancing/lb_policy_test_lib.h b/test/core/load_balancing/lb_policy_test_lib.h index 0d6a7a4eb7d..563ab82c1f3 100644 --- a/test/core/load_balancing/lb_policy_test_lib.h +++ b/test/core/load_balancing/lb_policy_test_lib.h @@ -62,19 +62,10 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/match.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" -#include "src/core/util/time.h" -#include "src/core/util/unique_type_name.h" -#include "src/core/util/work_serializer.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/transport/connectivity_state.h" -#include "src/core/util/uri.h" #include "src/core/load_balancing/backend_metric_data.h" #include "src/core/load_balancing/health_check_client_internal.h" #include "src/core/load_balancing/lb_policy.h" @@ -84,7 +75,16 @@ #include "src/core/load_balancing/subchannel_interface.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/service_config/service_config_call_data.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" +#include "src/core/util/match.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/unique_type_name.h" +#include "src/core/util/uri.h" +#include "src/core/util/work_serializer.h" #include "test/core/event_engine/event_engine_test_utils.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h" diff --git a/test/core/load_balancing/outlier_detection_lb_config_parser_test.cc b/test/core/load_balancing/outlier_detection_lb_config_parser_test.cc index 0e35a42cff7..b5145f451ff 100644 --- a/test/core/load_balancing/outlier_detection_lb_config_parser_test.cc +++ b/test/core/load_balancing/outlier_detection_lb_config_parser_test.cc @@ -24,9 +24,9 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/load_balancing/outlier_detection_test.cc b/test/core/load_balancing/outlier_detection_test.cc index ab0d9205000..e92c3bc4e84 100644 --- a/test/core/load_balancing/outlier_detection_test.cc +++ b/test/core/load_balancing/outlier_detection_test.cc @@ -35,13 +35,13 @@ #include #include -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" #include "src/core/load_balancing/backend_metric_data.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/util/json/json.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "test/core/load_balancing/lb_policy_test_lib.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/load_balancing/pick_first_test.cc b/test/core/load_balancing/pick_first_test.cc index 2b2cd73ec14..0f07d6fd39d 100644 --- a/test/core/load_balancing/pick_first_test.cc +++ b/test/core/load_balancing/pick_first_test.cc @@ -38,16 +38,16 @@ #include #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" -#include "src/core/util/work_serializer.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/telemetry/metrics.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" +#include "src/core/util/work_serializer.h" #include "test/core/load_balancing/lb_policy_test_lib.h" #include "test/core/test_util/fake_stats_plugin.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/load_balancing/ring_hash_test.cc b/test/core/load_balancing/ring_hash_test.cc index 72ed7120e5f..0861cdcb5db 100644 --- a/test/core/load_balancing/ring_hash_test.cc +++ b/test/core/load_balancing/ring_hash_test.cc @@ -34,11 +34,11 @@ #include #include -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/xxhash_inline.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/util/json/json.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/xxhash_inline.h" #include "test/core/load_balancing/lb_policy_test_lib.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/load_balancing/rls_lb_config_parser_test.cc b/test/core/load_balancing/rls_lb_config_parser_test.cc index 542e9e82293..f0a1773b719 100644 --- a/test/core/load_balancing/rls_lb_config_parser_test.cc +++ b/test/core/load_balancing/rls_lb_config_parser_test.cc @@ -24,9 +24,9 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/load_balancing/round_robin_test.cc b/test/core/load_balancing/round_robin_test.cc index 7597f9fc2d4..78da9b904f3 100644 --- a/test/core/load_balancing/round_robin_test.cc +++ b/test/core/load_balancing/round_robin_test.cc @@ -24,9 +24,9 @@ #include +#include "src/core/resolver/endpoint_addresses.h" #include "src/core/util/orphanable.h" #include "src/core/util/ref_counted_ptr.h" -#include "src/core/resolver/endpoint_addresses.h" #include "test/core/load_balancing/lb_policy_test_lib.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/load_balancing/static_stride_scheduler_benchmark.cc b/test/core/load_balancing/static_stride_scheduler_benchmark.cc index 272fb3275cf..c5d111c6962 100644 --- a/test/core/load_balancing/static_stride_scheduler_benchmark.cc +++ b/test/core/load_balancing/static_stride_scheduler_benchmark.cc @@ -29,8 +29,8 @@ #include -#include "src/core/util/no_destruct.h" #include "src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h" +#include "src/core/util/no_destruct.h" namespace grpc_core { namespace { diff --git a/test/core/load_balancing/weighted_round_robin_config_test.cc b/test/core/load_balancing/weighted_round_robin_config_test.cc index ac4acbae103..5da2fb5a006 100644 --- a/test/core/load_balancing/weighted_round_robin_config_test.cc +++ b/test/core/load_balancing/weighted_round_robin_config_test.cc @@ -23,9 +23,9 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/load_balancing/weighted_round_robin_test.cc b/test/core/load_balancing/weighted_round_robin_test.cc index 42e97028df1..8faa6c693e1 100644 --- a/test/core/load_balancing/weighted_round_robin_test.cc +++ b/test/core/load_balancing/weighted_round_robin_test.cc @@ -40,16 +40,16 @@ #include #include -#include "src/core/util/debug_location.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" #include "src/core/load_balancing/backend_metric_data.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/load_balancing/weighted_target/weighted_target.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "test/core/load_balancing/lb_policy_test_lib.h" #include "test/core/test_util/fake_stats_plugin.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/load_balancing/xds_override_host_lb_config_parser_test.cc b/test/core/load_balancing/xds_override_host_lb_config_parser_test.cc index 633b12cb986..3407ababe59 100644 --- a/test/core/load_balancing/xds_override_host_lb_config_parser_test.cc +++ b/test/core/load_balancing/xds_override_host_lb_config_parser_test.cc @@ -24,10 +24,10 @@ #include "src/core/client_channel/client_channel_service_config.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/load_balancing/xds/xds_override_host.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/xds/grpc/xds_health_status.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/load_balancing/xds_override_host_test.cc b/test/core/load_balancing/xds_override_host_test.cc index 15394f8f043..074f79183f8 100644 --- a/test/core/load_balancing/xds_override_host_test.cc +++ b/test/core/load_balancing/xds_override_host_test.cc @@ -39,12 +39,12 @@ #include "src/core/ext/filters/stateful_session/stateful_session_filter.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/xds/xds_dependency_manager.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/xds/grpc/xds_health_status.h" #include "test/core/load_balancing/lb_policy_test_lib.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/message_size/message_size_service_config_test.cc b/test/core/message_size/message_size_service_config_test.cc index b33698a32d2..65fd3a11118 100644 --- a/test/core/message_size/message_size_service_config_test.cc +++ b/test/core/message_size/message_size_service_config_test.cc @@ -28,10 +28,10 @@ #include "src/core/ext/filters/message_size/message_size_filter.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" #include "src/core/service_config/service_config_parser.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/network_benchmarks/low_level_ping_pong.cc b/test/core/network_benchmarks/low_level_ping_pong.cc index faae51b3657..9211b83e7ea 100644 --- a/test/core/network_benchmarks/low_level_ping_pong.cc +++ b/test/core/network_benchmarks/low_level_ping_pong.cc @@ -41,10 +41,10 @@ #include #include -#include "src/core/util/strerror.h" -#include "src/core/util/thd.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/socket_utils_posix.h" +#include "src/core/util/strerror.h" +#include "src/core/util/thd.h" #include "src/core/util/useful.h" #include "test/core/test_util/cmdline.h" #include "test/core/test_util/histogram.h" diff --git a/test/core/promise/arena_promise_test.cc b/test/core/promise/arena_promise_test.cc index 061d8c0a505..2f4da3b2c5d 100644 --- a/test/core/promise/arena_promise_test.cc +++ b/test/core/promise/arena_promise_test.cc @@ -21,10 +21,10 @@ #include -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/promise/test_context.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/promise/event_engine_wakeup_scheduler_test.cc b/test/core/promise/event_engine_wakeup_scheduler_test.cc index 3ce2a88669f..739c1a25f4e 100644 --- a/test/core/promise/event_engine_wakeup_scheduler_test.cc +++ b/test/core/promise/event_engine_wakeup_scheduler_test.cc @@ -24,9 +24,9 @@ #include #include -#include "src/core/util/notification.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/notification.h" namespace grpc_core { diff --git a/test/core/promise/for_each_test.cc b/test/core/promise/for_each_test.cc index c9613bbe5d0..ea0f63732c1 100644 --- a/test/core/promise/for_each_test.cc +++ b/test/core/promise/for_each_test.cc @@ -21,7 +21,6 @@ #include -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/inter_activity_pipe.h" #include "src/core/lib/promise/join.h" @@ -32,6 +31,7 @@ #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/promise/test_wakeup_schedulers.h" using testing::Mock; diff --git a/test/core/promise/inter_activity_latch_test.cc b/test/core/promise/inter_activity_latch_test.cc index 13195c2b171..925062c561b 100644 --- a/test/core/promise/inter_activity_latch_test.cc +++ b/test/core/promise/inter_activity_latch_test.cc @@ -20,9 +20,9 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/util/notification.h" #include "src/core/lib/promise/event_engine_wakeup_scheduler.h" #include "src/core/lib/promise/seq.h" +#include "src/core/util/notification.h" using grpc_event_engine::experimental::GetDefaultEventEngine; diff --git a/test/core/promise/interceptor_list_test.cc b/test/core/promise/interceptor_list_test.cc index 63c9eedad81..d52ba611006 100644 --- a/test/core/promise/interceptor_list_test.cc +++ b/test/core/promise/interceptor_list_test.cc @@ -20,10 +20,10 @@ #include -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/promise/test_context.h" namespace grpc_core { diff --git a/test/core/promise/map_pipe_test.cc b/test/core/promise/map_pipe_test.cc index bdedb6d5172..5b702f2f8d0 100644 --- a/test/core/promise/map_pipe_test.cc +++ b/test/core/promise/map_pipe_test.cc @@ -22,7 +22,6 @@ #include -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/for_each.h" #include "src/core/lib/promise/join.h" @@ -33,6 +32,7 @@ #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/promise/test_wakeup_schedulers.h" using testing::Mock; diff --git a/test/core/promise/observable_test.cc b/test/core/promise/observable_test.cc index 74a9c26db84..4bb60674903 100644 --- a/test/core/promise/observable_test.cc +++ b/test/core/promise/observable_test.cc @@ -23,9 +23,9 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "src/core/util/notification.h" #include "src/core/lib/promise/loop.h" #include "src/core/lib/promise/map.h" +#include "src/core/util/notification.h" #include "test/core/promise/poll_matcher.h" using testing::Mock; diff --git a/test/core/promise/party_test.cc b/test/core/promise/party_test.cc index 607e955d6e5..65ca2731072 100644 --- a/test/core/promise/party_test.cc +++ b/test/core/promise/party_test.cc @@ -31,10 +31,6 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/util/notification.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/inter_activity_latch.h" @@ -43,6 +39,10 @@ #include "src/core/lib/promise/sleep.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/notification.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/test/core/promise/pipe_test.cc b/test/core/promise/pipe_test.cc index 0386febafc1..b74f29df2e8 100644 --- a/test/core/promise/pipe_test.cc +++ b/test/core/promise/pipe_test.cc @@ -26,14 +26,14 @@ #include #include -#include "src/core/util/crash.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/join.h" #include "src/core/lib/promise/map.h" #include "src/core/lib/promise/seq.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/crash.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/promise/test_wakeup_schedulers.h" using testing::MockFunction; diff --git a/test/core/promise/sleep_test.cc b/test/core/promise/sleep_test.cc index c3055618aed..9e887b4c616 100644 --- a/test/core/promise/sleep_test.cc +++ b/test/core/promise/sleep_test.cc @@ -27,11 +27,11 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/util/notification.h" -#include "src/core/util/orphanable.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/exec_ctx_wakeup_scheduler.h" #include "src/core/lib/promise/race.h" +#include "src/core/util/notification.h" +#include "src/core/util/orphanable.h" #include "test/core/event_engine/mock_event_engine.h" #include "test/core/promise/test_wakeup_schedulers.h" diff --git a/test/core/promise/wait_for_callback_test.cc b/test/core/promise/wait_for_callback_test.cc index 16293081d66..25f5771379c 100644 --- a/test/core/promise/wait_for_callback_test.cc +++ b/test/core/promise/wait_for_callback_test.cc @@ -17,8 +17,8 @@ #include "absl/status/status.h" #include "gtest/gtest.h" -#include "src/core/util/notification.h" #include "src/core/lib/promise/map.h" +#include "src/core/util/notification.h" #include "test/core/promise/test_wakeup_schedulers.h" namespace grpc_core { diff --git a/test/core/resolver/binder_resolver_test.cc b/test/core/resolver/binder_resolver_test.cc index 4438a0730a1..7f6d3b9f14c 100644 --- a/test/core/resolver/binder_resolver_test.cc +++ b/test/core/resolver/binder_resolver_test.cc @@ -22,13 +22,13 @@ #include "gtest/gtest.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/orphanable.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/util/uri.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/uri.h" #include "test/core/test_util/test_config.h" #ifdef GRPC_HAVE_UNIX_SOCKET diff --git a/test/core/resolver/dns_resolver_cooldown_test.cc b/test/core/resolver/dns_resolver_cooldown_test.cc index e7d4dc79944..ad7b6a3a8c3 100644 --- a/test/core/resolver/dns_resolver_cooldown_test.cc +++ b/test/core/resolver/dns_resolver_cooldown_test.cc @@ -42,12 +42,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/no_destruct.h" -#include "src/core/util/notification.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/time.h" -#include "src/core/util/work_serializer.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -56,12 +50,18 @@ #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/util/uri.h" #include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" #include "src/core/resolver/resolver_registry.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/notification.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" +#include "src/core/util/work_serializer.h" #include "test/core/test_util/test_config.h" using ::grpc_event_engine::experimental::GetDefaultEventEngine; diff --git a/test/core/resolver/dns_resolver_test.cc b/test/core/resolver/dns_resolver_test.cc index b0eed7686c8..4bf8a069c8b 100644 --- a/test/core/resolver/dns_resolver_test.cc +++ b/test/core/resolver/dns_resolver_test.cc @@ -30,13 +30,13 @@ #include "src/core/lib/config/config_vars.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/work_serializer.h" #include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/util/uri.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" #include "src/core/resolver/resolver_registry.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/uri.h" +#include "src/core/util/work_serializer.h" #include "test/core/test_util/test_config.h" using ::grpc_event_engine::experimental::GetDefaultEventEngine; diff --git a/test/core/resolver/fake_resolver_test.cc b/test/core/resolver/fake_resolver_test.cc index cb58b074246..888ecac3399 100644 --- a/test/core/resolver/fake_resolver_test.cc +++ b/test/core/resolver/fake_resolver_test.cc @@ -41,16 +41,16 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/work_serializer.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/util/uri.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/resolver_factory.h" #include "src/core/resolver/resolver_registry.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/uri.h" +#include "src/core/util/work_serializer.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/resolver/sockaddr_resolver_test.cc b/test/core/resolver/sockaddr_resolver_test.cc index f35127113ad..faf90400364 100644 --- a/test/core/resolver/sockaddr_resolver_test.cc +++ b/test/core/resolver/sockaddr_resolver_test.cc @@ -27,14 +27,14 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/work_serializer.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/port.h" -#include "src/core/util/uri.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" #include "src/core/resolver/resolver_registry.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/uri.h" +#include "src/core/util/work_serializer.h" #include "test/core/test_util/test_config.h" static std::shared_ptr* g_work_serializer; diff --git a/test/core/resource_quota/arena_test.cc b/test/core/resource_quota/arena_test.cc index c796ff2e7d7..80213b2e083 100644 --- a/test/core/resource_quota/arena_test.cc +++ b/test/core/resource_quota/arena_test.cc @@ -35,10 +35,10 @@ #include #include -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/thd.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/thd.h" #include "test/core/test_util/test_config.h" using testing::StrictMock; diff --git a/test/core/resource_quota/memory_quota_fuzzer.cc b/test/core/resource_quota/memory_quota_fuzzer.cc index 60026f5eda2..2dc5c8eae33 100644 --- a/test/core/resource_quota/memory_quota_fuzzer.cc +++ b/test/core/resource_quota/memory_quota_fuzzer.cc @@ -31,11 +31,11 @@ #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/config.h" -#include "src/core/util/debug_location.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/memory_quota.h" +#include "src/core/util/debug_location.h" #include "src/core/util/useful.h" #include "src/libfuzzer/libfuzzer_macro.h" #include "test/core/resource_quota/call_checker.h" diff --git a/test/core/resource_quota/memory_quota_stress_test.cc b/test/core/resource_quota/memory_quota_stress_test.cc index 123b18425a4..a8086810cc7 100644 --- a/test/core/resource_quota/memory_quota_stress_test.cc +++ b/test/core/resource_quota/memory_quota_stress_test.cc @@ -33,9 +33,9 @@ #include #include -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/memory_quota.h" +#include "src/core/util/sync.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/security/alts_credentials_fuzzer.cc b/test/core/security/alts_credentials_fuzzer.cc index f38015dc83f..0f28807a7ca 100644 --- a/test/core/security/alts_credentials_fuzzer.cc +++ b/test/core/security/alts_credentials_fuzzer.cc @@ -27,11 +27,11 @@ #include #include -#include "src/core/util/crash.h" -#include "src/core/util/env.h" #include "src/core/lib/security/credentials/alts/alts_credentials.h" #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" #include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" #include "test/core/test_util/fuzzer_util.h" using grpc_core::testing::grpc_fuzzer_get_next_byte; diff --git a/test/core/security/alts_security_connector_test.cc b/test/core/security/alts_security_connector_test.cc index 785d1a91718..02a7cf5e1a4 100644 --- a/test/core/security/alts_security_connector_test.cc +++ b/test/core/security/alts_security_connector_test.cc @@ -29,11 +29,11 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/transport/transport.h" #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h" #include "src/core/tsi/transport_security.h" +#include "src/core/util/crash.h" using grpc_core::internal::grpc_alts_auth_context_from_tsi_peer; diff --git a/test/core/security/auth_context_test.cc b/test/core/security/auth_context_test.cc index dbe29154468..9443712cc91 100644 --- a/test/core/security/auth_context_test.cc +++ b/test/core/security/auth_context_test.cc @@ -22,9 +22,9 @@ #include "absl/log/log.h" +#include "src/core/lib/security/context/security_context.h" #include "src/core/util/crash.h" #include "src/core/util/ref_counted_ptr.h" -#include "src/core/lib/security/context/security_context.h" #include "src/core/util/string.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/security/check_gcp_environment_linux_test.cc b/test/core/security/check_gcp_environment_linux_test.cc index a2c3755464a..b2f7d324a73 100644 --- a/test/core/security/check_gcp_environment_linux_test.cc +++ b/test/core/security/check_gcp_environment_linux_test.cc @@ -25,8 +25,8 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" +#include "src/core/util/crash.h" #include "src/core/util/tmpfile.h" #if GPR_LINUX diff --git a/test/core/security/check_gcp_environment_windows_test.cc b/test/core/security/check_gcp_environment_windows_test.cc index 578aac9b8a0..7766136e8e3 100644 --- a/test/core/security/check_gcp_environment_windows_test.cc +++ b/test/core/security/check_gcp_environment_windows_test.cc @@ -25,8 +25,8 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" +#include "src/core/util/crash.h" #include "src/core/util/tmpfile.h" #ifdef GPR_WINDOWS diff --git a/test/core/security/create_jwt.cc b/test/core/security/create_jwt.cc index fddc73be66a..d2576d9b954 100644 --- a/test/core/security/create_jwt.cc +++ b/test/core/security/create_jwt.cc @@ -24,8 +24,8 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/security/credentials/jwt/jwt_credentials.h" +#include "src/core/util/crash.h" #include "test/core/test_util/cmdline.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/security/credentials_test.cc b/test/core/security/credentials_test.cc index bb0395c116b..aac5e3fb930 100644 --- a/test/core/security/credentials_test.cc +++ b/test/core/security/credentials_test.cc @@ -42,11 +42,6 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/crash.h" -#include "src/core/util/env.h" -#include "src/core/util/host_port.h" -#include "src/core/util/time.h" -#include "src/core/util/unique_type_name.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/promise/exec_ctx_wakeup_scheduler.h" #include "src/core/lib/promise/promise.h" @@ -66,12 +61,17 @@ #include "src/core/lib/security/credentials/xds/xds_credentials.h" #include "src/core/lib/security/transport/auth_filters.h" #include "src/core/lib/transport/error_utils.h" -#include "src/core/util/uri.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" +#include "src/core/util/host_port.h" #include "src/core/util/http_client/httpcli.h" #include "src/core/util/http_client/httpcli_ssl_credentials.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/string.h" +#include "src/core/util/time.h" #include "src/core/util/tmpfile.h" +#include "src/core/util/unique_type_name.h" +#include "src/core/util/uri.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/security/fetch_oauth2.cc b/test/core/security/fetch_oauth2.cc index f9c5c661f7b..b99d41f9dce 100644 --- a/test/core/security/fetch_oauth2.cc +++ b/test/core/security/fetch_oauth2.cc @@ -30,10 +30,10 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/util/json_util.h" +#include "src/core/util/crash.h" #include "src/cpp/client/secure_credentials.h" #include "test/core/security/oauth2_utils.h" #include "test/core/test_util/cmdline.h" diff --git a/test/core/security/grpc_tls_certificate_distributor_test.cc b/test/core/security/grpc_tls_certificate_distributor_test.cc index 4061b93dca9..34bb1b4ba3f 100644 --- a/test/core/security/grpc_tls_certificate_distributor_test.cc +++ b/test/core/security/grpc_tls_certificate_distributor_test.cc @@ -30,8 +30,8 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/security/grpc_tls_certificate_provider_test.cc b/test/core/security/grpc_tls_certificate_provider_test.cc index b59a872403a..59fd62cd2ab 100644 --- a/test/core/security/grpc_tls_certificate_provider_test.cc +++ b/test/core/security/grpc_tls_certificate_provider_test.cc @@ -28,8 +28,8 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" #include "src/core/util/tmpfile.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/security/grpc_tls_certificate_verifier_test.cc b/test/core/security/grpc_tls_certificate_verifier_test.cc index 23c0c4a766c..162c2e3c367 100644 --- a/test/core/security/grpc_tls_certificate_verifier_test.cc +++ b/test/core/security/grpc_tls_certificate_verifier_test.cc @@ -27,9 +27,9 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/security/security_connector/tls/tls_security_connector.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" #include "src/core/util/tmpfile.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/security/grpc_tls_credentials_options_test.cc b/test/core/security/grpc_tls_credentials_options_test.cc index b5b02dfd184..88912d141d6 100644 --- a/test/core/security/grpc_tls_credentials_options_test.cc +++ b/test/core/security/grpc_tls_credentials_options_test.cc @@ -28,9 +28,9 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/util/crash.h" #include "src/core/lib/security/credentials/tls/tls_credentials.h" #include "src/core/lib/security/security_connector/tls/tls_security_connector.h" +#include "src/core/util/crash.h" #include "src/core/util/tmpfile.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/security/json_token_test.cc b/test/core/security/json_token_test.cc index fab11a830ae..03569c4d1b5 100644 --- a/test/core/security/json_token_test.cc +++ b/test/core/security/json_token_test.cc @@ -31,9 +31,9 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/security/credentials/oauth2/oauth2_credentials.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/security/jwt_verifier_test.cc b/test/core/security/jwt_verifier_test.cc index 2c83a10539a..f4d045a3262 100644 --- a/test/core/security/jwt_verifier_test.cc +++ b/test/core/security/jwt_verifier_test.cc @@ -30,8 +30,8 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/security/credentials/jwt/json_token.h" +#include "src/core/util/crash.h" #include "src/core/util/http_client/httpcli.h" #include "src/core/util/json/json_reader.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/security/oauth2_utils.cc b/test/core/security/oauth2_utils.cc index f8888a7b8bc..6111bb25e61 100644 --- a/test/core/security/oauth2_utils.cc +++ b/test/core/security/oauth2_utils.cc @@ -30,14 +30,14 @@ #include #include -#include "src/core/util/crash.h" -#include "src/core/util/notification.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/exec_ctx_wakeup_scheduler.h" #include "src/core/lib/promise/map.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/credentials/credentials.h" +#include "src/core/util/crash.h" +#include "src/core/util/notification.h" char* grpc_test_fetch_oauth2_token_with_credentials( grpc_call_credentials* creds) { diff --git a/test/core/security/print_google_default_creds_token.cc b/test/core/security/print_google_default_creds_token.cc index cd78b60c7b0..684dc6e4352 100644 --- a/test/core/security/print_google_default_creds_token.cc +++ b/test/core/security/print_google_default_creds_token.cc @@ -29,10 +29,10 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/security/credentials/composite/composite_credentials.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/slice/slice_string_helpers.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" #include "test/core/test_util/cmdline.h" diff --git a/test/core/security/rbac_translator_test.cc b/test/core/security/rbac_translator_test.cc index 2bdf9c688a0..0d7a798da34 100644 --- a/test/core/security/rbac_translator_test.cc +++ b/test/core/security/rbac_translator_test.cc @@ -24,8 +24,8 @@ #include -#include "src/core/util/crash.h" #include "src/core/lib/security/authorization/audit_logging.h" +#include "src/core/util/crash.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/security/secure_endpoint_test.cc b/test/core/security/secure_endpoint_test.cc index 49c0c71a2f2..7b3e6ec9ff9 100644 --- a/test/core/security/secure_endpoint_test.cc +++ b/test/core/security/secure_endpoint_test.cc @@ -28,11 +28,11 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/endpoint_pair.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/tsi/fake_transport_security.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" #include "test/core/iomgr/endpoint_tests.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/security/security_connector_test.cc b/test/core/security/security_connector_test.cc index d2432fad382..dfccc4b7abe 100644 --- a/test/core/security/security_connector_test.cc +++ b/test/core/security/security_connector_test.cc @@ -31,13 +31,13 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/util/crash.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/security_connector/ssl_utils.h" #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/tsi/ssl_transport_security.h" #include "src/core/tsi/transport_security.h" +#include "src/core/util/crash.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/string.h" #include "src/core/util/tmpfile.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/security/ssl_credentials_test.cc b/test/core/security/ssl_credentials_test.cc index 3a4662c14ea..2d36bbc53bd 100644 --- a/test/core/security/ssl_credentials_test.cc +++ b/test/core/security/ssl_credentials_test.cc @@ -27,9 +27,9 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/security/security_connector/ssl_utils.h" #include "src/core/tsi/ssl_transport_security.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" TEST(SslCredentialsTest, ConvertGrpcToTsiCertPairs) { diff --git a/test/core/security/ssl_server_fuzzer.cc b/test/core/security/ssl_server_fuzzer.cc index 7e60e39f401..c260375c561 100644 --- a/test/core/security/ssl_server_fuzzer.cc +++ b/test/core/security/ssl_server_fuzzer.cc @@ -24,10 +24,10 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/util/crash.h" -#include "src/core/util/notification.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" +#include "src/core/util/crash.h" +#include "src/core/util/notification.h" #include "test/core/test_util/mock_endpoint.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/security/system_roots_test.cc b/test/core/security/system_roots_test.cc index dccedfb9518..8458721e8da 100644 --- a/test/core/security/system_roots_test.cc +++ b/test/core/security/system_roots_test.cc @@ -34,9 +34,6 @@ #include #include -#include "src/core/util/crash.h" -#include "src/core/util/env.h" -#include "src/core/util/load_file.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/security_connector/load_system_roots.h" #include "src/core/lib/security/security_connector/load_system_roots_supported.h" @@ -45,6 +42,9 @@ #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/tsi/ssl_transport_security.h" #include "src/core/tsi/transport_security.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" +#include "src/core/util/load_file.h" #include "src/core/util/tmpfile.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/security/tls_security_connector_test.cc b/test/core/security/tls_security_connector_test.cc index 7a5ed5c0ae4..df22c660ecd 100644 --- a/test/core/security/tls_security_connector_test.cc +++ b/test/core/security/tls_security_connector_test.cc @@ -33,13 +33,13 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/util/crash.h" -#include "src/core/util/unique_type_name.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" #include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h" #include "src/core/lib/security/credentials/tls/tls_credentials.h" #include "src/core/tsi/transport_security.h" +#include "src/core/util/crash.h" +#include "src/core/util/unique_type_name.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/security/verify_jwt.cc b/test/core/security/verify_jwt.cc index 54cb9b702e1..f86ec2851cc 100644 --- a/test/core/security/verify_jwt.cc +++ b/test/core/security/verify_jwt.cc @@ -28,10 +28,10 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/security/credentials/jwt/jwt_verifier.h" +#include "src/core/util/crash.h" #include "src/core/util/json/json_writer.h" #include "test/core/test_util/cmdline.h" diff --git a/test/core/service_config/service_config_test.cc b/test/core/service_config/service_config_test.cc index 1c8e26e0ce6..24112d7732f 100644 --- a/test/core/service_config/service_config_test.cc +++ b/test/core/service_config/service_config_test.cc @@ -32,13 +32,13 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/validation_errors.h" #include "src/core/service_config/service_config_impl.h" #include "src/core/service_config/service_config_parser.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/validation_errors.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/slice/slice_test.cc b/test/core/slice/slice_test.cc index f8aa55f5697..1e7b1a01dfb 100644 --- a/test/core/slice/slice_test.cc +++ b/test/core/slice/slice_test.cc @@ -36,10 +36,10 @@ #include #include -#include "src/core/util/memory.h" -#include "src/core/util/no_destruct.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_refcount.h" +#include "src/core/util/memory.h" +#include "src/core/util/no_destruct.h" #include "test/core/test_util/build.h" TEST(GrpcSliceTest, MallocReturnsSomethingSensible) { diff --git a/test/core/surface/completion_queue_threading_test.cc b/test/core/surface/completion_queue_threading_test.cc index 170939e4c43..3d6dbd1fc97 100644 --- a/test/core/surface/completion_queue_threading_test.cc +++ b/test/core/surface/completion_queue_threading_test.cc @@ -30,10 +30,10 @@ #include #include -#include "src/core/util/crash.h" -#include "src/core/util/thd.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/completion_queue.h" +#include "src/core/util/crash.h" +#include "src/core/util/thd.h" #include "src/core/util/useful.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/surface/concurrent_connectivity_test.cc b/test/core/surface/concurrent_connectivity_test.cc index 8d381d1cc3a..8b344fd521e 100644 --- a/test/core/surface/concurrent_connectivity_test.cc +++ b/test/core/surface/concurrent_connectivity_test.cc @@ -37,8 +37,6 @@ #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/util/thd.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -48,6 +46,8 @@ #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/tcp_server.h" +#include "src/core/util/thd.h" +#include "src/core/util/time.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/surface/lame_client_test.cc b/test/core/surface/lame_client_test.cc index a891838e3cc..5ec41ad9d18 100644 --- a/test/core/surface/lame_client_test.cc +++ b/test/core/surface/lame_client_test.cc @@ -32,13 +32,13 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/orphanable.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/orphanable.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/surface/num_external_connectivity_watchers_test.cc b/test/core/surface/num_external_connectivity_watchers_test.cc index a0094d6e232..a9e1b8ffd85 100644 --- a/test/core/surface/num_external_connectivity_watchers_test.cc +++ b/test/core/surface/num_external_connectivity_watchers_test.cc @@ -31,9 +31,9 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/host_port.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/host_port.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/surface/sequential_connectivity_test.cc b/test/core/surface/sequential_connectivity_test.cc index 54f9ae0dee6..ab6dfe4b1a6 100644 --- a/test/core/surface/sequential_connectivity_test.cc +++ b/test/core/surface/sequential_connectivity_test.cc @@ -33,9 +33,9 @@ #include #include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/util/host_port.h" #include "src/core/util/thd.h" -#include "src/core/lib/iomgr/error.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/surface/server_chttp2_test.cc b/test/core/surface/server_chttp2_test.cc index 35822ef9cb0..2e34ccc5dd8 100644 --- a/test/core/surface/server_chttp2_test.cc +++ b/test/core/surface/server_chttp2_test.cc @@ -27,8 +27,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/host_port.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" +#include "src/core/util/host_port.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/surface/server_test.cc b/test/core/surface/server_test.cc index 8749d247d33..ec58b556a7f 100644 --- a/test/core/surface/server_test.cc +++ b/test/core/surface/server_test.cc @@ -34,10 +34,10 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/host_port.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" +#include "src/core/util/host_port.h" #include "src/core/util/useful.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/telemetry/call_tracer_test.cc b/test/core/telemetry/call_tracer_test.cc index 758421510a6..b85542169b9 100644 --- a/test/core/telemetry/call_tracer_test.cc +++ b/test/core/telemetry/call_tracer_test.cc @@ -25,10 +25,10 @@ #include #include -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/test_util/fake_stats_plugin.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/test_util/evaluate_args_test_util.h b/test/core/test_util/evaluate_args_test_util.h index a960fa8d2e8..2d681d3b50f 100644 --- a/test/core/test_util/evaluate_args_test_util.h +++ b/test/core/test_util/evaluate_args_test_util.h @@ -27,7 +27,6 @@ #include "src/core/handshaker/endpoint_info/endpoint_info_handshaker.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" @@ -35,6 +34,7 @@ #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/test/core/test_util/fake_stats_plugin.h b/test/core/test_util/fake_stats_plugin.h index 42f1cbdba68..f52e31740bd 100644 --- a/test/core/test_util/fake_stats_plugin.h +++ b/test/core/test_util/fake_stats_plugin.h @@ -30,10 +30,10 @@ #include "gmock/gmock.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/util/ref_counted.h" #include "src/core/telemetry/call_tracer.h" #include "src/core/telemetry/metrics.h" #include "src/core/telemetry/tcp_tracer.h" +#include "src/core/util/ref_counted.h" namespace grpc_core { diff --git a/test/core/test_util/fuzzer_corpus_test.cc b/test/core/test_util/fuzzer_corpus_test.cc index bee7558cec5..3eaef693f10 100644 --- a/test/core/test_util/fuzzer_corpus_test.cc +++ b/test/core/test_util/fuzzer_corpus_test.cc @@ -35,8 +35,8 @@ #include #include -#include "src/core/util/env.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/env.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" #include "test/cpp/util/test_config.h" diff --git a/test/core/test_util/fuzzing_channel_args.h b/test/core/test_util/fuzzing_channel_args.h index 40f99ba18de..83cb5497bd3 100644 --- a/test/core/test_util/fuzzing_channel_args.h +++ b/test/core/test_util/fuzzing_channel_args.h @@ -20,8 +20,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/test_util/fuzzing_channel_args.pb.h" namespace grpc_core { diff --git a/test/core/test_util/one_corpus_entry_fuzzer.cc b/test/core/test_util/one_corpus_entry_fuzzer.cc index 6e01feb32b6..971c3f5d70b 100644 --- a/test/core/test_util/one_corpus_entry_fuzzer.cc +++ b/test/core/test_util/one_corpus_entry_fuzzer.cc @@ -23,8 +23,8 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/crash.h" #include "test/core/test_util/tls_utils.h" extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size); diff --git a/test/core/test_util/port_isolated_runtime_environment.cc b/test/core/test_util/port_isolated_runtime_environment.cc index 19655defdaa..a9358df9905 100644 --- a/test/core/test_util/port_isolated_runtime_environment.cc +++ b/test/core/test_util/port_isolated_runtime_environment.cc @@ -30,8 +30,8 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/crash.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/test_util/port_server_client.cc b/test/core/test_util/port_server_client.cc index e9ace70e734..5a8b4d4d2ed 100644 --- a/test/core/test_util/port_server_client.cc +++ b/test/core/test_util/port_server_client.cc @@ -40,10 +40,6 @@ #include #include -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -51,9 +47,13 @@ #include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/security/credentials/credentials.h" -#include "src/core/util/uri.h" #include "src/core/util/http_client/httpcli.h" #include "src/core/util/http_client/parser.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" typedef struct freereq { gpr_mu* mu = nullptr; diff --git a/test/core/test_util/test_config.cc b/test/core/test_util/test_config.cc index c9686fcfb0b..65993e8013a 100644 --- a/test/core/test_util/test_config.cc +++ b/test/core/test_util/test_config.cc @@ -32,8 +32,8 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/surface/init.h" +#include "src/core/util/crash.h" #include "test/core/event_engine/test_init.h" #include "test/core/test_util/build.h" #include "test/core/test_util/stack_tracer.h" diff --git a/test/core/test_util/test_lb_policies.cc b/test/core/test_util/test_lb_policies.cc index 826e701797f..ed7a654b5d7 100644 --- a/test/core/test_util/test_lb_policies.cc +++ b/test/core/test_util/test_lb_policies.cc @@ -33,14 +33,9 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/util/uri.h" #include "src/core/load_balancing/delegating_helper.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/load_balancing/lb_policy_factory.h" @@ -49,6 +44,11 @@ #include "src/core/load_balancing/subchannel_interface.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_util.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" namespace grpc_core { diff --git a/test/core/test_util/test_tcp_server.cc b/test/core/test_util/test_tcp_server.cc index d06abe27c00..cc3d2957648 100644 --- a/test/core/test_util/test_tcp_server.cc +++ b/test/core/test_util/test_tcp_server.cc @@ -34,7 +34,6 @@ #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset.h" @@ -42,6 +41,7 @@ #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils.h" #include "src/core/lib/iomgr/tcp_server.h" +#include "src/core/util/time.h" #include "test/core/test_util/test_config.h" static void on_server_destroyed(void* data, grpc_error_handle /*error*/) { diff --git a/test/core/test_util/tls_utils.cc b/test/core/test_util/tls_utils.cc index 39f335a3ba3..5832c583dba 100644 --- a/test/core/test_util/tls_utils.cc +++ b/test/core/test_util/tls_utils.cc @@ -26,9 +26,9 @@ #include #include -#include "src/core/util/load_file.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/load_file.h" #include "src/core/util/tmpfile.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/test_util/tls_utils.h b/test/core/test_util/tls_utils.h index e0f1aae1aef..5cd12ac6a10 100644 --- a/test/core/test_util/tls_utils.h +++ b/test/core/test_util/tls_utils.h @@ -28,9 +28,9 @@ #include #include +#include "src/core/lib/security/security_connector/ssl_utils.h" #include "src/core/util/sync.h" #include "src/core/util/thd.h" -#include "src/core/lib/security/security_connector/ssl_utils.h" namespace grpc_core { diff --git a/test/core/transport/binder/binder_transport_test.cc b/test/core/transport/binder/binder_transport_test.cc index 5fa7307f29d..d5e69b3f417 100644 --- a/test/core/transport/binder/binder_transport_test.cc +++ b/test/core/transport/binder/binder_transport_test.cc @@ -32,8 +32,8 @@ #include #include "src/core/ext/transport/binder/transport/binder_stream.h" -#include "src/core/util/notification.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/notification.h" #include "test/core/test_util/test_config.h" #include "test/core/transport/binder/mock_objects.h" diff --git a/test/core/transport/chaotic_good/chaotic_good_server_test.cc b/test/core/transport/chaotic_good/chaotic_good_server_test.cc index 47f71557874..1f1335f5f6c 100644 --- a/test/core/transport/chaotic_good/chaotic_good_server_test.cc +++ b/test/core/transport/chaotic_good/chaotic_good_server_test.cc @@ -35,10 +35,10 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" +#include "src/core/server/server.h" #include "src/core/util/notification.h" #include "src/core/util/time.h" #include "src/core/util/uri.h" -#include "src/core/server/server.h" #include "test/core/event_engine/event_engine_test_utils.h" #include "test/core/test_util/build.h" #include "test/core/test_util/port.h" diff --git a/test/core/transport/chaotic_good/client_transport_error_test.cc b/test/core/transport/chaotic_good/client_transport_error_test.cc index 5f324ed04e9..f335d8b928b 100644 --- a/test/core/transport/chaotic_good/client_transport_error_test.cc +++ b/test/core/transport/chaotic_good/client_transport_error_test.cc @@ -38,7 +38,6 @@ #include "src/core/ext/transport/chaotic_good/client_transport.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/timer_manager.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/event_engine_wakeup_scheduler.h" @@ -55,6 +54,7 @@ #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/promise_endpoint.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h" diff --git a/test/core/transport/chaotic_good/frame_fuzzer.cc b/test/core/transport/chaotic_good/frame_fuzzer.cc index 8b6a1bedd8a..d5e740229cb 100644 --- a/test/core/transport/chaotic_good/frame_fuzzer.cc +++ b/test/core/transport/chaotic_good/frame_fuzzer.cc @@ -29,13 +29,13 @@ #include "src/core/ext/transport/chaotic_good/frame_header.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_buffer.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/libfuzzer/libfuzzer_macro.h" #include "test/core/promise/test_context.h" #include "test/core/transport/chaotic_good/frame_fuzzer.pb.h" diff --git a/test/core/transport/chaotic_good/server_transport_test.cc b/test/core/transport/chaotic_good/server_transport_test.cc index 1c21883b853..ffe446024eb 100644 --- a/test/core/transport/chaotic_good/server_transport_test.cc +++ b/test/core/transport/chaotic_good/server_transport_test.cc @@ -34,7 +34,6 @@ #include #include -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/timer_manager.h" #include "src/core/lib/promise/seq.h" #include "src/core/lib/resource_quota/arena.h" @@ -43,6 +42,7 @@ #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h" #include "test/core/transport/chaotic_good/mock_promise_endpoint.h" diff --git a/test/core/transport/chttp2/flow_control_fuzzer.cc b/test/core/transport/chttp2/flow_control_fuzzer.cc index ebfdd21e1c0..5b195759e23 100644 --- a/test/core/transport/chttp2/flow_control_fuzzer.cc +++ b/test/core/transport/chttp2/flow_control_fuzzer.cc @@ -37,10 +37,10 @@ #include "src/core/ext/transport/chttp2/transport/flow_control.h" #include "src/core/lib/experiments/config.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/transport/bdp_estimator.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" #include "src/libfuzzer/libfuzzer_macro.h" #include "test/core/test_util/fuzz_config_vars.h" diff --git a/test/core/transport/chttp2/flow_control_test.cc b/test/core/transport/chttp2/flow_control_test.cc index 59ef2347072..618cdfb0643 100644 --- a/test/core/transport/chttp2/flow_control_test.cc +++ b/test/core/transport/chttp2/flow_control_test.cc @@ -23,11 +23,11 @@ #include #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/transport/bdp_estimator.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" extern gpr_timespec (*gpr_now_impl)(gpr_clock_type clock_type); diff --git a/test/core/transport/chttp2/graceful_shutdown_test.cc b/test/core/transport/chttp2/graceful_shutdown_test.cc index ad59868d959..b531c18ba48 100644 --- a/test/core/transport/chttp2/graceful_shutdown_test.cc +++ b/test/core/transport/chttp2/graceful_shutdown_test.cc @@ -49,9 +49,6 @@ #include "src/core/ext/transport/chttp2/transport/frame_goaway.h" #include "src/core/ext/transport/chttp2/transport/frame_ping.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/crash.h" -#include "src/core/util/notification.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/endpoint_pair.h" @@ -61,6 +58,9 @@ #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/surface/completion_queue.h" #include "src/core/server/server.h" +#include "src/core/util/crash.h" +#include "src/core/util/notification.h" +#include "src/core/util/sync.h" #include "src/core/util/useful.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/transport/chttp2/hpack_encoder_test.cc b/test/core/transport/chttp2/hpack_encoder_test.cc index a2d887ae928..c926f7411f8 100644 --- a/test/core/transport/chttp2/hpack_encoder_test.cc +++ b/test/core/transport/chttp2/hpack_encoder_test.cc @@ -32,11 +32,11 @@ #include #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/test_util/parse_hexstring.h" #include "test/core/test_util/slice_splitter.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc b/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc index acbbf3e851b..a0b40552f20 100644 --- a/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc +++ b/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc @@ -32,14 +32,14 @@ #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" #include "src/core/lib/experiments/config.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/status_helper.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" #include "src/libfuzzer/libfuzzer_macro.h" #include "test/core/test_util/fuzz_config_vars.h" #include "test/core/test_util/proto_bit_gen.h" diff --git a/test/core/transport/chttp2/hpack_parser_input_size_fuzzer.cc b/test/core/transport/chttp2/hpack_parser_input_size_fuzzer.cc index 2c7350368e5..c01dff488a8 100644 --- a/test/core/transport/chttp2/hpack_parser_input_size_fuzzer.cc +++ b/test/core/transport/chttp2/hpack_parser_input_size_fuzzer.cc @@ -35,8 +35,6 @@ #include #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/status_helper.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/arena.h" @@ -44,6 +42,8 @@ #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" #include "test/core/test_util/slice_splitter.h" bool squelch = true; diff --git a/test/core/transport/chttp2/hpack_parser_test.cc b/test/core/transport/chttp2/hpack_parser_test.cc index ea25b599f5c..55067405020 100644 --- a/test/core/transport/chttp2/hpack_parser_test.cc +++ b/test/core/transport/chttp2/hpack_parser_test.cc @@ -36,15 +36,15 @@ #include #include -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" #include "test/core/test_util/parse_hexstring.h" #include "test/core/test_util/slice_splitter.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/transport/chttp2/hpack_sync_fuzzer.cc b/test/core/transport/chttp2/hpack_sync_fuzzer.cc index fed74a8150e..4b18ec225a9 100644 --- a/test/core/transport/chttp2/hpack_sync_fuzzer.cc +++ b/test/core/transport/chttp2/hpack_sync_fuzzer.cc @@ -34,8 +34,6 @@ #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser_table.h" #include "src/core/lib/experiments/config.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/status_helper.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/arena.h" @@ -44,6 +42,8 @@ #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" #include "src/libfuzzer/libfuzzer_macro.h" #include "test/core/test_util/fuzz_config_vars.h" #include "test/core/test_util/proto_bit_gen.h" diff --git a/test/core/transport/chttp2/ping_configuration_test.cc b/test/core/transport/chttp2/ping_configuration_test.cc index b898743460a..28961fdca2f 100644 --- a/test/core/transport/chttp2/ping_configuration_test.cc +++ b/test/core/transport/chttp2/ping_configuration_test.cc @@ -28,10 +28,10 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/config.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/time.h" #include "test/core/test_util/mock_endpoint.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/transport/chttp2/settings_timeout_test.cc b/test/core/transport/chttp2/settings_timeout_test.cc index acfe8e1228f..c2f9658babe 100644 --- a/test/core/transport/chttp2/settings_timeout_test.cc +++ b/test/core/transport/chttp2/settings_timeout_test.cc @@ -45,8 +45,6 @@ #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/util/status_helper.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -58,6 +56,8 @@ #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/resource_quota/api.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/transport/chttp2/streams_not_seen_test.cc b/test/core/transport/chttp2/streams_not_seen_test.cc index 54a45855119..c22b7e052a8 100644 --- a/test/core/transport/chttp2/streams_not_seen_test.cc +++ b/test/core/transport/chttp2/streams_not_seen_test.cc @@ -56,11 +56,6 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/host_port.h" -#include "src/core/util/notification.h" -#include "src/core/util/sync.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -72,6 +67,11 @@ #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/host_port.h" +#include "src/core/util/notification.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/port.h" diff --git a/test/core/transport/chttp2/too_many_pings_test.cc b/test/core/transport/chttp2/too_many_pings_test.cc index 92ea1a91b7e..baba72b62dd 100644 --- a/test/core/transport/chttp2/too_many_pings_test.cc +++ b/test/core/transport/chttp2/too_many_pings_test.cc @@ -47,17 +47,17 @@ #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/host_port.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/surface/channel.h" -#include "src/core/util/uri.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/fake/fake_resolver.h" #include "src/core/resolver/resolver.h" +#include "src/core/util/host_port.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" #include "src/core/util/useful.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/port.h" diff --git a/test/core/transport/error_utils_test.cc b/test/core/transport/error_utils_test.cc index 5ec1be5330b..c60b4bf5d79 100644 --- a/test/core/transport/error_utils_test.cc +++ b/test/core/transport/error_utils_test.cc @@ -23,8 +23,8 @@ #include "absl/status/status.h" #include "gtest/gtest.h" -#include "src/core/util/status_helper.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/status_helper.h" #include "test/core/test_util/test_config.h" namespace { diff --git a/test/core/transport/metadata_map_test.cc b/test/core/transport/metadata_map_test.cc index 9a7200150d8..fe46273e0b0 100644 --- a/test/core/transport/metadata_map_test.cc +++ b/test/core/transport/metadata_map_test.cc @@ -28,13 +28,13 @@ #include -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/tsi/alts/frame_protector/alts_frame_protector_test.cc b/test/core/tsi/alts/frame_protector/alts_frame_protector_test.cc index 38c76311389..5f15a1d5650 100644 --- a/test/core/tsi/alts/frame_protector/alts_frame_protector_test.cc +++ b/test/core/tsi/alts/frame_protector/alts_frame_protector_test.cc @@ -25,9 +25,9 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/tsi/alts/crypt/gsec.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/crash.h" #include "test/core/tsi/alts/crypt/gsec_test_util.h" #include "test/core/tsi/transport_security_test_lib.h" diff --git a/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc b/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc index 3f82d175627..b2febc12751 100644 --- a/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc +++ b/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc @@ -47,14 +47,14 @@ #include #include -#include "src/core/util/crash.h" -#include "src/core/util/host_port.h" -#include "src/core/util/thd.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/credentials/alts/alts_credentials.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/alts/alts_security_connector.h" #include "src/core/lib/slice/slice_string_helpers.h" +#include "src/core/util/crash.h" +#include "src/core/util/host_port.h" +#include "src/core/util/thd.h" #include "src/core/util/useful.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/fake_udp_and_tcp_server.h" diff --git a/test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc b/test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc index 95a6853b8c8..22c42030cb5 100644 --- a/test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc +++ b/test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc @@ -26,13 +26,13 @@ #include #include -#include "src/core/util/env.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/tsi/alts/handshaker/alts_shared_resource.h" #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h" #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h" #include "src/core/tsi/transport_security.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/env.h" #include "test/core/test_util/test_config.h" #include "test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.h" diff --git a/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc b/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc index 6bf8226e27a..3fb9cc715ec 100644 --- a/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc +++ b/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc @@ -28,12 +28,12 @@ #include #include -#include "src/core/util/thd.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/tsi/alts/handshaker/alts_handshaker_client.h" #include "src/core/tsi/alts/handshaker/alts_shared_resource.h" #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h" #include "src/core/tsi/transport_security_grpc.h" +#include "src/core/util/thd.h" #include "src/proto/grpc/gcp/altscontext.upb.h" #include "test/core/test_util/test_config.h" #include "test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.h" diff --git a/test/core/tsi/crl_ssl_transport_security_test.cc b/test/core/tsi/crl_ssl_transport_security_test.cc index 0fb733cd757..3bfac12af77 100644 --- a/test/core/tsi/crl_ssl_transport_security_test.cc +++ b/test/core/tsi/crl_ssl_transport_security_test.cc @@ -32,11 +32,11 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/tsi/ssl_transport_security.h" #include "src/core/tsi/transport_security.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" #include "test/core/tsi/transport_security_test_lib.h" diff --git a/test/core/tsi/fake_transport_security_test.cc b/test/core/tsi/fake_transport_security_test.cc index 9751ab11ebf..df0d8fbebcc 100644 --- a/test/core/tsi/fake_transport_security_test.cc +++ b/test/core/tsi/fake_transport_security_test.cc @@ -28,9 +28,9 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/tsi/transport_security.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" #include "test/core/tsi/transport_security_test_lib.h" diff --git a/test/core/tsi/ssl_transport_security_test.cc b/test/core/tsi/ssl_transport_security_test.cc index c4722cca2f6..228372d86b6 100644 --- a/test/core/tsi/ssl_transport_security_test.cc +++ b/test/core/tsi/ssl_transport_security_test.cc @@ -34,9 +34,9 @@ #include #include -#include "src/core/util/memory.h" #include "src/core/tsi/transport_security.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/memory.h" #include "test/core/test_util/build.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/tsi/ssl_transport_security_utils_test.cc b/test/core/tsi/ssl_transport_security_utils_test.cc index ab449f4ac2e..ac105c42fa5 100644 --- a/test/core/tsi/ssl_transport_security_utils_test.cc +++ b/test/core/tsi/ssl_transport_security_utils_test.cc @@ -34,10 +34,10 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" -#include "src/core/util/load_file.h" #include "src/core/lib/slice/slice.h" #include "src/core/tsi/transport_security.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/load_file.h" #include "test/core/test_util/test_config.h" #include "test/core/tsi/transport_security_test_lib.h" diff --git a/test/core/tsi/transport_security_test.cc b/test/core/tsi/transport_security_test.cc index 25e8782bd85..a0ff0488b93 100644 --- a/test/core/tsi/transport_security_test.cc +++ b/test/core/tsi/transport_security_test.cc @@ -31,9 +31,9 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/tsi/fake_transport_security.h" #include "src/core/tsi/ssl_transport_security.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" #include "src/core/util/useful.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/uri/uri_parser_test.cc b/test/core/uri/uri_parser_test.cc index 965d208ae7c..66d5c9bbd7b 100644 --- a/test/core/uri/uri_parser_test.cc +++ b/test/core/uri/uri_parser_test.cc @@ -14,8 +14,6 @@ // limitations under the License. // -#include "src/core/util/uri.h" - #include #include "absl/status/status.h" @@ -24,6 +22,7 @@ #include +#include "src/core/util/uri.h" #include "test/core/test_util/test_config.h" using ::testing::ContainerEq; diff --git a/test/core/xds/xds_audit_logger_registry_test.cc b/test/core/xds/xds_audit_logger_registry_test.cc index 0de9538e2f5..7c7f38772f5 100644 --- a/test/core/xds/xds_audit_logger_registry_test.cc +++ b/test/core/xds/xds_audit_logger_registry_test.cc @@ -36,8 +36,8 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/security/authorization/audit_logging.h" +#include "src/core/util/crash.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" diff --git a/test/core/xds/xds_bootstrap_test.cc b/test/core/xds/xds_bootstrap_test.cc index 392386dd1e1..2f9a212a281 100644 --- a/test/core/xds/xds_bootstrap_test.cc +++ b/test/core/xds/xds_bootstrap_test.cc @@ -36,17 +36,17 @@ #include #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/env.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/validation_errors.h" #include "src/core/lib/security/certificate_provider/certificate_provider_factory.h" #include "src/core/lib/security/credentials/channel_creds_registry.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" +#include "src/core/util/env.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" #include "src/core/util/json/json_reader.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/tmpfile.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/certificate_provider_store.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "test/core/test_util/scoped_env_var.h" diff --git a/test/core/xds/xds_certificate_provider_test.cc b/test/core/xds/xds_certificate_provider_test.cc index 505b24d61d1..a81e03421e8 100644 --- a/test/core/xds/xds_certificate_provider_test.cc +++ b/test/core/xds/xds_certificate_provider_test.cc @@ -25,9 +25,9 @@ #include -#include "src/core/util/status_helper.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/security_connector/ssl_utils.h" +#include "src/core/util/status_helper.h" #include "src/core/util/useful.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/xds/xds_client_test.cc b/test/core/xds/xds_client_test.cc index 48d997d0d60..fb0a60ff73e 100644 --- a/test/core/xds/xds_client_test.cc +++ b/test/core/xds/xds_client_test.cc @@ -49,13 +49,13 @@ #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/util/debug_location.h" -#include "src/core/util/match.h" -#include "src/core/util/sync.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/match.h" +#include "src/core/util/sync.h" #include "src/core/xds/xds_client/xds_bootstrap.h" #include "src/core/xds/xds_client/xds_resource_type_impl.h" #include "src/proto/grpc/testing/xds/v3/base.pb.h" diff --git a/test/core/xds/xds_cluster_resource_type_test.cc b/test/core/xds/xds_cluster_resource_type_test.cc index 1a0f833195f..a4fbe5c1f09 100644 --- a/test/core/xds/xds_cluster_resource_type_test.cc +++ b/test/core/xds/xds_cluster_resource_type_test.cc @@ -36,13 +36,13 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/util/crash.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/error.h" #include "src/core/load_balancing/outlier_detection/outlier_detection.h" +#include "src/core/util/crash.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_cluster.h" #include "src/core/xds/grpc/xds_common_types.h" diff --git a/test/core/xds/xds_common_types_test.cc b/test/core/xds/xds_common_types_test.cc index 08d50cc3240..097c006fef9 100644 --- a/test/core/xds/xds_common_types_test.cc +++ b/test/core/xds/xds_common_types_test.cc @@ -40,11 +40,11 @@ #include "src/core/lib/debug/trace.h" #include "src/core/util/crash.h" +#include "src/core/util/json/json_writer.h" +#include "src/core/util/matchers.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/time.h" #include "src/core/util/validation_errors.h" -#include "src/core/util/matchers.h" -#include "src/core/util/json/json_writer.h" #include "src/core/xds/grpc/upb_utils.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/xds_client/xds_bootstrap.h" diff --git a/test/core/xds/xds_endpoint_resource_type_test.cc b/test/core/xds/xds_endpoint_resource_type_test.cc index 457f2f49463..cf58abfa85a 100644 --- a/test/core/xds/xds_endpoint_resource_type_test.cc +++ b/test/core/xds/xds_endpoint_resource_type_test.cc @@ -38,11 +38,11 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/crash.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/crash.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_endpoint.h" #include "src/core/xds/grpc/xds_health_status.h" diff --git a/test/core/xds/xds_http_filters_test.cc b/test/core/xds/xds_http_filters_test.cc index 9c1d66f5b96..efaae89a3df 100644 --- a/test/core/xds/xds_http_filters_test.cc +++ b/test/core/xds/xds_http_filters_test.cc @@ -45,10 +45,10 @@ #include "src/core/ext/filters/rbac/rbac_service_config_parser.h" #include "src/core/ext/filters/stateful_session/stateful_session_filter.h" #include "src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h" -#include "src/core/util/crash.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/crash.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/xds_client/xds_client.h" #include "src/proto/grpc/testing/xds/v3/address.pb.h" diff --git a/test/core/xds/xds_lb_policy_registry_test.cc b/test/core/xds/xds_lb_policy_registry_test.cc index e8c8a7300bc..4e1d16cbd85 100644 --- a/test/core/xds/xds_lb_policy_registry_test.cc +++ b/test/core/xds/xds_lb_policy_registry_test.cc @@ -35,13 +35,13 @@ #include #include "src/core/lib/config/core_configuration.h" +#include "src/core/load_balancing/lb_policy.h" +#include "src/core/load_balancing/lb_policy_factory.h" #include "src/core/util/crash.h" +#include "src/core/util/json/json_writer.h" #include "src/core/util/orphanable.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/validation_errors.h" -#include "src/core/load_balancing/lb_policy.h" -#include "src/core/load_balancing/lb_policy_factory.h" -#include "src/core/util/json/json_writer.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/proto/grpc/testing/xds/v3/client_side_weighted_round_robin.pb.h" #include "src/proto/grpc/testing/xds/v3/cluster.pb.h" diff --git a/test/core/xds/xds_listener_resource_type_test.cc b/test/core/xds/xds_listener_resource_type_test.cc index 5b40a3565b3..8bcf9bd92cc 100644 --- a/test/core/xds/xds_listener_resource_type_test.cc +++ b/test/core/xds/xds_listener_resource_type_test.cc @@ -40,12 +40,12 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/debug/trace.h" -#include "src/core/util/crash.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/crash.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_listener.h" diff --git a/test/core/xds/xds_route_config_resource_type_test.cc b/test/core/xds/xds_route_config_resource_type_test.cc index 9de295bbad4..60af33fc162 100644 --- a/test/core/xds/xds_route_config_resource_type_test.cc +++ b/test/core/xds/xds_route_config_resource_type_test.cc @@ -45,12 +45,12 @@ #include "src/core/lib/channel/status_util.h" #include "src/core/lib/debug/trace.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/util/crash.h" +#include "src/core/util/json/json_writer.h" +#include "src/core/util/matchers.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/time.h" -#include "src/core/lib/iomgr/error.h" -#include "src/core/util/matchers.h" -#include "src/core/util/json/json_writer.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_route_config.h" #include "src/core/xds/xds_client/xds_bootstrap.h" diff --git a/test/core/xds/xds_transport_fake.cc b/test/core/xds/xds_transport_fake.cc index 5961765572d..b8ea78ff794 100644 --- a/test/core/xds/xds_transport_fake.cc +++ b/test/core/xds/xds_transport_fake.cc @@ -30,9 +30,9 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" +#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/util/orphanable.h" #include "src/core/util/ref_counted_ptr.h" -#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/xds/xds_client/xds_bootstrap.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc b/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc index 28cff12cec6..ed67a35090a 100644 --- a/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc +++ b/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc @@ -39,14 +39,14 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/util/crash.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/thd.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/load_balancing/grpclb/grpclb_balancer_addresses.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/fake/fake_resolver.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/crash.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/thd.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/common/time_jump_test.cc b/test/cpp/common/time_jump_test.cc index 1c90a1ed5d3..e1593a59daa 100644 --- a/test/cpp/common/time_jump_test.cc +++ b/test/cpp/common/time_jump_test.cc @@ -31,13 +31,13 @@ #include -#include "src/core/util/crash.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/iomgr/timer_manager.h" +#include "src/core/util/crash.h" +#include "src/core/util/sync.h" #include "test/core/test_util/test_config.h" extern char** environ; diff --git a/test/cpp/common/timer_test.cc b/test/cpp/common/timer_test.cc index 2a85feff04b..e3f2a31c1dd 100644 --- a/test/cpp/common/timer_test.cc +++ b/test/cpp/common/timer_test.cc @@ -25,12 +25,12 @@ #include -#include "src/core/util/crash.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/timer_manager.h" +#include "src/core/util/crash.h" +#include "src/core/util/time.h" #include "test/core/test_util/test_config.h" #ifdef GRPC_POSIX_SOCKET_EV diff --git a/test/cpp/end2end/async_end2end_test.cc b/test/cpp/end2end/async_end2end_test.cc index 04ad724b359..0f59bcab892 100644 --- a/test/cpp/end2end/async_end2end_test.cc +++ b/test/cpp/end2end/async_end2end_test.cc @@ -39,9 +39,9 @@ #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/config/config_vars.h" +#include "src/core/lib/iomgr/port.h" #include "src/core/util/crash.h" #include "src/core/util/debug_location.h" -#include "src/core/lib/iomgr/port.h" #include "src/proto/grpc/health/v1/health.grpc.pb.h" #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/end2end/cfstream_test.cc b/test/cpp/end2end/cfstream_test.cc index 8314e2e4ee7..c0139db761f 100644 --- a/test/cpp/end2end/cfstream_test.cc +++ b/test/cpp/end2end/cfstream_test.cc @@ -39,10 +39,10 @@ #include #include +#include "src/core/lib/iomgr/port.h" #include "src/core/util/backoff.h" #include "src/core/util/crash.h" #include "src/core/util/env.h" -#include "src/core/lib/iomgr/port.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/end2end/channelz_service_test.cc b/test/cpp/end2end/channelz_service_test.cc index 4e35c9f812e..708b4ff53f9 100644 --- a/test/cpp/end2end/channelz_service_test.cc +++ b/test/cpp/end2end/channelz_service_test.cc @@ -36,10 +36,10 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/util/env.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" #include "src/core/lib/security/security_connector/ssl_utils.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/env.h" #include "src/cpp/client/secure_credentials.h" #include "src/proto/grpc/channelz/channelz.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/end2end/client_callback_end2end_test.cc b/test/cpp/end2end/client_callback_end2end_test.cc index ac091c26d12..fefcc81a976 100644 --- a/test/cpp/end2end/client_callback_end2end_test.cc +++ b/test/cpp/end2end/client_callback_end2end_test.cc @@ -39,8 +39,8 @@ #include #include -#include "src/core/util/env.h" #include "src/core/lib/iomgr/iomgr.h" +#include "src/core/util/env.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/end2end/client_lb_end2end_test.cc b/test/cpp/end2end/client_lb_end2end_test.cc index fe9a79a6380..886b0b207a2 100644 --- a/test/cpp/end2end/client_lb_end2end_test.cc +++ b/test/cpp/end2end/client_lb_end2end_test.cc @@ -55,15 +55,8 @@ #include "src/core/client_channel/global_subchannel_pool.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/util/backoff.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/util/crash.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/env.h" -#include "src/core/util/notification.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" #include "src/core/lib/transport/connectivity_state.h" @@ -72,6 +65,13 @@ #include "src/core/server/server.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/backoff.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/env.h" +#include "src/core/util/notification.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/cpp/server/secure_server_credentials.h" #include "src/proto/grpc/health/v1/health.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/end2end/connection_attempt_injector.cc b/test/cpp/end2end/connection_attempt_injector.cc index ef9668b87d0..a7b64bfcea3 100644 --- a/test/cpp/end2end/connection_attempt_injector.cc +++ b/test/cpp/end2end/connection_attempt_injector.cc @@ -23,8 +23,8 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/sync.h" // defined in tcp_client.cc extern grpc_tcp_client_vtable* grpc_tcp_client_impl; diff --git a/test/cpp/end2end/connection_attempt_injector.h b/test/cpp/end2end/connection_attempt_injector.h index b44ebbeee1c..4eb35d6850e 100644 --- a/test/cpp/end2end/connection_attempt_injector.h +++ b/test/cpp/end2end/connection_attempt_injector.h @@ -18,8 +18,8 @@ #include #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/tcp_client.h" +#include "src/core/util/time.h" namespace grpc { namespace testing { diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc index aaa02d52ad1..1bf43444442 100644 --- a/test/cpp/end2end/end2end_test.cc +++ b/test/cpp/end2end/end2end_test.cc @@ -44,10 +44,10 @@ #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/util/crash.h" -#include "src/core/util/env.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/security/credentials/credentials.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/end2end/grpclb_end2end_test.cc b/test/cpp/end2end/grpclb_end2end_test.cc index cbf6f80fe4e..ffb41cbb814 100644 --- a/test/cpp/end2end/grpclb_end2end_test.cc +++ b/test/cpp/end2end/grpclb_end2end_test.cc @@ -49,11 +49,6 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/util/crash.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/env.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" #include "src/core/load_balancing/grpclb/grpclb.h" @@ -61,6 +56,11 @@ #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/fake/fake_resolver.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/env.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" #include "src/cpp/server/secure_server_credentials.h" #include "src/proto/grpc/lb/v1/load_balancer.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/end2end/hybrid_end2end_test.cc b/test/cpp/end2end/hybrid_end2end_test.cc index f6e5d2ca29a..139dda2eb5d 100644 --- a/test/cpp/end2end/hybrid_end2end_test.cc +++ b/test/cpp/end2end/hybrid_end2end_test.cc @@ -33,8 +33,8 @@ #include #include -#include "src/core/util/env.h" #include "src/core/lib/iomgr/iomgr.h" +#include "src/core/util/env.h" #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/end2end/port_sharing_end2end_test.cc b/test/cpp/end2end/port_sharing_end2end_test.cc index 04b7931e7d3..decba5774b5 100644 --- a/test/cpp/end2end/port_sharing_end2end_test.cc +++ b/test/cpp/end2end/port_sharing_end2end_test.cc @@ -36,14 +36,14 @@ #include #include -#include "src/core/util/crash.h" -#include "src/core/util/env.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/tcp_server.h" #include "src/core/lib/security/credentials/credentials.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/end2end/raw_end2end_test.cc b/test/cpp/end2end/raw_end2end_test.cc index 39239483aad..40f83ed6a2e 100644 --- a/test/cpp/end2end/raw_end2end_test.cc +++ b/test/cpp/end2end/raw_end2end_test.cc @@ -35,9 +35,9 @@ #include #include +#include "src/core/lib/iomgr/port.h" #include "src/core/util/crash.h" #include "src/core/util/env.h" -#include "src/core/lib/iomgr/port.h" #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/end2end/resource_quota_end2end_stress_test.cc b/test/cpp/end2end/resource_quota_end2end_stress_test.cc index 011b115f7b3..9e4f18e083e 100644 --- a/test/cpp/end2end/resource_quota_end2end_stress_test.cc +++ b/test/cpp/end2end/resource_quota_end2end_stress_test.cc @@ -32,8 +32,8 @@ #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/experiments/config.h" -#include "src/core/util/notification.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" +#include "src/core/util/notification.h" #include "src/cpp/server/secure_server_credentials.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/end2end/rls_end2end_test.cc b/test/cpp/end2end/rls_end2end_test.cc index 353f9fae9fa..5237afae904 100644 --- a/test/cpp/end2end/rls_end2end_test.cc +++ b/test/cpp/end2end/rls_end2end_test.cc @@ -46,15 +46,15 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/util/env.h" -#include "src/core/util/host_port.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" -#include "src/core/util/uri.h" #include "src/core/load_balancing/rls/rls.h" #include "src/core/resolver/fake/fake_resolver.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/env.h" +#include "src/core/util/host_port.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" #include "src/cpp/server/secure_server_credentials.h" #include "src/proto/grpc/lookup/v1/rls.grpc.pb.h" #include "src/proto/grpc/lookup/v1/rls.pb.h" diff --git a/test/cpp/end2end/service_config_end2end_test.cc b/test/cpp/end2end/service_config_end2end_test.cc index 0ed4472ec10..6ff1835aa2f 100644 --- a/test/cpp/end2end/service_config_end2end_test.cc +++ b/test/cpp/end2end/service_config_end2end_test.cc @@ -48,18 +48,18 @@ #include "src/core/client_channel/backup_poller.h" #include "src/core/client_channel/global_subchannel_pool.h" #include "src/core/lib/address_utils/parse_address.h" -#include "src/core/util/backoff.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/util/crash.h" -#include "src/core/util/debug_location.h" -#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" #include "src/core/lib/transport/error_utils.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/fake/fake_resolver.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/backoff.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/cpp/server/secure_server_credentials.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/end2end/thread_stress_test.cc b/test/cpp/end2end/thread_stress_test.cc index f808668617a..0af6a0d0f49 100644 --- a/test/cpp/end2end/thread_stress_test.cc +++ b/test/cpp/end2end/thread_stress_test.cc @@ -35,8 +35,8 @@ #include #include -#include "src/core/util/env.h" #include "src/core/lib/surface/api_trace.h" +#include "src/core/util/env.h" #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/end2end/time_change_test.cc b/test/cpp/end2end/time_change_test.cc index e6cd0acf3d7..173318674b8 100644 --- a/test/cpp/end2end/time_change_test.cc +++ b/test/cpp/end2end/time_change_test.cc @@ -35,8 +35,8 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/timer.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc b/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc index ce188e7546d..8bde4dd29a0 100644 --- a/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc @@ -28,10 +28,10 @@ #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/util/env.h" #include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/fake/fake_resolver.h" +#include "src/core/util/env.h" #include "src/proto/grpc/testing/xds/v3/aggregate_cluster.grpc.pb.h" #include "test/core/test_util/resolve_localhost_ip46.h" #include "test/core/test_util/scoped_env_var.h" diff --git a/test/cpp/end2end/xds/xds_end2end_test.cc b/test/cpp/end2end/xds/xds_end2end_test.cc index 7b7a189a362..29f8161900f 100644 --- a/test/cpp/end2end/xds/xds_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_end2end_test.cc @@ -63,12 +63,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/crash.h" -#include "src/core/util/env.h" -#include "src/core/util/ref_counted_ptr.h" -#include "src/core/util/sync.h" -#include "src/core/util/time.h" -#include "src/core/util/time_util.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/security/authorization/audit_logging.h" #include "src/core/lib/security/certificate_provider/certificate_provider_registry.h" @@ -77,8 +71,14 @@ #include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/fake/fake_resolver.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/string.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #include "src/core/util/time_precise.h" +#include "src/core/util/time_util.h" #include "src/core/util/tmpfile.h" #include "src/core/xds/grpc/xds_listener.h" #include "src/core/xds/xds_client/xds_api.h" diff --git a/test/cpp/end2end/xds/xds_end2end_test_lib.cc b/test/cpp/end2end/xds/xds_end2end_test_lib.cc index 6364b4c9ed9..f9c22b25b26 100644 --- a/test/cpp/end2end/xds/xds_end2end_test_lib.cc +++ b/test/cpp/end2end/xds/xds_end2end_test_lib.cc @@ -38,8 +38,8 @@ #include #include "src/core/ext/filters/http/server/http_server_filter.h" -#include "src/core/util/env.h" #include "src/core/server/server.h" +#include "src/core/util/env.h" #include "src/core/util/tmpfile.h" #include "src/core/xds/grpc/xds_client_grpc.h" #include "src/core/xds/xds_client/xds_channel_args.h" diff --git a/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc b/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc index a9aad60e9f1..f0d6796691d 100644 --- a/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc @@ -32,9 +32,9 @@ #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/util/env.h" #include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/core/resolver/fake/fake_resolver.h" +#include "src/core/util/env.h" #include "src/proto/grpc/testing/xds/v3/cluster.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/pick_first.pb.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc b/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc index 9ba4f7be669..4ba42520f9b 100644 --- a/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc @@ -29,9 +29,9 @@ #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/util/env.h" #include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/core/resolver/fake/fake_resolver.h" +#include "src/core/util/env.h" #include "src/proto/grpc/testing/xds/v3/aggregate_cluster.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/cluster.grpc.pb.h" #include "test/core/test_util/resolve_localhost_ip46.h" diff --git a/test/cpp/end2end/xds/xds_utils.cc b/test/cpp/end2end/xds/xds_utils.cc index bfb36413d61..a092dc82cea 100644 --- a/test/cpp/end2end/xds/xds_utils.cc +++ b/test/cpp/end2end/xds/xds_utils.cc @@ -34,8 +34,8 @@ #include #include "src/core/ext/filters/http/server/http_server_filter.h" -#include "src/core/util/env.h" #include "src/core/server/server.h" +#include "src/core/util/env.h" #include "src/core/util/tmpfile.h" #include "src/core/xds/grpc/xds_client_grpc.h" #include "src/core/xds/xds_client/xds_channel_args.h" diff --git a/test/cpp/ext/csm/metadata_exchange_test.cc b/test/cpp/ext/csm/metadata_exchange_test.cc index a67f618d5f7..1b85eaf185a 100644 --- a/test/cpp/ext/csm/metadata_exchange_test.cc +++ b/test/cpp/ext/csm/metadata_exchange_test.cc @@ -30,8 +30,8 @@ #include #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/env.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/env.h" #include "src/core/util/tmpfile.h" #include "src/cpp/ext/csm/csm_observability.h" #include "src/cpp/ext/otel/otel_plugin.h" diff --git a/test/cpp/ext/otel/otel_test_library.cc b/test/cpp/ext/otel/otel_test_library.cc index c55202c09ac..f6d5c155cd3 100644 --- a/test/cpp/ext/otel/otel_test_library.cc +++ b/test/cpp/ext/otel/otel_test_library.cc @@ -32,8 +32,8 @@ #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/notification.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/notification.h" #include "test/core/test_util/fake_stats_plugin.h" #include "test/core/test_util/test_config.h" #include "test/cpp/end2end/test_service_impl.h" diff --git a/test/cpp/interop/grpclb_fallback_test.cc b/test/cpp/interop/grpclb_fallback_test.cc index b5e57aaa623..7d3c637fee2 100644 --- a/test/cpp/interop/grpclb_fallback_test.cc +++ b/test/cpp/interop/grpclb_fallback_test.cc @@ -43,9 +43,9 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/socket_mutator.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" #include "src/proto/grpc/testing/empty.pb.h" #include "src/proto/grpc/testing/messages.pb.h" diff --git a/test/cpp/interop/interop_server.cc b/test/cpp/interop/interop_server.cc index a68817d2d8d..25f5f633bfc 100644 --- a/test/cpp/interop/interop_server.cc +++ b/test/cpp/interop/interop_server.cc @@ -36,8 +36,8 @@ #include #include "src/core/util/crash.h" -#include "src/core/util/sync.h" #include "src/core/util/string.h" +#include "src/core/util/sync.h" #include "src/proto/grpc/testing/empty.pb.h" #include "src/proto/grpc/testing/messages.pb.h" #include "src/proto/grpc/testing/test.grpc.pb.h" diff --git a/test/cpp/interop/interop_test.cc b/test/cpp/interop/interop_test.cc index 385bcf7bd1f..1134971371d 100644 --- a/test/cpp/interop/interop_test.cc +++ b/test/cpp/interop/interop_test.cc @@ -34,8 +34,8 @@ #include -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/socket_utils_posix.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" #include "test/core/test_util/port.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/interop/istio_echo_server.cc b/test/cpp/interop/istio_echo_server.cc index c34ac281d78..bb24edcae46 100644 --- a/test/cpp/interop/istio_echo_server.cc +++ b/test/cpp/interop/istio_echo_server.cc @@ -46,8 +46,8 @@ #include "src/core/lib/channel/status_util.h" #include "src/core/util/env.h" -#include "src/core/util/host_port.h" #include "src/core/util/gethostname.h" +#include "src/core/util/host_port.h" #include "src/proto/grpc/testing/istio_echo.pb.h" #include "test/core/test_util/test_config.h" #include "test/cpp/interop/istio_echo_server_lib.h" diff --git a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc index f53e0bb99a1..53aa397b0be 100644 --- a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc +++ b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc @@ -34,13 +34,13 @@ #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" -#include "src/core/util/crash.h" -#include "src/core/util/time.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/timeout_encoding.h" +#include "src/core/util/crash.h" +#include "src/core/util/time.h" #include "test/core/test_util/test_config.h" #include "test/cpp/microbenchmarks/helpers.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/microbenchmarks/bm_cq.cc b/test/cpp/microbenchmarks/bm_cq.cc index bc3207006de..aa6505e03bb 100644 --- a/test/cpp/microbenchmarks/bm_cq.cc +++ b/test/cpp/microbenchmarks/bm_cq.cc @@ -28,9 +28,9 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/completion_queue.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" #include "test/cpp/microbenchmarks/helpers.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc b/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc index 7b4c08691f4..f504af9f5fe 100644 --- a/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc +++ b/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc @@ -28,11 +28,11 @@ #include #include -#include "src/core/util/crash.h" -#include "src/core/util/time.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/surface/completion_queue.h" +#include "src/core/util/crash.h" +#include "src/core/util/time.h" #include "test/core/test_util/test_config.h" #include "test/cpp/microbenchmarks/helpers.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/microbenchmarks/bm_exec_ctx.cc b/test/cpp/microbenchmarks/bm_exec_ctx.cc index 2c4b374aef0..4a464856764 100644 --- a/test/cpp/microbenchmarks/bm_exec_ctx.cc +++ b/test/cpp/microbenchmarks/bm_exec_ctx.cc @@ -19,8 +19,8 @@ #include -#include "src/core/util/notification.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/notification.h" #include "test/core/test_util/test_config.h" #include "test/cpp/microbenchmarks/helpers.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/microbenchmarks/bm_huffman_decode.cc b/test/cpp/microbenchmarks/bm_huffman_decode.cc index 50122d6b773..59a684f1298 100644 --- a/test/cpp/microbenchmarks/bm_huffman_decode.cc +++ b/test/cpp/microbenchmarks/bm_huffman_decode.cc @@ -21,8 +21,8 @@ #include "src/core/ext/transport/chttp2/transport/bin_encoder.h" #include "src/core/ext/transport/chttp2/transport/decode_huff.h" -#include "src/core/util/no_destruct.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/no_destruct.h" #include "test/core/test_util/test_config.h" #include "test/cpp/microbenchmarks/huffman_geometries/index.h" diff --git a/test/cpp/microbenchmarks/fullstack_fixtures.h b/test/cpp/microbenchmarks/fullstack_fixtures.h index 7515059cb2a..ed4075f60e5 100644 --- a/test/cpp/microbenchmarks/fullstack_fixtures.h +++ b/test/cpp/microbenchmarks/fullstack_fixtures.h @@ -34,7 +34,6 @@ #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/endpoint_pair.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -43,6 +42,7 @@ #include "src/core/lib/surface/channel_create.h" #include "src/core/lib/surface/completion_queue.h" #include "src/core/server/server.h" +#include "src/core/util/crash.h" #include "src/cpp/client/create_channel_internal.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/naming/address_sorting_test.cc b/test/cpp/naming/address_sorting_test.cc index 223b8e8cdac..e1fa4111ed6 100644 --- a/test/cpp/naming/address_sorting_test.cc +++ b/test/cpp/naming/address_sorting_test.cc @@ -37,8 +37,6 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/util/crash.h" -#include "src/core/util/host_port.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr.h" @@ -47,6 +45,8 @@ #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_registry.h" +#include "src/core/util/crash.h" +#include "src/core/util/host_port.h" #include "src/core/util/string.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/naming/cancel_ares_query_test.cc b/test/cpp/naming/cancel_ares_query_test.cc index 3fe3f73fbc8..e5290f1a2f6 100644 --- a/test/cpp/naming/cancel_ares_query_test.cc +++ b/test/cpp/naming/cancel_ares_query_test.cc @@ -41,10 +41,6 @@ #include "src/core/lib/event_engine/ares_resolver.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/crash.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/thd.h" -#include "src/core/util/work_serializer.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/iomgr/pollset_set.h" @@ -53,7 +49,11 @@ #include "src/core/resolver/resolver_registry.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/crash.h" +#include "src/core/util/orphanable.h" #include "src/core/util/string.h" +#include "src/core/util/thd.h" +#include "src/core/util/work_serializer.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/cmdline.h" #include "test/core/test_util/fake_udp_and_tcp_server.h" diff --git a/test/cpp/naming/resolver_component_test.cc b/test/cpp/naming/resolver_component_test.cc index e80bb03a700..f5a4984e98c 100644 --- a/test/cpp/naming/resolver_component_test.cc +++ b/test/cpp/naming/resolver_component_test.cc @@ -48,10 +48,6 @@ #include "src/core/lib/event_engine/ares_resolver.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/util/crash.h" -#include "src/core/util/host_port.h" -#include "src/core/util/orphanable.h" -#include "src/core/util/work_serializer.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/resolve_address.h" @@ -61,7 +57,11 @@ #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_registry.h" +#include "src/core/util/crash.h" +#include "src/core/util/host_port.h" +#include "src/core/util/orphanable.h" #include "src/core/util/string.h" +#include "src/core/util/work_serializer.h" #include "test/core/test_util/fake_udp_and_tcp_server.h" #include "test/core/test_util/port.h" #include "test/core/test_util/socket_use_after_close_detector.h" diff --git a/test/cpp/performance/writes_per_rpc_test.cc b/test/cpp/performance/writes_per_rpc_test.cc index c2be69c9559..e67e4ae015d 100644 --- a/test/cpp/performance/writes_per_rpc_test.cc +++ b/test/cpp/performance/writes_per_rpc_test.cc @@ -37,7 +37,6 @@ #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/util/notification.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -45,6 +44,7 @@ #include "src/core/lib/surface/channel_create.h" #include "src/core/server/server.h" #include "src/core/telemetry/stats.h" +#include "src/core/util/notification.h" #include "src/cpp/client/create_channel_internal.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" diff --git a/test/cpp/qps/client_async.cc b/test/cpp/qps/client_async.cc index 5a37c8fb421..889d935f989 100644 --- a/test/cpp/qps/client_async.cc +++ b/test/cpp/qps/client_async.cc @@ -38,8 +38,8 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/surface/completion_queue.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" #include "test/cpp/qps/client.h" #include "test/cpp/qps/usage_timer.h" diff --git a/test/cpp/qps/server_async.cc b/test/cpp/qps/server_async.cc index cbc843998af..2d088b882cf 100644 --- a/test/cpp/qps/server_async.cc +++ b/test/cpp/qps/server_async.cc @@ -35,9 +35,9 @@ #include #include +#include "src/core/lib/surface/completion_queue.h" #include "src/core/util/crash.h" #include "src/core/util/host_port.h" -#include "src/core/lib/surface/completion_queue.h" #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" #include "test/core/test_util/test_config.h" #include "test/cpp/qps/qps_server_builder.h" diff --git a/test/cpp/util/channel_trace_proto_helper.cc b/test/cpp/util/channel_trace_proto_helper.cc index 1f057f3d696..d2843f595fd 100644 --- a/test/cpp/util/channel_trace_proto_helper.cc +++ b/test/cpp/util/channel_trace_proto_helper.cc @@ -26,8 +26,8 @@ #include #include -#include "src/core/util/crash.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/crash.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/json/json_writer.h" diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index 8e4eb7f263a..80da2de1038 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -2095,10 +2095,6 @@ src/core/lib/address_utils/parse_address.cc \ src/core/lib/address_utils/parse_address.h \ src/core/lib/address_utils/sockaddr_utils.cc \ src/core/lib/address_utils/sockaddr_utils.h \ -src/core/util/backoff.cc \ -src/core/util/backoff.h \ -src/core/util/random_early_detection.cc \ -src/core/util/random_early_detection.h \ src/core/lib/channel/call_finalization.h \ src/core/lib/channel/channel_args.cc \ src/core/lib/channel/channel_args.h \ @@ -2132,8 +2128,6 @@ src/core/lib/config/core_configuration.cc \ src/core/lib/config/core_configuration.h \ src/core/lib/config/load_config.cc \ src/core/lib/config/load_config.h \ -src/core/util/event_log.cc \ -src/core/util/event_log.h \ src/core/lib/debug/trace.cc \ src/core/lib/debug/trace.h \ src/core/lib/event_engine/ares_resolver.cc \ @@ -2252,81 +2246,6 @@ src/core/lib/experiments/config.cc \ src/core/lib/experiments/config.h \ src/core/lib/experiments/experiments.cc \ src/core/lib/experiments/experiments.h \ -src/core/util/atomic_utils.h \ -src/core/util/bitset.h \ -src/core/util/chunked_vector.h \ -src/core/util/construct_destruct.h \ -src/core/util/cpp_impl_of.h \ -src/core/util/crash.cc \ -src/core/util/crash.h \ -src/core/util/debug_location.h \ -src/core/util/directory_reader.h \ -src/core/util/down_cast.h \ -src/core/util/dual_ref_counted.h \ -src/core/util/dump_args.cc \ -src/core/util/dump_args.h \ -src/core/util/env.h \ -src/core/util/examine_stack.cc \ -src/core/util/examine_stack.h \ -src/core/util/fork.cc \ -src/core/util/fork.h \ -src/core/util/host_port.cc \ -src/core/util/host_port.h \ -src/core/util/if_list.h \ -src/core/util/linux/env.cc \ -src/core/util/load_file.cc \ -src/core/util/load_file.h \ -src/core/util/manual_constructor.h \ -src/core/util/match.h \ -src/core/util/memory.h \ -src/core/util/mpscq.cc \ -src/core/util/mpscq.h \ -src/core/util/no_destruct.h \ -src/core/util/notification.h \ -src/core/util/orphanable.h \ -src/core/util/overload.h \ -src/core/util/packed_table.h \ -src/core/util/per_cpu.cc \ -src/core/util/per_cpu.h \ -src/core/util/posix/directory_reader.cc \ -src/core/util/posix/env.cc \ -src/core/util/posix/stat.cc \ -src/core/util/posix/thd.cc \ -src/core/util/ref_counted.h \ -src/core/util/ref_counted_ptr.h \ -src/core/util/ref_counted_string.cc \ -src/core/util/ref_counted_string.h \ -src/core/util/single_set_ptr.h \ -src/core/util/sorted_pack.h \ -src/core/util/stat.h \ -src/core/util/status_helper.cc \ -src/core/util/status_helper.h \ -src/core/util/strerror.cc \ -src/core/util/strerror.h \ -src/core/util/sync.h \ -src/core/util/table.h \ -src/core/util/tchar.cc \ -src/core/util/tchar.h \ -src/core/util/thd.h \ -src/core/util/time.cc \ -src/core/util/time.h \ -src/core/util/time_averaged_stats.cc \ -src/core/util/time_averaged_stats.h \ -src/core/util/time_util.cc \ -src/core/util/time_util.h \ -src/core/util/type_list.h \ -src/core/util/unique_type_name.h \ -src/core/util/uuid_v4.cc \ -src/core/util/uuid_v4.h \ -src/core/util/validation_errors.cc \ -src/core/util/validation_errors.h \ -src/core/util/windows/directory_reader.cc \ -src/core/util/windows/env.cc \ -src/core/util/windows/stat.cc \ -src/core/util/windows/thd.cc \ -src/core/util/work_serializer.cc \ -src/core/util/work_serializer.h \ -src/core/util/xxhash_inline.h \ src/core/lib/iomgr/block_annotate.h \ src/core/lib/iomgr/buffer_list.cc \ src/core/lib/iomgr/buffer_list.h \ @@ -2372,13 +2291,6 @@ src/core/lib/iomgr/executor.cc \ src/core/lib/iomgr/executor.h \ src/core/lib/iomgr/fork_posix.cc \ src/core/lib/iomgr/fork_windows.cc \ -src/core/util/gethostname.h \ -src/core/util/gethostname_fallback.cc \ -src/core/util/gethostname_host_name_max.cc \ -src/core/util/gethostname_sysconf.cc \ -src/core/util/grpc_if_nametoindex.h \ -src/core/util/grpc_if_nametoindex_posix.cc \ -src/core/util/grpc_if_nametoindex_unsupported.cc \ src/core/lib/iomgr/internal_errqueue.cc \ src/core/lib/iomgr/internal_errqueue.h \ src/core/lib/iomgr/iocp_windows.cc \ @@ -2469,8 +2381,6 @@ src/core/lib/iomgr/wakeup_fd_pipe.cc \ src/core/lib/iomgr/wakeup_fd_pipe.h \ src/core/lib/iomgr/wakeup_fd_posix.cc \ src/core/lib/iomgr/wakeup_fd_posix.h \ -src/core/util/matchers.cc \ -src/core/util/matchers.h \ src/core/lib/promise/activity.cc \ src/core/lib/promise/activity.h \ src/core/lib/promise/all_ok.h \ @@ -2729,8 +2639,6 @@ src/core/lib/transport/transport.cc \ src/core/lib/transport/transport.h \ src/core/lib/transport/transport_fwd.h \ src/core/lib/transport/transport_op_string.cc \ -src/core/util/uri.cc \ -src/core/util/uri.h \ src/core/load_balancing/address_filtering.cc \ src/core/load_balancing/address_filtering.h \ src/core/load_balancing/backend_metric_data.h \ @@ -2916,7 +2824,39 @@ src/core/util/alloc.cc \ src/core/util/alloc.h \ src/core/util/android/log.cc \ src/core/util/atm.cc \ +src/core/util/atomic_utils.h \ src/core/util/avl.h \ +src/core/util/backoff.cc \ +src/core/util/backoff.h \ +src/core/util/bitset.h \ +src/core/util/chunked_vector.h \ +src/core/util/construct_destruct.h \ +src/core/util/cpp_impl_of.h \ +src/core/util/crash.cc \ +src/core/util/crash.h \ +src/core/util/debug_location.h \ +src/core/util/directory_reader.h \ +src/core/util/down_cast.h \ +src/core/util/dual_ref_counted.h \ +src/core/util/dump_args.cc \ +src/core/util/dump_args.h \ +src/core/util/env.h \ +src/core/util/event_log.cc \ +src/core/util/event_log.h \ +src/core/util/examine_stack.cc \ +src/core/util/examine_stack.h \ +src/core/util/fork.cc \ +src/core/util/fork.h \ +src/core/util/gethostname.h \ +src/core/util/gethostname_fallback.cc \ +src/core/util/gethostname_host_name_max.cc \ +src/core/util/gethostname_sysconf.cc \ +src/core/util/gpr_time.cc \ +src/core/util/grpc_if_nametoindex.h \ +src/core/util/grpc_if_nametoindex_posix.cc \ +src/core/util/grpc_if_nametoindex_unsupported.cc \ +src/core/util/host_port.cc \ +src/core/util/host_port.h \ src/core/util/http_client/format_request.cc \ src/core/util/http_client/format_request.h \ src/core/util/http_client/httpcli.cc \ @@ -2925,6 +2865,7 @@ src/core/util/http_client/httpcli_security_connector.cc \ src/core/util/http_client/httpcli_ssl_credentials.h \ src/core/util/http_client/parser.cc \ src/core/util/http_client/parser.h \ +src/core/util/if_list.h \ src/core/util/iphone/cpu.cc \ src/core/util/json/json.h \ src/core/util/json/json_args.h \ @@ -2938,32 +2879,91 @@ src/core/util/json/json_util.h \ src/core/util/json/json_writer.cc \ src/core/util/json/json_writer.h \ src/core/util/linux/cpu.cc \ +src/core/util/linux/env.cc \ src/core/util/linux/log.cc \ +src/core/util/load_file.cc \ +src/core/util/load_file.h \ src/core/util/log.cc \ +src/core/util/manual_constructor.h \ +src/core/util/match.h \ +src/core/util/matchers.cc \ +src/core/util/matchers.h \ +src/core/util/memory.h \ +src/core/util/mpscq.cc \ +src/core/util/mpscq.h \ src/core/util/msys/tmpfile.cc \ +src/core/util/no_destruct.h \ +src/core/util/notification.h \ +src/core/util/orphanable.h \ +src/core/util/overload.h \ +src/core/util/packed_table.h \ +src/core/util/per_cpu.cc \ +src/core/util/per_cpu.h \ src/core/util/posix/cpu.cc \ +src/core/util/posix/directory_reader.cc \ +src/core/util/posix/env.cc \ src/core/util/posix/log.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/random_early_detection.cc \ +src/core/util/random_early_detection.h \ +src/core/util/ref_counted.h \ +src/core/util/ref_counted_ptr.h \ +src/core/util/ref_counted_string.cc \ +src/core/util/ref_counted_string.h \ +src/core/util/single_set_ptr.h \ +src/core/util/sorted_pack.h \ src/core/util/spinlock.h \ +src/core/util/stat.h \ +src/core/util/status_helper.cc \ +src/core/util/status_helper.h \ +src/core/util/strerror.cc \ +src/core/util/strerror.h \ src/core/util/string.cc \ src/core/util/string.h \ src/core/util/sync.cc \ +src/core/util/sync.h \ src/core/util/sync_abseil.cc \ +src/core/util/table.h \ +src/core/util/tchar.cc \ +src/core/util/tchar.h \ +src/core/util/thd.h \ src/core/util/time.cc \ +src/core/util/time.h \ +src/core/util/time_averaged_stats.cc \ +src/core/util/time_averaged_stats.h \ src/core/util/time_precise.cc \ src/core/util/time_precise.h \ +src/core/util/time_util.cc \ +src/core/util/time_util.h \ src/core/util/tmpfile.h \ +src/core/util/type_list.h \ +src/core/util/unique_type_name.h \ +src/core/util/uri.cc \ +src/core/util/uri.h \ src/core/util/useful.h \ +src/core/util/uuid_v4.cc \ +src/core/util/uuid_v4.h \ +src/core/util/validation_errors.cc \ +src/core/util/validation_errors.h \ src/core/util/windows/cpu.cc \ +src/core/util/windows/directory_reader.cc \ +src/core/util/windows/env.cc \ src/core/util/windows/log.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 \ +src/core/util/work_serializer.cc \ +src/core/util/work_serializer.h \ +src/core/util/xxhash_inline.h \ src/core/xds/grpc/certificate_provider_store.cc \ src/core/xds/grpc/certificate_provider_store.h \ src/core/xds/grpc/file_watcher_certificate_provider_factory.cc \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 193f08c5207..32858ba82b1 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -1866,10 +1866,6 @@ src/core/lib/address_utils/parse_address.cc \ src/core/lib/address_utils/parse_address.h \ src/core/lib/address_utils/sockaddr_utils.cc \ src/core/lib/address_utils/sockaddr_utils.h \ -src/core/util/backoff.cc \ -src/core/util/backoff.h \ -src/core/util/random_early_detection.cc \ -src/core/util/random_early_detection.h \ src/core/lib/channel/README.md \ src/core/lib/channel/call_finalization.h \ src/core/lib/channel/channel_args.cc \ @@ -1904,8 +1900,6 @@ src/core/lib/config/core_configuration.cc \ src/core/lib/config/core_configuration.h \ src/core/lib/config/load_config.cc \ src/core/lib/config/load_config.h \ -src/core/util/event_log.cc \ -src/core/util/event_log.h \ src/core/lib/debug/trace.cc \ src/core/lib/debug/trace.h \ src/core/lib/event_engine/ares_resolver.cc \ @@ -2024,82 +2018,6 @@ src/core/lib/experiments/config.cc \ src/core/lib/experiments/config.h \ src/core/lib/experiments/experiments.cc \ src/core/lib/experiments/experiments.h \ -src/core/util/README.md \ -src/core/util/atomic_utils.h \ -src/core/util/bitset.h \ -src/core/util/chunked_vector.h \ -src/core/util/construct_destruct.h \ -src/core/util/cpp_impl_of.h \ -src/core/util/crash.cc \ -src/core/util/crash.h \ -src/core/util/debug_location.h \ -src/core/util/directory_reader.h \ -src/core/util/down_cast.h \ -src/core/util/dual_ref_counted.h \ -src/core/util/dump_args.cc \ -src/core/util/dump_args.h \ -src/core/util/env.h \ -src/core/util/examine_stack.cc \ -src/core/util/examine_stack.h \ -src/core/util/fork.cc \ -src/core/util/fork.h \ -src/core/util/host_port.cc \ -src/core/util/host_port.h \ -src/core/util/if_list.h \ -src/core/util/linux/env.cc \ -src/core/util/load_file.cc \ -src/core/util/load_file.h \ -src/core/util/manual_constructor.h \ -src/core/util/match.h \ -src/core/util/memory.h \ -src/core/util/mpscq.cc \ -src/core/util/mpscq.h \ -src/core/util/no_destruct.h \ -src/core/util/notification.h \ -src/core/util/orphanable.h \ -src/core/util/overload.h \ -src/core/util/packed_table.h \ -src/core/util/per_cpu.cc \ -src/core/util/per_cpu.h \ -src/core/util/posix/directory_reader.cc \ -src/core/util/posix/env.cc \ -src/core/util/posix/stat.cc \ -src/core/util/posix/thd.cc \ -src/core/util/ref_counted.h \ -src/core/util/ref_counted_ptr.h \ -src/core/util/ref_counted_string.cc \ -src/core/util/ref_counted_string.h \ -src/core/util/single_set_ptr.h \ -src/core/util/sorted_pack.h \ -src/core/util/stat.h \ -src/core/util/status_helper.cc \ -src/core/util/status_helper.h \ -src/core/util/strerror.cc \ -src/core/util/strerror.h \ -src/core/util/sync.h \ -src/core/util/table.h \ -src/core/util/tchar.cc \ -src/core/util/tchar.h \ -src/core/util/thd.h \ -src/core/util/time.cc \ -src/core/util/time.h \ -src/core/util/time_averaged_stats.cc \ -src/core/util/time_averaged_stats.h \ -src/core/util/time_util.cc \ -src/core/util/time_util.h \ -src/core/util/type_list.h \ -src/core/util/unique_type_name.h \ -src/core/util/uuid_v4.cc \ -src/core/util/uuid_v4.h \ -src/core/util/validation_errors.cc \ -src/core/util/validation_errors.h \ -src/core/util/windows/directory_reader.cc \ -src/core/util/windows/env.cc \ -src/core/util/windows/stat.cc \ -src/core/util/windows/thd.cc \ -src/core/util/work_serializer.cc \ -src/core/util/work_serializer.h \ -src/core/util/xxhash_inline.h \ src/core/lib/iomgr/README.md \ src/core/lib/iomgr/block_annotate.h \ src/core/lib/iomgr/buffer_list.cc \ @@ -2146,13 +2064,6 @@ src/core/lib/iomgr/executor.cc \ src/core/lib/iomgr/executor.h \ src/core/lib/iomgr/fork_posix.cc \ src/core/lib/iomgr/fork_windows.cc \ -src/core/util/gethostname.h \ -src/core/util/gethostname_fallback.cc \ -src/core/util/gethostname_host_name_max.cc \ -src/core/util/gethostname_sysconf.cc \ -src/core/util/grpc_if_nametoindex.h \ -src/core/util/grpc_if_nametoindex_posix.cc \ -src/core/util/grpc_if_nametoindex_unsupported.cc \ src/core/lib/iomgr/internal_errqueue.cc \ src/core/lib/iomgr/internal_errqueue.h \ src/core/lib/iomgr/iocp_windows.cc \ @@ -2243,8 +2154,6 @@ src/core/lib/iomgr/wakeup_fd_pipe.cc \ src/core/lib/iomgr/wakeup_fd_pipe.h \ src/core/lib/iomgr/wakeup_fd_posix.cc \ src/core/lib/iomgr/wakeup_fd_posix.h \ -src/core/util/matchers.cc \ -src/core/util/matchers.h \ src/core/lib/promise/activity.cc \ src/core/lib/promise/activity.h \ src/core/lib/promise/all_ok.h \ @@ -2505,8 +2414,6 @@ src/core/lib/transport/transport.cc \ src/core/lib/transport/transport.h \ src/core/lib/transport/transport_fwd.h \ src/core/lib/transport/transport_op_string.cc \ -src/core/util/uri.cc \ -src/core/util/uri.h \ src/core/load_balancing/address_filtering.cc \ src/core/load_balancing/address_filtering.h \ src/core/load_balancing/backend_metric_data.h \ @@ -2698,7 +2605,39 @@ src/core/util/alloc.cc \ src/core/util/alloc.h \ src/core/util/android/log.cc \ src/core/util/atm.cc \ +src/core/util/atomic_utils.h \ src/core/util/avl.h \ +src/core/util/backoff.cc \ +src/core/util/backoff.h \ +src/core/util/bitset.h \ +src/core/util/chunked_vector.h \ +src/core/util/construct_destruct.h \ +src/core/util/cpp_impl_of.h \ +src/core/util/crash.cc \ +src/core/util/crash.h \ +src/core/util/debug_location.h \ +src/core/util/directory_reader.h \ +src/core/util/down_cast.h \ +src/core/util/dual_ref_counted.h \ +src/core/util/dump_args.cc \ +src/core/util/dump_args.h \ +src/core/util/env.h \ +src/core/util/event_log.cc \ +src/core/util/event_log.h \ +src/core/util/examine_stack.cc \ +src/core/util/examine_stack.h \ +src/core/util/fork.cc \ +src/core/util/fork.h \ +src/core/util/gethostname.h \ +src/core/util/gethostname_fallback.cc \ +src/core/util/gethostname_host_name_max.cc \ +src/core/util/gethostname_sysconf.cc \ +src/core/util/gpr_time.cc \ +src/core/util/grpc_if_nametoindex.h \ +src/core/util/grpc_if_nametoindex_posix.cc \ +src/core/util/grpc_if_nametoindex_unsupported.cc \ +src/core/util/host_port.cc \ +src/core/util/host_port.h \ src/core/util/http_client/format_request.cc \ src/core/util/http_client/format_request.h \ src/core/util/http_client/httpcli.cc \ @@ -2707,6 +2646,7 @@ src/core/util/http_client/httpcli_security_connector.cc \ src/core/util/http_client/httpcli_ssl_credentials.h \ src/core/util/http_client/parser.cc \ src/core/util/http_client/parser.h \ +src/core/util/if_list.h \ src/core/util/iphone/cpu.cc \ src/core/util/json/json.h \ src/core/util/json/json_args.h \ @@ -2720,32 +2660,91 @@ src/core/util/json/json_util.h \ src/core/util/json/json_writer.cc \ src/core/util/json/json_writer.h \ src/core/util/linux/cpu.cc \ +src/core/util/linux/env.cc \ src/core/util/linux/log.cc \ +src/core/util/load_file.cc \ +src/core/util/load_file.h \ src/core/util/log.cc \ +src/core/util/manual_constructor.h \ +src/core/util/match.h \ +src/core/util/matchers.cc \ +src/core/util/matchers.h \ +src/core/util/memory.h \ +src/core/util/mpscq.cc \ +src/core/util/mpscq.h \ src/core/util/msys/tmpfile.cc \ +src/core/util/no_destruct.h \ +src/core/util/notification.h \ +src/core/util/orphanable.h \ +src/core/util/overload.h \ +src/core/util/packed_table.h \ +src/core/util/per_cpu.cc \ +src/core/util/per_cpu.h \ src/core/util/posix/cpu.cc \ +src/core/util/posix/directory_reader.cc \ +src/core/util/posix/env.cc \ src/core/util/posix/log.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/random_early_detection.cc \ +src/core/util/random_early_detection.h \ +src/core/util/ref_counted.h \ +src/core/util/ref_counted_ptr.h \ +src/core/util/ref_counted_string.cc \ +src/core/util/ref_counted_string.h \ +src/core/util/single_set_ptr.h \ +src/core/util/sorted_pack.h \ src/core/util/spinlock.h \ +src/core/util/stat.h \ +src/core/util/status_helper.cc \ +src/core/util/status_helper.h \ +src/core/util/strerror.cc \ +src/core/util/strerror.h \ src/core/util/string.cc \ src/core/util/string.h \ src/core/util/sync.cc \ +src/core/util/sync.h \ src/core/util/sync_abseil.cc \ +src/core/util/table.h \ +src/core/util/tchar.cc \ +src/core/util/tchar.h \ +src/core/util/thd.h \ src/core/util/time.cc \ +src/core/util/time.h \ +src/core/util/time_averaged_stats.cc \ +src/core/util/time_averaged_stats.h \ src/core/util/time_precise.cc \ src/core/util/time_precise.h \ +src/core/util/time_util.cc \ +src/core/util/time_util.h \ src/core/util/tmpfile.h \ +src/core/util/type_list.h \ +src/core/util/unique_type_name.h \ +src/core/util/uri.cc \ +src/core/util/uri.h \ src/core/util/useful.h \ +src/core/util/uuid_v4.cc \ +src/core/util/uuid_v4.h \ +src/core/util/validation_errors.cc \ +src/core/util/validation_errors.h \ src/core/util/windows/cpu.cc \ +src/core/util/windows/directory_reader.cc \ +src/core/util/windows/env.cc \ src/core/util/windows/log.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 \ +src/core/util/work_serializer.cc \ +src/core/util/work_serializer.h \ +src/core/util/xxhash_inline.h \ src/core/xds/grpc/certificate_provider_store.cc \ src/core/xds/grpc/certificate_provider_store.h \ src/core/xds/grpc/file_watcher_certificate_provider_factory.cc \