From 1f2a8860d527c3de551acf7dcc543871f431a15c Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Fri, 31 May 2024 22:34:25 +0000 Subject: [PATCH] move gprpp --- BUILD | 50 +- CMakeLists.txt | 164 ++-- Makefile | 54 +- Package.swift | 150 ++-- build_autogenerated.yaml | 768 +++++++++--------- config.m4 | 62 +- .../chttp2/hpack_encoder_timeout_test.cc | 2 +- gRPC-C++.podspec | 192 ++--- gRPC-Core.podspec | 246 +++--- grpc.gemspec | 150 ++-- grpc.gyp | 82 +- include/grpcpp/impl/sync.h | 4 +- package.xml | 150 ++-- src/core/BUILD | 102 +-- src/core/channelz/channel_trace.cc | 2 +- src/core/channelz/channel_trace.h | 4 +- src/core/channelz/channelz.h | 8 +- src/core/channelz/channelz_registry.cc | 2 +- src/core/channelz/channelz_registry.h | 4 +- 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 +- .../client_channel/global_subchannel_pool.h | 4 +- .../client_channel/local_subchannel_pool.h | 2 +- src/core/client_channel/retry_filter.cc | 2 +- src/core/client_channel/retry_filter.h | 2 +- .../retry_filter_legacy_call_data.cc | 14 +- .../retry_filter_legacy_call_data.h | 10 +- .../client_channel/retry_service_config.h | 4 +- src/core/client_channel/retry_throttle.h | 6 +- src/core/client_channel/subchannel.cc | 12 +- src/core/client_channel/subchannel.h | 18 +- .../subchannel_interface_internal.h | 2 +- .../subchannel_pool_interface.h | 4 +- .../subchannel_stream_client.cc | 8 +- .../client_channel/subchannel_stream_client.h | 6 +- .../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 | 4 +- src/core/ext/filters/logging/logging_sink.h | 2 +- .../message_size/message_size_filter.h | 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 | 6 +- src/core/ext/gcp/metadata_query.h | 4 +- .../transport/binder/client/channel_create.cc | 2 +- .../binder/client/connection_id_generator.h | 2 +- .../binder/client/endpoint_binder_pool.h | 2 +- .../ext/transport/binder/client/jni_utils.cc | 2 +- .../binder/client/security_policy_setting.h | 2 +- .../security_policy/binder_security_policy.cc | 2 +- .../binder/transport/binder_transport.cc | 2 +- .../binder/transport/binder_transport.h | 2 +- .../ext/transport/binder/utils/ndk_binder.cc | 4 +- .../utils/transport_stream_receiver_impl.cc | 2 +- .../utils/transport_stream_receiver_impl.h | 2 +- .../ext/transport/binder/wire_format/binder.h | 2 +- .../binder/wire_format/binder_android.cc | 4 +- .../binder/wire_format/transaction.h | 2 +- .../binder/wire_format/wire_reader.h | 2 +- .../binder/wire_format/wire_reader_impl.cc | 4 +- .../binder/wire_format/wire_reader_impl.h | 2 +- .../binder/wire_format/wire_writer.cc | 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 +- .../ext/transport/chaotic_good/frame_header.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 +- .../chaotic_good/settings_metadata.cc | 2 +- .../chttp2/client/chttp2_connector.cc | 10 +- .../chttp2/client/chttp2_connector.h | 4 +- .../transport/chttp2/server/chttp2_server.cc | 14 +- .../chttp2/transport/chttp2_transport.cc | 12 +- .../chttp2/transport/chttp2_transport.h | 4 +- .../transport/chttp2/transport/flow_control.h | 2 +- .../ext/transport/chttp2/transport/frame.cc | 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 | 6 +- .../chttp2/transport/hpack_parser.cc | 2 +- .../chttp2/transport/hpack_parser_table.h | 2 +- .../ext/transport/chttp2/transport/internal.h | 10 +- .../ext/transport/chttp2/transport/parsing.cc | 4 +- .../chttp2/transport/ping_abuse_policy.h | 2 +- .../chttp2/transport/ping_callbacks.h | 2 +- .../chttp2/transport/ping_rate_policy.cc | 2 +- .../chttp2/transport/ping_rate_policy.h | 2 +- .../chttp2/transport/stream_lists.cc | 2 +- .../chttp2/transport/write_size_policy.h | 2 +- .../ext/transport/chttp2/transport/writing.cc | 10 +- .../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 | 6 +- .../handshaker/security/secure_endpoint.cc | 6 +- .../security/security_handshaker.cc | 8 +- .../handshaker/security/security_handshaker.h | 2 +- src/core/handshaker/security/tsi_error.cc | 2 +- .../tcp_connect/tcp_connect_handshaker.cc | 6 +- src/core/lib/address_utils/parse_address.cc | 4 +- src/core/lib/address_utils/sockaddr_utils.cc | 4 +- src/core/lib/channel/channel_args.h | 12 +- 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 +- .../lib/channel/channel_stack_builder_impl.h | 2 +- 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.cc | 6 +- .../lib/compression/compression_internal.h | 2 +- src/core/lib/config/load_config.cc | 2 +- src/core/lib/event_engine/ares_resolver.cc | 8 +- src/core/lib/event_engine/ares_resolver.h | 4 +- .../lib/event_engine/cf_engine/cf_engine.cc | 2 +- .../lib/event_engine/cf_engine/cf_engine.h | 2 +- .../cf_engine/cfstream_endpoint.cc | 2 +- .../cf_engine/cfstream_endpoint.h | 6 +- .../cf_engine/dns_service_resolver.cc | 2 +- .../cf_engine/dns_service_resolver.h | 4 +- .../lib/event_engine/default_event_engine.cc | 6 +- .../lib/event_engine/default_event_engine.h | 2 +- src/core/lib/event_engine/grpc_polled_fd.h | 2 +- .../posix_engine/ev_epoll1_linux.cc | 10 +- .../posix_engine/ev_epoll1_linux.h | 2 +- .../posix_engine/ev_poll_posix.cc | 14 +- .../event_engine/posix_engine/ev_poll_posix.h | 2 +- .../event_poller_posix_default.cc | 2 +- .../posix_engine/grpc_polled_fd_posix.h | 2 +- .../posix_engine/internal_errqueue.cc | 2 +- .../posix_engine/lockfree_event.cc | 4 +- .../posix_engine/native_posix_dns_resolver.cc | 2 +- .../posix_engine/posix_endpoint.cc | 14 +- .../posix_engine/posix_endpoint.h | 6 +- .../event_engine/posix_engine/posix_engine.cc | 6 +- .../event_engine/posix_engine/posix_engine.h | 4 +- .../posix_engine/posix_engine_listener.cc | 6 +- .../posix_engine/posix_engine_listener.h | 4 +- .../posix_engine_listener_utils.cc | 4 +- .../posix_engine/tcp_socket_utils.cc | 8 +- .../posix_engine/tcp_socket_utils.h | 2 +- .../lib/event_engine/posix_engine/timer.cc | 2 +- .../lib/event_engine/posix_engine/timer.h | 6 +- .../event_engine/posix_engine/timer_manager.h | 6 +- .../posix_engine/traced_buffer_list.cc | 4 +- .../posix_engine/traced_buffer_list.h | 2 +- .../posix_engine/wakeup_fd_eventfd.cc | 6 +- .../posix_engine/wakeup_fd_pipe.cc | 4 +- .../ref_counted_dns_resolver_interface.h | 2 +- src/core/lib/event_engine/tcp_socket_utils.cc | 4 +- .../event_engine/thread_pool/thread_count.cc | 2 +- .../event_engine/thread_pool/thread_count.h | 4 +- .../thread_pool/thread_pool_factory.cc | 2 +- .../thread_pool/work_stealing_thread_pool.cc | 10 +- .../thread_pool/work_stealing_thread_pool.h | 6 +- .../thready_event_engine.cc | 4 +- src/core/lib/event_engine/utils.cc | 2 +- src/core/lib/event_engine/utils.h | 2 +- .../windows/grpc_polled_fd_windows.cc | 4 +- .../windows/grpc_polled_fd_windows.h | 2 +- src/core/lib/event_engine/windows/iocp.cc | 2 +- .../windows/native_windows_dns_resolver.cc | 4 +- .../lib/event_engine/windows/win_socket.cc | 4 +- .../lib/event_engine/windows/win_socket.h | 4 +- .../event_engine/windows/windows_endpoint.cc | 4 +- .../event_engine/windows/windows_engine.cc | 6 +- .../lib/event_engine/windows/windows_engine.h | 4 +- .../event_engine/windows/windows_listener.cc | 4 +- .../event_engine/windows/windows_listener.h | 2 +- .../work_queue/basic_work_queue.cc | 2 +- .../work_queue/basic_work_queue.h | 2 +- src/core/lib/experiments/config.cc | 4 +- src/core/lib/gprpp/.clang-format | 50 -- src/core/lib/gprpp/README.md | 8 - src/core/lib/gprpp/time.cc | 242 ------ src/core/lib/iomgr/buffer_list.cc | 4 +- 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 | 8 +- 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 | 4 +- src/core/lib/iomgr/error.h | 4 +- src/core/lib/iomgr/ev_apple.cc | 4 +- 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 | 8 +- 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/internal_errqueue.cc | 2 +- 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/polling_entity.cc | 2 +- src/core/lib/iomgr/pollset_windows.cc | 4 +- src/core/lib/iomgr/resolve_address.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 +- src/core/lib/iomgr/socket_mutator.cc | 2 +- .../lib/iomgr/socket_utils_common_posix.cc | 4 +- 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 | 8 +- 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 | 4 +- src/core/lib/iomgr/unix_sockets_posix.cc | 2 +- src/core/lib/iomgr/unix_sockets_posix_noop.cc | 2 +- src/core/lib/iomgr/vsock.cc | 2 +- src/core/lib/iomgr/wakeup_fd_eventfd.cc | 4 +- src/core/lib/iomgr/wakeup_fd_pipe.cc | 4 +- src/core/lib/promise/activity.cc | 2 +- src/core/lib/promise/activity.h | 8 +- src/core/lib/promise/arena_promise.h | 2 +- src/core/lib/promise/context.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 | 6 +- 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/poll.h | 2 +- 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 | 6 +- src/core/lib/resource_quota/memory_quota.cc | 2 +- src/core/lib/resource_quota/memory_quota.h | 8 +- src/core/lib/resource_quota/periodic_update.h | 2 +- src/core/lib/resource_quota/resource_quota.h | 6 +- src/core/lib/resource_quota/thread_quota.h | 6 +- .../security/authorization/audit_logging.cc | 2 +- .../security/authorization/audit_logging.h | 2 +- .../authorization/authorization_engine.h | 2 +- .../authorization_policy_provider.h | 4 +- .../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 +- .../certificate_provider_factory.h | 6 +- .../lib/security/context/security_context.cc | 2 +- .../lib/security/context/security_context.h | 6 +- .../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 | 6 +- .../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 | 2 +- .../aws_external_account_credentials.h | 4 +- .../external/external_account_credentials.cc | 2 +- .../external/external_account_credentials.h | 6 +- .../file_external_account_credentials.cc | 2 +- .../file_external_account_credentials.h | 2 +- .../url_external_account_credentials.h | 4 +- .../credentials/fake/fake_credentials.cc | 2 +- .../credentials/fake/fake_credentials.h | 4 +- .../google_default/credentials_generic.cc | 2 +- .../google_default_credentials.cc | 14 +- .../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 | 2 +- .../credentials/jwt/jwt_credentials.h | 4 +- .../security/credentials/jwt/jwt_verifier.cc | 6 +- .../security/credentials/jwt/jwt_verifier.h | 2 +- .../credentials/local/local_credentials.h | 4 +- .../credentials/oauth2/oauth2_credentials.cc | 8 +- .../credentials/oauth2/oauth2_credentials.h | 10 +- .../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 | 10 +- .../tls/grpc_tls_certificate_verifier.cc | 2 +- .../tls/grpc_tls_certificate_verifier.h | 6 +- .../tls/grpc_tls_credentials_options.cc | 2 +- .../tls/grpc_tls_credentials_options.h | 2 +- .../credentials/tls/grpc_tls_crl_provider.cc | 4 +- .../credentials/tls/grpc_tls_crl_provider.h | 6 +- .../credentials/tls/tls_credentials.h | 4 +- .../credentials/xds/xds_credentials.h | 4 +- .../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 | 4 +- .../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/percent_encoding.cc | 2 +- src/core/lib/slice/slice.cc | 2 +- src/core/lib/slice/slice.h | 2 +- src/core/lib/slice/slice_internal.h | 2 +- src/core/lib/slice/slice_refcount.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 | 4 +- 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 | 8 +- 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/bdp_estimator.h | 2 +- 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/connectivity_state.h | 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 | 4 +- .../load_balancing/child_policy_handler.cc | 2 +- .../load_balancing/child_policy_handler.h | 4 +- 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 | 18 +- .../grpclb/grpclb_client_stats.cc | 2 +- .../grpclb/grpclb_client_stats.h | 6 +- .../grpclb/load_balancer_api.cc | 2 +- .../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 | 10 +- src/core/load_balancing/lb_policy.h | 14 +- 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 | 10 +- .../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 | 22 +- .../load_balancing/round_robin/round_robin.cc | 8 +- .../load_balancing/subchannel_interface.h | 4 +- .../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 | 4 +- .../resolver/dns/c_ares/dns_resolver_ares.cc | 12 +- .../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 | 10 +- .../event_engine_client_channel_resolver.h | 2 +- .../dns/event_engine/service_config_helper.cc | 2 +- src/core/resolver/dns/native/dns_resolver.cc | 8 +- src/core/resolver/fake/fake_resolver.cc | 6 +- src/core/resolver/fake/fake_resolver.h | 8 +- .../google_c2p/google_c2p_resolver.cc | 12 +- src/core/resolver/polling_resolver.cc | 6 +- src/core/resolver/polling_resolver.h | 6 +- src/core/resolver/resolver.h | 4 +- src/core/resolver/resolver_factory.h | 2 +- src/core/resolver/resolver_registry.h | 2 +- .../resolver/sockaddr/sockaddr_resolver.cc | 2 +- .../resolver/xds/xds_dependency_manager.cc | 2 +- .../resolver/xds/xds_dependency_manager.h | 2 +- src/core/resolver/xds/xds_resolver.cc | 18 +- .../resolver/xds/xds_resolver_attributes.h | 2 +- src/core/server/server.cc | 10 +- src/core/server/server.h | 12 +- src/core/server/server_config_selector.h | 6 +- .../server/server_config_selector_filter.cc | 6 +- src/core/server/xds_channel_stack_modifier.h | 4 +- src/core/server/xds_server_config_fetcher.cc | 12 +- 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.cc | 2 +- src/core/telemetry/metrics.h | 6 +- src/core/telemetry/stats.h | 2 +- src/core/telemetry/stats_data.h | 2 +- .../frame_protector/alts_frame_protector.cc | 2 +- .../tsi/alts/frame_protector/frame_handler.cc | 4 +- .../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 +- .../transport_security_common_api.h | 2 +- ...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 +- .../tsi/ssl/key_logging/ssl_key_logging.h | 6 +- src/core/tsi/ssl/session_cache/ssl_session.h | 2 +- .../ssl/session_cache/ssl_session_cache.cc | 4 +- .../tsi/ssl/session_cache/ssl_session_cache.h | 8 +- .../ssl/session_cache/ssl_session_openssl.cc | 2 +- src/core/tsi/ssl_transport_security.cc | 2 +- src/core/util/README.md | 11 +- src/core/util/alloc.cc | 2 +- src/core/util/android/log.cc | 2 +- src/core/{lib/gprpp => util}/atomic_utils.h | 6 +- src/core/util/avl.h | 4 +- src/core/util/backoff.h | 2 +- src/core/{lib/gprpp => util}/bitset.h | 6 +- src/core/{lib/gprpp => util}/chunked_vector.h | 8 +- .../{lib/gprpp => util}/construct_destruct.h | 6 +- src/core/{lib/gprpp => util}/cpp_impl_of.h | 6 +- src/core/{lib/gprpp => util}/crash.cc | 2 +- src/core/{lib/gprpp => util}/crash.h | 8 +- src/core/{lib/gprpp => util}/debug_location.h | 6 +- .../{lib/gprpp => util}/directory_reader.h | 6 +- src/core/{lib/gprpp => util}/down_cast.h | 6 +- .../{lib/gprpp => util}/dual_ref_counted.h | 16 +- src/core/{lib/gprpp => util}/dump_args.cc | 2 +- src/core/{lib/gprpp => util}/dump_args.h | 6 +- src/core/{lib/gprpp => util}/env.h | 6 +- src/core/util/event_log.h | 4 +- src/core/{lib/gprpp => util}/examine_stack.cc | 2 +- src/core/{lib/gprpp => util}/examine_stack.h | 6 +- src/core/{lib/gprpp => util}/fork.cc | 4 +- src/core/{lib/gprpp => util}/fork.h | 6 +- src/core/util/gpr_time.cc | 271 ++++++ src/core/util/grpc_if_nametoindex_posix.cc | 2 +- .../util/grpc_if_nametoindex_unsupported.cc | 2 +- src/core/{lib/gprpp => util}/host_port.cc | 2 +- src/core/{lib/gprpp => util}/host_port.h | 6 +- src/core/util/http_client/httpcli.cc | 2 +- src/core/util/http_client/httpcli.h | 10 +- .../http_client/httpcli_security_connector.cc | 6 +- .../http_client/httpcli_ssl_credentials.h | 2 +- src/core/{lib/gprpp => util}/if_list.h | 6 +- src/core/util/json/json_object_loader.h | 8 +- 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/cpu.cc | 4 +- src/core/{lib/gprpp => util}/linux/env.cc | 2 +- src/core/util/linux/log.cc | 4 +- src/core/{lib/gprpp => util}/load_file.cc | 2 +- src/core/{lib/gprpp => util}/load_file.h | 6 +- src/core/util/log.cc | 2 +- .../{lib/gprpp => util}/manual_constructor.h | 8 +- src/core/{lib/gprpp => util}/match.h | 8 +- src/core/{lib/gprpp => util}/memory.h | 6 +- src/core/{lib/gprpp => util}/mpscq.cc | 2 +- src/core/{lib/gprpp => util}/mpscq.h | 8 +- src/core/util/msys/tmpfile.cc | 2 +- src/core/{lib/gprpp => util}/no_destruct.h | 8 +- src/core/{lib/gprpp => util}/notification.h | 8 +- src/core/{lib/gprpp => util}/orphanable.h | 14 +- src/core/{lib/gprpp => util}/overload.h | 6 +- src/core/{lib/gprpp => util}/packed_table.h | 10 +- src/core/{lib/gprpp => util}/per_cpu.cc | 2 +- src/core/{lib/gprpp => util}/per_cpu.h | 6 +- src/core/util/posix/cpu.cc | 2 +- .../gprpp => util}/posix/directory_reader.cc | 2 +- src/core/{lib/gprpp => util}/posix/env.cc | 2 +- src/core/util/posix/log.cc | 4 +- src/core/{lib/gprpp => util}/posix/stat.cc | 4 +- src/core/util/posix/sync.cc | 2 +- src/core/{lib/gprpp => util}/posix/thd.cc | 8 +- src/core/util/posix/time.cc | 2 +- src/core/util/posix/tmpfile.cc | 4 +- src/core/{lib/gprpp => util}/ref_counted.h | 14 +- .../{lib/gprpp => util}/ref_counted_ptr.h | 10 +- .../{lib/gprpp => util}/ref_counted_string.cc | 2 +- .../{lib/gprpp => util}/ref_counted_string.h | 10 +- src/core/{lib/gprpp => util}/single_set_ptr.h | 6 +- src/core/{lib/gprpp => util}/sorted_pack.h | 8 +- src/core/{lib/gprpp => util}/stat.h | 6 +- src/core/{lib/gprpp => util}/status_helper.cc | 2 +- src/core/{lib/gprpp => util}/status_helper.h | 8 +- src/core/{lib/gprpp => util}/strerror.cc | 2 +- src/core/{lib/gprpp => util}/strerror.h | 6 +- src/core/util/string.cc | 2 +- src/core/util/subprocess_posix.cc | 4 +- src/core/util/subprocess_windows.cc | 4 +- src/core/{lib/gprpp => util}/sync.h | 8 +- src/core/util/sync_abseil.cc | 4 +- src/core/{lib/gprpp => util}/table.h | 8 +- src/core/{lib/gprpp => util}/tchar.cc | 2 +- src/core/{lib/gprpp => util}/tchar.h | 6 +- src/core/{lib/gprpp => util}/thd.h | 6 +- src/core/util/time.cc | 381 ++++----- src/core/{lib/gprpp => util}/time.h | 6 +- .../gprpp => util}/time_averaged_stats.cc | 2 +- .../{lib/gprpp => util}/time_averaged_stats.h | 6 +- src/core/util/time_precise.cc | 2 +- src/core/{lib/gprpp => util}/time_util.cc | 2 +- src/core/{lib/gprpp => util}/time_util.h | 6 +- src/core/{lib/gprpp => util}/type_list.h | 6 +- .../{lib/gprpp => util}/unique_type_name.h | 6 +- src/core/{lib/gprpp => util}/uuid_v4.cc | 2 +- src/core/{lib/gprpp => util}/uuid_v4.h | 6 +- .../{lib/gprpp => util}/validation_errors.cc | 2 +- .../{lib/gprpp => util}/validation_errors.h | 6 +- src/core/util/windows/cpu.cc | 2 +- .../windows/directory_reader.cc | 2 +- src/core/{lib/gprpp => util}/windows/env.cc | 4 +- src/core/util/windows/log.cc | 4 +- src/core/{lib/gprpp => util}/windows/stat.cc | 6 +- src/core/util/windows/string_util.cc | 2 +- src/core/util/windows/sync.cc | 2 +- src/core/{lib/gprpp => util}/windows/thd.cc | 6 +- src/core/util/windows/time.cc | 2 +- src/core/util/windows/tmpfile.cc | 4 +- .../{lib/gprpp => util}/work_serializer.cc | 10 +- .../{lib/gprpp => util}/work_serializer.h | 10 +- src/core/{lib/gprpp => util}/xxhash_inline.h | 6 +- .../xds/grpc/certificate_provider_store.h | 10 +- ...ile_watcher_certificate_provider_factory.h | 6 +- .../xds/grpc/xds_audit_logger_registry.cc | 4 +- 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 | 14 +- src/core/xds/grpc/xds_client_grpc.h | 4 +- src/core/xds/grpc/xds_cluster.cc | 10 +- .../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 | 6 +- src/core/xds/grpc/xds_http_fault_filter.cc | 4 +- src/core/xds/grpc/xds_http_fault_filter.h | 2 +- src/core/xds/grpc/xds_http_filters.h | 2 +- src/core/xds/grpc/xds_http_rbac_filter.cc | 2 +- src/core/xds/grpc/xds_http_rbac_filter.h | 2 +- .../grpc/xds_http_stateful_session_filter.cc | 4 +- .../grpc/xds_http_stateful_session_filter.h | 2 +- src/core/xds/grpc/xds_lb_policy_registry.cc | 4 +- src/core/xds/grpc/xds_lb_policy_registry.h | 2 +- src/core/xds/grpc/xds_listener.cc | 6 +- src/core/xds/grpc/xds_listener.h | 2 +- src/core/xds/grpc/xds_route_config.cc | 8 +- src/core/xds/grpc/xds_route_config.h | 4 +- src/core/xds/grpc/xds_transport_grpc.cc | 8 +- src/core/xds/grpc/xds_transport_grpc.h | 4 +- src/core/xds/xds_client/xds_api.h | 4 +- src/core/xds/xds_client/xds_bootstrap.cc | 2 +- src/core/xds/xds_client/xds_client.cc | 8 +- src/core/xds/xds_client/xds_client.h | 14 +- src/core/xds/xds_client/xds_client_stats.cc | 2 +- src/core/xds/xds_client/xds_client_stats.h | 8 +- .../xds/xds_client/xds_resource_type_impl.h | 2 +- src/core/xds/xds_client/xds_transport.h | 2 +- src/cpp/client/client_context.cc | 2 +- src/cpp/client/client_interceptor.cc | 2 +- src/cpp/client/client_stats_interceptor.cc | 2 +- src/cpp/client/secure_credentials.cc | 4 +- src/cpp/common/alarm.cc | 2 +- src/cpp/common/completion_queue_cc.cc | 4 +- 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/environment_autodetect.h | 2 +- src/cpp/ext/gcp/observability.cc | 4 +- src/cpp/ext/gcp/observability_config.cc | 8 +- src/cpp/ext/gcp/observability_config.h | 2 +- src/cpp/ext/gcp/observability_logging_sink.cc | 6 +- src/cpp/ext/gcp/observability_logging_sink.h | 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 +- .../health/default_health_check_service.h | 4 +- .../get_cpu_stats_unsupported.cc | 2 +- src/cpp/server/load_reporter/load_reporter.h | 2 +- .../load_reporter_async_service_impl.h | 4 +- src/cpp/server/orca/orca_service.cc | 8 +- src/cpp/server/server_cc.cc | 2 +- src/cpp/server/server_context.cc | 6 +- src/cpp/server/server_credentials.cc | 2 +- src/cpp/thread_manager/thread_manager.cc | 6 +- src/cpp/thread_manager/thread_manager.h | 4 +- .../tests/CronetTests/CronetUnitTests.mm | 4 +- src/python/grpcio/grpc_core_dependencies.py | 54 +- .../observability_lib_deps.py | 32 +- .../parse_address_with_named_scope_id_test.cc | 4 +- test/core/backoff/backoff_test.cc | 2 +- test/core/bad_client/bad_client.cc | 2 +- .../core/bad_client/tests/duplicate_header.cc | 2 +- test/core/bad_connection/close_fd_test.cc | 4 +- test/core/bad_ssl/bad_ssl_test.cc | 4 +- test/core/call/yodel/fuzzer_main.cc | 2 +- test/core/call/yodel/yodel_test.h | 2 +- test/core/channel/call_finalization_test.cc | 2 +- test/core/channel/channel_args_test.cc | 6 +- 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/config/load_config_test.cc | 2 +- test/core/end2end/bad_server_response_test.cc | 8 +- test/core/end2end/connection_refused_test.cc | 2 +- test/core/end2end/cq_verifier.cc | 6 +- test/core/end2end/cq_verifier.h | 4 +- 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.cc | 2 +- test/core/end2end/end2end_tests.h | 6 +- .../end2end/fixtures/http_proxy_fixture.cc | 10 +- test/core/end2end/fixtures/proxy.cc | 6 +- test/core/end2end/fixtures/secure_fixture.h | 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 | 4 +- 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 +- .../end2end/invalid_call_argument_test.cc | 2 +- test/core/end2end/no_server_test.cc | 2 +- test/core/end2end/tests/bad_ping.cc | 2 +- test/core/end2end/tests/binary_metadata.cc | 2 +- test/core/end2end/tests/call_creds.cc | 2 +- test/core/end2end/tests/call_host_override.cc | 2 +- .../core/end2end/tests/cancel_after_accept.cc | 2 +- .../end2end/tests/cancel_after_client_done.cc | 2 +- .../core/end2end/tests/cancel_after_invoke.cc | 2 +- .../end2end/tests/cancel_after_round_trip.cc | 2 +- test/core/end2end/tests/cancel_with_status.cc | 2 +- test/core/end2end/tests/channelz.cc | 2 +- test/core/end2end/tests/client_streaming.cc | 2 +- test/core/end2end/tests/compressed_payload.cc | 4 +- test/core/end2end/tests/connectivity.cc | 2 +- test/core/end2end/tests/default_host.cc | 2 +- .../core/end2end/tests/disappearing_server.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/filtered_metadata.cc | 2 +- .../end2end/tests/graceful_server_shutdown.cc | 2 +- test/core/end2end/tests/grpc_authz.cc | 4 +- test/core/end2end/tests/high_initial_seqno.cc | 2 +- test/core/end2end/tests/hpack_size.cc | 2 +- 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/large_metadata.cc | 2 +- .../end2end/tests/max_concurrent_streams.cc | 2 +- test/core/end2end/tests/max_connection_age.cc | 2 +- .../core/end2end/tests/max_connection_idle.cc | 2 +- test/core/end2end/tests/negative_deadline.cc | 2 +- test/core/end2end/tests/no_logging.cc | 2 +- test/core/end2end/tests/payload.cc | 2 +- test/core/end2end/tests/ping.cc | 2 +- .../core/end2end/tests/ping_pong_streaming.cc | 2 +- test/core/end2end/tests/proxy_auth.cc | 2 +- test/core/end2end/tests/registered_call.cc | 2 +- test/core/end2end/tests/request_with_flags.cc | 2 +- .../end2end/tests/request_with_payload.cc | 2 +- .../end2end/tests/resource_quota_server.cc | 4 +- test/core/end2end/tests/retry.cc | 2 +- ...retry_cancel_after_first_attempt_starts.cc | 2 +- .../tests/retry_cancel_during_delay.cc | 2 +- ...retry_cancel_with_multiple_send_batches.cc | 4 +- test/core/end2end/tests/retry_cancellation.cc | 2 +- test/core/end2end/tests/retry_disabled.cc | 2 +- .../retry_exceeds_buffer_size_in_delay.cc | 2 +- ...ry_exceeds_buffer_size_in_initial_batch.cc | 2 +- ...exceeds_buffer_size_in_subsequent_batch.cc | 2 +- test/core/end2end/tests/retry_lb_drop.cc | 6 +- test/core/end2end/tests/retry_lb_fail.cc | 2 +- .../tests/retry_non_retriable_status.cc | 2 +- ...ry_non_retriable_status_before_trailers.cc | 2 +- .../tests/retry_per_attempt_recv_timeout.cc | 2 +- ...er_attempt_recv_timeout_on_last_attempt.cc | 2 +- .../tests/retry_recv_initial_metadata.cc | 2 +- test/core/end2end/tests/retry_recv_message.cc | 2 +- .../tests/retry_recv_message_replay.cc | 4 +- .../retry_recv_trailing_metadata_error.cc | 6 +- .../tests/retry_send_initial_metadata_refs.cc | 2 +- .../core/end2end/tests/retry_send_op_fails.cc | 4 +- .../end2end/tests/retry_send_recv_batch.cc | 2 +- .../tests/retry_server_pushback_delay.cc | 2 +- .../tests/retry_server_pushback_disabled.cc | 2 +- test/core/end2end/tests/retry_streaming.cc | 2 +- .../tests/retry_streaming_after_commit.cc | 2 +- ...reaming_succeeds_before_replay_finished.cc | 2 +- test/core/end2end/tests/retry_throttled.cc | 2 +- .../end2end/tests/retry_too_many_attempts.cc | 2 +- .../end2end/tests/retry_transparent_goaway.cc | 4 +- ...etry_transparent_max_concurrent_streams.cc | 2 +- .../retry_transparent_not_sent_on_wire.cc | 4 +- .../tests/retry_unref_before_finish.cc | 2 +- .../end2end/tests/retry_unref_before_recv.cc | 2 +- .../end2end/tests/server_finishes_request.cc | 2 +- test/core/end2end/tests/server_streaming.cc | 2 +- .../end2end/tests/shutdown_finishes_calls.cc | 2 +- .../end2end/tests/simple_delayed_request.cc | 2 +- test/core/end2end/tests/simple_metadata.cc | 2 +- test/core/end2end/tests/simple_request.cc | 2 +- .../end2end/tests/streaming_error_response.cc | 2 +- .../tests/timeout_before_request_call.cc | 2 +- test/core/end2end/tests/trailing_metadata.cc | 2 +- test/core/end2end/tests/write_buffering.cc | 2 +- .../end2end/tests/write_buffering_at_end.cc | 2 +- .../core/event_engine/common_closures_test.cc | 2 +- .../event_engine/event_engine_test_utils.cc | 4 +- .../event_engine/event_engine_test_utils.h | 4 +- test/core/event_engine/forkable_test.cc | 2 +- .../fuzzing_event_engine.cc | 4 +- .../fuzzing_event_engine.h | 4 +- .../fuzzing_event_engine_unittest.cc | 2 +- .../posix/event_poller_posix_test.cc | 10 +- .../posix/lock_free_event_test.cc | 2 +- .../posix/log_too_many_open_files_test.cc | 2 +- .../event_engine/posix/posix_endpoint_test.cc | 6 +- .../posix/posix_engine_test_utils.cc | 2 +- .../posix/posix_event_engine_connect_test.cc | 4 +- .../event_engine/posix/timer_heap_test.cc | 2 +- .../event_engine/posix/timer_list_test.cc | 2 +- .../posix/traced_buffer_list_test.cc | 2 +- .../event_engine/query_extensions_test.cc | 2 +- .../posix/oracle_event_engine_posix.cc | 4 +- .../posix/oracle_event_engine_posix.h | 8 +- .../test_suite/tests/client_test.cc | 2 +- .../event_engine/test_suite/tests/dns_test.cc | 4 +- .../test_suite/tests/server_test.cc | 2 +- .../test_suite/tests/timer_test.cc | 2 +- .../test_suite/tools/echo_client.cc | 2 +- test/core/event_engine/thread_pool_test.cc | 6 +- 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 | 6 +- .../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/bitset_test.cc | 2 +- test/core/gprpp/chunked_vector_fuzzer.cc | 4 +- test/core/gprpp/chunked_vector_test.cc | 4 +- test/core/gprpp/cpp_impl_of_test.cc | 2 +- test/core/gprpp/directory_reader_test.cc | 2 +- test/core/gprpp/down_cast_test.cc | 2 +- test/core/gprpp/dual_ref_counted_test.cc | 6 +- test/core/gprpp/dump_args_test.cc | 2 +- test/core/gprpp/examine_stack_test.cc | 2 +- test/core/gprpp/fork_test.cc | 4 +- test/core/gprpp/host_port_test.cc | 2 +- test/core/gprpp/if_list_test.cc | 2 +- test/core/gprpp/load_file_test.cc | 2 +- test/core/gprpp/match_test.cc | 2 +- test/core/gprpp/mpscq_test.cc | 4 +- test/core/gprpp/no_destruct_test.cc | 2 +- test/core/gprpp/notification_test.cc | 2 +- test/core/gprpp/orphanable_test.cc | 2 +- test/core/gprpp/overload_test.cc | 2 +- test/core/gprpp/ref_counted_ptr_test.cc | 6 +- test/core/gprpp/ref_counted_test.cc | 2 +- test/core/gprpp/single_set_ptr_test.cc | 2 +- test/core/gprpp/sorted_pack_test.cc | 2 +- test/core/gprpp/stat_test.cc | 2 +- test/core/gprpp/status_helper_test.cc | 2 +- test/core/gprpp/table_test.cc | 2 +- test/core/gprpp/thd_test.cc | 2 +- test/core/gprpp/time_averaged_stats_test.cc | 2 +- test/core/gprpp/time_test.cc | 2 +- test/core/gprpp/time_util_test.cc | 2 +- test/core/gprpp/unique_type_name_test.cc | 2 +- test/core/gprpp/uuid_v4_test.cc | 2 +- test/core/gprpp/validation_errors_test.cc | 2 +- test/core/gprpp/work_serializer_test.cc | 6 +- test/core/handshake/client_ssl.cc | 6 +- .../readahead_handshaker_server_ssl.cc | 2 +- test/core/handshake/server_ssl_common.cc | 6 +- test/core/handshake/verify_peer_options.cc | 4 +- test/core/http/httpcli_test.cc | 6 +- test/core/http/httpscli_test.cc | 10 +- test/core/iomgr/buffer_list_test.cc | 2 +- test/core/iomgr/combiner_test.cc | 6 +- test/core/iomgr/endpoint_pair_test.cc | 2 +- test/core/iomgr/endpoint_tests.cc | 4 +- test/core/iomgr/error_test.cc | 2 +- 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 | 6 +- 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 | 16 +- ...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 | 4 +- .../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 +- test/core/memory_usage/callback_client.cc | 2 +- test/core/memory_usage/memory_usage_test.cc | 2 +- test/core/memory_usage/server.cc | 2 +- .../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 | 2 +- .../resolver/dns_resolver_cooldown_test.cc | 12 +- test/core/resolver/dns_resolver_test.cc | 4 +- test/core/resolver/fake_resolver_test.cc | 8 +- .../core/resolver/google_c2p_resolver_test.cc | 2 +- test/core/resolver/sockaddr_resolver_test.cc | 4 +- 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 | 4 +- .../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 | 10 +- test/core/security/fetch_oauth2.cc | 2 +- .../grpc_alts_credentials_options_test.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 | 4 +- 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/cmdline.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 +- test/core/test_util/port.cc | 2 +- .../port_isolated_runtime_environment.cc | 2 +- test/core/test_util/port_server_client.cc | 8 +- test/core/test_util/scoped_env_var.h | 2 +- test/core/test_util/stack_tracer.cc | 2 +- test/core/test_util/test_config.cc | 2 +- test/core/test_util/test_lb_policies.cc | 8 +- test/core/test_util/test_tcp_server.cc | 2 +- test/core/test_util/tls_utils.cc | 2 +- test/core/test_util/tls_utils.h | 4 +- .../transport/binder/binder_transport_test.cc | 2 +- .../transport/binder/end2end/fake_binder.cc | 2 +- .../transport/binder/end2end/fake_binder.h | 4 +- .../binder/end2end/fuzzers/fuzzer_utils.h | 2 +- .../chaotic_good/chaotic_good_server_test.cc | 4 +- .../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 +- .../transport/chttp2/ping_callbacks_test.cc | 2 +- .../chttp2/ping_configuration_test.cc | 2 +- .../remove_stream_from_stalled_lists_test.cc | 4 +- .../transport/chttp2/settings_timeout_test.cc | 4 +- ...ak_with_queued_flow_control_update_test.cc | 4 +- .../transport/chttp2/streams_not_seen_test.cc | 10 +- .../transport/chttp2/too_many_pings_test.cc | 8 +- test/core/transport/error_utils_test.cc | 2 +- test/core/transport/metadata_map_test.cc | 4 +- test/core/transport/timeout_encoding_test.cc | 2 +- .../fake_handshaker/fake_handshaker_server.cc | 2 +- .../fake_handshaker_server_main.cc | 2 +- .../alts/frame_protector/alts_counter_test.cc | 2 +- .../alts_frame_protector_test.cc | 2 +- .../frame_protector/frame_handler_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_session_cache_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/tsi/transport_security_test_lib.cc | 4 +- test/core/util/cpu_test.cc | 2 +- test/core/util/env_test.cc | 2 +- test/core/util/log_test.cc | 2 +- test/core/util/spinlock_test.cc | 2 +- test/core/util/sync_test.cc | 2 +- .../xds/certificate_provider_store_test.cc | 2 +- .../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_fuzzer.cc | 4 +- test/core/xds/xds_client_test.cc | 6 +- .../xds/xds_cluster_resource_type_test.cc | 6 +- test/core/xds/xds_common_types_test.cc | 8 +- .../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 | 8 +- .../xds/xds_listener_resource_type_test.cc | 6 +- .../xds_route_config_resource_type_test.cc | 6 +- test/core/xds/xds_transport_fake.cc | 4 +- test/core/xds/xds_transport_fake.h | 8 +- test/cpp/client/credentials_test.cc | 2 +- ...channel_with_active_connect_stress_test.cc | 6 +- test/cpp/cocoapods/generic/generic.mm | 2 +- test/cpp/common/alarm_test.cc | 2 +- test/cpp/common/time_jump_test.cc | 4 +- test/cpp/common/timer_test.cc | 4 +- test/cpp/end2end/async_end2end_test.cc | 4 +- test/cpp/end2end/cfstream_test.cc | 4 +- test/cpp/end2end/channelz_service_test.cc | 2 +- .../end2end/client_callback_end2end_test.cc | 2 +- test/cpp/end2end/client_crash_test.cc | 2 +- test/cpp/end2end/client_crash_test_server.cc | 2 +- test/cpp/end2end/client_fork_test.cc | 2 +- test/cpp/end2end/client_lb_end2end_test.cc | 12 +- .../end2end/connection_attempt_injector.cc | 2 +- .../cpp/end2end/connection_attempt_injector.h | 2 +- test/cpp/end2end/counted_service.h | 2 +- test/cpp/end2end/end2end_test.cc | 4 +- test/cpp/end2end/flaky_network_test.cc | 4 +- test/cpp/end2end/grpclb_end2end_test.cc | 10 +- .../end2end/health_service_end2end_test.cc | 2 +- test/cpp/end2end/hybrid_end2end_test.cc | 2 +- test/cpp/end2end/interceptors_util.h | 2 +- test/cpp/end2end/mock_test.cc | 2 +- test/cpp/end2end/orca_service_end2end_test.cc | 2 +- test/cpp/end2end/port_sharing_end2end_test.cc | 4 +- test/cpp/end2end/raw_end2end_test.cc | 4 +- .../resource_quota_end2end_stress_test.cc | 2 +- test/cpp/end2end/rls_end2end_test.cc | 6 +- test/cpp/end2end/rls_server.h | 2 +- test/cpp/end2end/server_crash_test.cc | 2 +- test/cpp/end2end/server_crash_test_client.cc | 2 +- test/cpp/end2end/server_early_return_test.cc | 2 +- .../server_load_reporting_end2end_test.cc | 2 +- .../end2end/service_config_end2end_test.cc | 6 +- test/cpp/end2end/shutdown_test.cc | 4 +- test/cpp/end2end/streaming_throughput_test.cc | 2 +- test/cpp/end2end/test_service_impl.cc | 4 +- test/cpp/end2end/test_service_impl.h | 2 +- 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 +- .../end2end/xds/xds_fallback_end2end_test.cc | 2 +- .../xds/xds_override_host_end2end_test.cc | 2 +- .../xds/xds_pick_first_end2end_test.cc | 2 +- .../end2end/xds/xds_ring_hash_end2end_test.cc | 2 +- test/cpp/end2end/xds/xds_rls_end2end_test.cc | 2 +- test/cpp/end2end/xds/xds_server.cc | 4 +- test/cpp/end2end/xds/xds_server.h | 4 +- test/cpp/end2end/xds/xds_utils.cc | 2 +- test/cpp/ext/csm/mesh_id_test.cc | 2 +- test/cpp/ext/csm/metadata_exchange_test.cc | 2 +- test/cpp/ext/filters/logging/library.h | 2 +- .../logging_census_integration_test.cc | 2 +- test/cpp/ext/filters/logging/logging_test.cc | 4 +- .../ext/gcp/environment_autodetect_test.cc | 4 +- test/cpp/ext/gcp/observability_config_test.cc | 2 +- test/cpp/ext/otel/otel_test_library.cc | 2 +- .../interop/backend_metrics_lb_policy_test.cc | 2 +- test/cpp/interop/client.cc | 2 +- test/cpp/interop/grpclb_fallback_test.cc | 2 +- test/cpp/interop/http2_client.cc | 2 +- test/cpp/interop/interop_client.cc | 2 +- test/cpp/interop/interop_server.cc | 4 +- test/cpp/interop/interop_test.cc | 2 +- test/cpp/interop/istio_echo_server.cc | 4 +- test/cpp/interop/istio_echo_server_lib.cc | 2 +- test/cpp/interop/istio_echo_server_test.cc | 4 +- test/cpp/interop/metrics_client.cc | 2 +- test/cpp/interop/observability_client.cc | 2 +- test/cpp/interop/pre_stop_hook_server.cc | 2 +- test/cpp/interop/pre_stop_hook_server.h | 2 +- test/cpp/interop/pre_stop_hook_server_test.cc | 2 +- test/cpp/interop/reconnect_interop_client.cc | 2 +- test/cpp/interop/reconnect_interop_server.cc | 2 +- test/cpp/interop/stress_interop_client.cc | 2 +- test/cpp/interop/stress_test.cc | 2 +- test/cpp/interop/xds_interop_client.cc | 2 +- test/cpp/interop/xds_interop_server_test.cc | 2 +- .../microbenchmarks/bm_basic_work_queue.cc | 2 +- test/cpp/microbenchmarks/bm_chttp2_hpack.cc | 4 +- test/cpp/microbenchmarks/bm_cq.cc | 2 +- .../microbenchmarks/bm_cq_multiple_threads.cc | 4 +- .../microbenchmarks/bm_event_engine_run.cc | 4 +- test/cpp/microbenchmarks/bm_exec_ctx.cc | 2 +- test/cpp/microbenchmarks/bm_huffman_decode.cc | 2 +- test/cpp/microbenchmarks/bm_rng.cc | 2 +- test/cpp/microbenchmarks/bm_thread_pool.cc | 4 +- .../fullstack_context_mutators.h | 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 +- ...resolver_component_tests_runner_invoker.cc | 4 +- test/cpp/performance/writes_per_rpc_test.cc | 2 +- test/cpp/qps/benchmark_config.cc | 2 +- test/cpp/qps/client.h | 4 +- test/cpp/qps/client_async.cc | 2 +- test/cpp/qps/client_callback.cc | 2 +- test/cpp/qps/client_sync.cc | 2 +- test/cpp/qps/driver.cc | 6 +- .../qps/inproc_sync_unary_ping_pong_test.cc | 2 +- test/cpp/qps/json_run_localhost.cc | 4 +- test/cpp/qps/parse_json.cc | 2 +- test/cpp/qps/qps_json_driver.cc | 2 +- test/cpp/qps/qps_openloop_test.cc | 2 +- test/cpp/qps/qps_worker.cc | 4 +- test/cpp/qps/report.cc | 2 +- .../qps/secure_sync_unary_ping_pong_test.cc | 2 +- test/cpp/qps/server.h | 2 +- test/cpp/qps/server_async.cc | 4 +- test/cpp/qps/server_callback.cc | 2 +- test/cpp/qps/server_sync.cc | 2 +- test/cpp/qps/usage_timer.cc | 2 +- test/cpp/server/server_builder_test.cc | 2 +- test/cpp/server/server_request_call_test.cc | 2 +- .../cpp/thread_manager/thread_manager_test.cc | 2 +- test/cpp/util/channel_trace_proto_helper.cc | 2 +- test/cpp/util/channelz_sampler_test.cc | 2 +- test/cpp/util/cli_call.cc | 2 +- test/cpp/util/cli_credentials.cc | 4 +- test/cpp/util/create_test_channel.cc | 2 +- test/cpp/util/get_grpc_test_runfile_dir.cc | 2 +- test/cpp/util/grpc_tool_test.cc | 2 +- test/cpp/util/metrics_server.cc | 2 +- .../proto_reflection_descriptor_database.cc | 2 +- test/cpp/util/test_credentials_provider.cc | 2 +- test/cpp/util/tls_test_utils.cc | 2 +- test/cpp/util/tls_test_utils.h | 2 +- test/cpp/util/windows/manifest_file.cc | 2 +- .../core/gen_grpc_tls_credentials_options.py | 2 +- .../codegen/core/gen_huffman_decompressor.cc | 2 +- tools/codegen/core/gen_if_list.py | 2 +- tools/codegen/core/gen_join.py | 4 +- tools/codegen/core/gen_seq.py | 4 +- tools/codegen/core/gen_stats_data.py | 2 +- .../core/templates/trace_flags.cc.mako | 2 +- .../distrib/check_namespace_qualification.py | 3 +- tools/doxygen/Doxyfile.c++.internal | 150 ++-- tools/doxygen/Doxyfile.core.internal | 152 ++-- tools/run_tests/sanity/check_absl_mutex.sh | 2 +- .../run_tests/sanity/cpp_banned_constructs.sh | 4 +- 1208 files changed, 4049 insertions(+), 4105 deletions(-) delete mode 100644 src/core/lib/gprpp/.clang-format delete mode 100644 src/core/lib/gprpp/README.md delete mode 100644 src/core/lib/gprpp/time.cc rename src/core/{lib/gprpp => util}/atomic_utils.h (90%) rename src/core/{lib/gprpp => util}/bitset.h (98%) rename src/core/{lib/gprpp => util}/chunked_vector.h (97%) rename src/core/{lib/gprpp => util}/construct_destruct.h (86%) rename src/core/{lib/gprpp => util}/cpp_impl_of.h (90%) rename src/core/{lib/gprpp => util}/crash.cc (96%) rename src/core/{lib/gprpp => util}/crash.h (86%) rename src/core/{lib/gprpp => util}/debug_location.h (94%) rename src/core/{lib/gprpp => util}/directory_reader.h (89%) rename src/core/{lib/gprpp => util}/down_cast.h (91%) rename src/core/{lib/gprpp => util}/dual_ref_counted.h (97%) rename src/core/{lib/gprpp => util}/dump_args.cc (96%) rename src/core/{lib/gprpp => util}/dump_args.h (93%) rename src/core/{lib/gprpp => util}/env.h (92%) rename src/core/{lib/gprpp => util}/examine_stack.cc (96%) rename src/core/{lib/gprpp => util}/examine_stack.h (89%) rename src/core/{lib/gprpp => util}/fork.cc (98%) rename src/core/{lib/gprpp => util}/fork.h (95%) create mode 100644 src/core/util/gpr_time.cc rename src/core/{lib/gprpp => util}/host_port.cc (98%) rename src/core/{lib/gprpp => util}/host_port.h (93%) rename src/core/{lib/gprpp => util}/if_list.h (99%) rename src/core/{lib/gprpp => util}/linux/env.cc (97%) rename src/core/{lib/gprpp => util}/load_file.cc (98%) rename src/core/{lib/gprpp => util}/load_file.h (88%) rename src/core/{lib/gprpp => util}/manual_constructor.h (95%) rename src/core/{lib/gprpp => util}/match.h (93%) rename src/core/{lib/gprpp => util}/memory.h (91%) rename src/core/{lib/gprpp => util}/mpscq.cc (98%) rename src/core/{lib/gprpp => util}/mpscq.h (94%) rename src/core/{lib/gprpp => util}/no_destruct.h (93%) rename src/core/{lib/gprpp => util}/notification.h (89%) rename src/core/{lib/gprpp => util}/orphanable.h (93%) rename src/core/{lib/gprpp => util}/overload.h (93%) rename src/core/{lib/gprpp => util}/packed_table.h (83%) rename src/core/{lib/gprpp => util}/per_cpu.cc (96%) rename src/core/{lib/gprpp => util}/per_cpu.h (95%) rename src/core/{lib/gprpp => util}/posix/directory_reader.cc (97%) rename src/core/{lib/gprpp => util}/posix/env.cc (96%) rename src/core/{lib/gprpp => util}/posix/stat.cc (94%) rename src/core/{lib/gprpp => util}/posix/thd.cc (97%) rename src/core/{lib/gprpp => util}/ref_counted.h (97%) rename src/core/{lib/gprpp => util}/ref_counted_ptr.h (98%) rename src/core/{lib/gprpp => util}/ref_counted_string.cc (96%) rename src/core/{lib/gprpp => util}/ref_counted_string.h (94%) rename src/core/{lib/gprpp => util}/single_set_ptr.h (94%) rename src/core/{lib/gprpp => util}/sorted_pack.h (94%) rename src/core/{lib/gprpp => util}/stat.h (89%) rename src/core/{lib/gprpp => util}/status_helper.cc (99%) rename src/core/{lib/gprpp => util}/status_helper.h (96%) rename src/core/{lib/gprpp => util}/strerror.cc (96%) rename src/core/{lib/gprpp => util}/strerror.h (85%) rename src/core/{lib/gprpp => util}/sync.h (97%) rename src/core/{lib/gprpp => util}/table.h (98%) rename src/core/{lib/gprpp => util}/tchar.cc (97%) rename src/core/{lib/gprpp => util}/tchar.h (87%) rename src/core/{lib/gprpp => util}/thd.h (98%) rename src/core/{lib/gprpp => util}/time.h (99%) rename src/core/{lib/gprpp => util}/time_averaged_stats.cc (97%) rename src/core/{lib/gprpp => util}/time_averaged_stats.h (95%) rename src/core/{lib/gprpp => util}/time_util.cc (98%) rename src/core/{lib/gprpp => util}/time_util.h (89%) rename src/core/{lib/gprpp => util}/type_list.h (86%) rename src/core/{lib/gprpp => util}/unique_type_name.h (94%) rename src/core/{lib/gprpp => util}/uuid_v4.cc (96%) rename src/core/{lib/gprpp => util}/uuid_v4.h (87%) rename src/core/{lib/gprpp => util}/validation_errors.cc (97%) rename src/core/{lib/gprpp => util}/validation_errors.h (96%) rename src/core/{lib/gprpp => util}/windows/directory_reader.cc (98%) rename src/core/{lib/gprpp => util}/windows/env.cc (95%) rename src/core/{lib/gprpp => util}/windows/stat.cc (92%) rename src/core/{lib/gprpp => util}/windows/thd.cc (97%) rename src/core/{lib/gprpp => util}/work_serializer.cc (99%) rename src/core/{lib/gprpp => util}/work_serializer.h (94%) rename src/core/{lib/gprpp => util}/xxhash_inline.h (86%) diff --git a/BUILD b/BUILD index 32114d5c1b4..9e0e36e27ad 100644 --- a/BUILD +++ b/BUILD @@ -735,17 +735,18 @@ grpc_cc_library( grpc_cc_library( name = "gpr", srcs = [ - "//src/core:lib/gprpp/crash.cc", - "//src/core:lib/gprpp/fork.cc", - "//src/core:lib/gprpp/host_port.cc", - "//src/core:lib/gprpp/mpscq.cc", - "//src/core:lib/gprpp/posix/stat.cc", - "//src/core:lib/gprpp/posix/thd.cc", - "//src/core:lib/gprpp/time_util.cc", - "//src/core:lib/gprpp/windows/stat.cc", - "//src/core:lib/gprpp/windows/thd.cc", + "//src/core:util/crash.cc", + "//src/core:util/fork.cc", + "//src/core:util/host_port.cc", + "//src/core:util/mpscq.cc", + "//src/core:util/posix/stat.cc", + "//src/core:util/posix/thd.cc", + "//src/core:util/time_util.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/gpr_time.cc", "//src/core:util/iphone/cpu.cc", "//src/core:util/linux/cpu.cc", "//src/core:util/linux/log.cc", @@ -760,7 +761,6 @@ grpc_cc_library( "//src/core:util/string.cc", "//src/core:util/sync.cc", "//src/core:util/sync_abseil.cc", - "//src/core:util/time.cc", "//src/core:util/time_precise.cc", "//src/core:util/windows/cpu.cc", "//src/core:util/windows/log.cc", @@ -771,15 +771,15 @@ grpc_cc_library( "//src/core:util/windows/tmpfile.cc", ], hdrs = [ - "//src/core:lib/gprpp/crash.h", - "//src/core:lib/gprpp/fork.h", - "//src/core:lib/gprpp/host_port.h", - "//src/core:lib/gprpp/memory.h", - "//src/core:lib/gprpp/mpscq.h", - "//src/core:lib/gprpp/stat.h", - "//src/core:lib/gprpp/sync.h", - "//src/core:lib/gprpp/thd.h", - "//src/core:lib/gprpp/time_util.h", + "//src/core:util/crash.h", + "//src/core:util/fork.h", + "//src/core:util/host_port.h", + "//src/core:util/memory.h", + "//src/core:util/mpscq.h", + "//src/core:util/stat.h", + "//src/core:util/sync.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", @@ -840,7 +840,7 @@ grpc_cc_library( grpc_cc_library( name = "cpp_impl_of", - hdrs = ["//src/core:lib/gprpp/cpp_impl_of.h"], + hdrs = ["//src/core:util/cpp_impl_of.h"], language = "c++", ) @@ -2998,10 +2998,10 @@ grpc_cc_library( grpc_cc_library( name = "work_serializer", srcs = [ - "//src/core:lib/gprpp/work_serializer.cc", + "//src/core:util/work_serializer.cc", ], hdrs = [ - "//src/core:lib/gprpp/work_serializer.h", + "//src/core:util/work_serializer.h", ], external_deps = [ "absl/base:core_headers", @@ -3118,7 +3118,7 @@ grpc_cc_library( grpc_cc_library( name = "debug_location", language = "c++", - public_hdrs = ["//src/core:lib/gprpp/debug_location.h"], + public_hdrs = ["//src/core:util/debug_location.h"], visibility = ["@grpc:debug_location"], deps = ["gpr_platform"], ) @@ -3126,7 +3126,7 @@ grpc_cc_library( grpc_cc_library( name = "orphanable", language = "c++", - public_hdrs = ["//src/core:lib/gprpp/orphanable.h"], + public_hdrs = ["//src/core:util/orphanable.h"], visibility = [ "@grpc:client_channel", "@grpc:xds_client_core", @@ -3163,7 +3163,7 @@ grpc_cc_library( name = "ref_counted_ptr", external_deps = ["absl/hash"], language = "c++", - public_hdrs = ["//src/core:lib/gprpp/ref_counted_ptr.h"], + public_hdrs = ["//src/core:util/ref_counted_ptr.h"], visibility = ["@grpc:ref_counted_ptr"], deps = [ "debug_location", diff --git a/CMakeLists.txt b/CMakeLists.txt index d975a4b03b1..79cc39e4173 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1670,21 +1670,21 @@ 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/lib/gprpp/crash.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/mpscq.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/strerror.cc - src/core/lib/gprpp/tchar.cc - src/core/lib/gprpp/time_util.cc - src/core/lib/gprpp/windows/env.cc - src/core/lib/gprpp/windows/stat.cc - src/core/lib/gprpp/windows/thd.cc + src/core/util/crash.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/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 @@ -2303,18 +2303,18 @@ 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/lib/gprpp/dump_args.cc - src/core/lib/gprpp/load_file.cc - src/core/lib/gprpp/per_cpu.cc - src/core/lib/gprpp/posix/directory_reader.cc - src/core/lib/gprpp/ref_counted_string.cc - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc - src/core/lib/gprpp/time_averaged_stats.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/work_serializer.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 @@ -3099,16 +3099,16 @@ 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/lib/gprpp/dump_args.cc - src/core/lib/gprpp/load_file.cc - src/core/lib/gprpp/per_cpu.cc - src/core/lib/gprpp/ref_counted_string.cc - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc - src/core/lib/gprpp/time_averaged_stats.cc - src/core/lib/gprpp/uuid_v4.cc - src/core/lib/gprpp/validation_errors.cc - src/core/lib/gprpp/work_serializer.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 @@ -5218,15 +5218,15 @@ 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/lib/gprpp/dump_args.cc - src/core/lib/gprpp/load_file.cc - src/core/lib/gprpp/per_cpu.cc - src/core/lib/gprpp/ref_counted_string.cc - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc - src/core/lib/gprpp/time_averaged_stats.cc - src/core/lib/gprpp/validation_errors.cc - src/core/lib/gprpp/work_serializer.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 @@ -8522,10 +8522,10 @@ 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/lib/gprpp/dump_args.cc - src/core/lib/gprpp/ref_counted_string.cc - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.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 @@ -10198,8 +10198,8 @@ 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/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.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 @@ -12477,7 +12477,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(dump_args_test - src/core/lib/gprpp/dump_args.cc + src/core/util/dump_args.cc test/core/gprpp/dump_args_test.cc ) target_compile_features(dump_args_test PUBLIC cxx_std_14) @@ -12900,8 +12900,8 @@ 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/gprpp/ref_counted_string.cc - src/core/lib/gprpp/time.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 ) @@ -13447,8 +13447,8 @@ 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/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.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 @@ -14306,8 +14306,8 @@ 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/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.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 @@ -14392,8 +14392,8 @@ 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/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.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 @@ -17914,15 +17914,15 @@ 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/lib/gprpp/dump_args.cc - src/core/lib/gprpp/load_file.cc - src/core/lib/gprpp/per_cpu.cc - src/core/lib/gprpp/ref_counted_string.cc - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc - src/core/lib/gprpp/time_averaged_stats.cc - src/core/lib/gprpp/validation_errors.cc - src/core/lib/gprpp/work_serializer.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 @@ -18144,8 +18144,8 @@ 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/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.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 @@ -19389,8 +19389,8 @@ 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/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.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 @@ -21661,8 +21661,8 @@ 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/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.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 @@ -30036,8 +30036,8 @@ if(gRPC_BUILD_TESTS) add_executable(test_core_event_engine_posix_timer_heap_test src/core/lib/event_engine/posix_engine/timer.cc src/core/lib/event_engine/posix_engine/timer_heap.cc - src/core/lib/gprpp/time.cc - src/core/lib/gprpp/time_averaged_stats.cc + src/core/util/time.cc + src/core/util/time_averaged_stats.cc test/core/event_engine/posix/timer_heap_test.cc ) if(WIN32 AND MSVC) @@ -30082,8 +30082,8 @@ if(gRPC_BUILD_TESTS) add_executable(test_core_event_engine_posix_timer_list_test src/core/lib/event_engine/posix_engine/timer.cc src/core/lib/event_engine/posix_engine/timer_heap.cc - src/core/lib/gprpp/time.cc - src/core/lib/gprpp/time_averaged_stats.cc + src/core/util/time.cc + src/core/util/time_averaged_stats.cc test/core/event_engine/posix/timer_list_test.cc ) if(WIN32 AND MSVC) @@ -30179,7 +30179,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(test_core_gprpp_time_test - src/core/lib/gprpp/time.cc + src/core/util/time.cc test/core/gprpp/time_test.cc ) if(WIN32 AND MSVC) @@ -33104,7 +33104,7 @@ if(gRPC_BUILD_TESTS) add_executable(write_size_policy_test src/core/ext/transport/chttp2/transport/write_size_policy.cc - src/core/lib/gprpp/time.cc + src/core/util/time.cc test/core/transport/chttp2/write_size_policy_test.cc ) if(WIN32 AND MSVC) diff --git a/Makefile b/Makefile index 1b5a8db3203..f8a3ad87215 100644 --- a/Makefile +++ b/Makefile @@ -1138,33 +1138,33 @@ 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/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/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 \ diff --git a/Package.swift b/Package.swift index 099db505847..afee52fde3e 100644 --- a/Package.swift +++ b/Package.swift @@ -1247,81 +1247,81 @@ let package = Package( "src/core/lib/experiments/config.h", "src/core/lib/experiments/experiments.cc", "src/core/lib/experiments/experiments.h", - "src/core/lib/gprpp/atomic_utils.h", - "src/core/lib/gprpp/bitset.h", - "src/core/lib/gprpp/chunked_vector.h", - "src/core/lib/gprpp/construct_destruct.h", - "src/core/lib/gprpp/cpp_impl_of.h", - "src/core/lib/gprpp/crash.cc", - "src/core/lib/gprpp/crash.h", - "src/core/lib/gprpp/debug_location.h", - "src/core/lib/gprpp/directory_reader.h", - "src/core/lib/gprpp/down_cast.h", - "src/core/lib/gprpp/dual_ref_counted.h", - "src/core/lib/gprpp/dump_args.cc", - "src/core/lib/gprpp/dump_args.h", - "src/core/lib/gprpp/env.h", - "src/core/lib/gprpp/examine_stack.cc", - "src/core/lib/gprpp/examine_stack.h", - "src/core/lib/gprpp/fork.cc", - "src/core/lib/gprpp/fork.h", - "src/core/lib/gprpp/host_port.cc", - "src/core/lib/gprpp/host_port.h", - "src/core/lib/gprpp/if_list.h", - "src/core/lib/gprpp/linux/env.cc", - "src/core/lib/gprpp/load_file.cc", - "src/core/lib/gprpp/load_file.h", - "src/core/lib/gprpp/manual_constructor.h", - "src/core/lib/gprpp/match.h", - "src/core/lib/gprpp/memory.h", - "src/core/lib/gprpp/mpscq.cc", - "src/core/lib/gprpp/mpscq.h", - "src/core/lib/gprpp/no_destruct.h", - "src/core/lib/gprpp/notification.h", - "src/core/lib/gprpp/orphanable.h", - "src/core/lib/gprpp/overload.h", - "src/core/lib/gprpp/packed_table.h", - "src/core/lib/gprpp/per_cpu.cc", - "src/core/lib/gprpp/per_cpu.h", - "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.h", - "src/core/lib/gprpp/ref_counted_ptr.h", - "src/core/lib/gprpp/ref_counted_string.cc", - "src/core/lib/gprpp/ref_counted_string.h", - "src/core/lib/gprpp/single_set_ptr.h", - "src/core/lib/gprpp/sorted_pack.h", - "src/core/lib/gprpp/stat.h", - "src/core/lib/gprpp/status_helper.cc", - "src/core/lib/gprpp/status_helper.h", - "src/core/lib/gprpp/strerror.cc", - "src/core/lib/gprpp/strerror.h", - "src/core/lib/gprpp/sync.h", - "src/core/lib/gprpp/table.h", - "src/core/lib/gprpp/tchar.cc", - "src/core/lib/gprpp/tchar.h", - "src/core/lib/gprpp/thd.h", - "src/core/lib/gprpp/time.cc", - "src/core/lib/gprpp/time.h", - "src/core/lib/gprpp/time_averaged_stats.cc", - "src/core/lib/gprpp/time_averaged_stats.h", - "src/core/lib/gprpp/time_util.cc", - "src/core/lib/gprpp/time_util.h", - "src/core/lib/gprpp/type_list.h", - "src/core/lib/gprpp/unique_type_name.h", - "src/core/lib/gprpp/uuid_v4.cc", - "src/core/lib/gprpp/uuid_v4.h", - "src/core/lib/gprpp/validation_errors.cc", - "src/core/lib/gprpp/validation_errors.h", - "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/gprpp/work_serializer.h", - "src/core/lib/gprpp/xxhash_inline.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", diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index fa913f66639..902f09a06f1 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -55,22 +55,22 @@ 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/lib/gprpp/construct_destruct.h - - src/core/lib/gprpp/crash.h - - src/core/lib/gprpp/debug_location.h - - src/core/lib/gprpp/env.h - - src/core/lib/gprpp/examine_stack.h - - src/core/lib/gprpp/fork.h - - src/core/lib/gprpp/host_port.h - - src/core/lib/gprpp/memory.h - - src/core/lib/gprpp/mpscq.h - - src/core/lib/gprpp/no_destruct.h - - src/core/lib/gprpp/stat.h - - src/core/lib/gprpp/strerror.h - - src/core/lib/gprpp/sync.h - - src/core/lib/gprpp/tchar.h - - src/core/lib/gprpp/thd.h - - src/core/lib/gprpp/time_util.h + - src/core/util/construct_destruct.h + - src/core/util/crash.h + - src/core/util/debug_location.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/memory.h + - src/core/util/mpscq.h + - src/core/util/no_destruct.h + - src/core/util/stat.h + - src/core/util/strerror.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 @@ -81,21 +81,21 @@ 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/lib/gprpp/crash.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/mpscq.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/strerror.cc - - src/core/lib/gprpp/tchar.cc - - src/core/lib/gprpp/time_util.cc - - src/core/lib/gprpp/windows/env.cc - - src/core/lib/gprpp/windows/stat.cc - - src/core/lib/gprpp/windows/thd.cc + - src/core/util/crash.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/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 @@ -877,38 +877,38 @@ 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/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/chunked_vector.h - - src/core/lib/gprpp/cpp_impl_of.h - - src/core/lib/gprpp/directory_reader.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/dual_ref_counted.h - - src/core/lib/gprpp/dump_args.h - - src/core/lib/gprpp/if_list.h - - src/core/lib/gprpp/load_file.h - - src/core/lib/gprpp/manual_constructor.h - - src/core/lib/gprpp/match.h - - src/core/lib/gprpp/notification.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/overload.h - - src/core/lib/gprpp/packed_table.h - - src/core/lib/gprpp/per_cpu.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h - - src/core/lib/gprpp/ref_counted_string.h - - src/core/lib/gprpp/single_set_ptr.h - - src/core/lib/gprpp/sorted_pack.h - - src/core/lib/gprpp/status_helper.h - - src/core/lib/gprpp/table.h - - src/core/lib/gprpp/time.h - - src/core/lib/gprpp/time_averaged_stats.h - - src/core/lib/gprpp/type_list.h - - src/core/lib/gprpp/unique_type_name.h - - src/core/lib/gprpp/uuid_v4.h - - src/core/lib/gprpp/validation_errors.h - - src/core/lib/gprpp/work_serializer.h - - src/core/lib/gprpp/xxhash_inline.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 @@ -1719,18 +1719,18 @@ 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/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/load_file.cc - - src/core/lib/gprpp/per_cpu.cc - - src/core/lib/gprpp/posix/directory_reader.cc - - src/core/lib/gprpp/ref_counted_string.cc - - src/core/lib/gprpp/status_helper.cc - - src/core/lib/gprpp/time.cc - - src/core/lib/gprpp/time_averaged_stats.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/work_serializer.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 @@ -2422,36 +2422,36 @@ 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/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/chunked_vector.h - - src/core/lib/gprpp/cpp_impl_of.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/dual_ref_counted.h - - src/core/lib/gprpp/dump_args.h - - src/core/lib/gprpp/if_list.h - - src/core/lib/gprpp/load_file.h - - src/core/lib/gprpp/manual_constructor.h - - src/core/lib/gprpp/match.h - - src/core/lib/gprpp/notification.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/overload.h - - src/core/lib/gprpp/packed_table.h - - src/core/lib/gprpp/per_cpu.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h - - src/core/lib/gprpp/ref_counted_string.h - - src/core/lib/gprpp/single_set_ptr.h - - src/core/lib/gprpp/sorted_pack.h - - src/core/lib/gprpp/status_helper.h - - src/core/lib/gprpp/table.h - - src/core/lib/gprpp/time.h - - src/core/lib/gprpp/time_averaged_stats.h - - src/core/lib/gprpp/type_list.h - - src/core/lib/gprpp/unique_type_name.h - - src/core/lib/gprpp/uuid_v4.h - - src/core/lib/gprpp/validation_errors.h - - src/core/lib/gprpp/work_serializer.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 @@ -2879,16 +2879,16 @@ 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/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/load_file.cc - - src/core/lib/gprpp/per_cpu.cc - - src/core/lib/gprpp/ref_counted_string.cc - - src/core/lib/gprpp/status_helper.cc - - src/core/lib/gprpp/time.cc - - src/core/lib/gprpp/time_averaged_stats.cc - - src/core/lib/gprpp/uuid_v4.cc - - src/core/lib/gprpp/validation_errors.cc - - src/core/lib/gprpp/work_serializer.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 @@ -4517,34 +4517,34 @@ 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/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/chunked_vector.h - - src/core/lib/gprpp/cpp_impl_of.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/dual_ref_counted.h - - src/core/lib/gprpp/dump_args.h - - src/core/lib/gprpp/if_list.h - - src/core/lib/gprpp/load_file.h - - src/core/lib/gprpp/manual_constructor.h - - src/core/lib/gprpp/match.h - - src/core/lib/gprpp/notification.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/overload.h - - src/core/lib/gprpp/packed_table.h - - src/core/lib/gprpp/per_cpu.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h - - src/core/lib/gprpp/ref_counted_string.h - - src/core/lib/gprpp/sorted_pack.h - - src/core/lib/gprpp/status_helper.h - - src/core/lib/gprpp/table.h - - src/core/lib/gprpp/time.h - - src/core/lib/gprpp/time_averaged_stats.h - - src/core/lib/gprpp/type_list.h - - src/core/lib/gprpp/unique_type_name.h - - src/core/lib/gprpp/validation_errors.h - - src/core/lib/gprpp/work_serializer.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 @@ -4849,15 +4849,15 @@ 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/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/load_file.cc - - src/core/lib/gprpp/per_cpu.cc - - src/core/lib/gprpp/ref_counted_string.cc - - src/core/lib/gprpp/status_helper.cc - - src/core/lib/gprpp/time.cc - - src/core/lib/gprpp/time_averaged_stats.cc - - src/core/lib/gprpp/validation_errors.cc - - src/core/lib/gprpp/work_serializer.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 @@ -5244,12 +5244,12 @@ targets: headers: - src/core/lib/debug/trace.h - src/core/lib/event_engine/event_engine_context.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.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 @@ -5398,7 +5398,7 @@ targets: language: c++ headers: - src/core/lib/debug/trace.h - - src/core/lib/gprpp/bitset.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 @@ -5751,10 +5751,10 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.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/util/avl.h src: - test/core/avl/avl_test.cc @@ -6253,7 +6253,7 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/bitset.h + - src/core/util/bitset.h - src/core/util/useful.h src: - test/core/gprpp/bitset_test.cc @@ -6389,25 +6389,25 @@ targets: - src/core/lib/event_engine/event_engine_context.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/chunked_vector.h - - src/core/lib/gprpp/cpp_impl_of.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/dual_ref_counted.h - - src/core/lib/gprpp/dump_args.h - - src/core/lib/gprpp/if_list.h - - src/core/lib/gprpp/manual_constructor.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/packed_table.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h - - src/core/lib/gprpp/ref_counted_string.h - - src/core/lib/gprpp/sorted_pack.h - - src/core/lib/gprpp/status_helper.h - - src/core/lib/gprpp/table.h - - src/core/lib/gprpp/time.h - - src/core/lib/gprpp/type_list.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 @@ -6490,10 +6490,10 @@ targets: - src/core/lib/debug/trace.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/ref_counted_string.cc - - src/core/lib/gprpp/status_helper.cc - - src/core/lib/gprpp/time.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 @@ -7687,17 +7687,17 @@ targets: - src/core/lib/event_engine/event_engine_context.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/chunked_vector.h - - src/core/lib/gprpp/cpp_impl_of.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/manual_constructor.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h - - src/core/lib/gprpp/status_helper.h - - src/core/lib/gprpp/time.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 @@ -7756,8 +7756,8 @@ targets: - src/core/lib/debug/trace.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/status_helper.cc - - src/core/lib/gprpp/time.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 @@ -8160,7 +8160,7 @@ targets: language: c++ headers: - src/core/lib/event_engine/common_closures.h - - src/core/lib/gprpp/notification.h + - src/core/util/notification.h src: - test/core/event_engine/common_closures_test.cc deps: @@ -8421,7 +8421,7 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/down_cast.h + - src/core/util/down_cast.h - src/core/lib/promise/context.h src: - test/core/promise/context_test.cc @@ -8447,7 +8447,7 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/cpp_impl_of.h + - src/core/util/cpp_impl_of.h src: - test/core/gprpp/cpp_impl_of_test.cc deps: @@ -8694,7 +8694,7 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/down_cast.h + - src/core/util/down_cast.h src: - test/core/gprpp/down_cast_test.cc deps: @@ -8733,9 +8733,9 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/dump_args.h + - src/core/util/dump_args.h src: - - src/core/lib/gprpp/dump_args.cc + - src/core/util/dump_args.cc - test/core/gprpp/dump_args_test.cc deps: - gtest @@ -8990,21 +8990,21 @@ targets: headers: - src/core/lib/channel/channel_args.h - src/core/lib/event_engine/channel_args_endpoint_config.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/dual_ref_counted.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h - - src/core/lib/gprpp/ref_counted_string.h - - src/core/lib/gprpp/time.h + - src/core/util/atomic_utils.h + - src/core/util/down_cast.h + - src/core/util/dual_ref_counted.h + - src/core/util/orphanable.h + - src/core/util/ref_counted.h + - 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/gprpp/ref_counted_string.cc - - src/core/lib/gprpp/time.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: @@ -9231,15 +9231,15 @@ targets: - src/core/lib/event_engine/event_engine_context.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/manual_constructor.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h - - src/core/lib/gprpp/status_helper.h - - src/core/lib/gprpp/time.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 @@ -9284,8 +9284,8 @@ targets: - src/core/lib/debug/trace.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/status_helper.cc - - src/core/lib/gprpp/time.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 @@ -9842,16 +9842,16 @@ targets: - src/core/lib/event_engine/event_engine_context.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/cpp_impl_of.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/manual_constructor.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h - - src/core/lib/gprpp/status_helper.h - - src/core/lib/gprpp/time.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 @@ -9915,8 +9915,8 @@ targets: - src/core/lib/debug/trace.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/status_helper.cc - - src/core/lib/gprpp/time.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 @@ -9973,16 +9973,16 @@ targets: - src/core/lib/event_engine/event_engine_context.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/cpp_impl_of.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/manual_constructor.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h - - src/core/lib/gprpp/status_helper.h - - src/core/lib/gprpp/time.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 @@ -10051,8 +10051,8 @@ targets: - src/core/lib/debug/trace.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/status_helper.cc - - src/core/lib/gprpp/time.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 @@ -11457,7 +11457,7 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/if_list.h + - src/core/util/if_list.h src: - test/core/gprpp/if_list_test.cc deps: @@ -11582,11 +11582,11 @@ targets: headers: - src/core/lib/debug/trace.h - src/core/lib/event_engine/event_engine_context.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.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 @@ -11719,34 +11719,34 @@ 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/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/chunked_vector.h - - src/core/lib/gprpp/cpp_impl_of.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/dual_ref_counted.h - - src/core/lib/gprpp/dump_args.h - - src/core/lib/gprpp/if_list.h - - src/core/lib/gprpp/load_file.h - - src/core/lib/gprpp/manual_constructor.h - - src/core/lib/gprpp/match.h - - src/core/lib/gprpp/notification.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/overload.h - - src/core/lib/gprpp/packed_table.h - - src/core/lib/gprpp/per_cpu.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h - - src/core/lib/gprpp/ref_counted_string.h - - src/core/lib/gprpp/sorted_pack.h - - src/core/lib/gprpp/status_helper.h - - src/core/lib/gprpp/table.h - - src/core/lib/gprpp/time.h - - src/core/lib/gprpp/time_averaged_stats.h - - src/core/lib/gprpp/type_list.h - - src/core/lib/gprpp/unique_type_name.h - - src/core/lib/gprpp/validation_errors.h - - src/core/lib/gprpp/work_serializer.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 @@ -12020,15 +12020,15 @@ 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/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/load_file.cc - - src/core/lib/gprpp/per_cpu.cc - - src/core/lib/gprpp/ref_counted_string.cc - - src/core/lib/gprpp/status_helper.cc - - src/core/lib/gprpp/time.cc - - src/core/lib/gprpp/time_averaged_stats.cc - - src/core/lib/gprpp/validation_errors.cc - - src/core/lib/gprpp/work_serializer.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 @@ -12222,16 +12222,16 @@ targets: - src/core/lib/event_engine/event_engine_context.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/cpp_impl_of.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/manual_constructor.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h - - src/core/lib/gprpp/status_helper.h - - src/core/lib/gprpp/time.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 @@ -12292,8 +12292,8 @@ targets: - src/core/lib/debug/trace.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/status_helper.cc - - src/core/lib/gprpp/time.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 @@ -12486,7 +12486,7 @@ targets: language: c++ headers: - src/core/lib/debug/trace.h - - src/core/lib/gprpp/bitset.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 @@ -12730,12 +12730,12 @@ targets: headers: - src/core/lib/debug/trace.h - src/core/lib/event_engine/event_engine_context.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.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 @@ -12916,16 +12916,16 @@ targets: - src/core/lib/event_engine/event_engine_context.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/cpp_impl_of.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/manual_constructor.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.h - - src/core/lib/gprpp/status_helper.h - - src/core/lib/gprpp/time.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 @@ -12994,8 +12994,8 @@ targets: - src/core/lib/debug/trace.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/status_helper.cc - - src/core/lib/gprpp/time.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 @@ -13042,8 +13042,8 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/match.h - - src/core/lib/gprpp/overload.h + - src/core/util/match.h + - src/core/util/overload.h src: - test/core/gprpp/match_test.cc deps: @@ -13522,11 +13522,11 @@ targets: language: c++ headers: - src/core/lib/event_engine/event_engine_context.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.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 @@ -13630,8 +13630,8 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/construct_destruct.h - - src/core/lib/gprpp/no_destruct.h + - src/core/util/construct_destruct.h + - src/core/util/no_destruct.h src: - test/core/gprpp/no_destruct_test.cc deps: @@ -13794,7 +13794,7 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/notification.h + - src/core/util/notification.h src: - test/core/gprpp/notification_test.cc deps: @@ -13817,12 +13817,12 @@ targets: language: c++ headers: - src/core/lib/event_engine/event_engine_context.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/notification.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.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 @@ -13981,7 +13981,7 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/overload.h + - src/core/util/overload.h src: - test/core/gprpp/overload_test.cc deps: @@ -14157,10 +14157,10 @@ targets: - src/core/lib/debug/trace.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/manual_constructor.h - - src/core/lib/gprpp/status_helper.h - - src/core/lib/gprpp/time.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 @@ -14199,8 +14199,8 @@ targets: - src/core/lib/debug/trace.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/status_helper.cc - - src/core/lib/gprpp/time.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 @@ -14735,12 +14735,12 @@ targets: headers: - src/core/lib/debug/trace.h - src/core/lib/event_engine/event_engine_context.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.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 @@ -18652,7 +18652,7 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/single_set_ptr.h + - src/core/util/single_set_ptr.h src: - test/core/gprpp/single_set_ptr_test.cc deps: @@ -18762,8 +18762,8 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/sorted_pack.h - - src/core/lib/gprpp/type_list.h + - src/core/util/sorted_pack.h + - src/core/util/type_list.h src: - test/core/gprpp/sorted_pack_test.cc deps: @@ -19149,8 +19149,8 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/table.h + - src/core/util/bitset.h + - src/core/util/table.h - src/core/util/useful.h src: - test/core/gprpp/table_test.cc @@ -19371,14 +19371,14 @@ targets: headers: - src/core/lib/event_engine/posix_engine/timer.h - src/core/lib/event_engine/posix_engine/timer_heap.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/time.h - - src/core/lib/gprpp/time_averaged_stats.h + - src/core/util/bitset.h + - src/core/util/time.h + - src/core/util/time_averaged_stats.h src: - src/core/lib/event_engine/posix_engine/timer.cc - src/core/lib/event_engine/posix_engine/timer_heap.cc - - src/core/lib/gprpp/time.cc - - src/core/lib/gprpp/time_averaged_stats.cc + - src/core/util/time.cc + - src/core/util/time_averaged_stats.cc - test/core/event_engine/posix/timer_heap_test.cc deps: - gtest @@ -19392,13 +19392,13 @@ targets: headers: - src/core/lib/event_engine/posix_engine/timer.h - src/core/lib/event_engine/posix_engine/timer_heap.h - - src/core/lib/gprpp/time.h - - src/core/lib/gprpp/time_averaged_stats.h + - src/core/util/time.h + - src/core/util/time_averaged_stats.h src: - src/core/lib/event_engine/posix_engine/timer.cc - src/core/lib/event_engine/posix_engine/timer_heap.cc - - src/core/lib/gprpp/time.cc - - src/core/lib/gprpp/time_averaged_stats.cc + - src/core/util/time.cc + - src/core/util/time_averaged_stats.cc - test/core/event_engine/posix/timer_list_test.cc deps: - gtest @@ -19443,9 +19443,9 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/time.h + - src/core/util/time.h src: - - src/core/lib/gprpp/time.cc + - src/core/util/time.cc - test/core/gprpp/time_test.cc deps: - gtest @@ -19760,10 +19760,10 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.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 @@ -20259,7 +20259,7 @@ targets: language: c++ headers: - src/core/lib/debug/trace.h - - src/core/lib/gprpp/bitset.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 @@ -20320,7 +20320,7 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/unique_type_name.h + - src/core/util/unique_type_name.h - src/core/util/useful.h src: - test/core/gprpp/unique_type_name_test.cc @@ -20401,12 +20401,12 @@ targets: language: c++ headers: - src/core/lib/event_engine/event_engine_context.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/notification.h - - src/core/lib/gprpp/orphanable.h - - src/core/lib/gprpp/ref_counted.h - - src/core/lib/gprpp/ref_counted_ptr.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 @@ -20889,10 +20889,10 @@ targets: language: c++ headers: - src/core/ext/transport/chttp2/transport/write_size_policy.h - - src/core/lib/gprpp/time.h + - src/core/util/time.h src: - src/core/ext/transport/chttp2/transport/write_size_policy.cc - - src/core/lib/gprpp/time.cc + - src/core/util/time.cc - test/core/transport/chttp2/write_size_policy_test.cc deps: - gtest diff --git a/config.m4 b/config.m4 index 79e933c07d5..b75f5ff4ca4 100644 --- a/config.m4 +++ b/config.m4 @@ -513,33 +513,33 @@ 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/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/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 \ @@ -1530,10 +1530,10 @@ 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/lib/gprpp) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gprpp/linux) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gprpp/posix) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gprpp/windows) + 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) diff --git a/fuzztest/core/transport/chttp2/hpack_encoder_timeout_test.cc b/fuzztest/core/transport/chttp2/hpack_encoder_timeout_test.cc index 6ab0dfadb10..dab3d8f8431 100644 --- a/fuzztest/core/transport/chttp2/hpack_encoder_timeout_test.cc +++ b/fuzztest/core/transport/chttp2/hpack_encoder_timeout_test.cc @@ -27,7 +27,7 @@ #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/metadata_batch.h" diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 8753ed96916..b1389d7f303 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -959,54 +959,54 @@ 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/lib/gprpp/atomic_utils.h', - 'src/core/lib/gprpp/bitset.h', - 'src/core/lib/gprpp/chunked_vector.h', - 'src/core/lib/gprpp/construct_destruct.h', - 'src/core/lib/gprpp/cpp_impl_of.h', - 'src/core/lib/gprpp/crash.h', - 'src/core/lib/gprpp/debug_location.h', - 'src/core/lib/gprpp/directory_reader.h', - 'src/core/lib/gprpp/down_cast.h', - 'src/core/lib/gprpp/dual_ref_counted.h', - 'src/core/lib/gprpp/dump_args.h', - 'src/core/lib/gprpp/env.h', - 'src/core/lib/gprpp/examine_stack.h', - 'src/core/lib/gprpp/fork.h', - 'src/core/lib/gprpp/host_port.h', - 'src/core/lib/gprpp/if_list.h', - 'src/core/lib/gprpp/load_file.h', - 'src/core/lib/gprpp/manual_constructor.h', - 'src/core/lib/gprpp/match.h', - 'src/core/lib/gprpp/memory.h', - 'src/core/lib/gprpp/mpscq.h', - 'src/core/lib/gprpp/no_destruct.h', - 'src/core/lib/gprpp/notification.h', - 'src/core/lib/gprpp/orphanable.h', - 'src/core/lib/gprpp/overload.h', - 'src/core/lib/gprpp/packed_table.h', - 'src/core/lib/gprpp/per_cpu.h', - 'src/core/lib/gprpp/ref_counted.h', - 'src/core/lib/gprpp/ref_counted_ptr.h', - 'src/core/lib/gprpp/ref_counted_string.h', - 'src/core/lib/gprpp/single_set_ptr.h', - 'src/core/lib/gprpp/sorted_pack.h', - 'src/core/lib/gprpp/stat.h', - 'src/core/lib/gprpp/status_helper.h', - 'src/core/lib/gprpp/strerror.h', - 'src/core/lib/gprpp/sync.h', - 'src/core/lib/gprpp/table.h', - 'src/core/lib/gprpp/tchar.h', - 'src/core/lib/gprpp/thd.h', - 'src/core/lib/gprpp/time.h', - 'src/core/lib/gprpp/time_averaged_stats.h', - 'src/core/lib/gprpp/time_util.h', - 'src/core/lib/gprpp/type_list.h', - 'src/core/lib/gprpp/unique_type_name.h', - 'src/core/lib/gprpp/uuid_v4.h', - 'src/core/lib/gprpp/validation_errors.h', - 'src/core/lib/gprpp/work_serializer.h', - 'src/core/lib/gprpp/xxhash_inline.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', @@ -2234,54 +2234,54 @@ 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/lib/gprpp/atomic_utils.h', - 'src/core/lib/gprpp/bitset.h', - 'src/core/lib/gprpp/chunked_vector.h', - 'src/core/lib/gprpp/construct_destruct.h', - 'src/core/lib/gprpp/cpp_impl_of.h', - 'src/core/lib/gprpp/crash.h', - 'src/core/lib/gprpp/debug_location.h', - 'src/core/lib/gprpp/directory_reader.h', - 'src/core/lib/gprpp/down_cast.h', - 'src/core/lib/gprpp/dual_ref_counted.h', - 'src/core/lib/gprpp/dump_args.h', - 'src/core/lib/gprpp/env.h', - 'src/core/lib/gprpp/examine_stack.h', - 'src/core/lib/gprpp/fork.h', - 'src/core/lib/gprpp/host_port.h', - 'src/core/lib/gprpp/if_list.h', - 'src/core/lib/gprpp/load_file.h', - 'src/core/lib/gprpp/manual_constructor.h', - 'src/core/lib/gprpp/match.h', - 'src/core/lib/gprpp/memory.h', - 'src/core/lib/gprpp/mpscq.h', - 'src/core/lib/gprpp/no_destruct.h', - 'src/core/lib/gprpp/notification.h', - 'src/core/lib/gprpp/orphanable.h', - 'src/core/lib/gprpp/overload.h', - 'src/core/lib/gprpp/packed_table.h', - 'src/core/lib/gprpp/per_cpu.h', - 'src/core/lib/gprpp/ref_counted.h', - 'src/core/lib/gprpp/ref_counted_ptr.h', - 'src/core/lib/gprpp/ref_counted_string.h', - 'src/core/lib/gprpp/single_set_ptr.h', - 'src/core/lib/gprpp/sorted_pack.h', - 'src/core/lib/gprpp/stat.h', - 'src/core/lib/gprpp/status_helper.h', - 'src/core/lib/gprpp/strerror.h', - 'src/core/lib/gprpp/sync.h', - 'src/core/lib/gprpp/table.h', - 'src/core/lib/gprpp/tchar.h', - 'src/core/lib/gprpp/thd.h', - 'src/core/lib/gprpp/time.h', - 'src/core/lib/gprpp/time_averaged_stats.h', - 'src/core/lib/gprpp/time_util.h', - 'src/core/lib/gprpp/type_list.h', - 'src/core/lib/gprpp/unique_type_name.h', - 'src/core/lib/gprpp/uuid_v4.h', - 'src/core/lib/gprpp/validation_errors.h', - 'src/core/lib/gprpp/work_serializer.h', - 'src/core/lib/gprpp/xxhash_inline.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', diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 528b93db132..ae387ec590e 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -1366,81 +1366,81 @@ 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/lib/gprpp/atomic_utils.h', - 'src/core/lib/gprpp/bitset.h', - 'src/core/lib/gprpp/chunked_vector.h', - 'src/core/lib/gprpp/construct_destruct.h', - 'src/core/lib/gprpp/cpp_impl_of.h', - 'src/core/lib/gprpp/crash.cc', - 'src/core/lib/gprpp/crash.h', - 'src/core/lib/gprpp/debug_location.h', - 'src/core/lib/gprpp/directory_reader.h', - 'src/core/lib/gprpp/down_cast.h', - 'src/core/lib/gprpp/dual_ref_counted.h', - 'src/core/lib/gprpp/dump_args.cc', - 'src/core/lib/gprpp/dump_args.h', - 'src/core/lib/gprpp/env.h', - 'src/core/lib/gprpp/examine_stack.cc', - 'src/core/lib/gprpp/examine_stack.h', - 'src/core/lib/gprpp/fork.cc', - 'src/core/lib/gprpp/fork.h', - 'src/core/lib/gprpp/host_port.cc', - 'src/core/lib/gprpp/host_port.h', - 'src/core/lib/gprpp/if_list.h', - 'src/core/lib/gprpp/linux/env.cc', - 'src/core/lib/gprpp/load_file.cc', - 'src/core/lib/gprpp/load_file.h', - 'src/core/lib/gprpp/manual_constructor.h', - 'src/core/lib/gprpp/match.h', - 'src/core/lib/gprpp/memory.h', - 'src/core/lib/gprpp/mpscq.cc', - 'src/core/lib/gprpp/mpscq.h', - 'src/core/lib/gprpp/no_destruct.h', - 'src/core/lib/gprpp/notification.h', - 'src/core/lib/gprpp/orphanable.h', - 'src/core/lib/gprpp/overload.h', - 'src/core/lib/gprpp/packed_table.h', - 'src/core/lib/gprpp/per_cpu.cc', - 'src/core/lib/gprpp/per_cpu.h', - '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.h', - 'src/core/lib/gprpp/ref_counted_ptr.h', - 'src/core/lib/gprpp/ref_counted_string.cc', - 'src/core/lib/gprpp/ref_counted_string.h', - 'src/core/lib/gprpp/single_set_ptr.h', - 'src/core/lib/gprpp/sorted_pack.h', - 'src/core/lib/gprpp/stat.h', - 'src/core/lib/gprpp/status_helper.cc', - 'src/core/lib/gprpp/status_helper.h', - 'src/core/lib/gprpp/strerror.cc', - 'src/core/lib/gprpp/strerror.h', - 'src/core/lib/gprpp/sync.h', - 'src/core/lib/gprpp/table.h', - 'src/core/lib/gprpp/tchar.cc', - 'src/core/lib/gprpp/tchar.h', - 'src/core/lib/gprpp/thd.h', - 'src/core/lib/gprpp/time.cc', - 'src/core/lib/gprpp/time.h', - 'src/core/lib/gprpp/time_averaged_stats.cc', - 'src/core/lib/gprpp/time_averaged_stats.h', - 'src/core/lib/gprpp/time_util.cc', - 'src/core/lib/gprpp/time_util.h', - 'src/core/lib/gprpp/type_list.h', - 'src/core/lib/gprpp/unique_type_name.h', - 'src/core/lib/gprpp/uuid_v4.cc', - 'src/core/lib/gprpp/uuid_v4.h', - 'src/core/lib/gprpp/validation_errors.cc', - 'src/core/lib/gprpp/validation_errors.h', - '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/gprpp/work_serializer.h', - 'src/core/lib/gprpp/xxhash_inline.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', @@ -3017,54 +3017,54 @@ 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/lib/gprpp/atomic_utils.h', - 'src/core/lib/gprpp/bitset.h', - 'src/core/lib/gprpp/chunked_vector.h', - 'src/core/lib/gprpp/construct_destruct.h', - 'src/core/lib/gprpp/cpp_impl_of.h', - 'src/core/lib/gprpp/crash.h', - 'src/core/lib/gprpp/debug_location.h', - 'src/core/lib/gprpp/directory_reader.h', - 'src/core/lib/gprpp/down_cast.h', - 'src/core/lib/gprpp/dual_ref_counted.h', - 'src/core/lib/gprpp/dump_args.h', - 'src/core/lib/gprpp/env.h', - 'src/core/lib/gprpp/examine_stack.h', - 'src/core/lib/gprpp/fork.h', - 'src/core/lib/gprpp/host_port.h', - 'src/core/lib/gprpp/if_list.h', - 'src/core/lib/gprpp/load_file.h', - 'src/core/lib/gprpp/manual_constructor.h', - 'src/core/lib/gprpp/match.h', - 'src/core/lib/gprpp/memory.h', - 'src/core/lib/gprpp/mpscq.h', - 'src/core/lib/gprpp/no_destruct.h', - 'src/core/lib/gprpp/notification.h', - 'src/core/lib/gprpp/orphanable.h', - 'src/core/lib/gprpp/overload.h', - 'src/core/lib/gprpp/packed_table.h', - 'src/core/lib/gprpp/per_cpu.h', - 'src/core/lib/gprpp/ref_counted.h', - 'src/core/lib/gprpp/ref_counted_ptr.h', - 'src/core/lib/gprpp/ref_counted_string.h', - 'src/core/lib/gprpp/single_set_ptr.h', - 'src/core/lib/gprpp/sorted_pack.h', - 'src/core/lib/gprpp/stat.h', - 'src/core/lib/gprpp/status_helper.h', - 'src/core/lib/gprpp/strerror.h', - 'src/core/lib/gprpp/sync.h', - 'src/core/lib/gprpp/table.h', - 'src/core/lib/gprpp/tchar.h', - 'src/core/lib/gprpp/thd.h', - 'src/core/lib/gprpp/time.h', - 'src/core/lib/gprpp/time_averaged_stats.h', - 'src/core/lib/gprpp/time_util.h', - 'src/core/lib/gprpp/type_list.h', - 'src/core/lib/gprpp/unique_type_name.h', - 'src/core/lib/gprpp/uuid_v4.h', - 'src/core/lib/gprpp/validation_errors.h', - 'src/core/lib/gprpp/work_serializer.h', - 'src/core/lib/gprpp/xxhash_inline.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', diff --git a/grpc.gemspec b/grpc.gemspec index adab660276e..845e8a42004 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -1253,81 +1253,81 @@ 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/lib/gprpp/atomic_utils.h ) - s.files += %w( src/core/lib/gprpp/bitset.h ) - s.files += %w( src/core/lib/gprpp/chunked_vector.h ) - s.files += %w( src/core/lib/gprpp/construct_destruct.h ) - s.files += %w( src/core/lib/gprpp/cpp_impl_of.h ) - s.files += %w( src/core/lib/gprpp/crash.cc ) - s.files += %w( src/core/lib/gprpp/crash.h ) - s.files += %w( src/core/lib/gprpp/debug_location.h ) - s.files += %w( src/core/lib/gprpp/directory_reader.h ) - s.files += %w( src/core/lib/gprpp/down_cast.h ) - s.files += %w( src/core/lib/gprpp/dual_ref_counted.h ) - s.files += %w( src/core/lib/gprpp/dump_args.cc ) - s.files += %w( src/core/lib/gprpp/dump_args.h ) - s.files += %w( src/core/lib/gprpp/env.h ) - s.files += %w( src/core/lib/gprpp/examine_stack.cc ) - s.files += %w( src/core/lib/gprpp/examine_stack.h ) - s.files += %w( src/core/lib/gprpp/fork.cc ) - s.files += %w( src/core/lib/gprpp/fork.h ) - s.files += %w( src/core/lib/gprpp/host_port.cc ) - s.files += %w( src/core/lib/gprpp/host_port.h ) - s.files += %w( src/core/lib/gprpp/if_list.h ) - s.files += %w( src/core/lib/gprpp/linux/env.cc ) - s.files += %w( src/core/lib/gprpp/load_file.cc ) - s.files += %w( src/core/lib/gprpp/load_file.h ) - s.files += %w( src/core/lib/gprpp/manual_constructor.h ) - s.files += %w( src/core/lib/gprpp/match.h ) - s.files += %w( src/core/lib/gprpp/memory.h ) - s.files += %w( src/core/lib/gprpp/mpscq.cc ) - s.files += %w( src/core/lib/gprpp/mpscq.h ) - s.files += %w( src/core/lib/gprpp/no_destruct.h ) - s.files += %w( src/core/lib/gprpp/notification.h ) - s.files += %w( src/core/lib/gprpp/orphanable.h ) - s.files += %w( src/core/lib/gprpp/overload.h ) - s.files += %w( src/core/lib/gprpp/packed_table.h ) - s.files += %w( src/core/lib/gprpp/per_cpu.cc ) - s.files += %w( src/core/lib/gprpp/per_cpu.h ) - s.files += %w( src/core/lib/gprpp/posix/directory_reader.cc ) - s.files += %w( src/core/lib/gprpp/posix/env.cc ) - s.files += %w( src/core/lib/gprpp/posix/stat.cc ) - s.files += %w( src/core/lib/gprpp/posix/thd.cc ) - s.files += %w( src/core/lib/gprpp/ref_counted.h ) - s.files += %w( src/core/lib/gprpp/ref_counted_ptr.h ) - s.files += %w( src/core/lib/gprpp/ref_counted_string.cc ) - s.files += %w( src/core/lib/gprpp/ref_counted_string.h ) - s.files += %w( src/core/lib/gprpp/single_set_ptr.h ) - s.files += %w( src/core/lib/gprpp/sorted_pack.h ) - s.files += %w( src/core/lib/gprpp/stat.h ) - s.files += %w( src/core/lib/gprpp/status_helper.cc ) - s.files += %w( src/core/lib/gprpp/status_helper.h ) - s.files += %w( src/core/lib/gprpp/strerror.cc ) - s.files += %w( src/core/lib/gprpp/strerror.h ) - s.files += %w( src/core/lib/gprpp/sync.h ) - s.files += %w( src/core/lib/gprpp/table.h ) - s.files += %w( src/core/lib/gprpp/tchar.cc ) - s.files += %w( src/core/lib/gprpp/tchar.h ) - s.files += %w( src/core/lib/gprpp/thd.h ) - s.files += %w( src/core/lib/gprpp/time.cc ) - s.files += %w( src/core/lib/gprpp/time.h ) - s.files += %w( src/core/lib/gprpp/time_averaged_stats.cc ) - s.files += %w( src/core/lib/gprpp/time_averaged_stats.h ) - s.files += %w( src/core/lib/gprpp/time_util.cc ) - s.files += %w( src/core/lib/gprpp/time_util.h ) - s.files += %w( src/core/lib/gprpp/type_list.h ) - s.files += %w( src/core/lib/gprpp/unique_type_name.h ) - s.files += %w( src/core/lib/gprpp/uuid_v4.cc ) - s.files += %w( src/core/lib/gprpp/uuid_v4.h ) - s.files += %w( src/core/lib/gprpp/validation_errors.cc ) - s.files += %w( src/core/lib/gprpp/validation_errors.h ) - s.files += %w( src/core/lib/gprpp/windows/directory_reader.cc ) - s.files += %w( src/core/lib/gprpp/windows/env.cc ) - s.files += %w( src/core/lib/gprpp/windows/stat.cc ) - s.files += %w( src/core/lib/gprpp/windows/thd.cc ) - s.files += %w( src/core/lib/gprpp/work_serializer.cc ) - s.files += %w( src/core/lib/gprpp/work_serializer.h ) - s.files += %w( src/core/lib/gprpp/xxhash_inline.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 ) diff --git a/grpc.gyp b/grpc.gyp index c9ad0b79cf9..2d3dfb9968e 100644 --- a/grpc.gyp +++ b/grpc.gyp @@ -227,21 +227,21 @@ 'src/core/lib/gpr/windows/sync.cc', 'src/core/lib/gpr/windows/time.cc', 'src/core/lib/gpr/windows/tmpfile.cc', - 'src/core/lib/gprpp/crash.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/mpscq.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/strerror.cc', - 'src/core/lib/gprpp/tchar.cc', - 'src/core/lib/gprpp/time_util.cc', - 'src/core/lib/gprpp/windows/env.cc', - 'src/core/lib/gprpp/windows/stat.cc', - 'src/core/lib/gprpp/windows/thd.cc', + 'src/core/util/crash.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/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', ], }, { @@ -768,16 +768,16 @@ '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/load_file.cc', - 'src/core/lib/gprpp/per_cpu.cc', - 'src/core/lib/gprpp/posix/directory_reader.cc', - 'src/core/lib/gprpp/ref_counted_string.cc', - 'src/core/lib/gprpp/status_helper.cc', - 'src/core/lib/gprpp/time.cc', - 'src/core/lib/gprpp/time_averaged_stats.cc', - 'src/core/lib/gprpp/validation_errors.cc', - 'src/core/lib/gprpp/windows/directory_reader.cc', - 'src/core/lib/gprpp/work_serializer.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/validation_errors.cc', + 'src/core/util/windows/directory_reader.cc', + 'src/core/util/work_serializer.cc', 'src/core/lib/handshaker/proxy_mapper_registry.cc', 'src/core/lib/http/format_request.cc', 'src/core/lib/http/httpcli.cc', @@ -1311,14 +1311,14 @@ '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/load_file.cc', - 'src/core/lib/gprpp/per_cpu.cc', - 'src/core/lib/gprpp/ref_counted_string.cc', - 'src/core/lib/gprpp/status_helper.cc', - 'src/core/lib/gprpp/time.cc', - 'src/core/lib/gprpp/time_averaged_stats.cc', - 'src/core/lib/gprpp/validation_errors.cc', - 'src/core/lib/gprpp/work_serializer.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/handshaker/proxy_mapper_registry.cc', 'src/core/lib/http/format_request.cc', 'src/core/lib/http/httpcli.cc', @@ -2120,14 +2120,14 @@ '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/load_file.cc', - 'src/core/lib/gprpp/per_cpu.cc', - 'src/core/lib/gprpp/ref_counted_string.cc', - 'src/core/lib/gprpp/status_helper.cc', - 'src/core/lib/gprpp/time.cc', - 'src/core/lib/gprpp/time_averaged_stats.cc', - 'src/core/lib/gprpp/validation_errors.cc', - 'src/core/lib/gprpp/work_serializer.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/handshaker/proxy_mapper_registry.cc', 'src/core/lib/iomgr/buffer_list.cc', 'src/core/lib/iomgr/call_combiner.cc', diff --git a/include/grpcpp/impl/sync.h b/include/grpcpp/impl/sync.h index 9288459196a..54ada5cf886 100644 --- a/include/grpcpp/impl/sync.h +++ b/include/grpcpp/impl/sync.h @@ -37,9 +37,9 @@ // The core library is not accessible in C++ codegen headers, and vice versa. // Thus, we need to have duplicate headers with similar functionality. // Make sure any change to this file is also reflected in -// src/core/lib/gprpp/sync.h too. +// src/core/util/sync.h too. // -// Whenever possible, prefer "src/core/lib/gprpp/sync.h" over this file, +// Whenever possible, prefer "src/core/util/sync.h" over this file, // since in core we do not rely on g_core_codegen_interface and hence do not // pay the costs of virtual function calls. diff --git a/package.xml b/package.xml index bb799c90382..c17bf278384 100644 --- a/package.xml +++ b/package.xml @@ -1235,81 +1235,81 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/core/BUILD b/src/core/BUILD index 7f967981c5a..a8bd59a3a76 100644 --- a/src/core/BUILD +++ b/src/core/BUILD @@ -51,10 +51,10 @@ grpc_cc_library( grpc_cc_library( name = "dump_args", srcs = [ - "lib/gprpp/dump_args.cc", + "util/dump_args.cc", ], hdrs = [ - "lib/gprpp/dump_args.h", + "util/dump_args.h", ], external_deps = [ "absl/functional:any_invocable", @@ -170,7 +170,7 @@ grpc_cc_library( grpc_cc_library( name = "atomic_utils", language = "c++", - public_hdrs = ["lib/gprpp/atomic_utils.h"], + public_hdrs = ["util/atomic_utils.h"], deps = ["//:gpr"], ) @@ -251,10 +251,10 @@ grpc_cc_library( grpc_cc_library( name = "examine_stack", srcs = [ - "lib/gprpp/examine_stack.cc", + "util/examine_stack.cc", ], hdrs = [ - "lib/gprpp/examine_stack.h", + "util/examine_stack.h", ], external_deps = ["absl/types:optional"], deps = ["//:gpr_platform"], @@ -286,7 +286,7 @@ grpc_cc_library( name = "gpr_manual_constructor", srcs = [], hdrs = [ - "lib/gprpp/manual_constructor.h", + "util/manual_constructor.h", ], language = "c++", deps = [ @@ -311,12 +311,12 @@ grpc_cc_library( grpc_cc_library( name = "env", srcs = [ - "lib/gprpp/linux/env.cc", - "lib/gprpp/posix/env.cc", - "lib/gprpp/windows/env.cc", + "util/linux/env.cc", + "util/posix/env.cc", + "util/windows/env.cc", ], hdrs = [ - "lib/gprpp/env.h", + "util/env.h", ], external_deps = ["absl/types:optional"], deps = [ @@ -328,11 +328,11 @@ grpc_cc_library( grpc_cc_library( name = "directory_reader", srcs = [ - "lib/gprpp/posix/directory_reader.cc", - "lib/gprpp/windows/directory_reader.cc", + "util/posix/directory_reader.cc", + "util/windows/directory_reader.cc", ], hdrs = [ - "lib/gprpp/directory_reader.h", + "util/directory_reader.h", ], external_deps = [ "absl/functional:function_ref", @@ -348,7 +348,7 @@ grpc_cc_library( grpc_cc_library( name = "chunked_vector", - hdrs = ["lib/gprpp/chunked_vector.h"], + hdrs = ["util/chunked_vector.h"], external_deps = [ "absl/log:check", ], @@ -362,17 +362,17 @@ grpc_cc_library( grpc_cc_library( name = "construct_destruct", language = "c++", - public_hdrs = ["lib/gprpp/construct_destruct.h"], + public_hdrs = ["util/construct_destruct.h"], deps = ["//:gpr_platform"], ) grpc_cc_library( name = "status_helper", srcs = [ - "lib/gprpp/status_helper.cc", + "util/status_helper.cc", ], hdrs = [ - "lib/gprpp/status_helper.h", + "util/status_helper.h", ], external_deps = [ "absl/log:check", @@ -397,7 +397,7 @@ grpc_cc_library( grpc_cc_library( name = "unique_type_name", - hdrs = ["lib/gprpp/unique_type_name.h"], + hdrs = ["util/unique_type_name.h"], external_deps = ["absl/strings"], language = "c++", deps = [ @@ -409,10 +409,10 @@ grpc_cc_library( grpc_cc_library( name = "validation_errors", srcs = [ - "lib/gprpp/validation_errors.cc", + "util/validation_errors.cc", ], hdrs = [ - "lib/gprpp/validation_errors.h", + "util/validation_errors.h", ], external_deps = [ "absl/log:log", @@ -426,7 +426,7 @@ grpc_cc_library( grpc_cc_library( name = "overload", language = "c++", - public_hdrs = ["lib/gprpp/overload.h"], + public_hdrs = ["util/overload.h"], deps = ["//:gpr_platform"], ) @@ -434,7 +434,7 @@ grpc_cc_library( name = "match", external_deps = ["absl/types:variant"], language = "c++", - public_hdrs = ["lib/gprpp/match.h"], + public_hdrs = ["util/match.h"], deps = [ "overload", "//:gpr_platform", @@ -448,7 +448,7 @@ grpc_cc_library( "absl/utility", ], language = "c++", - public_hdrs = ["lib/gprpp/table.h"], + public_hdrs = ["util/table.h"], deps = [ "bitset", "//:gpr_platform", @@ -457,7 +457,7 @@ grpc_cc_library( grpc_cc_library( name = "packed_table", - hdrs = ["lib/gprpp/packed_table.h"], + hdrs = ["util/packed_table.h"], language = "c++", deps = [ "sorted_pack", @@ -469,7 +469,7 @@ grpc_cc_library( grpc_cc_library( name = "bitset", language = "c++", - public_hdrs = ["lib/gprpp/bitset.h"], + public_hdrs = ["util/bitset.h"], deps = [ "useful", "//:gpr_platform", @@ -479,7 +479,7 @@ grpc_cc_library( grpc_cc_library( name = "no_destruct", language = "c++", - public_hdrs = ["lib/gprpp/no_destruct.h"], + public_hdrs = ["util/no_destruct.h"], deps = [ "construct_destruct", "//:gpr_platform", @@ -489,10 +489,10 @@ grpc_cc_library( grpc_cc_library( name = "tchar", srcs = [ - "lib/gprpp/tchar.cc", + "util/tchar.cc", ], hdrs = [ - "lib/gprpp/tchar.h", + "util/tchar.h", ], deps = ["//:gpr_platform"], ) @@ -1216,7 +1216,7 @@ grpc_cc_library( "absl/log:log", ], language = "c++", - public_hdrs = ["lib/gprpp/ref_counted.h"], + public_hdrs = ["util/ref_counted.h"], deps = [ "atomic_utils", "down_cast", @@ -1233,7 +1233,7 @@ grpc_cc_library( "absl/log:log", ], language = "c++", - public_hdrs = ["lib/gprpp/dual_ref_counted.h"], + public_hdrs = ["util/dual_ref_counted.h"], deps = [ "down_cast", "ref_counted", @@ -1247,10 +1247,10 @@ grpc_cc_library( grpc_cc_library( name = "ref_counted_string", srcs = [ - "lib/gprpp/ref_counted_string.cc", + "util/ref_counted_string.cc", ], hdrs = [ - "lib/gprpp/ref_counted_string.h", + "util/ref_counted_string.h", ], external_deps = ["absl/strings"], language = "c++", @@ -1263,10 +1263,10 @@ grpc_cc_library( grpc_cc_library( name = "uuid_v4", - srcs = ["lib/gprpp/uuid_v4.cc"], + srcs = ["util/uuid_v4.cc"], external_deps = ["absl/strings:str_format"], language = "c++", - public_hdrs = ["lib/gprpp/uuid_v4.h"], + public_hdrs = ["util/uuid_v4.h"], deps = ["//:gpr"], ) @@ -1694,10 +1694,10 @@ grpc_cc_library( grpc_cc_library( name = "time", srcs = [ - "lib/gprpp/time.cc", + "util/time.cc", ], hdrs = [ - "lib/gprpp/time.h", + "util/time.h", ], external_deps = [ "absl/log:check", @@ -1766,9 +1766,9 @@ grpc_cc_library( grpc_cc_library( name = "time_averaged_stats", - srcs = ["lib/gprpp/time_averaged_stats.cc"], + srcs = ["util/time_averaged_stats.cc"], hdrs = [ - "lib/gprpp/time_averaged_stats.h", + "util/time_averaged_stats.h", ], deps = ["//:gpr"], ) @@ -3027,10 +3027,10 @@ grpc_cc_library( grpc_cc_library( name = "per_cpu", srcs = [ - "lib/gprpp/per_cpu.cc", + "util/per_cpu.cc", ], hdrs = [ - "lib/gprpp/per_cpu.h", + "util/per_cpu.h", ], deps = [ "useful", @@ -3061,10 +3061,10 @@ grpc_cc_library( grpc_cc_library( name = "load_file", srcs = [ - "lib/gprpp/load_file.cc", + "util/load_file.cc", ], hdrs = [ - "lib/gprpp/load_file.h", + "util/load_file.h", ], external_deps = [ "absl/cleanup", @@ -3161,7 +3161,7 @@ grpc_cc_library( grpc_cc_library( name = "single_set_ptr", hdrs = [ - "lib/gprpp/single_set_ptr.h", + "util/single_set_ptr.h", ], external_deps = [ "absl/log:check", @@ -3219,7 +3219,7 @@ grpc_cc_library( grpc_cc_library( name = "notification", hdrs = [ - "lib/gprpp/notification.h", + "util/notification.h", ], external_deps = ["absl/time"], deps = ["//:gpr"], @@ -3770,7 +3770,7 @@ grpc_cc_library( grpc_cc_library( name = "sorted_pack", hdrs = [ - "lib/gprpp/sorted_pack.h", + "util/sorted_pack.h", ], language = "c++", deps = [ @@ -3782,7 +3782,7 @@ grpc_cc_library( grpc_cc_library( name = "type_list", hdrs = [ - "lib/gprpp/type_list.h", + "util/type_list.h", ], language = "c++", ) @@ -3790,7 +3790,7 @@ grpc_cc_library( grpc_cc_library( name = "if_list", hdrs = [ - "lib/gprpp/if_list.h", + "util/if_list.h", ], language = "c++", deps = ["//:gpr_platform"], @@ -4198,10 +4198,10 @@ grpc_cc_library( grpc_cc_library( name = "strerror", srcs = [ - "lib/gprpp/strerror.cc", + "util/strerror.cc", ], hdrs = [ - "lib/gprpp/strerror.h", + "util/strerror.h", ], external_deps = ["absl/strings:str_format"], deps = ["//:gpr_platform"], @@ -5795,7 +5795,7 @@ grpc_cc_library( grpc_cc_library( name = "down_cast", - hdrs = ["lib/gprpp/down_cast.h"], + hdrs = ["util/down_cast.h"], external_deps = [ "absl/base:config", "absl/log:check", @@ -5861,7 +5861,7 @@ grpc_cc_library( grpc_cc_library( name = "xxhash_inline", - hdrs = ["lib/gprpp/xxhash_inline.h"], + hdrs = ["util/xxhash_inline.h"], external_deps = ["xxhash"], language = "c++", deps = ["//:gpr_platform"], diff --git a/src/core/channelz/channel_trace.cc b/src/core/channelz/channel_trace.cc index 6e6884cd703..14aeb059b5d 100644 --- a/src/core/channelz/channel_trace.cc +++ b/src/core/channelz/channel_trace.cc @@ -28,7 +28,7 @@ #include #include "src/core/channelz/channelz.h" -#include "src/core/lib/gprpp/time.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" diff --git a/src/core/channelz/channel_trace.h b/src/core/channelz/channel_trace.h index c6c245c5cf5..eb9ef19e643 100644 --- a/src/core/channelz/channel_trace.h +++ b/src/core/channelz/channel_trace.h @@ -28,8 +28,8 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.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 { diff --git a/src/core/channelz/channelz.h b/src/core/channelz/channelz.h index e441edc81a6..e2527d002fa 100644 --- a/src/core/channelz/channelz.h +++ b/src/core/channelz/channelz.h @@ -38,10 +38,10 @@ #include #include "src/core/channelz/channel_trace.h" -#include "src/core/lib/gprpp/per_cpu.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.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 8089cc273bf..87194091e0e 100644 --- a/src/core/channelz/channelz_registry.cc +++ b/src/core/channelz/channelz_registry.cc @@ -34,7 +34,7 @@ #include #include "src/core/channelz/channelz.h" -#include "src/core/lib/gprpp/sync.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" diff --git a/src/core/channelz/channelz_registry.h b/src/core/channelz/channelz_registry.h index 39525597b4f..f849ac1ac84 100644 --- a/src/core/channelz/channelz_registry.h +++ b/src/core/channelz/channelz_registry.h @@ -28,8 +28,8 @@ #include #include "src/core/channelz/channelz.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/ref_counted_ptr.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 94adb85d44f..1d8234de626 100644 --- a/src/core/client_channel/backup_poller.cc +++ b/src/core/client_channel/backup_poller.cc @@ -29,8 +29,8 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/gprpp/time.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" diff --git a/src/core/client_channel/client_channel.cc b/src/core/client_channel/client_channel.cc index 5395efce7b9..84626bea009 100644 --- a/src/core/client_channel/client_channel.cc +++ b/src/core/client_channel/client_channel.cc @@ -66,13 +66,13 @@ #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/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/manual_constructor.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/unique_type_name.h" -#include "src/core/lib/gprpp/work_serializer.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" diff --git a/src/core/client_channel/client_channel.h b/src/core/client_channel/client_channel.h index abe53bbf689..475b53d0d00 100644 --- a/src/core/client_channel/client_channel.h +++ b/src/core/client_channel/client_channel.h @@ -27,7 +27,7 @@ #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/lib/gprpp/single_set_ptr.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" diff --git a/src/core/client_channel/client_channel_factory.h b/src/core/client_channel/client_channel_factory.h index e72f9923dd1..1d07749535a 100644 --- a/src/core/client_channel/client_channel_factory.h +++ b/src/core/client_channel/client_channel_factory.h @@ -23,7 +23,7 @@ #include "src/core/client_channel/subchannel.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/resolved_address.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 f0c58c1580f..28bbd5322c9 100644 --- a/src/core/client_channel/client_channel_filter.cc +++ b/src/core/client_channel/client_channel_filter.cc @@ -68,13 +68,13 @@ #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/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/manual_constructor.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/unique_type_name.h" -#include "src/core/lib/gprpp/work_serializer.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" diff --git a/src/core/client_channel/client_channel_filter.h b/src/core/client_channel/client_channel_filter.h index 9233c846c6f..b21d3513c1f 100644 --- a/src/core/client_channel/client_channel_filter.h +++ b/src/core/client_channel/client_channel_filter.h @@ -47,12 +47,12 @@ #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/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/work_serializer.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" diff --git a/src/core/client_channel/client_channel_internal.h b/src/core/client_channel/client_channel_internal.h index b4d204834ab..62ca5a424b4 100644 --- a/src/core/client_channel/client_channel_internal.h +++ b/src/core/client_channel/client_channel_internal.h @@ -27,7 +27,7 @@ #include #include "src/core/lib/channel/context.h" -#include "src/core/lib/gprpp/unique_type_name.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" diff --git a/src/core/client_channel/client_channel_service_config.h b/src/core/client_channel/client_channel_service_config.h index 60340e2685f..d74f6d77fb0 100644 --- a/src/core/client_channel/client_channel_service_config.h +++ b/src/core/client_channel/client_channel_service_config.h @@ -29,9 +29,9 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.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" diff --git a/src/core/client_channel/config_selector.h b/src/core/client_channel/config_selector.h index 0a0a6d54c80..c6b1ff30ede 100644 --- a/src/core/client_channel/config_selector.h +++ b/src/core/client_channel/config_selector.h @@ -33,8 +33,8 @@ #include "src/core/client_channel/client_channel_internal.h" #include "src/core/lib/channel/channel_fwd.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" diff --git a/src/core/client_channel/connector.h b/src/core/client_channel/connector.h index 5c218dd7d41..328255534d6 100644 --- a/src/core/client_channel/connector.h +++ b/src/core/client_channel/connector.h @@ -21,9 +21,9 @@ #include "src/core/channelz/channelz.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.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" diff --git a/src/core/client_channel/dynamic_filters.cc b/src/core/client_channel/dynamic_filters.cc index c589f860807..2f0d1d85040 100644 --- a/src/core/client_channel/dynamic_filters.cc +++ b/src/core/client_channel/dynamic_filters.cc @@ -33,7 +33,7 @@ #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/lib/gprpp/status_helper.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" diff --git a/src/core/client_channel/dynamic_filters.h b/src/core/client_channel/dynamic_filters.h index d6aa9b4cf7e..a540c056d91 100644 --- a/src/core/client_channel/dynamic_filters.h +++ b/src/core/client_channel/dynamic_filters.h @@ -28,10 +28,10 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.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" diff --git a/src/core/client_channel/global_subchannel_pool.h b/src/core/client_channel/global_subchannel_pool.h index bad648a595d..76ef31af385 100644 --- a/src/core/client_channel/global_subchannel_pool.h +++ b/src/core/client_channel/global_subchannel_pool.h @@ -26,8 +26,8 @@ #include "absl/base/thread_annotations.h" #include "src/core/client_channel/subchannel_pool_interface.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/client_channel/local_subchannel_pool.h b/src/core/client_channel/local_subchannel_pool.h index 5e4cce51b28..a6e1933bbe0 100644 --- a/src/core/client_channel/local_subchannel_pool.h +++ b/src/core/client_channel/local_subchannel_pool.h @@ -24,7 +24,7 @@ #include #include "src/core/client_channel/subchannel_pool_interface.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/client_channel/retry_filter.cc b/src/core/client_channel/retry_filter.cc index 87145a03b03..f7874f6dff5 100644 --- a/src/core/client_channel/retry_filter.cc +++ b/src/core/client_channel/retry_filter.cc @@ -33,7 +33,7 @@ #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/lib/gprpp/ref_counted_ptr.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" diff --git a/src/core/client_channel/retry_filter.h b/src/core/client_channel/retry_filter.h index 0da23f845b2..ae57ec31789 100644 --- a/src/core/client_channel/retry_filter.h +++ b/src/core/client_channel/retry_filter.h @@ -40,7 +40,7 @@ #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/lib/gprpp/ref_counted_ptr.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/useful.h" 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 a047afc1546..fdc4ee98517 100644 --- a/src/core/client_channel/retry_filter_legacy_call_data.cc +++ b/src/core/client_channel/retry_filter_legacy_call_data.cc @@ -35,13 +35,13 @@ #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/lib/gprpp/construct_destruct.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.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" 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 dcbbb93eb77..542d216b41e 100644 --- a/src/core/client_channel/retry_filter_legacy_call_data.h +++ b/src/core/client_channel/retry_filter_legacy_call_data.h @@ -38,11 +38,11 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.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" diff --git a/src/core/client_channel/retry_service_config.h b/src/core/client_channel/retry_service_config.h index 6e4bbc29753..479125b6321 100644 --- a/src/core/client_channel/retry_service_config.h +++ b/src/core/client_channel/retry_service_config.h @@ -30,8 +30,8 @@ #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/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.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" diff --git a/src/core/client_channel/retry_throttle.h b/src/core/client_channel/retry_throttle.h index ec1899b0967..3cb32604277 100644 --- a/src/core/client_channel/retry_throttle.h +++ b/src/core/client_channel/retry_throttle.h @@ -30,9 +30,9 @@ #include -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" namespace grpc_core { namespace internal { diff --git a/src/core/client_channel/subchannel.cc b/src/core/client_channel/subchannel.cc index e3e16f83c76..a8a3e2416a9 100644 --- a/src/core/client_channel/subchannel.cc +++ b/src/core/client_channel/subchannel.cc @@ -52,12 +52,12 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/sync.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" diff --git a/src/core/client_channel/subchannel.h b/src/core/client_channel/subchannel.h index 91b8014ced3..d71b5eacc54 100644 --- a/src/core/client_channel/subchannel.h +++ b/src/core/client_channel/subchannel.h @@ -37,15 +37,15 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/dual_ref_counted.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/unique_type_name.h" -#include "src/core/lib/gprpp/work_serializer.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" diff --git a/src/core/client_channel/subchannel_interface_internal.h b/src/core/client_channel/subchannel_interface_internal.h index fc5b9faaed5..9f488d1d8c9 100644 --- a/src/core/client_channel/subchannel_interface_internal.h +++ b/src/core/client_channel/subchannel_interface_internal.h @@ -20,7 +20,7 @@ #include #include "src/core/client_channel/subchannel.h" -#include "src/core/lib/gprpp/unique_type_name.h" +#include "src/core/util/unique_type_name.h" #include "src/core/load_balancing/subchannel_interface.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 6c02214ccdc..c8b0f84b656 100644 --- a/src/core/client_channel/subchannel_pool_interface.h +++ b/src/core/client_channel/subchannel_pool_interface.h @@ -27,8 +27,8 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" diff --git a/src/core/client_channel/subchannel_stream_client.cc b/src/core/client_channel/subchannel_stream_client.cc index ab3118d4442..dad48421f48 100644 --- a/src/core/client_channel/subchannel_stream_client.cc +++ b/src/core/client_channel/subchannel_stream_client.cc @@ -29,10 +29,10 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.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" diff --git a/src/core/client_channel/subchannel_stream_client.h b/src/core/client_channel/subchannel_stream_client.h index 7180f38fcd1..8461b25cb87 100644 --- a/src/core/client_channel/subchannel_stream_client.h +++ b/src/core/client_channel/subchannel_stream_client.h @@ -35,9 +35,9 @@ #include "src/core/client_channel/subchannel.h" #include "src/core/util/backoff.h" #include "src/core/lib/channel/context.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.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" 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 63a886bc991..7747c290cc1 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,12 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/no_destruct.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/per_cpu.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/sync.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" 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 001282276f1..230d71bb216 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,10 +29,10 @@ #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/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/single_set_ptr.h" -#include "src/core/lib/gprpp/time.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" 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 ae64f83ddc8..2d5bd0fcc4e 100644 --- a/src/core/ext/filters/fault_injection/fault_injection_filter.cc +++ b/src/core/ext/filters/fault_injection/fault_injection_filter.cc @@ -44,7 +44,7 @@ #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/lib/gprpp/time.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" 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 515df16a853..f2837cf9baf 100644 --- a/src/core/ext/filters/fault_injection/fault_injection_filter.h +++ b/src/core/ext/filters/fault_injection/fault_injection_filter.h @@ -30,7 +30,7 @@ #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/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/transport/transport.h" 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 bef8185fe27..d2981073bf1 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,8 +33,8 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.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" diff --git a/src/core/ext/filters/logging/logging_filter.cc b/src/core/ext/filters/logging/logging_filter.cc index b4ff60a8130..f14a520022e 100644 --- a/src/core/ext/filters/logging/logging_filter.cc +++ b/src/core/ext/filters/logging/logging_filter.cc @@ -55,8 +55,8 @@ #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/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/time.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" diff --git a/src/core/ext/filters/logging/logging_sink.h b/src/core/ext/filters/logging/logging_sink.h index b013cd9072e..71720799e4d 100644 --- a/src/core/ext/filters/logging/logging_sink.h +++ b/src/core/ext/filters/logging/logging_sink.h @@ -30,7 +30,7 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.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 200f6880883..37cc5044832 100644 --- a/src/core/ext/filters/message_size/message_size_filter.h +++ b/src/core/ext/filters/message_size/message_size_filter.h @@ -33,7 +33,7 @@ #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/lib/gprpp/validation_errors.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" 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 728a92e1bf0..8ad2b9f844d 100644 --- a/src/core/ext/filters/rbac/rbac_service_config_parser.h +++ b/src/core/ext/filters/rbac/rbac_service_config_parser.h @@ -30,7 +30,7 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/validation_errors.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" 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 f383f3fb9ed..0dd482e54e1 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,8 @@ #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/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/time.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" 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 64c488bce33..ba0389b055a 100644 --- a/src/core/ext/filters/stateful_session/stateful_session_filter.h +++ b/src/core/ext/filters/stateful_session/stateful_session_filter.h @@ -30,8 +30,8 @@ #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/lib/gprpp/ref_counted_string.h" -#include "src/core/lib/gprpp/unique_type_name.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" 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 ccb6245b28f..57d5d41515b 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,8 +30,8 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.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" diff --git a/src/core/ext/gcp/metadata_query.cc b/src/core/ext/gcp/metadata_query.cc index 4190d6bc818..0a3f78973ea 100644 --- a/src/core/ext/gcp/metadata_query.cc +++ b/src/core/ext/gcp/metadata_query.cc @@ -37,9 +37,9 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.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" diff --git a/src/core/ext/gcp/metadata_query.h b/src/core/ext/gcp/metadata_query.h index 395c1e6d995..c22c4a1fae4 100644 --- a/src/core/ext/gcp/metadata_query.h +++ b/src/core/ext/gcp/metadata_query.h @@ -24,8 +24,8 @@ #include -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/time.h" +#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" diff --git a/src/core/ext/transport/binder/client/channel_create.cc b/src/core/ext/transport/binder/client/channel_create.cc index 9f757f69bc7..b6f60c8139b 100644 --- a/src/core/ext/transport/binder/client/channel_create.cc +++ b/src/core/ext/transport/binder/client/channel_create.cc @@ -30,7 +30,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #ifdef GPR_SUPPORT_BINDER_TRANSPORT diff --git a/src/core/ext/transport/binder/client/connection_id_generator.h b/src/core/ext/transport/binder/client/connection_id_generator.h index d756ec1ced3..fbe945cfb74 100644 --- a/src/core/ext/transport/binder/client/connection_id_generator.h +++ b/src/core/ext/transport/binder/client/connection_id_generator.h @@ -21,7 +21,7 @@ #include -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" namespace grpc_binder { diff --git a/src/core/ext/transport/binder/client/endpoint_binder_pool.h b/src/core/ext/transport/binder/client/endpoint_binder_pool.h index f3452009b67..4f9ac233219 100644 --- a/src/core/ext/transport/binder/client/endpoint_binder_pool.h +++ b/src/core/ext/transport/binder/client/endpoint_binder_pool.h @@ -23,7 +23,7 @@ #include #include "src/core/ext/transport/binder/wire_format/binder.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" namespace grpc_binder { diff --git a/src/core/ext/transport/binder/client/jni_utils.cc b/src/core/ext/transport/binder/client/jni_utils.cc index 1133604a175..14ae20b090e 100644 --- a/src/core/ext/transport/binder/client/jni_utils.cc +++ b/src/core/ext/transport/binder/client/jni_utils.cc @@ -23,7 +23,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #if defined(ANDROID) || defined(__ANDROID__) diff --git a/src/core/ext/transport/binder/client/security_policy_setting.h b/src/core/ext/transport/binder/client/security_policy_setting.h index 212603744b9..46fb000246a 100644 --- a/src/core/ext/transport/binder/client/security_policy_setting.h +++ b/src/core/ext/transport/binder/client/security_policy_setting.h @@ -21,7 +21,7 @@ #include #include -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" namespace grpc_binder { diff --git a/src/core/ext/transport/binder/security_policy/binder_security_policy.cc b/src/core/ext/transport/binder/security_policy/binder_security_policy.cc index bd05a038113..1980626f754 100644 --- a/src/core/ext/transport/binder/security_policy/binder_security_policy.cc +++ b/src/core/ext/transport/binder/security_policy/binder_security_policy.cc @@ -28,7 +28,7 @@ #include #include "src/core/ext/transport/binder/client/jni_utils.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #endif diff --git a/src/core/ext/transport/binder/transport/binder_transport.cc b/src/core/ext/transport/binder/transport/binder_transport.cc index 691ac50d6e4..92d20f057c5 100644 --- a/src/core/ext/transport/binder/transport/binder_transport.cc +++ b/src/core/ext/transport/binder/transport/binder_transport.cc @@ -38,7 +38,7 @@ #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/lib/gprpp/crash.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" diff --git a/src/core/ext/transport/binder/transport/binder_transport.h b/src/core/ext/transport/binder/transport/binder_transport.h index 20399818762..d38c757d705 100644 --- a/src/core/ext/transport/binder/transport/binder_transport.h +++ b/src/core/ext/transport/binder/transport/binder_transport.h @@ -32,7 +32,7 @@ #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/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/transport/transport.h" diff --git a/src/core/ext/transport/binder/utils/ndk_binder.cc b/src/core/ext/transport/binder/utils/ndk_binder.cc index 08b0c824cb8..c92f4768191 100644 --- a/src/core/ext/transport/binder/utils/ndk_binder.cc +++ b/src/core/ext/transport/binder/utils/ndk_binder.cc @@ -27,8 +27,8 @@ #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/crash.h" +#include "src/core/util/sync.h" namespace { void* GetNdkBinderHandle() { diff --git a/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc b/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc index 9546109aa61..5a3cc10cb27 100644 --- a/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc +++ b/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc @@ -25,7 +25,7 @@ #include "absl/log/check.h" #include "absl/log/log.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc_binder { diff --git a/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h b/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h index 6fe22df4692..a671a5e8233 100644 --- a/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h +++ b/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h @@ -25,7 +25,7 @@ #include #include "src/core/ext/transport/binder/utils/transport_stream_receiver.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" namespace grpc_binder { diff --git a/src/core/ext/transport/binder/wire_format/binder.h b/src/core/ext/transport/binder/wire_format/binder.h index ce79c1332e8..7936fbb65ce 100644 --- a/src/core/ext/transport/binder/wire_format/binder.h +++ b/src/core/ext/transport/binder/wire_format/binder.h @@ -26,7 +26,7 @@ #include #include "src/core/ext/transport/binder/wire_format/binder_constants.h" -#include "src/core/lib/gprpp/orphanable.h" +#include "src/core/util/orphanable.h" namespace grpc_binder { diff --git a/src/core/ext/transport/binder/wire_format/binder_android.cc b/src/core/ext/transport/binder/wire_format/binder_android.cc index 6ca9b6dcecd..040913dab78 100644 --- a/src/core/ext/transport/binder/wire_format/binder_android.cc +++ b/src/core/ext/transport/binder/wire_format/binder_android.cc @@ -28,8 +28,8 @@ #include #include "src/core/ext/transport/binder/wire_format/binder_android.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/crash.h" +#include "src/core/util/sync.h" namespace grpc_binder { namespace { diff --git a/src/core/ext/transport/binder/wire_format/transaction.h b/src/core/ext/transport/binder/wire_format/transaction.h index 30f4af67ee1..ff27349d137 100644 --- a/src/core/ext/transport/binder/wire_format/transaction.h +++ b/src/core/ext/transport/binder/wire_format/transaction.h @@ -24,7 +24,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc_binder { diff --git a/src/core/ext/transport/binder/wire_format/wire_reader.h b/src/core/ext/transport/binder/wire_format/wire_reader.h index 2a4092d29d9..570f99ac683 100644 --- a/src/core/ext/transport/binder/wire_format/wire_reader.h +++ b/src/core/ext/transport/binder/wire_format/wire_reader.h @@ -22,7 +22,7 @@ #include "src/core/ext/transport/binder/wire_format/binder.h" #include "src/core/ext/transport/binder/wire_format/wire_writer.h" -#include "src/core/lib/gprpp/orphanable.h" +#include "src/core/util/orphanable.h" namespace grpc_binder { diff --git a/src/core/ext/transport/binder/wire_format/wire_reader_impl.cc b/src/core/ext/transport/binder/wire_format/wire_reader_impl.cc index 02cd6cf09cd..30dd0bfa01d 100644 --- a/src/core/ext/transport/binder/wire_format/wire_reader_impl.cc +++ b/src/core/ext/transport/binder/wire_format/wire_reader_impl.cc @@ -35,8 +35,8 @@ #include "src/core/ext/transport/binder/utils/transport_stream_receiver.h" #include "src/core/ext/transport/binder/wire_format/binder.h" #include "src/core/ext/transport/binder/wire_format/wire_writer.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/status_helper.h" +#include "src/core/util/crash.h" +#include "src/core/util/status_helper.h" namespace grpc_binder { namespace { diff --git a/src/core/ext/transport/binder/wire_format/wire_reader_impl.h b/src/core/ext/transport/binder/wire_format/wire_reader_impl.h index 48e80f718f6..a08cb6f4985 100644 --- a/src/core/ext/transport/binder/wire_format/wire_reader_impl.h +++ b/src/core/ext/transport/binder/wire_format/wire_reader_impl.h @@ -29,7 +29,7 @@ #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/lib/gprpp/notification.h" +#include "src/core/util/notification.h" namespace grpc_binder { diff --git a/src/core/ext/transport/binder/wire_format/wire_writer.cc b/src/core/ext/transport/binder/wire_format/wire_writer.cc index 6379bd17ff4..ba4779c29fb 100644 --- a/src/core/ext/transport/binder/wire_format/wire_writer.cc +++ b/src/core/ext/transport/binder/wire_format/wire_writer.cc @@ -28,7 +28,7 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #define RETURN_IF_ERROR(expr) \ do { \ 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 bb52c7385cc..2104ce047bb 100644 --- a/src/core/ext/transport/binder/wire_format/wire_writer.h +++ b/src/core/ext/transport/binder/wire_format/wire_writer.h @@ -25,7 +25,7 @@ #include "src/core/ext/transport/binder/wire_format/binder.h" #include "src/core/ext/transport/binder/wire_format/transaction.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "src/core/lib/iomgr/combiner.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 a5cf2893951..a04f66c79a0 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,10 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/no_destruct.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.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" 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 b8db7a52502..afb79cbd2ff 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,9 @@ #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/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.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" diff --git a/src/core/ext/transport/chaotic_good/client_transport.cc b/src/core/ext/transport/chaotic_good/client_transport.cc index 511d04f6ed1..06a214a7ccd 100644 --- a/src/core/ext/transport/chaotic_good/client_transport.cc +++ b/src/core/ext/transport/chaotic_good/client_transport.cc @@ -35,8 +35,8 @@ #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/lib/gprpp/match.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" diff --git a/src/core/ext/transport/chaotic_good/client_transport.h b/src/core/ext/transport/chaotic_good/client_transport.h index 12a96403d9a..30903fe0dd4 100644 --- a/src/core/ext/transport/chaotic_good/client_transport.h +++ b/src/core/ext/transport/chaotic_good/client_transport.h @@ -43,7 +43,7 @@ #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/lib/gprpp/sync.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" diff --git a/src/core/ext/transport/chaotic_good/frame.cc b/src/core/ext/transport/chaotic_good/frame.cc index e54465c29d3..9341e57dde7 100644 --- a/src/core/ext/transport/chaotic_good/frame.cc +++ b/src/core/ext/transport/chaotic_good/frame.cc @@ -29,9 +29,9 @@ #include #include "src/core/ext/transport/chaotic_good/frame_header.h" -#include "src/core/lib/gprpp/bitset.h" -#include "src/core/lib/gprpp/no_destruct.h" -#include "src/core/lib/gprpp/status_helper.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" diff --git a/src/core/ext/transport/chaotic_good/frame.h b/src/core/ext/transport/chaotic_good/frame.h index 2d820e85cce..b34d0e650bb 100644 --- a/src/core/ext/transport/chaotic_good/frame.h +++ b/src/core/ext/transport/chaotic_good/frame.h @@ -28,7 +28,7 @@ #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/lib/gprpp/match.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" diff --git a/src/core/ext/transport/chaotic_good/frame_header.h b/src/core/ext/transport/chaotic_good/frame_header.h index 8bfbe3effb1..507c0a7f436 100644 --- a/src/core/ext/transport/chaotic_good/frame_header.h +++ b/src/core/ext/transport/chaotic_good/frame_header.h @@ -23,7 +23,7 @@ #include -#include "src/core/lib/gprpp/bitset.h" +#include "src/core/util/bitset.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 524d9e68349..36366e9e1c1 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,11 @@ #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/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.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" 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 8511790c03b..afb1552a5b0 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,8 @@ #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/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.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" diff --git a/src/core/ext/transport/chaotic_good/server_transport.cc b/src/core/ext/transport/chaotic_good/server_transport.cc index bc4fbed3334..61cdc495897 100644 --- a/src/core/ext/transport/chaotic_good/server_transport.cc +++ b/src/core/ext/transport/chaotic_good/server_transport.cc @@ -34,7 +34,7 @@ #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/lib/gprpp/ref_counted_ptr.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" diff --git a/src/core/ext/transport/chaotic_good/server_transport.h b/src/core/ext/transport/chaotic_good/server_transport.h index 2cd1fb5974c..466fbe3ddfa 100644 --- a/src/core/ext/transport/chaotic_good/server_transport.h +++ b/src/core/ext/transport/chaotic_good/server_transport.h @@ -51,8 +51,8 @@ #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/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.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/if.h" diff --git a/src/core/ext/transport/chaotic_good/settings_metadata.cc b/src/core/ext/transport/chaotic_good/settings_metadata.cc index 9d395e8ae25..4de780677d4 100644 --- a/src/core/ext/transport/chaotic_good/settings_metadata.cc +++ b/src/core/ext/transport/chaotic_good/settings_metadata.cc @@ -18,7 +18,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.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 37f1a565736..1cc3de61871 100644 --- a/src/core/ext/transport/chttp2/client/chttp2_connector.cc +++ b/src/core/ext/transport/chttp2/client/chttp2_connector.cc @@ -55,11 +55,11 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/unique_type_name.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" diff --git a/src/core/ext/transport/chttp2/client/chttp2_connector.h b/src/core/ext/transport/chttp2/client/chttp2_connector.h index ffc90228655..226cc317caa 100644 --- a/src/core/ext/transport/chttp2/client/chttp2_connector.h +++ b/src/core/ext/transport/chttp2/client/chttp2_connector.h @@ -27,8 +27,8 @@ #include "src/core/client_channel/connector.h" #include "src/core/handshaker/handshaker.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.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" diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc index 39b2df1ce8a..2002464e733 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.cc +++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc @@ -61,13 +61,13 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/unique_type_name.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" diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc index 90cfdf3ad5e..ac4881c902f 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc @@ -76,12 +76,12 @@ #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/lib/gprpp/bitset.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.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" diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.h b/src/core/ext/transport/chttp2/transport/chttp2_transport.h index a98381b489d..08476bf0c84 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.h +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.h @@ -31,8 +31,8 @@ #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/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.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" diff --git a/src/core/ext/transport/chttp2/transport/flow_control.h b/src/core/ext/transport/chttp2/transport/flow_control.h index 3891845a4bd..f62a0dde4ff 100644 --- a/src/core/ext/transport/chttp2/transport/flow_control.h +++ b/src/core/ext/transport/chttp2/transport/flow_control.h @@ -37,7 +37,7 @@ #include "src/core/ext/transport/chttp2/transport/http2_settings.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/transport/bdp_estimator.h" diff --git a/src/core/ext/transport/chttp2/transport/frame.cc b/src/core/ext/transport/chttp2/transport/frame.cc index 9e05cf6d854..802dee12690 100644 --- a/src/core/ext/transport/chttp2/transport/frame.cc +++ b/src/core/ext/transport/chttp2/transport/frame.cc @@ -26,7 +26,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/transport/frame_data.cc b/src/core/ext/transport/chttp2/transport/frame_data.cc index 3476ab12481..91c6a43ef20 100644 --- a/src/core/ext/transport/chttp2/transport/frame_data.cc +++ b/src/core/ext/transport/chttp2/transport/frame_data.cc @@ -30,7 +30,7 @@ #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/status_helper.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" 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 22563924a07..6d4b6f36657 100644 --- a/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc +++ b/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc @@ -36,7 +36,7 @@ #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/lib/gprpp/status_helper.h" +#include "src/core/util/status_helper.h" #include "src/core/lib/transport/http2_errors.h" #include "src/core/lib/transport/metadata_batch.h" diff --git a/src/core/ext/transport/chttp2/transport/frame_settings.cc b/src/core/ext/transport/chttp2/transport/frame_settings.cc index 2d8227057ad..909523dc3a1 100644 --- a/src/core/ext/transport/chttp2/transport/frame_settings.cc +++ b/src/core/ext/transport/chttp2/transport/frame_settings.cc @@ -37,7 +37,7 @@ #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/lib/gprpp/debug_location.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/useful.h" diff --git a/src/core/ext/transport/chttp2/transport/frame_settings.h b/src/core/ext/transport/chttp2/transport/frame_settings.h index ba653c6a11c..e3ad2f89844 100644 --- a/src/core/ext/transport/chttp2/transport/frame_settings.h +++ b/src/core/ext/transport/chttp2/transport/frame_settings.h @@ -27,7 +27,7 @@ #include "src/core/ext/transport/chttp2/transport/http2_settings.h" #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" -#include "src/core/lib/gprpp/manual_constructor.h" +#include "src/core/util/manual_constructor.h" #include "src/core/lib/iomgr/error.h" typedef enum { diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc index 1d7ece76303..42894ea8dbd 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc @@ -35,7 +35,7 @@ #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/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/surface/validate_metadata.h" #include "src/core/lib/transport/timeout_encoding.h" diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder.h b/src/core/ext/transport/chttp2/transport/hpack_encoder.h index 94c520ae55b..8286be4a073 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_encoder.h +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.h @@ -35,7 +35,7 @@ #include "src/core/ext/transport/chttp2/transport/hpack_constants.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder_table.h" -#include "src/core/lib/gprpp/time.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" 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 c8a93a6a0ee..ab5e859f76e 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parse_result.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_parse_result.cc @@ -22,7 +22,7 @@ #include #include "src/core/ext/transport/chttp2/transport/hpack_constants.h" -#include "src/core/lib/gprpp/status_helper.h" +#include "src/core/util/status_helper.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice.h" 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 0d3a57ad3df..faf83186298 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parse_result.h +++ b/src/core/ext/transport/chttp2/transport/hpack_parse_result.h @@ -30,9 +30,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.cc b/src/core/ext/transport/chttp2/transport/hpack_parser.cc index 44ae22ea475..b7d13497419 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parser.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_parser.cc @@ -45,7 +45,7 @@ #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/lib/gprpp/match.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" 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 d126b3eeb43..618d76200f7 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parser_table.h +++ b/src/core/ext/transport/chttp2/transport/hpack_parser_table.h @@ -31,7 +31,7 @@ #include "src/core/ext/transport/chttp2/transport/hpack_constants.h" #include "src/core/ext/transport/chttp2/transport/hpack_parse_result.h" -#include "src/core/lib/gprpp/no_destruct.h" +#include "src/core/util/no_destruct.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/parsed_metadata.h" diff --git a/src/core/ext/transport/chttp2/transport/internal.h b/src/core/ext/transport/chttp2/transport/internal.h index ed596278686..d688b9d3aa6 100644 --- a/src/core/ext/transport/chttp2/transport/internal.h +++ b/src/core/ext/transport/chttp2/transport/internal.h @@ -59,11 +59,11 @@ #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/lib/gprpp/bitset.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.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" diff --git a/src/core/ext/transport/chttp2/transport/parsing.cc b/src/core/ext/transport/chttp2/transport/parsing.cc index 1093bfa5df1..5d600a6218c 100644 --- a/src/core/ext/transport/chttp2/transport/parsing.cc +++ b/src/core/ext/transport/chttp2/transport/parsing.cc @@ -63,8 +63,8 @@ #include "src/core/lib/channel/context.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.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" diff --git a/src/core/ext/transport/chttp2/transport/ping_abuse_policy.h b/src/core/ext/transport/chttp2/transport/ping_abuse_policy.h index 3d834a8665e..bff04089822 100644 --- a/src/core/ext/transport/chttp2/transport/ping_abuse_policy.h +++ b/src/core/ext/transport/chttp2/transport/ping_abuse_policy.h @@ -20,7 +20,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/transport/ping_callbacks.h b/src/core/ext/transport/chttp2/transport/ping_callbacks.h index 58a762aa013..6840a2b1a67 100644 --- a/src/core/ext/transport/chttp2/transport/ping_callbacks.h +++ b/src/core/ext/transport/chttp2/transport/ping_callbacks.h @@ -31,7 +31,7 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" extern grpc_core::TraceFlag grpc_ping_trace; diff --git a/src/core/ext/transport/chttp2/transport/ping_rate_policy.cc b/src/core/ext/transport/chttp2/transport/ping_rate_policy.cc index 143b08a67c7..6f329735306 100644 --- a/src/core/ext/transport/chttp2/transport/ping_rate_policy.cc +++ b/src/core/ext/transport/chttp2/transport/ping_rate_policy.cc @@ -24,7 +24,7 @@ #include #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/match.h" +#include "src/core/util/match.h" // How many pings do we allow to be inflight at any given time? // In older versions of gRPC this was implicitly 1. diff --git a/src/core/ext/transport/chttp2/transport/ping_rate_policy.h b/src/core/ext/transport/chttp2/transport/ping_rate_policy.h index 6dab7a361bc..df16b3813bc 100644 --- a/src/core/ext/transport/chttp2/transport/ping_rate_policy.h +++ b/src/core/ext/transport/chttp2/transport/ping_rate_policy.h @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/transport/stream_lists.cc b/src/core/ext/transport/chttp2/transport/stream_lists.cc index 424666044e6..302cc3cbb61 100644 --- a/src/core/ext/transport/chttp2/transport/stream_lists.cc +++ b/src/core/ext/transport/chttp2/transport/stream_lists.cc @@ -24,7 +24,7 @@ #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/lib/gprpp/bitset.h" +#include "src/core/util/bitset.h" static const char* stream_list_id_string(grpc_chttp2_stream_list_id id) { switch (id) { diff --git a/src/core/ext/transport/chttp2/transport/write_size_policy.h b/src/core/ext/transport/chttp2/transport/write_size_policy.h index a1eae8fec9e..fdeeda0763a 100644 --- a/src/core/ext/transport/chttp2/transport/write_size_policy.h +++ b/src/core/ext/transport/chttp2/transport/write_size_policy.h @@ -20,7 +20,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/transport/writing.cc b/src/core/ext/transport/chttp2/transport/writing.cc index 0cc28270314..d85dbc9c720 100644 --- a/src/core/ext/transport/chttp2/transport/writing.cc +++ b/src/core/ext/transport/chttp2/transport/writing.cc @@ -56,10 +56,10 @@ #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/lib/gprpp/match.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.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" @@ -74,7 +74,7 @@ #include "src/core/telemetry/stats_data.h" #include "src/core/util/useful.h" -// IWYU pragma: no_include "src/core/lib/gprpp/orphanable.h" +// IWYU pragma: no_include "src/core/util/orphanable.h" static void add_to_write_list(grpc_chttp2_write_cb** list, grpc_chttp2_write_cb* cb) { 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 60e277cb710..0e7824ccf20 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,7 +28,7 @@ #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/lib/gprpp/ref_counted_ptr.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" diff --git a/src/core/ext/transport/cronet/transport/cronet_transport.cc b/src/core/ext/transport/cronet/transport/cronet_transport.cc index 8e1242a3f4b..a369e55fa2c 100644 --- a/src/core/ext/transport/cronet/transport/cronet_transport.cc +++ b/src/core/ext/transport/cronet/transport/cronet_transport.cc @@ -47,9 +47,9 @@ #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/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/status_helper.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" diff --git a/src/core/ext/transport/inproc/inproc_transport.cc b/src/core/ext/transport/inproc/inproc_transport.cc index c5ea01739f4..1aff8360702 100644 --- a/src/core/ext/transport/inproc/inproc_transport.cc +++ b/src/core/ext/transport/inproc/inproc_transport.cc @@ -25,7 +25,7 @@ #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/lib/gprpp/crash.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" diff --git a/src/core/ext/transport/inproc/legacy_inproc_transport.cc b/src/core/ext/transport/inproc/legacy_inproc_transport.cc index bf63cc2e3a7..f3e7d85d2d6 100644 --- a/src/core/ext/transport/inproc/legacy_inproc_transport.cc +++ b/src/core/ext/transport/inproc/legacy_inproc_transport.cc @@ -48,10 +48,10 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.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" diff --git a/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc b/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc index 7db1842d5d8..b2a7bf2df6e 100644 --- a/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc +++ b/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc @@ -26,8 +26,8 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" diff --git a/src/core/handshaker/handshaker.cc b/src/core/handshaker/handshaker.cc index 9be4fd4383f..494da93bbbe 100644 --- a/src/core/handshaker/handshaker.cc +++ b/src/core/handshaker/handshaker.cc @@ -36,8 +36,8 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/status_helper.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" diff --git a/src/core/handshaker/handshaker.h b/src/core/handshaker/handshaker.h index f5df3824081..2c0b9e1ff20 100644 --- a/src/core/handshaker/handshaker.h +++ b/src/core/handshaker/handshaker.h @@ -31,10 +31,10 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.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" diff --git a/src/core/handshaker/http_connect/http_connect_handshaker.cc b/src/core/handshaker/http_connect/http_connect_handshaker.cc index 30773fe99b4..5fc9922dbd4 100644 --- a/src/core/handshaker/http_connect/http_connect_handshaker.cc +++ b/src/core/handshaker/http_connect/http_connect_handshaker.cc @@ -41,9 +41,9 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.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" diff --git a/src/core/handshaker/http_connect/http_proxy_mapper.cc b/src/core/handshaker/http_connect/http_proxy_mapper.cc index 26bdaaa2025..12851e25317 100644 --- a/src/core/handshaker/http_connect/http_proxy_mapper.cc +++ b/src/core/handshaker/http_connect/http_proxy_mapper.cc @@ -48,9 +48,9 @@ #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/gprpp/env.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/memory.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" diff --git a/src/core/handshaker/security/secure_endpoint.cc b/src/core/handshaker/security/secure_endpoint.cc index 922b111cab4..c0af9e374ec 100644 --- a/src/core/handshaker/security/secure_endpoint.cc +++ b/src/core/handshaker/security/secure_endpoint.cc @@ -42,9 +42,9 @@ #include "src/core/handshaker/security/tsi_error.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.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" diff --git a/src/core/handshaker/security/security_handshaker.cc b/src/core/handshaker/security/security_handshaker.cc index bf073a66561..abeb80bb0c2 100644 --- a/src/core/handshaker/security/security_handshaker.cc +++ b/src/core/handshaker/security/security_handshaker.cc @@ -51,10 +51,10 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/unique_type_name.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" diff --git a/src/core/handshaker/security/security_handshaker.h b/src/core/handshaker/security/security_handshaker.h index 9aa3bcfabc0..17d234402b7 100644 --- a/src/core/handshaker/security/security_handshaker.h +++ b/src/core/handshaker/security/security_handshaker.h @@ -27,7 +27,7 @@ #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/lib/gprpp/ref_counted_ptr.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" diff --git a/src/core/handshaker/security/tsi_error.cc b/src/core/handshaker/security/tsi_error.cc index 06b816df6ee..7b84542099f 100644 --- a/src/core/handshaker/security/tsi_error.cc +++ b/src/core/handshaker/security/tsi_error.cc @@ -20,7 +20,7 @@ #include -#include "src/core/lib/gprpp/status_helper.h" +#include "src/core/util/status_helper.h" grpc_error_handle grpc_set_tsi_error_result(grpc_error_handle error, tsi_result result) { diff --git a/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc b/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc index 3ec6ac829cf..449ad012c23 100644 --- a/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc +++ b/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc @@ -39,9 +39,9 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.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" diff --git a/src/core/lib/address_utils/parse_address.cc b/src/core/lib/address_utils/parse_address.cc index 8616507f401..b6108fb6d83 100644 --- a/src/core/lib/address_utils/parse_address.cc +++ b/src/core/lib/address_utils/parse_address.cc @@ -50,8 +50,8 @@ #include -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/status_helper.h" +#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" diff --git a/src/core/lib/address_utils/sockaddr_utils.cc b/src/core/lib/address_utils/sockaddr_utils.cc index 986cd846122..16e7da2d3d7 100644 --- a/src/core/lib/address_utils/sockaddr_utils.cc +++ b/src/core/lib/address_utils/sockaddr_utils.cc @@ -38,8 +38,8 @@ #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/host_port.h" +#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" diff --git a/src/core/lib/channel/channel_args.h b/src/core/lib/channel/channel_args.h index a57f1b1cea7..68f8c9618a0 100644 --- a/src/core/lib/channel/channel_args.h +++ b/src/core/lib/channel/channel_args.h @@ -37,12 +37,12 @@ #include #include -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/dual_ref_counted.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/ref_counted_string.h" -#include "src/core/lib/gprpp/time.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" diff --git a/src/core/lib/channel/channel_stack.h b/src/core/lib/channel/channel_stack.h index c414b33eb23..8523fab80b1 100644 --- a/src/core/lib/channel/channel_stack.h +++ b/src/core/lib/channel/channel_stack.h @@ -61,9 +61,9 @@ #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/lib/gprpp/manual_constructor.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.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" diff --git a/src/core/lib/channel/channel_stack_builder.h b/src/core/lib/channel/channel_stack_builder.h index b7c0f840d0f..6b88aca8b61 100644 --- a/src/core/lib/channel/channel_stack_builder.h +++ b/src/core/lib/channel/channel_stack_builder.h @@ -25,7 +25,7 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/surface/channel_stack_type.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 62c527ffe61..7dcdca90592 100644 --- a/src/core/lib/channel/channel_stack_builder_impl.cc +++ b/src/core/lib/channel/channel_stack_builder_impl.cc @@ -39,8 +39,8 @@ #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/lib/gprpp/no_destruct.h" -#include "src/core/lib/gprpp/sync.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" diff --git a/src/core/lib/channel/channel_stack_builder_impl.h b/src/core/lib/channel/channel_stack_builder_impl.h index 6f298b7c287..d0477b4fc6b 100644 --- a/src/core/lib/channel/channel_stack_builder_impl.h +++ b/src/core/lib/channel/channel_stack_builder_impl.h @@ -21,7 +21,7 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack_builder.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/channel/connected_channel.cc b/src/core/lib/channel/connected_channel.cc index bf6fe94471b..4a1fa16a94d 100644 --- a/src/core/lib/channel/connected_channel.cc +++ b/src/core/lib/channel/connected_channel.cc @@ -44,10 +44,10 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.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" diff --git a/src/core/lib/channel/promise_based_filter.cc b/src/core/lib/channel/promise_based_filter.cc index da858ee8d4f..b48fadfeb76 100644 --- a/src/core/lib/channel/promise_based_filter.cc +++ b/src/core/lib/channel/promise_based_filter.cc @@ -33,9 +33,9 @@ #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/manual_constructor.h" -#include "src/core/lib/gprpp/status_helper.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" diff --git a/src/core/lib/channel/promise_based_filter.h b/src/core/lib/channel/promise_based_filter.h index 5379bb6f66a..2c9ce728540 100644 --- a/src/core/lib/channel/promise_based_filter.h +++ b/src/core/lib/channel/promise_based_filter.h @@ -49,9 +49,9 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/match.h" -#include "src/core/lib/gprpp/time.h" +#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" diff --git a/src/core/lib/compression/compression_internal.cc b/src/core/lib/compression/compression_internal.cc index 6a2883f4883..1490664662b 100644 --- a/src/core/lib/compression/compression_internal.cc +++ b/src/core/lib/compression/compression_internal.cc @@ -34,9 +34,9 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/ref_counted_string.h" +#include "src/core/util/crash.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/ref_counted_string.h" namespace grpc_core { diff --git a/src/core/lib/compression/compression_internal.h b/src/core/lib/compression/compression_internal.h index 80434e6f59b..7636180cc07 100644 --- a/src/core/lib/compression/compression_internal.h +++ b/src/core/lib/compression/compression_internal.h @@ -30,7 +30,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/bitset.h" +#include "src/core/util/bitset.h" #include "src/core/lib/slice/slice.h" namespace grpc_core { diff --git a/src/core/lib/config/load_config.cc b/src/core/lib/config/load_config.cc index 1e9c3170a74..3d52fc4db03 100644 --- a/src/core/lib/config/load_config.cc +++ b/src/core/lib/config/load_config.cc @@ -24,7 +24,7 @@ #include -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.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 58df73794b9..5df39bac584 100644 --- a/src/core/lib/event_engine/ares_resolver.cc +++ b/src/core/lib/event_engine/ares_resolver.cc @@ -68,10 +68,10 @@ #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/gprpp/debug_location.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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 diff --git a/src/core/lib/event_engine/ares_resolver.h b/src/core/lib/event_engine/ares_resolver.h index 5c61bd7bd3d..81cc4808e20 100644 --- a/src/core/lib/event_engine/ares_resolver.h +++ b/src/core/lib/event_engine/ares_resolver.h @@ -40,8 +40,8 @@ #include "src/core/lib/event_engine/grpc_polled_fd.h" #include "src/core/lib/event_engine/ref_counted_dns_resolver_interface.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/sync.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/cf_engine/cf_engine.cc b/src/core/lib/event_engine/cf_engine/cf_engine.cc index 5b869962dfd..d717b42bb03 100644 --- a/src/core/lib/event_engine/cf_engine/cf_engine.cc +++ b/src/core/lib/event_engine/cf_engine/cf_engine.cc @@ -32,7 +32,7 @@ #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/utils.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc_event_engine { namespace experimental { 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 adba2e84e62..fafba5dbfd4 100644 --- a/src/core/lib/event_engine/cf_engine/cf_engine.h +++ b/src/core/lib/event_engine/cf_engine/cf_engine.h @@ -26,7 +26,7 @@ #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/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "src/core/lib/surface/init_internally.h" namespace grpc_event_engine { diff --git a/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc b/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc index a2307fe36f9..1adc85f6873 100644 --- a/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc +++ b/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc @@ -24,7 +24,7 @@ #include "src/core/lib/event_engine/cf_engine/cfstream_endpoint.h" #include "src/core/lib/event_engine/trace.h" -#include "src/core/lib/gprpp/strerror.h" +#include "src/core/util/strerror.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/cf_engine/cfstream_endpoint.h b/src/core/lib/event_engine/cf_engine/cfstream_endpoint.h index a8bb3dae273..8623dc888f0 100644 --- a/src/core/lib/event_engine/cf_engine/cfstream_endpoint.h +++ b/src/core/lib/event_engine/cf_engine/cfstream_endpoint.h @@ -30,9 +30,9 @@ #include "src/core/lib/event_engine/cf_engine/cftype_unique_ref.h" #include "src/core/lib/event_engine/posix_engine/lockfree_event.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/host_port.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/cf_engine/dns_service_resolver.cc b/src/core/lib/event_engine/cf_engine/dns_service_resolver.cc index fb5f7bfb7ba..f65fedd6cce 100644 --- a/src/core/lib/event_engine/cf_engine/dns_service_resolver.cc +++ b/src/core/lib/event_engine/cf_engine/dns_service_resolver.cc @@ -27,7 +27,7 @@ #include "src/core/lib/event_engine/posix_engine/lockfree_event.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/event_engine/trace.h" -#include "src/core/lib/gprpp/host_port.h" +#include "src/core/util/host_port.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/cf_engine/dns_service_resolver.h b/src/core/lib/event_engine/cf_engine/dns_service_resolver.h index cff4f9cc266..e9c464029b3 100644 --- a/src/core/lib/event_engine/cf_engine/dns_service_resolver.h +++ b/src/core/lib/event_engine/cf_engine/dns_service_resolver.h @@ -28,8 +28,8 @@ #include #include "src/core/lib/event_engine/cf_engine/cf_engine.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/default_event_engine.cc b/src/core/lib/event_engine/default_event_engine.cc index 743b788c72f..c65e4c2fb8c 100644 --- a/src/core/lib/event_engine/default_event_engine.cc +++ b/src/core/lib/event_engine/default_event_engine.cc @@ -27,9 +27,9 @@ #include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/default_event_engine_factory.h" #include "src/core/lib/event_engine/trace.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/no_destruct.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/sync.h" #ifdef GRPC_MAXIMIZE_THREADYNESS #include "src/core/lib/event_engine/thready_event_engine/thready_event_engine.h" // IWYU pragma: keep diff --git a/src/core/lib/event_engine/default_event_engine.h b/src/core/lib/event_engine/default_event_engine.h index d1944fa56f0..2f7c982ab4c 100644 --- a/src/core/lib/event_engine/default_event_engine.h +++ b/src/core/lib/event_engine/default_event_engine.h @@ -21,7 +21,7 @@ #include #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/debug_location.h" +#include "src/core/util/debug_location.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/grpc_polled_fd.h b/src/core/lib/event_engine/grpc_polled_fd.h index ea9c6eda138..d1e6dc3b20c 100644 --- a/src/core/lib/event_engine/grpc_polled_fd.h +++ b/src/core/lib/event_engine/grpc_polled_fd.h @@ -27,7 +27,7 @@ #include "absl/functional/any_invocable.h" #include "absl/status/status.h" -#include "src/core/lib/gprpp/sync.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 a1fffc0a7f9..e281e86e555 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,7 +31,7 @@ #include "src/core/lib/event_engine/poller.h" #include "src/core/lib/event_engine/time_util.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/iomgr/port.h" // This polling engine is only relevant on linux kernels supporting epoll @@ -48,10 +48,10 @@ #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h" #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h" #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h" -#include "src/core/lib/gprpp/fork.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/strerror.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/fork.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/strerror.h" +#include "src/core/util/sync.h" #define MAX_EPOLL_EVENTS_HANDLED_PER_ITERATION 1 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 0bd86a7296b..aaa2f79fd47 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,7 +30,7 @@ #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/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "src/core/lib/iomgr/port.h" #ifdef GRPC_LINUX_EPOLL 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 3f383e663bd..64a4325defa 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,7 +38,7 @@ #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/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/iomgr/port.h" #ifdef GRPC_POSIX_SOCKET_EV_POLL @@ -55,11 +55,11 @@ #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h" #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h" #include "src/core/lib/event_engine/time_util.h" -#include "src/core/lib/gprpp/fork.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/strerror.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/fork.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/strerror.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" static const intptr_t kClosureNotReady = 0; static const intptr_t kClosureReady = 1; @@ -853,7 +853,7 @@ std::shared_ptr MakePollPoller(Scheduler* scheduler, #else // GRPC_POSIX_SOCKET_EV_POLL -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/posix_engine/ev_poll_posix.h b/src/core/lib/event_engine/posix_engine/ev_poll_posix.h index d10044e8e42..d3e139eb0c8 100644 --- a/src/core/lib/event_engine/posix_engine/ev_poll_posix.h +++ b/src/core/lib/event_engine/posix_engine/ev_poll_posix.h @@ -28,7 +28,7 @@ #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/wakeup_fd_posix.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" namespace grpc_event_engine { namespace experimental { 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 7cad58fe92e..ab480ef9cd4 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,7 +25,7 @@ #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/lib/gprpp/no_destruct.h" +#include "src/core/util/no_destruct.h" #include "src/core/lib/iomgr/port.h" namespace grpc_event_engine { 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 d1d17f8c809..9fe53ece2c5 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,7 +20,7 @@ #include #include -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "src/core/lib/iomgr/port.h" #if GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER) diff --git a/src/core/lib/event_engine/posix_engine/internal_errqueue.cc b/src/core/lib/event_engine/posix_engine/internal_errqueue.cc index 2ee13382c91..0884cba9456 100644 --- a/src/core/lib/event_engine/posix_engine/internal_errqueue.cc +++ b/src/core/lib/event_engine/posix_engine/internal_errqueue.cc @@ -29,7 +29,7 @@ #include -#include "src/core/lib/gprpp/strerror.h" +#include "src/core/util/strerror.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/posix_engine/lockfree_event.cc b/src/core/lib/event_engine/posix_engine/lockfree_event.cc index f95969bc69c..8a45f14c8ba 100644 --- a/src/core/lib/event_engine/posix_engine/lockfree_event.cc +++ b/src/core/lib/event_engine/posix_engine/lockfree_event.cc @@ -25,8 +25,8 @@ #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/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/status_helper.h" +#include "src/core/util/crash.h" +#include "src/core/util/status_helper.h" // 'state' holds the to call when the fd is readable or writable respectively. // It can contain one of the following values: diff --git a/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc b/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc index 4e0f66fc1f7..fe3be43ce1a 100644 --- a/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc +++ b/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc @@ -34,7 +34,7 @@ #include "absl/strings/str_format.h" #include "src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h" -#include "src/core/lib/gprpp/host_port.h" +#include "src/core/util/host_port.h" #include "src/core/util/useful.h" namespace grpc_event_engine { 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 18d7dfb4623..57af77800bf 100644 --- a/src/core/lib/event_engine/posix_engine/posix_endpoint.cc +++ b/src/core/lib/event_engine/posix_engine/posix_endpoint.cc @@ -46,13 +46,13 @@ #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/gprpp/debug_location.h" -#include "src/core/lib/gprpp/load_file.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/strerror.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/load_file.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#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" 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 9a0ca6b8db4..da6eb9db0df 100644 --- a/src/core/lib/event_engine/posix_engine/posix_endpoint.h +++ b/src/core/lib/event_engine/posix_engine/posix_endpoint.h @@ -46,9 +46,9 @@ #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/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/sync.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" diff --git a/src/core/lib/event_engine/posix_engine/posix_engine.cc b/src/core/lib/event_engine/posix_engine/posix_engine.cc index f5c1bf6c3d2..9a607dd1c89 100644 --- a/src/core/lib/event_engine/posix_engine/posix_engine.cc +++ b/src/core/lib/event_engine/posix_engine/posix_engine.cc @@ -52,9 +52,9 @@ #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/event_engine/trace.h" #include "src/core/lib/event_engine/utils.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/no_destruct.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/crash.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/sync.h" #include "src/core/util/useful.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 ea426c379c9..dbe2f5eb2fd 100644 --- a/src/core/lib/event_engine/posix_engine/posix_engine.h +++ b/src/core/lib/event_engine/posix_engine/posix_engine.h @@ -39,8 +39,8 @@ #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/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/sync.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" 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 1ed4218489d..4666432692e 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,9 +46,9 @@ #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/gprpp/status_helper.h" -#include "src/core/lib/gprpp/strerror.h" -#include "src/core/lib/gprpp/time.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 { 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 5a15129ddbd..39bfb057a01 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,7 +34,7 @@ #include #include "src/core/lib/event_engine/posix.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "src/core/lib/iomgr/port.h" #ifdef GRPC_POSIX_SOCKET_TCP @@ -239,7 +239,7 @@ class PosixEngineListener : public PosixListenerWithFdSupport { #else // GRPC_POSIX_SOCKET_TCP -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" class PosixEngineListener : public PosixListenerWithFdSupport { public: 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 ebcbec1771b..5c2626a532f 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,8 +34,8 @@ #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/gprpp/crash.h" // IWYU pragma: keep -#include "src/core/lib/gprpp/status_helper.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" 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 987a010084c..063cac3390f 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,8 +28,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" // IWYU pragma: keep -#include "src/core/lib/gprpp/time.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" @@ -55,8 +55,8 @@ #include #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/strerror.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/strerror.h" #ifdef GRPC_HAVE_UNIX_SOCKET #ifdef GPR_WINDOWS 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 5bc53dbd391..1f4e039de96 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,7 +30,7 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#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" diff --git a/src/core/lib/event_engine/posix_engine/timer.cc b/src/core/lib/event_engine/posix_engine/timer.cc index 6f152ce494a..8e77e251bcc 100644 --- a/src/core/lib/event_engine/posix_engine/timer.cc +++ b/src/core/lib/event_engine/posix_engine/timer.cc @@ -27,7 +27,7 @@ #include #include "src/core/lib/event_engine/posix_engine/timer_heap.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" namespace grpc_event_engine { diff --git a/src/core/lib/event_engine/posix_engine/timer.h b/src/core/lib/event_engine/posix_engine/timer.h index 30e4bb2eb6c..54f753b91cf 100644 --- a/src/core/lib/event_engine/posix_engine/timer.h +++ b/src/core/lib/event_engine/posix_engine/timer.h @@ -33,9 +33,9 @@ #include #include "src/core/lib/event_engine/posix_engine/timer_heap.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/time_averaged_stats.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/time_averaged_stats.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/posix_engine/timer_manager.h b/src/core/lib/event_engine/posix_engine/timer_manager.h index 6b034358ef7..3650a06dfce 100644 --- a/src/core/lib/event_engine/posix_engine/timer_manager.h +++ b/src/core/lib/event_engine/posix_engine/timer_manager.h @@ -33,9 +33,9 @@ #include "src/core/lib/event_engine/forkable.h" #include "src/core/lib/event_engine/posix_engine/timer.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/notification.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" namespace grpc_event_engine { namespace experimental { 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 1171cb76624..66d3a21186b 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,7 +28,7 @@ #include #include -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "src/core/lib/iomgr/port.h" #ifdef GRPC_LINUX_ERRQUEUE @@ -318,7 +318,7 @@ void TcpSetWriteTimestampsCallback( #else // GRPC_LINUX_ERRQUEUE -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc_event_engine { namespace experimental { 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 f65dba6b009..47123d76c96 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,7 +25,7 @@ #include #include "src/core/lib/event_engine/posix_engine/internal_errqueue.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "src/core/lib/iomgr/port.h" namespace grpc_event_engine { 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 c05fd8d4d50..6c4cbfdbd0c 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,7 +18,7 @@ #include -#include "src/core/lib/gprpp/crash.h" // IWYU pragma: keep +#include "src/core/util/crash.h" // IWYU pragma: keep #include "src/core/lib/iomgr/port.h" #ifdef GRPC_LINUX_EVENTFD @@ -31,7 +31,7 @@ #endif #include "src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.h" -#include "src/core/lib/gprpp/strerror.h" +#include "src/core/util/strerror.h" namespace grpc_event_engine { namespace experimental { @@ -103,7 +103,7 @@ EventFdWakeupFd::CreateEventFdWakeupFd() { #else // GRPC_LINUX_EVENTFD -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" absl::Status EventFdWakeupFd::Init() { grpc_core::Crash("unimplemented"); } 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 75c887b0754..22a7e1f6b9a 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,7 +19,7 @@ #include -#include "src/core/lib/gprpp/crash.h" // IWYU pragma: keep +#include "src/core/util/crash.h" // IWYU pragma: keep #include "src/core/lib/iomgr/port.h" #ifdef GRPC_POSIX_WAKEUP_FD @@ -31,7 +31,7 @@ #endif #include "src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h" -#include "src/core/lib/gprpp/strerror.h" +#include "src/core/util/strerror.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/ref_counted_dns_resolver_interface.h b/src/core/lib/event_engine/ref_counted_dns_resolver_interface.h index 52d4168f06d..107ba10f75b 100644 --- a/src/core/lib/event_engine/ref_counted_dns_resolver_interface.h +++ b/src/core/lib/event_engine/ref_counted_dns_resolver_interface.h @@ -22,7 +22,7 @@ #include #include -#include "src/core/lib/gprpp/orphanable.h" +#include "src/core/util/orphanable.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/tcp_socket_utils.cc b/src/core/lib/event_engine/tcp_socket_utils.cc index 580116a07ef..86341a23608 100644 --- a/src/core/lib/event_engine/tcp_socket_utils.cc +++ b/src/core/lib/event_engine/tcp_socket_utils.cc @@ -60,8 +60,8 @@ #include -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/status_helper.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" diff --git a/src/core/lib/event_engine/thread_pool/thread_count.cc b/src/core/lib/event_engine/thread_pool/thread_count.cc index 362fad18bb2..e8d756d430a 100644 --- a/src/core/lib/event_engine/thread_pool/thread_count.cc +++ b/src/core/lib/event_engine/thread_pool/thread_count.cc @@ -25,7 +25,7 @@ #include #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/thread_pool/thread_count.h b/src/core/lib/event_engine/thread_pool/thread_count.h index a3842275e7e..7bca370e9e1 100644 --- a/src/core/lib/event_engine/thread_pool/thread_count.h +++ b/src/core/lib/event_engine/thread_pool/thread_count.h @@ -26,8 +26,8 @@ #include #include -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" namespace grpc_event_engine { diff --git a/src/core/lib/event_engine/thread_pool/thread_pool_factory.cc b/src/core/lib/event_engine/thread_pool/thread_pool_factory.cc index cab291bc1b4..bea6d8d526c 100644 --- a/src/core/lib/event_engine/thread_pool/thread_pool_factory.cc +++ b/src/core/lib/event_engine/thread_pool/thread_pool_factory.cc @@ -20,7 +20,7 @@ #include "src/core/lib/event_engine/forkable.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.h" #include "src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h" -#include "src/core/lib/gprpp/no_destruct.h" +#include "src/core/util/no_destruct.h" namespace grpc_event_engine { namespace experimental { 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 0047e9ba000..05903fdd5e8 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 @@ -42,11 +42,11 @@ #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/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/examine_stack.h" -#include "src/core/lib/gprpp/thd.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" +#include "src/core/util/examine_stack.h" +#include "src/core/util/thd.h" +#include "src/core/util/time.h" #ifdef GPR_POSIX_SYNC #include 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 a6e9267fd69..3c71c2d16c2 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 @@ -37,9 +37,9 @@ #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/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/notification.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc b/src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc index 1d80104f663..6b5e263a3b6 100644 --- a/src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc +++ b/src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc @@ -21,8 +21,8 @@ #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/crash.h" +#include "src/core/util/thd.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/utils.cc b/src/core/lib/event_engine/utils.cc index 5fe19aa3698..d0d1b436c5d 100644 --- a/src/core/lib/event_engine/utils.cc +++ b/src/core/lib/event_engine/utils.cc @@ -22,7 +22,7 @@ #include #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/utils.h b/src/core/lib/event_engine/utils.h index ab6d4fa1c96..5edfcd890f0 100644 --- a/src/core/lib/event_engine/utils.h +++ b/src/core/lib/event_engine/utils.h @@ -21,7 +21,7 @@ #include #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" namespace grpc_event_engine { namespace experimental { 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 37a8f85cc5c..0e09235ab44 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,8 +34,8 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/sync.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" diff --git a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.h b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.h index eda3330cb91..e16c8e80e9e 100644 --- a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.h +++ b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.h @@ -34,7 +34,7 @@ #include "src/core/lib/event_engine/grpc_polled_fd.h" #include "src/core/lib/event_engine/windows/iocp.h" #include "src/core/lib/event_engine/windows/win_socket.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" struct iovec; diff --git a/src/core/lib/event_engine/windows/iocp.cc b/src/core/lib/event_engine/windows/iocp.cc index c3b9a37e87f..f0ef2f805fb 100644 --- a/src/core/lib/event_engine/windows/iocp.cc +++ b/src/core/lib/event_engine/windows/iocp.cc @@ -28,7 +28,7 @@ #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/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/iomgr/error.h" namespace grpc_event_engine { 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 ab318238c02..2eba884d6fe 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,8 +26,8 @@ #include #include "src/core/lib/event_engine/windows/native_windows_dns_resolver.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/status_helper.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 { diff --git a/src/core/lib/event_engine/windows/win_socket.cc b/src/core/lib/event_engine/windows/win_socket.cc index d6a75770a4b..6d29283fa0e 100644 --- a/src/core/lib/event_engine/windows/win_socket.cc +++ b/src/core/lib/event_engine/windows/win_socket.cc @@ -23,8 +23,8 @@ #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/gprpp/debug_location.h" -#include "src/core/lib/gprpp/sync.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) diff --git a/src/core/lib/event_engine/windows/win_socket.h b/src/core/lib/event_engine/windows/win_socket.h index c6d52f41def..a19b30619e1 100644 --- a/src/core/lib/event_engine/windows/win_socket.h +++ b/src/core/lib/event_engine/windows/win_socket.h @@ -24,8 +24,8 @@ #include #include "src/core/lib/event_engine/thread_pool/thread_pool.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/sync.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/windows/windows_endpoint.cc b/src/core/lib/event_engine/windows/windows_endpoint.cc index c3edbebaa47..edc0ea555d8 100644 --- a/src/core/lib/event_engine/windows/windows_endpoint.cc +++ b/src/core/lib/event_engine/windows/windows_endpoint.cc @@ -28,8 +28,8 @@ #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/gprpp/debug_location.h" -#include "src/core/lib/gprpp/status_helper.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 { diff --git a/src/core/lib/event_engine/windows/windows_engine.cc b/src/core/lib/event_engine/windows/windows_engine.cc index 69a0f94ff53..7ddd4869b8e 100644 --- a/src/core/lib/event_engine/windows/windows_engine.cc +++ b/src/core/lib/event_engine/windows/windows_engine.cc @@ -42,9 +42,9 @@ #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/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.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 { diff --git a/src/core/lib/event_engine/windows/windows_engine.h b/src/core/lib/event_engine/windows/windows_engine.h index 150e7facf3f..6f6e19034ce 100644 --- a/src/core/lib/event_engine/windows/windows_engine.h +++ b/src/core/lib/event_engine/windows/windows_engine.h @@ -37,8 +37,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/windows_endpoint.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.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 { diff --git a/src/core/lib/event_engine/windows/windows_listener.cc b/src/core/lib/event_engine/windows/windows_listener.cc index 848258aca96..1cabba81ba4 100644 --- a/src/core/lib/event_engine/windows/windows_listener.cc +++ b/src/core/lib/event_engine/windows/windows_listener.cc @@ -25,8 +25,8 @@ #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/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.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" diff --git a/src/core/lib/event_engine/windows/windows_listener.h b/src/core/lib/event_engine/windows/windows_listener.h index 2773f3afbf3..eced3bafa4f 100644 --- a/src/core/lib/event_engine/windows/windows_listener.h +++ b/src/core/lib/event_engine/windows/windows_listener.h @@ -29,7 +29,7 @@ #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/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "src/core/lib/iomgr/port.h" #ifdef GRPC_HAVE_UNIX_SOCKET diff --git a/src/core/lib/event_engine/work_queue/basic_work_queue.cc b/src/core/lib/event_engine/work_queue/basic_work_queue.cc index a9170e69bd3..40bfcf7cd5d 100644 --- a/src/core/lib/event_engine/work_queue/basic_work_queue.cc +++ b/src/core/lib/event_engine/work_queue/basic_work_queue.cc @@ -18,7 +18,7 @@ #include #include "src/core/lib/event_engine/common_closures.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/work_queue/basic_work_queue.h b/src/core/lib/event_engine/work_queue/basic_work_queue.h index 2aa843c638a..93ac366831e 100644 --- a/src/core/lib/event_engine/work_queue/basic_work_queue.h +++ b/src/core/lib/event_engine/work_queue/basic_work_queue.h @@ -24,7 +24,7 @@ #include #include "src/core/lib/event_engine/work_queue/work_queue.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/experiments/config.cc b/src/core/lib/experiments/config.cc index ca0ab151429..5e875e5a70d 100644 --- a/src/core/lib/experiments/config.cc +++ b/src/core/lib/experiments/config.cc @@ -34,8 +34,8 @@ #include "src/core/lib/config/config_vars.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/crash.h" // IWYU pragma: keep -#include "src/core/lib/gprpp/no_destruct.h" +#include "src/core/util/crash.h" // IWYU pragma: keep +#include "src/core/util/no_destruct.h" #ifndef GRPC_EXPERIMENTS_ARE_FINAL namespace grpc_core { diff --git a/src/core/lib/gprpp/.clang-format b/src/core/lib/gprpp/.clang-format deleted file mode 100644 index 5f150ef6edb..00000000000 --- a/src/core/lib/gprpp/.clang-format +++ /dev/null @@ -1,50 +0,0 @@ ---- -Language: Cpp -BasedOnStyle: Google -DerivePointerAlignment: false -PointerAlignment: Left -IncludeBlocks: Regroup -IncludeCategories: - # ruby.h is even more first if it's included - - Regex: '^' - Priority: -200 - # Some platforms (namely msys) need wchar to be included BEFORE - # anything else, especially strsafe.h. - - Regex: '^' - Priority: 5 - # use priority 100+ for grpc headers so they sort last - # 'system' headers - include things that have " in the names to make them - # stand out and get fixed - - Regex: '^(<|")grpc' - Priority: 100 - # similary using include/ to get system headers should stand out and get - # fixed - - Regex: '^"include/' - Priority: 100 - # source headers go last - - Regex: '^"(src|test)/' - Priority: 101 - # not-grpc headers follow - # first, non system headers that are included like <> - these are all - # local carveouts, and get sorted below c++ but before non grpc "" files - - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)' - Priority: 30 - # first C system headers - they have a . in the filename - - Regex: '^<.*\.' - Priority: 10 - # then C++ system headers - no ., the only thing that will match now - - Regex: '^<' - Priority: 20 - # finally other "" includes go between system headers and our headers - - Regex: '^"' - Priority: 40 ---- -Language: ObjC -BasedOnStyle: Google -ColumnLimit: 100 -ObjCBlockIndentWidth: 2 ---- -Language: Proto -BasedOnStyle: Google -ColumnLimit: 100 -... diff --git a/src/core/lib/gprpp/README.md b/src/core/lib/gprpp/README.md deleted file mode 100644 index f5b87481c0b..00000000000 --- a/src/core/lib/gprpp/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# GPR++ - Google Portable Runtime for C++ - -The files in this directory contain various utility code for C++ code. -None of this code is gRPC-specific; anything here may also be useful -for other open source projects written in C++. - -Note that this is one of the few places in src/core where we allow -the use of portability macros. diff --git a/src/core/lib/gprpp/time.cc b/src/core/lib/gprpp/time.cc deleted file mode 100644 index 02240710a54..00000000000 --- a/src/core/lib/gprpp/time.cc +++ /dev/null @@ -1,242 +0,0 @@ -// Copyright 2021 gRPC authors. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "src/core/lib/gprpp/time.h" - -#include -#include -#include -#include -#include - -#include "absl/log/check.h" -#include "absl/strings/str_format.h" - -#include -#include -#include - -#include "src/core/lib/gprpp/no_destruct.h" - -// IWYU pragma: no_include - -namespace grpc_core { - -namespace { - -std::atomic g_process_epoch_seconds; -std::atomic g_process_epoch_cycles; - -class GprNowTimeSource final : public Timestamp::Source { - public: - Timestamp Now() override { - return Timestamp::FromTimespecRoundDown(gpr_now(GPR_CLOCK_MONOTONIC)); - } -}; - -GPR_ATTRIBUTE_NOINLINE std::pair InitTime() { - gpr_cycle_counter cycles_start = 0; - gpr_cycle_counter cycles_end = 0; - int64_t process_epoch_seconds = 0; - - // Check the current time... if we end up with zero, try again after 100ms. - // If it doesn't advance after sleeping for 2100ms, crash the process. - for (int i = 0; i < 21; i++) { - cycles_start = gpr_get_cycle_counter(); - gpr_timespec now = gpr_now(GPR_CLOCK_MONOTONIC); - cycles_end = gpr_get_cycle_counter(); - process_epoch_seconds = now.tv_sec; - if (process_epoch_seconds > 1) { - break; - } - gpr_log(GPR_INFO, - "gpr_now(GPR_CLOCK_MONOTONIC) returns a very small number: " - "sleeping for 100ms"); - gpr_sleep_until(gpr_time_add(now, gpr_time_from_millis(100, GPR_TIMESPAN))); - } - - // Check time has increased past 1 second. - CHECK_GT(process_epoch_seconds, 1); - // Fake the epoch to always return >=1 second from our monotonic clock (to - // avoid bugs elsewhere) - process_epoch_seconds -= 1; - int64_t expected = 0; - gpr_cycle_counter process_epoch_cycles = (cycles_start + cycles_end) / 2; - CHECK_NE(process_epoch_cycles, 0); - if (!g_process_epoch_seconds.compare_exchange_strong( - expected, process_epoch_seconds, std::memory_order_relaxed, - std::memory_order_relaxed)) { - process_epoch_seconds = expected; - do { - process_epoch_cycles = - g_process_epoch_cycles.load(std::memory_order_relaxed); - } while (process_epoch_cycles == 0); - } else { - g_process_epoch_cycles.store(process_epoch_cycles, - std::memory_order_relaxed); - } - return std::make_pair(process_epoch_seconds, process_epoch_cycles); -} - -gpr_timespec StartTime() { - int64_t sec = g_process_epoch_seconds.load(std::memory_order_relaxed); - if (GPR_UNLIKELY(sec == 0)) sec = InitTime().first; - return {sec, 0, GPR_CLOCK_MONOTONIC}; -} - -gpr_cycle_counter StartCycleCounter() { - gpr_cycle_counter cycles = - g_process_epoch_cycles.load(std::memory_order_relaxed); - if (GPR_UNLIKELY(cycles == 0)) cycles = InitTime().second; - return cycles; -} - -gpr_timespec MillisecondsAsTimespec(int64_t millis, gpr_clock_type clock_type) { - // special-case infinities as Timestamp can be 32bit on some - // platforms while gpr_time_from_millis always takes an int64_t. - if (millis == std::numeric_limits::max()) { - return gpr_inf_future(clock_type); - } - if (millis == std::numeric_limits::min()) { - return gpr_inf_past(clock_type); - } - - if (clock_type == GPR_TIMESPAN) { - return gpr_time_from_millis(millis, GPR_TIMESPAN); - } - return gpr_time_add(gpr_convert_clock_type(StartTime(), clock_type), - gpr_time_from_millis(millis, GPR_TIMESPAN)); -} - -int64_t TimespanToMillisRoundUp(gpr_timespec ts) { - CHECK(ts.clock_type == GPR_TIMESPAN); - double x = GPR_MS_PER_SEC * static_cast(ts.tv_sec) + - static_cast(ts.tv_nsec) / GPR_NS_PER_MS + - static_cast(GPR_NS_PER_SEC - 1) / - static_cast(GPR_NS_PER_SEC); - if (x <= static_cast(std::numeric_limits::min())) { - return std::numeric_limits::min(); - } - if (x >= static_cast(std::numeric_limits::max())) { - return std::numeric_limits::max(); - } - return static_cast(x); -} - -int64_t TimespanToMillisRoundDown(gpr_timespec ts) { - CHECK(ts.clock_type == GPR_TIMESPAN); - double x = GPR_MS_PER_SEC * static_cast(ts.tv_sec) + - static_cast(ts.tv_nsec) / GPR_NS_PER_MS; - if (x <= static_cast(std::numeric_limits::min())) { - return std::numeric_limits::min(); - } - if (x >= static_cast(std::numeric_limits::max())) { - return std::numeric_limits::max(); - } - return static_cast(x); -} - -} // namespace - -thread_local Timestamp::Source* Timestamp::thread_local_time_source_{ - NoDestructSingleton::Get()}; - -Timestamp ScopedTimeCache::Now() { - if (!cached_time_.has_value()) { - previous()->InvalidateCache(); - cached_time_ = previous()->Now(); - } - return cached_time_.value(); -} - -Timestamp Timestamp::FromTimespecRoundUp(gpr_timespec ts) { - return FromMillisecondsAfterProcessEpoch(TimespanToMillisRoundUp(gpr_time_sub( - gpr_convert_clock_type(ts, GPR_CLOCK_MONOTONIC), StartTime()))); -} - -Timestamp Timestamp::FromTimespecRoundDown(gpr_timespec ts) { - return FromMillisecondsAfterProcessEpoch( - TimespanToMillisRoundDown(gpr_time_sub( - gpr_convert_clock_type(ts, GPR_CLOCK_MONOTONIC), StartTime()))); -} - -Timestamp Timestamp::FromCycleCounterRoundUp(gpr_cycle_counter c) { - return Timestamp::FromMillisecondsAfterProcessEpoch( - TimespanToMillisRoundUp(gpr_cycle_counter_sub(c, StartCycleCounter()))); -} - -Timestamp Timestamp::FromCycleCounterRoundDown(gpr_cycle_counter c) { - return Timestamp::FromMillisecondsAfterProcessEpoch( - TimespanToMillisRoundDown(gpr_cycle_counter_sub(c, StartCycleCounter()))); -} - -gpr_timespec Timestamp::as_timespec(gpr_clock_type clock_type) const { - return MillisecondsAsTimespec(millis_, clock_type); -} - -std::string Timestamp::ToString() const { - if (millis_ == std::numeric_limits::max()) { - return "@∞"; - } - if (millis_ == std::numeric_limits::min()) { - return "@-∞"; - } - return "@" + std::to_string(millis_) + "ms"; -} - -gpr_timespec Duration::as_timespec() const { - return MillisecondsAsTimespec(millis_, GPR_TIMESPAN); -} - -Duration Duration::FromTimespec(gpr_timespec t) { - return Duration::Milliseconds(TimespanToMillisRoundUp(t)); -} - -std::string Duration::ToString() const { - if (millis_ == std::numeric_limits::max()) { - return "∞"; - } - if (millis_ == std::numeric_limits::min()) { - return "-∞"; - } - return std::to_string(millis_) + "ms"; -} - -std::string Duration::ToJsonString() const { - gpr_timespec ts = as_timespec(); - return absl::StrFormat("%d.%09ds", ts.tv_sec, ts.tv_nsec); -} - -Duration::operator grpc_event_engine::experimental::EventEngine::Duration() - const { - return std::chrono::milliseconds( - Clamp(millis_, std::numeric_limits::min() / GPR_NS_PER_MS, - std::numeric_limits::max() / GPR_NS_PER_MS)); -} - -void TestOnlySetProcessEpoch(gpr_timespec epoch) { - g_process_epoch_seconds.store( - gpr_convert_clock_type(epoch, GPR_CLOCK_MONOTONIC).tv_sec); - g_process_epoch_cycles.store(gpr_get_cycle_counter()); -} - -std::ostream& operator<<(std::ostream& out, Timestamp timestamp) { - return out << timestamp.ToString(); -} - -std::ostream& operator<<(std::ostream& out, Duration duration) { - return out << duration.ToString(); -} - -} // namespace grpc_core diff --git a/src/core/lib/iomgr/buffer_list.cc b/src/core/lib/iomgr/buffer_list.cc index aedb4227073..2ea3d9a6523 100644 --- a/src/core/lib/iomgr/buffer_list.cc +++ b/src/core/lib/iomgr/buffer_list.cc @@ -24,8 +24,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/crash.h" +#include "src/core/util/sync.h" #include "src/core/lib/iomgr/port.h" #ifdef GRPC_LINUX_ERRQUEUE diff --git a/src/core/lib/iomgr/buffer_list.h b/src/core/lib/iomgr/buffer_list.h index 9e57c818e17..19cacce9c63 100644 --- a/src/core/lib/iomgr/buffer_list.h +++ b/src/core/lib/iomgr/buffer_list.h @@ -24,7 +24,7 @@ #include #include -#include "src/core/lib/gprpp/sync.h" +#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" diff --git a/src/core/lib/iomgr/call_combiner.cc b/src/core/lib/iomgr/call_combiner.cc index fa56bfa3e76..b9810aacfb4 100644 --- a/src/core/lib/iomgr/call_combiner.cc +++ b/src/core/lib/iomgr/call_combiner.cc @@ -26,7 +26,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" diff --git a/src/core/lib/iomgr/call_combiner.h b/src/core/lib/iomgr/call_combiner.h index 28ed8388a94..230df63351a 100644 --- a/src/core/lib/iomgr/call_combiner.h +++ b/src/core/lib/iomgr/call_combiner.h @@ -26,9 +26,9 @@ #include #include -#include "src/core/lib/gprpp/mpscq.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#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" diff --git a/src/core/lib/iomgr/cfstream_handle.cc b/src/core/lib/iomgr/cfstream_handle.cc index 2978139b606..c2ec9f8d350 100644 --- a/src/core/lib/iomgr/cfstream_handle.cc +++ b/src/core/lib/iomgr/cfstream_handle.cc @@ -18,7 +18,7 @@ #include -#include "src/core/lib/gprpp/memory.h" +#include "src/core/util/memory.h" #include "src/core/lib/iomgr/port.h" #ifdef GRPC_CFSTREAM diff --git a/src/core/lib/iomgr/cfstream_handle.h b/src/core/lib/iomgr/cfstream_handle.h index 7dd156de2e0..518407eb2d5 100644 --- a/src/core/lib/iomgr/cfstream_handle.h +++ b/src/core/lib/iomgr/cfstream_handle.h @@ -29,7 +29,7 @@ #ifdef GRPC_CFSTREAM #import -#include "src/core/lib/gprpp/memory.h" +#include "src/core/util/memory.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/lockfree_event.h" diff --git a/src/core/lib/iomgr/closure.h b/src/core/lib/iomgr/closure.h index caf84fe30df..7aa919720d7 100644 --- a/src/core/lib/iomgr/closure.h +++ b/src/core/lib/iomgr/closure.h @@ -28,10 +28,10 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/manual_constructor.h" -#include "src/core/lib/gprpp/mpscq.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; diff --git a/src/core/lib/iomgr/combiner.cc b/src/core/lib/iomgr/combiner.cc index eb36799e215..7df6d16fbd5 100644 --- a/src/core/lib/iomgr/combiner.cc +++ b/src/core/lib/iomgr/combiner.cc @@ -29,8 +29,8 @@ #include #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/mpscq.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" diff --git a/src/core/lib/iomgr/endpoint_pair_posix.cc b/src/core/lib/iomgr/endpoint_pair_posix.cc index 42d0e7acdb6..3a1c0f349d4 100644 --- a/src/core/lib/iomgr/endpoint_pair_posix.cc +++ b/src/core/lib/iomgr/endpoint_pair_posix.cc @@ -37,7 +37,7 @@ #include #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/lib/gprpp/crash.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" diff --git a/src/core/lib/iomgr/endpoint_pair_windows.cc b/src/core/lib/iomgr/endpoint_pair_windows.cc index 729ab575c77..79ee6d0b466 100644 --- a/src/core/lib/iomgr/endpoint_pair_windows.cc +++ b/src/core/lib/iomgr/endpoint_pair_windows.cc @@ -30,7 +30,7 @@ #include #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/gprpp/crash.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" diff --git a/src/core/lib/iomgr/error.cc b/src/core/lib/iomgr/error.cc index b070a764fb3..df1bb836439 100644 --- a/src/core/lib/iomgr/error.cc +++ b/src/core/lib/iomgr/error.cc @@ -29,14 +29,14 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #ifdef GPR_WINDOWS #include #endif #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/strerror.h" +#include "src/core/util/strerror.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/util/useful.h" diff --git a/src/core/lib/iomgr/error.h b/src/core/lib/iomgr/error.h index 4d38a90c251..3579fa00390 100644 --- a/src/core/lib/iomgr/error.h +++ b/src/core/lib/iomgr/error.h @@ -32,8 +32,8 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/status_helper.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/spinlock.h" diff --git a/src/core/lib/iomgr/ev_apple.cc b/src/core/lib/iomgr/ev_apple.cc index ba6c21d670c..d6c3ff6e832 100644 --- a/src/core/lib/iomgr/ev_apple.cc +++ b/src/core/lib/iomgr/ev_apple.cc @@ -35,8 +35,8 @@ #include "absl/time/time.h" -#include "src/core/lib/gprpp/thd.h" -#include "src/core/lib/gprpp/time_util.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 f0021d0ed7e..84bc79278dd 100644 --- a/src/core/lib/iomgr/ev_epoll1_linux.cc +++ b/src/core/lib/iomgr/ev_epoll1_linux.cc @@ -21,7 +21,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/iomgr/port.h" // This polling engine is only relevant on linux kernels supporting epoll @@ -49,8 +49,8 @@ #include #include -#include "src/core/lib/gprpp/manual_constructor.h" -#include "src/core/lib/gprpp/strerror.h" +#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" diff --git a/src/core/lib/iomgr/ev_poll_posix.cc b/src/core/lib/iomgr/ev_poll_posix.cc index 02c3bb77c4b..3884ced95e2 100644 --- a/src/core/lib/iomgr/ev_poll_posix.cc +++ b/src/core/lib/iomgr/ev_poll_posix.cc @@ -41,8 +41,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/thd.h" +#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" diff --git a/src/core/lib/iomgr/ev_posix.cc b/src/core/lib/iomgr/ev_posix.cc index e204b4a697b..cee52af418d 100644 --- a/src/core/lib/iomgr/ev_posix.cc +++ b/src/core/lib/iomgr/ev_posix.cc @@ -35,7 +35,7 @@ #include "src/core/lib/config/config_vars.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.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" diff --git a/src/core/lib/iomgr/event_engine_shims/endpoint.cc b/src/core/lib/iomgr/event_engine_shims/endpoint.cc index 42238e47062..e483c9533a8 100644 --- a/src/core/lib/iomgr/event_engine_shims/endpoint.cc +++ b/src/core/lib/iomgr/event_engine_shims/endpoint.cc @@ -38,9 +38,9 @@ #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/lib/gprpp/construct_destruct.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/sync.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" diff --git a/src/core/lib/iomgr/exec_ctx.cc b/src/core/lib/iomgr/exec_ctx.cc index 66653a0c15c..4b222cfa62c 100644 --- a/src/core/lib/iomgr/exec_ctx.cc +++ b/src/core/lib/iomgr/exec_ctx.cc @@ -25,7 +25,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/iomgr/error.h" diff --git a/src/core/lib/iomgr/exec_ctx.h b/src/core/lib/iomgr/exec_ctx.h index 68340c7df1c..04b9e6e6cce 100644 --- a/src/core/lib/iomgr/exec_ctx.h +++ b/src/core/lib/iomgr/exec_ctx.h @@ -36,10 +36,10 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/fork.h" -#include "src/core/lib/gprpp/time.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" diff --git a/src/core/lib/iomgr/executor.cc b/src/core/lib/iomgr/executor.cc index 827bfc10c9d..e466d42860d 100644 --- a/src/core/lib/iomgr/executor.cc +++ b/src/core/lib/iomgr/executor.cc @@ -28,8 +28,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/memory.h" +#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/useful.h" diff --git a/src/core/lib/iomgr/executor.h b/src/core/lib/iomgr/executor.h index e20f2f0242e..6efc00340e8 100644 --- a/src/core/lib/iomgr/executor.h +++ b/src/core/lib/iomgr/executor.h @@ -21,7 +21,7 @@ #include -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/thd.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/util/spinlock.h" diff --git a/src/core/lib/iomgr/fork_posix.cc b/src/core/lib/iomgr/fork_posix.cc index 66fb78d363c..af7abd72ba5 100644 --- a/src/core/lib/iomgr/fork_posix.cc +++ b/src/core/lib/iomgr/fork_posix.cc @@ -32,9 +32,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/fork.h" -#include "src/core/lib/gprpp/thd.h" +#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" diff --git a/src/core/lib/iomgr/internal_errqueue.cc b/src/core/lib/iomgr/internal_errqueue.cc index 5223687a439..8303ff24bb8 100644 --- a/src/core/lib/iomgr/internal_errqueue.cc +++ b/src/core/lib/iomgr/internal_errqueue.cc @@ -28,7 +28,7 @@ #include #include -#include "src/core/lib/gprpp/strerror.h" +#include "src/core/util/strerror.h" namespace grpc_core { diff --git a/src/core/lib/iomgr/iocp_windows.cc b/src/core/lib/iomgr/iocp_windows.cc index 9d6477aaaaf..ced11b2c652 100644 --- a/src/core/lib/iomgr/iocp_windows.cc +++ b/src/core/lib/iomgr/iocp_windows.cc @@ -33,8 +33,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/thd.h" +#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" diff --git a/src/core/lib/iomgr/iomgr.cc b/src/core/lib/iomgr/iomgr.cc index 6acf40a66d2..93cb362940b 100644 --- a/src/core/lib/iomgr/iomgr.cc +++ b/src/core/lib/iomgr/iomgr.cc @@ -29,8 +29,8 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/thd.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" diff --git a/src/core/lib/iomgr/iomgr_windows.cc b/src/core/lib/iomgr/iomgr_windows.cc index 21570d9033f..1ab013f2de5 100644 --- a/src/core/lib/iomgr/iomgr_windows.cc +++ b/src/core/lib/iomgr/iomgr_windows.cc @@ -27,7 +27,7 @@ #include #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/crash.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" diff --git a/src/core/lib/iomgr/lockfree_event.cc b/src/core/lib/iomgr/lockfree_event.cc index 114625e5e79..f2dcae0013e 100644 --- a/src/core/lib/iomgr/lockfree_event.cc +++ b/src/core/lib/iomgr/lockfree_event.cc @@ -24,7 +24,7 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/iomgr/exec_ctx.h" extern grpc_core::DebugOnlyTraceFlag grpc_polling_trace; diff --git a/src/core/lib/iomgr/polling_entity.cc b/src/core/lib/iomgr/polling_entity.cc index 42233112c15..6c1e742f290 100644 --- a/src/core/lib/iomgr/polling_entity.cc +++ b/src/core/lib/iomgr/polling_entity.cc @@ -25,7 +25,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" grpc_polling_entity grpc_polling_entity_create_from_pollset_set( grpc_pollset_set* pollset_set) { diff --git a/src/core/lib/iomgr/pollset_windows.cc b/src/core/lib/iomgr/pollset_windows.cc index ab50af4bb4c..ed8d4ed2d16 100644 --- a/src/core/lib/iomgr/pollset_windows.cc +++ b/src/core/lib/iomgr/pollset_windows.cc @@ -24,8 +24,8 @@ #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/thd.h" +#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" diff --git a/src/core/lib/iomgr/resolve_address.cc b/src/core/lib/iomgr/resolve_address.cc index 24cdcf1c6d0..6298be8230a 100644 --- a/src/core/lib/iomgr/resolve_address.cc +++ b/src/core/lib/iomgr/resolve_address.cc @@ -24,8 +24,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/no_destruct.h" +#include "src/core/util/crash.h" +#include "src/core/util/no_destruct.h" namespace grpc_core { const char* kDefaultSecurePort = "https"; diff --git a/src/core/lib/iomgr/resolve_address.h b/src/core/lib/iomgr/resolve_address.h index c63118c053f..41d8178e4df 100644 --- a/src/core/lib/iomgr/resolve_address.h +++ b/src/core/lib/iomgr/resolve_address.h @@ -28,8 +28,8 @@ #include #include "src/core/lib/event_engine/handle_containers.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/time.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" diff --git a/src/core/lib/iomgr/resolve_address_posix.cc b/src/core/lib/iomgr/resolve_address_posix.cc index c9f2967b898..5277f9c6581 100644 --- a/src/core/lib/iomgr/resolve_address_posix.cc +++ b/src/core/lib/iomgr/resolve_address_posix.cc @@ -30,9 +30,9 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/thd.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" diff --git a/src/core/lib/iomgr/resolve_address_windows.cc b/src/core/lib/iomgr/resolve_address_windows.cc index 054f7423816..2aa3c0b241d 100644 --- a/src/core/lib/iomgr/resolve_address_windows.cc +++ b/src/core/lib/iomgr/resolve_address_windows.cc @@ -35,9 +35,9 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/thd.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" diff --git a/src/core/lib/iomgr/sockaddr_utils_posix.cc b/src/core/lib/iomgr/sockaddr_utils_posix.cc index d1981a43196..fd7d3145528 100644 --- a/src/core/lib/iomgr/sockaddr_utils_posix.cc +++ b/src/core/lib/iomgr/sockaddr_utils_posix.cc @@ -43,7 +43,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/iomgr/sockaddr.h" uint16_t grpc_htons(uint16_t hostshort) { return htons(hostshort); } diff --git a/src/core/lib/iomgr/socket_mutator.cc b/src/core/lib/iomgr/socket_mutator.cc index 428cc0bdf3f..cc5fe432c06 100644 --- a/src/core/lib/iomgr/socket_mutator.cc +++ b/src/core/lib/iomgr/socket_mutator.cc @@ -24,7 +24,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" void grpc_socket_mutator_init(grpc_socket_mutator* mutator, diff --git a/src/core/lib/iomgr/socket_utils_common_posix.cc b/src/core/lib/iomgr/socket_utils_common_posix.cc index 7ebafa6897b..d70dd07295b 100644 --- a/src/core/lib/iomgr/socket_utils_common_posix.cc +++ b/src/core/lib/iomgr/socket_utils_common_posix.cc @@ -52,8 +52,8 @@ #include #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/strerror.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" diff --git a/src/core/lib/iomgr/socket_utils_linux.cc b/src/core/lib/iomgr/socket_utils_linux.cc index 2e64c21e0b5..4ff3e446350 100644 --- a/src/core/lib/iomgr/socket_utils_linux.cc +++ b/src/core/lib/iomgr/socket_utils_linux.cc @@ -27,7 +27,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils_posix.h" diff --git a/src/core/lib/iomgr/socket_utils_posix.cc b/src/core/lib/iomgr/socket_utils_posix.cc index b34f3749c7f..16ba895d0ef 100644 --- a/src/core/lib/iomgr/socket_utils_posix.cc +++ b/src/core/lib/iomgr/socket_utils_posix.cc @@ -30,7 +30,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils_posix.h" #endif @@ -38,7 +38,7 @@ #ifdef GRPC_POSIX_SOCKET_TCP #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/lib/gprpp/strerror.h" +#include "src/core/util/strerror.h" #include "src/core/lib/iomgr/socket_utils_posix.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 8b0e8f45f7c..569630b8133 100644 --- a/src/core/lib/iomgr/socket_utils_windows.cc +++ b/src/core/lib/iomgr/socket_utils_windows.cc @@ -24,7 +24,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils.h" diff --git a/src/core/lib/iomgr/socket_windows.cc b/src/core/lib/iomgr/socket_windows.cc index 44e524c6829..ea7ae010de5 100644 --- a/src/core/lib/iomgr/socket_windows.cc +++ b/src/core/lib/iomgr/socket_windows.cc @@ -35,7 +35,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#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" diff --git a/src/core/lib/iomgr/tcp_client_cfstream.cc b/src/core/lib/iomgr/tcp_client_cfstream.cc index 09e7c5d799a..7540f643208 100644 --- a/src/core/lib/iomgr/tcp_client_cfstream.cc +++ b/src/core/lib/iomgr/tcp_client_cfstream.cc @@ -34,8 +34,8 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/event_engine/shim.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/host_port.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" diff --git a/src/core/lib/iomgr/tcp_client_posix.cc b/src/core/lib/iomgr/tcp_client_posix.cc index 8fb50f6754e..5961980488a 100644 --- a/src/core/lib/iomgr/tcp_client_posix.cc +++ b/src/core/lib/iomgr/tcp_client_posix.cc @@ -40,7 +40,7 @@ #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/lib/gprpp/crash.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" diff --git a/src/core/lib/iomgr/tcp_client_windows.cc b/src/core/lib/iomgr/tcp_client_windows.cc index a0589770aac..a3bacb73bd6 100644 --- a/src/core/lib/iomgr/tcp_client_windows.cc +++ b/src/core/lib/iomgr/tcp_client_windows.cc @@ -34,7 +34,7 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/event_engine/shim.h" -#include "src/core/lib/gprpp/crash.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" diff --git a/src/core/lib/iomgr/tcp_posix.cc b/src/core/lib/iomgr/tcp_posix.cc index c86fa383b4c..099acee3565 100644 --- a/src/core/lib/iomgr/tcp_posix.cc +++ b/src/core/lib/iomgr/tcp_posix.cc @@ -59,10 +59,10 @@ #include "src/core/util/event_log.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/strerror.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.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" diff --git a/src/core/lib/iomgr/tcp_server_posix.cc b/src/core/lib/iomgr/tcp_server_posix.cc index 8811eac862b..e4fbc3f93f9 100644 --- a/src/core/lib/iomgr/tcp_server_posix.cc +++ b/src/core/lib/iomgr/tcp_server_posix.cc @@ -62,7 +62,7 @@ #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/lib/gprpp/strerror.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" 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 ee8f7350eb6..74d7f26d201 100644 --- a/src/core/lib/iomgr/tcp_server_utils_posix_common.cc +++ b/src/core/lib/iomgr/tcp_server_utils_posix_common.cc @@ -40,7 +40,7 @@ #include #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/gprpp/crash.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" 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 495e800ea08..cf2f3a0a48d 100644 --- a/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc +++ b/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc @@ -38,7 +38,7 @@ #include #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/gprpp/crash.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" diff --git a/src/core/lib/iomgr/tcp_server_windows.cc b/src/core/lib/iomgr/tcp_server_windows.cc index b2a0ab25be8..a588adac64f 100644 --- a/src/core/lib/iomgr/tcp_server_windows.cc +++ b/src/core/lib/iomgr/tcp_server_windows.cc @@ -47,7 +47,7 @@ #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/lib/gprpp/crash.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" diff --git a/src/core/lib/iomgr/tcp_windows.cc b/src/core/lib/iomgr/tcp_windows.cc index 4ff54f374b3..a954caa8977 100644 --- a/src/core/lib/iomgr/tcp_windows.cc +++ b/src/core/lib/iomgr/tcp_windows.cc @@ -33,7 +33,7 @@ #include #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/gprpp/crash.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" diff --git a/src/core/lib/iomgr/timer_generic.cc b/src/core/lib/iomgr/timer_generic.cc index 1b0ab4b71cc..72d3f2605c3 100644 --- a/src/core/lib/iomgr/timer_generic.cc +++ b/src/core/lib/iomgr/timer_generic.cc @@ -31,10 +31,10 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/manual_constructor.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/time_averaged_stats.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" diff --git a/src/core/lib/iomgr/timer_manager.cc b/src/core/lib/iomgr/timer_manager.cc index 9cab02d2877..44c833e143a 100644 --- a/src/core/lib/iomgr/timer_manager.cc +++ b/src/core/lib/iomgr/timer_manager.cc @@ -28,8 +28,8 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/crash.h" +#include "src/core/util/thd.h" #include "src/core/lib/iomgr/timer.h" struct completed_thread { diff --git a/src/core/lib/iomgr/unix_sockets_posix.cc b/src/core/lib/iomgr/unix_sockets_posix.cc index 15b2226b688..918f50708d6 100644 --- a/src/core/lib/iomgr/unix_sockets_posix.cc +++ b/src/core/lib/iomgr/unix_sockets_posix.cc @@ -40,7 +40,7 @@ #include #include "src/core/lib/address_utils/parse_address.h" -#include "src/core/lib/gprpp/crash.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" diff --git a/src/core/lib/iomgr/unix_sockets_posix_noop.cc b/src/core/lib/iomgr/unix_sockets_posix_noop.cc index 8e783c8cb70..9a8206d4a96 100644 --- a/src/core/lib/iomgr/unix_sockets_posix_noop.cc +++ b/src/core/lib/iomgr/unix_sockets_posix_noop.cc @@ -28,7 +28,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" void grpc_create_socketpair_if_unix(int /* sv */[2]) { // TODO: Either implement this for the non-Unix socket case or make diff --git a/src/core/lib/iomgr/vsock.cc b/src/core/lib/iomgr/vsock.cc index 847dabe0f17..cc04f87698b 100644 --- a/src/core/lib/iomgr/vsock.cc +++ b/src/core/lib/iomgr/vsock.cc @@ -31,7 +31,7 @@ #include #include "src/core/lib/address_utils/parse_address.h" -#include "src/core/lib/gprpp/crash.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/useful.h" diff --git a/src/core/lib/iomgr/wakeup_fd_eventfd.cc b/src/core/lib/iomgr/wakeup_fd_eventfd.cc index 38760c2cfb4..e0700a178d8 100644 --- a/src/core/lib/iomgr/wakeup_fd_eventfd.cc +++ b/src/core/lib/iomgr/wakeup_fd_eventfd.cc @@ -28,8 +28,8 @@ #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/strerror.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) { diff --git a/src/core/lib/iomgr/wakeup_fd_pipe.cc b/src/core/lib/iomgr/wakeup_fd_pipe.cc index a3936608cc5..36a979227db 100644 --- a/src/core/lib/iomgr/wakeup_fd_pipe.cc +++ b/src/core/lib/iomgr/wakeup_fd_pipe.cc @@ -28,8 +28,8 @@ #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/strerror.h" +#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" diff --git a/src/core/lib/promise/activity.cc b/src/core/lib/promise/activity.cc index 614e343bc8f..7f495ddb1b3 100644 --- a/src/core/lib/promise/activity.cc +++ b/src/core/lib/promise/activity.cc @@ -25,7 +25,7 @@ #include -#include "src/core/lib/gprpp/atomic_utils.h" +#include "src/core/util/atomic_utils.h" namespace grpc_core { diff --git a/src/core/lib/promise/activity.h b/src/core/lib/promise/activity.h index 715de5317f2..320c752cde7 100644 --- a/src/core/lib/promise/activity.h +++ b/src/core/lib/promise/activity.h @@ -33,10 +33,10 @@ #include #include "src/core/lib/event_engine/event_engine_context.h" -#include "src/core/lib/gprpp/construct_destruct.h" -#include "src/core/lib/gprpp/no_destruct.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/sync.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" diff --git a/src/core/lib/promise/arena_promise.h b/src/core/lib/promise/arena_promise.h index 287d1c650f3..86a076e2cae 100644 --- a/src/core/lib/promise/arena_promise.h +++ b/src/core/lib/promise/arena_promise.h @@ -26,7 +26,7 @@ #include -#include "src/core/lib/gprpp/construct_destruct.h" +#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" diff --git a/src/core/lib/promise/context.h b/src/core/lib/promise/context.h index e1f1f6511d9..76c3f88f3ce 100644 --- a/src/core/lib/promise/context.h +++ b/src/core/lib/promise/context.h @@ -23,7 +23,7 @@ #include #include -#include "src/core/lib/gprpp/down_cast.h" +#include "src/core/util/down_cast.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 663609d4192..df0f8898b18 100644 --- a/src/core/lib/promise/detail/basic_seq.h +++ b/src/core/lib/promise/detail/basic_seq.h @@ -17,7 +17,7 @@ #include -#include "src/core/lib/gprpp/construct_destruct.h" +#include "src/core/util/construct_destruct.h" #include "src/core/lib/promise/poll.h" namespace grpc_core { diff --git a/src/core/lib/promise/detail/join_state.h b/src/core/lib/promise/detail/join_state.h index e930ba53f36..7786a5faab9 100644 --- a/src/core/lib/promise/detail/join_state.h +++ b/src/core/lib/promise/detail/join_state.h @@ -26,8 +26,8 @@ #include #include -#include "src/core/lib/gprpp/bitset.h" -#include "src/core/lib/gprpp/construct_destruct.h" +#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" diff --git a/src/core/lib/promise/detail/seq_state.h b/src/core/lib/promise/detail/seq_state.h index 841cd6cb042..2dd6e0bf755 100644 --- a/src/core/lib/promise/detail/seq_state.h +++ b/src/core/lib/promise/detail/seq_state.h @@ -29,8 +29,8 @@ #include #include -#include "src/core/lib/gprpp/construct_destruct.h" -#include "src/core/lib/gprpp/debug_location.h" +#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" diff --git a/src/core/lib/promise/exec_ctx_wakeup_scheduler.h b/src/core/lib/promise/exec_ctx_wakeup_scheduler.h index 865381f76b0..8cc979cd602 100644 --- a/src/core/lib/promise/exec_ctx_wakeup_scheduler.h +++ b/src/core/lib/promise/exec_ctx_wakeup_scheduler.h @@ -19,7 +19,7 @@ #include -#include "src/core/lib/gprpp/debug_location.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" diff --git a/src/core/lib/promise/for_each.h b/src/core/lib/promise/for_each.h index 80d066a18dc..ae12a2def16 100644 --- a/src/core/lib/promise/for_each.h +++ b/src/core/lib/promise/for_each.h @@ -27,7 +27,7 @@ #include #include -#include "src/core/lib/gprpp/construct_destruct.h" +#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" diff --git a/src/core/lib/promise/if.h b/src/core/lib/promise/if.h index 9dbef2acc8c..25d8959bcbe 100644 --- a/src/core/lib/promise/if.h +++ b/src/core/lib/promise/if.h @@ -23,7 +23,7 @@ #include -#include "src/core/lib/gprpp/construct_destruct.h" +#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" diff --git a/src/core/lib/promise/inter_activity_latch.h b/src/core/lib/promise/inter_activity_latch.h index b6465af0700..5a9ff013720 100644 --- a/src/core/lib/promise/inter_activity_latch.h +++ b/src/core/lib/promise/inter_activity_latch.h @@ -25,7 +25,7 @@ #include #include -#include "src/core/lib/gprpp/sync.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/trace.h" diff --git a/src/core/lib/promise/inter_activity_pipe.h b/src/core/lib/promise/inter_activity_pipe.h index e03901b76ce..6e2940a68a7 100644 --- a/src/core/lib/promise/inter_activity_pipe.h +++ b/src/core/lib/promise/inter_activity_pipe.h @@ -25,9 +25,9 @@ #include -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.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" diff --git a/src/core/lib/promise/interceptor_list.h b/src/core/lib/promise/interceptor_list.h index da44df51b71..77294a9c486 100644 --- a/src/core/lib/promise/interceptor_list.h +++ b/src/core/lib/promise/interceptor_list.h @@ -30,8 +30,8 @@ #include #include -#include "src/core/lib/gprpp/construct_destruct.h" -#include "src/core/lib/gprpp/debug_location.h" +#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" diff --git a/src/core/lib/promise/loop.h b/src/core/lib/promise/loop.h index 8b4f99286d4..e24ca254a29 100644 --- a/src/core/lib/promise/loop.h +++ b/src/core/lib/promise/loop.h @@ -23,7 +23,7 @@ #include -#include "src/core/lib/gprpp/construct_destruct.h" +#include "src/core/util/construct_destruct.h" #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/poll.h" diff --git a/src/core/lib/promise/mpsc.h b/src/core/lib/promise/mpsc.h index ec8132e843a..46f08ce0562 100644 --- a/src/core/lib/promise/mpsc.h +++ b/src/core/lib/promise/mpsc.h @@ -27,9 +27,9 @@ #include #include -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.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" #include "src/core/lib/promise/wait_set.h" diff --git a/src/core/lib/promise/observable.h b/src/core/lib/promise/observable.h index 9337feace3f..d7ad7d9c969 100644 --- a/src/core/lib/promise/observable.h +++ b/src/core/lib/promise/observable.h @@ -21,7 +21,7 @@ #include -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" diff --git a/src/core/lib/promise/party.cc b/src/core/lib/promise/party.cc index 58931d978d4..994aace5a3d 100644 --- a/src/core/lib/promise/party.cc +++ b/src/core/lib/promise/party.cc @@ -23,13 +23,13 @@ #include #include -#include "src/core/lib/gprpp/sync.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/trace.h" #ifdef GRPC_MAXIMIZE_THREADYNESS -#include "src/core/lib/gprpp/thd.h" // IWYU pragma: keep +#include "src/core/util/thd.h" // IWYU pragma: keep #include "src/core/lib/iomgr/exec_ctx.h" // IWYU pragma: keep #endif diff --git a/src/core/lib/promise/party.h b/src/core/lib/promise/party.h index d2467168c26..13ab4d3ab19 100644 --- a/src/core/lib/promise/party.h +++ b/src/core/lib/promise/party.h @@ -31,11 +31,11 @@ #include #include -#include "src/core/lib/gprpp/construct_destruct.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.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" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/detail/promise_factory.h" diff --git a/src/core/lib/promise/pipe.h b/src/core/lib/promise/pipe.h index 570f59e77a1..6168bf7267a 100644 --- a/src/core/lib/promise/pipe.h +++ b/src/core/lib/promise/pipe.h @@ -31,8 +31,8 @@ #include #include -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#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" diff --git a/src/core/lib/promise/poll.h b/src/core/lib/promise/poll.h index 57a4a65e83a..0a0c2190578 100644 --- a/src/core/lib/promise/poll.h +++ b/src/core/lib/promise/poll.h @@ -23,7 +23,7 @@ #include #include -#include "src/core/lib/gprpp/construct_destruct.h" +#include "src/core/util/construct_destruct.h" namespace grpc_core { diff --git a/src/core/lib/promise/seq.h b/src/core/lib/promise/seq.h index f1bbb2f322e..da8a937e960 100644 --- a/src/core/lib/promise/seq.h +++ b/src/core/lib/promise/seq.h @@ -21,7 +21,7 @@ #include -#include "src/core/lib/gprpp/debug_location.h" +#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" diff --git a/src/core/lib/promise/sleep.cc b/src/core/lib/promise/sleep.cc index 1b793367149..f43a757ce85 100644 --- a/src/core/lib/promise/sleep.cc +++ b/src/core/lib/promise/sleep.cc @@ -20,7 +20,7 @@ #include #include "src/core/lib/event_engine/event_engine_context.h" // IWYU pragma: keep -#include "src/core/lib/gprpp/time.h" +#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" diff --git a/src/core/lib/promise/sleep.h b/src/core/lib/promise/sleep.h index b595b7100e3..770ebcd4a8d 100644 --- a/src/core/lib/promise/sleep.h +++ b/src/core/lib/promise/sleep.h @@ -23,7 +23,7 @@ #include #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" diff --git a/src/core/lib/promise/wait_for_callback.h b/src/core/lib/promise/wait_for_callback.h index 519253bbb24..8eae1e458b7 100644 --- a/src/core/lib/promise/wait_for_callback.h +++ b/src/core/lib/promise/wait_for_callback.h @@ -22,7 +22,7 @@ #include -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" diff --git a/src/core/lib/resource_quota/api.cc b/src/core/lib/resource_quota/api.cc index 7e2f9594e65..792d93bf90a 100644 --- a/src/core/lib/resource_quota/api.cc +++ b/src/core/lib/resource_quota/api.cc @@ -28,7 +28,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" diff --git a/src/core/lib/resource_quota/arena.h b/src/core/lib/resource_quota/arena.h index 0b92e4b5b74..88a7a752b4b 100644 --- a/src/core/lib/resource_quota/arena.h +++ b/src/core/lib/resource_quota/arena.h @@ -35,7 +35,7 @@ #include #include -#include "src/core/lib/gprpp/construct_destruct.h" +#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" diff --git a/src/core/lib/resource_quota/connection_quota.h b/src/core/lib/resource_quota/connection_quota.h index fcaddc1b58a..7f05c7692c6 100644 --- a/src/core/lib/resource_quota/connection_quota.h +++ b/src/core/lib/resource_quota/connection_quota.h @@ -22,9 +22,9 @@ #include -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.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 458597da5da..3b6da6a6609 100644 --- a/src/core/lib/resource_quota/memory_quota.cc +++ b/src/core/lib/resource_quota/memory_quota.cc @@ -34,7 +34,7 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/mpscq.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" diff --git a/src/core/lib/resource_quota/memory_quota.h b/src/core/lib/resource_quota/memory_quota.h index 79de77cf793..ebf70f6e9c6 100644 --- a/src/core/lib/resource_quota/memory_quota.h +++ b/src/core/lib/resource_quota/memory_quota.h @@ -39,10 +39,10 @@ #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.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" diff --git a/src/core/lib/resource_quota/periodic_update.h b/src/core/lib/resource_quota/periodic_update.h index 4104c94a78b..7a91510ef77 100644 --- a/src/core/lib/resource_quota/periodic_update.h +++ b/src/core/lib/resource_quota/periodic_update.h @@ -23,7 +23,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.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 e17448f14eb..81ae3c332e6 100644 --- a/src/core/lib/resource_quota/resource_quota.h +++ b/src/core/lib/resource_quota/resource_quota.h @@ -24,9 +24,9 @@ #include #include -#include "src/core/lib/gprpp/cpp_impl_of.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" diff --git a/src/core/lib/resource_quota/thread_quota.h b/src/core/lib/resource_quota/thread_quota.h index d66ee574c02..965436f20df 100644 --- a/src/core/lib/resource_quota/thread_quota.h +++ b/src/core/lib/resource_quota/thread_quota.h @@ -22,9 +22,9 @@ #include -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.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 d5b9ae3d149..6c19a1042fe 100644 --- a/src/core/lib/security/authorization/audit_logging.cc +++ b/src/core/lib/security/authorization/audit_logging.cc @@ -33,7 +33,7 @@ #include #include -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "src/core/lib/security/authorization/stdout_logger.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/audit_logging.h b/src/core/lib/security/authorization/audit_logging.h index 694810599cf..1f97120cd60 100644 --- a/src/core/lib/security/authorization/audit_logging.h +++ b/src/core/lib/security/authorization/audit_logging.h @@ -30,7 +30,7 @@ #include #include -#include "src/core/lib/gprpp/sync.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 37486cef420..34fe1bd2a34 100644 --- a/src/core/lib/security/authorization/authorization_engine.h +++ b/src/core/lib/security/authorization/authorization_engine.h @@ -19,7 +19,7 @@ #include -#include "src/core/lib/gprpp/ref_counted.h" +#include "src/core/util/ref_counted.h" #include "src/core/lib/security/authorization/evaluate_args.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 a4dbc5e8a08..55b097eedb5 100644 --- a/src/core/lib/security/authorization/authorization_policy_provider.h +++ b/src/core/lib/security/authorization/authorization_policy_provider.h @@ -21,8 +21,8 @@ #include #include -#include "src/core/lib/gprpp/dual_ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" 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 8c8236e2367..b7b88f12bed 100644 --- a/src/core/lib/security/authorization/authorization_policy_provider_vtable.cc +++ b/src/core/lib/security/authorization/authorization_policy_provider_vtable.cc @@ -16,7 +16,7 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/security/authorization/authorization_policy_provider.h" #include "src/core/util/useful.h" diff --git a/src/core/lib/security/authorization/evaluate_args.cc b/src/core/lib/security/authorization/evaluate_args.cc index 04b99234b85..f45fcc9064d 100644 --- a/src/core/lib/security/authorization/evaluate_args.cc +++ b/src/core/lib/security/authorization/evaluate_args.cc @@ -28,7 +28,7 @@ #include "src/core/handshaker/endpoint_info/endpoint_info_handshaker.h" #include "src/core/lib/address_utils/parse_address.h" -#include "src/core/lib/gprpp/host_port.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/uri.h" 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 85de990fa88..b51c69a3752 100644 --- a/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc +++ b/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc @@ -30,8 +30,8 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/load_file.h" -#include "src/core/lib/gprpp/status_helper.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" 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 b61db3131b1..03eaabddf23 100644 --- a/src/core/lib/security/authorization/grpc_authorization_policy_provider.h +++ b/src/core/lib/security/authorization/grpc_authorization_policy_provider.h @@ -28,9 +28,9 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/thd.h" +#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" 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 742b3979d88..51bc95149af 100644 --- a/src/core/lib/security/authorization/grpc_server_authz_filter.h +++ b/src/core/lib/security/authorization/grpc_server_authz_filter.h @@ -23,7 +23,7 @@ #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/lib/gprpp/ref_counted_ptr.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" 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 719561a1eec..d3e5f71d79f 100644 --- a/src/core/lib/security/certificate_provider/certificate_provider_factory.h +++ b/src/core/lib/security/certificate_provider/certificate_provider_factory.h @@ -27,9 +27,9 @@ #include #include -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/validation_errors.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" diff --git a/src/core/lib/security/context/security_context.cc b/src/core/lib/security/context/security_context.cc index 13ccb6f48b7..5463a4c9d8a 100644 --- a/src/core/lib/security/context/security_context.cc +++ b/src/core/lib/security/context/security_context.cc @@ -34,7 +34,7 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/context.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" diff --git a/src/core/lib/security/context/security_context.h b/src/core/lib/security/context/security_context.h index b583c4b36ab..cc141580054 100644 --- a/src/core/lib/security/context/security_context.h +++ b/src/core/lib/security/context/security_context.h @@ -33,9 +33,9 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#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" diff --git a/src/core/lib/security/credentials/alts/alts_credentials.h b/src/core/lib/security/credentials/alts/alts_credentials.h index e49ef34be4e..33743815026 100644 --- a/src/core/lib/security/credentials/alts/alts_credentials.h +++ b/src/core/lib/security/credentials/alts/alts_credentials.h @@ -25,8 +25,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.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/useful.h" 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 7c50a81f609..9aa21575bb1 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,7 +22,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" bool grpc_alts_is_running_on_gcp() { 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 b034ccaac79..106f87fc02d 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,7 +29,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/call_creds_util.cc b/src/core/lib/security/credentials/call_creds_util.cc index c49dd918ab5..ea6b1315fca 100644 --- a/src/core/lib/security/credentials/call_creds_util.cc +++ b/src/core/lib/security/credentials/call_creds_util.cc @@ -26,7 +26,7 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.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/security_connector.h" #include "src/core/lib/transport/metadata_batch.h" diff --git a/src/core/lib/security/credentials/channel_creds_registry.h b/src/core/lib/security/credentials/channel_creds_registry.h index 8fa2462f2ba..f559c507be5 100644 --- a/src/core/lib/security/credentials/channel_creds_registry.h +++ b/src/core/lib/security/credentials/channel_creds_registry.h @@ -26,9 +26,9 @@ #include -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/validation_errors.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" 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 832daba1284..cc2078d9e0d 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,9 @@ #include #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.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" diff --git a/src/core/lib/security/credentials/composite/composite_credentials.cc b/src/core/lib/security/credentials/composite/composite_credentials.cc index 0684012e796..6a7fa03e455 100644 --- a/src/core/lib/security/credentials/composite/composite_credentials.cc +++ b/src/core/lib/security/credentials/composite/composite_credentials.cc @@ -30,7 +30,7 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" diff --git a/src/core/lib/security/credentials/composite/composite_credentials.h b/src/core/lib/security/credentials/composite/composite_credentials.h index bcf2915abaa..e094e1bac01 100644 --- a/src/core/lib/security/credentials/composite/composite_credentials.h +++ b/src/core/lib/security/credentials/composite/composite_credentials.h @@ -33,8 +33,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.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" diff --git a/src/core/lib/security/credentials/credentials.cc b/src/core/lib/security/credentials/credentials.cc index 4220938e31a..27dd07ca541 100644 --- a/src/core/lib/security/credentials/credentials.cc +++ b/src/core/lib/security/credentials/credentials.cc @@ -28,7 +28,7 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.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/useful.h" diff --git a/src/core/lib/security/credentials/credentials.h b/src/core/lib/security/credentials/credentials.h index 24e384e8d71..a05178a3558 100644 --- a/src/core/lib/security/credentials/credentials.h +++ b/src/core/lib/security/credentials/credentials.h @@ -36,10 +36,10 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.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" 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 fbdf09d238a..ac5eb178327 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,7 +38,7 @@ #include #include -#include "src/core/lib/gprpp/env.h" +#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" 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 c7dc1f166c3..2afa06296bf 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,8 +26,8 @@ #include -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#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" 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 dd54a701772..a9e04ed806b 100644 --- a/src/core/lib/security/credentials/external/external_account_credentials.cc +++ b/src/core/lib/security/credentials/external/external_account_credentials.cc @@ -45,7 +45,7 @@ #include #include -#include "src/core/lib/gprpp/status_helper.h" +#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" 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 f0023ab878e..ac9908f736f 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,9 @@ #include -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.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/polling_entity.h" 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 0bbef7b8a07..d394cd1a25f 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,7 +26,7 @@ #include #include -#include "src/core/lib/gprpp/load_file.h" +#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" 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 8436dea8e7d..8b20fc5afa7 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,7 +25,7 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.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" 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 cfa32761182..6adeac7e4a4 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,8 +26,8 @@ #include -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#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" diff --git a/src/core/lib/security/credentials/fake/fake_credentials.cc b/src/core/lib/security/credentials/fake/fake_credentials.cc index 2eb12fa1039..4efa3d49b5e 100644 --- a/src/core/lib/security/credentials/fake/fake_credentials.cc +++ b/src/core/lib/security/credentials/fake/fake_credentials.cc @@ -28,7 +28,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" diff --git a/src/core/lib/security/credentials/fake/fake_credentials.h b/src/core/lib/security/credentials/fake/fake_credentials.h index 214d9b3ac3e..27a9515e1d4 100644 --- a/src/core/lib/security/credentials/fake/fake_credentials.h +++ b/src/core/lib/security/credentials/fake/fake_credentials.h @@ -30,8 +30,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.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" 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 bfcc7c37e08..35848fa1727 100644 --- a/src/core/lib/security/credentials/google_default/credentials_generic.cc +++ b/src/core/lib/security/credentials/google_default/credentials_generic.cc @@ -24,7 +24,7 @@ #include #include -#include "src/core/lib/gprpp/env.h" +#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" 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 bb487f32cde..49c694e7a9a 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,13 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/load_file.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.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" 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 8611cbdc254..f2791f7956d 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,8 +26,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.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/useful.h" diff --git a/src/core/lib/security/credentials/iam/iam_credentials.cc b/src/core/lib/security/credentials/iam/iam_credentials.cc index c6be5fe8865..2d946bda055 100644 --- a/src/core/lib/security/credentials/iam/iam_credentials.cc +++ b/src/core/lib/security/credentials/iam/iam_credentials.cc @@ -31,7 +31,7 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" diff --git a/src/core/lib/security/credentials/iam/iam_credentials.h b/src/core/lib/security/credentials/iam/iam_credentials.h index 592dffc4ebd..129e4d34396 100644 --- a/src/core/lib/security/credentials/iam/iam_credentials.h +++ b/src/core/lib/security/credentials/iam/iam_credentials.h @@ -28,7 +28,7 @@ #include #include -#include "src/core/lib/gprpp/unique_type_name.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/slice/slice.h" diff --git a/src/core/lib/security/credentials/insecure/insecure_credentials.h b/src/core/lib/security/credentials/insecure/insecure_credentials.h index e9bf9327e72..09c3fe7ad8a 100644 --- a/src/core/lib/security/credentials/insecure/insecure_credentials.h +++ b/src/core/lib/security/credentials/insecure/insecure_credentials.h @@ -25,8 +25,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.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" diff --git a/src/core/lib/security/credentials/jwt/jwt_credentials.cc b/src/core/lib/security/credentials/jwt/jwt_credentials.cc index e2eff164a49..69835b5fedd 100644 --- a/src/core/lib/security/credentials/jwt/jwt_credentials.cc +++ b/src/core/lib/security/credentials/jwt/jwt_credentials.cc @@ -38,7 +38,7 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" diff --git a/src/core/lib/security/credentials/jwt/jwt_credentials.h b/src/core/lib/security/credentials/jwt/jwt_credentials.h index 91332098eeb..7dd2a542a7f 100644 --- a/src/core/lib/security/credentials/jwt/jwt_credentials.h +++ b/src/core/lib/security/credentials/jwt/jwt_credentials.h @@ -35,8 +35,8 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.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/credentials/jwt/json_token.h" diff --git a/src/core/lib/security/credentials/jwt/jwt_verifier.cc b/src/core/lib/security/credentials/jwt/jwt_verifier.cc index 215be72c650..2a72f969f00 100644 --- a/src/core/lib/security/credentials/jwt/jwt_verifier.cc +++ b/src/core/lib/security/credentials/jwt/jwt_verifier.cc @@ -55,9 +55,9 @@ #include #include -#include "src/core/lib/gprpp/manual_constructor.h" -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/gprpp/orphanable.h" +#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" diff --git a/src/core/lib/security/credentials/jwt/jwt_verifier.h b/src/core/lib/security/credentials/jwt/jwt_verifier.h index 922da79d4c9..0c0fa0686fb 100644 --- a/src/core/lib/security/credentials/jwt/jwt_verifier.h +++ b/src/core/lib/security/credentials/jwt/jwt_verifier.h @@ -24,7 +24,7 @@ #include #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/util/json/json.h" diff --git a/src/core/lib/security/credentials/local/local_credentials.h b/src/core/lib/security/credentials/local/local_credentials.h index 9665db5d082..61fe220634f 100644 --- a/src/core/lib/security/credentials/local/local_credentials.h +++ b/src/core/lib/security/credentials/local/local_credentials.h @@ -26,8 +26,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.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/useful.h" diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc index b439671bb30..5c267deab89 100644 --- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc +++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc @@ -47,10 +47,10 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/load_file.h" -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.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" diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.h b/src/core/lib/security/credentials/oauth2/oauth2_credentials.h index 891dd5172c1..1047251ae95 100644 --- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.h +++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.h @@ -32,11 +32,11 @@ #include #include -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/unique_type_name.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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/polling_entity.h" diff --git a/src/core/lib/security/credentials/plugin/plugin_credentials.h b/src/core/lib/security/credentials/plugin/plugin_credentials.h index a81dd171202..3442632e5e6 100644 --- a/src/core/lib/security/credentials/plugin/plugin_credentials.h +++ b/src/core/lib/security/credentials/plugin/plugin_credentials.h @@ -36,9 +36,9 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.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" diff --git a/src/core/lib/security/credentials/ssl/ssl_credentials.h b/src/core/lib/security/credentials/ssl/ssl_credentials.h index 6651e50202a..a40e7c3887b 100644 --- a/src/core/lib/security/credentials/ssl/ssl_credentials.h +++ b/src/core/lib/security/credentials/ssl/ssl_credentials.h @@ -30,8 +30,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.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" 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 5a0de70f093..6c8ff6908cd 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,8 +30,8 @@ #include -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/sync.h" +#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" 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 aa1dc975a5d..e27770d7125 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,9 +33,9 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/load_file.h" -#include "src/core/lib/gprpp/stat.h" -#include "src/core/lib/gprpp/status_helper.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" 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 d5908d974f0..2121642c735 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,11 +33,11 @@ #include #include -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/thd.h" -#include "src/core/lib/gprpp/unique_type_name.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" 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 b34005d0a89..9983371a8d4 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,7 +30,7 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/host_port.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" diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h b/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h index 3cb2bba340c..57c77aed9f1 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h +++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h @@ -30,9 +30,9 @@ #include #include -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/unique_type_name.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/sync.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" // An abstraction of the verifier that all verifier subclasses should extend. 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 288b2debc00..260a62d30ab 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,7 +28,7 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/debug_location.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" diff --git a/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h b/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h index b29468239a1..f40773739a1 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h +++ b/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h @@ -28,7 +28,7 @@ #include #include -#include "src/core/lib/gprpp/ref_counted.h" +#include "src/core/util/ref_counted.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/lib/security/credentials/tls/grpc_tls_certificate_verifier.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 2da191aeca5..5c422057554 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,8 +44,8 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/directory_reader.h" -#include "src/core/lib/gprpp/load_file.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" diff --git a/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h b/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h index 77ffc439384..b9188740c5e 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h +++ b/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h @@ -39,9 +39,9 @@ #include #include -#include "src/core/lib/gprpp/directory_reader.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/directory_reader.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.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 c72dcd61da8..1ccf2efda1e 100644 --- a/src/core/lib/security/credentials/tls/tls_credentials.h +++ b/src/core/lib/security/credentials/tls/tls_credentials.h @@ -25,8 +25,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.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" diff --git a/src/core/lib/security/credentials/xds/xds_credentials.h b/src/core/lib/security/credentials/xds/xds_credentials.h index 85d80a2983b..21d7ce6b3b6 100644 --- a/src/core/lib/security/credentials/xds/xds_credentials.h +++ b/src/core/lib/security/credentials/xds/xds_credentials.h @@ -34,8 +34,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.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" 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 07bb8c5ee3f..14279e7a69d 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,8 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" 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 1f0c13a3618..0e3bce8885d 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,7 +23,7 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#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" 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 21aa4bc62a5..b32b7476959 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,10 @@ #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/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" 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 1edc40c0b95..8f2eb5c74d9 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,7 +24,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/security/security_connector/security_connector.h" // Creates a fake connector that emulates real channel security. 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 97f3fff8718..6dc482d90cd 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,8 +28,8 @@ #include "src/core/handshaker/security/security_handshaker.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" 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 151264f35ae..4ad79f16fb0 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,7 @@ #include "src/core/handshaker/handshaker.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" 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 a7dd8610de5..ec1f9250458 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,7 +38,7 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/load_file.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" 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 ae435d4795d..0776450e817 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,8 @@ #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/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" 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 09020552f1c..adbef4661dd 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,7 +24,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/security/security_connector/security_connector.h" /// diff --git a/src/core/lib/security/security_connector/security_connector.cc b/src/core/lib/security/security_connector/security_connector.cc index 3090ba61928..7e86bf68c1c 100644 --- a/src/core/lib/security/security_connector/security_connector.cc +++ b/src/core/lib/security/security_connector/security_connector.cc @@ -28,7 +28,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/debug_location.h" +#include "src/core/util/debug_location.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/util/useful.h" diff --git a/src/core/lib/security/security_connector/security_connector.h b/src/core/lib/security/security_connector/security_connector.h index 38b90956b7b..4f4419cd9c8 100644 --- a/src/core/lib/security/security_connector/security_connector.h +++ b/src/core/lib/security/security_connector/security_connector.h @@ -32,9 +32,9 @@ #include "src/core/handshaker/handshaker.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.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" 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 52ec0f39534..25dba4ecac3 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,10 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.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" 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 3ce665d587e..5cddd00cc40 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,7 +26,7 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#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" diff --git a/src/core/lib/security/security_connector/ssl_utils.cc b/src/core/lib/security/security_connector/ssl_utils.cc index 1e69711bf33..f1a800e7b10 100644 --- a/src/core/lib/security/security_connector/ssl_utils.cc +++ b/src/core/lib/security/security_connector/ssl_utils.cc @@ -44,9 +44,9 @@ #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/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/load_file.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" diff --git a/src/core/lib/security/security_connector/ssl_utils.h b/src/core/lib/security/security_connector/ssl_utils.h index dd37f0e9b98..8f11b7ed65b 100644 --- a/src/core/lib/security/security_connector/ssl_utils.h +++ b/src/core/lib/security/security_connector/ssl_utils.h @@ -35,7 +35,7 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#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" 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 e74d9ca2bc4..05482d966f7 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,9 @@ #include "src/core/handshaker/security/security_handshaker.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/status_helper.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" 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 0053a9d46d3..122f359c194 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,8 @@ #include "src/core/handshaker/handshaker.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.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" diff --git a/src/core/lib/security/transport/auth_filters.h b/src/core/lib/security/transport/auth_filters.h index 3970ae1e4f3..92860cef5b3 100644 --- a/src/core/lib/security/transport/auth_filters.h +++ b/src/core/lib/security/transport/auth_filters.h @@ -30,7 +30,7 @@ #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/lib/gprpp/ref_counted_ptr.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" diff --git a/src/core/lib/security/transport/client_auth_filter.cc b/src/core/lib/security/transport/client_auth_filter.cc index be6fcdae3d8..12fc061b965 100644 --- a/src/core/lib/security/transport/client_auth_filter.cc +++ b/src/core/lib/security/transport/client_auth_filter.cc @@ -39,8 +39,8 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" diff --git a/src/core/lib/security/transport/server_auth_filter.cc b/src/core/lib/security/transport/server_auth_filter.cc index bf7aa2560c2..13ede6f4d41 100644 --- a/src/core/lib/security/transport/server_auth_filter.cc +++ b/src/core/lib/security/transport/server_auth_filter.cc @@ -41,9 +41,9 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.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" diff --git a/src/core/lib/slice/percent_encoding.cc b/src/core/lib/slice/percent_encoding.cc index 8931f1d716d..16ed58825b3 100644 --- a/src/core/lib/slice/percent_encoding.cc +++ b/src/core/lib/slice/percent_encoding.cc @@ -28,7 +28,7 @@ #include #include -#include "src/core/lib/gprpp/bitset.h" +#include "src/core/util/bitset.h" namespace grpc_core { diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc index f2d49e0bf47..997f63b1e85 100644 --- a/src/core/lib/slice/slice.cc +++ b/src/core/lib/slice/slice.cc @@ -29,7 +29,7 @@ #include #include -#include "src/core/lib/gprpp/memory.h" +#include "src/core/util/memory.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_refcount.h" diff --git a/src/core/lib/slice/slice.h b/src/core/lib/slice/slice.h index 2dc1d4164c7..e24d40a88b9 100644 --- a/src/core/lib/slice/slice.h +++ b/src/core/lib/slice/slice.h @@ -30,7 +30,7 @@ #include #include -#include "src/core/lib/gprpp/debug_location.h" +#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/string.h" diff --git a/src/core/lib/slice/slice_internal.h b/src/core/lib/slice/slice_internal.h index 03d8fbe180d..4227b0acaf2 100644 --- a/src/core/lib/slice/slice_internal.h +++ b/src/core/lib/slice/slice_internal.h @@ -32,7 +32,7 @@ #include #include -#include "src/core/lib/gprpp/memory.h" +#include "src/core/util/memory.h" // Returns a pointer to the first slice in the slice buffer without giving // ownership to or a reference count on that slice. diff --git a/src/core/lib/slice/slice_refcount.h b/src/core/lib/slice/slice_refcount.h index aa1c6d146b3..77274e5b8ec 100644 --- a/src/core/lib/slice/slice_refcount.h +++ b/src/core/lib/slice/slice_refcount.h @@ -24,7 +24,7 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/debug_location.h" +#include "src/core/util/debug_location.h" extern GRPC_DLL grpc_core::DebugOnlyTraceFlag grpc_slice_refcount_trace; diff --git a/src/core/lib/surface/call.cc b/src/core/lib/surface/call.cc index 5f0d4a99310..0c018b8d2d9 100644 --- a/src/core/lib/surface/call.cc +++ b/src/core/lib/surface/call.cc @@ -63,14 +63,14 @@ #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/lib/gprpp/bitset.h" -#include "src/core/lib/gprpp/cpp_impl_of.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/sync.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" diff --git a/src/core/lib/surface/call.h b/src/core/lib/surface/call.h index d464de2ec89..a6be2e8e572 100644 --- a/src/core/lib/surface/call.h +++ b/src/core/lib/surface/call.h @@ -38,8 +38,8 @@ #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/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.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" diff --git a/src/core/lib/surface/channel.h b/src/core/lib/surface/channel.h index 9d207ae5f2c..1bbca616e0e 100644 --- a/src/core/lib/surface/channel.h +++ b/src/core/lib/surface/channel.h @@ -33,11 +33,11 @@ #include "src/core/channelz/channelz.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/cpp_impl_of.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.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" diff --git a/src/core/lib/surface/channel_create.h b/src/core/lib/surface/channel_create.h index dcdb1dc9e96..ca7383af9b1 100644 --- a/src/core/lib/surface/channel_create.h +++ b/src/core/lib/surface/channel_create.h @@ -24,7 +24,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/orphanable.h" +#include "src/core/util/orphanable.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/channel_stack_type.h" diff --git a/src/core/lib/surface/channel_init.cc b/src/core/lib/surface/channel_init.cc index da694aa59be..67cb9d3b12f 100644 --- a/src/core/lib/surface/channel_init.cc +++ b/src/core/lib/surface/channel_init.cc @@ -38,8 +38,8 @@ #include "src/core/lib/channel/channel_stack_trace.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.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 c5067394014..dd350d03b9f 100644 --- a/src/core/lib/surface/channel_init.h +++ b/src/core/lib/surface/channel_init.h @@ -35,7 +35,7 @@ #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/lib/gprpp/debug_location.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" diff --git a/src/core/lib/surface/completion_queue.cc b/src/core/lib/surface/completion_queue.cc index 1c77614f6fb..ba9b0366013 100644 --- a/src/core/lib/surface/completion_queue.cc +++ b/src/core/lib/surface/completion_queue.cc @@ -41,11 +41,11 @@ #include #include -#include "src/core/lib/gprpp/atomic_utils.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.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/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" diff --git a/src/core/lib/surface/completion_queue.h b/src/core/lib/surface/completion_queue.h index 9779b210ada..5ea43c6e189 100644 --- a/src/core/lib/surface/completion_queue.h +++ b/src/core/lib/surface/completion_queue.h @@ -27,8 +27,8 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/manual_constructor.h" -#include "src/core/lib/gprpp/mpscq.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" diff --git a/src/core/lib/surface/init.cc b/src/core/lib/surface/init.cc index fc8e75484d2..39ce8d6afcd 100644 --- a/src/core/lib/surface/init.cc +++ b/src/core/lib/surface/init.cc @@ -34,9 +34,9 @@ #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/lib/gprpp/fork.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/thd.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" diff --git a/src/core/lib/surface/lame_client.cc b/src/core/lib/surface/lame_client.cc index f573194a42e..d453fcca7e4 100644 --- a/src/core/lib/surface/lame_client.cc +++ b/src/core/lib/surface/lame_client.cc @@ -36,9 +36,9 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.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" @@ -51,7 +51,7 @@ #include "src/core/util/useful.h" // Avoid some IWYU confusion: -// IWYU pragma: no_include "src/core/lib/gprpp/orphanable.h" +// IWYU pragma: no_include "src/core/util/orphanable.h" namespace grpc_core { diff --git a/src/core/lib/surface/lame_client.h b/src/core/lib/surface/lame_client.h index 1f8d323d352..b40f26b29af 100644 --- a/src/core/lib/surface/lame_client.h +++ b/src/core/lib/surface/lame_client.h @@ -31,7 +31,7 @@ #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/lib/gprpp/sync.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" diff --git a/src/core/lib/surface/legacy_channel.cc b/src/core/lib/surface/legacy_channel.cc index c35e0158c51..ede77376326 100644 --- a/src/core/lib/surface/legacy_channel.cc +++ b/src/core/lib/surface/legacy_channel.cc @@ -37,11 +37,11 @@ #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/gprpp/crash.h" -#include "src/core/lib/gprpp/dual_ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.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" diff --git a/src/core/lib/surface/legacy_channel.h b/src/core/lib/surface/legacy_channel.h index b5199e80939..fa54973b3af 100644 --- a/src/core/lib/surface/legacy_channel.h +++ b/src/core/lib/surface/legacy_channel.h @@ -32,8 +32,8 @@ #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/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" +#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" diff --git a/src/core/lib/surface/validate_metadata.cc b/src/core/lib/surface/validate_metadata.cc index e3d4f5f9b04..46aaaa55bfe 100644 --- a/src/core/lib/surface/validate_metadata.cc +++ b/src/core/lib/surface/validate_metadata.cc @@ -24,7 +24,7 @@ #include #include -#include "src/core/lib/gprpp/bitset.h" +#include "src/core/util/bitset.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice_internal.h" 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 ed8191618e7..f45000e4d82 100644 --- a/src/core/lib/surface/wait_for_cq_end_op.cc +++ b/src/core/lib/surface/wait_for_cq_end_op.cc @@ -18,7 +18,7 @@ #include -#include "src/core/lib/gprpp/match.h" +#include "src/core/util/match.h" #include "src/core/lib/promise/trace.h" namespace grpc_core { diff --git a/src/core/lib/transport/batch_builder.h b/src/core/lib/transport/batch_builder.h index 68a65ba25be..1e5fb73d631 100644 --- a/src/core/lib/transport/batch_builder.h +++ b/src/core/lib/transport/batch_builder.h @@ -33,8 +33,8 @@ #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.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" diff --git a/src/core/lib/transport/bdp_estimator.h b/src/core/lib/transport/bdp_estimator.h index 6c953bd4054..84d3f4b217a 100644 --- a/src/core/lib/transport/bdp_estimator.h +++ b/src/core/lib/transport/bdp_estimator.h @@ -31,7 +31,7 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" extern grpc_core::TraceFlag grpc_bdp_estimator_trace; diff --git a/src/core/lib/transport/call_arena_allocator.h b/src/core/lib/transport/call_arena_allocator.h index ebc748854ec..c0907fe67f7 100644 --- a/src/core/lib/transport/call_arena_allocator.h +++ b/src/core/lib/transport/call_arena_allocator.h @@ -22,7 +22,7 @@ #include -#include "src/core/lib/gprpp/ref_counted.h" +#include "src/core/util/ref_counted.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" diff --git a/src/core/lib/transport/call_destination.h b/src/core/lib/transport/call_destination.h index 04d402569c9..82719b698c2 100644 --- a/src/core/lib/transport/call_destination.h +++ b/src/core/lib/transport/call_destination.h @@ -17,7 +17,7 @@ #include -#include "src/core/lib/gprpp/orphanable.h" +#include "src/core/util/orphanable.h" #include "src/core/lib/transport/call_spine.h" namespace grpc_core { diff --git a/src/core/lib/transport/call_filters.cc b/src/core/lib/transport/call_filters.cc index c4b18721c86..f11a96c210b 100644 --- a/src/core/lib/transport/call_filters.cc +++ b/src/core/lib/transport/call_filters.cc @@ -18,7 +18,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/transport/metadata.h" namespace grpc_core { diff --git a/src/core/lib/transport/call_filters.h b/src/core/lib/transport/call_filters.h index c69ef82c1dc..0eab480f9f8 100644 --- a/src/core/lib/transport/call_filters.h +++ b/src/core/lib/transport/call_filters.h @@ -23,9 +23,9 @@ #include -#include "src/core/lib/gprpp/dump_args.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#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" diff --git a/src/core/lib/transport/call_spine.h b/src/core/lib/transport/call_spine.h index 1dbc939d915..6e6da6f3593 100644 --- a/src/core/lib/transport/call_spine.h +++ b/src/core/lib/transport/call_spine.h @@ -21,7 +21,7 @@ #include #include "src/core/lib/channel/context.h" -#include "src/core/lib/gprpp/dual_ref_counted.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" diff --git a/src/core/lib/transport/connectivity_state.cc b/src/core/lib/transport/connectivity_state.cc index 35bd75185e1..93c6df8d030 100644 --- a/src/core/lib/transport/connectivity_state.cc +++ b/src/core/lib/transport/connectivity_state.cc @@ -21,8 +21,8 @@ #include #include -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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/error.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/transport/connectivity_state.h b/src/core/lib/transport/connectivity_state.h index 8b5fb677186..4de1f78c163 100644 --- a/src/core/lib/transport/connectivity_state.h +++ b/src/core/lib/transport/connectivity_state.h @@ -30,8 +30,8 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/work_serializer.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/lib/transport/error_utils.cc b/src/core/lib/transport/error_utils.cc index 2b3b776a27a..97804bcf4bc 100644 --- a/src/core/lib/transport/error_utils.cc +++ b/src/core/lib/transport/error_utils.cc @@ -25,7 +25,7 @@ #include #include -#include "src/core/lib/gprpp/status_helper.h" +#include "src/core/util/status_helper.h" #include "src/core/lib/transport/status_conversion.h" static grpc_error_handle recursively_find_error_with_field( diff --git a/src/core/lib/transport/error_utils.h b/src/core/lib/transport/error_utils.h index f10bfad63b6..c32f085171d 100644 --- a/src/core/lib/transport/error_utils.h +++ b/src/core/lib/transport/error_utils.h @@ -26,7 +26,7 @@ #include #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/transport/http2_errors.h" diff --git a/src/core/lib/transport/interception_chain.cc b/src/core/lib/transport/interception_chain.cc index 667077af586..a008cadf0f8 100644 --- a/src/core/lib/transport/interception_chain.cc +++ b/src/core/lib/transport/interception_chain.cc @@ -18,7 +18,7 @@ #include -#include "src/core/lib/gprpp/match.h" +#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" diff --git a/src/core/lib/transport/interception_chain.h b/src/core/lib/transport/interception_chain.h index e9dcb937b19..125bfa707d7 100644 --- a/src/core/lib/transport/interception_chain.h +++ b/src/core/lib/transport/interception_chain.h @@ -20,7 +20,7 @@ #include -#include "src/core/lib/gprpp/ref_counted.h" +#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" diff --git a/src/core/lib/transport/metadata_batch.h b/src/core/lib/transport/metadata_batch.h index a5a934803ee..5bbb92379ac 100644 --- a/src/core/lib/transport/metadata_batch.h +++ b/src/core/lib/transport/metadata_batch.h @@ -41,11 +41,11 @@ #include "src/core/lib/compression/compression_internal.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/chunked_vector.h" -#include "src/core/lib/gprpp/if_list.h" -#include "src/core/lib/gprpp/packed_table.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/type_list.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" diff --git a/src/core/lib/transport/parsed_metadata.h b/src/core/lib/transport/parsed_metadata.h index 26e3264bb4c..8833ff8ba28 100644 --- a/src/core/lib/transport/parsed_metadata.h +++ b/src/core/lib/transport/parsed_metadata.h @@ -32,7 +32,7 @@ #include #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/lib/slice/slice.h" namespace grpc_core { diff --git a/src/core/lib/transport/promise_endpoint.cc b/src/core/lib/transport/promise_endpoint.cc index 031f5194e02..3872cfc38c5 100644 --- a/src/core/lib/transport/promise_endpoint.cc +++ b/src/core/lib/transport/promise_endpoint.cc @@ -29,7 +29,7 @@ #include #include -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "src/core/lib/slice/slice_buffer.h" namespace grpc_core { diff --git a/src/core/lib/transport/promise_endpoint.h b/src/core/lib/transport/promise_endpoint.h index 12659aff583..02252736083 100644 --- a/src/core/lib/transport/promise_endpoint.h +++ b/src/core/lib/transport/promise_endpoint.h @@ -39,7 +39,7 @@ #include "src/core/lib/event_engine/extensions/chaotic_good_extension.h" #include "src/core/lib/event_engine/query_extensions.h" -#include "src/core/lib/gprpp/sync.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" diff --git a/src/core/lib/transport/status_conversion.h b/src/core/lib/transport/status_conversion.h index 6691a84d729..3c169873257 100644 --- a/src/core/lib/transport/status_conversion.h +++ b/src/core/lib/transport/status_conversion.h @@ -22,7 +22,7 @@ #include #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/lib/transport/http2_errors.h" // Conversion of grpc status codes to http2 error codes (for RST_STREAM) diff --git a/src/core/lib/transport/timeout_encoding.h b/src/core/lib/transport/timeout_encoding.h index 58346c98c6d..62f29ce7cfe 100644 --- a/src/core/lib/transport/timeout_encoding.h +++ b/src/core/lib/transport/timeout_encoding.h @@ -25,7 +25,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/lib/slice/slice.h" namespace grpc_core { diff --git a/src/core/lib/transport/transport.cc b/src/core/lib/transport/transport.cc index 0ea7ad6284e..370ae142d1d 100644 --- a/src/core/lib/transport/transport.cc +++ b/src/core/lib/transport/transport.cc @@ -32,7 +32,7 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/time.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" diff --git a/src/core/lib/transport/transport.h b/src/core/lib/transport/transport.h index 7d879a91de5..2f021ae6886 100644 --- a/src/core/lib/transport/transport.h +++ b/src/core/lib/transport/transport.h @@ -41,8 +41,8 @@ #include "src/core/lib/channel/context.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted.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" diff --git a/src/core/lib/transport/transport_op_string.cc b/src/core/lib/transport/transport_op_string.cc index 09222337537..6e1f06af305 100644 --- a/src/core/lib/transport/transport_op_string.cc +++ b/src/core/lib/transport/transport_op_string.cc @@ -26,8 +26,8 @@ #include #include "src/core/lib/channel/channel_fwd.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/status_helper.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" diff --git a/src/core/load_balancing/address_filtering.cc b/src/core/load_balancing/address_filtering.cc index 4077eda12ab..7905002873f 100644 --- a/src/core/load_balancing/address_filtering.cc +++ b/src/core/load_balancing/address_filtering.cc @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/resolved_address.h" namespace grpc_core { diff --git a/src/core/load_balancing/address_filtering.h b/src/core/load_balancing/address_filtering.h index 0c03092694e..e14df20157c 100644 --- a/src/core/load_balancing/address_filtering.h +++ b/src/core/load_balancing/address_filtering.h @@ -27,8 +27,8 @@ #include -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_string.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 diff --git a/src/core/load_balancing/child_policy_handler.cc b/src/core/load_balancing/child_policy_handler.cc index 87e29859e57..d7ed6109beb 100644 --- a/src/core/load_balancing/child_policy_handler.cc +++ b/src/core/load_balancing/child_policy_handler.cc @@ -30,7 +30,7 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/debug_location.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" diff --git a/src/core/load_balancing/child_policy_handler.h b/src/core/load_balancing/child_policy_handler.h index 9a964f020cd..8f8815fb3e5 100644 --- a/src/core/load_balancing/child_policy_handler.h +++ b/src/core/load_balancing/child_policy_handler.h @@ -25,8 +25,8 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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 fea9d48e0d7..ae64ccefea9 100644 --- a/src/core/load_balancing/delegating_helper.h +++ b/src/core/load_balancing/delegating_helper.h @@ -28,8 +28,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" diff --git a/src/core/load_balancing/endpoint_list.cc b/src/core/load_balancing/endpoint_list.cc index 261711ba81a..828fc01729d 100644 --- a/src/core/load_balancing/endpoint_list.cc +++ b/src/core/load_balancing/endpoint_list.cc @@ -34,9 +34,9 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#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" diff --git a/src/core/load_balancing/endpoint_list.h b/src/core/load_balancing/endpoint_list.h index cd8276bf51a..4a3a91a8129 100644 --- a/src/core/load_balancing/endpoint_list.h +++ b/src/core/load_balancing/endpoint_list.h @@ -31,10 +31,10 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/work_serializer.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" 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 e03fe8d70ce..0021a5651fc 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,7 @@ #include #include "src/core/lib/channel/channel_stack.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" diff --git a/src/core/load_balancing/grpclb/grpclb.cc b/src/core/load_balancing/grpclb/grpclb.cc index 818479dc157..a80831df444 100644 --- a/src/core/load_balancing/grpclb/grpclb.cc +++ b/src/core/load_balancing/grpclb/grpclb.cc @@ -101,15 +101,15 @@ #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/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.h" -#include "src/core/lib/gprpp/work_serializer.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" diff --git a/src/core/load_balancing/grpclb/grpclb_client_stats.cc b/src/core/load_balancing/grpclb/grpclb_client_stats.cc index b21e56c908c..6ed75719e9c 100644 --- a/src/core/load_balancing/grpclb/grpclb_client_stats.cc +++ b/src/core/load_balancing/grpclb/grpclb_client_stats.cc @@ -24,7 +24,7 @@ #include #include -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/load_balancing/grpclb/grpclb_client_stats.h b/src/core/load_balancing/grpclb/grpclb_client_stats.h index 557d00429a9..d03462038f6 100644 --- a/src/core/load_balancing/grpclb/grpclb_client_stats.h +++ b/src/core/load_balancing/grpclb/grpclb_client_stats.h @@ -30,9 +30,9 @@ #include #include -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/memory.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/load_balancing/grpclb/load_balancer_api.cc b/src/core/load_balancing/grpclb/load_balancer_api.cc index a702e900843..24ae0be665c 100644 --- a/src/core/load_balancing/grpclb/load_balancer_api.cc +++ b/src/core/load_balancing/grpclb/load_balancer_api.cc @@ -30,7 +30,7 @@ #include #include -#include "src/core/lib/gprpp/memory.h" +#include "src/core/util/memory.h" #include "src/proto/grpc/lb/v1/load_balancer.upb.h" namespace grpc_core { diff --git a/src/core/load_balancing/grpclb/load_balancer_api.h b/src/core/load_balancing/grpclb/load_balancer_api.h index e948810e492..5ecfbc831a9 100644 --- a/src/core/load_balancing/grpclb/load_balancer_api.h +++ b/src/core/load_balancing/grpclb/load_balancer_api.h @@ -28,7 +28,7 @@ #include #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/load_balancing/grpclb/grpclb_client_stats.h" #define GRPC_GRPCLB_SERVICE_NAME_MAX_LENGTH 128 diff --git a/src/core/load_balancing/health_check_client.cc b/src/core/load_balancing/health_check_client.cc index ba70c0702f8..f988eb2fbd7 100644 --- a/src/core/load_balancing/health_check_client.cc +++ b/src/core/load_balancing/health_check_client.cc @@ -47,11 +47,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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/work_serializer.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" diff --git a/src/core/load_balancing/health_check_client.h b/src/core/load_balancing/health_check_client.h index 03f42cd1e91..eef6e4ba494 100644 --- a/src/core/load_balancing/health_check_client.h +++ b/src/core/load_balancing/health_check_client.h @@ -22,7 +22,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/work_serializer.h" +#include "src/core/util/work_serializer.h" #include "src/core/load_balancing/subchannel_interface.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 0fc86ac2858..1ac15968ffe 100644 --- a/src/core/load_balancing/health_check_client_internal.h +++ b/src/core/load_balancing/health_check_client_internal.h @@ -34,11 +34,11 @@ #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/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/unique_type_name.h" -#include "src/core/lib/gprpp/work_serializer.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" diff --git a/src/core/load_balancing/lb_policy.h b/src/core/load_balancing/lb_policy.h index 1ac1deb2055..eca9b144cca 100644 --- a/src/core/load_balancing/lb_policy.h +++ b/src/core/load_balancing/lb_policy.h @@ -39,13 +39,13 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/dual_ref_counted.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/work_serializer.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/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" diff --git a/src/core/load_balancing/lb_policy_factory.h b/src/core/load_balancing/lb_policy_factory.h index 697a5321667..64d7041e1fb 100644 --- a/src/core/load_balancing/lb_policy_factory.h +++ b/src/core/load_balancing/lb_policy_factory.h @@ -22,8 +22,8 @@ #include -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#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" diff --git a/src/core/load_balancing/lb_policy_registry.h b/src/core/load_balancing/lb_policy_registry.h index 44d1e487522..d3730017077 100644 --- a/src/core/load_balancing/lb_policy_registry.h +++ b/src/core/load_balancing/lb_policy_registry.h @@ -25,8 +25,8 @@ #include -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#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" diff --git a/src/core/load_balancing/oob_backend_metric.cc b/src/core/load_balancing/oob_backend_metric.cc index 0a022825e47..e028dda7644 100644 --- a/src/core/load_balancing/oob_backend_metric.cc +++ b/src/core/load_balancing/oob_backend_metric.cc @@ -42,12 +42,12 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.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" diff --git a/src/core/load_balancing/oob_backend_metric.h b/src/core/load_balancing/oob_backend_metric.h index 26ac8b1b12d..a8bb0d823c3 100644 --- a/src/core/load_balancing/oob_backend_metric.h +++ b/src/core/load_balancing/oob_backend_metric.h @@ -21,7 +21,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/load_balancing/backend_metric_data.h" #include "src/core/load_balancing/subchannel_interface.h" diff --git a/src/core/load_balancing/oob_backend_metric_internal.h b/src/core/load_balancing/oob_backend_metric_internal.h index 30f9ac158da..fddafdc14a3 100644 --- a/src/core/load_balancing/oob_backend_metric_internal.h +++ b/src/core/load_balancing/oob_backend_metric_internal.h @@ -30,11 +30,11 @@ #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/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/unique_type_name.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" diff --git a/src/core/load_balancing/outlier_detection/outlier_detection.cc b/src/core/load_balancing/outlier_detection/outlier_detection.cc index 2545345cf33..5fb83db3305 100644 --- a/src/core/load_balancing/outlier_detection/outlier_detection.cc +++ b/src/core/load_balancing/outlier_detection/outlier_detection.cc @@ -50,14 +50,14 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/unique_type_name.h" -#include "src/core/lib/gprpp/validation_errors.h" -#include "src/core/lib/gprpp/work_serializer.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" diff --git a/src/core/load_balancing/outlier_detection/outlier_detection.h b/src/core/load_balancing/outlier_detection/outlier_detection.h index ba5767914ec..959e912d147 100644 --- a/src/core/load_balancing/outlier_detection/outlier_detection.h +++ b/src/core/load_balancing/outlier_detection/outlier_detection.h @@ -23,8 +23,8 @@ #include -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.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" #include "src/core/util/json/json_object_loader.h" diff --git a/src/core/load_balancing/pick_first/pick_first.cc b/src/core/load_balancing/pick_first/pick_first.cc index 47b43a30114..65fc3e63792 100644 --- a/src/core/load_balancing/pick_first/pick_first.cc +++ b/src/core/load_balancing/pick_first/pick_first.cc @@ -46,12 +46,12 @@ #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/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/work_serializer.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" diff --git a/src/core/load_balancing/priority/priority.cc b/src/core/load_balancing/priority/priority.cc index 114ca5df053..57cb423419a 100644 --- a/src/core/load_balancing/priority/priority.cc +++ b/src/core/load_balancing/priority/priority.cc @@ -42,13 +42,13 @@ #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/gprpp/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/ref_counted_string.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.h" -#include "src/core/lib/gprpp/work_serializer.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" diff --git a/src/core/load_balancing/ring_hash/ring_hash.cc b/src/core/load_balancing/ring_hash/ring_hash.cc index 87f4e722105..691da0706be 100644 --- a/src/core/load_balancing/ring_hash/ring_hash.cc +++ b/src/core/load_balancing/ring_hash/ring_hash.cc @@ -47,14 +47,14 @@ #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/gprpp/crash.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.h" -#include "src/core/lib/gprpp/work_serializer.h" -#include "src/core/lib/gprpp/xxhash_inline.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" diff --git a/src/core/load_balancing/ring_hash/ring_hash.h b/src/core/load_balancing/ring_hash/ring_hash.h index c5f6205e170..030a207cd31 100644 --- a/src/core/load_balancing/ring_hash/ring_hash.h +++ b/src/core/load_balancing/ring_hash/ring_hash.h @@ -21,8 +21,8 @@ #include -#include "src/core/lib/gprpp/unique_type_name.h" -#include "src/core/lib/gprpp/validation_errors.h" +#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" diff --git a/src/core/load_balancing/rls/rls.cc b/src/core/load_balancing/rls/rls.cc index 392b40ae247..43c739d1ad6 100644 --- a/src/core/load_balancing/rls/rls.cc +++ b/src/core/load_balancing/rls/rls.cc @@ -72,17 +72,17 @@ #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/gprpp/debug_location.h" -#include "src/core/lib/gprpp/dual_ref_counted.h" -#include "src/core/lib/gprpp/match.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/uuid_v4.h" -#include "src/core/lib/gprpp/validation_errors.h" -#include "src/core/lib/gprpp/work_serializer.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" diff --git a/src/core/load_balancing/round_robin/round_robin.cc b/src/core/load_balancing/round_robin/round_robin.cc index f149d153078..fe039ce5818 100644 --- a/src/core/load_balancing/round_robin/round_robin.cc +++ b/src/core/load_balancing/round_robin/round_robin.cc @@ -40,10 +40,10 @@ #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/gprpp/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/work_serializer.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" diff --git a/src/core/load_balancing/subchannel_interface.h b/src/core/load_balancing/subchannel_interface.h index d135924f2b3..2e0fed6607c 100644 --- a/src/core/load_balancing/subchannel_interface.h +++ b/src/core/load_balancing/subchannel_interface.h @@ -25,8 +25,8 @@ #include #include -#include "src/core/lib/gprpp/dual_ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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 e4f805f7384..3fe22e29ad8 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,14 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.h" -#include "src/core/lib/gprpp/work_serializer.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" diff --git a/src/core/load_balancing/weighted_target/weighted_target.cc b/src/core/load_balancing/weighted_target/weighted_target.cc index 61c4777851d..a84affe2193 100644 --- a/src/core/load_balancing/weighted_target/weighted_target.cc +++ b/src/core/load_balancing/weighted_target/weighted_target.cc @@ -45,13 +45,13 @@ #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/gprpp/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.h" -#include "src/core/lib/gprpp/work_serializer.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" diff --git a/src/core/load_balancing/xds/cds.cc b/src/core/load_balancing/xds/cds.cc index 88813f87d78..724dd400416 100644 --- a/src/core/load_balancing/xds/cds.cc +++ b/src/core/load_balancing/xds/cds.cc @@ -40,14 +40,14 @@ #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/gprpp/debug_location.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/match.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/unique_type_name.h" -#include "src/core/lib/gprpp/work_serializer.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" diff --git a/src/core/load_balancing/xds/xds_cluster_impl.cc b/src/core/load_balancing/xds/xds_cluster_impl.cc index 25b6a0c464a..2169825a619 100644 --- a/src/core/load_balancing/xds/xds_cluster_impl.cc +++ b/src/core/load_balancing/xds/xds_cluster_impl.cc @@ -41,14 +41,14 @@ #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/gprpp/debug_location.h" -#include "src/core/lib/gprpp/match.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/ref_counted_string.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/validation_errors.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" diff --git a/src/core/load_balancing/xds/xds_cluster_manager.cc b/src/core/load_balancing/xds/xds_cluster_manager.cc index 5c4b8e641bc..c036bdb6803 100644 --- a/src/core/load_balancing/xds/xds_cluster_manager.cc +++ b/src/core/load_balancing/xds/xds_cluster_manager.cc @@ -41,12 +41,12 @@ #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/gprpp/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.h" -#include "src/core/lib/gprpp/work_serializer.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" diff --git a/src/core/load_balancing/xds/xds_override_host.cc b/src/core/load_balancing/xds/xds_override_host.cc index 06b73fc509f..59fafe0d0bf 100644 --- a/src/core/load_balancing/xds/xds_override_host.cc +++ b/src/core/load_balancing/xds/xds_override_host.cc @@ -56,14 +56,14 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/match.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/ref_counted_string.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/validation_errors.h" -#include "src/core/lib/gprpp/work_serializer.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" diff --git a/src/core/load_balancing/xds/xds_override_host.h b/src/core/load_balancing/xds/xds_override_host.h index 226b55dee01..6a8d72713d4 100644 --- a/src/core/load_balancing/xds/xds_override_host.h +++ b/src/core/load_balancing/xds/xds_override_host.h @@ -21,8 +21,8 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/validation_errors.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/util/json/json.h" #include "src/core/util/json/json_args.h" diff --git a/src/core/load_balancing/xds/xds_wrr_locality.cc b/src/core/load_balancing/xds/xds_wrr_locality.cc index 0d2ea0472b2..d4f206fad9f 100644 --- a/src/core/load_balancing/xds/xds_wrr_locality.cc +++ b/src/core/load_balancing/xds/xds_wrr_locality.cc @@ -34,11 +34,11 @@ #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/gprpp/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/ref_counted_string.h" -#include "src/core/lib/gprpp/validation_errors.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" diff --git a/src/core/resolver/binder/binder_resolver.cc b/src/core/resolver/binder/binder_resolver.cc index 477c3f0c153..b66739d3b13 100644 --- a/src/core/resolver/binder/binder_resolver.cc +++ b/src/core/resolver/binder/binder_resolver.cc @@ -18,7 +18,7 @@ #include -#include "src/core/lib/gprpp/status_helper.h" +#include "src/core/util/status_helper.h" #include "src/core/lib/iomgr/port.h" // IWYU pragma: keep #ifdef GRPC_HAVE_UNIX_SOCKET @@ -47,7 +47,7 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/orphanable.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" 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 9e28e816f2a..5aeb8471991 100644 --- a/src/core/resolver/dns/c_ares/dns_resolver_ares.cc +++ b/src/core/resolver/dns/c_ares/dns_resolver_ares.cc @@ -39,12 +39,12 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.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" 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 652921cb668..2c9973bd738 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,7 +27,7 @@ #include -#include "src/core/lib/gprpp/sync.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" 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 07738942206..1736b4dd05e 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,7 @@ #include -#include "src/core/lib/gprpp/sync.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/ev_posix.h" 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 ef70bfc5b67..45a7eae7636 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,8 @@ #include #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/memory.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" 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 7994a1900a5..1900d1ad8b6 100644 --- a/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc +++ b/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc @@ -25,7 +25,7 @@ #include #include -#include "src/core/lib/gprpp/status_helper.h" +#include "src/core/util/status_helper.h" #include "src/core/lib/iomgr/sockaddr.h" // IWYU pragma: no_include @@ -61,9 +61,9 @@ #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/gprpp/debug_location.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/time.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 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 9183fd59151..8364a058890 100644 --- a/src/core/resolver/dns/c_ares/grpc_ares_wrapper.h +++ b/src/core/resolver/dns/c_ares/grpc_ares_wrapper.h @@ -31,7 +31,7 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/sync.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" diff --git a/src/core/resolver/dns/dns_resolver_plugin.cc b/src/core/resolver/dns/dns_resolver_plugin.cc index 122c3fd740e..dac7c6d3bb4 100644 --- a/src/core/resolver/dns/dns_resolver_plugin.cc +++ b/src/core/resolver/dns/dns_resolver_plugin.cc @@ -23,7 +23,7 @@ #include "src/core/lib/config/config_vars.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/crash.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" 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 e784c5b8a60..f6290e2d1ba 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 @@ -43,11 +43,11 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.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" 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 c41627d8a87..ae0c06d2e6d 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,7 +17,7 @@ #include -#include "src/core/lib/gprpp/orphanable.h" +#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" 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 b93f12627be..ca8ee6b813d 100644 --- a/src/core/resolver/dns/event_engine/service_config_helper.cc +++ b/src/core/resolver/dns/event_engine/service_config_helper.cc @@ -23,7 +23,7 @@ #include -#include "src/core/lib/gprpp/status_helper.h" +#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" diff --git a/src/core/resolver/dns/native/dns_resolver.cc b/src/core/resolver/dns/native/dns_resolver.cc index 15960442a67..c8f33efe05f 100644 --- a/src/core/resolver/dns/native/dns_resolver.cc +++ b/src/core/resolver/dns/native/dns_resolver.cc @@ -36,10 +36,10 @@ #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/gprpp/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.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" diff --git a/src/core/resolver/fake/fake_resolver.cc b/src/core/resolver/fake/fake_resolver.cc index 169cf54355d..d57698689b1 100644 --- a/src/core/resolver/fake/fake_resolver.cc +++ b/src/core/resolver/fake/fake_resolver.cc @@ -31,9 +31,9 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/work_serializer.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" diff --git a/src/core/resolver/fake/fake_resolver.h b/src/core/resolver/fake/fake_resolver.h index 75dc3ab0ca4..4fcdd9894fd 100644 --- a/src/core/resolver/fake/fake_resolver.h +++ b/src/core/resolver/fake/fake_resolver.h @@ -27,10 +27,10 @@ #include #include -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.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" diff --git a/src/core/resolver/google_c2p/google_c2p_resolver.cc b/src/core/resolver/google_c2p/google_c2p_resolver.cc index e41bd96f998..d25334733e0 100644 --- a/src/core/resolver/google_c2p/google_c2p_resolver.cc +++ b/src/core/resolver/google_c2p/google_c2p_resolver.cc @@ -36,12 +36,12 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/work_serializer.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" diff --git a/src/core/resolver/polling_resolver.cc b/src/core/resolver/polling_resolver.cc index fa59cfb5da3..f8ad0c3b0d1 100644 --- a/src/core/resolver/polling_resolver.cc +++ b/src/core/resolver/polling_resolver.cc @@ -34,9 +34,9 @@ #include "src/core/util/backoff.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/work_serializer.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" diff --git a/src/core/resolver/polling_resolver.h b/src/core/resolver/polling_resolver.h index 3cd6fd874b2..80e686472dd 100644 --- a/src/core/resolver/polling_resolver.h +++ b/src/core/resolver/polling_resolver.h @@ -29,9 +29,9 @@ #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/gprpp/orphanable.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/work_serializer.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" diff --git a/src/core/resolver/resolver.h b/src/core/resolver/resolver.h index 99108a63b38..27cd703dcf8 100644 --- a/src/core/resolver/resolver.h +++ b/src/core/resolver/resolver.h @@ -27,8 +27,8 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" diff --git a/src/core/resolver/resolver_factory.h b/src/core/resolver/resolver_factory.h index d0646473ec3..71f64e0eb78 100644 --- a/src/core/resolver/resolver_factory.h +++ b/src/core/resolver/resolver_factory.h @@ -26,7 +26,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/orphanable.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" diff --git a/src/core/resolver/resolver_registry.h b/src/core/resolver/resolver_registry.h index 52a93b51f5b..66fe2689010 100644 --- a/src/core/resolver/resolver_registry.h +++ b/src/core/resolver/resolver_registry.h @@ -27,7 +27,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/orphanable.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" diff --git a/src/core/resolver/sockaddr/sockaddr_resolver.cc b/src/core/resolver/sockaddr/sockaddr_resolver.cc index b6be8ad0c77..ed9e5116116 100644 --- a/src/core/resolver/sockaddr/sockaddr_resolver.cc +++ b/src/core/resolver/sockaddr/sockaddr_resolver.cc @@ -29,7 +29,7 @@ #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/lib/gprpp/orphanable.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" diff --git a/src/core/resolver/xds/xds_dependency_manager.cc b/src/core/resolver/xds/xds_dependency_manager.cc index 566e16059ce..125bbf9f388 100644 --- a/src/core/resolver/xds/xds_dependency_manager.cc +++ b/src/core/resolver/xds/xds_dependency_manager.cc @@ -24,7 +24,7 @@ #include #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/match.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" diff --git a/src/core/resolver/xds/xds_dependency_manager.h b/src/core/resolver/xds/xds_dependency_manager.h index 9b2a5580601..576cf7d788d 100644 --- a/src/core/resolver/xds/xds_dependency_manager.h +++ b/src/core/resolver/xds/xds_dependency_manager.h @@ -23,7 +23,7 @@ #include -#include "src/core/lib/gprpp/ref_counted.h" +#include "src/core/util/ref_counted.h" #include "src/core/resolver/resolver.h" #include "src/core/xds/grpc/xds_client_grpc.h" #include "src/core/xds/grpc/xds_cluster.h" diff --git a/src/core/resolver/xds/xds_resolver.cc b/src/core/resolver/xds/xds_resolver.cc index 626b7dfebc9..59026345fc8 100644 --- a/src/core/resolver/xds/xds_resolver.cc +++ b/src/core/resolver/xds/xds_resolver.cc @@ -59,15 +59,15 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/dual_ref_counted.h" -#include "src/core/lib/gprpp/match.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/work_serializer.h" -#include "src/core/lib/gprpp/xxhash_inline.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" diff --git a/src/core/resolver/xds/xds_resolver_attributes.h b/src/core/resolver/xds/xds_resolver_attributes.h index 0d70624dcdd..fe15871a869 100644 --- a/src/core/resolver/xds/xds_resolver_attributes.h +++ b/src/core/resolver/xds/xds_resolver_attributes.h @@ -21,7 +21,7 @@ #include -#include "src/core/lib/gprpp/unique_type_name.h" +#include "src/core/util/unique_type_name.h" #include "src/core/service_config/service_config_call_data.h" namespace grpc_core { diff --git a/src/core/server/server.cc b/src/core/server/server.cc index 6397e03a62c..d4271fa11fe 100644 --- a/src/core/server/server.cc +++ b/src/core/server/server.cc @@ -53,11 +53,11 @@ #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/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/mpscq.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/status_helper.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" diff --git a/src/core/server/server.h b/src/core/server/server.h index 3f7bda11a22..2948fa07985 100644 --- a/src/core/server/server.h +++ b/src/core/server/server.h @@ -51,12 +51,12 @@ #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/lib/gprpp/cpp_impl_of.h" -#include "src/core/lib/gprpp/dual_ref_counted.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.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" diff --git a/src/core/server/server_config_selector.h b/src/core/server/server_config_selector.h index c6274f49f35..eb3f361b3a7 100644 --- a/src/core/server/server_config_selector.h +++ b/src/core/server/server_config_selector.h @@ -24,9 +24,9 @@ #include -#include "src/core/lib/gprpp/dual_ref_counted.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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/lib/transport/metadata_batch.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_parser.h" diff --git a/src/core/server/server_config_selector_filter.cc b/src/core/server/server_config_selector_filter.cc index b4acec5329e..5d0532012b8 100644 --- a/src/core/server/server_config_selector_filter.cc +++ b/src/core/server/server_config_selector_filter.cc @@ -31,9 +31,9 @@ #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/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/sync.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" diff --git a/src/core/server/xds_channel_stack_modifier.h b/src/core/server/xds_channel_stack_modifier.h index 4cea9e165e7..78810478d99 100644 --- a/src/core/server/xds_channel_stack_modifier.h +++ b/src/core/server/xds_channel_stack_modifier.h @@ -29,8 +29,8 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack_builder.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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/xds_server_config_fetcher.cc b/src/core/server/xds_server_config_fetcher.cc index 8314984bd83..417c87710ac 100644 --- a/src/core/server/xds_server_config_fetcher.cc +++ b/src/core/server/xds_server_config_fetcher.cc @@ -54,12 +54,12 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/match.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/unique_type_name.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" diff --git a/src/core/service_config/service_config.h b/src/core/service_config/service_config.h index ba5fa8262ae..ceb468df79e 100644 --- a/src/core/service_config/service_config.h +++ b/src/core/service_config/service_config.h @@ -24,7 +24,7 @@ #include #include -#include "src/core/lib/gprpp/ref_counted.h" +#include "src/core/util/ref_counted.h" #include "src/core/service_config/service_config_parser.h" #include "src/core/util/useful.h" diff --git a/src/core/service_config/service_config_call_data.h b/src/core/service_config/service_config_call_data.h index a422893c6e2..0d62425aa66 100644 --- a/src/core/service_config/service_config_call_data.h +++ b/src/core/service_config/service_config_call_data.h @@ -25,9 +25,9 @@ #include #include "src/core/lib/channel/context.h" -#include "src/core/lib/gprpp/chunked_vector.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.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" 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 9afa99018fc..1593cbce280 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,7 @@ #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/lib/gprpp/ref_counted_ptr.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" diff --git a/src/core/service_config/service_config_impl.cc b/src/core/service_config/service_config_impl.cc index 034e635690b..af0786b568f 100644 --- a/src/core/service_config/service_config_impl.cc +++ b/src/core/service_config/service_config_impl.cc @@ -29,8 +29,8 @@ #include #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/gprpp/validation_errors.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" diff --git a/src/core/service_config/service_config_impl.h b/src/core/service_config/service_config_impl.h index f617163a956..bea26f01b95 100644 --- a/src/core/service_config/service_config_impl.h +++ b/src/core/service_config/service_config_impl.h @@ -33,8 +33,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/validation_errors.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" diff --git a/src/core/service_config/service_config_parser.h b/src/core/service_config/service_config_parser.h index 9b7983a7680..46e6ef6dba8 100644 --- a/src/core/service_config/service_config_parser.h +++ b/src/core/service_config/service_config_parser.h @@ -29,7 +29,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/validation_errors.h" +#include "src/core/util/validation_errors.h" #include "src/core/util/json/json.h" namespace grpc_core { diff --git a/src/core/telemetry/call_tracer.h b/src/core/telemetry/call_tracer.h index 967658fa36b..76515d03688 100644 --- a/src/core/telemetry/call_tracer.h +++ b/src/core/telemetry/call_tracer.h @@ -31,7 +31,7 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/context.h" -#include "src/core/lib/gprpp/ref_counted_string.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" diff --git a/src/core/telemetry/metrics.cc b/src/core/telemetry/metrics.cc index b403a8649f2..41e1a5a6d19 100644 --- a/src/core/telemetry/metrics.cc +++ b/src/core/telemetry/metrics.cc @@ -20,7 +20,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc_core { diff --git a/src/core/telemetry/metrics.h b/src/core/telemetry/metrics.h index 2fb92d4597e..59dfe6c7125 100644 --- a/src/core/telemetry/metrics.h +++ b/src/core/telemetry/metrics.h @@ -31,9 +31,9 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/context.h" -#include "src/core/lib/gprpp/no_destruct.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.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" diff --git a/src/core/telemetry/stats.h b/src/core/telemetry/stats.h index b1026abbb28..2615c651389 100644 --- a/src/core/telemetry/stats.h +++ b/src/core/telemetry/stats.h @@ -29,7 +29,7 @@ #include -#include "src/core/lib/gprpp/no_destruct.h" +#include "src/core/util/no_destruct.h" #include "src/core/telemetry/histogram_view.h" #include "src/core/telemetry/stats_data.h" diff --git a/src/core/telemetry/stats_data.h b/src/core/telemetry/stats_data.h index 6220a118f20..55c9bec1a0d 100644 --- a/src/core/telemetry/stats_data.h +++ b/src/core/telemetry/stats_data.h @@ -26,7 +26,7 @@ #include -#include "src/core/lib/gprpp/per_cpu.h" +#include "src/core/util/per_cpu.h" #include "src/core/telemetry/histogram_view.h" namespace grpc_core { 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 09415c413d6..de709d5cf4a 100644 --- a/src/core/tsi/alts/frame_protector/alts_frame_protector.cc +++ b/src/core/tsi/alts/frame_protector/alts_frame_protector.cc @@ -30,7 +30,7 @@ #include #include -#include "src/core/lib/gprpp/memory.h" +#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" diff --git a/src/core/tsi/alts/frame_protector/frame_handler.cc b/src/core/tsi/alts/frame_protector/frame_handler.cc index 0c22491fd3a..7460307f6c1 100644 --- a/src/core/tsi/alts/frame_protector/frame_handler.cc +++ b/src/core/tsi/alts/frame_protector/frame_handler.cc @@ -28,8 +28,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/memory.h" +#include "src/core/util/crash.h" +#include "src/core/util/memory.h" // Use little endian to interpret a string of bytes as uint32_t. static uint32_t load_32_le(const unsigned char* buffer) { diff --git a/src/core/tsi/alts/handshaker/alts_handshaker_client.cc b/src/core/tsi/alts/handshaker/alts_handshaker_client.cc index 91afee2e5f5..18c3d7665e5 100644 --- a/src/core/tsi/alts/handshaker/alts_handshaker_client.cc +++ b/src/core/tsi/alts/handshaker/alts_handshaker_client.cc @@ -30,9 +30,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/sync.h" +#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" diff --git a/src/core/tsi/alts/handshaker/alts_shared_resource.cc b/src/core/tsi/alts/handshaker/alts_shared_resource.cc index 03e2b4439e1..9b31497aba7 100644 --- a/src/core/tsi/alts/handshaker/alts_shared_resource.cc +++ b/src/core/tsi/alts/handshaker/alts_shared_resource.cc @@ -24,7 +24,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/tsi/alts/handshaker/alts_handshaker_client.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 43265edfbfd..aa130b128e7 100644 --- a/src/core/tsi/alts/handshaker/alts_shared_resource.h +++ b/src/core/tsi/alts/handshaker/alts_shared_resource.h @@ -23,7 +23,7 @@ #include #include -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/thd.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/surface/completion_queue.h" diff --git a/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc b/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc index fa22ca884b7..df199907703 100644 --- a/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc +++ b/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc @@ -35,8 +35,8 @@ #include #include -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/gprpp/sync.h" +#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" diff --git a/src/core/tsi/alts/handshaker/transport_security_common_api.h b/src/core/tsi/alts/handshaker/transport_security_common_api.h index a8cb4c3f79d..61327e31935 100644 --- a/src/core/tsi/alts/handshaker/transport_security_common_api.h +++ b/src/core/tsi/alts/handshaker/transport_security_common_api.h @@ -25,7 +25,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/gcp/transport_security_common.upb.h" // C struct coresponding to protobuf message RpcProtocolVersions.Version 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 8d9a98dbc45..bada7631a03 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,7 +27,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#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" 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 a9aac4948a9..4c4f42c3d4f 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,7 +24,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#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" 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 da2eaf4bfad..e9debed56bc 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,7 +26,7 @@ #include #include -#include "src/core/lib/gprpp/crash.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/util/useful.h" 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 40046f0769e..84bd4141d27 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,7 +25,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/tsi/alts/frame_protector/alts_counter.h" struct alts_iovec_record_protocol { diff --git a/src/core/tsi/fake_transport_security.cc b/src/core/tsi/fake_transport_security.cc index 2fffb042bb8..a6b7e161731 100644 --- a/src/core/tsi/fake_transport_security.cc +++ b/src/core/tsi/fake_transport_security.cc @@ -28,8 +28,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/memory.h" +#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" diff --git a/src/core/tsi/local_transport_security.cc b/src/core/tsi/local_transport_security.cc index 30a2ef7f670..ccea7eed29a 100644 --- a/src/core/tsi/local_transport_security.cc +++ b/src/core/tsi/local_transport_security.cc @@ -28,7 +28,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/tsi/transport_security_grpc.h" 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 e1a496cc519..9d2b5cab130 100644 --- a/src/core/tsi/ssl/key_logging/ssl_key_logging.cc +++ b/src/core/tsi/ssl/key_logging/ssl_key_logging.cc @@ -21,8 +21,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.h" +#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" diff --git a/src/core/tsi/ssl/key_logging/ssl_key_logging.h b/src/core/tsi/ssl/key_logging/ssl_key_logging.h index ec420acc228..c3752c1e7b0 100644 --- a/src/core/tsi/ssl/key_logging/ssl_key_logging.h +++ b/src/core/tsi/ssl/key_logging/ssl_key_logging.h @@ -27,9 +27,9 @@ #include #include -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/memory.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/sync.h" namespace tsi { diff --git a/src/core/tsi/ssl/session_cache/ssl_session.h b/src/core/tsi/ssl/session_cache/ssl_session.h index d56451ec7fb..f990f3dfd52 100644 --- a/src/core/tsi/ssl/session_cache/ssl_session.h +++ b/src/core/tsi/ssl/session_cache/ssl_session.h @@ -26,7 +26,7 @@ #include #include -#include "src/core/lib/gprpp/ref_counted.h" +#include "src/core/util/ref_counted.h" // The main purpose of code here is to provide means to cache SSL sessions // in a way that they can be shared between connections. 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 de89e3e85fe..03c027906b1 100644 --- a/src/core/tsi/ssl/session_cache/ssl_session_cache.cc +++ b/src/core/tsi/ssl/session_cache/ssl_session_cache.cc @@ -25,8 +25,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.h" +#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" 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 881a69cf006..bc820c21210 100644 --- a/src/core/tsi/ssl/session_cache/ssl_session_cache.h +++ b/src/core/tsi/ssl/session_cache/ssl_session_cache.h @@ -28,10 +28,10 @@ #include #include -#include "src/core/lib/gprpp/cpp_impl_of.h" -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/sync.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 ad427950e1d..2cc57c55bc1 100644 --- a/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc +++ b/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc @@ -19,7 +19,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/tsi/ssl/session_cache/ssl_session.h" #ifndef OPENSSL_IS_BORINGSSL diff --git a/src/core/tsi/ssl_transport_security.cc b/src/core/tsi/ssl_transport_security.cc index 6ec4e0a2546..810eeb91074 100644 --- a/src/core/tsi/ssl_transport_security.cc +++ b/src/core/tsi/ssl_transport_security.cc @@ -60,7 +60,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#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" diff --git a/src/core/util/README.md b/src/core/util/README.md index 21fb0c796db..b07a40223f7 100644 --- a/src/core/util/README.md +++ b/src/core/util/README.md @@ -1,8 +1,11 @@ -# GPR - Google Portable Runtime for C +# Utility Code -The files in this directory contain basic utility code and platform -abstractions for C code. None of this code is gRPC-specific; anything -here may also be useful for other open source projects written in C. +The files in this directory contain various utility libraries and platform +abstractions for C++ code. None of this code is gRPC-specific; anything +here may also be useful for other open source projects written in C++. +In principle, any library here could be replaced with an external +dependency that provides the same functionality if such an external +library should become available. Note that this is one of the few places in src/core where we allow the use of portability macros. diff --git a/src/core/util/alloc.cc b/src/core/util/alloc.cc index a8b92260a92..c2342a1c552 100644 --- a/src/core/util/alloc.cc +++ b/src/core/util/alloc.cc @@ -26,7 +26,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" void* gpr_malloc(size_t size) { void* p; diff --git a/src/core/util/android/log.cc b/src/core/util/android/log.cc index c368f3aa324..206d4e3f892 100644 --- a/src/core/util/android/log.cc +++ b/src/core/util/android/log.cc @@ -28,7 +28,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" static android_LogPriority severity_to_log_priority(gpr_log_severity severity) { switch (severity) { diff --git a/src/core/lib/gprpp/atomic_utils.h b/src/core/util/atomic_utils.h similarity index 90% rename from src/core/lib/gprpp/atomic_utils.h rename to src/core/util/atomic_utils.h index 3ecc18305b6..b01b8c89c24 100644 --- a/src/core/lib/gprpp/atomic_utils.h +++ b/src/core/util/atomic_utils.h @@ -16,8 +16,8 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_ATOMIC_UTILS_H -#define GRPC_SRC_CORE_LIB_GPRPP_ATOMIC_UTILS_H +#ifndef GRPC_SRC_CORE_UTIL_ATOMIC_UTILS_H +#define GRPC_SRC_CORE_UTIL_ATOMIC_UTILS_H #include @@ -44,4 +44,4 @@ inline bool IncrementIfNonzero(std::atomic* p) { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_ATOMIC_UTILS_H +#endif // GRPC_SRC_CORE_UTIL_ATOMIC_UTILS_H diff --git a/src/core/util/avl.h b/src/core/util/avl.h index e2caa8e1a26..23a510e949f 100644 --- a/src/core/util/avl.h +++ b/src/core/util/avl.h @@ -23,8 +23,8 @@ #include #include -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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/util/backoff.h b/src/core/util/backoff.h index e76f76a35b9..5059d878e95 100644 --- a/src/core/util/backoff.h +++ b/src/core/util/backoff.h @@ -23,7 +23,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/lib/gprpp/bitset.h b/src/core/util/bitset.h similarity index 98% rename from src/core/lib/gprpp/bitset.h rename to src/core/util/bitset.h index ea941b0e10b..83acd192e09 100644 --- a/src/core/lib/gprpp/bitset.h +++ b/src/core/util/bitset.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_BITSET_H -#define GRPC_SRC_CORE_LIB_GPRPP_BITSET_H +#ifndef GRPC_SRC_CORE_UTIL_BITSET_H +#define GRPC_SRC_CORE_UTIL_BITSET_H #include #include @@ -222,4 +222,4 @@ class BitSet<0> { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_BITSET_H +#endif // GRPC_SRC_CORE_UTIL_BITSET_H diff --git a/src/core/lib/gprpp/chunked_vector.h b/src/core/util/chunked_vector.h similarity index 97% rename from src/core/lib/gprpp/chunked_vector.h rename to src/core/util/chunked_vector.h index b60bdac65ad..bdbe2043f94 100644 --- a/src/core/lib/gprpp/chunked_vector.h +++ b/src/core/util/chunked_vector.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_CHUNKED_VECTOR_H -#define GRPC_SRC_CORE_LIB_GPRPP_CHUNKED_VECTOR_H +#ifndef GRPC_SRC_CORE_UTIL_CHUNKED_VECTOR_H +#define GRPC_SRC_CORE_UTIL_CHUNKED_VECTOR_H #include #include @@ -24,7 +24,7 @@ #include #include -#include "src/core/lib/gprpp/manual_constructor.h" +#include "src/core/util/manual_constructor.h" #include "src/core/lib/resource_quota/arena.h" namespace grpc_core { @@ -255,4 +255,4 @@ class ChunkedVector { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_CHUNKED_VECTOR_H +#endif // GRPC_SRC_CORE_UTIL_CHUNKED_VECTOR_H diff --git a/src/core/lib/gprpp/construct_destruct.h b/src/core/util/construct_destruct.h similarity index 86% rename from src/core/lib/gprpp/construct_destruct.h rename to src/core/util/construct_destruct.h index d905c26d35c..ae108e024c0 100644 --- a/src/core/lib/gprpp/construct_destruct.h +++ b/src/core/util/construct_destruct.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_CONSTRUCT_DESTRUCT_H -#define GRPC_SRC_CORE_LIB_GPRPP_CONSTRUCT_DESTRUCT_H +#ifndef GRPC_SRC_CORE_UTIL_CONSTRUCT_DESTRUCT_H +#define GRPC_SRC_CORE_UTIL_CONSTRUCT_DESTRUCT_H #include #include @@ -37,4 +37,4 @@ void Construct(T* p, Args&&... args) { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_CONSTRUCT_DESTRUCT_H +#endif // GRPC_SRC_CORE_UTIL_CONSTRUCT_DESTRUCT_H diff --git a/src/core/lib/gprpp/cpp_impl_of.h b/src/core/util/cpp_impl_of.h similarity index 90% rename from src/core/lib/gprpp/cpp_impl_of.h rename to src/core/util/cpp_impl_of.h index 292da05ee7a..d4936ceafe0 100644 --- a/src/core/lib/gprpp/cpp_impl_of.h +++ b/src/core/util/cpp_impl_of.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_CPP_IMPL_OF_H -#define GRPC_SRC_CORE_LIB_GPRPP_CPP_IMPL_OF_H +#ifndef GRPC_SRC_CORE_UTIL_CPP_IMPL_OF_H +#define GRPC_SRC_CORE_UTIL_CPP_IMPL_OF_H namespace grpc_core { @@ -46,4 +46,4 @@ class CppImplOf { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_CPP_IMPL_OF_H +#endif // GRPC_SRC_CORE_UTIL_CPP_IMPL_OF_H diff --git a/src/core/lib/gprpp/crash.cc b/src/core/util/crash.cc similarity index 96% rename from src/core/lib/gprpp/crash.cc rename to src/core/util/crash.cc index 1db8043438b..992f3390870 100644 --- a/src/core/lib/gprpp/crash.cc +++ b/src/core/util/crash.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include #include diff --git a/src/core/lib/gprpp/crash.h b/src/core/util/crash.h similarity index 86% rename from src/core/lib/gprpp/crash.h rename to src/core/util/crash.h index 274f1296ca9..b34cf396001 100644 --- a/src/core/lib/gprpp/crash.h +++ b/src/core/util/crash.h @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_CRASH_H -#define GRPC_SRC_CORE_LIB_GPRPP_CRASH_H +#ifndef GRPC_SRC_CORE_UTIL_CRASH_H +#define GRPC_SRC_CORE_UTIL_CRASH_H #include "absl/strings/string_view.h" #include -#include "src/core/lib/gprpp/debug_location.h" +#include "src/core/util/debug_location.h" namespace grpc_core { @@ -34,4 +34,4 @@ namespace grpc_core { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_CRASH_H +#endif // GRPC_SRC_CORE_UTIL_CRASH_H diff --git a/src/core/lib/gprpp/debug_location.h b/src/core/util/debug_location.h similarity index 94% rename from src/core/lib/gprpp/debug_location.h rename to src/core/util/debug_location.h index 2637d316d10..b38242b31c2 100644 --- a/src/core/lib/gprpp/debug_location.h +++ b/src/core/util/debug_location.h @@ -16,8 +16,8 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_DEBUG_LOCATION_H -#define GRPC_SRC_CORE_LIB_GPRPP_DEBUG_LOCATION_H +#ifndef GRPC_SRC_CORE_UTIL_DEBUG_LOCATION_H +#define GRPC_SRC_CORE_UTIL_DEBUG_LOCATION_H #include @@ -96,4 +96,4 @@ struct ValueWithDebugLocation { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_DEBUG_LOCATION_H +#endif // GRPC_SRC_CORE_UTIL_DEBUG_LOCATION_H diff --git a/src/core/lib/gprpp/directory_reader.h b/src/core/util/directory_reader.h similarity index 89% rename from src/core/lib/gprpp/directory_reader.h rename to src/core/util/directory_reader.h index 73dac02d41c..082aa21fcc1 100644 --- a/src/core/lib/gprpp/directory_reader.h +++ b/src/core/util/directory_reader.h @@ -16,8 +16,8 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_DIRECTORY_READER_H -#define GRPC_SRC_CORE_LIB_GPRPP_DIRECTORY_READER_H +#ifndef GRPC_SRC_CORE_UTIL_DIRECTORY_READER_H +#define GRPC_SRC_CORE_UTIL_DIRECTORY_READER_H #include @@ -45,4 +45,4 @@ std::unique_ptr MakeDirectoryReader( } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_DIRECTORY_READER_H \ No newline at end of file +#endif // GRPC_SRC_CORE_UTIL_DIRECTORY_READER_H \ No newline at end of file diff --git a/src/core/lib/gprpp/down_cast.h b/src/core/util/down_cast.h similarity index 91% rename from src/core/lib/gprpp/down_cast.h rename to src/core/util/down_cast.h index ca1b2d78029..a38433ff1bb 100644 --- a/src/core/lib/gprpp/down_cast.h +++ b/src/core/util/down_cast.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_DOWN_CAST_H -#define GRPC_SRC_CORE_LIB_GPRPP_DOWN_CAST_H +#ifndef GRPC_SRC_CORE_UTIL_DOWN_CAST_H +#define GRPC_SRC_CORE_UTIL_DOWN_CAST_H #include @@ -46,4 +46,4 @@ inline To DownCast(From& f) { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_DOWN_CAST_H +#endif // GRPC_SRC_CORE_UTIL_DOWN_CAST_H diff --git a/src/core/lib/gprpp/dual_ref_counted.h b/src/core/util/dual_ref_counted.h similarity index 97% rename from src/core/lib/gprpp/dual_ref_counted.h rename to src/core/util/dual_ref_counted.h index 38365db381b..6d2b89227a7 100644 --- a/src/core/lib/gprpp/dual_ref_counted.h +++ b/src/core/util/dual_ref_counted.h @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_DUAL_REF_COUNTED_H -#define GRPC_SRC_CORE_LIB_GPRPP_DUAL_REF_COUNTED_H +#ifndef GRPC_SRC_CORE_UTIL_DUAL_REF_COUNTED_H +#define GRPC_SRC_CORE_UTIL_DUAL_REF_COUNTED_H #include #include @@ -25,11 +25,11 @@ #include #include -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/down_cast.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/down_cast.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { @@ -368,4 +368,4 @@ class DualRefCounted : public Impl { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_DUAL_REF_COUNTED_H +#endif // GRPC_SRC_CORE_UTIL_DUAL_REF_COUNTED_H diff --git a/src/core/lib/gprpp/dump_args.cc b/src/core/util/dump_args.cc similarity index 96% rename from src/core/lib/gprpp/dump_args.cc rename to src/core/util/dump_args.cc index e5bc183246b..cecdf3c1bd0 100644 --- a/src/core/lib/gprpp/dump_args.cc +++ b/src/core/util/dump_args.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/dump_args.h" +#include "src/core/util/dump_args.h" #include "absl/log/check.h" #include "absl/strings/ascii.h" diff --git a/src/core/lib/gprpp/dump_args.h b/src/core/util/dump_args.h similarity index 93% rename from src/core/lib/gprpp/dump_args.h rename to src/core/util/dump_args.h index c2b66ce2be3..2e54f9eebd1 100644 --- a/src/core/lib/gprpp/dump_args.h +++ b/src/core/util/dump_args.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_DUMP_ARGS_H -#define GRPC_SRC_CORE_LIB_GPRPP_DUMP_ARGS_H +#ifndef GRPC_SRC_CORE_UTIL_DUMP_ARGS_H +#define GRPC_SRC_CORE_UTIL_DUMP_ARGS_H #include #include @@ -66,4 +66,4 @@ class DumpArgs { #define GRPC_DUMP_ARGS(...) \ grpc_core::dump_args_detail::DumpArgs(#__VA_ARGS__, __VA_ARGS__) -#endif // GRPC_SRC_CORE_LIB_GPRPP_DUMP_ARGS_H +#endif // GRPC_SRC_CORE_UTIL_DUMP_ARGS_H diff --git a/src/core/lib/gprpp/env.h b/src/core/util/env.h similarity index 92% rename from src/core/lib/gprpp/env.h rename to src/core/util/env.h index 381cb461275..e48c399b5ca 100644 --- a/src/core/lib/gprpp/env.h +++ b/src/core/util/env.h @@ -16,8 +16,8 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_ENV_H -#define GRPC_SRC_CORE_LIB_GPRPP_ENV_H +#ifndef GRPC_SRC_CORE_UTIL_ENV_H +#define GRPC_SRC_CORE_UTIL_ENV_H #include @@ -50,4 +50,4 @@ void SetOrUnsetEnv(const char* name, const absl::optional& value) { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_ENV_H +#endif // GRPC_SRC_CORE_UTIL_ENV_H diff --git a/src/core/util/event_log.h b/src/core/util/event_log.h index 3f8b1372b69..7dd5fa7a284 100644 --- a/src/core/util/event_log.h +++ b/src/core/util/event_log.h @@ -27,8 +27,8 @@ #include -#include "src/core/lib/gprpp/per_cpu.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/per_cpu.h" +#include "src/core/util/sync.h" #include "src/core/util/time_precise.h" namespace grpc_core { diff --git a/src/core/lib/gprpp/examine_stack.cc b/src/core/util/examine_stack.cc similarity index 96% rename from src/core/lib/gprpp/examine_stack.cc rename to src/core/util/examine_stack.cc index a6bc5423192..a47f12472ca 100644 --- a/src/core/lib/gprpp/examine_stack.cc +++ b/src/core/util/examine_stack.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/gprpp/examine_stack.h" +#include "src/core/util/examine_stack.h" #include diff --git a/src/core/lib/gprpp/examine_stack.h b/src/core/util/examine_stack.h similarity index 89% rename from src/core/lib/gprpp/examine_stack.h rename to src/core/util/examine_stack.h index c844924f456..2486bda33b6 100644 --- a/src/core/lib/gprpp/examine_stack.h +++ b/src/core/util/examine_stack.h @@ -16,8 +16,8 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_EXAMINE_STACK_H -#define GRPC_SRC_CORE_LIB_GPRPP_EXAMINE_STACK_H +#ifndef GRPC_SRC_CORE_UTIL_EXAMINE_STACK_H +#define GRPC_SRC_CORE_UTIL_EXAMINE_STACK_H #include @@ -42,4 +42,4 @@ absl::optional GetCurrentStackTrace(); } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_EXAMINE_STACK_H +#endif // GRPC_SRC_CORE_UTIL_EXAMINE_STACK_H diff --git a/src/core/lib/gprpp/fork.cc b/src/core/util/fork.cc similarity index 98% rename from src/core/lib/gprpp/fork.cc rename to src/core/util/fork.cc index 909b828f173..ffce0a04d15 100644 --- a/src/core/lib/gprpp/fork.cc +++ b/src/core/util/fork.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/gprpp/fork.h" +#include "src/core/util/fork.h" #include @@ -27,7 +27,7 @@ #include "src/core/lib/config/config_vars.h" #include "src/core/lib/event_engine/thread_local.h" -#include "src/core/lib/gprpp/no_destruct.h" +#include "src/core/util/no_destruct.h" // // NOTE: FORKING IS NOT GENERALLY SUPPORTED, THIS IS ONLY INTENDED TO WORK diff --git a/src/core/lib/gprpp/fork.h b/src/core/util/fork.h similarity index 95% rename from src/core/lib/gprpp/fork.h rename to src/core/util/fork.h index 376f625e1e7..6e5566cc510 100644 --- a/src/core/lib/gprpp/fork.h +++ b/src/core/util/fork.h @@ -16,8 +16,8 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_FORK_H -#define GRPC_SRC_CORE_LIB_GPRPP_FORK_H +#ifndef GRPC_SRC_CORE_UTIL_FORK_H +#define GRPC_SRC_CORE_UTIL_FORK_H #include #include @@ -95,4 +95,4 @@ class GPR_DLL Fork { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_FORK_H +#endif // GRPC_SRC_CORE_UTIL_FORK_H diff --git a/src/core/util/gpr_time.cc b/src/core/util/gpr_time.cc new file mode 100644 index 00000000000..ae2bd82f5bc --- /dev/null +++ b/src/core/util/gpr_time.cc @@ -0,0 +1,271 @@ +// +// +// Copyright 2015 gRPC authors. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +// + +// Generic implementation of time calls. + +#include + +#include +#include +#include + +#include "absl/log/check.h" + +#include +#include + +#include "src/core/util/crash.h" + +int gpr_time_cmp(gpr_timespec a, gpr_timespec b) { + int cmp = (a.tv_sec > b.tv_sec) - (a.tv_sec < b.tv_sec); + CHECK(a.clock_type == b.clock_type); + if (cmp == 0 && a.tv_sec != INT64_MAX && a.tv_sec != INT64_MIN) { + cmp = (a.tv_nsec > b.tv_nsec) - (a.tv_nsec < b.tv_nsec); + } + return cmp; +} + +gpr_timespec gpr_time_min(gpr_timespec a, gpr_timespec b) { + return gpr_time_cmp(a, b) < 0 ? a : b; +} + +gpr_timespec gpr_time_max(gpr_timespec a, gpr_timespec b) { + return gpr_time_cmp(a, b) > 0 ? a : b; +} + +gpr_timespec gpr_time_0(gpr_clock_type type) { + gpr_timespec out; + out.tv_sec = 0; + out.tv_nsec = 0; + out.clock_type = type; + return out; +} + +gpr_timespec gpr_inf_future(gpr_clock_type type) { + gpr_timespec out; + out.tv_sec = INT64_MAX; + out.tv_nsec = 0; + out.clock_type = type; + return out; +} + +gpr_timespec gpr_inf_past(gpr_clock_type type) { + gpr_timespec out; + out.tv_sec = INT64_MIN; + out.tv_nsec = 0; + out.clock_type = type; + return out; +} + +static gpr_timespec to_seconds_from_sub_second_time(int64_t time_in_units, + int64_t units_per_sec, + gpr_clock_type type) { + gpr_timespec out; + if (time_in_units == INT64_MAX) { + out = gpr_inf_future(type); + } else if (time_in_units == INT64_MIN) { + out = gpr_inf_past(type); + } else { + DCHECK_EQ(GPR_NS_PER_SEC % units_per_sec, 0); + + out.tv_sec = time_in_units / units_per_sec; + out.tv_nsec = + static_cast((time_in_units - (out.tv_sec * units_per_sec)) * + (GPR_NS_PER_SEC / units_per_sec)); + /// `out.tv_nsec` should always be positive. + if (out.tv_nsec < 0) { + out.tv_nsec += GPR_NS_PER_SEC; + out.tv_sec--; + } + + out.clock_type = type; + } + return out; +} + +static gpr_timespec to_seconds_from_above_second_time(int64_t time_in_units, + int64_t secs_per_unit, + gpr_clock_type type) { + gpr_timespec out; + if (time_in_units >= INT64_MAX / secs_per_unit) { + out = gpr_inf_future(type); + } else if (time_in_units <= INT64_MIN / secs_per_unit) { + out = gpr_inf_past(type); + } else { + out.tv_sec = time_in_units * secs_per_unit; + out.tv_nsec = 0; + out.clock_type = type; + } + return out; +} + +gpr_timespec gpr_time_from_nanos(int64_t ns, gpr_clock_type clock_type) { + return to_seconds_from_sub_second_time(ns, GPR_NS_PER_SEC, clock_type); +} + +gpr_timespec gpr_time_from_micros(int64_t us, gpr_clock_type clock_type) { + return to_seconds_from_sub_second_time(us, GPR_US_PER_SEC, clock_type); +} + +gpr_timespec gpr_time_from_millis(int64_t ms, gpr_clock_type clock_type) { + return to_seconds_from_sub_second_time(ms, GPR_MS_PER_SEC, clock_type); +} + +gpr_timespec gpr_time_from_seconds(int64_t s, gpr_clock_type clock_type) { + return to_seconds_from_sub_second_time(s, 1, clock_type); +} + +gpr_timespec gpr_time_from_minutes(int64_t m, gpr_clock_type clock_type) { + return to_seconds_from_above_second_time(m, 60, clock_type); +} + +gpr_timespec gpr_time_from_hours(int64_t h, gpr_clock_type clock_type) { + return to_seconds_from_above_second_time(h, 3600, clock_type); +} + +gpr_timespec gpr_time_add(gpr_timespec a, gpr_timespec b) { + gpr_timespec sum; + int64_t inc = 0; + CHECK(b.clock_type == GPR_TIMESPAN); + // tv_nsec in a timespan is always +ve. -ve timespan is represented as (-ve + // tv_sec, +ve tv_nsec). For example, timespan = -2.5 seconds is represented + // as {-3, 5e8, GPR_TIMESPAN} + CHECK_GE(b.tv_nsec, 0); + sum.clock_type = a.clock_type; + sum.tv_nsec = a.tv_nsec + b.tv_nsec; + if (sum.tv_nsec >= GPR_NS_PER_SEC) { + sum.tv_nsec -= GPR_NS_PER_SEC; + inc++; + } + if (a.tv_sec == INT64_MAX || a.tv_sec == INT64_MIN) { + sum = a; + } else if (b.tv_sec == INT64_MAX || + (b.tv_sec >= 0 && a.tv_sec >= INT64_MAX - b.tv_sec)) { + sum = gpr_inf_future(sum.clock_type); + } else if (b.tv_sec == INT64_MIN || + (b.tv_sec <= 0 && a.tv_sec <= INT64_MIN - b.tv_sec)) { + sum = gpr_inf_past(sum.clock_type); + } else { + sum.tv_sec = a.tv_sec + b.tv_sec; + if (inc != 0 && sum.tv_sec == INT64_MAX - 1) { + sum = gpr_inf_future(sum.clock_type); + } else { + sum.tv_sec += inc; + } + } + return sum; +} + +gpr_timespec gpr_time_sub(gpr_timespec a, gpr_timespec b) { + gpr_timespec diff; + int64_t dec = 0; + if (b.clock_type == GPR_TIMESPAN) { + diff.clock_type = a.clock_type; + // tv_nsec in a timespan is always +ve. -ve timespan is represented as (-ve + // tv_sec, +ve tv_nsec). For example, timespan = -2.5 seconds is represented + // as {-3, 5e8, GPR_TIMESPAN} + CHECK_GE(b.tv_nsec, 0); + } else { + CHECK(a.clock_type == b.clock_type); + diff.clock_type = GPR_TIMESPAN; + } + diff.tv_nsec = a.tv_nsec - b.tv_nsec; + if (diff.tv_nsec < 0) { + diff.tv_nsec += GPR_NS_PER_SEC; + dec++; + } + if (a.tv_sec == INT64_MAX || a.tv_sec == INT64_MIN) { + diff.tv_sec = a.tv_sec; + diff.tv_nsec = a.tv_nsec; + } else if (b.tv_sec == INT64_MIN || + (b.tv_sec <= 0 && a.tv_sec >= INT64_MAX + b.tv_sec)) { + diff = gpr_inf_future(GPR_CLOCK_REALTIME); + } else if (b.tv_sec == INT64_MAX || + (b.tv_sec >= 0 && a.tv_sec <= INT64_MIN + b.tv_sec)) { + diff = gpr_inf_past(GPR_CLOCK_REALTIME); + } else { + diff.tv_sec = a.tv_sec - b.tv_sec; + if (dec != 0 && diff.tv_sec == INT64_MIN + 1) { + diff = gpr_inf_past(GPR_CLOCK_REALTIME); + } else { + diff.tv_sec -= dec; + } + } + return diff; +} + +int gpr_time_similar(gpr_timespec a, gpr_timespec b, gpr_timespec threshold) { + int cmp_ab; + + CHECK(a.clock_type == b.clock_type); + CHECK(threshold.clock_type == GPR_TIMESPAN); + + cmp_ab = gpr_time_cmp(a, b); + if (cmp_ab == 0) return 1; + if (cmp_ab < 0) { + return gpr_time_cmp(gpr_time_sub(b, a), threshold) <= 0; + } else { + return gpr_time_cmp(gpr_time_sub(a, b), threshold) <= 0; + } +} + +int32_t gpr_time_to_millis(gpr_timespec t) { + if (t.tv_sec >= 2147483) { + if (t.tv_sec == 2147483 && t.tv_nsec < 648 * GPR_NS_PER_MS) { + return 2147483 * GPR_MS_PER_SEC + t.tv_nsec / GPR_NS_PER_MS; + } + return 2147483647; + } else if (t.tv_sec <= -2147483) { + // TODO(ctiller): correct handling here (it's so far in the past do we + // care?) + return -2147483647; + } else { + return static_cast(t.tv_sec * GPR_MS_PER_SEC + + t.tv_nsec / GPR_NS_PER_MS); + } +} + +double gpr_timespec_to_micros(gpr_timespec t) { + return static_cast(t.tv_sec) * GPR_US_PER_SEC + t.tv_nsec * 1e-3; +} + +gpr_timespec gpr_convert_clock_type(gpr_timespec t, gpr_clock_type clock_type) { + if (t.clock_type == clock_type) { + return t; + } + + if (t.tv_sec == INT64_MAX || t.tv_sec == INT64_MIN) { + t.clock_type = clock_type; + return t; + } + + if (clock_type == GPR_TIMESPAN) { + return gpr_time_sub(t, gpr_now(t.clock_type)); + } + + if (t.clock_type == GPR_TIMESPAN) { + return gpr_time_add(gpr_now(clock_type), t); + } + + // If the given input hits this code, the same result is not guaranteed for + // the same input because it relies on `gpr_now` to calculate the difference + // between two different clocks. Please be careful when you want to use this + // function in unit tests. (e.g. https://github.com/grpc/grpc/pull/22655) + return gpr_time_add(gpr_now(clock_type), + gpr_time_sub(t, gpr_now(t.clock_type))); +} diff --git a/src/core/util/grpc_if_nametoindex_posix.cc b/src/core/util/grpc_if_nametoindex_posix.cc index 55428c76d89..e9562ad127a 100644 --- a/src/core/util/grpc_if_nametoindex_posix.cc +++ b/src/core/util/grpc_if_nametoindex_posix.cc @@ -27,7 +27,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/util/grpc_if_nametoindex.h" uint32_t grpc_if_nametoindex(char* name) { diff --git a/src/core/util/grpc_if_nametoindex_unsupported.cc b/src/core/util/grpc_if_nametoindex_unsupported.cc index c82e118ca99..f432bbba28a 100644 --- a/src/core/util/grpc_if_nametoindex_unsupported.cc +++ b/src/core/util/grpc_if_nametoindex_unsupported.cc @@ -24,7 +24,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/util/grpc_if_nametoindex.h" uint32_t grpc_if_nametoindex(char* name) { diff --git a/src/core/lib/gprpp/host_port.cc b/src/core/util/host_port.cc similarity index 98% rename from src/core/lib/gprpp/host_port.cc rename to src/core/util/host_port.cc index 7e5ae646ca7..49491c901e0 100644 --- a/src/core/lib/gprpp/host_port.cc +++ b/src/core/util/host_port.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/gprpp/host_port.h" +#include "src/core/util/host_port.h" #include diff --git a/src/core/lib/gprpp/host_port.h b/src/core/util/host_port.h similarity index 93% rename from src/core/lib/gprpp/host_port.h rename to src/core/util/host_port.h index 547129505c8..38a6f438ae8 100644 --- a/src/core/lib/gprpp/host_port.h +++ b/src/core/util/host_port.h @@ -16,8 +16,8 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_HOST_PORT_H -#define GRPC_SRC_CORE_LIB_GPRPP_HOST_PORT_H +#ifndef GRPC_SRC_CORE_UTIL_HOST_PORT_H +#define GRPC_SRC_CORE_UTIL_HOST_PORT_H #include @@ -54,4 +54,4 @@ bool SplitHostPort(absl::string_view name, std::string* host, } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_HOST_PORT_H +#endif // GRPC_SRC_CORE_UTIL_HOST_PORT_H diff --git a/src/core/util/http_client/httpcli.cc b/src/core/util/http_client/httpcli.cc index 2771787dd00..651fa7bc184 100644 --- a/src/core/util/http_client/httpcli.cc +++ b/src/core/util/http_client/httpcli.cc @@ -41,7 +41,7 @@ #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/lib/gprpp/status_helper.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" diff --git a/src/core/util/http_client/httpcli.h b/src/core/util/http_client/httpcli.h index 8ac9f7fb052..6ca8d735061 100644 --- a/src/core/util/http_client/httpcli.h +++ b/src/core/util/http_client/httpcli.h @@ -36,11 +36,11 @@ #include #include "src/core/handshaker/handshaker.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.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" diff --git a/src/core/util/http_client/httpcli_security_connector.cc b/src/core/util/http_client/httpcli_security_connector.cc index ac0c1adb257..25e2b645b62 100644 --- a/src/core/util/http_client/httpcli_security_connector.cc +++ b/src/core/util/http_client/httpcli_security_connector.cc @@ -39,9 +39,9 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.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" diff --git a/src/core/util/http_client/httpcli_ssl_credentials.h b/src/core/util/http_client/httpcli_ssl_credentials.h index 45364c64a46..e06668f65b5 100644 --- a/src/core/util/http_client/httpcli_ssl_credentials.h +++ b/src/core/util/http_client/httpcli_ssl_credentials.h @@ -21,7 +21,7 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/gprpp/if_list.h b/src/core/util/if_list.h similarity index 99% rename from src/core/lib/gprpp/if_list.h rename to src/core/util/if_list.h index a06847423fd..054d128507f 100644 --- a/src/core/lib/gprpp/if_list.h +++ b/src/core/util/if_list.h @@ -16,8 +16,8 @@ // Automatically generated by tools/codegen/core/gen_if_list.py // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_IF_LIST_H -#define GRPC_SRC_CORE_LIB_GPRPP_IF_LIST_H +#ifndef GRPC_SRC_CORE_UTIL_IF_LIST_H +#define GRPC_SRC_CORE_UTIL_IF_LIST_H #include @@ -4527,4 +4527,4 @@ auto IfList( } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_IF_LIST_H +#endif // GRPC_SRC_CORE_UTIL_IF_LIST_H diff --git a/src/core/util/json/json_object_loader.h b/src/core/util/json/json_object_loader.h index 03bce3efefd..bece2a5afa3 100644 --- a/src/core/util/json/json_object_loader.h +++ b/src/core/util/json/json_object_loader.h @@ -32,10 +32,10 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" -#include "src/core/lib/gprpp/no_destruct.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.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" diff --git a/src/core/util/json/json_reader.cc b/src/core/util/json/json_reader.cc index 291e96544d6..631eb4d97b9 100644 --- a/src/core/util/json/json_reader.cc +++ b/src/core/util/json/json_reader.cc @@ -38,7 +38,7 @@ #include #include -#include "src/core/lib/gprpp/match.h" +#include "src/core/util/match.h" #include "src/core/util/json/json.h" #define GRPC_JSON_MAX_DEPTH 255 diff --git a/src/core/util/json/json_util.cc b/src/core/util/json/json_util.cc index 8faa7cd8f25..85ebc142d7e 100644 --- a/src/core/util/json/json_util.cc +++ b/src/core/util/json/json_util.cc @@ -20,8 +20,8 @@ #include "src/core/util/json/json_util.h" -#include "src/core/lib/gprpp/no_destruct.h" -#include "src/core/lib/gprpp/validation_errors.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" diff --git a/src/core/util/json/json_util.h b/src/core/util/json/json_util.h index da45b74b3c3..450bdcefa79 100644 --- a/src/core/util/json/json_util.h +++ b/src/core/util/json/json_util.h @@ -32,7 +32,7 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/lib/iomgr/error.h" #include "src/core/util/json/json.h" diff --git a/src/core/util/linux/cpu.cc b/src/core/util/linux/cpu.cc index 670ca6551c1..4b11c23ef93 100644 --- a/src/core/util/linux/cpu.cc +++ b/src/core/util/linux/cpu.cc @@ -33,8 +33,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/strerror.h" +#include "src/core/util/crash.h" +#include "src/core/util/strerror.h" static int ncpus = 0; diff --git a/src/core/lib/gprpp/linux/env.cc b/src/core/util/linux/env.cc similarity index 97% rename from src/core/lib/gprpp/linux/env.cc rename to src/core/util/linux/env.cc index 4f4b097841b..d2b8e2b29e6 100644 --- a/src/core/lib/gprpp/linux/env.cc +++ b/src/core/util/linux/env.cc @@ -32,7 +32,7 @@ #include #include -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" namespace grpc_core { diff --git a/src/core/util/linux/log.cc b/src/core/util/linux/log.cc index f09ecb2dbbc..dee2621b8db 100644 --- a/src/core/util/linux/log.cc +++ b/src/core/util/linux/log.cc @@ -44,8 +44,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/examine_stack.h" +#include "src/core/util/crash.h" +#include "src/core/util/examine_stack.h" void gpr_log(const char* file, int line, gpr_log_severity severity, const char* format, ...) { diff --git a/src/core/lib/gprpp/load_file.cc b/src/core/util/load_file.cc similarity index 98% rename from src/core/lib/gprpp/load_file.cc rename to src/core/util/load_file.cc index 01cb7798de2..455c58f3004 100644 --- a/src/core/lib/gprpp/load_file.cc +++ b/src/core/util/load_file.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/load_file.h" +#include "src/core/util/load_file.h" #include #include diff --git a/src/core/lib/gprpp/load_file.h b/src/core/util/load_file.h similarity index 88% rename from src/core/lib/gprpp/load_file.h rename to src/core/util/load_file.h index 761d8d1fbd6..78955ae1aea 100644 --- a/src/core/lib/gprpp/load_file.h +++ b/src/core/util/load_file.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_LOAD_FILE_H -#define GRPC_SRC_CORE_LIB_GPRPP_LOAD_FILE_H +#ifndef GRPC_SRC_CORE_UTIL_LOAD_FILE_H +#define GRPC_SRC_CORE_UTIL_LOAD_FILE_H #include @@ -31,4 +31,4 @@ absl::StatusOr LoadFile(const std::string& filename, bool add_null_terminator); } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_LOAD_FILE_H +#endif // GRPC_SRC_CORE_UTIL_LOAD_FILE_H diff --git a/src/core/util/log.cc b/src/core/util/log.cc index 9a6f68104e0..16be419dad9 100644 --- a/src/core/util/log.cc +++ b/src/core/util/log.cc @@ -31,7 +31,7 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" #ifndef GPR_DEFAULT_LOG_VERBOSITY_STRING diff --git a/src/core/lib/gprpp/manual_constructor.h b/src/core/util/manual_constructor.h similarity index 95% rename from src/core/lib/gprpp/manual_constructor.h rename to src/core/util/manual_constructor.h index 02892970295..d7a50683bd6 100644 --- a/src/core/lib/gprpp/manual_constructor.h +++ b/src/core/util/manual_constructor.h @@ -16,8 +16,8 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_MANUAL_CONSTRUCTOR_H -#define GRPC_SRC_CORE_LIB_GPRPP_MANUAL_CONSTRUCTOR_H +#ifndef GRPC_SRC_CORE_UTIL_MANUAL_CONSTRUCTOR_H +#define GRPC_SRC_CORE_UTIL_MANUAL_CONSTRUCTOR_H // manually construct a region of memory with some type @@ -27,7 +27,7 @@ #include -#include "src/core/lib/gprpp/construct_destruct.h" +#include "src/core/util/construct_destruct.h" namespace grpc_core { @@ -143,4 +143,4 @@ class ManualConstructor { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_MANUAL_CONSTRUCTOR_H +#endif // GRPC_SRC_CORE_UTIL_MANUAL_CONSTRUCTOR_H diff --git a/src/core/lib/gprpp/match.h b/src/core/util/match.h similarity index 93% rename from src/core/lib/gprpp/match.h rename to src/core/util/match.h index 9fa388fd2c0..186b7edeb2a 100644 --- a/src/core/lib/gprpp/match.h +++ b/src/core/util/match.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_MATCH_H -#define GRPC_SRC_CORE_LIB_GPRPP_MATCH_H +#ifndef GRPC_SRC_CORE_UTIL_MATCH_H +#define GRPC_SRC_CORE_UTIL_MATCH_H #include @@ -21,7 +21,7 @@ #include -#include "src/core/lib/gprpp/overload.h" +#include "src/core/util/overload.h" namespace grpc_core { @@ -72,4 +72,4 @@ auto MatchMutable(absl::variant* value, Fs... fs) } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_MATCH_H +#endif // GRPC_SRC_CORE_UTIL_MATCH_H diff --git a/src/core/lib/gprpp/memory.h b/src/core/util/memory.h similarity index 91% rename from src/core/lib/gprpp/memory.h rename to src/core/util/memory.h index 932862d708c..fe3f5850b00 100644 --- a/src/core/lib/gprpp/memory.h +++ b/src/core/util/memory.h @@ -16,8 +16,8 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_MEMORY_H -#define GRPC_SRC_CORE_LIB_GPRPP_MEMORY_H +#ifndef GRPC_SRC_CORE_UTIL_MEMORY_H +#define GRPC_SRC_CORE_UTIL_MEMORY_H #include #include @@ -49,4 +49,4 @@ T* Zalloc() { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_MEMORY_H +#endif // GRPC_SRC_CORE_UTIL_MEMORY_H diff --git a/src/core/lib/gprpp/mpscq.cc b/src/core/util/mpscq.cc similarity index 98% rename from src/core/lib/gprpp/mpscq.cc rename to src/core/util/mpscq.cc index d57ff40f7d8..fd998e8c905 100644 --- a/src/core/lib/gprpp/mpscq.cc +++ b/src/core/util/mpscq.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/gprpp/mpscq.h" +#include "src/core/util/mpscq.h" #include diff --git a/src/core/lib/gprpp/mpscq.h b/src/core/util/mpscq.h similarity index 94% rename from src/core/lib/gprpp/mpscq.h rename to src/core/util/mpscq.h index c33d34ffa13..e6ae70665b9 100644 --- a/src/core/lib/gprpp/mpscq.h +++ b/src/core/util/mpscq.h @@ -16,8 +16,8 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_MPSCQ_H -#define GRPC_SRC_CORE_LIB_GPRPP_MPSCQ_H +#ifndef GRPC_SRC_CORE_UTIL_MPSCQ_H +#define GRPC_SRC_CORE_UTIL_MPSCQ_H #include @@ -26,7 +26,7 @@ #include #include -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" namespace grpc_core { @@ -97,4 +97,4 @@ class LockedMultiProducerSingleConsumerQueue { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_MPSCQ_H +#endif // GRPC_SRC_CORE_UTIL_MPSCQ_H diff --git a/src/core/util/msys/tmpfile.cc b/src/core/util/msys/tmpfile.cc index 41a04f1c75d..9f69cdf1d63 100644 --- a/src/core/util/msys/tmpfile.cc +++ b/src/core/util/msys/tmpfile.cc @@ -29,7 +29,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/util/string_windows.h" #include "src/core/util/tmpfile.h" diff --git a/src/core/lib/gprpp/no_destruct.h b/src/core/util/no_destruct.h similarity index 93% rename from src/core/lib/gprpp/no_destruct.h rename to src/core/util/no_destruct.h index 1f8a82c1753..e07f1f0cbf0 100644 --- a/src/core/lib/gprpp/no_destruct.h +++ b/src/core/util/no_destruct.h @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_NO_DESTRUCT_H -#define GRPC_SRC_CORE_LIB_GPRPP_NO_DESTRUCT_H +#ifndef GRPC_SRC_CORE_UTIL_NO_DESTRUCT_H +#define GRPC_SRC_CORE_UTIL_NO_DESTRUCT_H #include #include #include -#include "src/core/lib/gprpp/construct_destruct.h" +#include "src/core/util/construct_destruct.h" namespace grpc_core { @@ -92,4 +92,4 @@ NoDestruct NoDestructSingleton::value_; } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_NO_DESTRUCT_H +#endif // GRPC_SRC_CORE_UTIL_NO_DESTRUCT_H diff --git a/src/core/lib/gprpp/notification.h b/src/core/util/notification.h similarity index 89% rename from src/core/lib/gprpp/notification.h rename to src/core/util/notification.h index 4be78279023..49395dbde48 100644 --- a/src/core/lib/gprpp/notification.h +++ b/src/core/util/notification.h @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_NOTIFICATION_H -#define GRPC_SRC_CORE_LIB_GPRPP_NOTIFICATION_H +#ifndef GRPC_SRC_CORE_UTIL_NOTIFICATION_H +#define GRPC_SRC_CORE_UTIL_NOTIFICATION_H #include "absl/time/clock.h" #include "absl/time/time.h" #include -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" namespace grpc_core { @@ -64,4 +64,4 @@ class Notification { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_NOTIFICATION_H +#endif // GRPC_SRC_CORE_UTIL_NOTIFICATION_H diff --git a/src/core/lib/gprpp/orphanable.h b/src/core/util/orphanable.h similarity index 93% rename from src/core/lib/gprpp/orphanable.h rename to src/core/util/orphanable.h index 924a41fd5fe..2b3217ff23f 100644 --- a/src/core/lib/gprpp/orphanable.h +++ b/src/core/util/orphanable.h @@ -16,8 +16,8 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_ORPHANABLE_H -#define GRPC_SRC_CORE_LIB_GPRPP_ORPHANABLE_H +#ifndef GRPC_SRC_CORE_UTIL_ORPHANABLE_H +#define GRPC_SRC_CORE_UTIL_ORPHANABLE_H #include #include @@ -25,10 +25,10 @@ #include -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/down_cast.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/down_cast.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { @@ -150,4 +150,4 @@ class InternallyRefCounted : public Orphanable { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_ORPHANABLE_H +#endif // GRPC_SRC_CORE_UTIL_ORPHANABLE_H diff --git a/src/core/lib/gprpp/overload.h b/src/core/util/overload.h similarity index 93% rename from src/core/lib/gprpp/overload.h rename to src/core/util/overload.h index 2a3bd546e86..dd5fdb0ab8f 100644 --- a/src/core/lib/gprpp/overload.h +++ b/src/core/util/overload.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_OVERLOAD_H -#define GRPC_SRC_CORE_LIB_GPRPP_OVERLOAD_H +#ifndef GRPC_SRC_CORE_UTIL_OVERLOAD_H +#define GRPC_SRC_CORE_UTIL_OVERLOAD_H #include @@ -56,4 +56,4 @@ OverloadType Overload(Cases... cases) { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_OVERLOAD_H +#endif // GRPC_SRC_CORE_UTIL_OVERLOAD_H diff --git a/src/core/lib/gprpp/packed_table.h b/src/core/util/packed_table.h similarity index 83% rename from src/core/lib/gprpp/packed_table.h rename to src/core/util/packed_table.h index a1f7b09f0cf..2a7946174d4 100644 --- a/src/core/lib/gprpp/packed_table.h +++ b/src/core/util/packed_table.h @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_PACKED_TABLE_H -#define GRPC_SRC_CORE_LIB_GPRPP_PACKED_TABLE_H +#ifndef GRPC_SRC_CORE_UTIL_PACKED_TABLE_H +#define GRPC_SRC_CORE_UTIL_PACKED_TABLE_H #include -#include "src/core/lib/gprpp/sorted_pack.h" -#include "src/core/lib/gprpp/table.h" +#include "src/core/util/sorted_pack.h" +#include "src/core/util/table.h" namespace grpc_core { @@ -37,4 +37,4 @@ using PackedTable = } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_PACKED_TABLE_H +#endif // GRPC_SRC_CORE_UTIL_PACKED_TABLE_H diff --git a/src/core/lib/gprpp/per_cpu.cc b/src/core/util/per_cpu.cc similarity index 96% rename from src/core/lib/gprpp/per_cpu.cc rename to src/core/util/per_cpu.cc index 4cd06fd6513..13098726bc7 100644 --- a/src/core/lib/gprpp/per_cpu.cc +++ b/src/core/util/per_cpu.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/per_cpu.h" +#include "src/core/util/per_cpu.h" #include #include diff --git a/src/core/lib/gprpp/per_cpu.h b/src/core/util/per_cpu.h similarity index 95% rename from src/core/lib/gprpp/per_cpu.h rename to src/core/util/per_cpu.h index a4e30092df6..40b6b5a5c01 100644 --- a/src/core/lib/gprpp/per_cpu.h +++ b/src/core/util/per_cpu.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_PER_CPU_H -#define GRPC_SRC_CORE_LIB_GPRPP_PER_CPU_H +#ifndef GRPC_SRC_CORE_UTIL_PER_CPU_H +#define GRPC_SRC_CORE_UTIL_PER_CPU_H #include @@ -100,4 +100,4 @@ class PerCpu { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_PER_CPU_H +#endif // GRPC_SRC_CORE_UTIL_PER_CPU_H diff --git a/src/core/util/posix/cpu.cc b/src/core/util/posix/cpu.cc index 9d7c638aa12..86d24361bc7 100644 --- a/src/core/util/posix/cpu.cc +++ b/src/core/util/posix/cpu.cc @@ -29,7 +29,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" static long ncpus = 0; diff --git a/src/core/lib/gprpp/posix/directory_reader.cc b/src/core/util/posix/directory_reader.cc similarity index 97% rename from src/core/lib/gprpp/posix/directory_reader.cc rename to src/core/util/posix/directory_reader.cc index eff9823a213..b8fd3642f1f 100644 --- a/src/core/lib/gprpp/posix/directory_reader.cc +++ b/src/core/util/posix/directory_reader.cc @@ -31,7 +31,7 @@ #include -#include "src/core/lib/gprpp/directory_reader.h" +#include "src/core/util/directory_reader.h" namespace grpc_core { diff --git a/src/core/lib/gprpp/posix/env.cc b/src/core/util/posix/env.cc similarity index 96% rename from src/core/lib/gprpp/posix/env.cc rename to src/core/util/posix/env.cc index 4121e24c072..8ace63d0ea2 100644 --- a/src/core/lib/gprpp/posix/env.cc +++ b/src/core/util/posix/env.cc @@ -22,7 +22,7 @@ #include -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" namespace grpc_core { diff --git a/src/core/util/posix/log.cc b/src/core/util/posix/log.cc index 09791014ef8..1c7ccf5640f 100644 --- a/src/core/util/posix/log.cc +++ b/src/core/util/posix/log.cc @@ -35,8 +35,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/examine_stack.h" +#include "src/core/util/crash.h" +#include "src/core/util/examine_stack.h" void gpr_log(const char* file, int line, gpr_log_severity severity, const char* format, ...) { diff --git a/src/core/lib/gprpp/posix/stat.cc b/src/core/util/posix/stat.cc similarity index 94% rename from src/core/lib/gprpp/posix/stat.cc rename to src/core/util/posix/stat.cc index f46741af5c9..d00d6028385 100644 --- a/src/core/lib/gprpp/posix/stat.cc +++ b/src/core/util/posix/stat.cc @@ -31,8 +31,8 @@ #include -#include "src/core/lib/gprpp/stat.h" -#include "src/core/lib/gprpp/strerror.h" +#include "src/core/util/stat.h" +#include "src/core/util/strerror.h" namespace grpc_core { diff --git a/src/core/util/posix/sync.cc b/src/core/util/posix/sync.cc index 912a1a6b48e..af543f3eb36 100644 --- a/src/core/util/posix/sync.cc +++ b/src/core/util/posix/sync.cc @@ -31,7 +31,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" void gpr_mu_init(gpr_mu* mu) { #ifdef GRPC_ASAN_ENABLED diff --git a/src/core/lib/gprpp/posix/thd.cc b/src/core/util/posix/thd.cc similarity index 97% rename from src/core/lib/gprpp/posix/thd.cc rename to src/core/util/posix/thd.cc index dd3124fad25..08492369379 100644 --- a/src/core/lib/gprpp/posix/thd.cc +++ b/src/core/util/posix/thd.cc @@ -40,10 +40,10 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/fork.h" -#include "src/core/lib/gprpp/strerror.h" -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/crash.h" +#include "src/core/util/fork.h" +#include "src/core/util/strerror.h" +#include "src/core/util/thd.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/util/posix/time.cc b/src/core/util/posix/time.cc index 6624b0fd656..1dccb752e13 100644 --- a/src/core/util/posix/time.cc +++ b/src/core/util/posix/time.cc @@ -34,7 +34,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" static struct timespec timespec_from_gpr(gpr_timespec gts) { struct timespec rv; diff --git a/src/core/util/posix/tmpfile.cc b/src/core/util/posix/tmpfile.cc index dbf399dba63..6a618bcda3a 100644 --- a/src/core/util/posix/tmpfile.cc +++ b/src/core/util/posix/tmpfile.cc @@ -31,8 +31,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/strerror.h" +#include "src/core/util/crash.h" +#include "src/core/util/strerror.h" #include "src/core/util/string.h" #include "src/core/util/tmpfile.h" diff --git a/src/core/lib/gprpp/ref_counted.h b/src/core/util/ref_counted.h similarity index 97% rename from src/core/lib/gprpp/ref_counted.h rename to src/core/util/ref_counted.h index 7d9f8c4d11d..00da2b64ba3 100644 --- a/src/core/lib/gprpp/ref_counted.h +++ b/src/core/util/ref_counted.h @@ -16,8 +16,8 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_REF_COUNTED_H -#define GRPC_SRC_CORE_LIB_GPRPP_REF_COUNTED_H +#ifndef GRPC_SRC_CORE_UTIL_REF_COUNTED_H +#define GRPC_SRC_CORE_UTIL_REF_COUNTED_H #include #include @@ -28,10 +28,10 @@ #include #include -#include "src/core/lib/gprpp/atomic_utils.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/down_cast.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/atomic_utils.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/down_cast.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { @@ -392,4 +392,4 @@ class RefCounted : public Impl { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_REF_COUNTED_H +#endif // GRPC_SRC_CORE_UTIL_REF_COUNTED_H diff --git a/src/core/lib/gprpp/ref_counted_ptr.h b/src/core/util/ref_counted_ptr.h similarity index 98% rename from src/core/lib/gprpp/ref_counted_ptr.h rename to src/core/util/ref_counted_ptr.h index c3506bc8697..5cfb62ea392 100644 --- a/src/core/lib/gprpp/ref_counted_ptr.h +++ b/src/core/util/ref_counted_ptr.h @@ -16,8 +16,8 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_REF_COUNTED_PTR_H -#define GRPC_SRC_CORE_LIB_GPRPP_REF_COUNTED_PTR_H +#ifndef GRPC_SRC_CORE_UTIL_REF_COUNTED_PTR_H +#define GRPC_SRC_CORE_UTIL_REF_COUNTED_PTR_H #include @@ -29,8 +29,8 @@ #include -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/down_cast.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/down_cast.h" namespace grpc_core { @@ -442,4 +442,4 @@ struct RefCountedPtrEq { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_REF_COUNTED_PTR_H +#endif // GRPC_SRC_CORE_UTIL_REF_COUNTED_PTR_H diff --git a/src/core/lib/gprpp/ref_counted_string.cc b/src/core/util/ref_counted_string.cc similarity index 96% rename from src/core/lib/gprpp/ref_counted_string.cc rename to src/core/util/ref_counted_string.cc index 1a0a9ff0318..84fb0d6cb60 100644 --- a/src/core/lib/gprpp/ref_counted_string.cc +++ b/src/core/util/ref_counted_string.cc @@ -14,7 +14,7 @@ // limitations under the License. // -#include "src/core/lib/gprpp/ref_counted_string.h" +#include "src/core/util/ref_counted_string.h" #include diff --git a/src/core/lib/gprpp/ref_counted_string.h b/src/core/util/ref_counted_string.h similarity index 94% rename from src/core/lib/gprpp/ref_counted_string.h rename to src/core/util/ref_counted_string.h index 64f96bd9638..b135683b99f 100644 --- a/src/core/lib/gprpp/ref_counted_string.h +++ b/src/core/util/ref_counted_string.h @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_REF_COUNTED_STRING_H -#define GRPC_SRC_CORE_LIB_GPRPP_REF_COUNTED_STRING_H +#ifndef GRPC_SRC_CORE_UTIL_REF_COUNTED_STRING_H +#define GRPC_SRC_CORE_UTIL_REF_COUNTED_STRING_H #include @@ -25,8 +25,8 @@ #include -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { @@ -158,4 +158,4 @@ struct RefCountedStringValueLessThan { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_REF_COUNTED_STRING_H +#endif // GRPC_SRC_CORE_UTIL_REF_COUNTED_STRING_H diff --git a/src/core/lib/gprpp/single_set_ptr.h b/src/core/util/single_set_ptr.h similarity index 94% rename from src/core/lib/gprpp/single_set_ptr.h rename to src/core/util/single_set_ptr.h index 369e777bd23..3b6fcb97f08 100644 --- a/src/core/lib/gprpp/single_set_ptr.h +++ b/src/core/util/single_set_ptr.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_SINGLE_SET_PTR_H -#define GRPC_SRC_CORE_LIB_GPRPP_SINGLE_SET_PTR_H +#ifndef GRPC_SRC_CORE_UTIL_SINGLE_SET_PTR_H +#define GRPC_SRC_CORE_UTIL_SINGLE_SET_PTR_H #include #include @@ -85,4 +85,4 @@ class SingleSetPtr { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_SINGLE_SET_PTR_H +#endif // GRPC_SRC_CORE_UTIL_SINGLE_SET_PTR_H diff --git a/src/core/lib/gprpp/sorted_pack.h b/src/core/util/sorted_pack.h similarity index 94% rename from src/core/lib/gprpp/sorted_pack.h rename to src/core/util/sorted_pack.h index 47e3f9c525d..6afdf6d76fa 100644 --- a/src/core/lib/gprpp/sorted_pack.h +++ b/src/core/util/sorted_pack.h @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_SORTED_PACK_H -#define GRPC_SRC_CORE_LIB_GPRPP_SORTED_PACK_H +#ifndef GRPC_SRC_CORE_UTIL_SORTED_PACK_H +#define GRPC_SRC_CORE_UTIL_SORTED_PACK_H #include #include -#include "src/core/lib/gprpp/type_list.h" +#include "src/core/util/type_list.h" namespace grpc_core { @@ -86,4 +86,4 @@ struct WithSortedPack { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_SORTED_PACK_H +#endif // GRPC_SRC_CORE_UTIL_SORTED_PACK_H diff --git a/src/core/lib/gprpp/stat.h b/src/core/util/stat.h similarity index 89% rename from src/core/lib/gprpp/stat.h rename to src/core/util/stat.h index 2bee50c9029..08fb01ead02 100644 --- a/src/core/lib/gprpp/stat.h +++ b/src/core/util/stat.h @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_STAT_H -#define GRPC_SRC_CORE_LIB_GPRPP_STAT_H +#ifndef GRPC_SRC_CORE_UTIL_STAT_H +#define GRPC_SRC_CORE_UTIL_STAT_H #include @@ -33,4 +33,4 @@ absl::Status GetFileModificationTime(const char* filename, time_t* timestamp); } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_STAT_H +#endif // GRPC_SRC_CORE_UTIL_STAT_H diff --git a/src/core/lib/gprpp/status_helper.cc b/src/core/util/status_helper.cc similarity index 99% rename from src/core/lib/gprpp/status_helper.cc rename to src/core/util/status_helper.cc index fe76efb87a3..fc7fe4f000b 100644 --- a/src/core/lib/gprpp/status_helper.cc +++ b/src/core/util/status_helper.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/gprpp/status_helper.h" +#include "src/core/util/status_helper.h" #include diff --git a/src/core/lib/gprpp/status_helper.h b/src/core/util/status_helper.h similarity index 96% rename from src/core/lib/gprpp/status_helper.h rename to src/core/util/status_helper.h index 1f001948796..432d0eb59e6 100644 --- a/src/core/lib/gprpp/status_helper.h +++ b/src/core/util/status_helper.h @@ -16,8 +16,8 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_STATUS_HELPER_H -#define GRPC_SRC_CORE_LIB_GPRPP_STATUS_HELPER_H +#ifndef GRPC_SRC_CORE_UTIL_STATUS_HELPER_H +#define GRPC_SRC_CORE_UTIL_STATUS_HELPER_H #include @@ -31,7 +31,7 @@ #include -#include "src/core/lib/gprpp/debug_location.h" +#include "src/core/util/debug_location.h" extern "C" { struct google_rpc_Status; @@ -187,4 +187,4 @@ absl::Status StatusMoveFromHeapPtr(uintptr_t ptr); } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_STATUS_HELPER_H +#endif // GRPC_SRC_CORE_UTIL_STATUS_HELPER_H diff --git a/src/core/lib/gprpp/strerror.cc b/src/core/util/strerror.cc similarity index 96% rename from src/core/lib/gprpp/strerror.cc rename to src/core/util/strerror.cc index 298efa1eed3..fb18a65068d 100644 --- a/src/core/lib/gprpp/strerror.cc +++ b/src/core/util/strerror.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/strerror.h" +#include "src/core/util/strerror.h" #include diff --git a/src/core/lib/gprpp/strerror.h b/src/core/util/strerror.h similarity index 85% rename from src/core/lib/gprpp/strerror.h rename to src/core/util/strerror.h index fce645f6c1f..0c8c13a2ae8 100644 --- a/src/core/lib/gprpp/strerror.h +++ b/src/core/util/strerror.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_STRERROR_H -#define GRPC_SRC_CORE_LIB_GPRPP_STRERROR_H +#ifndef GRPC_SRC_CORE_UTIL_STRERROR_H +#define GRPC_SRC_CORE_UTIL_STRERROR_H #include @@ -26,4 +26,4 @@ std::string StrError(int err); } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_STRERROR_H +#endif // GRPC_SRC_CORE_UTIL_STRERROR_H diff --git a/src/core/util/string.cc b/src/core/util/string.cc index 7efbd09f51f..34d3f7bbdaf 100644 --- a/src/core/util/string.cc +++ b/src/core/util/string.cc @@ -34,7 +34,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" char* gpr_strdup(const char* src) { diff --git a/src/core/util/subprocess_posix.cc b/src/core/util/subprocess_posix.cc index f7232d38229..0027be4e334 100644 --- a/src/core/util/subprocess_posix.cc +++ b/src/core/util/subprocess_posix.cc @@ -34,8 +34,8 @@ #include #include -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/gprpp/strerror.h" +#include "src/core/util/memory.h" +#include "src/core/util/strerror.h" #include "src/core/util/subprocess.h" struct gpr_subprocess { diff --git a/src/core/util/subprocess_windows.cc b/src/core/util/subprocess_windows.cc index d85b04b8b58..2034402d90d 100644 --- a/src/core/util/subprocess_windows.cc +++ b/src/core/util/subprocess_windows.cc @@ -30,8 +30,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/tchar.h" +#include "src/core/util/crash.h" +#include "src/core/util/tchar.h" #include "src/core/util/string.h" #include "src/core/util/subprocess.h" diff --git a/src/core/lib/gprpp/sync.h b/src/core/util/sync.h similarity index 97% rename from src/core/lib/gprpp/sync.h rename to src/core/util/sync.h index 16efe619cd5..2b85b3d335a 100644 --- a/src/core/lib/gprpp/sync.h +++ b/src/core/util/sync.h @@ -16,8 +16,8 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_SYNC_H -#define GRPC_SRC_CORE_LIB_GPRPP_SYNC_H +#ifndef GRPC_SRC_CORE_UTIL_SYNC_H +#define GRPC_SRC_CORE_UTIL_SYNC_H #include "absl/base/thread_annotations.h" #include "absl/log/check.h" @@ -28,7 +28,7 @@ #include #ifndef GPR_ABSEIL_SYNC -#include "src/core/lib/gprpp/time_util.h" +#include "src/core/util/time_util.h" #endif // The core library is not accessible in C++ codegen headers, and vice versa. @@ -197,4 +197,4 @@ class ABSL_SCOPED_LOCKABLE LockableAndReleasableMutexLock { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_SYNC_H +#endif // GRPC_SRC_CORE_UTIL_SYNC_H diff --git a/src/core/util/sync_abseil.cc b/src/core/util/sync_abseil.cc index cc23c3d1cd3..7d3fca72294 100644 --- a/src/core/util/sync_abseil.cc +++ b/src/core/util/sync_abseil.cc @@ -33,8 +33,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/time_util.h" +#include "src/core/util/crash.h" +#include "src/core/util/time_util.h" void gpr_mu_init(gpr_mu* mu) { static_assert(sizeof(gpr_mu) == sizeof(absl::Mutex), diff --git a/src/core/lib/gprpp/table.h b/src/core/util/table.h similarity index 98% rename from src/core/lib/gprpp/table.h rename to src/core/util/table.h index 8c6bc978543..ddd88d3fcb0 100644 --- a/src/core/lib/gprpp/table.h +++ b/src/core/util/table.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_TABLE_H -#define GRPC_SRC_CORE_LIB_GPRPP_TABLE_H +#ifndef GRPC_SRC_CORE_UTIL_TABLE_H +#define GRPC_SRC_CORE_UTIL_TABLE_H #include @@ -27,7 +27,7 @@ #include -#include "src/core/lib/gprpp/bitset.h" +#include "src/core/util/bitset.h" namespace grpc_core { @@ -449,4 +449,4 @@ class Table { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_TABLE_H +#endif // GRPC_SRC_CORE_UTIL_TABLE_H diff --git a/src/core/lib/gprpp/tchar.cc b/src/core/util/tchar.cc similarity index 97% rename from src/core/lib/gprpp/tchar.cc rename to src/core/util/tchar.cc index 20bd7acc233..ee9634be76a 100644 --- a/src/core/lib/gprpp/tchar.cc +++ b/src/core/util/tchar.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/tchar.h" +#include "src/core/util/tchar.h" #include diff --git a/src/core/lib/gprpp/tchar.h b/src/core/util/tchar.h similarity index 87% rename from src/core/lib/gprpp/tchar.h rename to src/core/util/tchar.h index d1e1acbc1bd..53350b0af8b 100644 --- a/src/core/lib/gprpp/tchar.h +++ b/src/core/util/tchar.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_TCHAR_H -#define GRPC_SRC_CORE_LIB_GPRPP_TCHAR_H +#ifndef GRPC_SRC_CORE_UTIL_TCHAR_H +#define GRPC_SRC_CORE_UTIL_TCHAR_H #include @@ -30,4 +30,4 @@ std::string TcharToChar(TcharString input); } // namespace grpc_core #endif -#endif // GRPC_SRC_CORE_LIB_GPRPP_TCHAR_H +#endif // GRPC_SRC_CORE_UTIL_TCHAR_H diff --git a/src/core/lib/gprpp/thd.h b/src/core/util/thd.h similarity index 98% rename from src/core/lib/gprpp/thd.h rename to src/core/util/thd.h index 44ff3b22e3c..493e113fba1 100644 --- a/src/core/lib/gprpp/thd.h +++ b/src/core/util/thd.h @@ -16,8 +16,8 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_THD_H -#define GRPC_SRC_CORE_LIB_GPRPP_THD_H +#ifndef GRPC_SRC_CORE_UTIL_THD_H +#define GRPC_SRC_CORE_UTIL_THD_H /// Internal thread interface. @@ -192,4 +192,4 @@ class Thread { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_THD_H +#endif // GRPC_SRC_CORE_UTIL_THD_H diff --git a/src/core/util/time.cc b/src/core/util/time.cc index a46e95ef352..b1f10b78f17 100644 --- a/src/core/util/time.cc +++ b/src/core/util/time.cc @@ -1,6 +1,4 @@ -// -// -// Copyright 2015 gRPC authors. +// Copyright 2021 gRPC authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -13,259 +11,232 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -// -// -// Generic implementation of time calls. +#include "src/core/util/time.h" -#include - -#include -#include -#include +#include +#include +#include +#include +#include #include "absl/log/check.h" +#include "absl/strings/str_format.h" #include +#include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/no_destruct.h" -int gpr_time_cmp(gpr_timespec a, gpr_timespec b) { - int cmp = (a.tv_sec > b.tv_sec) - (a.tv_sec < b.tv_sec); - CHECK(a.clock_type == b.clock_type); - if (cmp == 0 && a.tv_sec != INT64_MAX && a.tv_sec != INT64_MIN) { - cmp = (a.tv_nsec > b.tv_nsec) - (a.tv_nsec < b.tv_nsec); - } - return cmp; -} +// IWYU pragma: no_include -gpr_timespec gpr_time_min(gpr_timespec a, gpr_timespec b) { - return gpr_time_cmp(a, b) < 0 ? a : b; -} +namespace grpc_core { -gpr_timespec gpr_time_max(gpr_timespec a, gpr_timespec b) { - return gpr_time_cmp(a, b) > 0 ? a : b; -} +namespace { + +std::atomic g_process_epoch_seconds; +std::atomic g_process_epoch_cycles; + +class GprNowTimeSource final : public Timestamp::Source { + public: + Timestamp Now() override { + return Timestamp::FromTimespecRoundDown(gpr_now(GPR_CLOCK_MONOTONIC)); + } +}; + +GPR_ATTRIBUTE_NOINLINE std::pair InitTime() { + gpr_cycle_counter cycles_start = 0; + gpr_cycle_counter cycles_end = 0; + int64_t process_epoch_seconds = 0; + + // Check the current time... if we end up with zero, try again after 100ms. + // If it doesn't advance after sleeping for 2100ms, crash the process. + for (int i = 0; i < 21; i++) { + cycles_start = gpr_get_cycle_counter(); + gpr_timespec now = gpr_now(GPR_CLOCK_MONOTONIC); + cycles_end = gpr_get_cycle_counter(); + process_epoch_seconds = now.tv_sec; + if (process_epoch_seconds > 1) { + break; + } + gpr_log(GPR_INFO, + "gpr_now(GPR_CLOCK_MONOTONIC) returns a very small number: " + "sleeping for 100ms"); + gpr_sleep_until(gpr_time_add(now, gpr_time_from_millis(100, GPR_TIMESPAN))); + } -gpr_timespec gpr_time_0(gpr_clock_type type) { - gpr_timespec out; - out.tv_sec = 0; - out.tv_nsec = 0; - out.clock_type = type; - return out; + // Check time has increased past 1 second. + CHECK_GT(process_epoch_seconds, 1); + // Fake the epoch to always return >=1 second from our monotonic clock (to + // avoid bugs elsewhere) + process_epoch_seconds -= 1; + int64_t expected = 0; + gpr_cycle_counter process_epoch_cycles = (cycles_start + cycles_end) / 2; + CHECK_NE(process_epoch_cycles, 0); + if (!g_process_epoch_seconds.compare_exchange_strong( + expected, process_epoch_seconds, std::memory_order_relaxed, + std::memory_order_relaxed)) { + process_epoch_seconds = expected; + do { + process_epoch_cycles = + g_process_epoch_cycles.load(std::memory_order_relaxed); + } while (process_epoch_cycles == 0); + } else { + g_process_epoch_cycles.store(process_epoch_cycles, + std::memory_order_relaxed); + } + return std::make_pair(process_epoch_seconds, process_epoch_cycles); } -gpr_timespec gpr_inf_future(gpr_clock_type type) { - gpr_timespec out; - out.tv_sec = INT64_MAX; - out.tv_nsec = 0; - out.clock_type = type; - return out; +gpr_timespec StartTime() { + int64_t sec = g_process_epoch_seconds.load(std::memory_order_relaxed); + if (GPR_UNLIKELY(sec == 0)) sec = InitTime().first; + return {sec, 0, GPR_CLOCK_MONOTONIC}; } -gpr_timespec gpr_inf_past(gpr_clock_type type) { - gpr_timespec out; - out.tv_sec = INT64_MIN; - out.tv_nsec = 0; - out.clock_type = type; - return out; +gpr_cycle_counter StartCycleCounter() { + gpr_cycle_counter cycles = + g_process_epoch_cycles.load(std::memory_order_relaxed); + if (GPR_UNLIKELY(cycles == 0)) cycles = InitTime().second; + return cycles; } -static gpr_timespec to_seconds_from_sub_second_time(int64_t time_in_units, - int64_t units_per_sec, - gpr_clock_type type) { - gpr_timespec out; - if (time_in_units == INT64_MAX) { - out = gpr_inf_future(type); - } else if (time_in_units == INT64_MIN) { - out = gpr_inf_past(type); - } else { - DCHECK_EQ(GPR_NS_PER_SEC % units_per_sec, 0); - - out.tv_sec = time_in_units / units_per_sec; - out.tv_nsec = - static_cast((time_in_units - (out.tv_sec * units_per_sec)) * - (GPR_NS_PER_SEC / units_per_sec)); - /// `out.tv_nsec` should always be positive. - if (out.tv_nsec < 0) { - out.tv_nsec += GPR_NS_PER_SEC; - out.tv_sec--; - } +gpr_timespec MillisecondsAsTimespec(int64_t millis, gpr_clock_type clock_type) { + // special-case infinities as Timestamp can be 32bit on some + // platforms while gpr_time_from_millis always takes an int64_t. + if (millis == std::numeric_limits::max()) { + return gpr_inf_future(clock_type); + } + if (millis == std::numeric_limits::min()) { + return gpr_inf_past(clock_type); + } - out.clock_type = type; + if (clock_type == GPR_TIMESPAN) { + return gpr_time_from_millis(millis, GPR_TIMESPAN); + } + return gpr_time_add(gpr_convert_clock_type(StartTime(), clock_type), + gpr_time_from_millis(millis, GPR_TIMESPAN)); +} + +int64_t TimespanToMillisRoundUp(gpr_timespec ts) { + CHECK(ts.clock_type == GPR_TIMESPAN); + double x = GPR_MS_PER_SEC * static_cast(ts.tv_sec) + + static_cast(ts.tv_nsec) / GPR_NS_PER_MS + + static_cast(GPR_NS_PER_SEC - 1) / + static_cast(GPR_NS_PER_SEC); + if (x <= static_cast(std::numeric_limits::min())) { + return std::numeric_limits::min(); + } + if (x >= static_cast(std::numeric_limits::max())) { + return std::numeric_limits::max(); } - return out; + return static_cast(x); } -static gpr_timespec to_seconds_from_above_second_time(int64_t time_in_units, - int64_t secs_per_unit, - gpr_clock_type type) { - gpr_timespec out; - if (time_in_units >= INT64_MAX / secs_per_unit) { - out = gpr_inf_future(type); - } else if (time_in_units <= INT64_MIN / secs_per_unit) { - out = gpr_inf_past(type); - } else { - out.tv_sec = time_in_units * secs_per_unit; - out.tv_nsec = 0; - out.clock_type = type; +int64_t TimespanToMillisRoundDown(gpr_timespec ts) { + CHECK(ts.clock_type == GPR_TIMESPAN); + double x = GPR_MS_PER_SEC * static_cast(ts.tv_sec) + + static_cast(ts.tv_nsec) / GPR_NS_PER_MS; + if (x <= static_cast(std::numeric_limits::min())) { + return std::numeric_limits::min(); + } + if (x >= static_cast(std::numeric_limits::max())) { + return std::numeric_limits::max(); } - return out; + return static_cast(x); } -gpr_timespec gpr_time_from_nanos(int64_t ns, gpr_clock_type clock_type) { - return to_seconds_from_sub_second_time(ns, GPR_NS_PER_SEC, clock_type); -} +} // namespace -gpr_timespec gpr_time_from_micros(int64_t us, gpr_clock_type clock_type) { - return to_seconds_from_sub_second_time(us, GPR_US_PER_SEC, clock_type); +thread_local Timestamp::Source* Timestamp::thread_local_time_source_{ + NoDestructSingleton::Get()}; + +Timestamp ScopedTimeCache::Now() { + if (!cached_time_.has_value()) { + previous()->InvalidateCache(); + cached_time_ = previous()->Now(); + } + return cached_time_.value(); } -gpr_timespec gpr_time_from_millis(int64_t ms, gpr_clock_type clock_type) { - return to_seconds_from_sub_second_time(ms, GPR_MS_PER_SEC, clock_type); +Timestamp Timestamp::FromTimespecRoundUp(gpr_timespec ts) { + return FromMillisecondsAfterProcessEpoch(TimespanToMillisRoundUp(gpr_time_sub( + gpr_convert_clock_type(ts, GPR_CLOCK_MONOTONIC), StartTime()))); } -gpr_timespec gpr_time_from_seconds(int64_t s, gpr_clock_type clock_type) { - return to_seconds_from_sub_second_time(s, 1, clock_type); +Timestamp Timestamp::FromTimespecRoundDown(gpr_timespec ts) { + return FromMillisecondsAfterProcessEpoch( + TimespanToMillisRoundDown(gpr_time_sub( + gpr_convert_clock_type(ts, GPR_CLOCK_MONOTONIC), StartTime()))); } -gpr_timespec gpr_time_from_minutes(int64_t m, gpr_clock_type clock_type) { - return to_seconds_from_above_second_time(m, 60, clock_type); +Timestamp Timestamp::FromCycleCounterRoundUp(gpr_cycle_counter c) { + return Timestamp::FromMillisecondsAfterProcessEpoch( + TimespanToMillisRoundUp(gpr_cycle_counter_sub(c, StartCycleCounter()))); } -gpr_timespec gpr_time_from_hours(int64_t h, gpr_clock_type clock_type) { - return to_seconds_from_above_second_time(h, 3600, clock_type); +Timestamp Timestamp::FromCycleCounterRoundDown(gpr_cycle_counter c) { + return Timestamp::FromMillisecondsAfterProcessEpoch( + TimespanToMillisRoundDown(gpr_cycle_counter_sub(c, StartCycleCounter()))); } -gpr_timespec gpr_time_add(gpr_timespec a, gpr_timespec b) { - gpr_timespec sum; - int64_t inc = 0; - CHECK(b.clock_type == GPR_TIMESPAN); - // tv_nsec in a timespan is always +ve. -ve timespan is represented as (-ve - // tv_sec, +ve tv_nsec). For example, timespan = -2.5 seconds is represented - // as {-3, 5e8, GPR_TIMESPAN} - CHECK_GE(b.tv_nsec, 0); - sum.clock_type = a.clock_type; - sum.tv_nsec = a.tv_nsec + b.tv_nsec; - if (sum.tv_nsec >= GPR_NS_PER_SEC) { - sum.tv_nsec -= GPR_NS_PER_SEC; - inc++; - } - if (a.tv_sec == INT64_MAX || a.tv_sec == INT64_MIN) { - sum = a; - } else if (b.tv_sec == INT64_MAX || - (b.tv_sec >= 0 && a.tv_sec >= INT64_MAX - b.tv_sec)) { - sum = gpr_inf_future(sum.clock_type); - } else if (b.tv_sec == INT64_MIN || - (b.tv_sec <= 0 && a.tv_sec <= INT64_MIN - b.tv_sec)) { - sum = gpr_inf_past(sum.clock_type); - } else { - sum.tv_sec = a.tv_sec + b.tv_sec; - if (inc != 0 && sum.tv_sec == INT64_MAX - 1) { - sum = gpr_inf_future(sum.clock_type); - } else { - sum.tv_sec += inc; - } - } - return sum; +gpr_timespec Timestamp::as_timespec(gpr_clock_type clock_type) const { + return MillisecondsAsTimespec(millis_, clock_type); } -gpr_timespec gpr_time_sub(gpr_timespec a, gpr_timespec b) { - gpr_timespec diff; - int64_t dec = 0; - if (b.clock_type == GPR_TIMESPAN) { - diff.clock_type = a.clock_type; - // tv_nsec in a timespan is always +ve. -ve timespan is represented as (-ve - // tv_sec, +ve tv_nsec). For example, timespan = -2.5 seconds is represented - // as {-3, 5e8, GPR_TIMESPAN} - CHECK_GE(b.tv_nsec, 0); - } else { - CHECK(a.clock_type == b.clock_type); - diff.clock_type = GPR_TIMESPAN; +std::string Timestamp::ToString() const { + if (millis_ == std::numeric_limits::max()) { + return "@∞"; } - diff.tv_nsec = a.tv_nsec - b.tv_nsec; - if (diff.tv_nsec < 0) { - diff.tv_nsec += GPR_NS_PER_SEC; - dec++; + if (millis_ == std::numeric_limits::min()) { + return "@-∞"; } - if (a.tv_sec == INT64_MAX || a.tv_sec == INT64_MIN) { - diff.tv_sec = a.tv_sec; - diff.tv_nsec = a.tv_nsec; - } else if (b.tv_sec == INT64_MIN || - (b.tv_sec <= 0 && a.tv_sec >= INT64_MAX + b.tv_sec)) { - diff = gpr_inf_future(GPR_CLOCK_REALTIME); - } else if (b.tv_sec == INT64_MAX || - (b.tv_sec >= 0 && a.tv_sec <= INT64_MIN + b.tv_sec)) { - diff = gpr_inf_past(GPR_CLOCK_REALTIME); - } else { - diff.tv_sec = a.tv_sec - b.tv_sec; - if (dec != 0 && diff.tv_sec == INT64_MIN + 1) { - diff = gpr_inf_past(GPR_CLOCK_REALTIME); - } else { - diff.tv_sec -= dec; - } - } - return diff; + return "@" + std::to_string(millis_) + "ms"; } -int gpr_time_similar(gpr_timespec a, gpr_timespec b, gpr_timespec threshold) { - int cmp_ab; - - CHECK(a.clock_type == b.clock_type); - CHECK(threshold.clock_type == GPR_TIMESPAN); +gpr_timespec Duration::as_timespec() const { + return MillisecondsAsTimespec(millis_, GPR_TIMESPAN); +} - cmp_ab = gpr_time_cmp(a, b); - if (cmp_ab == 0) return 1; - if (cmp_ab < 0) { - return gpr_time_cmp(gpr_time_sub(b, a), threshold) <= 0; - } else { - return gpr_time_cmp(gpr_time_sub(a, b), threshold) <= 0; - } +Duration Duration::FromTimespec(gpr_timespec t) { + return Duration::Milliseconds(TimespanToMillisRoundUp(t)); } -int32_t gpr_time_to_millis(gpr_timespec t) { - if (t.tv_sec >= 2147483) { - if (t.tv_sec == 2147483 && t.tv_nsec < 648 * GPR_NS_PER_MS) { - return 2147483 * GPR_MS_PER_SEC + t.tv_nsec / GPR_NS_PER_MS; - } - return 2147483647; - } else if (t.tv_sec <= -2147483) { - // TODO(ctiller): correct handling here (it's so far in the past do we - // care?) - return -2147483647; - } else { - return static_cast(t.tv_sec * GPR_MS_PER_SEC + - t.tv_nsec / GPR_NS_PER_MS); +std::string Duration::ToString() const { + if (millis_ == std::numeric_limits::max()) { + return "∞"; } + if (millis_ == std::numeric_limits::min()) { + return "-∞"; + } + return std::to_string(millis_) + "ms"; } -double gpr_timespec_to_micros(gpr_timespec t) { - return static_cast(t.tv_sec) * GPR_US_PER_SEC + t.tv_nsec * 1e-3; +std::string Duration::ToJsonString() const { + gpr_timespec ts = as_timespec(); + return absl::StrFormat("%d.%09ds", ts.tv_sec, ts.tv_nsec); } -gpr_timespec gpr_convert_clock_type(gpr_timespec t, gpr_clock_type clock_type) { - if (t.clock_type == clock_type) { - return t; - } - - if (t.tv_sec == INT64_MAX || t.tv_sec == INT64_MIN) { - t.clock_type = clock_type; - return t; - } +Duration::operator grpc_event_engine::experimental::EventEngine::Duration() + const { + return std::chrono::milliseconds( + Clamp(millis_, std::numeric_limits::min() / GPR_NS_PER_MS, + std::numeric_limits::max() / GPR_NS_PER_MS)); +} - if (clock_type == GPR_TIMESPAN) { - return gpr_time_sub(t, gpr_now(t.clock_type)); - } +void TestOnlySetProcessEpoch(gpr_timespec epoch) { + g_process_epoch_seconds.store( + gpr_convert_clock_type(epoch, GPR_CLOCK_MONOTONIC).tv_sec); + g_process_epoch_cycles.store(gpr_get_cycle_counter()); +} - if (t.clock_type == GPR_TIMESPAN) { - return gpr_time_add(gpr_now(clock_type), t); - } +std::ostream& operator<<(std::ostream& out, Timestamp timestamp) { + return out << timestamp.ToString(); +} - // If the given input hits this code, the same result is not guaranteed for - // the same input because it relies on `gpr_now` to calculate the difference - // between two different clocks. Please be careful when you want to use this - // function in unit tests. (e.g. https://github.com/grpc/grpc/pull/22655) - return gpr_time_add(gpr_now(clock_type), - gpr_time_sub(t, gpr_now(t.clock_type))); +std::ostream& operator<<(std::ostream& out, Duration duration) { + return out << duration.ToString(); } + +} // namespace grpc_core diff --git a/src/core/lib/gprpp/time.h b/src/core/util/time.h similarity index 99% rename from src/core/lib/gprpp/time.h rename to src/core/util/time.h index 96963753d38..228339d5e83 100644 --- a/src/core/lib/gprpp/time.h +++ b/src/core/util/time.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_TIME_H -#define GRPC_SRC_CORE_LIB_GPRPP_TIME_H +#ifndef GRPC_SRC_CORE_UTIL_TIME_H +#define GRPC_SRC_CORE_UTIL_TIME_H #include @@ -381,4 +381,4 @@ std::ostream& operator<<(std::ostream& out, Duration duration); } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_TIME_H +#endif // GRPC_SRC_CORE_UTIL_TIME_H diff --git a/src/core/lib/gprpp/time_averaged_stats.cc b/src/core/util/time_averaged_stats.cc similarity index 97% rename from src/core/lib/gprpp/time_averaged_stats.cc rename to src/core/util/time_averaged_stats.cc index 55f65397b79..caf52f72751 100644 --- a/src/core/lib/gprpp/time_averaged_stats.cc +++ b/src/core/util/time_averaged_stats.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/gprpp/time_averaged_stats.h" +#include "src/core/util/time_averaged_stats.h" #include diff --git a/src/core/lib/gprpp/time_averaged_stats.h b/src/core/util/time_averaged_stats.h similarity index 95% rename from src/core/lib/gprpp/time_averaged_stats.h rename to src/core/util/time_averaged_stats.h index cdd10a24afa..8f0c2c44989 100644 --- a/src/core/lib/gprpp/time_averaged_stats.h +++ b/src/core/util/time_averaged_stats.h @@ -16,8 +16,8 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_TIME_AVERAGED_STATS_H -#define GRPC_SRC_CORE_LIB_GPRPP_TIME_AVERAGED_STATS_H +#ifndef GRPC_SRC_CORE_UTIL_TIME_AVERAGED_STATS_H +#define GRPC_SRC_CORE_UTIL_TIME_AVERAGED_STATS_H namespace grpc_core { @@ -76,4 +76,4 @@ class TimeAveragedStats { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_TIME_AVERAGED_STATS_H +#endif // GRPC_SRC_CORE_UTIL_TIME_AVERAGED_STATS_H diff --git a/src/core/util/time_precise.cc b/src/core/util/time_precise.cc index b675777a19e..745b808ab9c 100644 --- a/src/core/util/time_precise.cc +++ b/src/core/util/time_precise.cc @@ -28,7 +28,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/util/time_precise.h" #ifndef GPR_CYCLE_COUNTER_CUSTOM diff --git a/src/core/lib/gprpp/time_util.cc b/src/core/util/time_util.cc similarity index 98% rename from src/core/lib/gprpp/time_util.cc rename to src/core/util/time_util.cc index 3a1cd376370..5ac7ef5b8db 100644 --- a/src/core/lib/gprpp/time_util.cc +++ b/src/core/util/time_util.cc @@ -14,7 +14,7 @@ // limitations under the License. // -#include "src/core/lib/gprpp/time_util.h" +#include "src/core/util/time_util.h" #include #include diff --git a/src/core/lib/gprpp/time_util.h b/src/core/util/time_util.h similarity index 89% rename from src/core/lib/gprpp/time_util.h rename to src/core/util/time_util.h index 665eeafb649..f29f87d2e4b 100644 --- a/src/core/lib/gprpp/time_util.h +++ b/src/core/util/time_util.h @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_TIME_UTIL_H -#define GRPC_SRC_CORE_LIB_GPRPP_TIME_UTIL_H +#ifndef GRPC_SRC_CORE_UTIL_TIME_UTIL_H +#define GRPC_SRC_CORE_UTIL_TIME_UTIL_H #include "absl/time/time.h" @@ -38,4 +38,4 @@ absl::Time ToAbslTime(gpr_timespec ts); } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_TIME_UTIL_H +#endif // GRPC_SRC_CORE_UTIL_TIME_UTIL_H diff --git a/src/core/lib/gprpp/type_list.h b/src/core/util/type_list.h similarity index 86% rename from src/core/lib/gprpp/type_list.h rename to src/core/util/type_list.h index 958a733ba70..c0a9161c087 100644 --- a/src/core/lib/gprpp/type_list.h +++ b/src/core/util/type_list.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_TYPE_LIST_H -#define GRPC_SRC_CORE_LIB_GPRPP_TYPE_LIST_H +#ifndef GRPC_SRC_CORE_UTIL_TYPE_LIST_H +#define GRPC_SRC_CORE_UTIL_TYPE_LIST_H namespace grpc_core { @@ -29,4 +29,4 @@ struct Typelist { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_TYPE_LIST_H +#endif // GRPC_SRC_CORE_UTIL_TYPE_LIST_H diff --git a/src/core/lib/gprpp/unique_type_name.h b/src/core/util/unique_type_name.h similarity index 94% rename from src/core/lib/gprpp/unique_type_name.h rename to src/core/util/unique_type_name.h index 2e71ab73f07..e64fbe33e03 100644 --- a/src/core/lib/gprpp/unique_type_name.h +++ b/src/core/util/unique_type_name.h @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_UNIQUE_TYPE_NAME_H -#define GRPC_SRC_CORE_LIB_GPRPP_UNIQUE_TYPE_NAME_H +#ifndef GRPC_SRC_CORE_UTIL_UNIQUE_TYPE_NAME_H +#define GRPC_SRC_CORE_UTIL_UNIQUE_TYPE_NAME_H #include @@ -101,4 +101,4 @@ class UniqueTypeName { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_UNIQUE_TYPE_NAME_H +#endif // GRPC_SRC_CORE_UTIL_UNIQUE_TYPE_NAME_H diff --git a/src/core/lib/gprpp/uuid_v4.cc b/src/core/util/uuid_v4.cc similarity index 96% rename from src/core/lib/gprpp/uuid_v4.cc rename to src/core/util/uuid_v4.cc index 23297a34c05..13781805d28 100644 --- a/src/core/lib/gprpp/uuid_v4.cc +++ b/src/core/util/uuid_v4.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/gprpp/uuid_v4.h" +#include "src/core/util/uuid_v4.h" #include "absl/strings/str_format.h" diff --git a/src/core/lib/gprpp/uuid_v4.h b/src/core/util/uuid_v4.h similarity index 87% rename from src/core/lib/gprpp/uuid_v4.h rename to src/core/util/uuid_v4.h index 32264005b75..671cd798303 100644 --- a/src/core/lib/gprpp/uuid_v4.h +++ b/src/core/util/uuid_v4.h @@ -16,8 +16,8 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_UUID_V4_H -#define GRPC_SRC_CORE_LIB_GPRPP_UUID_V4_H +#ifndef GRPC_SRC_CORE_UTIL_UUID_V4_H +#define GRPC_SRC_CORE_UTIL_UUID_V4_H #include @@ -33,4 +33,4 @@ std::string GenerateUUIDv4(uint64_t hi, uint64_t lo); } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_UUID_V4_H +#endif // GRPC_SRC_CORE_UTIL_UUID_V4_H diff --git a/src/core/lib/gprpp/validation_errors.cc b/src/core/util/validation_errors.cc similarity index 97% rename from src/core/lib/gprpp/validation_errors.cc rename to src/core/util/validation_errors.cc index 4cae4f814e4..f7085300b7e 100644 --- a/src/core/lib/gprpp/validation_errors.cc +++ b/src/core/util/validation_errors.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/validation_errors.h" +#include "src/core/util/validation_errors.h" #include diff --git a/src/core/lib/gprpp/validation_errors.h b/src/core/util/validation_errors.h similarity index 96% rename from src/core/lib/gprpp/validation_errors.h rename to src/core/util/validation_errors.h index 34a299b2ca8..eb7f4094aa0 100644 --- a/src/core/lib/gprpp/validation_errors.h +++ b/src/core/util/validation_errors.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_GPRPP_VALIDATION_ERRORS_H -#define GRPC_SRC_CORE_LIB_GPRPP_VALIDATION_ERRORS_H +#ifndef GRPC_SRC_CORE_UTIL_VALIDATION_ERRORS_H +#define GRPC_SRC_CORE_UTIL_VALIDATION_ERRORS_H #include @@ -142,4 +142,4 @@ class ValidationErrors { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_VALIDATION_ERRORS_H +#endif // GRPC_SRC_CORE_UTIL_VALIDATION_ERRORS_H diff --git a/src/core/util/windows/cpu.cc b/src/core/util/windows/cpu.cc index 94af1e419c6..7cadfb5b0ec 100644 --- a/src/core/util/windows/cpu.cc +++ b/src/core/util/windows/cpu.cc @@ -22,7 +22,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" unsigned gpr_cpu_num_cores(void) { SYSTEM_INFO si; diff --git a/src/core/lib/gprpp/windows/directory_reader.cc b/src/core/util/windows/directory_reader.cc similarity index 98% rename from src/core/lib/gprpp/windows/directory_reader.cc rename to src/core/util/windows/directory_reader.cc index 3d45ee6532d..bb7b92bd035 100644 --- a/src/core/lib/gprpp/windows/directory_reader.cc +++ b/src/core/util/windows/directory_reader.cc @@ -32,7 +32,7 @@ #include -#include "src/core/lib/gprpp/directory_reader.h" +#include "src/core/util/directory_reader.h" namespace grpc_core { namespace { diff --git a/src/core/lib/gprpp/windows/env.cc b/src/core/util/windows/env.cc similarity index 95% rename from src/core/lib/gprpp/windows/env.cc rename to src/core/util/windows/env.cc index 4390d202e01..4bbccb2cd34 100644 --- a/src/core/lib/gprpp/windows/env.cc +++ b/src/core/util/windows/env.cc @@ -24,8 +24,8 @@ #include -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/tchar.h" +#include "src/core/util/env.h" +#include "src/core/util/tchar.h" namespace grpc_core { diff --git a/src/core/util/windows/log.cc b/src/core/util/windows/log.cc index 722e4bd9a83..7a86fd8ee6c 100644 --- a/src/core/util/windows/log.cc +++ b/src/core/util/windows/log.cc @@ -29,8 +29,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/examine_stack.h" +#include "src/core/util/crash.h" +#include "src/core/util/examine_stack.h" #include "src/core/util/string.h" void gpr_log(const char* file, int line, gpr_log_severity severity, diff --git a/src/core/lib/gprpp/windows/stat.cc b/src/core/util/windows/stat.cc similarity index 92% rename from src/core/lib/gprpp/windows/stat.cc rename to src/core/util/windows/stat.cc index 3d2d42f814b..fa71b5a60ce 100644 --- a/src/core/lib/gprpp/windows/stat.cc +++ b/src/core/util/windows/stat.cc @@ -26,9 +26,9 @@ #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/stat.h" -#include "src/core/lib/gprpp/strerror.h" +#include "src/core/util/crash.h" +#include "src/core/util/stat.h" +#include "src/core/util/strerror.h" namespace grpc_core { diff --git a/src/core/util/windows/string_util.cc b/src/core/util/windows/string_util.cc index c39152e6037..8a0a40a3a6e 100644 --- a/src/core/util/windows/string_util.cc +++ b/src/core/util/windows/string_util.cc @@ -36,7 +36,7 @@ #include #include -#include "src/core/lib/gprpp/tchar.h" +#include "src/core/util/tchar.h" #include "src/core/util/string.h" char* gpr_format_message(int messageid) { diff --git a/src/core/util/windows/sync.cc b/src/core/util/windows/sync.cc index 800188bf29d..55ee88db625 100644 --- a/src/core/util/windows/sync.cc +++ b/src/core/util/windows/sync.cc @@ -29,7 +29,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" void gpr_mu_init(gpr_mu* mu) { InitializeCriticalSection(&mu->cs); diff --git a/src/core/lib/gprpp/windows/thd.cc b/src/core/util/windows/thd.cc similarity index 97% rename from src/core/lib/gprpp/windows/thd.cc rename to src/core/util/windows/thd.cc index b5c6368cf40..0206f5c8c6a 100644 --- a/src/core/lib/gprpp/windows/thd.cc +++ b/src/core/util/windows/thd.cc @@ -32,9 +32,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/crash.h" +#include "src/core/util/memory.h" +#include "src/core/util/thd.h" namespace { class ThreadInternalsWindows; diff --git a/src/core/util/windows/time.cc b/src/core/util/windows/time.cc index b80a4a5a14b..ef93790fee4 100644 --- a/src/core/util/windows/time.cc +++ b/src/core/util/windows/time.cc @@ -31,7 +31,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/util/time_precise.h" static LARGE_INTEGER g_start_time = []() { diff --git a/src/core/util/windows/tmpfile.cc b/src/core/util/windows/tmpfile.cc index cd3838bc4ee..df76e0b0725 100644 --- a/src/core/util/windows/tmpfile.cc +++ b/src/core/util/windows/tmpfile.cc @@ -29,8 +29,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/tchar.h" +#include "src/core/util/crash.h" +#include "src/core/util/tchar.h" #include "src/core/util/tmpfile.h" FILE* gpr_tmpfile(const char* prefix, char** tmp_filename_out) { diff --git a/src/core/lib/gprpp/work_serializer.cc b/src/core/util/work_serializer.cc similarity index 99% rename from src/core/lib/gprpp/work_serializer.cc rename to src/core/util/work_serializer.cc index 653aa8659cf..27cce840105 100644 --- a/src/core/lib/gprpp/work_serializer.cc +++ b/src/core/util/work_serializer.cc @@ -14,7 +14,7 @@ // limitations under the License. // -#include "src/core/lib/gprpp/work_serializer.h" +#include "src/core/util/work_serializer.h" #include @@ -36,10 +36,10 @@ #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/mpscq.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/sync.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" diff --git a/src/core/lib/gprpp/work_serializer.h b/src/core/util/work_serializer.h similarity index 94% rename from src/core/lib/gprpp/work_serializer.h rename to src/core/util/work_serializer.h index 677c97ad380..712e163b865 100644 --- a/src/core/lib/gprpp/work_serializer.h +++ b/src/core/util/work_serializer.h @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_WORK_SERIALIZER_H -#define GRPC_SRC_CORE_LIB_GPRPP_WORK_SERIALIZER_H +#ifndef GRPC_SRC_CORE_UTIL_WORK_SERIALIZER_H +#define GRPC_SRC_CORE_UTIL_WORK_SERIALIZER_H #include #include @@ -25,8 +25,8 @@ #include #include -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" namespace grpc_core { @@ -103,4 +103,4 @@ class ABSL_LOCKABLE WorkSerializer { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_WORK_SERIALIZER_H +#endif // GRPC_SRC_CORE_UTIL_WORK_SERIALIZER_H diff --git a/src/core/lib/gprpp/xxhash_inline.h b/src/core/util/xxhash_inline.h similarity index 86% rename from src/core/lib/gprpp/xxhash_inline.h rename to src/core/util/xxhash_inline.h index 6b12c711216..ea5565ac3b6 100644 --- a/src/core/lib/gprpp/xxhash_inline.h +++ b/src/core/util/xxhash_inline.h @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_XXHASH_INLINE_H -#define GRPC_SRC_CORE_LIB_GPRPP_XXHASH_INLINE_H +#ifndef GRPC_SRC_CORE_UTIL_XXHASH_INLINE_H +#define GRPC_SRC_CORE_UTIL_XXHASH_INLINE_H #include @@ -26,4 +26,4 @@ #define XXH_INLINE_ALL #include "xxhash.h" -#endif // GRPC_SRC_CORE_LIB_GPRPP_XXHASH_INLINE_H +#endif // GRPC_SRC_CORE_UTIL_XXHASH_INLINE_H diff --git a/src/core/xds/grpc/certificate_provider_store.h b/src/core/xds/grpc/certificate_provider_store.h index f2a3b944c94..11a9ca7aec1 100644 --- a/src/core/xds/grpc/certificate_provider_store.h +++ b/src/core/xds/grpc/certificate_provider_store.h @@ -29,11 +29,11 @@ #include #include -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/unique_type_name.h" -#include "src/core/lib/gprpp/validation_errors.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/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" 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 0306dbe4370..6b0428632b4 100644 --- a/src/core/xds/grpc/file_watcher_certificate_provider_factory.h +++ b/src/core/xds/grpc/file_watcher_certificate_provider_factory.h @@ -26,9 +26,9 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.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/certificate_provider/certificate_provider_factory.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" diff --git a/src/core/xds/grpc/xds_audit_logger_registry.cc b/src/core/xds/grpc/xds_audit_logger_registry.cc index 328849808ce..3545a2d470a 100644 --- a/src/core/xds/grpc/xds_audit_logger_registry.cc +++ b/src/core/xds/grpc/xds_audit_logger_registry.cc @@ -28,8 +28,8 @@ #include -#include "src/core/lib/gprpp/match.h" -#include "src/core/lib/gprpp/validation_errors.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" diff --git a/src/core/xds/grpc/xds_audit_logger_registry.h b/src/core/xds/grpc/xds_audit_logger_registry.h index 5e8ec0a2e5e..17b846e0eb6 100644 --- a/src/core/xds/grpc/xds_audit_logger_registry.h +++ b/src/core/xds/grpc/xds_audit_logger_registry.h @@ -25,7 +25,7 @@ #include -#include "src/core/lib/gprpp/validation_errors.h" +#include "src/core/util/validation_errors.h" #include "src/core/util/json/json.h" #include "src/core/xds/xds_client/xds_resource_type.h" diff --git a/src/core/xds/grpc/xds_bootstrap_grpc.cc b/src/core/xds/grpc/xds_bootstrap_grpc.cc index 9ab26b38238..d8b0d36f796 100644 --- a/src/core/xds/grpc/xds_bootstrap_grpc.cc +++ b/src/core/xds/grpc/xds_bootstrap_grpc.cc @@ -37,8 +37,8 @@ #include #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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/json/json.h" #include "src/core/util/json/json_object_loader.h" diff --git a/src/core/xds/grpc/xds_bootstrap_grpc.h b/src/core/xds/grpc/xds_bootstrap_grpc.h index 00c08f9e2e2..ffcba417e6e 100644 --- a/src/core/xds/grpc/xds_bootstrap_grpc.h +++ b/src/core/xds/grpc/xds_bootstrap_grpc.h @@ -29,8 +29,8 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/validation_errors.h" +#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" diff --git a/src/core/xds/grpc/xds_certificate_provider.h b/src/core/xds/grpc/xds_certificate_provider.h index c86f0b5fcd0..0d5602d96e7 100644 --- a/src/core/xds/grpc/xds_certificate_provider.h +++ b/src/core/xds/grpc/xds_certificate_provider.h @@ -31,9 +31,9 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/unique_type_name.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" diff --git a/src/core/xds/grpc/xds_client_grpc.cc b/src/core/xds/grpc/xds_client_grpc.cc index 6855e7fa6d8..c781e99fd08 100644 --- a/src/core/xds/grpc/xds_client_grpc.cc +++ b/src/core/xds/grpc/xds_client_grpc.cc @@ -43,13 +43,13 @@ #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/gprpp/debug_location.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/load_file.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/debug_location.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/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" diff --git a/src/core/xds/grpc/xds_client_grpc.h b/src/core/xds/grpc/xds_client_grpc.h index babfbf4bc37..94874449434 100644 --- a/src/core/xds/grpc/xds_client_grpc.h +++ b/src/core/xds/grpc/xds_client_grpc.h @@ -26,8 +26,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" diff --git a/src/core/xds/grpc/xds_cluster.cc b/src/core/xds/grpc/xds_cluster.cc index 0bad9c7b4d7..f7df3774c34 100644 --- a/src/core/xds/grpc/xds_cluster.cc +++ b/src/core/xds/grpc/xds_cluster.cc @@ -58,11 +58,11 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/match.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.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/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" diff --git a/src/core/xds/grpc/xds_cluster_specifier_plugin.h b/src/core/xds/grpc/xds_cluster_specifier_plugin.h index 8aa245fa125..37c6b36a22a 100644 --- a/src/core/xds/grpc/xds_cluster_specifier_plugin.h +++ b/src/core/xds/grpc/xds_cluster_specifier_plugin.h @@ -27,7 +27,7 @@ #include -#include "src/core/lib/gprpp/validation_errors.h" +#include "src/core/util/validation_errors.h" #include "src/core/util/json/json.h" #include "src/core/xds/grpc/xds_common_types.h" diff --git a/src/core/xds/grpc/xds_common_types.h b/src/core/xds/grpc/xds_common_types.h index 29433cf6952..e76ffc6bfdf 100644 --- a/src/core/xds/grpc/xds_common_types.h +++ b/src/core/xds/grpc/xds_common_types.h @@ -29,8 +29,8 @@ #include -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.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" diff --git a/src/core/xds/grpc/xds_endpoint.cc b/src/core/xds/grpc/xds_endpoint.cc index c689a57d515..76ef8daa8cf 100644 --- a/src/core/xds/grpc/xds_endpoint.cc +++ b/src/core/xds/grpc/xds_endpoint.cc @@ -47,8 +47,8 @@ #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/lib/gprpp/env.h" -#include "src/core/lib/gprpp/validation_errors.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/string.h" #include "src/core/xds/grpc/upb_utils.h" diff --git a/src/core/xds/grpc/xds_endpoint.h b/src/core/xds/grpc/xds_endpoint.h index 43de2349901..778ed925f3b 100644 --- a/src/core/xds/grpc/xds_endpoint.h +++ b/src/core/xds/grpc/xds_endpoint.h @@ -33,9 +33,9 @@ #include -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.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" diff --git a/src/core/xds/grpc/xds_http_fault_filter.cc b/src/core/xds/grpc/xds_http_fault_filter.cc index 48156bd8cc3..1136a94fb43 100644 --- a/src/core/xds/grpc/xds_http_fault_filter.cc +++ b/src/core/xds/grpc/xds_http_fault_filter.cc @@ -39,8 +39,8 @@ #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/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.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" diff --git a/src/core/xds/grpc/xds_http_fault_filter.h b/src/core/xds/grpc/xds_http_fault_filter.h index cd6dfd78691..ce24070d269 100644 --- a/src/core/xds/grpc/xds_http_fault_filter.h +++ b/src/core/xds/grpc/xds_http_fault_filter.h @@ -26,7 +26,7 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" -#include "src/core/lib/gprpp/validation_errors.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" #include "src/core/xds/xds_client/xds_resource_type.h" diff --git a/src/core/xds/grpc/xds_http_filters.h b/src/core/xds/grpc/xds_http_filters.h index b61690fd74d..7ff07f063fd 100644 --- a/src/core/xds/grpc/xds_http_filters.h +++ b/src/core/xds/grpc/xds_http_filters.h @@ -34,7 +34,7 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" -#include "src/core/lib/gprpp/validation_errors.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/xds/grpc/xds_common_types.h" diff --git a/src/core/xds/grpc/xds_http_rbac_filter.cc b/src/core/xds/grpc/xds_http_rbac_filter.cc index ee81008bd90..8f527204468 100644 --- a/src/core/xds/grpc/xds_http_rbac_filter.cc +++ b/src/core/xds/grpc/xds_http_rbac_filter.cc @@ -46,7 +46,7 @@ #include "src/core/ext/filters/rbac/rbac_filter.h" #include "src/core/ext/filters/rbac/rbac_service_config_parser.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/env.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/string.h" diff --git a/src/core/xds/grpc/xds_http_rbac_filter.h b/src/core/xds/grpc/xds_http_rbac_filter.h index f95fc5d8693..754ebfdc93b 100644 --- a/src/core/xds/grpc/xds_http_rbac_filter.h +++ b/src/core/xds/grpc/xds_http_rbac_filter.h @@ -26,7 +26,7 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" -#include "src/core/lib/gprpp/validation_errors.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" #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 698e1776361..3f0a821cb05 100644 --- a/src/core/xds/grpc/xds_http_stateful_session_filter.cc +++ b/src/core/xds/grpc/xds_http_stateful_session_filter.cc @@ -35,8 +35,8 @@ #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/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.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/xds/grpc/upb_utils.h" diff --git a/src/core/xds/grpc/xds_http_stateful_session_filter.h b/src/core/xds/grpc/xds_http_stateful_session_filter.h index b734b0fb135..f20cb343e88 100644 --- a/src/core/xds/grpc/xds_http_stateful_session_filter.h +++ b/src/core/xds/grpc/xds_http_stateful_session_filter.h @@ -26,7 +26,7 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" -#include "src/core/lib/gprpp/validation_errors.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" #include "src/core/xds/xds_client/xds_resource_type.h" diff --git a/src/core/xds/grpc/xds_lb_policy_registry.cc b/src/core/xds/grpc/xds_lb_policy_registry.cc index fa55b1997c5..1265bd562e6 100644 --- a/src/core/xds/grpc/xds_lb_policy_registry.cc +++ b/src/core/xds/grpc/xds_lb_policy_registry.cc @@ -36,8 +36,8 @@ #include #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.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" diff --git a/src/core/xds/grpc/xds_lb_policy_registry.h b/src/core/xds/grpc/xds_lb_policy_registry.h index f184b20a3d9..2c5eb002291 100644 --- a/src/core/xds/grpc/xds_lb_policy_registry.h +++ b/src/core/xds/grpc/xds_lb_policy_registry.h @@ -25,7 +25,7 @@ #include -#include "src/core/lib/gprpp/validation_errors.h" +#include "src/core/util/validation_errors.h" #include "src/core/util/json/json.h" #include "src/core/xds/xds_client/xds_resource_type.h" diff --git a/src/core/xds/grpc/xds_listener.cc b/src/core/xds/grpc/xds_listener.cc index 64a618251fd..0d43f5de7bf 100644 --- a/src/core/xds/grpc/xds_listener.cc +++ b/src/core/xds/grpc/xds_listener.cc @@ -50,9 +50,9 @@ #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/gprpp/host_port.h" -#include "src/core/lib/gprpp/match.h" -#include "src/core/lib/gprpp/validation_errors.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/xds/grpc/upb_utils.h" diff --git a/src/core/xds/grpc/xds_listener.h b/src/core/xds/grpc/xds_listener.h index ce5d1ca11a6..9e35e16aeff 100644 --- a/src/core/xds/grpc/xds_listener.h +++ b/src/core/xds/grpc/xds_listener.h @@ -36,7 +36,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_common_types.h" diff --git a/src/core/xds/grpc/xds_route_config.cc b/src/core/xds/grpc/xds_route_config.cc index 9813ff62f2e..da9c65e6c2c 100644 --- a/src/core/xds/grpc/xds_route_config.cc +++ b/src/core/xds/grpc/xds_route_config.cc @@ -61,10 +61,10 @@ #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/lib/gprpp/env.h" -#include "src/core/lib/gprpp/match.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.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/json/json.h" diff --git a/src/core/xds/grpc/xds_route_config.h b/src/core/xds/grpc/xds_route_config.h index 873adf16fc9..9573d9c63d4 100644 --- a/src/core/xds/grpc/xds_route_config.h +++ b/src/core/xds/grpc/xds_route_config.h @@ -36,8 +36,8 @@ #include #include "src/core/lib/channel/status_util.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.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" diff --git a/src/core/xds/grpc/xds_transport_grpc.cc b/src/core/xds/grpc/xds_transport_grpc.cc index 3f2716bcdd0..fb4cd776e13 100644 --- a/src/core/xds/grpc/xds_transport_grpc.cc +++ b/src/core/xds/grpc/xds_transport_grpc.cc @@ -43,10 +43,10 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.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" diff --git a/src/core/xds/grpc/xds_transport_grpc.h b/src/core/xds/grpc/xds_transport_grpc.h index d0c08aa3cd9..aabd080aebf 100644 --- a/src/core/xds/grpc/xds_transport_grpc.h +++ b/src/core/xds/grpc/xds_transport_grpc.h @@ -29,8 +29,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" diff --git a/src/core/xds/xds_client/xds_api.h b/src/core/xds/xds_client/xds_api.h index 990d9ed7718..7011174f716 100644 --- a/src/core/xds/xds_client/xds_api.h +++ b/src/core/xds/xds_client/xds_api.h @@ -35,8 +35,8 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.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_bootstrap.cc b/src/core/xds/xds_client/xds_bootstrap.cc index 65b70778ef3..b6f5edfc9e2 100644 --- a/src/core/xds/xds_client/xds_bootstrap.cc +++ b/src/core/xds/xds_client/xds_bootstrap.cc @@ -20,7 +20,7 @@ #include -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "src/core/util/string.h" namespace grpc_core { diff --git a/src/core/xds/xds_client/xds_client.cc b/src/core/xds/xds_client/xds_client.cc index ca501a7b333..5290d8affc9 100644 --- a/src/core/xds/xds_client/xds_client.cc +++ b/src/core/xds/xds_client/xds_client.cc @@ -47,10 +47,10 @@ #include #include "src/core/util/backoff.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.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" diff --git a/src/core/xds/xds_client/xds_client.h b/src/core/xds/xds_client/xds_client.h index b69112fef3a..b280c1fe566 100644 --- a/src/core/xds/xds_client/xds_client.h +++ b/src/core/xds/xds_client/xds_client.h @@ -34,13 +34,13 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/dual_ref_counted.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/work_serializer.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/work_serializer.h" #include "src/core/util/uri.h" #include "src/core/xds/xds_client/xds_api.h" #include "src/core/xds/xds_client/xds_bootstrap.h" diff --git a/src/core/xds/xds_client/xds_client_stats.cc b/src/core/xds/xds_client/xds_client_stats.cc index fa1cfe1087e..52f8818a511 100644 --- a/src/core/xds/xds_client/xds_client_stats.cc +++ b/src/core/xds/xds_client/xds_client_stats.cc @@ -22,7 +22,7 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/debug_location.h" +#include "src/core/util/debug_location.h" #include "src/core/xds/xds_client/xds_client.h" namespace grpc_core { diff --git a/src/core/xds/xds_client/xds_client_stats.h b/src/core/xds/xds_client/xds_client_stats.h index 291a9e25718..ae8db5df6bf 100644 --- a/src/core/xds/xds_client/xds_client_stats.h +++ b/src/core/xds/xds_client/xds_client_stats.h @@ -31,10 +31,10 @@ #include -#include "src/core/lib/gprpp/per_cpu.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.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" diff --git a/src/core/xds/xds_client/xds_resource_type_impl.h b/src/core/xds/xds_client/xds_resource_type_impl.h index dd47ccb0b09..a927f796b5e 100644 --- a/src/core/xds/xds_client/xds_resource_type_impl.h +++ b/src/core/xds/xds_client/xds_resource_type_impl.h @@ -23,7 +23,7 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/xds/xds_client/xds_client.h" #include "src/core/xds/xds_client/xds_resource_type.h" diff --git a/src/core/xds/xds_client/xds_transport.h b/src/core/xds/xds_client/xds_transport.h index 43b19d63035..0bff4a86dbc 100644 --- a/src/core/xds/xds_client/xds_transport.h +++ b/src/core/xds/xds_client/xds_transport.h @@ -26,7 +26,7 @@ #include -#include "src/core/lib/gprpp/orphanable.h" +#include "src/core/util/orphanable.h" #include "src/core/xds/xds_client/xds_bootstrap.h" namespace grpc_core { diff --git a/src/cpp/client/client_context.cc b/src/cpp/client/client_context.cc index 76bee4cb6b8..84a3bb5c1e0 100644 --- a/src/cpp/client/client_context.cc +++ b/src/cpp/client/client_context.cc @@ -42,7 +42,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc { diff --git a/src/cpp/client/client_interceptor.cc b/src/cpp/client/client_interceptor.cc index dfa30d6fe41..9c1a3f27b7a 100644 --- a/src/cpp/client/client_interceptor.cc +++ b/src/cpp/client/client_interceptor.cc @@ -18,7 +18,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc { diff --git a/src/cpp/client/client_stats_interceptor.cc b/src/cpp/client/client_stats_interceptor.cc index 84c017ddbcf..ea2828fc9db 100644 --- a/src/cpp/client/client_stats_interceptor.cc +++ b/src/cpp/client/client_stats_interceptor.cc @@ -18,7 +18,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc { namespace internal { diff --git a/src/cpp/client/secure_credentials.cc b/src/cpp/client/secure_credentials.cc index b41f307daba..643e2a4ab1b 100644 --- a/src/cpp/client/secure_credentials.cc +++ b/src/cpp/client/secure_credentials.cc @@ -47,8 +47,8 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/load_file.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/json/json.h" #include "src/core/util/json/json_reader.h" diff --git a/src/cpp/common/alarm.cc b/src/cpp/common/alarm.cc index 918922eb235..ee37668c7e5 100644 --- a/src/cpp/common/alarm.cc +++ b/src/cpp/common/alarm.cc @@ -34,7 +34,7 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/time.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" diff --git a/src/cpp/common/completion_queue_cc.cc b/src/cpp/common/completion_queue_cc.cc index b2c3463c053..88396bfbbc6 100644 --- a/src/cpp/common/completion_queue_cc.cc +++ b/src/cpp/common/completion_queue_cc.cc @@ -29,8 +29,8 @@ #include #include -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/sync.h" +#include "src/core/util/thd.h" #include "src/core/util/useful.h" namespace grpc { diff --git a/src/cpp/common/secure_auth_context.h b/src/cpp/common/secure_auth_context.h index dabe8ed9c81..1b82e21affe 100644 --- a/src/cpp/common/secure_auth_context.h +++ b/src/cpp/common/secure_auth_context.h @@ -26,7 +26,7 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/security/context/security_context.h" namespace grpc { diff --git a/src/cpp/common/secure_create_auth_context.cc b/src/cpp/common/secure_create_auth_context.cc index 4658321520f..c812a6a9a28 100644 --- a/src/cpp/common/secure_create_auth_context.cc +++ b/src/cpp/common/secure_create_auth_context.cc @@ -21,7 +21,7 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/security/context/security_context.h" #include "src/cpp/common/secure_auth_context.h" diff --git a/src/cpp/common/validate_service_config.cc b/src/cpp/common/validate_service_config.cc index bdd92f60e1a..ff515088fdd 100644 --- a/src/cpp/common/validate_service_config.cc +++ b/src/cpp/common/validate_service_config.cc @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" diff --git a/src/cpp/ext/csm/metadata_exchange.cc b/src/cpp/ext/csm/metadata_exchange.cc index 21abe5029eb..14320ed4f5c 100644 --- a/src/cpp/ext/csm/metadata_exchange.cc +++ b/src/cpp/ext/csm/metadata_exchange.cc @@ -39,8 +39,8 @@ #include #include -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/load_file.h" +#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" diff --git a/src/cpp/ext/filters/census/client_filter.cc b/src/cpp/ext/filters/census/client_filter.cc index efb191da95d..e68032b5be6 100644 --- a/src/cpp/ext/filters/census/client_filter.cc +++ b/src/cpp/ext/filters/census/client_filter.cc @@ -54,7 +54,7 @@ #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/lib/gprpp/sync.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" 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 690677b5d94..51706df2e51 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,7 @@ #include #include "src/core/lib/channel/context.h" -#include "src/core/lib/gprpp/sync.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" diff --git a/src/cpp/ext/gcp/environment_autodetect.cc b/src/cpp/ext/gcp/environment_autodetect.cc index b4963ffa7ea..f7cf590b125 100644 --- a/src/cpp/ext/gcp/environment_autodetect.cc +++ b/src/cpp/ext/gcp/environment_autodetect.cc @@ -36,12 +36,12 @@ #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/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/load_file.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.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" diff --git a/src/cpp/ext/gcp/environment_autodetect.h b/src/cpp/ext/gcp/environment_autodetect.h index fb15ea1d06d..b45eb9ed2c1 100644 --- a/src/cpp/ext/gcp/environment_autodetect.h +++ b/src/cpp/ext/gcp/environment_autodetect.h @@ -29,7 +29,7 @@ #include #include -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" namespace grpc { diff --git a/src/cpp/ext/gcp/observability.cc b/src/cpp/ext/gcp/observability.cc index 2c683e20cc8..ef508c89dd9 100644 --- a/src/cpp/ext/gcp/observability.cc +++ b/src/cpp/ext/gcp/observability.cc @@ -47,8 +47,8 @@ #include #include "src/core/ext/filters/logging/logging_filter.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/notification.h" +#include "src/core/util/crash.h" +#include "src/core/util/notification.h" #include "src/cpp/client/client_stats_interceptor.h" #include "src/cpp/ext/filters/census/client_filter.h" #include "src/cpp/ext/filters/census/grpc_plugin.h" diff --git a/src/cpp/ext/gcp/observability_config.cc b/src/cpp/ext/gcp/observability_config.cc index 977ced0671f..1eee36dca56 100644 --- a/src/cpp/ext/gcp/observability_config.cc +++ b/src/cpp/ext/gcp/observability_config.cc @@ -32,10 +32,10 @@ #include #include -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/load_file.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/validation_errors.h" +#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" diff --git a/src/cpp/ext/gcp/observability_config.h b/src/cpp/ext/gcp/observability_config.h index 8854f860c95..db1dc7c634b 100644 --- a/src/cpp/ext/gcp/observability_config.h +++ b/src/cpp/ext/gcp/observability_config.h @@ -29,7 +29,7 @@ #include -#include "src/core/lib/gprpp/validation_errors.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" diff --git a/src/cpp/ext/gcp/observability_logging_sink.cc b/src/cpp/ext/gcp/observability_logging_sink.cc index 27cbdb78c7d..af90090e6cd 100644 --- a/src/cpp/ext/gcp/observability_logging_sink.cc +++ b/src/cpp/ext/gcp/observability_logging_sink.cc @@ -43,9 +43,9 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/uuid_v4.h" +#include "src/core/util/env.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" diff --git a/src/cpp/ext/gcp/observability_logging_sink.h b/src/cpp/ext/gcp/observability_logging_sink.h index eea8d6196a7..f4703721f3d 100644 --- a/src/cpp/ext/gcp/observability_logging_sink.h +++ b/src/cpp/ext/gcp/observability_logging_sink.h @@ -35,7 +35,7 @@ #include #include "src/core/ext/filters/logging/logging_sink.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "src/cpp/ext/gcp/environment_autodetect.h" #include "src/cpp/ext/gcp/observability_config.h" diff --git a/src/cpp/ext/otel/otel_client_call_tracer.cc b/src/cpp/ext/otel/otel_client_call_tracer.cc index 84123c0444e..91fb473188b 100644 --- a/src/cpp/ext/otel/otel_client_call_tracer.cc +++ b/src/cpp/ext/otel/otel_client_call_tracer.cc @@ -48,7 +48,7 @@ #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/gprpp/sync.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" diff --git a/src/cpp/ext/otel/otel_client_call_tracer.h b/src/cpp/ext/otel/otel_client_call_tracer.h index 366c83064f1..302de1df4c8 100644 --- a/src/cpp/ext/otel/otel_client_call_tracer.h +++ b/src/cpp/ext/otel/otel_client_call_tracer.h @@ -32,7 +32,7 @@ #include #include -#include "src/core/lib/gprpp/sync.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" diff --git a/src/cpp/ext/otel/otel_plugin.cc b/src/cpp/ext/otel/otel_plugin.cc index 18cee7af41f..f911052fff6 100644 --- a/src/cpp/ext/otel/otel_plugin.cc +++ b/src/cpp/ext/otel/otel_plugin.cc @@ -38,7 +38,7 @@ #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/lib/gprpp/match.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/cpp/ext/otel/key_value_iterable.h" diff --git a/src/cpp/server/external_connection_acceptor_impl.h b/src/cpp/server/external_connection_acceptor_impl.h index 1d32263e604..36176b2e7ea 100644 --- a/src/cpp/server/external_connection_acceptor_impl.h +++ b/src/cpp/server/external_connection_acceptor_impl.h @@ -26,7 +26,7 @@ #include #include -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "src/core/lib/iomgr/tcp_server.h" namespace grpc { diff --git a/src/cpp/server/health/default_health_check_service.h b/src/cpp/server/health/default_health_check_service.h index dc1b18979a4..042b057b08f 100644 --- a/src/cpp/server/health/default_health_check_service.h +++ b/src/cpp/server/health/default_health_check_service.h @@ -35,8 +35,8 @@ #include #include -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc { diff --git a/src/cpp/server/load_reporter/get_cpu_stats_unsupported.cc b/src/cpp/server/load_reporter/get_cpu_stats_unsupported.cc index 2744c66b25e..debc4a556b6 100644 --- a/src/cpp/server/load_reporter/get_cpu_stats_unsupported.cc +++ b/src/cpp/server/load_reporter/get_cpu_stats_unsupported.cc @@ -22,7 +22,7 @@ #include "absl/log/log.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/cpp/server/load_reporter/get_cpu_stats.h" namespace grpc { diff --git a/src/cpp/server/load_reporter/load_reporter.h b/src/cpp/server/load_reporter/load_reporter.h index 7268d4e3f0d..4b08ca05bfc 100644 --- a/src/cpp/server/load_reporter/load_reporter.h +++ b/src/cpp/server/load_reporter/load_reporter.h @@ -38,7 +38,7 @@ #include -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "src/cpp/server/load_reporter/load_data_store.h" #include "src/proto/grpc/lb/v1/load_reporter.grpc.pb.h" diff --git a/src/cpp/server/load_reporter/load_reporter_async_service_impl.h b/src/cpp/server/load_reporter/load_reporter_async_service_impl.h index c348e918e54..4cace4fb78d 100644 --- a/src/cpp/server/load_reporter/load_reporter_async_service_impl.h +++ b/src/cpp/server/load_reporter/load_reporter_async_service_impl.h @@ -36,8 +36,8 @@ #include #include -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/sync.h" +#include "src/core/util/thd.h" #include "src/cpp/server/load_reporter/load_reporter.h" #include "src/proto/grpc/lb/v1/load_reporter.grpc.pb.h" diff --git a/src/cpp/server/orca/orca_service.cc b/src/cpp/server/orca/orca_service.cc index 05a86fdfd08..0e0d32f0bbb 100644 --- a/src/cpp/server/orca/orca_service.cc +++ b/src/cpp/server/orca/orca_service.cc @@ -46,10 +46,10 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.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" diff --git a/src/cpp/server/server_cc.cc b/src/cpp/server/server_cc.cc index 099b8ca2141..4474d448ecb 100644 --- a/src/cpp/server/server_cc.cc +++ b/src/cpp/server/server_cc.cc @@ -69,7 +69,7 @@ #include #include "src/core/ext/transport/inproc/inproc_transport.h" -#include "src/core/lib/gprpp/manual_constructor.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" diff --git a/src/cpp/server/server_context.cc b/src/cpp/server/server_context.cc index 69d2f55237f..093e044e6de 100644 --- a/src/cpp/server/server_context.cc +++ b/src/cpp/server/server_context.cc @@ -57,9 +57,9 @@ #include #include "src/core/lib/channel/context.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/sync.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" diff --git a/src/cpp/server/server_credentials.cc b/src/cpp/server/server_credentials.cc index a3323b9b273..efb432107de 100644 --- a/src/cpp/server/server_credentials.cc +++ b/src/cpp/server/server_credentials.cc @@ -14,7 +14,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc { diff --git a/src/cpp/thread_manager/thread_manager.cc b/src/cpp/thread_manager/thread_manager.cc index 1fd3ee20bc8..02943266c32 100644 --- a/src/cpp/thread_manager/thread_manager.cc +++ b/src/cpp/thread_manager/thread_manager.cc @@ -24,9 +24,9 @@ #include "absl/log/log.h" #include "absl/strings/str_format.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/thd.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 c15eaa2be86..e9fbefaa607 100644 --- a/src/cpp/thread_manager/thread_manager.h +++ b/src/cpp/thread_manager/thread_manager.h @@ -21,8 +21,8 @@ #include -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/thd.h" +#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" diff --git a/src/objective-c/tests/CronetTests/CronetUnitTests.mm b/src/objective-c/tests/CronetTests/CronetUnitTests.mm index ba913160525..91dd206ec54 100644 --- a/src/objective-c/tests/CronetTests/CronetUnitTests.mm +++ b/src/objective-c/tests/CronetTests/CronetUnitTests.mm @@ -31,8 +31,8 @@ #import #import "src/core/lib/channel/channel_args.h" -#import "src/core/lib/gprpp/env.h" -#import "src/core/lib/gprpp/host_port.h" +#import "src/core/util/env.h" +#import "src/core/util/host_port.h" #import "src/core/util/string.h" #import "src/core/util/tmpfile.h" #import "test/core/end2end/data/ssl_test_data.h" diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 96f3a36606c..6c100a705d6 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -487,33 +487,33 @@ 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/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/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', diff --git a/src/python/grpcio_observability/observability_lib_deps.py b/src/python/grpcio_observability/observability_lib_deps.py index 9ae5ba98c89..a3d52abc550 100644 --- a/src/python/grpcio_observability/observability_lib_deps.py +++ b/src/python/grpcio_observability/observability_lib_deps.py @@ -20,22 +20,22 @@ 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/lib/gprpp/crash.cc', - 'grpc_root/src/core/lib/gprpp/examine_stack.cc', - 'grpc_root/src/core/lib/gprpp/fork.cc', - 'grpc_root/src/core/lib/gprpp/host_port.cc', - 'grpc_root/src/core/lib/gprpp/linux/env.cc', - 'grpc_root/src/core/lib/gprpp/mpscq.cc', - 'grpc_root/src/core/lib/gprpp/posix/env.cc', - 'grpc_root/src/core/lib/gprpp/posix/stat.cc', - 'grpc_root/src/core/lib/gprpp/posix/thd.cc', - 'grpc_root/src/core/lib/gprpp/ref_counted_string.cc', - 'grpc_root/src/core/lib/gprpp/strerror.cc', - 'grpc_root/src/core/lib/gprpp/tchar.cc', - 'grpc_root/src/core/lib/gprpp/time_util.cc', - 'grpc_root/src/core/lib/gprpp/windows/env.cc', - 'grpc_root/src/core/lib/gprpp/windows/stat.cc', - 'grpc_root/src/core/lib/gprpp/windows/thd.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', 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 311a11ab278..fd78e274654 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,8 +37,8 @@ #include #include "src/core/lib/address_utils/parse_address.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/host_port.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" diff --git a/test/core/backoff/backoff_test.cc b/test/core/backoff/backoff_test.cc index aa253155b1e..fefd91a511f 100644 --- a/test/core/backoff/backoff_test.cc +++ b/test/core/backoff/backoff_test.cc @@ -25,7 +25,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/bad_client/bad_client.cc b/test/core/bad_client/bad_client.cc index f47a79cccc3..ca0621d98f0 100644 --- a/test/core/bad_client/bad_client.cc +++ b/test/core/bad_client/bad_client.cc @@ -35,7 +35,7 @@ #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/lib/gprpp/thd.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" diff --git a/test/core/bad_client/tests/duplicate_header.cc b/test/core/bad_client/tests/duplicate_header.cc index 12c5dfd58cb..a76285b07a6 100644 --- a/test/core/bad_client/tests/duplicate_header.cc +++ b/test/core/bad_client/tests/duplicate_header.cc @@ -25,7 +25,7 @@ #include #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/bad_client/bad_client.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 d3d69c8c068..e58be9eca14 100644 --- a/test/core/bad_connection/close_fd_test.cc +++ b/test/core/bad_connection/close_fd_test.cc @@ -36,7 +36,7 @@ #include "src/core/channelz/channelz.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" @@ -56,7 +56,7 @@ #include #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" -#include "src/core/lib/gprpp/crash.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" diff --git a/test/core/bad_ssl/bad_ssl_test.cc b/test/core/bad_ssl/bad_ssl_test.cc index ade42a80c68..0ef363e01ff 100644 --- a/test/core/bad_ssl/bad_ssl_test.cc +++ b/test/core/bad_ssl/bad_ssl_test.cc @@ -35,8 +35,8 @@ #include #include -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/host_port.h" +#include "src/core/util/env.h" +#include "src/core/util/host_port.h" #include "src/core/util/subprocess.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/port.h" diff --git a/test/core/call/yodel/fuzzer_main.cc b/test/core/call/yodel/fuzzer_main.cc index 8eb9502a963..eb70872dcc8 100644 --- a/test/core/call/yodel/fuzzer_main.cc +++ b/test/core/call/yodel/fuzzer_main.cc @@ -24,7 +24,7 @@ #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/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "src/libfuzzer/libfuzzer_macro.h" #include "test/core/call/yodel/fuzzer.pb.h" #include "test/core/call/yodel/yodel_test.h" diff --git a/test/core/call/yodel/yodel_test.h b/test/core/call/yodel/yodel_test.h index 75b9b96a997..b554d8137f2 100644 --- a/test/core/call/yodel/yodel_test.h +++ b/test/core/call/yodel/yodel_test.h @@ -23,7 +23,7 @@ #include -#include "src/core/lib/gprpp/debug_location.h" +#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" diff --git a/test/core/channel/call_finalization_test.cc b/test/core/channel/call_finalization_test.cc index 2539d753ac3..a732975f4f8 100644 --- a/test/core/channel/call_finalization_test.cc +++ b/test/core/channel/call_finalization_test.cc @@ -22,7 +22,7 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#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 "test/core/promise/test_context.h" diff --git a/test/core/channel/channel_args_test.cc b/test/core/channel/channel_args_test.cc index 09f65577f0e..f4a77850c44 100644 --- a/test/core/channel/channel_args_test.cc +++ b/test/core/channel/channel_args_test.cc @@ -30,9 +30,9 @@ #include #include -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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 a07dbf148b6..ebd142d1ff3 100644 --- a/test/core/channel/channel_stack_test.cc +++ b/test/core/channel/channel_stack_test.cc @@ -27,7 +27,7 @@ #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/lib/gprpp/status_helper.h" +#include "src/core/util/status_helper.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/channel/server_call_tracer_factory_test.cc b/test/core/channel/server_call_tracer_factory_test.cc index fd4b2bac8d9..225f6f8007b 100644 --- a/test/core/channel/server_call_tracer_factory_test.cc +++ b/test/core/channel/server_call_tracer_factory_test.cc @@ -17,7 +17,7 @@ #include "gtest/gtest.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/telemetry/call_tracer.h" diff --git a/test/core/channelz/channelz_test.cc b/test/core/channelz/channelz_test.cc index 06d11c08b73..58d7fbc19be 100644 --- a/test/core/channelz/channelz_test.cc +++ b/test/core/channelz/channelz_test.cc @@ -42,7 +42,7 @@ #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/lib/gprpp/notification.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" 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 e0c108fdb8d..90d5a9688fc 100644 --- a/test/core/client_channel/client_channel_service_config_test.cc +++ b/test/core/client_channel/client_channel_service_config_test.cc @@ -25,7 +25,7 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/time.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" diff --git a/test/core/client_channel/retry_service_config_test.cc b/test/core/client_channel/retry_service_config_test.cc index 34f41a5da9a..a4fd1e61237 100644 --- a/test/core/client_channel/retry_service_config_test.cc +++ b/test/core/client_channel/retry_service_config_test.cc @@ -27,8 +27,8 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.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" diff --git a/test/core/config/load_config_test.cc b/test/core/config/load_config_test.cc index 7e136c0f7d7..7d9ac207163 100644 --- a/test/core/config/load_config_test.cc +++ b/test/core/config/load_config_test.cc @@ -17,7 +17,7 @@ #include "absl/flags/flag.h" #include "gtest/gtest.h" -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" ABSL_FLAG(std::vector, comma_separated_strings, {}, ""); diff --git a/test/core/end2end/bad_server_response_test.cc b/test/core/end2end/bad_server_response_test.cc index 03a7e937a9c..74f775d7b22 100644 --- a/test/core/end2end/bad_server_response_test.cc +++ b/test/core/end2end/bad_server_response_test.cc @@ -40,10 +40,10 @@ #include #include "src/core/lib/event_engine/shim.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/thd.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" diff --git a/test/core/end2end/connection_refused_test.cc b/test/core/end2end/connection_refused_test.cc index 1e3414b8875..408bea360b4 100644 --- a/test/core/end2end/connection_refused_test.cc +++ b/test/core/end2end/connection_refused_test.cc @@ -33,7 +33,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/host_port.h" +#include "src/core/util/host_port.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/port.h" diff --git a/test/core/end2end/cq_verifier.cc b/test/core/end2end/cq_verifier.cc index c0bc5b66f97..4665e4e6ccb 100644 --- a/test/core/end2end/cq_verifier.cc +++ b/test/core/end2end/cq_verifier.cc @@ -45,9 +45,9 @@ #include #include "src/core/lib/compression/message_compress.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/match.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" diff --git a/test/core/end2end/cq_verifier.h b/test/core/end2end/cq_verifier.h index ea2280e9051..d86d3248958 100644 --- a/test/core/end2end/cq_verifier.h +++ b/test/core/end2end/cq_verifier.h @@ -34,8 +34,8 @@ #include #include -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/test/core/end2end/dualstack_socket_test.cc b/test/core/end2end/dualstack_socket_test.cc index 33ab2091c1b..595b0bd4deb 100644 --- a/test/core/end2end/dualstack_socket_test.cc +++ b/test/core/end2end/dualstack_socket_test.cc @@ -50,7 +50,7 @@ #include #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/gprpp/host_port.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" diff --git a/test/core/end2end/end2end_test_fuzzer.cc b/test/core/end2end/end2end_test_fuzzer.cc index 0df0feda71c..5d772d65ed4 100644 --- a/test/core/end2end/end2end_test_fuzzer.cc +++ b/test/core/end2end/end2end_test_fuzzer.cc @@ -34,7 +34,7 @@ #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/lib/gprpp/env.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" diff --git a/test/core/end2end/end2end_test_suites.cc b/test/core/end2end/end2end_test_suites.cc index 35bd844a603..89d5fa3a64c 100644 --- a/test/core/end2end/end2end_test_suites.cc +++ b/test/core/end2end/end2end_test_suites.cc @@ -50,10 +50,10 @@ #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/lib/gprpp/env.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/no_destruct.h" -#include "src/core/lib/gprpp/sync.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" diff --git a/test/core/end2end/end2end_tests.cc b/test/core/end2end/end2end_tests.cc index 51505c91fd5..5938cc9c2c9 100644 --- a/test/core/end2end/end2end_tests.cc +++ b/test/core/end2end/end2end_tests.cc @@ -34,7 +34,7 @@ #include "src/core/lib/compression/message_compress.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/no_destruct.h" +#include "src/core/util/no_destruct.h" #include "test/core/end2end/cq_verifier.h" namespace grpc_core { diff --git a/test/core/end2end/end2end_tests.h b/test/core/end2end/end2end_tests.h index 4575d432594..b808d4b8a99 100644 --- a/test/core/end2end/end2end_tests.h +++ b/test/core/end2end/end2end_tests.h @@ -54,9 +54,9 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/bitset.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/time.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" diff --git a/test/core/end2end/fixtures/http_proxy_fixture.cc b/test/core/end2end/fixtures/http_proxy_fixture.cc index ac9acc9ffb4..75929a6c03f 100644 --- a/test/core/end2end/fixtures/http_proxy_fixture.cc +++ b/test/core/end2end/fixtures/http_proxy_fixture.cc @@ -46,11 +46,11 @@ #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/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/thd.h" -#include "src/core/lib/gprpp/time.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" diff --git a/test/core/end2end/fixtures/proxy.cc b/test/core/end2end/fixtures/proxy.cc index febdb809838..e5f2c132052 100644 --- a/test/core/end2end/fixtures/proxy.cc +++ b/test/core/end2end/fixtures/proxy.cc @@ -36,9 +36,9 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/thd.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" diff --git a/test/core/end2end/fixtures/secure_fixture.h b/test/core/end2end/fixtures/secure_fixture.h index d0a8448ae72..e5ef8c78726 100644 --- a/test/core/end2end/fixtures/secure_fixture.h +++ b/test/core/end2end/fixtures/secure_fixture.h @@ -27,7 +27,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/host_port.h" +#include "src/core/util/host_port.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/test_util/port.h" diff --git a/test/core/end2end/fixtures/sockpair_fixture.h b/test/core/end2end/fixtures/sockpair_fixture.h index 0d35b3ea64f..9b40ad304b5 100644 --- a/test/core/end2end/fixtures/sockpair_fixture.h +++ b/test/core/end2end/fixtures/sockpair_fixture.h @@ -33,7 +33,7 @@ #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/lib/gprpp/ref_counted_ptr.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" diff --git a/test/core/end2end/fuzzers/api_fuzzer.cc b/test/core/end2end/fuzzers/api_fuzzer.cc index b3fde2b9954..453d5d583ce 100644 --- a/test/core/end2end/fuzzers/api_fuzzer.cc +++ b/test/core/end2end/fuzzers/api_fuzzer.cc @@ -50,10 +50,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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.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" diff --git a/test/core/end2end/fuzzers/client_fuzzer.cc b/test/core/end2end/fuzzers/client_fuzzer.cc index defc274c1f3..80bf05b193d 100644 --- a/test/core/end2end/fuzzers/client_fuzzer.cc +++ b/test/core/end2end/fuzzers/client_fuzzer.cc @@ -28,8 +28,8 @@ #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/lib/gprpp/env.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" diff --git a/test/core/end2end/fuzzers/fuzzing_common.cc b/test/core/end2end/fuzzers/fuzzing_common.cc index 2597694bf3b..af3af8eb97c 100644 --- a/test/core/end2end/fuzzers/fuzzing_common.cc +++ b/test/core/end2end/fuzzers/fuzzing_common.cc @@ -38,7 +38,7 @@ #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/config.h" -#include "src/core/lib/gprpp/crash.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" diff --git a/test/core/end2end/fuzzers/fuzzing_common.h b/test/core/end2end/fuzzers/fuzzing_common.h index 51d63abb3d3..2a8169aea4f 100644 --- a/test/core/end2end/fuzzers/fuzzing_common.h +++ b/test/core/end2end/fuzzers/fuzzing_common.h @@ -34,8 +34,8 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.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" diff --git a/test/core/end2end/fuzzers/network_input.h b/test/core/end2end/fuzzers/network_input.h index 1ac51d6f62b..237203f6d98 100644 --- a/test/core/end2end/fuzzers/network_input.h +++ b/test/core/end2end/fuzzers/network_input.h @@ -15,7 +15,7 @@ #ifndef GRPC_TEST_CORE_END2END_FUZZERS_NETWORK_INPUT_H #define GRPC_TEST_CORE_END2END_FUZZERS_NETWORK_INPUT_H -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/lib/iomgr/endpoint.h" #include "test/core/end2end/fuzzers/fuzzer_input.pb.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" diff --git a/test/core/end2end/fuzzers/server_fuzzer.cc b/test/core/end2end/fuzzers/server_fuzzer.cc index c151c8b30b8..5ba4a189b42 100644 --- a/test/core/end2end/fuzzers/server_fuzzer.cc +++ b/test/core/end2end/fuzzers/server_fuzzer.cc @@ -24,7 +24,7 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/experiments/config.h" -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "src/core/lib/iomgr/exec_ctx.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/goaway_server_test.cc b/test/core/end2end/goaway_server_test.cc index edf58074223..9f5bb8f002f 100644 --- a/test/core/end2end/goaway_server_test.cc +++ b/test/core/end2end/goaway_server_test.cc @@ -47,8 +47,8 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/time.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" diff --git a/test/core/end2end/h2_ssl_session_reuse_test.cc b/test/core/end2end/h2_ssl_session_reuse_test.cc index e419096114d..9def9b0bd67 100644 --- a/test/core/end2end/h2_ssl_session_reuse_test.cc +++ b/test/core/end2end/h2_ssl_session_reuse_test.cc @@ -38,7 +38,7 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/host_port.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/useful.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 e3982feaa4f..b0dc7985879 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,7 +38,7 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/host_port.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/useful.h" diff --git a/test/core/end2end/invalid_call_argument_test.cc b/test/core/end2end/invalid_call_argument_test.cc index 1f086c3f98a..3d6b6ca268c 100644 --- a/test/core/end2end/invalid_call_argument_test.cc +++ b/test/core/end2end/invalid_call_argument_test.cc @@ -36,7 +36,7 @@ #include #include -#include "src/core/lib/gprpp/host_port.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/no_server_test.cc b/test/core/end2end/no_server_test.cc index 4b14f0a1a72..df8e95b3a4f 100644 --- a/test/core/end2end/no_server_test.cc +++ b/test/core/end2end/no_server_test.cc @@ -35,7 +35,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" diff --git a/test/core/end2end/tests/bad_ping.cc b/test/core/end2end/tests/bad_ping.cc index 51a799549b2..0fc08fc07d2 100644 --- a/test/core/end2end/tests/bad_ping.cc +++ b/test/core/end2end/tests/bad_ping.cc @@ -24,7 +24,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #define MAX_PING_STRIKES 2 diff --git a/test/core/end2end/tests/binary_metadata.cc b/test/core/end2end/tests/binary_metadata.cc index 4e4123fd369..b95d637def0 100644 --- a/test/core/end2end/tests/binary_metadata.cc +++ b/test/core/end2end/tests/binary_metadata.cc @@ -24,7 +24,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/lib/slice/slice.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/call_creds.cc b/test/core/end2end/tests/call_creds.cc index 2b078a1152d..0764214561b 100644 --- a/test/core/end2end/tests/call_creds.cc +++ b/test/core/end2end/tests/call_creds.cc @@ -28,7 +28,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/lib/security/credentials/credentials.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/call_host_override.cc b/test/core/end2end/tests/call_host_override.cc index e56b1deb231..c97c5b9b72a 100644 --- a/test/core/end2end/tests/call_host_override.cc +++ b/test/core/end2end/tests/call_host_override.cc @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/cancel_after_accept.cc b/test/core/end2end/tests/cancel_after_accept.cc index 3dcd451aaad..75611e339cd 100644 --- a/test/core/end2end/tests/cancel_after_accept.cc +++ b/test/core/end2end/tests/cancel_after_accept.cc @@ -26,7 +26,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.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/cancel_after_client_done.cc b/test/core/end2end/tests/cancel_after_client_done.cc index 5dd19ec9e1c..22f1e9e55bd 100644 --- a/test/core/end2end/tests/cancel_after_client_done.cc +++ b/test/core/end2end/tests/cancel_after_client_done.cc @@ -23,7 +23,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" diff --git a/test/core/end2end/tests/cancel_after_invoke.cc b/test/core/end2end/tests/cancel_after_invoke.cc index 64eacc7ca59..cf05fcffeef 100644 --- a/test/core/end2end/tests/cancel_after_invoke.cc +++ b/test/core/end2end/tests/cancel_after_invoke.cc @@ -24,7 +24,7 @@ #include #include "src/core/ext/transport/chttp2/transport/internal.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" diff --git a/test/core/end2end/tests/cancel_after_round_trip.cc b/test/core/end2end/tests/cancel_after_round_trip.cc index afc6505f81e..4d027e0e404 100644 --- a/test/core/end2end/tests/cancel_after_round_trip.cc +++ b/test/core/end2end/tests/cancel_after_round_trip.cc @@ -26,7 +26,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.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/cancel_with_status.cc b/test/core/end2end/tests/cancel_with_status.cc index 2af5d2e8498..b64a92dde18 100644 --- a/test/core/end2end/tests/cancel_with_status.cc +++ b/test/core/end2end/tests/cancel_with_status.cc @@ -25,7 +25,7 @@ #include #include "src/core/ext/transport/chttp2/transport/internal.h" -#include "src/core/lib/gprpp/time.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 570ba3e9670..a4a622f56c7 100644 --- a/test/core/end2end/tests/channelz.cc +++ b/test/core/end2end/tests/channelz.cc @@ -27,7 +27,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/lib/surface/channel.h" #include "src/core/server/server.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/client_streaming.cc b/test/core/end2end/tests/client_streaming.cc index c1c284bd005..34f4277a277 100644 --- a/test/core/end2end/tests/client_streaming.cc +++ b/test/core/end2end/tests/client_streaming.cc @@ -22,7 +22,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/compressed_payload.cc b/test/core/end2end/tests/compressed_payload.cc index bb8cfe68148..39263de9dd5 100644 --- a/test/core/end2end/tests/compressed_payload.cc +++ b/test/core/end2end/tests/compressed_payload.cc @@ -31,8 +31,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/bitset.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/bitset.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/connectivity.cc b/test/core/end2end/tests/connectivity.cc index ee2c78d0b74..00e83236e4d 100644 --- a/test/core/end2end/tests/connectivity.cc +++ b/test/core/end2end/tests/connectivity.cc @@ -23,7 +23,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/default_host.cc b/test/core/end2end/tests/default_host.cc index 770c15c4d61..fe5100dd845 100644 --- a/test/core/end2end/tests/default_host.cc +++ b/test/core/end2end/tests/default_host.cc @@ -24,7 +24,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" using testing::AnyOf; diff --git a/test/core/end2end/tests/disappearing_server.cc b/test/core/end2end/tests/disappearing_server.cc index 5b65e20eb57..8f6efd2a0cc 100644 --- a/test/core/end2end/tests/disappearing_server.cc +++ b/test/core/end2end/tests/disappearing_server.cc @@ -24,7 +24,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #ifndef GPR_WINDOWS // b/148110727 for more details diff --git a/test/core/end2end/tests/filter_causes_close.cc b/test/core/end2end/tests/filter_causes_close.cc index dc7fdafc667..b0e5f4a1b3f 100644 --- a/test/core/end2end/tests/filter_causes_close.cc +++ b/test/core/end2end/tests/filter_causes_close.cc @@ -29,9 +29,9 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.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" diff --git a/test/core/end2end/tests/filter_context.cc b/test/core/end2end/tests/filter_context.cc index 7d53047f971..bfcda4910c2 100644 --- a/test/core/end2end/tests/filter_context.cc +++ b/test/core/end2end/tests/filter_context.cc @@ -31,7 +31,7 @@ #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/lib/gprpp/time.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" diff --git a/test/core/end2end/tests/filter_init_fails.cc b/test/core/end2end/tests/filter_init_fails.cc index 025d43fa6b6..99b4ac62539 100644 --- a/test/core/end2end/tests/filter_init_fails.cc +++ b/test/core/end2end/tests/filter_init_fails.cc @@ -30,8 +30,8 @@ #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/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.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" diff --git a/test/core/end2end/tests/filtered_metadata.cc b/test/core/end2end/tests/filtered_metadata.cc index f5b94af0a5f..b916a1346b8 100644 --- a/test/core/end2end/tests/filtered_metadata.cc +++ b/test/core/end2end/tests/filtered_metadata.cc @@ -24,7 +24,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/graceful_server_shutdown.cc b/test/core/end2end/tests/graceful_server_shutdown.cc index 4bfc209aa74..edad138affb 100644 --- a/test/core/end2end/tests/graceful_server_shutdown.cc +++ b/test/core/end2end/tests/graceful_server_shutdown.cc @@ -22,7 +22,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/grpc_authz.cc b/test/core/end2end/tests/grpc_authz.cc index 1c184423188..5d658c00f47 100644 --- a/test/core/end2end/tests/grpc_authz.cc +++ b/test/core/end2end/tests/grpc_authz.cc @@ -25,8 +25,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/time.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 "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/high_initial_seqno.cc b/test/core/end2end/tests/high_initial_seqno.cc index ac5e0eacc3d..6286d51652a 100644 --- a/test/core/end2end/tests/high_initial_seqno.cc +++ b/test/core/end2end/tests/high_initial_seqno.cc @@ -24,7 +24,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/hpack_size.cc b/test/core/end2end/tests/hpack_size.cc index 465de045e03..3aa76aff226 100644 --- a/test/core/end2end/tests/hpack_size.cc +++ b/test/core/end2end/tests/hpack_size.cc @@ -29,7 +29,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/no_destruct.h" +#include "src/core/util/no_destruct.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/http2_stats.cc b/test/core/end2end/tests/http2_stats.cc index 3cc2e830822..d2f60c800bb 100644 --- a/test/core/end2end/tests/http2_stats.cc +++ b/test/core/end2end/tests/http2_stats.cc @@ -35,9 +35,9 @@ #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/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.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" diff --git a/test/core/end2end/tests/invoke_large_request.cc b/test/core/end2end/tests/invoke_large_request.cc index f7c5eb7cbe6..4181b4caaa1 100644 --- a/test/core/end2end/tests/invoke_large_request.cc +++ b/test/core/end2end/tests/invoke_large_request.cc @@ -26,7 +26,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/lib/slice/slice.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/keepalive_timeout.cc b/test/core/end2end/tests/keepalive_timeout.cc index 64b2aa09caa..4c1a1133d28 100644 --- a/test/core/end2end/tests/keepalive_timeout.cc +++ b/test/core/end2end/tests/keepalive_timeout.cc @@ -27,7 +27,7 @@ #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/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/lib/iomgr/port.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/large_metadata.cc b/test/core/end2end/tests/large_metadata.cc index 499e3ff6886..dc2ad13b601 100644 --- a/test/core/end2end/tests/large_metadata.cc +++ b/test/core/end2end/tests/large_metadata.cc @@ -27,7 +27,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/max_concurrent_streams.cc b/test/core/end2end/tests/max_concurrent_streams.cc index 17c7117527c..af17fb4bb8b 100644 --- a/test/core/end2end/tests/max_concurrent_streams.cc +++ b/test/core/end2end/tests/max_concurrent_streams.cc @@ -25,7 +25,7 @@ #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/max_connection_age.cc b/test/core/end2end/tests/max_connection_age.cc index 963a4a65d49..039e04566b2 100644 --- a/test/core/end2end/tests/max_connection_age.cc +++ b/test/core/end2end/tests/max_connection_age.cc @@ -26,7 +26,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/tests/max_connection_idle.cc b/test/core/end2end/tests/max_connection_idle.cc index 1fd5285a2be..278e7197395 100644 --- a/test/core/end2end/tests/max_connection_idle.cc +++ b/test/core/end2end/tests/max_connection_idle.cc @@ -27,7 +27,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/negative_deadline.cc b/test/core/end2end/tests/negative_deadline.cc index dc418784048..92b53feab2f 100644 --- a/test/core/end2end/tests/negative_deadline.cc +++ b/test/core/end2end/tests/negative_deadline.cc @@ -22,7 +22,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/no_logging.cc b/test/core/end2end/tests/no_logging.cc index c9f0b99af9d..43f2c4ccfe9 100644 --- a/test/core/end2end/tests/no_logging.cc +++ b/test/core/end2end/tests/no_logging.cc @@ -32,7 +32,7 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" void gpr_default_log(gpr_log_func_args* args); diff --git a/test/core/end2end/tests/payload.cc b/test/core/end2end/tests/payload.cc index 6bcb041a7aa..a3f46c647de 100644 --- a/test/core/end2end/tests/payload.cc +++ b/test/core/end2end/tests/payload.cc @@ -22,7 +22,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/lib/slice/slice.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/ping.cc b/test/core/end2end/tests/ping.cc index 61eb6fbeef7..70b2fbb57c2 100644 --- a/test/core/end2end/tests/ping.cc +++ b/test/core/end2end/tests/ping.cc @@ -23,7 +23,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.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 1bec19445b3..445422c8713 100644 --- a/test/core/end2end/tests/ping_pong_streaming.cc +++ b/test/core/end2end/tests/ping_pong_streaming.cc @@ -20,7 +20,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/lib/slice/slice.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/proxy_auth.cc b/test/core/end2end/tests/proxy_auth.cc index 1de11151610..9b2b3897b83 100644 --- a/test/core/end2end/tests/proxy_auth.cc +++ b/test/core/end2end/tests/proxy_auth.cc @@ -24,7 +24,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/fixtures/http_proxy_fixture.h" diff --git a/test/core/end2end/tests/registered_call.cc b/test/core/end2end/tests/registered_call.cc index b0c3a9273fb..1b0b1833df1 100644 --- a/test/core/end2end/tests/registered_call.cc +++ b/test/core/end2end/tests/registered_call.cc @@ -20,7 +20,7 @@ #include -#include "src/core/lib/gprpp/time.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 8da1f646196..277fee4eb36 100644 --- a/test/core/end2end/tests/request_with_flags.cc +++ b/test/core/end2end/tests/request_with_flags.cc @@ -30,7 +30,7 @@ #include #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/lib/transport/transport.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/request_with_payload.cc b/test/core/end2end/tests/request_with_payload.cc index bbfdf8ce5ed..d2da70e6ec6 100644 --- a/test/core/end2end/tests/request_with_payload.cc +++ b/test/core/end2end/tests/request_with_payload.cc @@ -22,7 +22,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/resource_quota_server.cc b/test/core/end2end/tests/resource_quota_server.cc index 0bc7a69e034..dd46020ca93 100644 --- a/test/core/end2end/tests/resource_quota_server.cc +++ b/test/core/end2end/tests/resource_quota_server.cc @@ -31,8 +31,8 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/time.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" diff --git a/test/core/end2end/tests/retry.cc b/test/core/end2end/tests/retry.cc index ad9d875f9d1..22e3434e553 100644 --- a/test/core/end2end/tests/retry.cc +++ b/test/core/end2end/tests/retry.cc @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.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_cancel_after_first_attempt_starts.cc b/test/core/end2end/tests/retry_cancel_after_first_attempt_starts.cc index 253e34db8cf..cf33d718760 100644 --- a/test/core/end2end/tests/retry_cancel_after_first_attempt_starts.cc +++ b/test/core/end2end/tests/retry_cancel_after_first_attempt_starts.cc @@ -22,7 +22,7 @@ #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.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_cancel_during_delay.cc b/test/core/end2end/tests/retry_cancel_during_delay.cc index 5538d29f7eb..f102175e4cb 100644 --- a/test/core/end2end/tests/retry_cancel_during_delay.cc +++ b/test/core/end2end/tests/retry_cancel_during_delay.cc @@ -24,7 +24,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.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_cancel_with_multiple_send_batches.cc b/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc index d94cb0beb0e..777f52ff7d4 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,8 +32,8 @@ #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/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.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" diff --git a/test/core/end2end/tests/retry_cancellation.cc b/test/core/end2end/tests/retry_cancellation.cc index 5944f2b8b70..9f03d3129d1 100644 --- a/test/core/end2end/tests/retry_cancellation.cc +++ b/test/core/end2end/tests/retry_cancellation.cc @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" diff --git a/test/core/end2end/tests/retry_disabled.cc b/test/core/end2end/tests/retry_disabled.cc index dc59d38f28b..be335e8cd6d 100644 --- a/test/core/end2end/tests/retry_disabled.cc +++ b/test/core/end2end/tests/retry_disabled.cc @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.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_exceeds_buffer_size_in_delay.cc b/test/core/end2end/tests/retry_exceeds_buffer_size_in_delay.cc index 3a0b681d198..0171d6a828d 100644 --- a/test/core/end2end/tests/retry_exceeds_buffer_size_in_delay.cc +++ b/test/core/end2end/tests/retry_exceeds_buffer_size_in_delay.cc @@ -23,7 +23,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.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_exceeds_buffer_size_in_initial_batch.cc b/test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc index 9d1382f4fa7..90ac8edd5a0 100644 --- a/test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc +++ b/test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.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_exceeds_buffer_size_in_subsequent_batch.cc b/test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc index 1d6669c1121..f962de41719 100644 --- a/test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc +++ b/test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.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_lb_drop.cc b/test/core/end2end/tests/retry_lb_drop.cc index 6a9e4b413b0..97a03bc68c2 100644 --- a/test/core/end2end/tests/retry_lb_drop.cc +++ b/test/core/end2end/tests/retry_lb_drop.cc @@ -32,9 +32,9 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.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" diff --git a/test/core/end2end/tests/retry_lb_fail.cc b/test/core/end2end/tests/retry_lb_fail.cc index 84f8b3fac60..77ef319f3e3 100644 --- a/test/core/end2end/tests/retry_lb_fail.cc +++ b/test/core/end2end/tests/retry_lb_fail.cc @@ -25,7 +25,7 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/time.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_non_retriable_status.cc b/test/core/end2end/tests/retry_non_retriable_status.cc index ce09e2a575d..4051f38daa6 100644 --- a/test/core/end2end/tests/retry_non_retriable_status.cc +++ b/test/core/end2end/tests/retry_non_retriable_status.cc @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.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_non_retriable_status_before_trailers.cc b/test/core/end2end/tests/retry_non_retriable_status_before_trailers.cc index 55bd0480e1f..07340b8d7f9 100644 --- a/test/core/end2end/tests/retry_non_retriable_status_before_trailers.cc +++ b/test/core/end2end/tests/retry_non_retriable_status_before_trailers.cc @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.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_per_attempt_recv_timeout.cc b/test/core/end2end/tests/retry_per_attempt_recv_timeout.cc index 4f7cbc05aa2..d21ce8ae7c3 100644 --- a/test/core/end2end/tests/retry_per_attempt_recv_timeout.cc +++ b/test/core/end2end/tests/retry_per_attempt_recv_timeout.cc @@ -24,7 +24,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/tests/retry_per_attempt_recv_timeout_on_last_attempt.cc b/test/core/end2end/tests/retry_per_attempt_recv_timeout_on_last_attempt.cc index 7e126c5dd26..f0447521b8c 100644 --- a/test/core/end2end/tests/retry_per_attempt_recv_timeout_on_last_attempt.cc +++ b/test/core/end2end/tests/retry_per_attempt_recv_timeout_on_last_attempt.cc @@ -24,7 +24,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/tests/retry_recv_initial_metadata.cc b/test/core/end2end/tests/retry_recv_initial_metadata.cc index 9738cd5dee1..2c4d44e6e1a 100644 --- a/test/core/end2end/tests/retry_recv_initial_metadata.cc +++ b/test/core/end2end/tests/retry_recv_initial_metadata.cc @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.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_message.cc b/test/core/end2end/tests/retry_recv_message.cc index bee892a9e9e..a2fcbc5ebd0 100644 --- a/test/core/end2end/tests/retry_recv_message.cc +++ b/test/core/end2end/tests/retry_recv_message.cc @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.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_message_replay.cc b/test/core/end2end/tests/retry_recv_message_replay.cc index befb2391dde..cddb1da2232 100644 --- a/test/core/end2end/tests/retry_recv_message_replay.cc +++ b/test/core/end2end/tests/retry_recv_message_replay.cc @@ -30,8 +30,8 @@ #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/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.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" 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 7a43114ec3a..211ad62a409 100644 --- a/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc +++ b/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc @@ -28,9 +28,9 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.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" diff --git a/test/core/end2end/tests/retry_send_initial_metadata_refs.cc b/test/core/end2end/tests/retry_send_initial_metadata_refs.cc index 5958580cb90..2f99da1ed2f 100644 --- a/test/core/end2end/tests/retry_send_initial_metadata_refs.cc +++ b/test/core/end2end/tests/retry_send_initial_metadata_refs.cc @@ -26,7 +26,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.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 2fdc3818694..c571b6c74c5 100644 --- a/test/core/end2end/tests/retry_send_op_fails.cc +++ b/test/core/end2end/tests/retry_send_op_fails.cc @@ -30,8 +30,8 @@ #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/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.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" diff --git a/test/core/end2end/tests/retry_send_recv_batch.cc b/test/core/end2end/tests/retry_send_recv_batch.cc index 75194d043c3..5f9ac9c7aa4 100644 --- a/test/core/end2end/tests/retry_send_recv_batch.cc +++ b/test/core/end2end/tests/retry_send_recv_batch.cc @@ -22,7 +22,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.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_server_pushback_delay.cc b/test/core/end2end/tests/retry_server_pushback_delay.cc index dff07f9698f..58507c833c3 100644 --- a/test/core/end2end/tests/retry_server_pushback_delay.cc +++ b/test/core/end2end/tests/retry_server_pushback_delay.cc @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.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_server_pushback_disabled.cc b/test/core/end2end/tests/retry_server_pushback_disabled.cc index ecbac8e8969..33226294b89 100644 --- a/test/core/end2end/tests/retry_server_pushback_disabled.cc +++ b/test/core/end2end/tests/retry_server_pushback_disabled.cc @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.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 ab06d00a862..0b48e7b00fb 100644 --- a/test/core/end2end/tests/retry_streaming.cc +++ b/test/core/end2end/tests/retry_streaming.cc @@ -27,7 +27,7 @@ #include "src/core/channelz/channelz.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/lib/surface/channel.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/retry_streaming_after_commit.cc b/test/core/end2end/tests/retry_streaming_after_commit.cc index ecb42085956..2e642d4852f 100644 --- a/test/core/end2end/tests/retry_streaming_after_commit.cc +++ b/test/core/end2end/tests/retry_streaming_after_commit.cc @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.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_succeeds_before_replay_finished.cc b/test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc index 6870ec0ab9f..1d2e1f54d81 100644 --- a/test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc +++ b/test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.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_throttled.cc b/test/core/end2end/tests/retry_throttled.cc index 52415d623ea..a0ca05f8757 100644 --- a/test/core/end2end/tests/retry_throttled.cc +++ b/test/core/end2end/tests/retry_throttled.cc @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.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_too_many_attempts.cc b/test/core/end2end/tests/retry_too_many_attempts.cc index a51a9abb439..ef5bc219c10 100644 --- a/test/core/end2end/tests/retry_too_many_attempts.cc +++ b/test/core/end2end/tests/retry_too_many_attempts.cc @@ -25,7 +25,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.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_goaway.cc b/test/core/end2end/tests/retry_transparent_goaway.cc index 091a800f210..afad5953fc5 100644 --- a/test/core/end2end/tests/retry_transparent_goaway.cc +++ b/test/core/end2end/tests/retry_transparent_goaway.cc @@ -27,8 +27,8 @@ #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/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.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" diff --git a/test/core/end2end/tests/retry_transparent_max_concurrent_streams.cc b/test/core/end2end/tests/retry_transparent_max_concurrent_streams.cc index 663fd6f6105..a9e9273fcdc 100644 --- a/test/core/end2end/tests/retry_transparent_max_concurrent_streams.cc +++ b/test/core/end2end/tests/retry_transparent_max_concurrent_streams.cc @@ -25,7 +25,7 @@ #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.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 05bf6c1ac12..0f1d32d70e5 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,8 +29,8 @@ #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/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.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" diff --git a/test/core/end2end/tests/retry_unref_before_finish.cc b/test/core/end2end/tests/retry_unref_before_finish.cc index 8957160457b..5c6a460c23d 100644 --- a/test/core/end2end/tests/retry_unref_before_finish.cc +++ b/test/core/end2end/tests/retry_unref_before_finish.cc @@ -22,7 +22,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.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_unref_before_recv.cc b/test/core/end2end/tests/retry_unref_before_recv.cc index c6503dea747..569e8114d6b 100644 --- a/test/core/end2end/tests/retry_unref_before_recv.cc +++ b/test/core/end2end/tests/retry_unref_before_recv.cc @@ -23,7 +23,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/server_finishes_request.cc b/test/core/end2end/tests/server_finishes_request.cc index 5d27facf228..4af74bec179 100644 --- a/test/core/end2end/tests/server_finishes_request.cc +++ b/test/core/end2end/tests/server_finishes_request.cc @@ -22,7 +22,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/server_streaming.cc b/test/core/end2end/tests/server_streaming.cc index b6fd6f30511..1218d575c08 100644 --- a/test/core/end2end/tests/server_streaming.cc +++ b/test/core/end2end/tests/server_streaming.cc @@ -24,7 +24,7 @@ #include -#include "src/core/lib/gprpp/time.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/shutdown_finishes_calls.cc b/test/core/end2end/tests/shutdown_finishes_calls.cc index c59e9d24c8d..25c57ee4d46 100644 --- a/test/core/end2end/tests/shutdown_finishes_calls.cc +++ b/test/core/end2end/tests/shutdown_finishes_calls.cc @@ -23,7 +23,7 @@ #include #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/tests/simple_delayed_request.cc b/test/core/end2end/tests/simple_delayed_request.cc index bbdfe4ab790..e9c61145e2b 100644 --- a/test/core/end2end/tests/simple_delayed_request.cc +++ b/test/core/end2end/tests/simple_delayed_request.cc @@ -26,7 +26,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.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_metadata.cc b/test/core/end2end/tests/simple_metadata.cc index 0fbfc3c685e..9edd15e0b7c 100644 --- a/test/core/end2end/tests/simple_metadata.cc +++ b/test/core/end2end/tests/simple_metadata.cc @@ -22,7 +22,7 @@ #include -#include "src/core/lib/gprpp/time.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 cd49842b8af..b964edf0dda 100644 --- a/test/core/end2end/tests/simple_request.cc +++ b/test/core/end2end/tests/simple_request.cc @@ -30,7 +30,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/streaming_error_response.cc b/test/core/end2end/tests/streaming_error_response.cc index 85fc49bb393..d01fdf0f9b6 100644 --- a/test/core/end2end/tests/streaming_error_response.cc +++ b/test/core/end2end/tests/streaming_error_response.cc @@ -25,7 +25,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/timeout_before_request_call.cc b/test/core/end2end/tests/timeout_before_request_call.cc index bb61acd648e..e3895f3e27b 100644 --- a/test/core/end2end/tests/timeout_before_request_call.cc +++ b/test/core/end2end/tests/timeout_before_request_call.cc @@ -24,7 +24,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/lib/slice/slice.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/trailing_metadata.cc b/test/core/end2end/tests/trailing_metadata.cc index 9b8de263def..79ea782e4b9 100644 --- a/test/core/end2end/tests/trailing_metadata.cc +++ b/test/core/end2end/tests/trailing_metadata.cc @@ -22,7 +22,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/write_buffering.cc b/test/core/end2end/tests/write_buffering.cc index 6cddfffbec8..2e53fe6f22d 100644 --- a/test/core/end2end/tests/write_buffering.cc +++ b/test/core/end2end/tests/write_buffering.cc @@ -23,7 +23,7 @@ #include #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/write_buffering_at_end.cc b/test/core/end2end/tests/write_buffering_at_end.cc index 531e2715aa1..ddaa1530dfc 100644 --- a/test/core/end2end/tests/write_buffering_at_end.cc +++ b/test/core/end2end/tests/write_buffering_at_end.cc @@ -23,7 +23,7 @@ #include #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/event_engine/common_closures_test.cc b/test/core/event_engine/common_closures_test.cc index ee4f71937d1..a09d2061d69 100644 --- a/test/core/event_engine/common_closures_test.cc +++ b/test/core/event_engine/common_closures_test.cc @@ -21,7 +21,7 @@ #include -#include "src/core/lib/gprpp/notification.h" +#include "src/core/util/notification.h" using ::grpc_event_engine::experimental::AnyInvocableClosure; using ::grpc_event_engine::experimental::SelfDeletingClosure; diff --git a/test/core/event_engine/event_engine_test_utils.cc b/test/core/event_engine/event_engine_test_utils.cc index d026f50d0b9..71b43e4d086 100644 --- a/test/core/event_engine/event_engine_test_utils.cc +++ b/test/core/event_engine/event_engine_test_utils.cc @@ -38,8 +38,8 @@ #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/gprpp/notification.h" -#include "src/core/lib/gprpp/time.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" diff --git a/test/core/event_engine/event_engine_test_utils.h b/test/core/event_engine/event_engine_test_utils.h index debef7a0449..7e85e36802d 100644 --- a/test/core/event_engine/event_engine_test_utils.h +++ b/test/core/event_engine/event_engine_test_utils.h @@ -31,8 +31,8 @@ #include #include -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/sync.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< diff --git a/test/core/event_engine/forkable_test.cc b/test/core/event_engine/forkable_test.cc index c15c3d76494..86dbe636593 100644 --- a/test/core/event_engine/forkable_test.cc +++ b/test/core/event_engine/forkable_test.cc @@ -30,7 +30,7 @@ #include "gtest/gtest.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/no_destruct.h" +#include "src/core/util/no_destruct.h" namespace { using ::grpc_event_engine::experimental::Forkable; 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 7a71288f0b5..93097b7a6a8 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,7 +32,7 @@ #include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/lib/iomgr/port.h" #include "src/core/telemetry/stats.h" #include "src/core/util/useful.h" @@ -42,7 +42,7 @@ #if defined(GRPC_POSIX_SOCKET_TCP) #include "src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h" #else -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #endif // IWYU pragma: no_include diff --git a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h index f28cdca5251..17a88daeab4 100644 --- a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h +++ b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h @@ -41,8 +41,8 @@ #include #include "src/core/lib/event_engine/time_util.h" -#include "src/core/lib/gprpp/no_destruct.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/sync.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/fuzzing_event_engine/fuzzing_event_engine_unittest.cc b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine_unittest.cc index e78e4aaa01e..e5eb79fccc3 100644 --- a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine_unittest.cc +++ b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine_unittest.cc @@ -21,7 +21,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" using ::grpc_event_engine::experimental::FuzzingEventEngine; 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 d6c29bcfc51..42d40d04cf6 100644 --- a/test/core/event_engine/posix/event_poller_posix_test.cc +++ b/test/core/event_engine/posix/event_poller_posix_test.cc @@ -35,7 +35,7 @@ #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/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/iomgr/port.h" // IWYU pragma: no_include @@ -63,10 +63,10 @@ #include "src/core/lib/event_engine/posix_engine/event_poller_posix_default.h" #include "src/core/lib/event_engine/posix_engine/posix_engine.h" #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/dual_ref_counted.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/strerror.h" +#include "src/core/util/crash.h" +#include "src/core/util/dual_ref_counted.h" +#include "src/core/util/notification.h" +#include "src/core/util/strerror.h" #include "test/core/event_engine/posix/posix_engine_test_utils.h" #include "test/core/test_util/port.h" diff --git a/test/core/event_engine/posix/lock_free_event_test.cc b/test/core/event_engine/posix/lock_free_event_test.cc index c00ac1c6e2a..f53aea94ad5 100644 --- a/test/core/event_engine/posix/lock_free_event_test.cc +++ b/test/core/event_engine/posix/lock_free_event_test.cc @@ -32,7 +32,7 @@ #include "src/core/lib/event_engine/posix_engine/event_poller.h" #include "src/core/lib/event_engine/posix_engine/lockfree_event.h" #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" using ::grpc_event_engine::experimental::EventEngine; using ::grpc_event_engine::experimental::Scheduler; diff --git a/test/core/event_engine/posix/log_too_many_open_files_test.cc b/test/core/event_engine/posix/log_too_many_open_files_test.cc index 3ae18a73ede..c87b879a286 100644 --- a/test/core/event_engine/posix/log_too_many_open_files_test.cc +++ b/test/core/event_engine/posix/log_too_many_open_files_test.cc @@ -24,7 +24,7 @@ #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/gprpp/strerror.h" +#include "src/core/util/strerror.h" #include "test/core/test_util/test_config.h" using ::grpc_event_engine::experimental::PosixSocketWrapper; diff --git a/test/core/event_engine/posix/posix_endpoint_test.cc b/test/core/event_engine/posix/posix_endpoint_test.cc index 5effe01234e..b3f157ec4c9 100644 --- a/test/core/event_engine/posix/posix_endpoint_test.cc +++ b/test/core/event_engine/posix/posix_endpoint_test.cc @@ -45,9 +45,9 @@ #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/gprpp/dual_ref_counted.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" diff --git a/test/core/event_engine/posix/posix_engine_test_utils.cc b/test/core/event_engine/posix/posix_engine_test_utils.cc index 6f35b9065b9..30c7f408804 100644 --- a/test/core/event_engine/posix/posix_engine_test_utils.cc +++ b/test/core/event_engine/posix/posix_engine_test_utils.cc @@ -23,7 +23,7 @@ #include "absl/log/log.h" #include "absl/strings/str_format.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc_event_engine { namespace experimental { 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 bf89dafc3fb..03c08519931 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,8 +43,8 @@ #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/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/notification.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 "test/core/event_engine/event_engine_test_utils.h" diff --git a/test/core/event_engine/posix/timer_heap_test.cc b/test/core/event_engine/posix/timer_heap_test.cc index cfc50cdcd3f..155715ecd81 100644 --- a/test/core/event_engine/posix/timer_heap_test.cc +++ b/test/core/event_engine/posix/timer_heap_test.cc @@ -31,7 +31,7 @@ #include #include "src/core/lib/event_engine/posix_engine/timer.h" -#include "src/core/lib/gprpp/bitset.h" +#include "src/core/util/bitset.h" using testing::Contains; using testing::Not; diff --git a/test/core/event_engine/posix/timer_list_test.cc b/test/core/event_engine/posix/timer_list_test.cc index 4d77f2a5e58..0fae801fb94 100644 --- a/test/core/event_engine/posix/timer_list_test.cc +++ b/test/core/event_engine/posix/timer_list_test.cc @@ -28,7 +28,7 @@ #include #include "src/core/lib/event_engine/posix_engine/timer.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" using testing::Mock; using testing::Return; 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 1ae3a05cb94..05a98c24a92 100644 --- a/test/core/event_engine/posix/traced_buffer_list_test.cc +++ b/test/core/event_engine/posix/traced_buffer_list_test.cc @@ -25,7 +25,7 @@ #include #include -#include "src/core/lib/gprpp/time.h" +#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/useful.h" diff --git a/test/core/event_engine/query_extensions_test.cc b/test/core/event_engine/query_extensions_test.cc index 5f9f43ab55e..d657f43b81f 100644 --- a/test/core/event_engine/query_extensions_test.cc +++ b/test/core/event_engine/query_extensions_test.cc @@ -23,7 +23,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc_event_engine { namespace experimental { 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 52eff1798ec..e17213606c3 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,8 +35,8 @@ #include #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/strerror.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 { diff --git a/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.h b/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.h index dc6de649e71..9688b313e99 100644 --- a/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.h +++ b/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.h @@ -30,10 +30,10 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/crash.h" +#include "src/core/util/notification.h" +#include "src/core/util/sync.h" +#include "src/core/util/thd.h" #include "test/core/event_engine/event_engine_test_utils.h" namespace grpc_event_engine { 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 29c4ce35084..728f76ee440 100644 --- a/test/core/event_engine/test_suite/tests/client_test.cc +++ b/test/core/event_engine/test_suite/tests/client_test.cc @@ -38,7 +38,7 @@ #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/lib/gprpp/notification.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" 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 6243bbdb49f..81fee2fddd9 100644 --- a/test/core/event_engine/test_suite/tests/dns_test.cc +++ b/test/core/event_engine/test_suite/tests/dns_test.cc @@ -37,8 +37,8 @@ #include "src/core/lib/config/config_vars.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/gprpp/crash.h" // IWYU pragma: keep -#include "src/core/lib/gprpp/notification.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" 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 0ff5bfb411c..997eb9c1023 100644 --- a/test/core/event_engine/test_suite/tests/server_test.cc +++ b/test/core/event_engine/test_suite/tests/server_test.cc @@ -38,7 +38,7 @@ #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/lib/gprpp/notification.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" diff --git a/test/core/event_engine/test_suite/tests/timer_test.cc b/test/core/event_engine/test_suite/tests/timer_test.cc index 543f5c97d2c..c4a4e5cc35a 100644 --- a/test/core/event_engine/test_suite/tests/timer_test.cc +++ b/test/core/event_engine/test_suite/tests/timer_test.cc @@ -35,7 +35,7 @@ #include #include "src/core/lib/event_engine/time_util.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "test/core/event_engine/test_suite/event_engine_test_framework.h" using ::testing::ElementsAre; 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 afc109e78ed..67a3c67ce9a 100644 --- a/test/core/event_engine/test_suite/tools/echo_client.cc +++ b/test/core/event_engine/test_suite/tools/echo_client.cc @@ -53,7 +53,7 @@ #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/lib/gprpp/notification.h" +#include "src/core/util/notification.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/resolver/resolver_registry.h" diff --git a/test/core/event_engine/thread_pool_test.cc b/test/core/event_engine/thread_pool_test.cc index ead7e44e134..29f32d16691 100644 --- a/test/core/event_engine/thread_pool_test.cc +++ b/test/core/event_engine/thread_pool_test.cc @@ -32,9 +32,9 @@ #include "src/core/lib/event_engine/thread_pool/thread_count.h" #include "src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/thd.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/notification.h" +#include "src/core/util/thd.h" +#include "src/core/util/time.h" #include "test/core/test_util/test_config.h" namespace grpc_event_engine { diff --git a/test/core/event_engine/windows/iocp_test.cc b/test/core/event_engine/windows/iocp_test.cc index e96b8d3816d..bd17f699418 100644 --- a/test/core/event_engine/windows/iocp_test.cc +++ b/test/core/event_engine/windows/iocp_test.cc @@ -32,7 +32,7 @@ #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/lib/gprpp/notification.h" +#include "src/core/util/notification.h" #include "src/core/lib/iomgr/error.h" #include "test/core/event_engine/windows/create_sockpair.h" diff --git a/test/core/event_engine/windows/win_socket_test.cc b/test/core/event_engine/windows/win_socket_test.cc index fe780f8c190..7f0757f0b30 100644 --- a/test/core/event_engine/windows/win_socket_test.cc +++ b/test/core/event_engine/windows/win_socket_test.cc @@ -27,7 +27,7 @@ #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/lib/gprpp/notification.h" +#include "src/core/util/notification.h" #include "src/core/lib/iomgr/error.h" #include "test/core/event_engine/windows/create_sockpair.h" diff --git a/test/core/event_engine/windows/windows_endpoint_test.cc b/test/core/event_engine/windows/windows_endpoint_test.cc index a5682b7c356..c401e3dbf9e 100644 --- a/test/core/event_engine/windows/windows_endpoint_test.cc +++ b/test/core/event_engine/windows/windows_endpoint_test.cc @@ -28,7 +28,7 @@ #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/lib/gprpp/notification.h" +#include "src/core/util/notification.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "test/core/event_engine/windows/create_sockpair.h" 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 85221719839..127c24c7308 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,9 +34,9 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/work_serializer.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" 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 0d5868881ec..1356a2039fb 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,7 +28,7 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#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" diff --git a/test/core/filters/client_auth_filter_test.cc b/test/core/filters/client_auth_filter_test.cc index 2d842875d5a..6e0f4bdde5f 100644 --- a/test/core/filters/client_auth_filter_test.cc +++ b/test/core/filters/client_auth_filter_test.cc @@ -28,8 +28,8 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.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" diff --git a/test/core/filters/filter_test.cc b/test/core/filters/filter_test.cc index c6d11ddd56f..3c813052fc2 100644 --- a/test/core/filters/filter_test.cc +++ b/test/core/filters/filter_test.cc @@ -30,7 +30,7 @@ #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/lib/gprpp/crash.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" diff --git a/test/core/filters/filter_test.h b/test/core/filters/filter_test.h index f48890f2a58..08784f16741 100644 --- a/test/core/filters/filter_test.h +++ b/test/core/filters/filter_test.h @@ -38,7 +38,7 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" diff --git a/test/core/gprpp/bitset_test.cc b/test/core/gprpp/bitset_test.cc index 58a23f628c1..99f1f72a7ee 100644 --- a/test/core/gprpp/bitset_test.cc +++ b/test/core/gprpp/bitset_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/bitset.h" +#include "src/core/util/bitset.h" #include #include diff --git a/test/core/gprpp/chunked_vector_fuzzer.cc b/test/core/gprpp/chunked_vector_fuzzer.cc index 2a83b3df935..c5c055c9948 100644 --- a/test/core/gprpp/chunked_vector_fuzzer.cc +++ b/test/core/gprpp/chunked_vector_fuzzer.cc @@ -25,8 +25,8 @@ #include #include -#include "src/core/lib/gprpp/chunked_vector.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#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" diff --git a/test/core/gprpp/chunked_vector_test.cc b/test/core/gprpp/chunked_vector_test.cc index 6299b0209d7..c1e8d9b483d 100644 --- a/test/core/gprpp/chunked_vector_test.cc +++ b/test/core/gprpp/chunked_vector_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/chunked_vector.h" +#include "src/core/util/chunked_vector.h" #include #include @@ -21,7 +21,7 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#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" diff --git a/test/core/gprpp/cpp_impl_of_test.cc b/test/core/gprpp/cpp_impl_of_test.cc index 00b164cb3aa..49653bee36b 100644 --- a/test/core/gprpp/cpp_impl_of_test.cc +++ b/test/core/gprpp/cpp_impl_of_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/cpp_impl_of.h" +#include "src/core/util/cpp_impl_of.h" #include diff --git a/test/core/gprpp/directory_reader_test.cc b/test/core/gprpp/directory_reader_test.cc index b20e167b078..e117bc2b058 100644 --- a/test/core/gprpp/directory_reader_test.cc +++ b/test/core/gprpp/directory_reader_test.cc @@ -14,7 +14,7 @@ // limitations under the License. // -#include "src/core/lib/gprpp/directory_reader.h" +#include "src/core/util/directory_reader.h" #include #include diff --git a/test/core/gprpp/down_cast_test.cc b/test/core/gprpp/down_cast_test.cc index e0af7081734..dd84b197f70 100644 --- a/test/core/gprpp/down_cast_test.cc +++ b/test/core/gprpp/down_cast_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/down_cast.h" +#include "src/core/util/down_cast.h" #include "gtest/gtest.h" diff --git a/test/core/gprpp/dual_ref_counted_test.cc b/test/core/gprpp/dual_ref_counted_test.cc index 1f7cf80e41d..4c9e2de162f 100644 --- a/test/core/gprpp/dual_ref_counted_test.cc +++ b/test/core/gprpp/dual_ref_counted_test.cc @@ -14,15 +14,15 @@ // limitations under the License. // -#include "src/core/lib/gprpp/dual_ref_counted.h" +#include "src/core/util/dual_ref_counted.h" #include #include "absl/log/check.h" #include "gtest/gtest.h" -#include "src/core/lib/gprpp/manual_constructor.h" -#include "src/core/lib/gprpp/ref_counted.h" +#include "src/core/util/manual_constructor.h" +#include "src/core/util/ref_counted.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/gprpp/dump_args_test.cc b/test/core/gprpp/dump_args_test.cc index 2207d4eab62..ee98567b3e0 100644 --- a/test/core/gprpp/dump_args_test.cc +++ b/test/core/gprpp/dump_args_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/dump_args.h" +#include "src/core/util/dump_args.h" #include diff --git a/test/core/gprpp/examine_stack_test.cc b/test/core/gprpp/examine_stack_test.cc index f9384842c7d..e257f114828 100644 --- a/test/core/gprpp/examine_stack_test.cc +++ b/test/core/gprpp/examine_stack_test.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/gprpp/examine_stack.h" +#include "src/core/util/examine_stack.h" #include "absl/debugging/stacktrace.h" #include "absl/debugging/symbolize.h" diff --git a/test/core/gprpp/fork_test.cc b/test/core/gprpp/fork_test.cc index 24f74c77d6b..543c00da713 100644 --- a/test/core/gprpp/fork_test.cc +++ b/test/core/gprpp/fork_test.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/gprpp/fork.h" +#include "src/core/util/fork.h" #include @@ -24,7 +24,7 @@ #include -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/thd.h" #include "test/core/test_util/test_config.h" TEST(ForkTest, Init) { diff --git a/test/core/gprpp/host_port_test.cc b/test/core/gprpp/host_port_test.cc index 77432e3155d..3f7607c0a56 100644 --- a/test/core/gprpp/host_port_test.cc +++ b/test/core/gprpp/host_port_test.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/gprpp/host_port.h" +#include "src/core/util/host_port.h" #include "gtest/gtest.h" diff --git a/test/core/gprpp/if_list_test.cc b/test/core/gprpp/if_list_test.cc index 38dce561bf4..d99d8ed6ba3 100644 --- a/test/core/gprpp/if_list_test.cc +++ b/test/core/gprpp/if_list_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/if_list.h" +#include "src/core/util/if_list.h" #include diff --git a/test/core/gprpp/load_file_test.cc b/test/core/gprpp/load_file_test.cc index 180624c9eb4..4888749fb40 100644 --- a/test/core/gprpp/load_file_test.cc +++ b/test/core/gprpp/load_file_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/load_file.h" +#include "src/core/util/load_file.h" #include #include diff --git a/test/core/gprpp/match_test.cc b/test/core/gprpp/match_test.cc index 370a6501564..8233f6eee16 100644 --- a/test/core/gprpp/match_test.cc +++ b/test/core/gprpp/match_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/match.h" +#include "src/core/util/match.h" #include diff --git a/test/core/gprpp/mpscq_test.cc b/test/core/gprpp/mpscq_test.cc index 1bf92acd189..65dce481d43 100644 --- a/test/core/gprpp/mpscq_test.cc +++ b/test/core/gprpp/mpscq_test.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/gprpp/mpscq.h" +#include "src/core/util/mpscq.h" #include #include @@ -29,7 +29,7 @@ #include #include -#include "src/core/lib/gprpp/thd.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/gprpp/no_destruct_test.cc b/test/core/gprpp/no_destruct_test.cc index d0f9d19a4c9..7a440e65a2d 100644 --- a/test/core/gprpp/no_destruct_test.cc +++ b/test/core/gprpp/no_destruct_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/no_destruct.h" +#include "src/core/util/no_destruct.h" #include diff --git a/test/core/gprpp/notification_test.cc b/test/core/gprpp/notification_test.cc index ed5dcf48021..3a4fb77a53d 100644 --- a/test/core/gprpp/notification_test.cc +++ b/test/core/gprpp/notification_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/notification.h" +#include "src/core/util/notification.h" #include #include diff --git a/test/core/gprpp/orphanable_test.cc b/test/core/gprpp/orphanable_test.cc index fe53367c9a2..4e38d719d9c 100644 --- a/test/core/gprpp/orphanable_test.cc +++ b/test/core/gprpp/orphanable_test.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/gprpp/orphanable.h" +#include "src/core/util/orphanable.h" #include "gtest/gtest.h" diff --git a/test/core/gprpp/overload_test.cc b/test/core/gprpp/overload_test.cc index e7443a5be2c..c3b26549fd4 100644 --- a/test/core/gprpp/overload_test.cc +++ b/test/core/gprpp/overload_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/overload.h" +#include "src/core/util/overload.h" #include diff --git a/test/core/gprpp/ref_counted_ptr_test.cc b/test/core/gprpp/ref_counted_ptr_test.cc index 12f619e5673..90ad48125f4 100644 --- a/test/core/gprpp/ref_counted_ptr_test.cc +++ b/test/core/gprpp/ref_counted_ptr_test.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/ref_counted_ptr.h" #include @@ -26,8 +26,8 @@ #include -#include "src/core/lib/gprpp/dual_ref_counted.h" -#include "src/core/lib/gprpp/ref_counted.h" +#include "src/core/util/dual_ref_counted.h" +#include "src/core/util/ref_counted.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/gprpp/ref_counted_test.cc b/test/core/gprpp/ref_counted_test.cc index 15ee86e5c52..5b0171d3b4f 100644 --- a/test/core/gprpp/ref_counted_test.cc +++ b/test/core/gprpp/ref_counted_test.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/gprpp/ref_counted.h" +#include "src/core/util/ref_counted.h" #include #include diff --git a/test/core/gprpp/single_set_ptr_test.cc b/test/core/gprpp/single_set_ptr_test.cc index b93aa14c3e8..67f9cc39b96 100644 --- a/test/core/gprpp/single_set_ptr_test.cc +++ b/test/core/gprpp/single_set_ptr_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/single_set_ptr.h" +#include "src/core/util/single_set_ptr.h" #include #include diff --git a/test/core/gprpp/sorted_pack_test.cc b/test/core/gprpp/sorted_pack_test.cc index ad4e911c813..74e0bb6823d 100644 --- a/test/core/gprpp/sorted_pack_test.cc +++ b/test/core/gprpp/sorted_pack_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/sorted_pack.h" +#include "src/core/util/sorted_pack.h" #include diff --git a/test/core/gprpp/stat_test.cc b/test/core/gprpp/stat_test.cc index 29536b4a0e6..4595a6208bd 100644 --- a/test/core/gprpp/stat_test.cc +++ b/test/core/gprpp/stat_test.cc @@ -14,7 +14,7 @@ // limitations under the License. // -#include "src/core/lib/gprpp/stat.h" +#include "src/core/util/stat.h" #include diff --git a/test/core/gprpp/status_helper_test.cc b/test/core/gprpp/status_helper_test.cc index fd967742a2d..db0b3b9dc26 100644 --- a/test/core/gprpp/status_helper_test.cc +++ b/test/core/gprpp/status_helper_test.cc @@ -14,7 +14,7 @@ // limitations under the License. // -#include "src/core/lib/gprpp/status_helper.h" +#include "src/core/util/status_helper.h" #include diff --git a/test/core/gprpp/table_test.cc b/test/core/gprpp/table_test.cc index 9c9ba507263..7d959b311e5 100644 --- a/test/core/gprpp/table_test.cc +++ b/test/core/gprpp/table_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/table.h" +#include "src/core/util/table.h" #include #include diff --git a/test/core/gprpp/thd_test.cc b/test/core/gprpp/thd_test.cc index c26a417a387..fd93eb278d3 100644 --- a/test/core/gprpp/thd_test.cc +++ b/test/core/gprpp/thd_test.cc @@ -18,7 +18,7 @@ // Test of gpr thread support. -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/thd.h" #include diff --git a/test/core/gprpp/time_averaged_stats_test.cc b/test/core/gprpp/time_averaged_stats_test.cc index 1407c2694aa..f42f27e3353 100644 --- a/test/core/gprpp/time_averaged_stats_test.cc +++ b/test/core/gprpp/time_averaged_stats_test.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/gprpp/time_averaged_stats.h" +#include "src/core/util/time_averaged_stats.h" #include diff --git a/test/core/gprpp/time_test.cc b/test/core/gprpp/time_test.cc index db554ac68cb..01ab35e3b47 100644 --- a/test/core/gprpp/time_test.cc +++ b/test/core/gprpp/time_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include diff --git a/test/core/gprpp/time_util_test.cc b/test/core/gprpp/time_util_test.cc index 09a6650932e..749a6f26ec0 100644 --- a/test/core/gprpp/time_util_test.cc +++ b/test/core/gprpp/time_util_test.cc @@ -14,7 +14,7 @@ // limitations under the License. // -#include "src/core/lib/gprpp/time_util.h" +#include "src/core/util/time_util.h" #include #include diff --git a/test/core/gprpp/unique_type_name_test.cc b/test/core/gprpp/unique_type_name_test.cc index bce147edd32..75a1716b701 100644 --- a/test/core/gprpp/unique_type_name_test.cc +++ b/test/core/gprpp/unique_type_name_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/unique_type_name.h" +#include "src/core/util/unique_type_name.h" #include #include diff --git a/test/core/gprpp/uuid_v4_test.cc b/test/core/gprpp/uuid_v4_test.cc index e970d54ebce..a5a73e2f826 100644 --- a/test/core/gprpp/uuid_v4_test.cc +++ b/test/core/gprpp/uuid_v4_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/uuid_v4.h" +#include "src/core/util/uuid_v4.h" #include "gtest/gtest.h" diff --git a/test/core/gprpp/validation_errors_test.cc b/test/core/gprpp/validation_errors_test.cc index cbf5add2feb..e3222408d2e 100644 --- a/test/core/gprpp/validation_errors_test.cc +++ b/test/core/gprpp/validation_errors_test.cc @@ -14,7 +14,7 @@ // limitations under the License. // -#include "src/core/lib/gprpp/validation_errors.h" +#include "src/core/util/validation_errors.h" #include "gtest/gtest.h" diff --git a/test/core/gprpp/work_serializer_test.cc b/test/core/gprpp/work_serializer_test.cc index 0d92acecba8..a7b12a18eb7 100644 --- a/test/core/gprpp/work_serializer_test.cc +++ b/test/core/gprpp/work_serializer_test.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/gprpp/work_serializer.h" +#include "src/core/util/work_serializer.h" #include @@ -37,8 +37,8 @@ #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/thd.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" diff --git a/test/core/handshake/client_ssl.cc b/test/core/handshake/client_ssl.cc index d59018f3a65..da8e77a204f 100644 --- a/test/core/handshake/client_ssl.cc +++ b/test/core/handshake/client_ssl.cc @@ -58,9 +58,9 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/crash.h" +#include "src/core/util/sync.h" +#include "src/core/util/thd.h" #include "test/core/test_util/tls_utils.h" #define SSL_CERT_PATH "src/core/tsi/test_creds/server1.pem" diff --git a/test/core/handshake/readahead_handshaker_server_ssl.cc b/test/core/handshake/readahead_handshaker_server_ssl.cc index c5331e1abb4..da2dc822af2 100644 --- a/test/core/handshake/readahead_handshaker_server_ssl.cc +++ b/test/core/handshake/readahead_handshaker_server_ssl.cc @@ -27,7 +27,7 @@ #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/lib/gprpp/ref_counted_ptr.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" diff --git a/test/core/handshake/server_ssl_common.cc b/test/core/handshake/server_ssl_common.cc index 0bebf83ed2e..70aae783473 100644 --- a/test/core/handshake/server_ssl_common.cc +++ b/test/core/handshake/server_ssl_common.cc @@ -46,9 +46,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/thd.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" diff --git a/test/core/handshake/verify_peer_options.cc b/test/core/handshake/verify_peer_options.cc index 3e5e2b1590d..626dc964468 100644 --- a/test/core/handshake/verify_peer_options.cc +++ b/test/core/handshake/verify_peer_options.cc @@ -41,8 +41,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/crash.h" +#include "src/core/util/thd.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 e63cbfe4f22..1adf98bfdc0 100644 --- a/test/core/http/httpcli_test.cc +++ b/test/core/http/httpcli_test.cc @@ -43,9 +43,9 @@ #include #include -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/time_util.h" +#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" diff --git a/test/core/http/httpscli_test.cc b/test/core/http/httpscli_test.cc index 6491f52c5e3..dd277bcb014 100644 --- a/test/core/http/httpscli_test.cc +++ b/test/core/http/httpscli_test.cc @@ -42,11 +42,11 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/time_util.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" diff --git a/test/core/iomgr/buffer_list_test.cc b/test/core/iomgr/buffer_list_test.cc index 9994961a727..db7b45db1af 100644 --- a/test/core/iomgr/buffer_list_test.cc +++ b/test/core/iomgr/buffer_list_test.cc @@ -25,7 +25,7 @@ #include #include -#include "src/core/lib/gprpp/time.h" +#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" diff --git a/test/core/iomgr/combiner_test.cc b/test/core/iomgr/combiner_test.cc index 0a8c0a45066..278bd64e326 100644 --- a/test/core/iomgr/combiner_test.cc +++ b/test/core/iomgr/combiner_test.cc @@ -26,9 +26,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/crash.h" +#include "src/core/util/notification.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/iomgr/endpoint_pair_test.cc b/test/core/iomgr/endpoint_pair_test.cc index 71b631fb184..ee2224150e7 100644 --- a/test/core/iomgr/endpoint_pair_test.cc +++ b/test/core/iomgr/endpoint_pair_test.cc @@ -35,7 +35,7 @@ #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/lib/gprpp/notification.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/useful.h" diff --git a/test/core/iomgr/endpoint_tests.cc b/test/core/iomgr/endpoint_tests.cc index bd810dfcc82..5b59d4699fc 100644 --- a/test/core/iomgr/endpoint_tests.cc +++ b/test/core/iomgr/endpoint_tests.cc @@ -29,8 +29,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/time.h" +#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/useful.h" diff --git a/test/core/iomgr/error_test.cc b/test/core/iomgr/error_test.cc index 165158b06b9..51f85232d72 100644 --- a/test/core/iomgr/error_test.cc +++ b/test/core/iomgr/error_test.cc @@ -27,7 +27,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" TEST(ErrorTest, SetGetInt) { diff --git a/test/core/iomgr/fd_conservation_posix_test.cc b/test/core/iomgr/fd_conservation_posix_test.cc index 28676454923..1f92a773438 100644 --- a/test/core/iomgr/fd_conservation_posix_test.cc +++ b/test/core/iomgr/fd_conservation_posix_test.cc @@ -23,7 +23,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/iomgr/endpoint_pair.h" #include "src/core/lib/iomgr/iomgr.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/iomgr/fd_posix_test.cc b/test/core/iomgr/fd_posix_test.cc index 8497b62591a..dad10bdb71b 100644 --- a/test/core/iomgr/fd_posix_test.cc +++ b/test/core/iomgr/fd_posix_test.cc @@ -44,8 +44,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/strerror.h" +#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" diff --git a/test/core/iomgr/grpc_ipv6_loopback_available_test.cc b/test/core/iomgr/grpc_ipv6_loopback_available_test.cc index 34a2c59f7ce..87f15cd5439 100644 --- a/test/core/iomgr/grpc_ipv6_loopback_available_test.cc +++ b/test/core/iomgr/grpc_ipv6_loopback_available_test.cc @@ -21,7 +21,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/iomgr/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/iomgr/pollset_windows_starvation_test.cc b/test/core/iomgr/pollset_windows_starvation_test.cc index c3e51f5c7cf..d9f8d36a4ac 100644 --- a/test/core/iomgr/pollset_windows_starvation_test.cc +++ b/test/core/iomgr/pollset_windows_starvation_test.cc @@ -20,7 +20,7 @@ #include #include -#include "src/core/lib/gprpp/thd.h" +#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" diff --git a/test/core/iomgr/resolve_address_posix_test.cc b/test/core/iomgr/resolve_address_posix_test.cc index 9cebdbfa87e..74e8a159f8e 100644 --- a/test/core/iomgr/resolve_address_posix_test.cc +++ b/test/core/iomgr/resolve_address_posix_test.cc @@ -35,10 +35,10 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/thd.h" -#include "src/core/lib/gprpp/time.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" diff --git a/test/core/iomgr/resolve_address_test.cc b/test/core/iomgr/resolve_address_test.cc index ec5834646dc..49277799f82 100644 --- a/test/core/iomgr/resolve_address_test.cc +++ b/test/core/iomgr/resolve_address_test.cc @@ -35,9 +35,9 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.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" diff --git a/test/core/iomgr/socket_utils_test.cc b/test/core/iomgr/socket_utils_test.cc index edec3943f7c..225ccb57c0e 100644 --- a/test/core/iomgr/socket_utils_test.cc +++ b/test/core/iomgr/socket_utils_test.cc @@ -34,7 +34,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#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/useful.h" diff --git a/test/core/iomgr/tcp_client_posix_test.cc b/test/core/iomgr/tcp_client_posix_test.cc index f3f24b06303..3d3806fc26d 100644 --- a/test/core/iomgr/tcp_client_posix_test.cc +++ b/test/core/iomgr/tcp_client_posix_test.cc @@ -20,7 +20,7 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/lib/iomgr/port.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" @@ -43,7 +43,7 @@ #include #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/lib/gprpp/crash.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" diff --git a/test/core/iomgr/tcp_posix_test.cc b/test/core/iomgr/tcp_posix_test.cc index 6117be2beb1..1591ed283cf 100644 --- a/test/core/iomgr/tcp_posix_test.cc +++ b/test/core/iomgr/tcp_posix_test.cc @@ -19,8 +19,8 @@ #include "absl/time/time.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/time.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 @@ -47,7 +47,7 @@ #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/lib/gprpp/crash.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" diff --git a/test/core/iomgr/tcp_server_posix_test.cc b/test/core/iomgr/tcp_server_posix_test.cc index 235c789717a..b04b3c7d7ec 100644 --- a/test/core/iomgr/tcp_server_posix_test.cc +++ b/test/core/iomgr/tcp_server_posix_test.cc @@ -19,7 +19,7 @@ #include #include "src/core/lib/event_engine/shim.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/lib/iomgr/port.h" #include "test/core/test_util/test_config.h" @@ -51,9 +51,9 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/gprpp/strerror.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" diff --git a/test/core/iomgr/timer_heap_test.cc b/test/core/iomgr/timer_heap_test.cc index af4571a4031..4bf9b0d7080 100644 --- a/test/core/iomgr/timer_heap_test.cc +++ b/test/core/iomgr/timer_heap_test.cc @@ -27,7 +27,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/iomgr/port.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 aa1d545bea7..9baf8301ac9 100644 --- a/test/core/iomgr/timer_list_test.cc +++ b/test/core/iomgr/timer_list_test.cc @@ -27,8 +27,8 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/time.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" diff --git a/test/core/json/json_object_loader_test.cc b/test/core/json/json_object_loader_test.cc index 6ea9b7b0598..44e96bf1f9a 100644 --- a/test/core/json/json_object_loader_test.cc +++ b/test/core/json/json_object_loader_test.cc @@ -22,8 +22,8 @@ #include -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#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" diff --git a/test/core/load_balancing/lb_policy_test_lib.h b/test/core/load_balancing/lb_policy_test_lib.h index 9ae6039a63b..0d6a7a4eb7d 100644 --- a/test/core/load_balancing/lb_policy_test_lib.h +++ b/test/core/load_balancing/lb_policy_test_lib.h @@ -62,14 +62,14 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/match.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/unique_type_name.h" -#include "src/core/lib/gprpp/work_serializer.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" 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 40dad8d96d3..0e35a42cff7 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,7 +24,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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 "test/core/test_util/test_config.h" diff --git a/test/core/load_balancing/outlier_detection_test.cc b/test/core/load_balancing/outlier_detection_test.cc index 2a809d485f7..ab0d9205000 100644 --- a/test/core/load_balancing/outlier_detection_test.cc +++ b/test/core/load_balancing/outlier_detection_test.cc @@ -35,9 +35,9 @@ #include #include -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.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/resolver/endpoint_addresses.h" diff --git a/test/core/load_balancing/pick_first_test.cc b/test/core/load_balancing/pick_first_test.cc index 413c58be6ff..2b2cd73ec14 100644 --- a/test/core/load_balancing/pick_first_test.cc +++ b/test/core/load_balancing/pick_first_test.cc @@ -38,11 +38,11 @@ #include #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/work_serializer.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" diff --git a/test/core/load_balancing/ring_hash_test.cc b/test/core/load_balancing/ring_hash_test.cc index 9420834d51f..72ed7120e5f 100644 --- a/test/core/load_balancing/ring_hash_test.cc +++ b/test/core/load_balancing/ring_hash_test.cc @@ -34,8 +34,8 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/xxhash_inline.h" +#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" 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 0c1da6ef8c3..542e9e82293 100644 --- a/test/core/load_balancing/rls_lb_config_parser_test.cc +++ b/test/core/load_balancing/rls_lb_config_parser_test.cc @@ -24,7 +24,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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 "test/core/test_util/test_config.h" diff --git a/test/core/load_balancing/round_robin_test.cc b/test/core/load_balancing/round_robin_test.cc index 697b0ebc107..7597f9fc2d4 100644 --- a/test/core/load_balancing/round_robin_test.cc +++ b/test/core/load_balancing/round_robin_test.cc @@ -24,8 +24,8 @@ #include -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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 ca882c63247..272fb3275cf 100644 --- a/test/core/load_balancing/static_stride_scheduler_benchmark.cc +++ b/test/core/load_balancing/static_stride_scheduler_benchmark.cc @@ -29,7 +29,7 @@ #include -#include "src/core/lib/gprpp/no_destruct.h" +#include "src/core/util/no_destruct.h" #include "src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h" namespace grpc_core { 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 7d6f3bb81b2..ac4acbae103 100644 --- a/test/core/load_balancing/weighted_round_robin_config_test.cc +++ b/test/core/load_balancing/weighted_round_robin_config_test.cc @@ -23,7 +23,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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 "test/core/test_util/test_config.h" diff --git a/test/core/load_balancing/weighted_round_robin_test.cc b/test/core/load_balancing/weighted_round_robin_test.cc index d680a1c3e37..42e97028df1 100644 --- a/test/core/load_balancing/weighted_round_robin_test.cc +++ b/test/core/load_balancing/weighted_round_robin_test.cc @@ -40,10 +40,10 @@ #include #include -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.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/load_balancing/backend_metric_data.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/load_balancing/weighted_target/weighted_target.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 175c41aedbd..633b12cb986 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,7 +24,7 @@ #include "src/core/client_channel/client_channel_service_config.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" diff --git a/test/core/load_balancing/xds_override_host_test.cc b/test/core/load_balancing/xds_override_host_test.cc index 989545290a6..15394f8f043 100644 --- a/test/core/load_balancing/xds_override_host_test.cc +++ b/test/core/load_balancing/xds_override_host_test.cc @@ -39,8 +39,8 @@ #include "src/core/ext/filters/stateful_session/stateful_session_filter.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" diff --git a/test/core/memory_usage/callback_client.cc b/test/core/memory_usage/callback_client.cc index 9444d090c4a..d1340ca8934 100644 --- a/test/core/memory_usage/callback_client.cc +++ b/test/core/memory_usage/callback_client.cc @@ -38,7 +38,7 @@ #include #include -#include "src/core/lib/gprpp/notification.h" +#include "src/core/util/notification.h" #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" #include "src/proto/grpc/testing/messages.pb.h" #include "test/core/memory_usage/memstats.h" diff --git a/test/core/memory_usage/memory_usage_test.cc b/test/core/memory_usage/memory_usage_test.cc index 9ca28321a72..7a7f75d0d84 100644 --- a/test/core/memory_usage/memory_usage_test.cc +++ b/test/core/memory_usage/memory_usage_test.cc @@ -46,7 +46,7 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "src/core/util/subprocess.h" #include "src/proto/grpc/testing/xds/v3/cluster.pb.h" #include "src/proto/grpc/testing/xds/v3/health_check.pb.h" diff --git a/test/core/memory_usage/server.cc b/test/core/memory_usage/server.cc index b071f62cf38..5876f3e5683 100644 --- a/test/core/memory_usage/server.cc +++ b/test/core/memory_usage/server.cc @@ -48,7 +48,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/host_port.h" +#include "src/core/util/host_port.h" #include "src/core/xds/grpc/xds_enabled_server.h" #include "test/core/end2end/data/ssl_test_data.h" #include "test/core/memory_usage/memstats.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 e88434ed4d5..b33698a32d2 100644 --- a/test/core/message_size/message_size_service_config_test.cc +++ b/test/core/message_size/message_size_service_config_test.cc @@ -28,7 +28,7 @@ #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/lib/gprpp/ref_counted_ptr.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" diff --git a/test/core/network_benchmarks/low_level_ping_pong.cc b/test/core/network_benchmarks/low_level_ping_pong.cc index 49bd712bb7a..faae51b3657 100644 --- a/test/core/network_benchmarks/low_level_ping_pong.cc +++ b/test/core/network_benchmarks/low_level_ping_pong.cc @@ -41,8 +41,8 @@ #include #include -#include "src/core/lib/gprpp/strerror.h" -#include "src/core/lib/gprpp/thd.h" +#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/useful.h" diff --git a/test/core/promise/arena_promise_test.cc b/test/core/promise/arena_promise_test.cc index d8f43426012..061d8c0a505 100644 --- a/test/core/promise/arena_promise_test.cc +++ b/test/core/promise/arena_promise_test.cc @@ -21,7 +21,7 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.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" diff --git a/test/core/promise/event_engine_wakeup_scheduler_test.cc b/test/core/promise/event_engine_wakeup_scheduler_test.cc index 306105d26ce..3ce2a88669f 100644 --- a/test/core/promise/event_engine_wakeup_scheduler_test.cc +++ b/test/core/promise/event_engine_wakeup_scheduler_test.cc @@ -24,7 +24,7 @@ #include #include -#include "src/core/lib/gprpp/notification.h" +#include "src/core/util/notification.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" diff --git a/test/core/promise/for_each_test.cc b/test/core/promise/for_each_test.cc index 4ce3914004f..c9613bbe5d0 100644 --- a/test/core/promise/for_each_test.cc +++ b/test/core/promise/for_each_test.cc @@ -21,7 +21,7 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#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" diff --git a/test/core/promise/inter_activity_latch_test.cc b/test/core/promise/inter_activity_latch_test.cc index 087489b240e..13195c2b171 100644 --- a/test/core/promise/inter_activity_latch_test.cc +++ b/test/core/promise/inter_activity_latch_test.cc @@ -20,7 +20,7 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/notification.h" +#include "src/core/util/notification.h" #include "src/core/lib/promise/event_engine_wakeup_scheduler.h" #include "src/core/lib/promise/seq.h" diff --git a/test/core/promise/interceptor_list_test.cc b/test/core/promise/interceptor_list_test.cc index f9ff107d289..63c9eedad81 100644 --- a/test/core/promise/interceptor_list_test.cc +++ b/test/core/promise/interceptor_list_test.cc @@ -20,7 +20,7 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.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" diff --git a/test/core/promise/map_pipe_test.cc b/test/core/promise/map_pipe_test.cc index 0bcc4f7c739..bdedb6d5172 100644 --- a/test/core/promise/map_pipe_test.cc +++ b/test/core/promise/map_pipe_test.cc @@ -22,7 +22,7 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#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" diff --git a/test/core/promise/observable_test.cc b/test/core/promise/observable_test.cc index b6a2268ad99..74a9c26db84 100644 --- a/test/core/promise/observable_test.cc +++ b/test/core/promise/observable_test.cc @@ -23,7 +23,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "src/core/lib/gprpp/notification.h" +#include "src/core/util/notification.h" #include "src/core/lib/promise/loop.h" #include "src/core/lib/promise/map.h" #include "test/core/promise/poll_matcher.h" diff --git a/test/core/promise/party_test.cc b/test/core/promise/party_test.cc index 3afe59b755d..607e955d6e5 100644 --- a/test/core/promise/party_test.cc +++ b/test/core/promise/party_test.cc @@ -31,10 +31,10 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.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" diff --git a/test/core/promise/pipe_test.cc b/test/core/promise/pipe_test.cc index e1219c55400..0386febafc1 100644 --- a/test/core/promise/pipe_test.cc +++ b/test/core/promise/pipe_test.cc @@ -26,8 +26,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#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" diff --git a/test/core/promise/sleep_test.cc b/test/core/promise/sleep_test.cc index 0d83460f0b8..c3055618aed 100644 --- a/test/core/promise/sleep_test.cc +++ b/test/core/promise/sleep_test.cc @@ -27,8 +27,8 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/orphanable.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" diff --git a/test/core/promise/wait_for_callback_test.cc b/test/core/promise/wait_for_callback_test.cc index cb54ccf2e0e..16293081d66 100644 --- a/test/core/promise/wait_for_callback_test.cc +++ b/test/core/promise/wait_for_callback_test.cc @@ -17,7 +17,7 @@ #include "absl/status/status.h" #include "gtest/gtest.h" -#include "src/core/lib/gprpp/notification.h" +#include "src/core/util/notification.h" #include "src/core/lib/promise/map.h" #include "test/core/promise/test_wakeup_schedulers.h" diff --git a/test/core/resolver/binder_resolver_test.cc b/test/core/resolver/binder_resolver_test.cc index acb1a49ea28..4438a0730a1 100644 --- a/test/core/resolver/binder_resolver_test.cc +++ b/test/core/resolver/binder_resolver_test.cc @@ -22,7 +22,7 @@ #include "gtest/gtest.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/orphanable.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" diff --git a/test/core/resolver/dns_resolver_cooldown_test.cc b/test/core/resolver/dns_resolver_cooldown_test.cc index e0e4f9981f9..e7d4dc79944 100644 --- a/test/core/resolver/dns_resolver_cooldown_test.cc +++ b/test/core/resolver/dns_resolver_cooldown_test.cc @@ -42,12 +42,12 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/no_destruct.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/work_serializer.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" diff --git a/test/core/resolver/dns_resolver_test.cc b/test/core/resolver/dns_resolver_test.cc index c44e4e36028..b0eed7686c8 100644 --- a/test/core/resolver/dns_resolver_test.cc +++ b/test/core/resolver/dns_resolver_test.cc @@ -30,8 +30,8 @@ #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/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/work_serializer.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" diff --git a/test/core/resolver/fake_resolver_test.cc b/test/core/resolver/fake_resolver_test.cc index 83da4160716..cb58b074246 100644 --- a/test/core/resolver/fake_resolver_test.cc +++ b/test/core/resolver/fake_resolver_test.cc @@ -41,10 +41,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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/work_serializer.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" diff --git a/test/core/resolver/google_c2p_resolver_test.cc b/test/core/resolver/google_c2p_resolver_test.cc index a95843b588c..96ddc587c4e 100644 --- a/test/core/resolver/google_c2p_resolver_test.cc +++ b/test/core/resolver/google_c2p_resolver_test.cc @@ -32,7 +32,7 @@ #include #include -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "test/core/test_util/fake_udp_and_tcp_server.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/resolver/sockaddr_resolver_test.cc b/test/core/resolver/sockaddr_resolver_test.cc index 35540314dbf..f35127113ad 100644 --- a/test/core/resolver/sockaddr_resolver_test.cc +++ b/test/core/resolver/sockaddr_resolver_test.cc @@ -27,8 +27,8 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/work_serializer.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" diff --git a/test/core/resource_quota/arena_test.cc b/test/core/resource_quota/arena_test.cc index 4c602b48e2b..c796ff2e7d7 100644 --- a/test/core/resource_quota/arena_test.cc +++ b/test/core/resource_quota/arena_test.cc @@ -35,8 +35,8 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/thd.h" +#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 "test/core/test_util/test_config.h" diff --git a/test/core/resource_quota/memory_quota_fuzzer.cc b/test/core/resource_quota/memory_quota_fuzzer.cc index 912e3508065..60026f5eda2 100644 --- a/test/core/resource_quota/memory_quota_fuzzer.cc +++ b/test/core/resource_quota/memory_quota_fuzzer.cc @@ -31,7 +31,7 @@ #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/config.h" -#include "src/core/lib/gprpp/debug_location.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" diff --git a/test/core/resource_quota/memory_quota_stress_test.cc b/test/core/resource_quota/memory_quota_stress_test.cc index ab1634c3775..123b18425a4 100644 --- a/test/core/resource_quota/memory_quota_stress_test.cc +++ b/test/core/resource_quota/memory_quota_stress_test.cc @@ -33,7 +33,7 @@ #include #include -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/security/alts_credentials_fuzzer.cc b/test/core/security/alts_credentials_fuzzer.cc index 4ad08a367ba..f38015dc83f 100644 --- a/test/core/security/alts_credentials_fuzzer.cc +++ b/test/core/security/alts_credentials_fuzzer.cc @@ -27,8 +27,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.h" +#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" diff --git a/test/core/security/alts_security_connector_test.cc b/test/core/security/alts_security_connector_test.cc index 3fa83df1e65..785d1a91718 100644 --- a/test/core/security/alts_security_connector_test.cc +++ b/test/core/security/alts_security_connector_test.cc @@ -29,7 +29,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#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" diff --git a/test/core/security/auth_context_test.cc b/test/core/security/auth_context_test.cc index ea9be077e24..dbe29154468 100644 --- a/test/core/security/auth_context_test.cc +++ b/test/core/security/auth_context_test.cc @@ -22,8 +22,8 @@ #include "absl/log/log.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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 1627aa67b67..a2c3755464a 100644 --- a/test/core/security/check_gcp_environment_linux_test.cc +++ b/test/core/security/check_gcp_environment_linux_test.cc @@ -25,7 +25,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" #include "src/core/util/tmpfile.h" diff --git a/test/core/security/check_gcp_environment_windows_test.cc b/test/core/security/check_gcp_environment_windows_test.cc index d046565d8ab..578aac9b8a0 100644 --- a/test/core/security/check_gcp_environment_windows_test.cc +++ b/test/core/security/check_gcp_environment_windows_test.cc @@ -25,7 +25,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" #include "src/core/util/tmpfile.h" diff --git a/test/core/security/create_jwt.cc b/test/core/security/create_jwt.cc index a8f48a9d179..fddc73be66a 100644 --- a/test/core/security/create_jwt.cc +++ b/test/core/security/create_jwt.cc @@ -24,7 +24,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/security/credentials/jwt/jwt_credentials.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 dc69d2f753f..bb0395c116b 100644 --- a/test/core/security/credentials_test.cc +++ b/test/core/security/credentials_test.cc @@ -42,11 +42,11 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/unique_type_name.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" diff --git a/test/core/security/fetch_oauth2.cc b/test/core/security/fetch_oauth2.cc index 8faad222de3..f9c5c661f7b 100644 --- a/test/core/security/fetch_oauth2.cc +++ b/test/core/security/fetch_oauth2.cc @@ -30,7 +30,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#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" diff --git a/test/core/security/grpc_alts_credentials_options_test.cc b/test/core/security/grpc_alts_credentials_options_test.cc index 4168ffe7244..c5f92b9809b 100644 --- a/test/core/security/grpc_alts_credentials_options_test.cc +++ b/test/core/security/grpc_alts_credentials_options_test.cc @@ -27,7 +27,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #define ALTS_CLIENT_OPTIONS_TEST_TARGET_SERVICE_ACCOUNT_1 "abc@google.com" #define ALTS_CLIENT_OPTIONS_TEST_TARGET_SERVICE_ACCOUNT_2 "def@google.com" diff --git a/test/core/security/grpc_tls_certificate_distributor_test.cc b/test/core/security/grpc_tls_certificate_distributor_test.cc index f43b15f38a9..4061b93dca9 100644 --- a/test/core/security/grpc_tls_certificate_distributor_test.cc +++ b/test/core/security/grpc_tls_certificate_distributor_test.cc @@ -30,7 +30,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/slice/slice_internal.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 ed0621fef74..b59a872403a 100644 --- a/test/core/security/grpc_tls_certificate_provider_test.cc +++ b/test/core/security/grpc_tls_certificate_provider_test.cc @@ -28,7 +28,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/util/tmpfile.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/security/grpc_tls_certificate_verifier_test.cc b/test/core/security/grpc_tls_certificate_verifier_test.cc index e775fe7a847..23c0c4a766c 100644 --- a/test/core/security/grpc_tls_certificate_verifier_test.cc +++ b/test/core/security/grpc_tls_certificate_verifier_test.cc @@ -27,7 +27,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#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/tmpfile.h" diff --git a/test/core/security/grpc_tls_credentials_options_test.cc b/test/core/security/grpc_tls_credentials_options_test.cc index 4dde2e18b97..b5b02dfd184 100644 --- a/test/core/security/grpc_tls_credentials_options_test.cc +++ b/test/core/security/grpc_tls_credentials_options_test.cc @@ -28,7 +28,7 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/crash.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/tmpfile.h" diff --git a/test/core/security/json_token_test.cc b/test/core/security/json_token_test.cc index 95e01826c57..fab11a830ae 100644 --- a/test/core/security/json_token_test.cc +++ b/test/core/security/json_token_test.cc @@ -31,7 +31,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#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/json/json.h" diff --git a/test/core/security/jwt_verifier_test.cc b/test/core/security/jwt_verifier_test.cc index 792fbe670cf..2c83a10539a 100644 --- a/test/core/security/jwt_verifier_test.cc +++ b/test/core/security/jwt_verifier_test.cc @@ -30,7 +30,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/security/credentials/jwt/json_token.h" #include "src/core/util/http_client/httpcli.h" #include "src/core/util/json/json_reader.h" diff --git a/test/core/security/oauth2_utils.cc b/test/core/security/oauth2_utils.cc index b135ac3eef2..f8888a7b8bc 100644 --- a/test/core/security/oauth2_utils.cc +++ b/test/core/security/oauth2_utils.cc @@ -30,8 +30,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/notification.h" +#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" diff --git a/test/core/security/print_google_default_creds_token.cc b/test/core/security/print_google_default_creds_token.cc index b1636f0b5d5..cd78b60c7b0 100644 --- a/test/core/security/print_google_default_creds_token.cc +++ b/test/core/security/print_google_default_creds_token.cc @@ -29,7 +29,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#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" diff --git a/test/core/security/rbac_translator_test.cc b/test/core/security/rbac_translator_test.cc index 49e9c21a10a..2bdf9c688a0 100644 --- a/test/core/security/rbac_translator_test.cc +++ b/test/core/security/rbac_translator_test.cc @@ -24,7 +24,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/security/authorization/audit_logging.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" diff --git a/test/core/security/secure_endpoint_test.cc b/test/core/security/secure_endpoint_test.cc index 80168ebdfb1..49c0c71a2f2 100644 --- a/test/core/security/secure_endpoint_test.cc +++ b/test/core/security/secure_endpoint_test.cc @@ -28,7 +28,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#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" diff --git a/test/core/security/security_connector_test.cc b/test/core/security/security_connector_test.cc index 63d14a065fc..d2432fad382 100644 --- a/test/core/security/security_connector_test.cc +++ b/test/core/security/security_connector_test.cc @@ -31,8 +31,8 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" diff --git a/test/core/security/ssl_credentials_test.cc b/test/core/security/ssl_credentials_test.cc index 2a62fe4a8d8..3a4662c14ea 100644 --- a/test/core/security/ssl_credentials_test.cc +++ b/test/core/security/ssl_credentials_test.cc @@ -27,7 +27,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#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 "test/core/test_util/test_config.h" diff --git a/test/core/security/ssl_server_fuzzer.cc b/test/core/security/ssl_server_fuzzer.cc index 429911d2ccb..7e60e39f401 100644 --- a/test/core/security/ssl_server_fuzzer.cc +++ b/test/core/security/ssl_server_fuzzer.cc @@ -24,8 +24,8 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/notification.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 "test/core/test_util/mock_endpoint.h" diff --git a/test/core/security/system_roots_test.cc b/test/core/security/system_roots_test.cc index 7dfaae7b92d..dccedfb9518 100644 --- a/test/core/security/system_roots_test.cc +++ b/test/core/security/system_roots_test.cc @@ -34,9 +34,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/load_file.h" +#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" diff --git a/test/core/security/tls_security_connector_test.cc b/test/core/security/tls_security_connector_test.cc index 9bc1961b3e7..7a5ed5c0ae4 100644 --- a/test/core/security/tls_security_connector_test.cc +++ b/test/core/security/tls_security_connector_test.cc @@ -33,8 +33,8 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/unique_type_name.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" diff --git a/test/core/security/verify_jwt.cc b/test/core/security/verify_jwt.cc index 5a322f39fa8..54cb9b702e1 100644 --- a/test/core/security/verify_jwt.cc +++ b/test/core/security/verify_jwt.cc @@ -28,7 +28,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#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" diff --git a/test/core/service_config/service_config_test.cc b/test/core/service_config/service_config_test.cc index d20b92ae55c..1c8e26e0ce6 100644 --- a/test/core/service_config/service_config_test.cc +++ b/test/core/service_config/service_config_test.cc @@ -32,8 +32,8 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/validation_errors.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" diff --git a/test/core/slice/slice_test.cc b/test/core/slice/slice_test.cc index 44c139d8c07..f8aa55f5697 100644 --- a/test/core/slice/slice_test.cc +++ b/test/core/slice/slice_test.cc @@ -36,8 +36,8 @@ #include #include -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/gprpp/no_destruct.h" +#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 "test/core/test_util/build.h" diff --git a/test/core/surface/completion_queue_threading_test.cc b/test/core/surface/completion_queue_threading_test.cc index ad81f5194f9..170939e4c43 100644 --- a/test/core/surface/completion_queue_threading_test.cc +++ b/test/core/surface/completion_queue_threading_test.cc @@ -30,8 +30,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/thd.h" +#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/useful.h" diff --git a/test/core/surface/concurrent_connectivity_test.cc b/test/core/surface/concurrent_connectivity_test.cc index 33bc43d2752..8d381d1cc3a 100644 --- a/test/core/surface/concurrent_connectivity_test.cc +++ b/test/core/surface/concurrent_connectivity_test.cc @@ -37,8 +37,8 @@ #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/lib/gprpp/thd.h" -#include "src/core/lib/gprpp/time.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" diff --git a/test/core/surface/lame_client_test.cc b/test/core/surface/lame_client_test.cc index 44c723059bf..a891838e3cc 100644 --- a/test/core/surface/lame_client_test.cc +++ b/test/core/surface/lame_client_test.cc @@ -32,7 +32,7 @@ #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/lib/gprpp/orphanable.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" diff --git a/test/core/surface/num_external_connectivity_watchers_test.cc b/test/core/surface/num_external_connectivity_watchers_test.cc index d2ebf533b01..a0094d6e232 100644 --- a/test/core/surface/num_external_connectivity_watchers_test.cc +++ b/test/core/surface/num_external_connectivity_watchers_test.cc @@ -31,7 +31,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/host_port.h" +#include "src/core/util/host_port.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/test_util/port.h" diff --git a/test/core/surface/sequential_connectivity_test.cc b/test/core/surface/sequential_connectivity_test.cc index 79accd74c3d..54f9ae0dee6 100644 --- a/test/core/surface/sequential_connectivity_test.cc +++ b/test/core/surface/sequential_connectivity_test.cc @@ -33,8 +33,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/thd.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" diff --git a/test/core/surface/server_chttp2_test.cc b/test/core/surface/server_chttp2_test.cc index d3fd84b544b..35822ef9cb0 100644 --- a/test/core/surface/server_chttp2_test.cc +++ b/test/core/surface/server_chttp2_test.cc @@ -27,7 +27,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/host_port.h" +#include "src/core/util/host_port.h" #include "src/core/lib/security/credentials/fake/fake_credentials.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 958d033cef0..8749d247d33 100644 --- a/test/core/surface/server_test.cc +++ b/test/core/surface/server_test.cc @@ -34,7 +34,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/host_port.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" diff --git a/test/core/telemetry/call_tracer_test.cc b/test/core/telemetry/call_tracer_test.cc index 3adbc5d6204..758421510a6 100644 --- a/test/core/telemetry/call_tracer_test.cc +++ b/test/core/telemetry/call_tracer_test.cc @@ -25,7 +25,7 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#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" diff --git a/test/core/test_util/cmdline.cc b/test/core/test_util/cmdline.cc index b635870c384..fca3fee5f8e 100644 --- a/test/core/test_util/cmdline.cc +++ b/test/core/test_util/cmdline.cc @@ -34,7 +34,7 @@ #include #include -#include "src/core/lib/gprpp/memory.h" +#include "src/core/util/memory.h" typedef enum { ARGTYPE_INT, ARGTYPE_BOOL, ARGTYPE_STRING } argtype; diff --git a/test/core/test_util/evaluate_args_test_util.h b/test/core/test_util/evaluate_args_test_util.h index 1bd6438f1aa..a960fa8d2e8 100644 --- a/test/core/test_util/evaluate_args_test_util.h +++ b/test/core/test_util/evaluate_args_test_util.h @@ -27,7 +27,7 @@ #include "src/core/handshaker/endpoint_info/endpoint_info_handshaker.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" diff --git a/test/core/test_util/fake_stats_plugin.h b/test/core/test_util/fake_stats_plugin.h index 045fffa443e..42f1cbdba68 100644 --- a/test/core/test_util/fake_stats_plugin.h +++ b/test/core/test_util/fake_stats_plugin.h @@ -30,7 +30,7 @@ #include "gmock/gmock.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/lib/gprpp/ref_counted.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" diff --git a/test/core/test_util/fuzzer_corpus_test.cc b/test/core/test_util/fuzzer_corpus_test.cc index 0bdbf3a8c8f..bee7558cec5 100644 --- a/test/core/test_util/fuzzer_corpus_test.cc +++ b/test/core/test_util/fuzzer_corpus_test.cc @@ -35,7 +35,7 @@ #include #include -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "src/core/lib/iomgr/error.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/test_util/fuzzing_channel_args.h b/test/core/test_util/fuzzing_channel_args.h index 9b4eb78f0a4..40f99ba18de 100644 --- a/test/core/test_util/fuzzing_channel_args.h +++ b/test/core/test_util/fuzzing_channel_args.h @@ -20,7 +20,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "test/core/test_util/fuzzing_channel_args.pb.h" diff --git a/test/core/test_util/one_corpus_entry_fuzzer.cc b/test/core/test_util/one_corpus_entry_fuzzer.cc index 0737b779d1b..6e01feb32b6 100644 --- a/test/core/test_util/one_corpus_entry_fuzzer.cc +++ b/test/core/test_util/one_corpus_entry_fuzzer.cc @@ -23,7 +23,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/test_util/port.cc b/test/core/test_util/port.cc index ddecc426eb0..0d391eea0f7 100644 --- a/test/core/test_util/port.cc +++ b/test/core/test_util/port.cc @@ -30,7 +30,7 @@ #include #include -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "test/core/test_util/port.h" #include "test/core/test_util/port_server_client.h" diff --git a/test/core/test_util/port_isolated_runtime_environment.cc b/test/core/test_util/port_isolated_runtime_environment.cc index b037ab70e79..19655defdaa 100644 --- a/test/core/test_util/port_isolated_runtime_environment.cc +++ b/test/core/test_util/port_isolated_runtime_environment.cc @@ -30,7 +30,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/iomgr/port.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 175ae3e7dea..e9ace70e734 100644 --- a/test/core/test_util/port_server_client.cc +++ b/test/core/test_util/port_server_client.cc @@ -40,10 +40,10 @@ #include #include -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.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/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/test/core/test_util/scoped_env_var.h b/test/core/test_util/scoped_env_var.h index 0f5041ab119..6a7127a2faf 100644 --- a/test/core/test_util/scoped_env_var.h +++ b/test/core/test_util/scoped_env_var.h @@ -19,7 +19,7 @@ #include -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" namespace grpc_core { namespace testing { diff --git a/test/core/test_util/stack_tracer.cc b/test/core/test_util/stack_tracer.cc index 1960ce3353c..305a43c8fc4 100644 --- a/test/core/test_util/stack_tracer.cc +++ b/test/core/test_util/stack_tracer.cc @@ -26,7 +26,7 @@ #include -#include "src/core/lib/gprpp/examine_stack.h" +#include "src/core/util/examine_stack.h" namespace { diff --git a/test/core/test_util/test_config.cc b/test/core/test_util/test_config.cc index b816f5f1b10..c9686fcfb0b 100644 --- a/test/core/test_util/test_config.cc +++ b/test/core/test_util/test_config.cc @@ -32,7 +32,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/surface/init.h" #include "test/core/event_engine/test_init.h" #include "test/core/test_util/build.h" diff --git a/test/core/test_util/test_lb_policies.cc b/test/core/test_util/test_lb_policies.cc index a2677b1da0e..826e701797f 100644 --- a/test/core/test_util/test_lb_policies.cc +++ b/test/core/test_util/test_lb_policies.cc @@ -33,10 +33,10 @@ #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/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.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" diff --git a/test/core/test_util/test_tcp_server.cc b/test/core/test_util/test_tcp_server.cc index 41cb382dd46..d06abe27c00 100644 --- a/test/core/test_util/test_tcp_server.cc +++ b/test/core/test_util/test_tcp_server.cc @@ -34,7 +34,7 @@ #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/lib/gprpp/time.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" diff --git a/test/core/test_util/tls_utils.cc b/test/core/test_util/tls_utils.cc index 376ce9615ec..39f335a3ba3 100644 --- a/test/core/test_util/tls_utils.cc +++ b/test/core/test_util/tls_utils.cc @@ -26,7 +26,7 @@ #include #include -#include "src/core/lib/gprpp/load_file.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/util/tmpfile.h" diff --git a/test/core/test_util/tls_utils.h b/test/core/test_util/tls_utils.h index 6b1bc1f1fa2..e0f1aae1aef 100644 --- a/test/core/test_util/tls_utils.h +++ b/test/core/test_util/tls_utils.h @@ -28,8 +28,8 @@ #include #include -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/thd.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 933648a6a22..5fa7307f29d 100644 --- a/test/core/transport/binder/binder_transport_test.cc +++ b/test/core/transport/binder/binder_transport_test.cc @@ -32,7 +32,7 @@ #include #include "src/core/ext/transport/binder/transport/binder_stream.h" -#include "src/core/lib/gprpp/notification.h" +#include "src/core/util/notification.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "test/core/test_util/test_config.h" #include "test/core/transport/binder/mock_objects.h" diff --git a/test/core/transport/binder/end2end/fake_binder.cc b/test/core/transport/binder/end2end/fake_binder.cc index bc132e8fe07..6a5cc9698ac 100644 --- a/test/core/transport/binder/end2end/fake_binder.cc +++ b/test/core/transport/binder/end2end/fake_binder.cc @@ -19,7 +19,7 @@ #include "absl/log/log.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc_binder { namespace end2end_testing { diff --git a/test/core/transport/binder/end2end/fake_binder.h b/test/core/transport/binder/end2end/fake_binder.h index a50359e0f2f..6dbb532a230 100644 --- a/test/core/transport/binder/end2end/fake_binder.h +++ b/test/core/transport/binder/end2end/fake_binder.h @@ -66,8 +66,8 @@ #include "src/core/ext/transport/binder/wire_format/binder.h" #include "src/core/ext/transport/binder/wire_format/wire_reader.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/sync.h" +#include "src/core/util/thd.h" namespace grpc_binder { namespace end2end_testing { diff --git a/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h b/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h index 0196615e6f2..43ece12498d 100644 --- a/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h +++ b/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h @@ -28,7 +28,7 @@ #include "src/core/ext/transport/binder/wire_format/binder.h" #include "src/core/ext/transport/binder/wire_format/wire_reader.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "test/core/transport/binder/end2end/fuzzers/binder_transport_fuzzer.pb.h" namespace grpc_binder { 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 5edc758ee41..47f71557874 100644 --- a/test/core/transport/chaotic_good/chaotic_good_server_test.cc +++ b/test/core/transport/chaotic_good/chaotic_good_server_test.cc @@ -35,8 +35,8 @@ #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/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/time.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" 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 0dcc5595c07..5f324ed04e9 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,7 @@ #include "src/core/ext/transport/chaotic_good/client_transport.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" diff --git a/test/core/transport/chaotic_good/frame_fuzzer.cc b/test/core/transport/chaotic_good/frame_fuzzer.cc index 92dc762e4ac..8b6a1bedd8a 100644 --- a/test/core/transport/chaotic_good/frame_fuzzer.cc +++ b/test/core/transport/chaotic_good/frame_fuzzer.cc @@ -29,7 +29,7 @@ #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/lib/gprpp/ref_counted_ptr.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" diff --git a/test/core/transport/chaotic_good/server_transport_test.cc b/test/core/transport/chaotic_good/server_transport_test.cc index da80f94781f..1c21883b853 100644 --- a/test/core/transport/chaotic_good/server_transport_test.cc +++ b/test/core/transport/chaotic_good/server_transport_test.cc @@ -34,7 +34,7 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#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" diff --git a/test/core/transport/chttp2/flow_control_fuzzer.cc b/test/core/transport/chttp2/flow_control_fuzzer.cc index de541fed56e..ebfdd21e1c0 100644 --- a/test/core/transport/chttp2/flow_control_fuzzer.cc +++ b/test/core/transport/chttp2/flow_control_fuzzer.cc @@ -37,7 +37,7 @@ #include "src/core/ext/transport/chttp2/transport/flow_control.h" #include "src/core/lib/experiments/config.h" -#include "src/core/lib/gprpp/time.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" diff --git a/test/core/transport/chttp2/flow_control_test.cc b/test/core/transport/chttp2/flow_control_test.cc index 75652fcfb16..59ef2347072 100644 --- a/test/core/transport/chttp2/flow_control_test.cc +++ b/test/core/transport/chttp2/flow_control_test.cc @@ -23,8 +23,8 @@ #include #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.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" diff --git a/test/core/transport/chttp2/graceful_shutdown_test.cc b/test/core/transport/chttp2/graceful_shutdown_test.cc index b817a2fccf1..ad59868d959 100644 --- a/test/core/transport/chttp2/graceful_shutdown_test.cc +++ b/test/core/transport/chttp2/graceful_shutdown_test.cc @@ -49,9 +49,9 @@ #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/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/sync.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" diff --git a/test/core/transport/chttp2/hpack_encoder_test.cc b/test/core/transport/chttp2/hpack_encoder_test.cc index 68a3e4fd93b..a2d887ae928 100644 --- a/test/core/transport/chttp2/hpack_encoder_test.cc +++ b/test/core/transport/chttp2/hpack_encoder_test.cc @@ -32,7 +32,7 @@ #include #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" diff --git a/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc b/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc index 1b21b228935..acbbf3e851b 100644 --- a/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc +++ b/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc @@ -32,8 +32,8 @@ #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" #include "src/core/lib/experiments/config.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.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" 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 4094a669b3c..2c7350368e5 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,8 @@ #include #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.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" diff --git a/test/core/transport/chttp2/hpack_parser_test.cc b/test/core/transport/chttp2/hpack_parser_test.cc index d735ebc2b7c..ea25b599f5c 100644 --- a/test/core/transport/chttp2/hpack_parser_test.cc +++ b/test/core/transport/chttp2/hpack_parser_test.cc @@ -36,9 +36,9 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.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/exec_ctx.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" diff --git a/test/core/transport/chttp2/hpack_sync_fuzzer.cc b/test/core/transport/chttp2/hpack_sync_fuzzer.cc index 230ddc8a5cb..fed74a8150e 100644 --- a/test/core/transport/chttp2/hpack_sync_fuzzer.cc +++ b/test/core/transport/chttp2/hpack_sync_fuzzer.cc @@ -34,8 +34,8 @@ #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/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.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" diff --git a/test/core/transport/chttp2/ping_callbacks_test.cc b/test/core/transport/chttp2/ping_callbacks_test.cc index cd75e9673b2..a0dd7bbd1ed 100644 --- a/test/core/transport/chttp2/ping_callbacks_test.cc +++ b/test/core/transport/chttp2/ping_callbacks_test.cc @@ -20,7 +20,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "test/core/event_engine/mock_event_engine.h" using grpc_event_engine::experimental::EventEngine; diff --git a/test/core/transport/chttp2/ping_configuration_test.cc b/test/core/transport/chttp2/ping_configuration_test.cc index 83acda3b566..b898743460a 100644 --- a/test/core/transport/chttp2/ping_configuration_test.cc +++ b/test/core/transport/chttp2/ping_configuration_test.cc @@ -28,7 +28,7 @@ #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/lib/gprpp/time.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" diff --git a/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc b/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc index 56cf4721205..291add0aaef 100644 --- a/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc +++ b/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc @@ -45,8 +45,8 @@ #include "src/core/ext/transport/chttp2/transport/flow_control.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/host_port.h" +#include "src/core/util/sync.h" #include "test/core/test_util/port.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 e884f623fca..acfe8e1228f 100644 --- a/test/core/transport/chttp2/settings_timeout_test.cc +++ b/test/core/transport/chttp2/settings_timeout_test.cc @@ -45,8 +45,8 @@ #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/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.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" diff --git a/test/core/transport/chttp2/stream_leak_with_queued_flow_control_update_test.cc b/test/core/transport/chttp2/stream_leak_with_queued_flow_control_update_test.cc index 0bae088a3aa..178e29de625 100644 --- a/test/core/transport/chttp2/stream_leak_with_queued_flow_control_update_test.cc +++ b/test/core/transport/chttp2/stream_leak_with_queued_flow_control_update_test.cc @@ -36,8 +36,8 @@ #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/host_port.h" +#include "src/core/util/sync.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 dd859111bb9..54a45855119 100644 --- a/test/core/transport/chttp2/streams_not_seen_test.cc +++ b/test/core/transport/chttp2/streams_not_seen_test.cc @@ -56,11 +56,11 @@ #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/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.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" diff --git a/test/core/transport/chttp2/too_many_pings_test.cc b/test/core/transport/chttp2/too_many_pings_test.cc index 32669c59e1a..92ea1a91b7e 100644 --- a/test/core/transport/chttp2/too_many_pings_test.cc +++ b/test/core/transport/chttp2/too_many_pings_test.cc @@ -47,10 +47,10 @@ #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/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.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" diff --git a/test/core/transport/error_utils_test.cc b/test/core/transport/error_utils_test.cc index 0817f34ee53..5ec1be5330b 100644 --- a/test/core/transport/error_utils_test.cc +++ b/test/core/transport/error_utils_test.cc @@ -23,7 +23,7 @@ #include "absl/status/status.h" #include "gtest/gtest.h" -#include "src/core/lib/gprpp/status_helper.h" +#include "src/core/util/status_helper.h" #include "src/core/lib/iomgr/error.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/transport/metadata_map_test.cc b/test/core/transport/metadata_map_test.cc index 12e42c7167a..9a7200150d8 100644 --- a/test/core/transport/metadata_map_test.cc +++ b/test/core/transport/metadata_map_test.cc @@ -28,8 +28,8 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" +#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" diff --git a/test/core/transport/timeout_encoding_test.cc b/test/core/transport/timeout_encoding_test.cc index 0f03dfa7b3f..6de2dcd0398 100644 --- a/test/core/transport/timeout_encoding_test.cc +++ b/test/core/transport/timeout_encoding_test.cc @@ -24,7 +24,7 @@ #include "absl/strings/string_view.h" #include "gtest/gtest.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.cc b/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.cc index e7f58d93c94..1c2c8892e4c 100644 --- a/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.cc +++ b/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.cc @@ -33,7 +33,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "test/core/tsi/alts/fake_handshaker/handshaker.grpc.pb.h" #include "test/core/tsi/alts/fake_handshaker/handshaker.pb.h" #include "test/core/tsi/alts/fake_handshaker/transport_security_common.pb.h" diff --git a/test/core/tsi/alts/fake_handshaker/fake_handshaker_server_main.cc b/test/core/tsi/alts/fake_handshaker/fake_handshaker_server_main.cc index 711ca4206d1..4e8df4b23f0 100644 --- a/test/core/tsi/alts/fake_handshaker/fake_handshaker_server_main.cc +++ b/test/core/tsi/alts/fake_handshaker/fake_handshaker_server_main.cc @@ -24,7 +24,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" #include "test/core/tsi/alts/fake_handshaker/fake_handshaker_server.h" #include "test/cpp/util/test_config.h" diff --git a/test/core/tsi/alts/frame_protector/alts_counter_test.cc b/test/core/tsi/alts/frame_protector/alts_counter_test.cc index baa516d27f6..832795d4566 100644 --- a/test/core/tsi/alts/frame_protector/alts_counter_test.cc +++ b/test/core/tsi/alts/frame_protector/alts_counter_test.cc @@ -23,7 +23,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "test/core/tsi/alts/crypt/gsec_test_util.h" const size_t kSmallCounterSize = 4; 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 132fea59e69..38c76311389 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,7 +25,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/tsi/alts/crypt/gsec.h" #include "src/core/tsi/transport_security_interface.h" #include "test/core/tsi/alts/crypt/gsec_test_util.h" diff --git a/test/core/tsi/alts/frame_protector/frame_handler_test.cc b/test/core/tsi/alts/frame_protector/frame_handler_test.cc index b5ddb31b9b6..44a680be5e5 100644 --- a/test/core/tsi/alts/frame_protector/frame_handler_test.cc +++ b/test/core/tsi/alts/frame_protector/frame_handler_test.cc @@ -29,7 +29,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" #include "test/core/tsi/alts/crypt/gsec_test_util.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 65a32533d42..3f82d175627 100644 --- a/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc +++ b/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc @@ -47,9 +47,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/thd.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/error.h" #include "src/core/lib/security/credentials/alts/alts_credentials.h" #include "src/core/lib/security/credentials/credentials.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 1d2248a4617..95a6853b8c8 100644 --- a/test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc +++ b/test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc @@ -26,7 +26,7 @@ #include #include -#include "src/core/lib/gprpp/env.h" +#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" 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 59479f0c7fb..6bf8226e27a 100644 --- a/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc +++ b/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc @@ -28,7 +28,7 @@ #include #include -#include "src/core/lib/gprpp/thd.h" +#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" diff --git a/test/core/tsi/crl_ssl_transport_security_test.cc b/test/core/tsi/crl_ssl_transport_security_test.cc index e314218e2d2..0fb733cd757 100644 --- a/test/core/tsi/crl_ssl_transport_security_test.cc +++ b/test/core/tsi/crl_ssl_transport_security_test.cc @@ -32,7 +32,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#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" diff --git a/test/core/tsi/fake_transport_security_test.cc b/test/core/tsi/fake_transport_security_test.cc index 711a8f2cdbe..9751ab11ebf 100644 --- a/test/core/tsi/fake_transport_security_test.cc +++ b/test/core/tsi/fake_transport_security_test.cc @@ -28,7 +28,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/tsi/transport_security.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/tsi/ssl_session_cache_test.cc b/test/core/tsi/ssl_session_cache_test.cc index 91af924adb9..ba466bc31c6 100644 --- a/test/core/tsi/ssl_session_cache_test.cc +++ b/test/core/tsi/ssl_session_cache_test.cc @@ -28,7 +28,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/tsi/ssl_transport_security_test.cc b/test/core/tsi/ssl_transport_security_test.cc index a66720e0ca0..c4722cca2f6 100644 --- a/test/core/tsi/ssl_transport_security_test.cc +++ b/test/core/tsi/ssl_transport_security_test.cc @@ -34,7 +34,7 @@ #include #include -#include "src/core/lib/gprpp/memory.h" +#include "src/core/util/memory.h" #include "src/core/tsi/transport_security.h" #include "src/core/tsi/transport_security_interface.h" #include "test/core/test_util/build.h" diff --git a/test/core/tsi/ssl_transport_security_utils_test.cc b/test/core/tsi/ssl_transport_security_utils_test.cc index 5b64dc212df..ab449f4ac2e 100644 --- a/test/core/tsi/ssl_transport_security_utils_test.cc +++ b/test/core/tsi/ssl_transport_security_utils_test.cc @@ -34,7 +34,7 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" -#include "src/core/lib/gprpp/load_file.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" diff --git a/test/core/tsi/transport_security_test.cc b/test/core/tsi/transport_security_test.cc index 8d9e1bed6e6..25e8782bd85 100644 --- a/test/core/tsi/transport_security_test.cc +++ b/test/core/tsi/transport_security_test.cc @@ -31,7 +31,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#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/string.h" diff --git a/test/core/tsi/transport_security_test_lib.cc b/test/core/tsi/transport_security_test_lib.cc index 946c09f6e2e..2f97326fad9 100644 --- a/test/core/tsi/transport_security_test_lib.cc +++ b/test/core/tsi/transport_security_test_lib.cc @@ -38,8 +38,8 @@ #include #include "src/core/handshaker/security/tsi_error.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/memory.h" +#include "src/core/util/crash.h" +#include "src/core/util/memory.h" static void notification_signal(tsi_test_fixture* fixture) { gpr_mu_lock(&fixture->mu); diff --git a/test/core/util/cpu_test.cc b/test/core/util/cpu_test.cc index b71922e4594..1c480304f47 100644 --- a/test/core/util/cpu_test.cc +++ b/test/core/util/cpu_test.cc @@ -34,7 +34,7 @@ #include #include -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/thd.h" #include "test/core/test_util/test_config.h" // Test structure is essentially: diff --git a/test/core/util/env_test.cc b/test/core/util/env_test.cc index b3f09966c07..df82aa37752 100644 --- a/test/core/util/env_test.cc +++ b/test/core/util/env_test.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "absl/log/log.h" #include "gtest/gtest.h" diff --git a/test/core/util/log_test.cc b/test/core/util/log_test.cc index fa39d2c28ed..e692e37c9d8 100644 --- a/test/core/util/log_test.cc +++ b/test/core/util/log_test.cc @@ -26,7 +26,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" static bool log_func_reached = false; diff --git a/test/core/util/spinlock_test.cc b/test/core/util/spinlock_test.cc index 6e8be4a853e..da7c4b4ca57 100644 --- a/test/core/util/spinlock_test.cc +++ b/test/core/util/spinlock_test.cc @@ -30,7 +30,7 @@ #include #include -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/thd.h" #include "test/core/test_util/test_config.h" // ------------------------------------------------- diff --git a/test/core/util/sync_test.cc b/test/core/util/sync_test.cc index 32f44c56a9e..256664302e2 100644 --- a/test/core/util/sync_test.cc +++ b/test/core/util/sync_test.cc @@ -29,7 +29,7 @@ #include #include -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/thd.h" #include "test/core/test_util/test_config.h" // ==================Example use of interface=================== diff --git a/test/core/xds/certificate_provider_store_test.cc b/test/core/xds/certificate_provider_store_test.cc index adcd41f3833..1e67242b50f 100644 --- a/test/core/xds/certificate_provider_store_test.cc +++ b/test/core/xds/certificate_provider_store_test.cc @@ -30,7 +30,7 @@ #include #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/unique_type_name.h" +#include "src/core/util/unique_type_name.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/xds/xds_audit_logger_registry_test.cc b/test/core/xds/xds_audit_logger_registry_test.cc index 15089f371ac..0de9538e2f5 100644 --- a/test/core/xds/xds_audit_logger_registry_test.cc +++ b/test/core/xds/xds_audit_logger_registry_test.cc @@ -36,7 +36,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/security/authorization/audit_logging.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" diff --git a/test/core/xds/xds_bootstrap_test.cc b/test/core/xds/xds_bootstrap_test.cc index 529bcbeef1e..392386dd1e1 100644 --- a/test/core/xds/xds_bootstrap_test.cc +++ b/test/core/xds/xds_bootstrap_test.cc @@ -36,9 +36,9 @@ #include #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/validation_errors.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" diff --git a/test/core/xds/xds_certificate_provider_test.cc b/test/core/xds/xds_certificate_provider_test.cc index a005b1d0f6c..505b24d61d1 100644 --- a/test/core/xds/xds_certificate_provider_test.cc +++ b/test/core/xds/xds_certificate_provider_test.cc @@ -25,7 +25,7 @@ #include -#include "src/core/lib/gprpp/status_helper.h" +#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/useful.h" diff --git a/test/core/xds/xds_client_fuzzer.cc b/test/core/xds/xds_client_fuzzer.cc index f7b3e2fc48e..186dd5106d9 100644 --- a/test/core/xds/xds_client_fuzzer.cc +++ b/test/core/xds/xds_client_fuzzer.cc @@ -31,8 +31,8 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_cluster.h" #include "src/core/xds/grpc/xds_endpoint.h" diff --git a/test/core/xds/xds_client_test.cc b/test/core/xds/xds_client_test.cc index f0e0022988e..48d997d0d60 100644 --- a/test/core/xds/xds_client_test.cc +++ b/test/core/xds/xds_client_test.cc @@ -48,9 +48,9 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/match.h" -#include "src/core/lib/gprpp/sync.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" diff --git a/test/core/xds/xds_cluster_resource_type_test.cc b/test/core/xds/xds_cluster_resource_type_test.cc index 34fce7801cf..1a0f833195f 100644 --- a/test/core/xds/xds_cluster_resource_type_test.cc +++ b/test/core/xds/xds_cluster_resource_type_test.cc @@ -36,9 +36,9 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.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/json/json.h" diff --git a/test/core/xds/xds_common_types_test.cc b/test/core/xds/xds_common_types_test.cc index cefbb4f30bd..08d50cc3240 100644 --- a/test/core/xds/xds_common_types_test.cc +++ b/test/core/xds/xds_common_types_test.cc @@ -39,10 +39,10 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.h" +#include "src/core/util/crash.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" diff --git a/test/core/xds/xds_endpoint_resource_type_test.cc b/test/core/xds/xds_endpoint_resource_type_test.cc index 31596773e43..457f2f49463 100644 --- a/test/core/xds/xds_endpoint_resource_type_test.cc +++ b/test/core/xds/xds_endpoint_resource_type_test.cc @@ -38,8 +38,8 @@ #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/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" diff --git a/test/core/xds/xds_http_filters_test.cc b/test/core/xds/xds_http_filters_test.cc index dd3dc0943bd..9c1d66f5b96 100644 --- a/test/core/xds/xds_http_filters_test.cc +++ b/test/core/xds/xds_http_filters_test.cc @@ -45,8 +45,8 @@ #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/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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/json/json_writer.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" diff --git a/test/core/xds/xds_lb_policy_registry_test.cc b/test/core/xds/xds_lb_policy_registry_test.cc index 54053afe0de..e8c8a7300bc 100644 --- a/test/core/xds/xds_lb_policy_registry_test.cc +++ b/test/core/xds/xds_lb_policy_registry_test.cc @@ -35,10 +35,10 @@ #include #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/validation_errors.h" +#include "src/core/util/crash.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" diff --git a/test/core/xds/xds_listener_resource_type_test.cc b/test/core/xds/xds_listener_resource_type_test.cc index 6db6680c8ae..5b40a3565b3 100644 --- a/test/core/xds/xds_listener_resource_type_test.cc +++ b/test/core/xds/xds_listener_resource_type_test.cc @@ -40,9 +40,9 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.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/json/json.h" #include "src/core/util/json/json_writer.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 ea59d519333..9de295bbad4 100644 --- a/test/core/xds/xds_route_config_resource_type_test.cc +++ b/test/core/xds/xds_route_config_resource_type_test.cc @@ -45,9 +45,9 @@ #include "src/core/lib/channel/status_util.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.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/matchers.h" #include "src/core/util/json/json_writer.h" diff --git a/test/core/xds/xds_transport_fake.cc b/test/core/xds/xds_transport_fake.cc index bd6c21730fc..5961765572d 100644 --- a/test/core/xds/xds_transport_fake.cc +++ b/test/core/xds/xds_transport_fake.cc @@ -30,8 +30,8 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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/core/xds/xds_transport_fake.h b/test/core/xds/xds_transport_fake.h index 54c75c92d86..dc4d9c87772 100644 --- a/test/core/xds/xds_transport_fake.h +++ b/test/core/xds/xds_transport_fake.h @@ -34,10 +34,10 @@ #include -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.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/xds/xds_client/xds_bootstrap.h" #include "src/core/xds/xds_client/xds_transport.h" diff --git a/test/cpp/client/credentials_test.cc b/test/cpp/client/credentials_test.cc index 10b0c80e066..866fe098f94 100644 --- a/test/cpp/client/credentials_test.cc +++ b/test/cpp/client/credentials_test.cc @@ -31,7 +31,7 @@ #include #include -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "src/core/util/tmpfile.h" #include "src/cpp/client/secure_credentials.h" #include "test/cpp/util/tls_test_utils.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 a41aa0011a0..28cff12cec6 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,9 +39,9 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/thd.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" diff --git a/test/cpp/cocoapods/generic/generic.mm b/test/cpp/cocoapods/generic/generic.mm index e7baa8f4919..6d81dac0332 100644 --- a/test/cpp/cocoapods/generic/generic.mm +++ b/test/cpp/cocoapods/generic/generic.mm @@ -32,7 +32,7 @@ #include #include -#include "src/core/lib/gprpp/thd.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/alarm_test.cc b/test/cpp/common/alarm_test.cc index c9ec2bb6508..63eb170dfc1 100644 --- a/test/cpp/common/alarm_test.cc +++ b/test/cpp/common/alarm_test.cc @@ -26,7 +26,7 @@ #include #include -#include "src/core/lib/gprpp/notification.h" +#include "src/core/util/notification.h" #include "test/core/test_util/test_config.h" namespace grpc { diff --git a/test/cpp/common/time_jump_test.cc b/test/cpp/common/time_jump_test.cc index ef7adb4ad02..1c90a1ed5d3 100644 --- a/test/cpp/common/time_jump_test.cc +++ b/test/cpp/common/time_jump_test.cc @@ -31,8 +31,8 @@ #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.h" +#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" diff --git a/test/cpp/common/timer_test.cc b/test/cpp/common/timer_test.cc index 3cc129cefb2..2a85feff04b 100644 --- a/test/cpp/common/timer_test.cc +++ b/test/cpp/common/timer_test.cc @@ -25,8 +25,8 @@ #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/time.h" +#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" diff --git a/test/cpp/end2end/async_end2end_test.cc b/test/cpp/end2end/async_end2end_test.cc index b4f7657ecfc..04ad724b359 100644 --- a/test/cpp/end2end/async_end2end_test.cc +++ b/test/cpp/end2end/async_end2end_test.cc @@ -39,8 +39,8 @@ #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/debug_location.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" diff --git a/test/cpp/end2end/cfstream_test.cc b/test/cpp/end2end/cfstream_test.cc index b9de014cca5..8314e2e4ee7 100644 --- a/test/cpp/end2end/cfstream_test.cc +++ b/test/cpp/end2end/cfstream_test.cc @@ -40,8 +40,8 @@ #include #include "src/core/util/backoff.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.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" diff --git a/test/cpp/end2end/channelz_service_test.cc b/test/cpp/end2end/channelz_service_test.cc index 98a6fff4436..4e35c9f812e 100644 --- a/test/cpp/end2end/channelz_service_test.cc +++ b/test/cpp/end2end/channelz_service_test.cc @@ -36,7 +36,7 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/env.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" diff --git a/test/cpp/end2end/client_callback_end2end_test.cc b/test/cpp/end2end/client_callback_end2end_test.cc index 88ce497a590..ac091c26d12 100644 --- a/test/cpp/end2end/client_callback_end2end_test.cc +++ b/test/cpp/end2end/client_callback_end2end_test.cc @@ -39,7 +39,7 @@ #include #include -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/end2end/client_crash_test.cc b/test/cpp/end2end/client_crash_test.cc index 21a118e9e72..7124bfafbc2 100644 --- a/test/cpp/end2end/client_crash_test.cc +++ b/test/cpp/end2end/client_crash_test.cc @@ -31,7 +31,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.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/client_crash_test_server.cc b/test/cpp/end2end/client_crash_test_server.cc index 441e8e3dbcb..6d166740ee2 100644 --- a/test/cpp/end2end/client_crash_test_server.cc +++ b/test/cpp/end2end/client_crash_test_server.cc @@ -27,7 +27,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/end2end/client_fork_test.cc b/test/cpp/end2end/client_fork_test.cc index 2388e558528..c93ff755e83 100644 --- a/test/cpp/end2end/client_fork_test.cc +++ b/test/cpp/end2end/client_fork_test.cc @@ -36,7 +36,7 @@ int main(int /* argc */, char** /* argv */) { return 0; } #include #include -#include "src/core/lib/gprpp/fork.h" +#include "src/core/util/fork.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 fd4b1e87998..fe9a79a6380 100644 --- a/test/cpp/end2end/client_lb_end2end_test.cc +++ b/test/cpp/end2end/client_lb_end2end_test.cc @@ -58,12 +58,12 @@ #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/gprpp/crash.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.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" diff --git a/test/cpp/end2end/connection_attempt_injector.cc b/test/cpp/end2end/connection_attempt_injector.cc index ab285203d8b..ef9668b87d0 100644 --- a/test/cpp/end2end/connection_attempt_injector.cc +++ b/test/cpp/end2end/connection_attempt_injector.cc @@ -23,7 +23,7 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "src/core/lib/iomgr/exec_ctx.h" // defined in tcp_client.cc diff --git a/test/cpp/end2end/connection_attempt_injector.h b/test/cpp/end2end/connection_attempt_injector.h index bc56f85284b..b44ebbeee1c 100644 --- a/test/cpp/end2end/connection_attempt_injector.h +++ b/test/cpp/end2end/connection_attempt_injector.h @@ -18,7 +18,7 @@ #include #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/core/lib/iomgr/tcp_client.h" namespace grpc { diff --git a/test/cpp/end2end/counted_service.h b/test/cpp/end2end/counted_service.h index 4d875acc65d..2f07675eb59 100644 --- a/test/cpp/end2end/counted_service.h +++ b/test/cpp/end2end/counted_service.h @@ -17,7 +17,7 @@ #ifndef GRPC_TEST_CPP_END2END_COUNTED_SERVICE_H #define GRPC_TEST_CPP_END2END_COUNTED_SERVICE_H -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" namespace grpc { namespace testing { diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc index 543be34226f..aaa02d52ad1 100644 --- a/test/cpp/end2end/end2end_test.cc +++ b/test/cpp/end2end/end2end_test.cc @@ -44,8 +44,8 @@ #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.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/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" diff --git a/test/cpp/end2end/flaky_network_test.cc b/test/cpp/end2end/flaky_network_test.cc index a65124368bd..3df6f1e080f 100644 --- a/test/cpp/end2end/flaky_network_test.cc +++ b/test/cpp/end2end/flaky_network_test.cc @@ -42,8 +42,8 @@ #include #include "src/core/util/backoff.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.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/grpclb_end2end_test.cc b/test/cpp/end2end/grpclb_end2end_test.cc index ef1cfc1382d..cbf6f80fe4e 100644 --- a/test/cpp/end2end/grpclb_end2end_test.cc +++ b/test/cpp/end2end/grpclb_end2end_test.cc @@ -49,11 +49,11 @@ #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/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.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" diff --git a/test/cpp/end2end/health_service_end2end_test.cc b/test/cpp/end2end/health_service_end2end_test.cc index 002fa26218b..31b587470af 100644 --- a/test/cpp/end2end/health_service_end2end_test.cc +++ b/test/cpp/end2end/health_service_end2end_test.cc @@ -34,7 +34,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.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/hybrid_end2end_test.cc b/test/cpp/end2end/hybrid_end2end_test.cc index 20b920f6276..f6e5d2ca29a 100644 --- a/test/cpp/end2end/hybrid_end2end_test.cc +++ b/test/cpp/end2end/hybrid_end2end_test.cc @@ -33,7 +33,7 @@ #include #include -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "src/core/lib/iomgr/iomgr.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/interceptors_util.h b/test/cpp/end2end/interceptors_util.h index 73e443a46b3..c16c34cd714 100644 --- a/test/cpp/end2end/interceptors_util.h +++ b/test/cpp/end2end/interceptors_util.h @@ -28,7 +28,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/cpp/util/string_ref_helper.h" diff --git a/test/cpp/end2end/mock_test.cc b/test/cpp/end2end/mock_test.cc index f561ec70a20..da70181b6dd 100644 --- a/test/cpp/end2end/mock_test.cc +++ b/test/cpp/end2end/mock_test.cc @@ -36,7 +36,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "src/proto/grpc/testing/echo_mock.grpc.pb.h" diff --git a/test/cpp/end2end/orca_service_end2end_test.cc b/test/cpp/end2end/orca_service_end2end_test.cc index bf67dd0bc36..ce88cb19110 100644 --- a/test/cpp/end2end/orca_service_end2end_test.cc +++ b/test/cpp/end2end/orca_service_end2end_test.cc @@ -32,7 +32,7 @@ #include #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/proto/grpc/testing/xds/v3/orca_service.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/orca_service.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 05c03c79a93..04b7931e7d3 100644 --- a/test/cpp/end2end/port_sharing_end2end_test.cc +++ b/test/cpp/end2end/port_sharing_end2end_test.cc @@ -36,8 +36,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.h" +#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" diff --git a/test/cpp/end2end/raw_end2end_test.cc b/test/cpp/end2end/raw_end2end_test.cc index 8c304bc4a08..39239483aad 100644 --- a/test/cpp/end2end/raw_end2end_test.cc +++ b/test/cpp/end2end/raw_end2end_test.cc @@ -35,8 +35,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.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" diff --git a/test/cpp/end2end/resource_quota_end2end_stress_test.cc b/test/cpp/end2end/resource_quota_end2end_stress_test.cc index 2ba4ea9c9a0..011b115f7b3 100644 --- a/test/cpp/end2end/resource_quota_end2end_stress_test.cc +++ b/test/cpp/end2end/resource_quota_end2end_stress_test.cc @@ -32,7 +32,7 @@ #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/experiments/config.h" -#include "src/core/lib/gprpp/notification.h" +#include "src/core/util/notification.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" #include "src/cpp/server/secure_server_credentials.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/end2end/rls_end2end_test.cc b/test/cpp/end2end/rls_end2end_test.cc index 452cf016eb0..353f9fae9fa 100644 --- a/test/cpp/end2end/rls_end2end_test.cc +++ b/test/cpp/end2end/rls_end2end_test.cc @@ -46,9 +46,9 @@ #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/lib/gprpp/env.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/time.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" diff --git a/test/cpp/end2end/rls_server.h b/test/cpp/end2end/rls_server.h index a169c15dfe6..149e38c6395 100644 --- a/test/cpp/end2end/rls_server.h +++ b/test/cpp/end2end/rls_server.h @@ -19,7 +19,7 @@ #include "absl/types/optional.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/proto/grpc/lookup/v1/rls.grpc.pb.h" #include "src/proto/grpc/lookup/v1/rls.pb.h" #include "test/cpp/end2end/counted_service.h" diff --git a/test/cpp/end2end/server_crash_test.cc b/test/cpp/end2end/server_crash_test.cc index 6973f054dcb..bbdea2c1af2 100644 --- a/test/cpp/end2end/server_crash_test.cc +++ b/test/cpp/end2end/server_crash_test.cc @@ -31,7 +31,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.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/server_crash_test_client.cc b/test/cpp/end2end/server_crash_test_client.cc index 4d2e266f025..01b25967be3 100644 --- a/test/cpp/end2end/server_crash_test_client.cc +++ b/test/cpp/end2end/server_crash_test_client.cc @@ -29,7 +29,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/end2end/server_early_return_test.cc b/test/cpp/end2end/server_early_return_test.cc index 010b9d480af..51e1ca5f60f 100644 --- a/test/cpp/end2end/server_early_return_test.cc +++ b/test/cpp/end2end/server_early_return_test.cc @@ -31,7 +31,7 @@ #include #include -#include "src/core/lib/gprpp/crash.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/server_load_reporting_end2end_test.cc b/test/cpp/end2end/server_load_reporting_end2end_test.cc index d5e057d386a..5365264c5bd 100644 --- a/test/cpp/end2end/server_load_reporting_end2end_test.cc +++ b/test/cpp/end2end/server_load_reporting_end2end_test.cc @@ -32,7 +32,7 @@ #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/lb/v1/load_reporter.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/service_config_end2end_test.cc b/test/cpp/end2end/service_config_end2end_test.cc index 4cfa2cd5202..0ed4472ec10 100644 --- a/test/cpp/end2end/service_config_end2end_test.cc +++ b/test/cpp/end2end/service_config_end2end_test.cc @@ -51,9 +51,9 @@ #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/gprpp/crash.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.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" diff --git a/test/cpp/end2end/shutdown_test.cc b/test/cpp/end2end/shutdown_test.cc index baae51856b5..dcfb52099b6 100644 --- a/test/cpp/end2end/shutdown_test.cc +++ b/test/cpp/end2end/shutdown_test.cc @@ -32,8 +32,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.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/streaming_throughput_test.cc b/test/cpp/end2end/streaming_throughput_test.cc index a7a3511d157..8fb9f975349 100644 --- a/test/cpp/end2end/streaming_throughput_test.cc +++ b/test/cpp/end2end/streaming_throughput_test.cc @@ -37,7 +37,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.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/test_service_impl.cc b/test/cpp/end2end/test_service_impl.cc index 0c23abc6c51..5608f4b8179 100644 --- a/test/cpp/end2end/test_service_impl.cc +++ b/test/cpp/end2end/test_service_impl.cc @@ -30,8 +30,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/notification.h" +#include "src/core/util/crash.h" +#include "src/core/util/notification.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/cpp/util/string_ref_helper.h" diff --git a/test/cpp/end2end/test_service_impl.h b/test/cpp/end2end/test_service_impl.h index 05511373302..618a4652e9f 100644 --- a/test/cpp/end2end/test_service_impl.h +++ b/test/cpp/end2end/test_service_impl.h @@ -35,7 +35,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/test_config.h" #include "test/cpp/util/string_ref_helper.h" diff --git a/test/cpp/end2end/thread_stress_test.cc b/test/cpp/end2end/thread_stress_test.cc index 45460855a10..f808668617a 100644 --- a/test/cpp/end2end/thread_stress_test.cc +++ b/test/cpp/end2end/thread_stress_test.cc @@ -35,7 +35,7 @@ #include #include -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "src/core/lib/surface/api_trace.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/time_change_test.cc b/test/cpp/end2end/time_change_test.cc index af74f8bdd50..e6cd0acf3d7 100644 --- a/test/cpp/end2end/time_change_test.cc +++ b/test/cpp/end2end/time_change_test.cc @@ -35,7 +35,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/iomgr/timer.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.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 b87cf9df016..ce188e7546d 100644 --- a/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc @@ -28,7 +28,7 @@ #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/lib/gprpp/env.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" diff --git a/test/cpp/end2end/xds/xds_end2end_test.cc b/test/cpp/end2end/xds/xds_end2end_test.cc index 10f6e5febf1..7b7a189a362 100644 --- a/test/cpp/end2end/xds/xds_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_end2end_test.cc @@ -63,12 +63,12 @@ #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/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/time_util.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" diff --git a/test/cpp/end2end/xds/xds_end2end_test_lib.cc b/test/cpp/end2end/xds/xds_end2end_test_lib.cc index f9e884650fe..6364b4c9ed9 100644 --- a/test/cpp/end2end/xds/xds_end2end_test_lib.cc +++ b/test/cpp/end2end/xds/xds_end2end_test_lib.cc @@ -38,7 +38,7 @@ #include #include "src/core/ext/filters/http/server/http_server_filter.h" -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "src/core/server/server.h" #include "src/core/util/tmpfile.h" #include "src/core/xds/grpc/xds_client_grpc.h" diff --git a/test/cpp/end2end/xds/xds_fallback_end2end_test.cc b/test/cpp/end2end/xds/xds_fallback_end2end_test.cc index abe68ba641d..eaae2a1377a 100644 --- a/test/cpp/end2end/xds/xds_fallback_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_fallback_end2end_test.cc @@ -31,7 +31,7 @@ #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "src/cpp/client/secure_credentials.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "src/proto/grpc/testing/echo_messages.pb.h" diff --git a/test/cpp/end2end/xds/xds_override_host_end2end_test.cc b/test/cpp/end2end/xds/xds_override_host_end2end_test.cc index b02ab1ae2ef..09f19d058a3 100644 --- a/test/cpp/end2end/xds/xds_override_host_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_override_host_end2end_test.cc @@ -24,7 +24,7 @@ #include "absl/strings/str_split.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "src/proto/grpc/testing/xds/v3/stateful_session.pb.h" #include "src/proto/grpc/testing/xds/v3/stateful_session_cookie.pb.h" #include "test/core/test_util/scoped_env_var.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 c637f637552..a9aad60e9f1 100644 --- a/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc @@ -32,7 +32,7 @@ #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/lib/gprpp/env.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/proto/grpc/testing/xds/v3/cluster.grpc.pb.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 70188884d2e..9ba4f7be669 100644 --- a/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc @@ -29,7 +29,7 @@ #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/lib/gprpp/env.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/proto/grpc/testing/xds/v3/aggregate_cluster.grpc.pb.h" diff --git a/test/cpp/end2end/xds/xds_rls_end2end_test.cc b/test/cpp/end2end/xds/xds_rls_end2end_test.cc index 4e18874b7e8..2297d159ca9 100644 --- a/test/cpp/end2end/xds/xds_rls_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_rls_end2end_test.cc @@ -23,7 +23,7 @@ #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "src/proto/grpc/lookup/v1/rls.grpc.pb.h" #include "src/proto/grpc/lookup/v1/rls.pb.h" #include "src/proto/grpc/lookup/v1/rls_config.pb.h" diff --git a/test/cpp/end2end/xds/xds_server.cc b/test/cpp/end2end/xds/xds_server.cc index a4019c7fdfe..bbae462c994 100644 --- a/test/cpp/end2end/xds/xds_server.cc +++ b/test/cpp/end2end/xds/xds_server.cc @@ -27,8 +27,8 @@ #include "absl/types/optional.h" #include "src/core/lib/address_utils/parse_address.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/crash.h" +#include "src/core/util/sync.h" #include "src/proto/grpc/testing/xds/v3/ads.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/discovery.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/lrs.grpc.pb.h" diff --git a/test/cpp/end2end/xds/xds_server.h b/test/cpp/end2end/xds/xds_server.h index 20372a2a3be..efe93cc5445 100644 --- a/test/cpp/end2end/xds/xds_server.h +++ b/test/cpp/end2end/xds/xds_server.h @@ -31,8 +31,8 @@ #include #include "src/core/lib/address_utils/parse_address.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/crash.h" +#include "src/core/util/sync.h" #include "src/proto/grpc/testing/xds/v3/ads.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/cluster.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/discovery.grpc.pb.h" diff --git a/test/cpp/end2end/xds/xds_utils.cc b/test/cpp/end2end/xds/xds_utils.cc index 6a45d81b8a0..bfb36413d61 100644 --- a/test/cpp/end2end/xds/xds_utils.cc +++ b/test/cpp/end2end/xds/xds_utils.cc @@ -34,7 +34,7 @@ #include #include "src/core/ext/filters/http/server/http_server_filter.h" -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "src/core/server/server.h" #include "src/core/util/tmpfile.h" #include "src/core/xds/grpc/xds_client_grpc.h" diff --git a/test/cpp/ext/csm/mesh_id_test.cc b/test/cpp/ext/csm/mesh_id_test.cc index 7d0b8ba8c21..e1a7f86fc80 100644 --- a/test/cpp/ext/csm/mesh_id_test.cc +++ b/test/cpp/ext/csm/mesh_id_test.cc @@ -20,7 +20,7 @@ #include -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "src/core/util/tmpfile.h" #include "src/cpp/ext/csm/metadata_exchange.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/ext/csm/metadata_exchange_test.cc b/test/cpp/ext/csm/metadata_exchange_test.cc index f83577cc7d9..a67f618d5f7 100644 --- a/test/cpp/ext/csm/metadata_exchange_test.cc +++ b/test/cpp/ext/csm/metadata_exchange_test.cc @@ -30,7 +30,7 @@ #include #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "src/core/telemetry/call_tracer.h" #include "src/core/util/tmpfile.h" #include "src/cpp/ext/csm/csm_observability.h" diff --git a/test/cpp/ext/filters/logging/library.h b/test/cpp/ext/filters/logging/library.h index 92b7311c5a6..f1ca3fc9576 100644 --- a/test/cpp/ext/filters/logging/library.h +++ b/test/cpp/ext/filters/logging/library.h @@ -35,7 +35,7 @@ #include #include "src/core/ext/filters/logging/logging_filter.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "src/cpp/ext/gcp/observability_logging_sink.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "src/proto/grpc/testing/echo_messages.pb.h" diff --git a/test/cpp/ext/filters/logging/logging_census_integration_test.cc b/test/cpp/ext/filters/logging/logging_census_integration_test.cc index b8c196d1c09..622c93ffbb4 100644 --- a/test/cpp/ext/filters/logging/logging_census_integration_test.cc +++ b/test/cpp/ext/filters/logging/logging_census_integration_test.cc @@ -32,7 +32,7 @@ #include "src/core/ext/filters/logging/logging_filter.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "src/cpp/ext/gcp/observability_logging_sink.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "src/proto/grpc/testing/echo_messages.pb.h" diff --git a/test/cpp/ext/filters/logging/logging_test.cc b/test/cpp/ext/filters/logging/logging_test.cc index 09df6f7f906..6441e1cefcf 100644 --- a/test/cpp/ext/filters/logging/logging_test.cc +++ b/test/cpp/ext/filters/logging/logging_test.cc @@ -29,8 +29,8 @@ #include #include "src/core/ext/filters/logging/logging_filter.h" -#include "src/core/lib/gprpp/dump_args.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/dump_args.h" +#include "src/core/util/sync.h" #include "src/cpp/ext/gcp/observability_logging_sink.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "src/proto/grpc/testing/echo_messages.pb.h" diff --git a/test/cpp/ext/gcp/environment_autodetect_test.cc b/test/cpp/ext/gcp/environment_autodetect_test.cc index 947f18838bd..d466a48ba93 100644 --- a/test/cpp/ext/gcp/environment_autodetect_test.cc +++ b/test/cpp/ext/gcp/environment_autodetect_test.cc @@ -29,8 +29,8 @@ #include -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/notification.h" +#include "src/core/util/env.h" +#include "src/core/util/notification.h" #include "test/core/test_util/test_config.h" namespace grpc { diff --git a/test/cpp/ext/gcp/observability_config_test.cc b/test/cpp/ext/gcp/observability_config_test.cc index 4a586ba2175..391832b13d5 100644 --- a/test/cpp/ext/gcp/observability_config_test.cc +++ b/test/cpp/ext/gcp/observability_config_test.cc @@ -22,7 +22,7 @@ #include #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/tmpfile.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/ext/otel/otel_test_library.cc b/test/cpp/ext/otel/otel_test_library.cc index 40153f13dda..c55202c09ac 100644 --- a/test/cpp/ext/otel/otel_test_library.cc +++ b/test/cpp/ext/otel/otel_test_library.cc @@ -32,7 +32,7 @@ #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/notification.h" +#include "src/core/util/notification.h" #include "src/core/telemetry/call_tracer.h" #include "test/core/test_util/fake_stats_plugin.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/interop/backend_metrics_lb_policy_test.cc b/test/cpp/interop/backend_metrics_lb_policy_test.cc index 56d5e9f6e96..0a5fb277bab 100644 --- a/test/cpp/interop/backend_metrics_lb_policy_test.cc +++ b/test/cpp/interop/backend_metrics_lb_policy_test.cc @@ -31,7 +31,7 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "src/proto/grpc/testing/messages.pb.h" #include "src/proto/grpc/testing/test.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/interop/client.cc b/test/cpp/interop/client.cc index 8a708c345da..fe211e71ddb 100644 --- a/test/cpp/interop/client.cc +++ b/test/cpp/interop/client.cc @@ -28,7 +28,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" #include "test/core/test_util/test_config.h" #include "test/cpp/interop/client_helper.h" diff --git a/test/cpp/interop/grpclb_fallback_test.cc b/test/cpp/interop/grpclb_fallback_test.cc index 594c5b6b39b..b5e57aaa623 100644 --- a/test/cpp/interop/grpclb_fallback_test.cc +++ b/test/cpp/interop/grpclb_fallback_test.cc @@ -43,7 +43,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#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/string.h" diff --git a/test/cpp/interop/http2_client.cc b/test/cpp/interop/http2_client.cc index 62c728d4c78..d19b0b6616a 100644 --- a/test/cpp/interop/http2_client.cc +++ b/test/cpp/interop/http2_client.cc @@ -29,7 +29,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" #include "src/core/util/useful.h" #include "src/proto/grpc/testing/messages.pb.h" diff --git a/test/cpp/interop/interop_client.cc b/test/cpp/interop/interop_client.cc index 165e46da54c..f6a34a32d6e 100644 --- a/test/cpp/interop/interop_client.cc +++ b/test/cpp/interop/interop_client.cc @@ -43,7 +43,7 @@ #include "src/core/lib/config/config_vars.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.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_server.cc b/test/cpp/interop/interop_server.cc index fb7d3430107..a68817d2d8d 100644 --- a/test/cpp/interop/interop_server.cc +++ b/test/cpp/interop/interop_server.cc @@ -35,8 +35,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/crash.h" +#include "src/core/util/sync.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_test.cc b/test/cpp/interop/interop_test.cc index d46e2a531cd..385bcf7bd1f 100644 --- a/test/cpp/interop/interop_test.cc +++ b/test/cpp/interop/interop_test.cc @@ -34,7 +34,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/iomgr/socket_utils_posix.h" #include "src/core/util/string.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/interop/istio_echo_server.cc b/test/cpp/interop/istio_echo_server.cc index 7893415c03b..c34ac281d78 100644 --- a/test/cpp/interop/istio_echo_server.cc +++ b/test/cpp/interop/istio_echo_server.cc @@ -45,8 +45,8 @@ #include #include "src/core/lib/channel/status_util.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/host_port.h" +#include "src/core/util/env.h" +#include "src/core/util/host_port.h" #include "src/core/util/gethostname.h" #include "src/proto/grpc/testing/istio_echo.pb.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/interop/istio_echo_server_lib.cc b/test/cpp/interop/istio_echo_server_lib.cc index cb39a15cf99..f0ddd49c80a 100644 --- a/test/cpp/interop/istio_echo_server_lib.cc +++ b/test/cpp/interop/istio_echo_server_lib.cc @@ -27,7 +27,7 @@ #include #include -#include "src/core/lib/gprpp/host_port.h" +#include "src/core/util/host_port.h" #include "src/proto/grpc/testing/istio_echo.pb.h" using proto::EchoRequest; diff --git a/test/cpp/interop/istio_echo_server_test.cc b/test/cpp/interop/istio_echo_server_test.cc index 8f1e39c2c3c..faa9a47ac57 100644 --- a/test/cpp/interop/istio_echo_server_test.cc +++ b/test/cpp/interop/istio_echo_server_test.cc @@ -27,8 +27,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/host_port.h" +#include "src/core/util/crash.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/cpp/interop/istio_echo_server_lib.h" diff --git a/test/cpp/interop/metrics_client.cc b/test/cpp/interop/metrics_client.cc index 853c04a9c17..344abd27d3c 100644 --- a/test/cpp/interop/metrics_client.cc +++ b/test/cpp/interop/metrics_client.cc @@ -24,7 +24,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/metrics.grpc.pb.h" #include "src/proto/grpc/testing/metrics.pb.h" #include "test/cpp/util/metrics_server.h" diff --git a/test/cpp/interop/observability_client.cc b/test/cpp/interop/observability_client.cc index 247ab1d1738..c264aa504ec 100644 --- a/test/cpp/interop/observability_client.cc +++ b/test/cpp/interop/observability_client.cc @@ -32,7 +32,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" #include "test/core/test_util/test_config.h" #include "test/cpp/interop/client_helper.h" diff --git a/test/cpp/interop/pre_stop_hook_server.cc b/test/cpp/interop/pre_stop_hook_server.cc index ff9def05fd2..a00ab791a9d 100644 --- a/test/cpp/interop/pre_stop_hook_server.cc +++ b/test/cpp/interop/pre_stop_hook_server.cc @@ -24,7 +24,7 @@ #include -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "src/proto/grpc/testing/messages.pb.h" namespace grpc { diff --git a/test/cpp/interop/pre_stop_hook_server.h b/test/cpp/interop/pre_stop_hook_server.h index c491d4140df..a2ab3f35568 100644 --- a/test/cpp/interop/pre_stop_hook_server.h +++ b/test/cpp/interop/pre_stop_hook_server.h @@ -22,7 +22,7 @@ #include #include -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "src/proto/grpc/testing/messages.pb.h" #include "src/proto/grpc/testing/test.grpc.pb.h" diff --git a/test/cpp/interop/pre_stop_hook_server_test.cc b/test/cpp/interop/pre_stop_hook_server_test.cc index d3dfdbf1aa7..2501ce91147 100644 --- a/test/cpp/interop/pre_stop_hook_server_test.cc +++ b/test/cpp/interop/pre_stop_hook_server_test.cc @@ -27,7 +27,7 @@ #include #include -#include "src/core/lib/gprpp/sync.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/reconnect_interop_client.cc b/test/cpp/interop/reconnect_interop_client.cc index bdc7b27aa07..1c2e4837ec0 100644 --- a/test/cpp/interop/reconnect_interop_client.cc +++ b/test/cpp/interop/reconnect_interop_client.cc @@ -28,7 +28,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.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/reconnect_interop_server.cc b/test/cpp/interop/reconnect_interop_server.cc index 656bf77e906..a5ac668bb29 100644 --- a/test/cpp/interop/reconnect_interop_server.cc +++ b/test/cpp/interop/reconnect_interop_server.cc @@ -34,7 +34,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.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/stress_interop_client.cc b/test/cpp/interop/stress_interop_client.cc index 91a33d2547c..0ccacfaefb1 100644 --- a/test/cpp/interop/stress_interop_client.cc +++ b/test/cpp/interop/stress_interop_client.cc @@ -28,7 +28,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "test/cpp/interop/interop_client.h" #include "test/cpp/util/metrics_server.h" diff --git a/test/cpp/interop/stress_test.cc b/test/cpp/interop/stress_test.cc index b37c608a369..e87dcae505a 100644 --- a/test/cpp/interop/stress_test.cc +++ b/test/cpp/interop/stress_test.cc @@ -30,7 +30,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/metrics.grpc.pb.h" #include "src/proto/grpc/testing/metrics.pb.h" #include "test/cpp/interop/interop_client.h" diff --git a/test/cpp/interop/xds_interop_client.cc b/test/cpp/interop/xds_interop_client.cc index 8480c24691d..f3af46b19f2 100644 --- a/test/cpp/interop/xds_interop_client.cc +++ b/test/cpp/interop/xds_interop_client.cc @@ -48,7 +48,7 @@ #include #include "src/core/lib/channel/status_util.h" -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.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/xds_interop_server_test.cc b/test/cpp/interop/xds_interop_server_test.cc index 479bf9125c3..808924ed0b3 100644 --- a/test/cpp/interop/xds_interop_server_test.cc +++ b/test/cpp/interop/xds_interop_server_test.cc @@ -24,7 +24,7 @@ #include #include -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "src/proto/grpc/testing/empty.pb.h" #include "src/proto/grpc/testing/test.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/microbenchmarks/bm_basic_work_queue.cc b/test/cpp/microbenchmarks/bm_basic_work_queue.cc index d76f0767861..d0784d22faf 100644 --- a/test/cpp/microbenchmarks/bm_basic_work_queue.cc +++ b/test/cpp/microbenchmarks/bm_basic_work_queue.cc @@ -23,7 +23,7 @@ #include "src/core/lib/event_engine/common_closures.h" #include "src/core/lib/event_engine/work_queue/basic_work_queue.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" #include "test/core/test_util/test_config.h" namespace { diff --git a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc index 2f18b1de233..f53e0bb99a1 100644 --- a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc +++ b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc @@ -34,8 +34,8 @@ #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/time.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" diff --git a/test/cpp/microbenchmarks/bm_cq.cc b/test/cpp/microbenchmarks/bm_cq.cc index 0cd5de5c2c4..bc3207006de 100644 --- a/test/cpp/microbenchmarks/bm_cq.cc +++ b/test/cpp/microbenchmarks/bm_cq.cc @@ -28,7 +28,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/completion_queue.h" #include "test/core/test_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 e0144995e0d..7b4c08691f4 100644 --- a/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc +++ b/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc @@ -28,8 +28,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/time.h" +#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" diff --git a/test/cpp/microbenchmarks/bm_event_engine_run.cc b/test/cpp/microbenchmarks/bm_event_engine_run.cc index 8693024f955..5f70aea856f 100644 --- a/test/cpp/microbenchmarks/bm_event_engine_run.cc +++ b/test/cpp/microbenchmarks/bm_event_engine_run.cc @@ -29,8 +29,8 @@ #include "src/core/lib/event_engine/common_closures.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/notification.h" +#include "src/core/util/crash.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_exec_ctx.cc b/test/cpp/microbenchmarks/bm_exec_ctx.cc index 3df871af00e..2c4b374aef0 100644 --- a/test/cpp/microbenchmarks/bm_exec_ctx.cc +++ b/test/cpp/microbenchmarks/bm_exec_ctx.cc @@ -19,7 +19,7 @@ #include -#include "src/core/lib/gprpp/notification.h" +#include "src/core/util/notification.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/test_util/test_config.h" #include "test/cpp/microbenchmarks/helpers.h" diff --git a/test/cpp/microbenchmarks/bm_huffman_decode.cc b/test/cpp/microbenchmarks/bm_huffman_decode.cc index 1766f028269..50122d6b773 100644 --- a/test/cpp/microbenchmarks/bm_huffman_decode.cc +++ b/test/cpp/microbenchmarks/bm_huffman_decode.cc @@ -21,7 +21,7 @@ #include "src/core/ext/transport/chttp2/transport/bin_encoder.h" #include "src/core/ext/transport/chttp2/transport/decode_huff.h" -#include "src/core/lib/gprpp/no_destruct.h" +#include "src/core/util/no_destruct.h" #include "src/core/lib/slice/slice.h" #include "test/core/test_util/test_config.h" #include "test/cpp/microbenchmarks/huffman_geometries/index.h" diff --git a/test/cpp/microbenchmarks/bm_rng.cc b/test/cpp/microbenchmarks/bm_rng.cc index 8797ee633a6..bf84e39910e 100644 --- a/test/cpp/microbenchmarks/bm_rng.cc +++ b/test/cpp/microbenchmarks/bm_rng.cc @@ -22,7 +22,7 @@ #include "absl/random/random.h" -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" static void BM_OneRngFromFreshBitSet(benchmark::State& state) { for (auto _ : state) { diff --git a/test/cpp/microbenchmarks/bm_thread_pool.cc b/test/cpp/microbenchmarks/bm_thread_pool.cc index 323c5267c56..620a7ce7d1c 100644 --- a/test/cpp/microbenchmarks/bm_thread_pool.cc +++ b/test/cpp/microbenchmarks/bm_thread_pool.cc @@ -27,8 +27,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/gprpp/crash.h" -#include "src/core/lib/gprpp/notification.h" +#include "src/core/util/crash.h" +#include "src/core/util/notification.h" #include "src/core/util/useful.h" #include "test/core/test_util/test_config.h" #include "test/cpp/microbenchmarks/helpers.h" diff --git a/test/cpp/microbenchmarks/fullstack_context_mutators.h b/test/cpp/microbenchmarks/fullstack_context_mutators.h index 466f60b8307..05d2b0e9195 100644 --- a/test/cpp/microbenchmarks/fullstack_context_mutators.h +++ b/test/cpp/microbenchmarks/fullstack_context_mutators.h @@ -28,7 +28,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "test/cpp/microbenchmarks/helpers.h" namespace grpc { diff --git a/test/cpp/microbenchmarks/fullstack_fixtures.h b/test/cpp/microbenchmarks/fullstack_fixtures.h index f94a36cfe40..7515059cb2a 100644 --- a/test/cpp/microbenchmarks/fullstack_fixtures.h +++ b/test/cpp/microbenchmarks/fullstack_fixtures.h @@ -34,7 +34,7 @@ #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/lib/gprpp/crash.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" diff --git a/test/cpp/naming/address_sorting_test.cc b/test/cpp/naming/address_sorting_test.cc index 563ce7d8a36..223b8e8cdac 100644 --- a/test/cpp/naming/address_sorting_test.cc +++ b/test/cpp/naming/address_sorting_test.cc @@ -37,8 +37,8 @@ #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/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/host_port.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" diff --git a/test/cpp/naming/cancel_ares_query_test.cc b/test/cpp/naming/cancel_ares_query_test.cc index 03d787d0b69..3fe3f73fbc8 100644 --- a/test/cpp/naming/cancel_ares_query_test.cc +++ b/test/cpp/naming/cancel_ares_query_test.cc @@ -41,10 +41,10 @@ #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/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/thd.h" -#include "src/core/lib/gprpp/work_serializer.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" diff --git a/test/cpp/naming/resolver_component_test.cc b/test/cpp/naming/resolver_component_test.cc index d42e5f7dda1..e80bb03a700 100644 --- a/test/cpp/naming/resolver_component_test.cc +++ b/test/cpp/naming/resolver_component_test.cc @@ -48,10 +48,10 @@ #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/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/work_serializer.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" diff --git a/test/cpp/naming/resolver_component_tests_runner_invoker.cc b/test/cpp/naming/resolver_component_tests_runner_invoker.cc index 4fb67300c5c..26fe87fb600 100644 --- a/test/cpp/naming/resolver_component_tests_runner_invoker.cc +++ b/test/cpp/naming/resolver_component_tests_runner_invoker.cc @@ -35,13 +35,13 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #ifdef __FreeBSD__ #include #endif -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" #include "test/cpp/util/subprocess.h" diff --git a/test/cpp/performance/writes_per_rpc_test.cc b/test/cpp/performance/writes_per_rpc_test.cc index 189d972fc2e..c2be69c9559 100644 --- a/test/cpp/performance/writes_per_rpc_test.cc +++ b/test/cpp/performance/writes_per_rpc_test.cc @@ -37,7 +37,7 @@ #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/lib/gprpp/notification.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" diff --git a/test/cpp/qps/benchmark_config.cc b/test/cpp/qps/benchmark_config.cc index 906f128d746..c2ef8c08870 100644 --- a/test/cpp/qps/benchmark_config.cc +++ b/test/cpp/qps/benchmark_config.cc @@ -25,7 +25,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "test/cpp/util/test_credentials_provider.h" ABSL_FLAG(bool, enable_log_reporter, true, diff --git a/test/cpp/qps/client.h b/test/cpp/qps/client.h index 792d271242b..fe66465bbce 100644 --- a/test/cpp/qps/client.h +++ b/test/cpp/qps/client.h @@ -40,8 +40,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" #include "src/proto/grpc/testing/payloads.pb.h" #include "test/cpp/qps/histogram.h" diff --git a/test/cpp/qps/client_async.cc b/test/cpp/qps/client_async.cc index 11fd6b89e62..5a37c8fb421 100644 --- a/test/cpp/qps/client_async.cc +++ b/test/cpp/qps/client_async.cc @@ -38,7 +38,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/surface/completion_queue.h" #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" #include "test/cpp/qps/client.h" diff --git a/test/cpp/qps/client_callback.cc b/test/cpp/qps/client_callback.cc index 51cead4e3ea..29a35676aa4 100644 --- a/test/cpp/qps/client_callback.cc +++ b/test/cpp/qps/client_callback.cc @@ -34,7 +34,7 @@ #include #include -#include "src/core/lib/gprpp/crash.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/client_sync.cc b/test/cpp/qps/client_sync.cc index eb1d8aeea72..23778475ac7 100644 --- a/test/cpp/qps/client_sync.cc +++ b/test/cpp/qps/client_sync.cc @@ -35,7 +35,7 @@ #include #include -#include "src/core/lib/gprpp/crash.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/interarrival.h" diff --git a/test/cpp/qps/driver.cc b/test/cpp/qps/driver.cc index e8ee2da4539..a940b3cf779 100644 --- a/test/cpp/qps/driver.cc +++ b/test/cpp/qps/driver.cc @@ -35,9 +35,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/host_port.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" +#include "src/core/util/host_port.h" #include "src/proto/grpc/testing/worker_service.grpc.pb.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/qps/inproc_sync_unary_ping_pong_test.cc b/test/cpp/qps/inproc_sync_unary_ping_pong_test.cc index e876e50cf78..57e826a5dff 100644 --- a/test/cpp/qps/inproc_sync_unary_ping_pong_test.cc +++ b/test/cpp/qps/inproc_sync_unary_ping_pong_test.cc @@ -20,7 +20,7 @@ #include "absl/log/log.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" #include "test/cpp/qps/benchmark_config.h" #include "test/cpp/qps/driver.h" diff --git a/test/cpp/qps/json_run_localhost.cc b/test/cpp/qps/json_run_localhost.cc index 8bc842328c9..59d46414bca 100644 --- a/test/cpp/qps/json_run_localhost.cc +++ b/test/cpp/qps/json_run_localhost.cc @@ -31,8 +31,8 @@ #include "absl/log/check.h" #include "absl/log/log.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" #include "test/core/test_util/port.h" #include "test/cpp/util/subprocess.h" diff --git a/test/cpp/qps/parse_json.cc b/test/cpp/qps/parse_json.cc index e283c8eae7d..0b6af9f962d 100644 --- a/test/cpp/qps/parse_json.cc +++ b/test/cpp/qps/parse_json.cc @@ -24,7 +24,7 @@ #include "absl/log/log.h" #include "absl/strings/str_format.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc { namespace testing { diff --git a/test/cpp/qps/qps_json_driver.cc b/test/cpp/qps/qps_json_driver.cc index 50734258b50..c11e9f2bd81 100644 --- a/test/cpp/qps/qps_json_driver.cc +++ b/test/cpp/qps/qps_json_driver.cc @@ -27,7 +27,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" #include "test/cpp/qps/benchmark_config.h" #include "test/cpp/qps/driver.h" diff --git a/test/cpp/qps/qps_openloop_test.cc b/test/cpp/qps/qps_openloop_test.cc index 21c83418427..92db5ef53c4 100644 --- a/test/cpp/qps/qps_openloop_test.cc +++ b/test/cpp/qps/qps_openloop_test.cc @@ -20,7 +20,7 @@ #include "absl/log/log.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" #include "test/cpp/qps/benchmark_config.h" #include "test/cpp/qps/driver.h" diff --git a/test/cpp/qps/qps_worker.cc b/test/cpp/qps/qps_worker.cc index f2b444fc9c8..4f396456c51 100644 --- a/test/cpp/qps/qps_worker.cc +++ b/test/cpp/qps/qps_worker.cc @@ -37,8 +37,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/host_port.h" +#include "src/core/util/crash.h" +#include "src/core/util/host_port.h" #include "src/proto/grpc/testing/worker_service.grpc.pb.h" #include "test/core/test_util/grpc_profiler.h" #include "test/core/test_util/histogram.h" diff --git a/test/cpp/qps/report.cc b/test/cpp/qps/report.cc index fa43276cf86..e0b0cd646b2 100644 --- a/test/cpp/qps/report.cc +++ b/test/cpp/qps/report.cc @@ -24,7 +24,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/report_qps_scenario_service.grpc.pb.h" #include "test/cpp/qps/driver.h" #include "test/cpp/qps/parse_json.h" diff --git a/test/cpp/qps/secure_sync_unary_ping_pong_test.cc b/test/cpp/qps/secure_sync_unary_ping_pong_test.cc index 6829f0dcd29..d64d40c8e8a 100644 --- a/test/cpp/qps/secure_sync_unary_ping_pong_test.cc +++ b/test/cpp/qps/secure_sync_unary_ping_pong_test.cc @@ -20,7 +20,7 @@ #include "absl/log/log.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" #include "test/cpp/qps/benchmark_config.h" #include "test/cpp/qps/driver.h" diff --git a/test/cpp/qps/server.h b/test/cpp/qps/server.h index 2413d2d566d..98d0ee1dd6d 100644 --- a/test/cpp/qps/server.h +++ b/test/cpp/qps/server.h @@ -29,7 +29,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/control.pb.h" #include "src/proto/grpc/testing/messages.pb.h" #include "test/core/end2end/data/ssl_test_data.h" diff --git a/test/cpp/qps/server_async.cc b/test/cpp/qps/server_async.cc index 16bb01e8960..cbc843998af 100644 --- a/test/cpp/qps/server_async.cc +++ b/test/cpp/qps/server_async.cc @@ -35,8 +35,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/host_port.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" diff --git a/test/cpp/qps/server_callback.cc b/test/cpp/qps/server_callback.cc index c198b3d86b0..07c65226872 100644 --- a/test/cpp/qps/server_callback.cc +++ b/test/cpp/qps/server_callback.cc @@ -24,7 +24,7 @@ #include #include -#include "src/core/lib/gprpp/host_port.h" +#include "src/core/util/host_port.h" #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" #include "test/cpp/qps/qps_server_builder.h" #include "test/cpp/qps/server.h" diff --git a/test/cpp/qps/server_sync.cc b/test/cpp/qps/server_sync.cc index 59a688d9b3e..fe9f8274f52 100644 --- a/test/cpp/qps/server_sync.cc +++ b/test/cpp/qps/server_sync.cc @@ -27,7 +27,7 @@ #include #include -#include "src/core/lib/gprpp/host_port.h" +#include "src/core/util/host_port.h" #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" #include "test/cpp/qps/qps_server_builder.h" #include "test/cpp/qps/server.h" diff --git a/test/cpp/qps/usage_timer.cc b/test/cpp/qps/usage_timer.cc index 0f717141d25..9bea4846a4f 100644 --- a/test/cpp/qps/usage_timer.cc +++ b/test/cpp/qps/usage_timer.cc @@ -26,7 +26,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #ifdef __linux__ #include #include diff --git a/test/cpp/server/server_builder_test.cc b/test/cpp/server/server_builder_test.cc index 089f7c38ecf..73e02cedbde 100644 --- a/test/cpp/server/server_builder_test.cc +++ b/test/cpp/server/server_builder_test.cc @@ -26,7 +26,7 @@ #include #include -#include "src/core/lib/gprpp/notification.h" +#include "src/core/util/notification.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/event_engine/event_engine_test_utils.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/server/server_request_call_test.cc b/test/cpp/server/server_request_call_test.cc index 96bbf15400a..bf781e3e2bf 100644 --- a/test/cpp/server/server_request_call_test.cc +++ b/test/cpp/server/server_request_call_test.cc @@ -29,7 +29,7 @@ #include #include -#include "src/core/lib/gprpp/crash.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/thread_manager/thread_manager_test.cc b/test/cpp/thread_manager/thread_manager_test.cc index 6c7eb3a3f34..751ab3977c6 100644 --- a/test/cpp/thread_manager/thread_manager_test.cc +++ b/test/cpp/thread_manager/thread_manager_test.cc @@ -31,7 +31,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" namespace grpc { diff --git a/test/cpp/util/channel_trace_proto_helper.cc b/test/cpp/util/channel_trace_proto_helper.cc index 677862fbf12..1f057f3d696 100644 --- a/test/cpp/util/channel_trace_proto_helper.cc +++ b/test/cpp/util/channel_trace_proto_helper.cc @@ -26,7 +26,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/core/lib/iomgr/error.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" diff --git a/test/cpp/util/channelz_sampler_test.cc b/test/cpp/util/channelz_sampler_test.cc index fde2a019f97..5c5f1118d60 100644 --- a/test/cpp/util/channelz_sampler_test.cc +++ b/test/cpp/util/channelz_sampler_test.cc @@ -43,7 +43,7 @@ #include #include -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "src/cpp/server/channelz/channelz_service.h" #include "src/proto/grpc/testing/test.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/util/cli_call.cc b/test/cpp/util/cli_call.cc index df765c64a49..82b851dd68d 100644 --- a/test/cpp/util/cli_call.cc +++ b/test/cpp/util/cli_call.cc @@ -31,7 +31,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc { namespace testing { diff --git a/test/cpp/util/cli_credentials.cc b/test/cpp/util/cli_credentials.cc index 8b178524df8..2d343cf41f1 100644 --- a/test/cpp/util/cli_credentials.cc +++ b/test/cpp/util/cli_credentials.cc @@ -25,8 +25,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/load_file.h" +#include "src/core/util/crash.h" +#include "src/core/util/load_file.h" ABSL_RETIRED_FLAG(bool, enable_ssl, false, "Replaced by --channel_creds_type=ssl."); diff --git a/test/cpp/util/create_test_channel.cc b/test/cpp/util/create_test_channel.cc index f5c3a9a037e..8d10f8cdbfa 100644 --- a/test/cpp/util/create_test_channel.cc +++ b/test/cpp/util/create_test_channel.cc @@ -25,7 +25,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "test/cpp/util/test_credentials_provider.h" ABSL_FLAG(std::string, grpc_test_use_grpclb_with_child_policy, "", diff --git a/test/cpp/util/get_grpc_test_runfile_dir.cc b/test/cpp/util/get_grpc_test_runfile_dir.cc index 4e0ce11ca5a..68107d63685 100644 --- a/test/cpp/util/get_grpc_test_runfile_dir.cc +++ b/test/cpp/util/get_grpc_test_runfile_dir.cc @@ -14,7 +14,7 @@ #include "test/cpp/util/get_grpc_test_runfile_dir.h" -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" namespace grpc { diff --git a/test/cpp/util/grpc_tool_test.cc b/test/cpp/util/grpc_tool_test.cc index c6a513bbd38..6d3b6d528da 100644 --- a/test/cpp/util/grpc_tool_test.cc +++ b/test/cpp/util/grpc_tool_test.cc @@ -38,7 +38,7 @@ #include #include -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "src/proto/grpc/testing/echo.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/util/metrics_server.cc b/test/cpp/util/metrics_server.cc index 59d3dcead15..311cd0b401e 100644 --- a/test/cpp/util/metrics_server.cc +++ b/test/cpp/util/metrics_server.cc @@ -24,7 +24,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/metrics.grpc.pb.h" #include "src/proto/grpc/testing/metrics.pb.h" diff --git a/test/cpp/util/proto_reflection_descriptor_database.cc b/test/cpp/util/proto_reflection_descriptor_database.cc index b5441f87596..ac0113fd509 100644 --- a/test/cpp/util/proto_reflection_descriptor_database.cc +++ b/test/cpp/util/proto_reflection_descriptor_database.cc @@ -22,7 +22,7 @@ #include "absl/log/log.h" -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" using grpc::reflection::v1alpha::ErrorResponse; using grpc::reflection::v1alpha::ListServiceResponse; diff --git a/test/cpp/util/test_credentials_provider.cc b/test/cpp/util/test_credentials_provider.cc index c94f0a054bd..e88002ece92 100644 --- a/test/cpp/util/test_credentials_provider.cc +++ b/test/cpp/util/test_credentials_provider.cc @@ -33,7 +33,7 @@ #include #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" #include "test/core/end2end/data/ssl_test_data.h" ABSL_FLAG(std::string, tls_cert_file, "", diff --git a/test/cpp/util/tls_test_utils.cc b/test/cpp/util/tls_test_utils.cc index 15c9b6211ed..45d1e5c7f88 100644 --- a/test/cpp/util/tls_test_utils.cc +++ b/test/cpp/util/tls_test_utils.cc @@ -18,7 +18,7 @@ #include -#include "src/core/lib/gprpp/thd.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/util/tls_test_utils.h b/test/cpp/util/tls_test_utils.h index 6f7d84acaa9..9b4e69bcd80 100644 --- a/test/cpp/util/tls_test_utils.h +++ b/test/cpp/util/tls_test_utils.h @@ -23,7 +23,7 @@ #include #include -#include "src/core/lib/gprpp/thd.h" +#include "src/core/util/thd.h" namespace grpc { namespace testing { diff --git a/test/cpp/util/windows/manifest_file.cc b/test/cpp/util/windows/manifest_file.cc index 0bf2c9d3f01..c82021196ab 100644 --- a/test/cpp/util/windows/manifest_file.cc +++ b/test/cpp/util/windows/manifest_file.cc @@ -31,7 +31,7 @@ #include -#include "src/core/lib/gprpp/crash.h" +#include "src/core/util/crash.h" namespace grpc { namespace testing { diff --git a/tools/codegen/core/gen_grpc_tls_credentials_options.py b/tools/codegen/core/gen_grpc_tls_credentials_options.py index 20350765fda..24a153e9c9a 100755 --- a/tools/codegen/core/gen_grpc_tls_credentials_options.py +++ b/tools/codegen/core/gen_grpc_tls_credentials_options.py @@ -308,7 +308,7 @@ print( #include #include -#include "src/core/lib/gprpp/ref_counted.h" +#include "src/core/util/ref_counted.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/lib/security/credentials/tls/grpc_tls_certificate_verifier.h" diff --git a/tools/codegen/core/gen_huffman_decompressor.cc b/tools/codegen/core/gen_huffman_decompressor.cc index 0861dff009f..62c7a5dbd7c 100644 --- a/tools/codegen/core/gen_huffman_decompressor.cc +++ b/tools/codegen/core/gen_huffman_decompressor.cc @@ -37,7 +37,7 @@ #include "absl/types/variant.h" #include "src/core/ext/transport/chttp2/transport/huffsyms.h" -#include "src/core/lib/gprpp/match.h" +#include "src/core/util/match.h" /////////////////////////////////////////////////////////////////////////////// // SHA256 hash handling diff --git a/tools/codegen/core/gen_if_list.py b/tools/codegen/core/gen_if_list.py index 0411ef3ef88..c3a2b6764c8 100755 --- a/tools/codegen/core/gen_if_list.py +++ b/tools/codegen/core/gen_if_list.py @@ -25,7 +25,7 @@ def put_banner(files, banner): print("", file=f) -with open("src/core/lib/gprpp/if_list.h", "w") as H: +with open("src/core/util/if_list.h", "w") as H: # copy-paste copyright notice from this file with open(sys.argv[0]) as my_source: copyright = [] diff --git a/tools/codegen/core/gen_join.py b/tools/codegen/core/gen_join.py index fe6c3a108c9..3c619911303 100755 --- a/tools/codegen/core/gen_join.py +++ b/tools/codegen/core/gen_join.py @@ -111,10 +111,10 @@ front_matter = """ #include "absl/log/check.h" #include "absl/log/log.h" -#include "src/core/lib/gprpp/construct_destruct.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/gprpp/bitset.h" +#include "src/core/util/bitset.h" #include #include #include diff --git a/tools/codegen/core/gen_seq.py b/tools/codegen/core/gen_seq.py index dc2566d2fe5..a8283610845 100755 --- a/tools/codegen/core/gen_seq.py +++ b/tools/codegen/core/gen_seq.py @@ -207,8 +207,8 @@ front_matter = """ #include "absl/base/attributes.h" #include "absl/strings/str_cat.h" -#include "src/core/lib/gprpp/construct_destruct.h" -#include "src/core/lib/gprpp/debug_location.h" +#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" diff --git a/tools/codegen/core/gen_stats_data.py b/tools/codegen/core/gen_stats_data.py index b7e66f00107..7b0d849ff66 100755 --- a/tools/codegen/core/gen_stats_data.py +++ b/tools/codegen/core/gen_stats_data.py @@ -289,7 +289,7 @@ with open("src/core/telemetry/stats_data.h", "w") as H: print("#include ", file=H) print('#include "src/core/telemetry/histogram_view.h"', file=H) print('#include "absl/strings/string_view.h"', file=H) - print('#include "src/core/lib/gprpp/per_cpu.h"', file=H) + print('#include "src/core/util/per_cpu.h"', file=H) print(file=H) print("namespace grpc_core {", file=H) diff --git a/tools/codegen/core/templates/trace_flags.cc.mako b/tools/codegen/core/templates/trace_flags.cc.mako index 401f5feed0c..417921351ee 100644 --- a/tools/codegen/core/templates/trace_flags.cc.mako +++ b/tools/codegen/core/templates/trace_flags.cc.mako @@ -19,7 +19,7 @@ #include "${absl_prefix}absl/container/flat_hash_map.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/no_destruct.h" +#include "src/core/util/no_destruct.h" namespace grpc_core { diff --git a/tools/distrib/check_namespace_qualification.py b/tools/distrib/check_namespace_qualification.py index 51ccb71aeb8..960ecdb6056 100755 --- a/tools/distrib/check_namespace_qualification.py +++ b/tools/distrib/check_namespace_qualification.py @@ -74,9 +74,8 @@ IGNORED_FILES = [ # users would be better off using unique namespaces. "src/compiler/cpp_generator.cc", # multi-line #define statements are not handled - "src/core/lib/gprpp/global_config_env.h", "src/core/lib/profiling/timers.h", - "src/core/lib/gprpp/crash.h", + "src/core/util/crash.h", # The grpc_core::Server redundant namespace qualification is required for # older gcc versions. "src/core/ext/transport/chttp2/server/chttp2_server.h", diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index 89f9a4dd42d..8e4eb7f263a 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -2252,81 +2252,81 @@ 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/lib/gprpp/atomic_utils.h \ -src/core/lib/gprpp/bitset.h \ -src/core/lib/gprpp/chunked_vector.h \ -src/core/lib/gprpp/construct_destruct.h \ -src/core/lib/gprpp/cpp_impl_of.h \ -src/core/lib/gprpp/crash.cc \ -src/core/lib/gprpp/crash.h \ -src/core/lib/gprpp/debug_location.h \ -src/core/lib/gprpp/directory_reader.h \ -src/core/lib/gprpp/down_cast.h \ -src/core/lib/gprpp/dual_ref_counted.h \ -src/core/lib/gprpp/dump_args.cc \ -src/core/lib/gprpp/dump_args.h \ -src/core/lib/gprpp/env.h \ -src/core/lib/gprpp/examine_stack.cc \ -src/core/lib/gprpp/examine_stack.h \ -src/core/lib/gprpp/fork.cc \ -src/core/lib/gprpp/fork.h \ -src/core/lib/gprpp/host_port.cc \ -src/core/lib/gprpp/host_port.h \ -src/core/lib/gprpp/if_list.h \ -src/core/lib/gprpp/linux/env.cc \ -src/core/lib/gprpp/load_file.cc \ -src/core/lib/gprpp/load_file.h \ -src/core/lib/gprpp/manual_constructor.h \ -src/core/lib/gprpp/match.h \ -src/core/lib/gprpp/memory.h \ -src/core/lib/gprpp/mpscq.cc \ -src/core/lib/gprpp/mpscq.h \ -src/core/lib/gprpp/no_destruct.h \ -src/core/lib/gprpp/notification.h \ -src/core/lib/gprpp/orphanable.h \ -src/core/lib/gprpp/overload.h \ -src/core/lib/gprpp/packed_table.h \ -src/core/lib/gprpp/per_cpu.cc \ -src/core/lib/gprpp/per_cpu.h \ -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.h \ -src/core/lib/gprpp/ref_counted_ptr.h \ -src/core/lib/gprpp/ref_counted_string.cc \ -src/core/lib/gprpp/ref_counted_string.h \ -src/core/lib/gprpp/single_set_ptr.h \ -src/core/lib/gprpp/sorted_pack.h \ -src/core/lib/gprpp/stat.h \ -src/core/lib/gprpp/status_helper.cc \ -src/core/lib/gprpp/status_helper.h \ -src/core/lib/gprpp/strerror.cc \ -src/core/lib/gprpp/strerror.h \ -src/core/lib/gprpp/sync.h \ -src/core/lib/gprpp/table.h \ -src/core/lib/gprpp/tchar.cc \ -src/core/lib/gprpp/tchar.h \ -src/core/lib/gprpp/thd.h \ -src/core/lib/gprpp/time.cc \ -src/core/lib/gprpp/time.h \ -src/core/lib/gprpp/time_averaged_stats.cc \ -src/core/lib/gprpp/time_averaged_stats.h \ -src/core/lib/gprpp/time_util.cc \ -src/core/lib/gprpp/time_util.h \ -src/core/lib/gprpp/type_list.h \ -src/core/lib/gprpp/unique_type_name.h \ -src/core/lib/gprpp/uuid_v4.cc \ -src/core/lib/gprpp/uuid_v4.h \ -src/core/lib/gprpp/validation_errors.cc \ -src/core/lib/gprpp/validation_errors.h \ -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/gprpp/work_serializer.h \ -src/core/lib/gprpp/xxhash_inline.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 \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index fa0d255da51..193f08c5207 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -2024,82 +2024,82 @@ 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/lib/gprpp/README.md \ -src/core/lib/gprpp/atomic_utils.h \ -src/core/lib/gprpp/bitset.h \ -src/core/lib/gprpp/chunked_vector.h \ -src/core/lib/gprpp/construct_destruct.h \ -src/core/lib/gprpp/cpp_impl_of.h \ -src/core/lib/gprpp/crash.cc \ -src/core/lib/gprpp/crash.h \ -src/core/lib/gprpp/debug_location.h \ -src/core/lib/gprpp/directory_reader.h \ -src/core/lib/gprpp/down_cast.h \ -src/core/lib/gprpp/dual_ref_counted.h \ -src/core/lib/gprpp/dump_args.cc \ -src/core/lib/gprpp/dump_args.h \ -src/core/lib/gprpp/env.h \ -src/core/lib/gprpp/examine_stack.cc \ -src/core/lib/gprpp/examine_stack.h \ -src/core/lib/gprpp/fork.cc \ -src/core/lib/gprpp/fork.h \ -src/core/lib/gprpp/host_port.cc \ -src/core/lib/gprpp/host_port.h \ -src/core/lib/gprpp/if_list.h \ -src/core/lib/gprpp/linux/env.cc \ -src/core/lib/gprpp/load_file.cc \ -src/core/lib/gprpp/load_file.h \ -src/core/lib/gprpp/manual_constructor.h \ -src/core/lib/gprpp/match.h \ -src/core/lib/gprpp/memory.h \ -src/core/lib/gprpp/mpscq.cc \ -src/core/lib/gprpp/mpscq.h \ -src/core/lib/gprpp/no_destruct.h \ -src/core/lib/gprpp/notification.h \ -src/core/lib/gprpp/orphanable.h \ -src/core/lib/gprpp/overload.h \ -src/core/lib/gprpp/packed_table.h \ -src/core/lib/gprpp/per_cpu.cc \ -src/core/lib/gprpp/per_cpu.h \ -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.h \ -src/core/lib/gprpp/ref_counted_ptr.h \ -src/core/lib/gprpp/ref_counted_string.cc \ -src/core/lib/gprpp/ref_counted_string.h \ -src/core/lib/gprpp/single_set_ptr.h \ -src/core/lib/gprpp/sorted_pack.h \ -src/core/lib/gprpp/stat.h \ -src/core/lib/gprpp/status_helper.cc \ -src/core/lib/gprpp/status_helper.h \ -src/core/lib/gprpp/strerror.cc \ -src/core/lib/gprpp/strerror.h \ -src/core/lib/gprpp/sync.h \ -src/core/lib/gprpp/table.h \ -src/core/lib/gprpp/tchar.cc \ -src/core/lib/gprpp/tchar.h \ -src/core/lib/gprpp/thd.h \ -src/core/lib/gprpp/time.cc \ -src/core/lib/gprpp/time.h \ -src/core/lib/gprpp/time_averaged_stats.cc \ -src/core/lib/gprpp/time_averaged_stats.h \ -src/core/lib/gprpp/time_util.cc \ -src/core/lib/gprpp/time_util.h \ -src/core/lib/gprpp/type_list.h \ -src/core/lib/gprpp/unique_type_name.h \ -src/core/lib/gprpp/uuid_v4.cc \ -src/core/lib/gprpp/uuid_v4.h \ -src/core/lib/gprpp/validation_errors.cc \ -src/core/lib/gprpp/validation_errors.h \ -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/gprpp/work_serializer.h \ -src/core/lib/gprpp/xxhash_inline.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 \ diff --git a/tools/run_tests/sanity/check_absl_mutex.sh b/tools/run_tests/sanity/check_absl_mutex.sh index e4b5cb27d9d..474a71696f9 100755 --- a/tools/run_tests/sanity/check_absl_mutex.sh +++ b/tools/run_tests/sanity/check_absl_mutex.sh @@ -28,7 +28,7 @@ find . \( \( -name "*.cc" \) -or \( -name "*.h" \) \) \ -or \( -wholename "./include/*" \) \ -or \( -wholename "./test/*" \) \) \ -a -not -wholename "./include/grpcpp/impl/sync.h" \ - -a -not -wholename "./src/core/lib/gprpp/sync.h" \ + -a -not -wholename "./src/core/util/sync.h" \ -a -not -wholename "./src/core/util/sync_abseil.cc" \ -print0 |\ xargs -0 grep -n "absl::Mutex" | \ diff --git a/tools/run_tests/sanity/cpp_banned_constructs.sh b/tools/run_tests/sanity/cpp_banned_constructs.sh index 527d1b0b65e..af0766fa6ea 100755 --- a/tools/run_tests/sanity/cpp_banned_constructs.sh +++ b/tools/run_tests/sanity/cpp_banned_constructs.sh @@ -26,7 +26,7 @@ cd "$(dirname "$0")/../../.." grep -EIrn \ 'std::(mutex|condition_variable|lock_guard|unique_lock|thread)' \ include/grpc include/grpcpp src/core src/cpp | \ - grep -Ev 'include/grpcpp/impl/sync.h|src/core/lib/gprpp/work_serializer.cc' | \ + grep -Ev 'include/grpcpp/impl/sync.h|src/core/util/work_serializer.cc' | \ diff - /dev/null # @@ -36,7 +36,7 @@ grep -EIrn \ grep -EIrn \ '^#include (||||||)' \ include/grpc include/grpcpp src/core src/cpp | \ - grep -Ev 'include/grpcpp/impl/sync.h|src/core/lib/gprpp/work_serializer.cc' | \ + grep -Ev 'include/grpcpp/impl/sync.h|src/core/util/work_serializer.cc' | \ diff - /dev/null #