From a626995f364816237fbabd76eac65087f0e1f12a Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Fri, 13 Sep 2024 12:11:21 -0700 Subject: [PATCH 01/30] [client_lb_e2e_test] increase timeout for WeightedRoundRobinTest.WithOutlierDetection test (#37718) This attempts to fix the following flake: https://btx.cloud.google.com/invocations/e8a6ff31-ba5f-49ff-97d7-eb4b6b3b7c04/targets/%2F%2Ftest%2Fcpp%2Fend2end:client_lb_end2end_test@poller%3Dpoll;config=c4ae5af353698403518bd66f686ce4f7f10d865e4cdcccbb7036582cbc9fa7d6/tests The flake is a timeout, and it's extremely rare -- it's happened only twice in the last year, and both times under MSAN. I can't reproduce it manually, even running 1000x on RBE with MSAN. But I think this PR should address it. Closes #37718 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37718 from markdroth:client_lb_e2e_flake 1ee75c77679dd940652d028abbd2e912a5ff8e81 PiperOrigin-RevId: 674387421 --- test/cpp/end2end/client_lb_end2end_test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/cpp/end2end/client_lb_end2end_test.cc b/test/cpp/end2end/client_lb_end2end_test.cc index ab21e760b4c..b3d1394480d 100644 --- a/test/cpp/end2end/client_lb_end2end_test.cc +++ b/test/cpp/end2end/client_lb_end2end_test.cc @@ -3277,7 +3277,7 @@ TEST_F(WeightedRoundRobinTest, CallAndServerMetric) { // all of its subchannels every time it saw an update, thus causing the // WRR policy to re-enter the blackout period for that address. TEST_F(WeightedRoundRobinTest, WithOutlierDetection) { - const int kBlackoutPeriodSeconds = 5; + const int kBlackoutPeriodSeconds = 10; const int kNumServers = 3; StartServers(kNumServers); // Report server metrics that should give 6:4:3 WRR picks. From 2afe013e8489fb9327b589180351faa7a664550f Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Fri, 13 Sep 2024 12:59:42 -0700 Subject: [PATCH 02/30] [flake] Fix chaotic good no_logging flake (#37721) Move the problematic log to be a trace log (not needed for general workflows), and take the opportunity to clean up a few other errors to log every n seconds -- because we principally need the signal that it's happening, not every occurrence. Closes #37721 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37721 from ctiller:flake-fightas-6 ac18237c51ec8b635c0ae15f246953248df9a8ff PiperOrigin-RevId: 674404222 --- .../server/chaotic_good_server.cc | 22 ++++++++----------- .../chaotic_good/server/chaotic_good_server.h | 2 +- 2 files changed, 10 insertions(+), 14 deletions(-) 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 2a707602920..ac044244bd2 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 @@ -187,11 +187,7 @@ void ChaoticGoodServerListener::ActiveConnection::NewConnectionID() { connection_id_, std::make_shared>()); } -void ChaoticGoodServerListener::ActiveConnection::Done( - absl::optional error) { - if (error.has_value()) { - LOG(ERROR) << "ActiveConnection::Done:" << this << " " << *error; - } +void ChaoticGoodServerListener::ActiveConnection::Done() { // Can easily be holding various locks here: bounce through EE to ensure no // deadlocks. listener_->event_engine_->Run([self = Ref()]() { @@ -387,13 +383,15 @@ auto ChaoticGoodServerListener::ActiveConnection::HandshakingState:: void ChaoticGoodServerListener::ActiveConnection::HandshakingState:: OnHandshakeDone(absl::StatusOr result) { if (!result.ok()) { - connection_->Done( - absl::StrCat("Handshake failed: ", result.status().ToString())); + LOG_EVERY_N_SEC(ERROR, 5) << "Handshake failed: ", result.status(); + connection_->Done(); return; } CHECK_NE(*result, nullptr); if ((*result)->endpoint == nullptr) { - connection_->Done("Server handshake done but has empty endpoint."); + LOG_EVERY_N_SEC(ERROR, 5) + << "Server handshake done but has empty endpoint."; + connection_->Done(); return; } CHECK(grpc_event_engine::experimental::grpc_is_event_engine_endpoint( @@ -429,12 +427,10 @@ void ChaoticGoodServerListener::ActiveConnection::HandshakingState:: EventEngineWakeupScheduler(connection_->listener_->event_engine_), [self = Ref()](absl::Status status) { if (!status.ok()) { - self->connection_->Done( - absl::StrCat("Server setting frame handling failed: ", - StatusToString(status))); - } else { - self->connection_->Done(); + GRPC_TRACE_LOG(chaotic_good, ERROR) + << "Server setting frame handling failed: " << status; } + self->connection_->Done(); }, connection_->arena_.get()); MutexLock lock(&connection_->mu_); 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 0b20dcbb363..d5ec23b5de3 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 @@ -111,7 +111,7 @@ class ChaoticGoodServerListener final : public Server::ListenerInterface { }; private: - void Done(absl::optional error = absl::nullopt); + void Done(); void NewConnectionID(); RefCountedPtr arena_ = SimpleArenaAllocator()->MakeArena(); const RefCountedPtr listener_; From a915689850d7d471a39f7c489c71f5ad7727472f Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Fri, 13 Sep 2024 16:22:19 -0700 Subject: [PATCH 03/30] [flake] Fix TSAN race StartCall needs to be called from the party of the call being started, and so here we reorder things such that that's guaranteed. PiperOrigin-RevId: 674471582 --- src/core/ext/transport/chaotic_good/server_transport.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/core/ext/transport/chaotic_good/server_transport.cc b/src/core/ext/transport/chaotic_good/server_transport.cc index 6ffb6b7f067..b40e0290b0a 100644 --- a/src/core/ext/transport/chaotic_good/server_transport.cc +++ b/src/core/ext/transport/chaotic_good/server_transport.cc @@ -237,10 +237,11 @@ auto ChaoticGoodServerTransport::DeserializeAndPushFragmentToNewCall( call_initiator.emplace(std::move(call.initiator)); auto add_result = NewStream(frame_header.stream_id, *call_initiator); if (add_result.ok()) { - call_destination_->StartCall(std::move(call.handler)); call_initiator->SpawnGuarded( "server-write", [this, stream_id = frame_header.stream_id, - call_initiator = *call_initiator]() { + call_initiator = *call_initiator, + call_handler = std::move(call.handler)]() { + call_destination_->StartCall(std::move(call_handler)); return CallOutboundLoop(stream_id, call_initiator); }); } else { From 536bbbf18191d8e0659f8e414dbab10263ed1720 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Fri, 13 Sep 2024 19:28:33 -0700 Subject: [PATCH 04/30] [party] Race fix (#37726) Party contains a state field that contains ref count *and some other things*... so RefIfNonZero needs to pay attention to only consider the ref count portion. Closes #37726 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37726 from ctiller:flake-fightas-7 f2b3b3ff6dfb92475bfe9cca1d41dc183734c011 PiperOrigin-RevId: 674514201 --- src/core/ext/transport/chaotic_good/server_transport.cc | 2 +- src/core/lib/promise/party.cc | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/ext/transport/chaotic_good/server_transport.cc b/src/core/ext/transport/chaotic_good/server_transport.cc index b40e0290b0a..d6c5faf3574 100644 --- a/src/core/ext/transport/chaotic_good/server_transport.cc +++ b/src/core/ext/transport/chaotic_good/server_transport.cc @@ -240,7 +240,7 @@ auto ChaoticGoodServerTransport::DeserializeAndPushFragmentToNewCall( call_initiator->SpawnGuarded( "server-write", [this, stream_id = frame_header.stream_id, call_initiator = *call_initiator, - call_handler = std::move(call.handler)]() { + call_handler = std::move(call.handler)]() mutable { call_destination_->StartCall(std::move(call_handler)); return CallOutboundLoop(stream_id, call_initiator); }); diff --git a/src/core/lib/promise/party.cc b/src/core/lib/promise/party.cc index b8b6a899a48..1fbc01fd3da 100644 --- a/src/core/lib/promise/party.cc +++ b/src/core/lib/promise/party.cc @@ -41,18 +41,18 @@ namespace grpc_core { // PartySyncUsingAtomics GRPC_MUST_USE_RESULT bool Party::RefIfNonZero() { - auto count = state_.load(std::memory_order_relaxed); + auto state = state_.load(std::memory_order_relaxed); do { // If zero, we are done (without an increment). If not, we must do a CAS // to maintain the contract: do not increment the counter if it is already // zero - if (count == 0) { + if ((state & kRefMask) == 0) { return false; } - } while (!state_.compare_exchange_weak(count, count + kOneRef, + } while (!state_.compare_exchange_weak(state, state + kOneRef, std::memory_order_acq_rel, std::memory_order_relaxed)); - LogStateChange("RefIfNonZero", count, count + kOneRef); + LogStateChange("RefIfNonZero", state, state + kOneRef); return true; } From db09bbeb82f675b6cb5e48e1c0eac747bfb8bcfc Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Sun, 15 Sep 2024 10:08:33 -0700 Subject: [PATCH 05/30] [flake] Fix flake in connection_refused_test (#37728) Increase deadline in the case that we don't expect a deadline to hit (it expired too early in https://btx.cloud.google.com/invocations/55447722-0454-44b4-bd96-9f1604d8e02c/targets/%2F%2Ftest%2Fcore%2Fend2end:connection_refused_test;config=213e6770efdd9d7e0a9867560d39d4ea0067b835bad2334b239f96b3b6b502ba/log, but two seconds is actually kind of tight here). Closes #37728 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37728 from ctiller:flake-fightas-8 7a5378b8e796619004b7e4f764a6fbbbcd48ef9f PiperOrigin-RevId: 674894511 --- test/core/end2end/connection_refused_test.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/core/end2end/connection_refused_test.cc b/test/core/end2end/connection_refused_test.cc index 1e3414b8875..5bba8040307 100644 --- a/test/core/end2end/connection_refused_test.cc +++ b/test/core/end2end/connection_refused_test.cc @@ -86,7 +86,8 @@ static void run_test(bool wait_for_ready, bool use_service_config) { chan = grpc_channel_create(addr.c_str(), creds, args); grpc_channel_credentials_release(creds); grpc_slice host = grpc_slice_from_static_string("nonexistant"); - gpr_timespec deadline = grpc_timeout_seconds_to_deadline(2); + gpr_timespec deadline = + grpc_timeout_seconds_to_deadline(wait_for_ready ? 2 : 600); call = grpc_channel_create_call(chan, nullptr, GRPC_PROPAGATE_DEFAULTS, cq, grpc_slice_from_static_string("/service/method"), From 478c8850e2abbc7e5beb39486404d44d008a1116 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Sun, 15 Sep 2024 17:44:53 -0700 Subject: [PATCH 06/30] [flake] Disable xds_fault_injection_end2end_test on Mac (#37730) Suspect an STL bug or similar, but I think it suffices to test this on Linux. Closes #37730 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37730 from ctiller:no-way 118f0529a64ef60aa28ab7e74bbf7162c8203d87 PiperOrigin-RevId: 674960371 --- CMakeLists.txt | 4 ++-- build_autogenerated.yaml | 1 - test/cpp/end2end/xds/BUILD | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5dbde74415d..169d6d553e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1591,7 +1591,7 @@ if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_dependencies(buildtests_cxx xds_fallback_end2end_test) endif() - if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) add_dependencies(buildtests_cxx xds_fault_injection_end2end_test) endif() if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) @@ -35482,7 +35482,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) endif() endif() if(gRPC_BUILD_TESTS) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) +if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) add_executable(xds_fault_injection_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index 8f5100705fb..2d75546550c 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -21871,7 +21871,6 @@ targets: platforms: - linux - posix - - mac - name: xds_gcp_authn_end2end_test gtest: true build: test diff --git a/test/cpp/end2end/xds/BUILD b/test/cpp/end2end/xds/BUILD index 07e486e6b62..f247f14425b 100644 --- a/test/cpp/end2end/xds/BUILD +++ b/test/cpp/end2end/xds/BUILD @@ -281,6 +281,7 @@ grpc_cc_test( linkstatic = True, # Fixes dyld error on MacOS shard_count = 5, tags = [ + "no_mac", "no_test_ios", "no_windows", "xds_end2end_test", From 33edf1a9a3c676484333cd1cb980fcef0bc32eee Mon Sep 17 00:00:00 2001 From: apolcyn Date: Mon, 16 Sep 2024 09:11:20 -0700 Subject: [PATCH 07/30] [testing] reduce number of sockets in windows socket-use-after-close detection loop (#37669) This test has been flaking for a while with a WSAEACCESS error on the `bind` call. Change the loop to only create on socket at a time (on Windows) to rule out something windows-specific is not liking the fact that we are opening multiple listen sockets on the same port. Closes #37669 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37669 from apolcyn:change_loop ffa105ba462af814782e352c49823bef89598741 PiperOrigin-RevId: 675172803 --- test/core/test_util/BUILD | 5 +- .../socket_use_after_close_detector.cc | 65 ++----------------- 2 files changed, 10 insertions(+), 60 deletions(-) diff --git a/test/core/test_util/BUILD b/test/core/test_util/BUILD index 12ae1064e45..653c1639a25 100644 --- a/test/core/test_util/BUILD +++ b/test/core/test_util/BUILD @@ -395,7 +395,10 @@ grpc_cc_library( testonly = True, srcs = ["socket_use_after_close_detector.cc"], hdrs = ["socket_use_after_close_detector.h"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:log", + "gtest", + ], language = "C++", deps = [ "grpc_test_util", diff --git a/test/core/test_util/socket_use_after_close_detector.cc b/test/core/test_util/socket_use_after_close_detector.cc index ab55cbacfae..8d2c77b2555 100644 --- a/test/core/test_util/socket_use_after_close_detector.cc +++ b/test/core/test_util/socket_use_after_close_detector.cc @@ -33,6 +33,7 @@ #include #include +#include "absl/log/log.h" #include "gtest/gtest.h" #include @@ -40,71 +41,17 @@ #include "src/core/lib/iomgr/sockaddr.h" #include "test/core/test_util/port.h" -// TODO(unknown): pull in different headers when enabling this -// test on windows. Also set BAD_SOCKET_RETURN_VAL -// to INVALID_SOCKET on windows. -#ifdef GPR_WINDOWS -#include "src/core/lib/iomgr/socket_windows.h" -#include "src/core/lib/iomgr/tcp_windows.h" - -#define BAD_SOCKET_RETURN_VAL INVALID_SOCKET -#else #define BAD_SOCKET_RETURN_VAL (-1) -#endif namespace { #ifdef GPR_WINDOWS void OpenAndCloseSocketsStressLoop(int port, gpr_event* done_ev) { - sockaddr_in6 addr; - memset(&addr, 0, sizeof(addr)); - addr.sin6_family = AF_INET6; - addr.sin6_port = htons(port); - ((char*)&addr.sin6_addr)[15] = 1; - for (;;) { - if (gpr_event_get(done_ev)) { - return; - } - std::vector sockets; - for (size_t i = 0; i < 50; i++) { - SOCKET s = WSASocket(AF_INET6, SOCK_STREAM, IPPROTO_TCP, nullptr, 0, - WSA_FLAG_OVERLAPPED); - ASSERT_TRUE(s != BAD_SOCKET_RETURN_VAL) - << "Failed to create TCP ipv6 socket"; - char val = 1; - ASSERT_TRUE(setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)) != - SOCKET_ERROR) - << "Failed to set socketopt reuseaddr. WSA error: " + - std::to_string(WSAGetLastError()); - ASSERT_TRUE(grpc_tcp_set_non_block(s) == absl::OkStatus()) - << "Failed to set socket non-blocking"; - ASSERT_TRUE(bind(s, (const sockaddr*)&addr, sizeof(addr)) != SOCKET_ERROR) - << "Failed to bind socket " + std::to_string(s) + - " to [::1]:" + std::to_string(port) + - ". WSA error: " + std::to_string(WSAGetLastError()); - ASSERT_TRUE(listen(s, 1) != SOCKET_ERROR) - << "Failed to listen on socket " + std::to_string(s) + - ". WSA error: " + std::to_string(WSAGetLastError()); - sockets.push_back(s); - } - // Do a non-blocking accept followed by a close on all of those sockets. - // Do this in a separate loop to try to induce a time window to hit races. - for (size_t i = 0; i < sockets.size(); i++) { - ASSERT_TRUE(accept(sockets[i], nullptr, nullptr) == INVALID_SOCKET) - << "Accept on phony socket unexpectedly accepted actual connection."; - ASSERT_TRUE(WSAGetLastError() == WSAEWOULDBLOCK) - << "OpenAndCloseSocketsStressLoop accept on socket " + - std::to_string(sockets[i]) + - " failed in " - "an unexpected way. " - "WSA error: " + - std::to_string(WSAGetLastError()) + - ". Socket use-after-close bugs are likely."; - ASSERT_TRUE(closesocket(sockets[i]) != SOCKET_ERROR) - << "Failed to close socket: " + std::to_string(sockets[i]) + - ". WSA error: " + std::to_string(WSAGetLastError()); - } - } + // TODO(apolcyn): re-enable this on windows if we can debug the failure. + // Previously, this was causing test flakes for a while b/c bind calls + // would fail with WSAEACCESS. Not clear if we were just making windows + // unhappy. + LOG(INFO) << "OpenAndCloseSocketsStressLoop is a no-op for windows"; return; } #else From ed3d6c0d62cecffe17781b9e0d157292835bd808 Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Tue, 17 Sep 2024 09:29:01 -0700 Subject: [PATCH 08/30] [xds_cluster_e2e_test] remove unnecessary check for EDS response state (#37736) This check wasn't actually adding any value in the test, and we've seen a couple of flakes like the following: https://btx.cloud.google.com/invocations/c814e411-7589-4cbf-b907-6be55ff55f0e/targets/%2F%2Ftest%2Fcpp%2Fend2end%2Fxds:xds_cluster_end2end_test@poller%3Depoll1;config=56f5b09615e325097b100b58c41171656571290519a83c5d89a6067ef0283d46/tests Closes #37736 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37736 from markdroth:xds_cluster_e2e_flake2 f94604afdf92f9f2891f52ed6503a1f60c048c5f PiperOrigin-RevId: 675597480 --- test/cpp/end2end/xds/xds_cluster_end2end_test.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/cpp/end2end/xds/xds_cluster_end2end_test.cc b/test/cpp/end2end/xds/xds_cluster_end2end_test.cc index 951639f2db5..afb41a287be 100644 --- a/test/cpp/end2end/xds/xds_cluster_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_cluster_end2end_test.cc @@ -1563,8 +1563,6 @@ TEST_P(FailoverTest, MoveAllLocalitiesInCurrentPriorityToHigherPriority) { balancer_->ads_service()->SetEdsResource(BuildEdsResource(args)); // When backend 2 gets traffic, we know the second update has been seen. WaitForBackend(DEBUG_LOCATION, 2); - // The xDS server got at least 1 response. - EXPECT_TRUE(balancer_->ads_service()->eds_response_state().has_value()); } // This tests a bug triggered by the xds_cluster_resolver policy reusing From 76bbbb06b28f1064af49afb71e1cd60d370dae23 Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Tue, 17 Sep 2024 11:20:18 -0700 Subject: [PATCH 09/30] [xds_cluster_e2e_test] fix flake in DropConfigUpdate test (#37735) Changed test to add a new backend, as a more reliable method for determining when the client has seen the update. This fixes flakes like the following: https://btx.cloud.google.com/invocations/d4267c2a-3557-4e09-8439-d7f24637a5ba/targets/%2F%2Ftest%2Fcpp%2Fend2end%2Fxds:xds_cluster_end2end_test@poller%3Dpoll;config=c4ae5af353698403518bd66f686ce4f7f10d865e4cdcccbb7036582cbc9fa7d6/tests Closes #37735 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37735 from markdroth:xds_cluster_e2e_flake 68edb080daebd056e456037e8f792c66a22a99a1 PiperOrigin-RevId: 675640226 --- .../end2end/xds/xds_cluster_end2end_test.cc | 40 +++++++------------ 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/test/cpp/end2end/xds/xds_cluster_end2end_test.cc b/test/cpp/end2end/xds/xds_cluster_end2end_test.cc index afb41a287be..1190111fe1a 100644 --- a/test/cpp/end2end/xds/xds_cluster_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_cluster_end2end_test.cc @@ -1073,7 +1073,7 @@ TEST_P(EdsTest, DropPerTenThousand) { // Tests that drop is working correctly after update. TEST_P(EdsTest, DropConfigUpdate) { - CreateAndStartBackends(1); + CreateAndStartBackends(2); const uint32_t kDropPerMillionForLb = 100000; const uint32_t kDropPerMillionForThrottle = 200000; const double kErrorTolerance = 0.05; @@ -1085,8 +1085,8 @@ TEST_P(EdsTest, DropConfigUpdate) { ComputeIdealNumRpcs(kDropRateForLb, kErrorTolerance); const size_t kNumRpcsBoth = ComputeIdealNumRpcs(kDropRateForLbAndThrottle, kErrorTolerance); - // The first ADS response contains one drop category. - EdsResourceArgs args({{"locality0", CreateEndpointsForBackends()}}); + // The first EDS response contains backend 0 and one drop category. + EdsResourceArgs args({{"locality0", CreateEndpointsForBackends(0, 1)}}); args.drop_categories = {{kLbDropType, kDropPerMillionForLb}}; balancer_->ads_service()->SetEdsResource(BuildEdsResource(args)); // Send kNumRpcsLbOnly RPCs and count the drops. @@ -1100,32 +1100,20 @@ TEST_P(EdsTest, DropConfigUpdate) { LOG(INFO) << "First batch drop rate " << seen_drop_rate; EXPECT_THAT(seen_drop_rate, ::testing::DoubleNear(kDropRateForLb, kErrorTolerance)); - // The second ADS response contains two drop categories, send an update EDS - // response. + // The second EDS response contains both backends and two drop categories. + args = EdsResourceArgs({{"locality0", CreateEndpointsForBackends()}}); args.drop_categories = {{kLbDropType, kDropPerMillionForLb}, {kThrottleDropType, kDropPerMillionForThrottle}}; balancer_->ads_service()->SetEdsResource(BuildEdsResource(args)); - // Wait until the drop rate increases to the middle of the two configs, - // which implies that the update has been in effect. - const double kDropRateThreshold = - (kDropRateForLb + kDropRateForLbAndThrottle) / 2; - size_t num_rpcs = kNumRpcsBoth; - SendRpcsUntil( - DEBUG_LOCATION, - [&](const RpcResult& result) { - ++num_rpcs; - if (result.status.ok()) { - EXPECT_EQ(result.response.message(), kRequestMessage); - } else { - EXPECT_EQ(result.status.error_code(), StatusCode::UNAVAILABLE); - EXPECT_THAT(result.status.error_message(), - ::testing::StartsWith(kStatusMessageDropPrefix)); - ++num_drops; - } - seen_drop_rate = static_cast(num_drops) / num_rpcs; - return seen_drop_rate < kDropRateThreshold; - }, - /*timeout_ms=*/40000); + // Wait until backend 1 sees traffic, so that we know the client has + // seen the update. + WaitForBackend(DEBUG_LOCATION, 1, [&](const RpcResult& result) { + if (!result.status.ok()) { + EXPECT_EQ(result.status.error_code(), StatusCode::UNAVAILABLE); + EXPECT_THAT(result.status.error_message(), + ::testing::StartsWith(kStatusMessageDropPrefix)); + } + }); // Send kNumRpcsBoth RPCs and count the drops. LOG(INFO) << "========= BEFORE SECOND BATCH =========="; num_drops = SendRpcsAndCountFailuresWithMessage(DEBUG_LOCATION, kNumRpcsBoth, From e0a62f776236891145c6083f0575aefc89eb348d Mon Sep 17 00:00:00 2001 From: AJ Heller Date: Tue, 17 Sep 2024 11:38:31 -0700 Subject: [PATCH 10/30] [experiments] Bump EventEngine experiment expiration dates (#37740) Closes #37740 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37740 from drfloob:bump 804c70f4e5b462ab9129bedefc0439927d0388f0 PiperOrigin-RevId: 675647548 --- src/core/lib/experiments/experiments.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/lib/experiments/experiments.yaml b/src/core/lib/experiments/experiments.yaml index 6cc3781f266..bde5859f66a 100644 --- a/src/core/lib/experiments/experiments.yaml +++ b/src/core/lib/experiments/experiments.yaml @@ -61,25 +61,25 @@ allow_in_fuzzing_config: false - name: event_engine_application_callbacks description: Run application callbacks in EventEngine threads, instead of on the thread-local ApplicationCallbackExecCtx - expiry: 2024/10/31 + expiry: 2025/03/01 owner: hork@google.com - name: event_engine_client description: Use EventEngine clients instead of iomgr's grpc_tcp_client - expiry: 2024/10/01 + expiry: 2025/03/01 owner: hork@google.com test_tags: ["core_end2end_test", "event_engine_client_test"] uses_polling: true - name: event_engine_dns description: If set, use EventEngine DNSResolver for client channel resolution - expiry: 2024/10/01 + expiry: 2025/03/01 owner: yijiem@google.com test_tags: ["cancel_ares_query_test", "resolver_component_tests_runner_invoker"] allow_in_fuzzing_config: false uses_polling: true - name: event_engine_listener description: Use EventEngine listeners instead of iomgr's grpc_tcp_server - expiry: 2024/12/01 + expiry: 2025/03/01 owner: vigneshbabu@google.com test_tags: ["core_end2end_test", "event_engine_listener_test"] uses_polling: true From cddde6f3dbc675bfe457a65d576f0ae282467e31 Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Tue, 17 Sep 2024 12:45:09 -0700 Subject: [PATCH 11/30] [experiment] extend expiration of call_tracer_in_transport experiment (#37734) Closes #37734 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37734 from markdroth:experiment_expiration 215371c86b1e2ea663589740c60855173bfab474 PiperOrigin-RevId: 675672071 --- src/core/lib/experiments/experiments.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/lib/experiments/experiments.yaml b/src/core/lib/experiments/experiments.yaml index bde5859f66a..d4115e8f5e9 100644 --- a/src/core/lib/experiments/experiments.yaml +++ b/src/core/lib/experiments/experiments.yaml @@ -42,7 +42,7 @@ # state of each experiment. - name: call_tracer_in_transport description: Transport directly passes byte counts to CallTracer. - expiry: 2024/09/30 + expiry: 2025/02/01 owner: roth@google.com test_tags: [] - name: canary_client_privacy From 7d11791ec7204184ffa611405f4a89cd3cdc2c60 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Tue, 17 Sep 2024 13:48:09 -0700 Subject: [PATCH 12/30] [Flaky] max_connection_age test fix (#37739) Closes #37739 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37739 from yashykt:FixMaxConnectionAgeTest 5d677ef875598e9dabf7f658affd8c48c16119a0 PiperOrigin-RevId: 675695824 --- test/core/end2end/tests/max_connection_age.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/test/core/end2end/tests/max_connection_age.cc b/test/core/end2end/tests/max_connection_age.cc index f2d0d88a51b..03252855cf1 100644 --- a/test/core/end2end/tests/max_connection_age.cc +++ b/test/core/end2end/tests/max_connection_age.cc @@ -162,10 +162,12 @@ CORE_END2END_TEST(Http2Test, MaxAgeGracefullyClose) { Expect(101, false); } Step(); - // The connection is closed gracefully with goaway, the rpc should still be - // completed. - EXPECT_EQ(server_status.status(), GRPC_STATUS_UNIMPLEMENTED); - EXPECT_EQ(server_status.message(), "xyz"); + if (got_server) { + // The connection is closed gracefully with goaway, the rpc should still be + // completed. + EXPECT_EQ(server_status.status(), GRPC_STATUS_UNIMPLEMENTED); + EXPECT_EQ(server_status.message(), "xyz"); + } } } // namespace From 2c9b757462f4c2ea8dfd065e162e9db65af451e6 Mon Sep 17 00:00:00 2001 From: Xuan Wang Date: Tue, 17 Sep 2024 14:09:11 -0700 Subject: [PATCH 13/30] [Python test] Fix gcf permission denied error (#37684) `grpc_distribtests_gcp_python` test is [failing with permission error](https://fusion2.corp.google.com/ci;ids=1930537984/kokoro/prod:grpc%2Fcore%2Fmaster%2Flinux%2Fgrpc_distribtests_gcp_python/activity/2c6d57dd-f504-4834-9fd6-845db47ede01/log): ``` ERROR: (gcloud.functions.deploy) ResponseError: status=[403], code=[Ok], message=[Permission 'run.services.setIamPolicy' denied on resource 'projects/grpc-testing/locations/us-central1/services/grpc-gcf-distribtest-3cd3cc11-1a8f-4b88-9c3b-220f0bdf9fdc' (or resource may not exist).] ``` In the logs, looks like we're creating gen2 functions by default: ``` As of this Cloud SDK release, new functions will be deployed as 2nd gen functions by default. This is equivalent to currently deploying new with the --gen2 flag. Existing 1st gen functions will not be impacted and will continue to deploy as 1st gen functions. ``` Since we don't need functions provided by gen2 functions and use `--no-gen2` fixed the permission issue, we're adding `--no-gen2` flag to our test. ### Test: * Passed manually run: http://sponge/e52ffb74-5a12-4e67-9f95-4638390ef57c Closes #37684 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37684 from XuanWang-Amos:fix_gcf 26588c0cc3ad1663836e18028dfe2a1b22825d4d PiperOrigin-RevId: 675703636 --- test/distrib/gcf/python/run_single.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/distrib/gcf/python/run_single.sh b/test/distrib/gcf/python/run_single.sh index c2387555035..6d436e2510e 100755 --- a/test/distrib/gcf/python/run_single.sh +++ b/test/distrib/gcf/python/run_single.sh @@ -44,7 +44,8 @@ function cleanup() { trap cleanup SIGINT SIGTERM EXIT # Deploy -DEPLOY_OUTPUT=$(gcloud functions deploy "${FUNCTION_NAME}" --entry-point test_publish --runtime "${RUNTIME}" --trigger-http --allow-unauthenticated) + +DEPLOY_OUTPUT=$(gcloud functions deploy "${FUNCTION_NAME}" --entry-point test_publish --runtime "${RUNTIME}" --trigger-http --allow-unauthenticated --no-gen2) HTTP_URL=$(echo "${DEPLOY_OUTPUT}" | grep "url: " | awk '{print $2;}') # Send Requests From 9a1ba9d15db703a6d64cfcb751677c9616b17002 Mon Sep 17 00:00:00 2001 From: Xuan Wang Date: Tue, 17 Sep 2024 14:09:56 -0700 Subject: [PATCH 14/30] [Python test] Add test timestamp (#37703) `grpc/core/master/macos/grpc_basictests_python` test is flaky, all test cases passed by the test itself [failed with timeout](https://btx.cloud.google.com/invocations/33bdec48-e17b-431b-b473-c8a335e1650c/log): ``` 2024-09-11 16:48:57,385 TIMEOUT: py38.asyncio.tests_aio.unit.done_callback_test.TestServerSideDoneCallback [pid=11128, time=486.5sec] ``` This PR does two things: 1. Increase timeout for test case from `480s` to `600s`. 2. Add timestamp to test starting and passing so we know which test case takes a long time to run. Log before timestamp change: ``` Running tests_aio.unit.done_callback_test.TestServerSideDoneCallback.test_stream_stream Running tests_aio.unit.done_callback_test.TestServerSideDoneCallback.test_stream_unary Running tests_aio.unit.done_callback_test.TestServerSideDoneCallback.test_unary_stream Running tests_aio.unit.done_callback_test.TestServerSideDoneCallback.test_unary_unary Testing gRPC Python... SUCCESS tests_aio.unit.done_callback_test.TestServerSideDoneCallback.test_error_in_callback SUCCESS tests_aio.unit.done_callback_test.TestServerSideDoneCallback.test_error_in_handler SUCCESS tests_aio.unit.done_callback_test.TestServerSideDoneCallback.test_stream_stream SUCCESS tests_aio.unit.done_callback_test.TestServerSideDoneCallback.test_stream_unary SUCCESS tests_aio.unit.done_callback_test.TestServerSideDoneCallback.test_unary_stream SUCCESS tests_aio.unit.done_callback_test.TestServerSideDoneCallback.test_unary_unary ``` Log after timestamp change: ``` Running tests_aio.unit.done_callback_test.TestClientSideDoneCallback.test_stream_stream Running tests_aio.unit.done_callback_test.TestClientSideDoneCallback.test_stream_unary Running tests_aio.unit.done_callback_test.TestClientSideDoneCallback.test_unary_stream Running tests_aio.unit.done_callback_test.TestClientSideDoneCallback.test_unary_unary [2024-09-12 10:47:13.877185]Testing gRPC Python... [2024-09-12 10:47:13.901135]SUCCESS tests_aio.unit.done_callback_test.TestClientSideDoneCallback.test_add_after_done [2024-09-12 10:47:13.933705]SUCCESS tests_aio.unit.done_callback_test.TestClientSideDoneCallback.test_stream_stream [2024-09-12 10:47:13.962419]SUCCESS tests_aio.unit.done_callback_test.TestClientSideDoneCallback.test_stream_unary [2024-09-12 10:47:13.990368]SUCCESS tests_aio.unit.done_callback_test.TestClientSideDoneCallback.test_unary_stream ``` Closes #37703 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37703 from XuanWang-Amos:add_test_timestamp 4e13d29021bbd2af7f260d060ab2a5b3361741ad PiperOrigin-RevId: 675703890 --- src/python/grpcio_tests/tests/_result.py | 11 +++++++++-- tools/run_tests/run_tests.py | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/python/grpcio_tests/tests/_result.py b/src/python/grpcio_tests/tests/_result.py index 6f621d7e75e..151c621fb6f 100644 --- a/src/python/grpcio_tests/tests/_result.py +++ b/src/python/grpcio_tests/tests/_result.py @@ -15,6 +15,7 @@ from __future__ import absolute_import import collections +import datetime import io import itertools import traceback @@ -295,7 +296,9 @@ class TerminalResult(CoverageResult): """See unittest.TestResult.startTestRun.""" super(TerminalResult, self).startTestRun() self.out.write( - _Colors.HEADER + "Testing gRPC Python...\n" + _Colors.END + _Colors.HEADER + + "[{}]Testing gRPC Python...\n".format(datetime.datetime.now()) + + _Colors.END ) def stopTestRun(self): @@ -324,7 +327,11 @@ class TerminalResult(CoverageResult): """See unittest.TestResult.addSuccess.""" super(TerminalResult, self).addSuccess(test) self.out.write( - _Colors.OK + "SUCCESS {}\n".format(test.id()) + _Colors.END + _Colors.OK + + "[{}]SUCCESS {}\n".format( + datetime.datetime.now(), test.id() + ) + + _Colors.END ) self.out.flush() diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index e9c9b926143..8f265a34540 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -719,7 +719,7 @@ class PythonLanguage(object): self.config.job_spec( python_config.run + [self._TEST_COMMAND[io_platform]], - timeout_seconds=8 * 60, + timeout_seconds=10 * 60, environ=dict( GRPC_PYTHON_TESTRUNNER_FILTER=str(test_case), **environment, From f3b24f16d6a4a41cf2c1537a95a29032ef495477 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Tue, 17 Sep 2024 17:05:18 -0700 Subject: [PATCH 15/30] [ChannelIdleFilter] Use different error messages for idleness and max connection age (#37709) Without this, we see GOAWAYs with "enter idle" irrespective of the reason being idleness or max connection age. Closes #37709 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37709 from yashykt:ChannelIdleFilterMessage 236072e7e2dc957fefba7738ef6dedf934b99a50 PiperOrigin-RevId: 675762380 --- .../filters/channel_idle/legacy_channel_idle_filter.cc | 10 +++++----- .../filters/channel_idle/legacy_channel_idle_filter.h | 2 +- test/core/end2end/tests/max_connection_age.cc | 3 +++ 3 files changed, 9 insertions(+), 6 deletions(-) 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 b560b92f59c..6b0582afc0c 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 @@ -207,7 +207,7 @@ void LegacyMaxAgeFilter::PostInit() { // OnDone -- close the connection if the promise completed // successfully. // (if it did not, it was cancelled) - if (status.ok()) CloseChannel(); + if (status.ok()) CloseChannel("max connection age"); }, std::move(arena))); } @@ -273,16 +273,16 @@ void LegacyChannelIdleFilter::StartIdleTimer() { activity_.Set(MakeActivity( std::move(promise), ExecCtxWakeupScheduler{}, [channel_stack, this](absl::Status status) { - if (status.ok()) CloseChannel(); + if (status.ok()) CloseChannel("connection idle"); }, std::move(arena))); } -void LegacyChannelIdleFilter::CloseChannel() { +void LegacyChannelIdleFilter::CloseChannel(absl::string_view reason) { auto* op = grpc_make_transport_op(nullptr); op->disconnect_with_error = grpc_error_set_int( - GRPC_ERROR_CREATE("enter idle"), - StatusIntProperty::ChannelConnectivityState, GRPC_CHANNEL_IDLE); + GRPC_ERROR_CREATE(reason), StatusIntProperty::ChannelConnectivityState, + GRPC_CHANNEL_IDLE); // Pass the transport op down to the channel stack. auto* elem = grpc_channel_stack_element(channel_stack_, 0); elem->filter->start_transport_op(elem, op); 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 9ee7981b2f5..74bf3a2f09b 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 @@ -69,7 +69,7 @@ class LegacyChannelIdleFilter : public ChannelFilter { grpc_channel_stack* channel_stack() { return channel_stack_; }; virtual void Shutdown(); - void CloseChannel(); + void CloseChannel(absl::string_view reason); void IncreaseCallCount(); void DecreaseCallCount(); diff --git a/test/core/end2end/tests/max_connection_age.cc b/test/core/end2end/tests/max_connection_age.cc index 03252855cf1..3b13e36458e 100644 --- a/test/core/end2end/tests/max_connection_age.cc +++ b/test/core/end2end/tests/max_connection_age.cc @@ -20,6 +20,7 @@ #include +#include "gmock/gmock.h" #include "gtest/gtest.h" #include @@ -109,6 +110,8 @@ CORE_END2END_TEST(Http2Test, MaxAgeForciblyClose) { // The connection should be closed immediately after the max age grace period, // the in-progress RPC should fail. EXPECT_EQ(server_status.status(), GRPC_STATUS_UNAVAILABLE); + EXPECT_THAT(server_status.message(), + ::testing::MatchesRegex("max connection age")); } CORE_END2END_TEST(Http2Test, MaxAgeGracefullyClose) { From bdf52dd4ad0a8974fd0f087a4c895cf8fc1ffd4d Mon Sep 17 00:00:00 2001 From: Nathan Baulch Date: Tue, 17 Sep 2024 17:44:17 -0700 Subject: [PATCH 16/30] Fix more minor typos (#37541) Just thought I'd contribute some more typo fixes I've stumbled upon. This is a followup on #37450. Use the following command to get a quick and dirty summary of the specific corrections made: ```shell git diff HEAD^! --word-diff-regex='\w+' -U0 \ | grep -E '\[\-.*\-\]\{\+.*\+\}' \ | sed -r 's/.*\[\-(.*)\-\]\{\+(.*)\+\}.*/\1 \2/' \ | sort | uniq -c | sort -n ``` FWIW, the top typos are: * compressable (134) * existant (82) * unparseable (49) * occured (24) * replys (18) * validing (17) * writter (16) * vaidate (9) * directoty (8) * convertabl (8) * atrributes (8) * indxes (8) * transfered (7) * exchage (7) * descedent (6) * enpoint (6) * nonexistant (6) * matadata (6) * addtional (5) * callack (5) * experenced (5) * wil (5) Closes #37541 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37541 from NathanBaulch:typos 7cbfc121ed0bb5ac75e2dba3ade0d9a62c39c93d PiperOrigin-RevId: 675772876 --- src/compiler/php_generator.cc | 4 +- .../http_connect/http_connect_handshaker.cc | 2 +- src/core/lib/event_engine/ares_resolver.cc | 6 +- .../cf_engine/dns_service_resolver.cc | 2 +- .../posix_engine/native_posix_dns_resolver.cc | 2 +- .../windows/native_windows_dns_resolver.cc | 2 +- src/core/lib/iomgr/resolve_address_posix.cc | 2 +- src/core/lib/iomgr/resolve_address_windows.cc | 2 +- src/core/lib/promise/activity.h | 6 +- src/core/load_balancing/rls/rls.cc | 2 +- .../resolver/dns/c_ares/grpc_ares_wrapper.cc | 6 +- src/core/util/log.cc | 8 +- .../tests/generated_code/Math/MathStub.php | 4 +- src/php/tests/generated_code/math_server.php | 14 +-- .../interop/Grpc/Testing/HookServiceStub.php | 6 +- .../Testing/LoadBalancerStatsServiceStub.php | 4 +- .../Grpc/Testing/ReconnectServiceStub.php | 4 +- .../interop/Grpc/Testing/TestServiceStub.php | 10 +-- .../Grpc/Testing/UnimplementedServiceStub.php | 2 +- .../XdsUpdateClientConfigureServiceStub.php | 2 +- .../Testing/XdsUpdateHealthServiceStub.php | 6 +- src/php/tests/interop/interop_server.php | 18 ++-- src/php/tests/interop/metrics_client.php | 2 +- src/php/tests/unit_tests/ServerCallTest.php | 4 +- src/php/tests/unit_tests/StatusTest.php | 4 +- src/ruby/spec/generic/client_stub_spec.rb | 40 ++++----- test/core/channelz/channelz_registry_test.cc | 4 +- .../retry_service_config_test.cc | 4 +- test/core/end2end/bad_server_response_test.cc | 6 +- test/core/end2end/connection_refused_test.cc | 2 +- .../end2end/invalid_call_argument_test.cc | 6 +- test/core/end2end/no_server_test.cc | 4 +- test/core/end2end/tests/no_logging.cc | 2 +- .../event_engine/test_suite/tests/dns_test.cc | 44 +++++----- test/core/iomgr/resolve_address_test.cc | 28 +++--- .../rls_lb_config_parser_test.cc | 30 +++---- test/core/security/credentials_test.cc | 24 ++--- test/core/surface/server_chttp2_test.cc | 2 +- test/core/xds/xds_client_test.cc | 2 +- .../xds/xds_cluster_resource_type_test.cc | 8 +- .../xds/xds_endpoint_resource_type_test.cc | 2 +- test/core/xds/xds_http_filters_test.cc | 14 +-- .../xds/xds_listener_resource_type_test.cc | 6 +- .../xds_route_config_resource_type_test.cc | 8 +- test/cpp/common/alts_util_test.cc | 16 ++-- .../end2end/xds/xds_cluster_end2end_test.cc | 44 +++++----- .../xds/xds_cluster_type_end2end_test.cc | 8 +- test/cpp/end2end/xds/xds_core_end2end_test.cc | 2 +- test/cpp/end2end/xds/xds_end2end_test_lib.h | 12 +-- .../xds/xds_fault_injection_end2end_test.cc | 2 +- .../xds/xds_outlier_detection_end2end_test.cc | 24 ++--- .../end2end/xds/xds_ring_hash_end2end_test.cc | 88 +++++++++---------- .../end2end/xds/xds_routing_end2end_test.cc | 22 ++--- test/cpp/util/channel_trace_proto_helper.cc | 18 ++-- test/cpp/util/channelz_sampler.cc | 12 +-- 55 files changed, 304 insertions(+), 304 deletions(-) diff --git a/src/compiler/php_generator.cc b/src/compiler/php_generator.cc index 7d42dc8f1af..7ef2891c488 100644 --- a/src/compiler/php_generator.cc +++ b/src/compiler/php_generator.cc @@ -176,7 +176,7 @@ void PrintServerMethod(const MethodDescriptor* method, Printer* out) { "of \\$input_type_id$\n" " * @param \\Grpc\\ServerContext $$context server request context\n" " * @return \\$output_type_id$ for response data, null if if error " - "occured\n" + "occurred\n" " * initial metadata (if any) and status (if not ok) should be set " "to $$context\n" " */\n" @@ -208,7 +208,7 @@ void PrintServerMethod(const MethodDescriptor* method, Printer* out) { " * @param \\$input_type_id$ $$request client request\n" " * @param \\Grpc\\ServerContext $$context server request context\n" " * @return \\$output_type_id$ for response data, null if if error " - "occured\n" + "occurred\n" " * initial metadata (if any) and status (if not ok) should be set " "to $$context\n" " */\n" diff --git a/src/core/handshaker/http_connect/http_connect_handshaker.cc b/src/core/handshaker/http_connect/http_connect_handshaker.cc index 2260224d10d..2954860fe5e 100644 --- a/src/core/handshaker/http_connect/http_connect_handshaker.cc +++ b/src/core/handshaker/http_connect/http_connect_handshaker.cc @@ -279,7 +279,7 @@ void HttpConnectHandshaker::DoHandshake( for (size_t i = 0; i < num_header_strings; ++i) { char* sep = strchr(header_strings[i], ':'); if (sep == nullptr) { - LOG(ERROR) << "skipping unparseable HTTP CONNECT header: " + LOG(ERROR) << "skipping unparsable HTTP CONNECT header: " << header_strings[i]; continue; } diff --git a/src/core/lib/event_engine/ares_resolver.cc b/src/core/lib/event_engine/ares_resolver.cc index 1cd7c73f54e..3fca4efad49 100644 --- a/src/core/lib/event_engine/ares_resolver.cc +++ b/src/core/lib/event_engine/ares_resolver.cc @@ -272,7 +272,7 @@ void AresResolver::LookupHostname( event_engine_->Run( [callback = std::move(callback), status = absl::InvalidArgumentError(absl::StrCat( - "Unparseable name: ", name))]() mutable { callback(status); }); + "Unparsable name: ", name))]() mutable { callback(status); }); return; } if (host.empty()) { @@ -351,7 +351,7 @@ void AresResolver::LookupSRV( event_engine_->Run( [callback = std::move(callback), status = absl::InvalidArgumentError(absl::StrCat( - "Unparseable name: ", name))]() mutable { callback(status); }); + "Unparsable name: ", name))]() mutable { callback(status); }); return; } if (host.empty()) { @@ -386,7 +386,7 @@ void AresResolver::LookupTXT( event_engine_->Run( [callback = std::move(callback), status = absl::InvalidArgumentError(absl::StrCat( - "Unparseable name: ", name))]() mutable { callback(status); }); + "Unparsable name: ", name))]() mutable { callback(status); }); return; } if (host.empty()) { 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 8c0cd0b694a..adf52ecc2f3 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 @@ -43,7 +43,7 @@ void DNSServiceResolverImpl::LookupHostname( if (!grpc_core::SplitHostPort(name, &host, &port_string)) { engine_->Run([on_resolve = std::move(on_resolve), status = absl::InvalidArgumentError( - absl::StrCat("Unparseable name: ", name))]() mutable { + absl::StrCat("Unparsable name: ", name))]() mutable { on_resolve(status); }); return; 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..8cde00153a1 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 @@ -50,7 +50,7 @@ LookupHostnameBlocking(absl::string_view name, absl::string_view default_port) { // parse name, splitting it into host and port parts grpc_core::SplitHostPort(name, &host, &port); if (host.empty()) { - return absl::InvalidArgumentError(absl::StrCat("Unparseable name: ", name)); + return absl::InvalidArgumentError(absl::StrCat("Unparsable name: ", name)); } if (port.empty()) { if (default_port.empty()) { 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..a23ba405ab9 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 @@ -42,7 +42,7 @@ LookupHostnameBlocking(absl::string_view name, absl::string_view default_port) { std::string port; grpc_core::SplitHostPort(name, &host, &port); if (host.empty()) { - return absl::InvalidArgumentError(absl::StrCat("Unparseable name: ", name)); + return absl::InvalidArgumentError(absl::StrCat("Unparsable name: ", name)); } if (port.empty()) { if (default_port.empty()) { diff --git a/src/core/lib/iomgr/resolve_address_posix.cc b/src/core/lib/iomgr/resolve_address_posix.cc index f890a349b97..8a161fcc6c4 100644 --- a/src/core/lib/iomgr/resolve_address_posix.cc +++ b/src/core/lib/iomgr/resolve_address_posix.cc @@ -106,7 +106,7 @@ NativeDNSResolver::LookupHostnameBlocking(absl::string_view name, SplitHostPort(name, &host, &port); if (host.empty()) { err = - GRPC_ERROR_CREATE(absl::StrCat("unparseable host:port \"", name, "\"")); + GRPC_ERROR_CREATE(absl::StrCat("unparsable host:port \"", name, "\"")); goto done; } if (port.empty()) { diff --git a/src/core/lib/iomgr/resolve_address_windows.cc b/src/core/lib/iomgr/resolve_address_windows.cc index 105dcc85744..6db705774a6 100644 --- a/src/core/lib/iomgr/resolve_address_windows.cc +++ b/src/core/lib/iomgr/resolve_address_windows.cc @@ -110,7 +110,7 @@ NativeDNSResolver::LookupHostnameBlocking(absl::string_view name, SplitHostPort(name, &host, &port); if (host.empty()) { error = - GRPC_ERROR_CREATE(absl::StrFormat("unparseable host:port: '%s'", name)); + GRPC_ERROR_CREATE(absl::StrFormat("unparsable host:port: '%s'", name)); goto done; } if (port.empty()) { diff --git a/src/core/lib/promise/activity.h b/src/core/lib/promise/activity.h index 55738c08995..59d504fd6d1 100644 --- a/src/core/lib/promise/activity.h +++ b/src/core/lib/promise/activity.h @@ -368,8 +368,8 @@ class FreestandingActivity : public Activity, private Wakeable { // If more than one action is received during a run, we use max() to resolve // which one to report (so Cancel overrides Wakeup). enum class ActionDuringRun : uint8_t { - kNone, // No action occured during run. - kWakeup, // A wakeup occured during run. + kNone, // No action occurred during run. + kWakeup, // A wakeup occurred during run. kCancel, // Cancel was called during run. }; @@ -389,7 +389,7 @@ class FreestandingActivity : public Activity, private Wakeable { // completed. void WakeupComplete() { Unref(); } - // Set the action that occured during this run. + // Set the action that occurred during this run. // We use max to combine actions so that cancellation overrides wakeups. void SetActionDuringRun(ActionDuringRun action) ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_) { diff --git a/src/core/load_balancing/rls/rls.cc b/src/core/load_balancing/rls/rls.cc index 0318bd6740f..b425a326a8e 100644 --- a/src/core/load_balancing/rls/rls.cc +++ b/src/core/load_balancing/rls/rls.cc @@ -2590,7 +2590,7 @@ class RlsLbFactory final : public LoadBalancingPolicyFactory { absl::StatusOr> ParseLoadBalancingConfig(const Json& json) const override { return LoadFromJson>( - json, JsonArgs(), "errors validing RLS LB policy config"); + json, JsonArgs(), "errors validating RLS LB policy config"); } }; 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 50161653ea4..be2116994bb 100644 --- a/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc +++ b/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc @@ -388,7 +388,7 @@ static void on_readable(void* arg, grpc_error_handle error) { // this ev_driver will be cancelled by the following ares_cancel() and the // on_done callbacks will be invoked with a status of ARES_ECANCELLED. The // remaining file descriptors in this ev_driver will be cleaned up in the - // follwing grpc_ares_notify_on_event_locked(). + // following grpc_ares_notify_on_event_locked(). ares_cancel(ev_driver->channel); } grpc_ares_notify_on_event_locked(ev_driver); @@ -413,7 +413,7 @@ static void on_writable(void* arg, grpc_error_handle error) { // this ev_driver will be cancelled by the following ares_cancel() and the // on_done callbacks will be invoked with a status of ARES_ECANCELLED. The // remaining file descriptors in this ev_driver will be cleaned up in the - // follwing grpc_ares_notify_on_event_locked(). + // following grpc_ares_notify_on_event_locked(). ares_cancel(ev_driver->channel); } grpc_ares_notify_on_event_locked(ev_driver); @@ -910,7 +910,7 @@ grpc_error_handle grpc_dns_lookup_ares_continued( grpc_core::SplitHostPort(name, host, port); if (host->empty()) { error = - GRPC_ERROR_CREATE(absl::StrCat("unparseable host:port \"", name, "\"")); + GRPC_ERROR_CREATE(absl::StrCat("unparsable host:port \"", name, "\"")); return error; } else if (check_port && port->empty()) { if (default_port == nullptr || strlen(default_port) == 0) { diff --git a/src/core/util/log.cc b/src/core/util/log.cc index 0a1ef08f75c..e2feca75993 100644 --- a/src/core/util/log.cc +++ b/src/core/util/log.cc @@ -104,15 +104,15 @@ void gpr_log_verbosity_init(void) { if (absl::EqualsIgnoreCase(verbosity, "INFO")) { LOG_FIRST_N(WARNING, 1) << "Log level INFO is not suitable for production. Prefer WARNING or " - "ERROR. However if you see this message in a debug environmenmt or " - "test environmenmt it is safe to ignore this message."; + "ERROR. However if you see this message in a debug environment or " + "test environment it is safe to ignore this message."; absl::SetVLogLevel("*grpc*/*", -1); absl::SetMinLogLevel(absl::LogSeverityAtLeast::kInfo); } else if (absl::EqualsIgnoreCase(verbosity, "DEBUG")) { LOG_FIRST_N(WARNING, 1) << "Log level DEBUG is not suitable for production. Prefer WARNING or " - "ERROR. However if you see this message in a debug environmenmt or " - "test environmenmt it is safe to ignore this message."; + "ERROR. However if you see this message in a debug environment or " + "test environment it is safe to ignore this message."; absl::SetVLogLevel("*grpc*/*", 2); absl::SetMinLogLevel(absl::LogSeverityAtLeast::kInfo); } else if (absl::EqualsIgnoreCase(verbosity, "ERROR")) { diff --git a/src/php/tests/generated_code/Math/MathStub.php b/src/php/tests/generated_code/Math/MathStub.php index babcafe270d..5ab377c6f69 100644 --- a/src/php/tests/generated_code/Math/MathStub.php +++ b/src/php/tests/generated_code/Math/MathStub.php @@ -27,7 +27,7 @@ class MathStub { * and remainder. * @param \Math\DivArgs $request client request * @param \Grpc\ServerContext $context server request context - * @return \Math\DivReply for response data, null if if error occured + * @return \Math\DivReply for response data, null if if error occurred * initial metadata (if any) and status (if not ok) should be set to $context */ public function Div( @@ -80,7 +80,7 @@ class MathStub { * is closed. * @param \Grpc\ServerCallReader $reader read client request data of \Math\Num * @param \Grpc\ServerContext $context server request context - * @return \Math\Num for response data, null if if error occured + * @return \Math\Num for response data, null if if error occurred * initial metadata (if any) and status (if not ok) should be set to $context */ public function Sum( diff --git a/src/php/tests/generated_code/math_server.php b/src/php/tests/generated_code/math_server.php index 7301f0f12d5..18839ff9411 100644 --- a/src/php/tests/generated_code/math_server.php +++ b/src/php/tests/generated_code/math_server.php @@ -63,7 +63,7 @@ class MathService extends Math\MathStub public function DivMany( \Grpc\ServerCallReader $reader, - \Grpc\ServerCallWriter $writter, + \Grpc\ServerCallWriter $writer, \Grpc\ServerContext $context ): void { while ($divArgs = $reader->read()) { @@ -74,7 +74,7 @@ class MathService extends Math\MathStub \Grpc\STATUS_INVALID_ARGUMENT, 'Cannot divide by zero' )); - $writter->finish(); + $writer->finish(); return; } $quotient = intdiv($dividend, $divisor); @@ -83,14 +83,14 @@ class MathService extends Math\MathStub 'quotient' => $quotient, 'remainder' => $remainder, ]); - $writter->write($reply); + $writer->write($reply); } - $writter->finish(); + $writer->finish(); } public function Fib( \Math\FibArgs $request, - \Grpc\ServerCallWriter $writter, + \Grpc\ServerCallWriter $writer, \Grpc\ServerContext $context ): void { $previous = 0; @@ -99,12 +99,12 @@ class MathService extends Math\MathStub for ($i = 0; $i < $limit; $i++) { $num = new \Math\Num(); $num->setNum($current); - $writter->write($num); + $writer->write($num); $next = $previous + $current; $previous = $current; $current = $next; } - $writter->finish(); + $writer->finish(); } /** diff --git a/src/php/tests/interop/Grpc/Testing/HookServiceStub.php b/src/php/tests/interop/Grpc/Testing/HookServiceStub.php index b9590d34b57..c5311b8c101 100644 --- a/src/php/tests/interop/Grpc/Testing/HookServiceStub.php +++ b/src/php/tests/interop/Grpc/Testing/HookServiceStub.php @@ -31,7 +31,7 @@ class HookServiceStub { * to a SetReturnStatus * @param \Grpc\Testing\EmptyMessage $request client request * @param \Grpc\ServerContext $context server request context - * @return \Grpc\Testing\EmptyMessage for response data, null if if error occured + * @return \Grpc\Testing\EmptyMessage for response data, null if if error occurred * initial metadata (if any) and status (if not ok) should be set to $context */ public function Hook( @@ -46,7 +46,7 @@ class HookServiceStub { * Sets a return status for pending and upcoming calls to Hook * @param \Grpc\Testing\SetReturnStatusRequest $request client request * @param \Grpc\ServerContext $context server request context - * @return \Grpc\Testing\EmptyMessage for response data, null if if error occured + * @return \Grpc\Testing\EmptyMessage for response data, null if if error occurred * initial metadata (if any) and status (if not ok) should be set to $context */ public function SetReturnStatus( @@ -61,7 +61,7 @@ class HookServiceStub { * Clears the return status. Incoming calls to Hook will "hang" * @param \Grpc\Testing\EmptyMessage $request client request * @param \Grpc\ServerContext $context server request context - * @return \Grpc\Testing\EmptyMessage for response data, null if if error occured + * @return \Grpc\Testing\EmptyMessage for response data, null if if error occurred * initial metadata (if any) and status (if not ok) should be set to $context */ public function ClearReturnStatus( diff --git a/src/php/tests/interop/Grpc/Testing/LoadBalancerStatsServiceStub.php b/src/php/tests/interop/Grpc/Testing/LoadBalancerStatsServiceStub.php index f99f489d4b8..90b278869cc 100644 --- a/src/php/tests/interop/Grpc/Testing/LoadBalancerStatsServiceStub.php +++ b/src/php/tests/interop/Grpc/Testing/LoadBalancerStatsServiceStub.php @@ -30,7 +30,7 @@ class LoadBalancerStatsServiceStub { * Gets the backend distribution for RPCs sent by a test client. * @param \Grpc\Testing\LoadBalancerStatsRequest $request client request * @param \Grpc\ServerContext $context server request context - * @return \Grpc\Testing\LoadBalancerStatsResponse for response data, null if if error occured + * @return \Grpc\Testing\LoadBalancerStatsResponse for response data, null if if error occurred * initial metadata (if any) and status (if not ok) should be set to $context */ public function GetClientStats( @@ -45,7 +45,7 @@ class LoadBalancerStatsServiceStub { * Gets the accumulated stats for RPCs sent by a test client. * @param \Grpc\Testing\LoadBalancerAccumulatedStatsRequest $request client request * @param \Grpc\ServerContext $context server request context - * @return \Grpc\Testing\LoadBalancerAccumulatedStatsResponse for response data, null if if error occured + * @return \Grpc\Testing\LoadBalancerAccumulatedStatsResponse for response data, null if if error occurred * initial metadata (if any) and status (if not ok) should be set to $context */ public function GetClientAccumulatedStats( diff --git a/src/php/tests/interop/Grpc/Testing/ReconnectServiceStub.php b/src/php/tests/interop/Grpc/Testing/ReconnectServiceStub.php index 450ecc0e8a1..21118f9ac2e 100644 --- a/src/php/tests/interop/Grpc/Testing/ReconnectServiceStub.php +++ b/src/php/tests/interop/Grpc/Testing/ReconnectServiceStub.php @@ -29,7 +29,7 @@ class ReconnectServiceStub { /** * @param \Grpc\Testing\ReconnectParams $request client request * @param \Grpc\ServerContext $context server request context - * @return \Grpc\Testing\EmptyMessage for response data, null if if error occured + * @return \Grpc\Testing\EmptyMessage for response data, null if if error occurred * initial metadata (if any) and status (if not ok) should be set to $context */ public function Start( @@ -43,7 +43,7 @@ class ReconnectServiceStub { /** * @param \Grpc\Testing\EmptyMessage $request client request * @param \Grpc\ServerContext $context server request context - * @return \Grpc\Testing\ReconnectInfo for response data, null if if error occured + * @return \Grpc\Testing\ReconnectInfo for response data, null if if error occurred * initial metadata (if any) and status (if not ok) should be set to $context */ public function Stop( diff --git a/src/php/tests/interop/Grpc/Testing/TestServiceStub.php b/src/php/tests/interop/Grpc/Testing/TestServiceStub.php index d6c3fac7afe..722e3add6f4 100644 --- a/src/php/tests/interop/Grpc/Testing/TestServiceStub.php +++ b/src/php/tests/interop/Grpc/Testing/TestServiceStub.php @@ -31,7 +31,7 @@ class TestServiceStub { * One empty request followed by one empty response. * @param \Grpc\Testing\EmptyMessage $request client request * @param \Grpc\ServerContext $context server request context - * @return \Grpc\Testing\EmptyMessage for response data, null if if error occured + * @return \Grpc\Testing\EmptyMessage for response data, null if if error occurred * initial metadata (if any) and status (if not ok) should be set to $context */ public function EmptyCall( @@ -46,7 +46,7 @@ class TestServiceStub { * One request followed by one response. * @param \Grpc\Testing\SimpleRequest $request client request * @param \Grpc\ServerContext $context server request context - * @return \Grpc\Testing\SimpleResponse for response data, null if if error occured + * @return \Grpc\Testing\SimpleResponse for response data, null if if error occurred * initial metadata (if any) and status (if not ok) should be set to $context */ public function UnaryCall( @@ -63,7 +63,7 @@ class TestServiceStub { * satisfy subsequent requests. * @param \Grpc\Testing\SimpleRequest $request client request * @param \Grpc\ServerContext $context server request context - * @return \Grpc\Testing\SimpleResponse for response data, null if if error occured + * @return \Grpc\Testing\SimpleResponse for response data, null if if error occurred * initial metadata (if any) and status (if not ok) should be set to $context */ public function CacheableUnaryCall( @@ -96,7 +96,7 @@ class TestServiceStub { * The server returns the aggregated size of client payload as the result. * @param \Grpc\ServerCallReader $reader read client request data of \Grpc\Testing\StreamingInputCallRequest * @param \Grpc\ServerContext $context server request context - * @return \Grpc\Testing\StreamingInputCallResponse for response data, null if if error occured + * @return \Grpc\Testing\StreamingInputCallResponse for response data, null if if error occurred * initial metadata (if any) and status (if not ok) should be set to $context */ public function StreamingInputCall( @@ -149,7 +149,7 @@ class TestServiceStub { * to test the behavior when clients call unimplemented methods. * @param \Grpc\Testing\EmptyMessage $request client request * @param \Grpc\ServerContext $context server request context - * @return \Grpc\Testing\EmptyMessage for response data, null if if error occured + * @return \Grpc\Testing\EmptyMessage for response data, null if if error occurred * initial metadata (if any) and status (if not ok) should be set to $context */ public function UnimplementedCall( diff --git a/src/php/tests/interop/Grpc/Testing/UnimplementedServiceStub.php b/src/php/tests/interop/Grpc/Testing/UnimplementedServiceStub.php index 086cca2fb02..f82e532ab18 100644 --- a/src/php/tests/interop/Grpc/Testing/UnimplementedServiceStub.php +++ b/src/php/tests/interop/Grpc/Testing/UnimplementedServiceStub.php @@ -31,7 +31,7 @@ class UnimplementedServiceStub { * A call that no server should implement * @param \Grpc\Testing\EmptyMessage $request client request * @param \Grpc\ServerContext $context server request context - * @return \Grpc\Testing\EmptyMessage for response data, null if if error occured + * @return \Grpc\Testing\EmptyMessage for response data, null if if error occurred * initial metadata (if any) and status (if not ok) should be set to $context */ public function UnimplementedCall( diff --git a/src/php/tests/interop/Grpc/Testing/XdsUpdateClientConfigureServiceStub.php b/src/php/tests/interop/Grpc/Testing/XdsUpdateClientConfigureServiceStub.php index fb3bb1ce0bf..8ac84a2d55d 100644 --- a/src/php/tests/interop/Grpc/Testing/XdsUpdateClientConfigureServiceStub.php +++ b/src/php/tests/interop/Grpc/Testing/XdsUpdateClientConfigureServiceStub.php @@ -30,7 +30,7 @@ class XdsUpdateClientConfigureServiceStub { * Update the tes client's configuration. * @param \Grpc\Testing\ClientConfigureRequest $request client request * @param \Grpc\ServerContext $context server request context - * @return \Grpc\Testing\ClientConfigureResponse for response data, null if if error occured + * @return \Grpc\Testing\ClientConfigureResponse for response data, null if if error occurred * initial metadata (if any) and status (if not ok) should be set to $context */ public function Configure( diff --git a/src/php/tests/interop/Grpc/Testing/XdsUpdateHealthServiceStub.php b/src/php/tests/interop/Grpc/Testing/XdsUpdateHealthServiceStub.php index 759308b1a00..b44b877e940 100644 --- a/src/php/tests/interop/Grpc/Testing/XdsUpdateHealthServiceStub.php +++ b/src/php/tests/interop/Grpc/Testing/XdsUpdateHealthServiceStub.php @@ -29,7 +29,7 @@ class XdsUpdateHealthServiceStub { /** * @param \Grpc\Testing\EmptyMessage $request client request * @param \Grpc\ServerContext $context server request context - * @return \Grpc\Testing\EmptyMessage for response data, null if if error occured + * @return \Grpc\Testing\EmptyMessage for response data, null if if error occurred * initial metadata (if any) and status (if not ok) should be set to $context */ public function SetServing( @@ -43,7 +43,7 @@ class XdsUpdateHealthServiceStub { /** * @param \Grpc\Testing\EmptyMessage $request client request * @param \Grpc\ServerContext $context server request context - * @return \Grpc\Testing\EmptyMessage for response data, null if if error occured + * @return \Grpc\Testing\EmptyMessage for response data, null if if error occurred * initial metadata (if any) and status (if not ok) should be set to $context */ public function SetNotServing( @@ -57,7 +57,7 @@ class XdsUpdateHealthServiceStub { /** * @param \Grpc\Testing\HookRequest $request client request * @param \Grpc\ServerContext $context server request context - * @return \Grpc\Testing\HookResponse for response data, null if if error occured + * @return \Grpc\Testing\HookResponse for response data, null if if error occurred * initial metadata (if any) and status (if not ok) should be set to $context */ public function SendHookRequest( diff --git a/src/php/tests/interop/interop_server.php b/src/php/tests/interop/interop_server.php index f280fe7b48f..9abd2b2a868 100644 --- a/src/php/tests/interop/interop_server.php +++ b/src/php/tests/interop/interop_server.php @@ -102,7 +102,7 @@ class TestService extends \Grpc\Testing\TestServiceStub public function StreamingOutputCall( \Grpc\Testing\StreamingOutputCallRequest $request, - \Grpc\ServerCallWriter $writter, + \Grpc\ServerCallWriter $writer, \Grpc\ServerContext $context ): void { $echo_status = $this->maybeEchoStatusAndMessage($request); @@ -119,10 +119,10 @@ class TestService extends \Grpc\Testing\TestServiceStub 'payload' => $payload, ]); $options = []; - $writter->write($response, $options); + $writer->write($response, $options); } $context->setStatus($echo_status ?? \Grpc\Status::ok()); - $writter->finish(); + $writer->finish(); } public function StreamingInputCall( @@ -142,7 +142,7 @@ class TestService extends \Grpc\Testing\TestServiceStub public function FullDuplexCall( \Grpc\ServerCallReader $reader, - \Grpc\ServerCallWriter $writter, + \Grpc\ServerCallWriter $writer, \Grpc\ServerContext $context ): void { list($initial_metadata, $trailing_metadata) = @@ -155,7 +155,7 @@ class TestService extends \Grpc\Testing\TestServiceStub ); if ($echo_status) { $context->setStatus($echo_status); - $writter->finish(); + $writer->finish(); return; } @@ -171,20 +171,20 @@ class TestService extends \Grpc\Testing\TestServiceStub 'payload' => $payload, ]); $options = []; - $writter->write($response, $options); + $writer->write($response, $options); } } $context->setStatus(\Grpc\Status::ok($trailing_metadata)); - $writter->finish(); + $writer->finish(); } public function HalfDuplexCall( \Grpc\ServerCallReader $reader, - \Grpc\ServerCallWriter $writter, + \Grpc\ServerCallWriter $writer, \Grpc\ServerContext $context ): void { $context->setStatus(\Grpc\Status::unimplemented()); - $writter->finish(); + $writer->finish(); } public function UnimplementedCall( diff --git a/src/php/tests/interop/metrics_client.php b/src/php/tests/interop/metrics_client.php index d5215b826f3..09664a51384 100644 --- a/src/php/tests/interop/metrics_client.php +++ b/src/php/tests/interop/metrics_client.php @@ -24,7 +24,7 @@ $server_port = (count($parts) == 2) ? $parts[1] : ''; $socket = socket_create(AF_INET, SOCK_STREAM, 0); if (@!socket_connect($socket, $server_host, $server_port)) { - echo "Cannot connect to merics server...\n"; + echo "Cannot connect to metrics server...\n"; exit(1); } socket_write($socket, 'qps'); diff --git a/src/php/tests/unit_tests/ServerCallTest.php b/src/php/tests/unit_tests/ServerCallTest.php index 9db62ba6fde..b0c97755b8a 100644 --- a/src/php/tests/unit_tests/ServerCallTest.php +++ b/src/php/tests/unit_tests/ServerCallTest.php @@ -236,7 +236,7 @@ class ServerCallTest extends \PHPUnit\Framework\TestCase $status = \Grpc\Status::status( \Grpc\STATUS_INVALID_ARGUMENT, "invalid argument", - ['trailiingMeta' => 100] + ['trailingMeta' => 100] ); $this->mockCall->expects($this->once()) @@ -259,7 +259,7 @@ class ServerCallTest extends \PHPUnit\Framework\TestCase { $metadata = ['a' => 1]; $message = $this->newStringMessage(); - $status = \Grpc\Status::ok(['trailiingMeta' => 100]); + $status = \Grpc\Status::ok(['trailingMeta' => 100]); $this->mockCall->expects($this->once()) ->method('startBatch') diff --git a/src/php/tests/unit_tests/StatusTest.php b/src/php/tests/unit_tests/StatusTest.php index ce4ee884576..dd148cf2f90 100644 --- a/src/php/tests/unit_tests/StatusTest.php +++ b/src/php/tests/unit_tests/StatusTest.php @@ -70,12 +70,12 @@ class StatusTest extends \PHPUnit\Framework\TestCase $status = [ 'code' => \Grpc\STATUS_INVALID_ARGUMENT, 'details' => 'invalid argument', - 'metadata' => ['trailiingMeta' => 100] + 'metadata' => ['trailingMeta' => 100] ]; $return = \Grpc\Status::status( \Grpc\STATUS_INVALID_ARGUMENT, "invalid argument", - ['trailiingMeta' => 100] + ['trailingMeta' => 100] ); $this->assertEquals($status, $return); } diff --git a/src/ruby/spec/generic/client_stub_spec.rb b/src/ruby/spec/generic/client_stub_spec.rb index 5cc0679b3c6..62788f75291 100644 --- a/src/ruby/spec/generic/client_stub_spec.rb +++ b/src/ruby/spec/generic/client_stub_spec.rb @@ -453,23 +453,23 @@ describe 'ClientStub' do # rubocop:disable Metrics/BlockLength describe '#server_streamer', server_streamer: true do before(:each) do @sent_msg = 'a_msg' - @replys = Array.new(3) { |i| 'reply_' + (i + 1).to_s } + @replies = Array.new(3) { |i| 'reply_' + (i + 1).to_s } end shared_examples 'server streaming' do it 'should send a request to/receive replies from a server' do server_port = create_test_server host = "localhost:#{server_port}" - th = run_server_streamer(@sent_msg, @replys, @pass) + th = run_server_streamer(@sent_msg, @replies, @pass) stub = GRPC::ClientStub.new(host, :this_channel_is_insecure) - expect(get_responses(stub).collect { |r| r }).to eq(@replys) + expect(get_responses(stub).collect { |r| r }).to eq(@replies) th.join end it 'should raise an error if the status is not ok' do server_port = create_test_server host = "localhost:#{server_port}" - th = run_server_streamer(@sent_msg, @replys, @fail) + th = run_server_streamer(@sent_msg, @replies, @fail) stub = GRPC::ClientStub.new(host, :this_channel_is_insecure) e = get_responses(stub) expect { e.collect { |r| r } }.to raise_error(GRPC::BadStatus) @@ -479,7 +479,7 @@ describe 'ClientStub' do # rubocop:disable Metrics/BlockLength it 'should send metadata to the server ok' do server_port = create_test_server host = "localhost:#{server_port}" - th = run_server_streamer(@sent_msg, @replys, @fail, + th = run_server_streamer(@sent_msg, @replies, @fail, expected_metadata: { k1: 'v1', k2: 'v2' }) stub = GRPC::ClientStub.new(host, :this_channel_is_insecure) e = get_responses(stub) @@ -502,7 +502,7 @@ describe 'ClientStub' do # rubocop:disable Metrics/BlockLength server_port = create_test_server host = "localhost:#{server_port}" th = run_server_streamer_handle_client_cancellation( - @sent_msg, @replys) + @sent_msg, @replies) stub = GRPC::ClientStub.new(host, :this_channel_is_insecure) unmarshal = proc { fail(ArgumentError, 'test unmarshalling error') } @@ -547,13 +547,13 @@ describe 'ClientStub' do # rubocop:disable Metrics/BlockLength @server_initial_md = { 'sk1' => 'sv1', 'sk2' => 'sv2' } @server_trailing_md = { 'tk1' => 'tv1', 'tk2' => 'tv2' } th = run_server_streamer( - @sent_msg, @replys, @pass, + @sent_msg, @replies, @pass, expected_metadata: @metadata, server_initial_md: @server_initial_md, server_trailing_md: @server_trailing_md) stub = GRPC::ClientStub.new(host, :this_channel_is_insecure) e = get_responses(stub, run_start_call_first: run_start_call_first) - expect(e.collect { |r| r }).to eq(@replys) + expect(e.collect { |r| r }).to eq(@replies) th.join end @@ -577,7 +577,7 @@ describe 'ClientStub' do # rubocop:disable Metrics/BlockLength server_port = create_test_server host = "localhost:#{server_port}" th = run_server_streamer_handle_client_cancellation( - @sent_msg, @replys) + @sent_msg, @replies) stub = GRPC::ClientStub.new(host, :this_channel_is_insecure) resp = get_responses(stub, run_start_call_first: false) expect(resp.next).to eq('reply_1') @@ -591,18 +591,18 @@ describe 'ClientStub' do # rubocop:disable Metrics/BlockLength describe '#bidi_streamer', bidi: true do before(:each) do @sent_msgs = Array.new(3) { |i| 'msg_' + (i + 1).to_s } - @replys = Array.new(3) { |i| 'reply_' + (i + 1).to_s } + @replies = Array.new(3) { |i| 'reply_' + (i + 1).to_s } server_port = create_test_server @host = "localhost:#{server_port}" end shared_examples 'bidi streaming' do it 'supports sending all the requests first' do - th = run_bidi_streamer_handle_inputs_first(@sent_msgs, @replys, + th = run_bidi_streamer_handle_inputs_first(@sent_msgs, @replies, @pass) stub = GRPC::ClientStub.new(@host, :this_channel_is_insecure) e = get_responses(stub) - expect(e.collect { |r| r }).to eq(@replys) + expect(e.collect { |r| r }).to eq(@replies) th.join end @@ -724,7 +724,7 @@ describe 'ClientStub' do # rubocop:disable Metrics/BlockLength requests_to_push, request_queue, expected_error_message) - # the write loop errror should cancel the call and end the + # the write loop error should cancel the call and end the # server's request stream th.join end @@ -777,7 +777,7 @@ describe 'ClientStub' do # rubocop:disable Metrics/BlockLength it 'receives a grpc status code when writes to a bidi stream fail' do # This test tries to trigger the case when a 'SEND_MESSAGE' op - # and subseqeunt 'SEND_CLOSE_FROM_CLIENT' op of a bidi stream fails. + # and subsequent 'SEND_CLOSE_FROM_CLIENT' op of a bidi stream fails. # In this case, iteration through the response stream should result # in a grpc status code, and the writer thread should not raise an # exception. @@ -942,7 +942,7 @@ describe 'ClientStub' do # rubocop:disable Metrics/BlockLength end end - def run_server_streamer(expected_input, replys, status, + def run_server_streamer(expected_input, replies, status, expected_metadata: {}, server_initial_md: {}, server_trailing_md: {}) @@ -954,19 +954,19 @@ describe 'ClientStub' do # rubocop:disable Metrics/BlockLength expect(c.metadata[k.to_s]).to eq(v) end expect(c.remote_read).to eq(expected_input) - replys.each { |r| c.remote_send(r) } + replies.each { |r| c.remote_send(r) } c.send_status(status, status == @pass ? 'OK' : 'NOK', true, metadata: server_trailing_md) close_active_server_call(c) end end - def run_bidi_streamer_handle_inputs_first(expected_inputs, replys, + def run_bidi_streamer_handle_inputs_first(expected_inputs, replies, status) wakey_thread do |notifier| c = expect_server_to_be_invoked(notifier) expected_inputs.each { |i| expect(c.remote_read).to eq(i) } - replys.each { |r| c.remote_send(r) } + replies.each { |r| c.remote_send(r) } c.send_status(status, status == @pass ? 'OK' : 'NOK', true) close_active_server_call(c) end @@ -1018,12 +1018,12 @@ describe 'ClientStub' do # rubocop:disable Metrics/BlockLength end def run_server_streamer_handle_client_cancellation( - expected_input, replys) + expected_input, replies) wakey_thread do |notifier| c = expect_server_to_be_invoked(notifier) expect(c.remote_read).to eq(expected_input) begin - replys.each { |r| c.remote_send(r) } + replies.each { |r| c.remote_send(r) } rescue GRPC::Core::CallError # An attempt to write to the client might fail. This is ok # because the client call is expected to cancel the call, diff --git a/test/core/channelz/channelz_registry_test.cc b/test/core/channelz/channelz_registry_test.cc index 7b193c274fd..29110f3f5c1 100644 --- a/test/core/channelz/channelz_registry_test.cc +++ b/test/core/channelz/channelz_registry_test.cc @@ -83,9 +83,9 @@ TEST_F(ChannelzRegistryTest, RegisterManyItems) { TEST_F(ChannelzRegistryTest, NullIfNotPresentTest) { RefCountedPtr channelz_channel = CreateTestNode(); // try to pull out a uuid that does not exist. - RefCountedPtr nonexistant = + RefCountedPtr nonexistent = ChannelzRegistry::Get(channelz_channel->uuid() + 1); - EXPECT_EQ(nonexistant, nullptr); + EXPECT_EQ(nonexistent, nullptr); RefCountedPtr retrieved = ChannelzRegistry::Get(channelz_channel->uuid()); EXPECT_EQ(channelz_channel, retrieved); diff --git a/test/core/client_channel/retry_service_config_test.cc b/test/core/client_channel/retry_service_config_test.cc index 34f41a5da9a..410f064c9ec 100644 --- a/test/core/client_channel/retry_service_config_test.cc +++ b/test/core/client_channel/retry_service_config_test.cc @@ -473,7 +473,7 @@ TEST_F(RetryParserTest, << service_config.status(); } -TEST_F(RetryParserTest, InvalidRetryPolicyUnparseableRetryableStatusCodes) { +TEST_F(RetryParserTest, InvalidRetryPolicyUnparsableRetryableStatusCodes) { const char* test_json = "{\n" " \"methodConfig\": [ {\n" @@ -614,7 +614,7 @@ TEST_F(RetryParserTest, EXPECT_TRUE(parsed_config->retryable_status_codes().Empty()); } -TEST_F(RetryParserTest, InvalidRetryPolicyPerAttemptRecvTimeoutUnparseable) { +TEST_F(RetryParserTest, InvalidRetryPolicyPerAttemptRecvTimeoutUnparsable) { const char* test_json = "{\n" " \"methodConfig\": [ {\n" diff --git a/test/core/end2end/bad_server_response_test.cc b/test/core/end2end/bad_server_response_test.cc index d9c543fcfed..db615d1b098 100644 --- a/test/core/end2end/bad_server_response_test.cc +++ b/test/core/end2end/bad_server_response_test.cc @@ -75,7 +75,7 @@ "application/grpc" \ "\x10\x07:status\x03" #STATUS_CODE -#define UNPARSEABLE_RESP "Bad Request\n" +#define UNPARSABLE_RESP "Bad Request\n" #define HTTP2_DETAIL_MSG(STATUS_CODE) \ "Received http2 header with status: " #STATUS_CODE @@ -394,10 +394,10 @@ int main(int argc, char** argv) { GRPC_STATUS_UNAVAILABLE, HTTP2_DETAIL_MSG(503)); run_test(true, true, HTTP2_RESP(504), sizeof(HTTP2_RESP(504)) - 1, GRPC_STATUS_UNAVAILABLE, HTTP2_DETAIL_MSG(504)); - // unparseable response. RPC should fail immediately due to a connect + // unparsable response. RPC should fail immediately due to a connect // failure. // - run_test(false, false, UNPARSEABLE_RESP, sizeof(UNPARSEABLE_RESP) - 1, + run_test(false, false, UNPARSABLE_RESP, sizeof(UNPARSABLE_RESP) - 1, GRPC_STATUS_UNAVAILABLE, nullptr); // http1 response. RPC should fail immediately due to a connect failure. diff --git a/test/core/end2end/connection_refused_test.cc b/test/core/end2end/connection_refused_test.cc index 5bba8040307..f753cf7a86e 100644 --- a/test/core/end2end/connection_refused_test.cc +++ b/test/core/end2end/connection_refused_test.cc @@ -85,7 +85,7 @@ static void run_test(bool wait_for_ready, bool use_service_config) { grpc_channel_credentials* creds = grpc_insecure_credentials_create(); chan = grpc_channel_create(addr.c_str(), creds, args); grpc_channel_credentials_release(creds); - grpc_slice host = grpc_slice_from_static_string("nonexistant"); + grpc_slice host = grpc_slice_from_static_string("nonexistent"); gpr_timespec deadline = grpc_timeout_seconds_to_deadline(wait_for_ready ? 2 : 600); call = diff --git a/test/core/end2end/invalid_call_argument_test.cc b/test/core/end2end/invalid_call_argument_test.cc index 1f086c3f98a..572c441d74d 100644 --- a/test/core/end2end/invalid_call_argument_test.cc +++ b/test/core/end2end/invalid_call_argument_test.cc @@ -74,11 +74,11 @@ static void prepare_test(int is_client) { memset(g_state.ops, 0, sizeof(g_state.ops)); if (is_client) { - // create a call, channel to a non existant server + // create a call, channel to a non existent server grpc_channel_credentials* creds = grpc_insecure_credentials_create(); - g_state.chan = grpc_channel_create("nonexistant:54321", creds, nullptr); + g_state.chan = grpc_channel_create("nonexistent:54321", creds, nullptr); grpc_channel_credentials_release(creds); - grpc_slice host = grpc_slice_from_static_string("nonexistant"); + grpc_slice host = grpc_slice_from_static_string("nonexistent"); g_state.call = grpc_channel_create_call( g_state.chan, nullptr, GRPC_PROPAGATE_DEFAULTS, g_state.cq, grpc_slice_from_static_string("/Foo"), &host, g_state.deadline, diff --git a/test/core/end2end/no_server_test.cc b/test/core/end2end/no_server_test.cc index 4b14f0a1a72..6f16b24ca6b 100644 --- a/test/core/end2end/no_server_test.cc +++ b/test/core/end2end/no_server_test.cc @@ -57,10 +57,10 @@ void run_test(bool wait_for_ready) { grpc_core::MakeRefCounted(); auto args = grpc_core::ChannelArgs().SetObject(response_generator).ToC(); - // create a call, channel to a non existant server + // create a call, channel to a non existent server grpc_channel_credentials* creds = grpc_insecure_credentials_create(); grpc_channel* chan = - grpc_channel_create("fake:nonexistant", creds, args.get()); + grpc_channel_create("fake:nonexistent", creds, args.get()); grpc_channel_credentials_release(creds); gpr_timespec deadline = grpc_timeout_seconds_to_deadline(2); grpc_call* call = grpc_channel_create_call( diff --git a/test/core/end2end/tests/no_logging.cc b/test/core/end2end/tests/no_logging.cc index 1ffb8116d8c..c6d9db38d16 100644 --- a/test/core/end2end/tests/no_logging.cc +++ b/test/core/end2end/tests/no_logging.cc @@ -99,7 +99,7 @@ class VerifyLogNoiseLogSink : public absl::LogSink { std::regex("Failed to bind some addresses for.*")}, {"log.cc", std::regex("Prefer WARNING or ERROR. However if you see this " - "message in a debug environmenmt or test environmenmt " + "message in a debug environment or test environment " "it is safe to ignore this message.")}}); if (IsVlogWithVerbosityMoreThan1(entry)) { 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 9af554f61e4..635a796a1e4 100644 --- a/test/core/event_engine/test_suite/tests/dns_test.cc +++ b/test/core/event_engine/test_suite/tests/dns_test.cc @@ -557,7 +557,7 @@ TEST_F(EventEngineDNSTest, InvalidIPv6Addresses) { &dns_resolver_signal_, "[2001:db8::11111]:1"); } -void TestUnparseableHostPort( +void TestUnparsableHostPort( std::unique_ptr dns_resolver, grpc_core::Notification* barrier, absl::string_view target) { dns_resolver->LookupHostname( @@ -569,38 +569,38 @@ void TestUnparseableHostPort( barrier->WaitForNotification(); } -TEST_F(EventEngineDNSTest, UnparseableHostPortsOnlyBracket) { - TestUnparseableHostPort(CreateDNSResolverWithoutSpecifyingServer(), - &dns_resolver_signal_, "["); +TEST_F(EventEngineDNSTest, UnparsableHostPortsOnlyBracket) { + TestUnparsableHostPort(CreateDNSResolverWithoutSpecifyingServer(), + &dns_resolver_signal_, "["); } -TEST_F(EventEngineDNSTest, UnparseableHostPortsMissingRightBracket) { - TestUnparseableHostPort(CreateDNSResolverWithoutSpecifyingServer(), - &dns_resolver_signal_, "[::1"); +TEST_F(EventEngineDNSTest, UnparsableHostPortsMissingRightBracket) { + TestUnparsableHostPort(CreateDNSResolverWithoutSpecifyingServer(), + &dns_resolver_signal_, "[::1"); } -TEST_F(EventEngineDNSTest, UnparseableHostPortsBadPort) { - TestUnparseableHostPort(CreateDNSResolverWithoutSpecifyingServer(), - &dns_resolver_signal_, "[::1]bad"); +TEST_F(EventEngineDNSTest, UnparsableHostPortsBadPort) { + TestUnparsableHostPort(CreateDNSResolverWithoutSpecifyingServer(), + &dns_resolver_signal_, "[::1]bad"); } -TEST_F(EventEngineDNSTest, UnparseableHostPortsBadIPv6) { - TestUnparseableHostPort(CreateDNSResolverWithoutSpecifyingServer(), - &dns_resolver_signal_, "[1.2.3.4]"); +TEST_F(EventEngineDNSTest, UnparsableHostPortsBadIPv6) { + TestUnparsableHostPort(CreateDNSResolverWithoutSpecifyingServer(), + &dns_resolver_signal_, "[1.2.3.4]"); } -TEST_F(EventEngineDNSTest, UnparseableHostPortsBadLocalhost) { - TestUnparseableHostPort(CreateDNSResolverWithoutSpecifyingServer(), - &dns_resolver_signal_, "[localhost]"); +TEST_F(EventEngineDNSTest, UnparsableHostPortsBadLocalhost) { + TestUnparsableHostPort(CreateDNSResolverWithoutSpecifyingServer(), + &dns_resolver_signal_, "[localhost]"); } -TEST_F(EventEngineDNSTest, UnparseableHostPortsBadLocalhostWithPort) { - TestUnparseableHostPort(CreateDNSResolverWithoutSpecifyingServer(), - &dns_resolver_signal_, "[localhost]:1"); +TEST_F(EventEngineDNSTest, UnparsableHostPortsBadLocalhostWithPort) { + TestUnparsableHostPort(CreateDNSResolverWithoutSpecifyingServer(), + &dns_resolver_signal_, "[localhost]:1"); } -TEST_F(EventEngineDNSTest, UnparseableHostPortsEmptyHostname) { - TestUnparseableHostPort(CreateDNSResolverWithoutSpecifyingServer(), - &dns_resolver_signal_, ":443"); +TEST_F(EventEngineDNSTest, UnparsableHostPortsEmptyHostname) { + TestUnparsableHostPort(CreateDNSResolverWithoutSpecifyingServer(), + &dns_resolver_signal_, ":443"); } // END diff --git a/test/core/iomgr/resolve_address_test.cc b/test/core/iomgr/resolve_address_test.cc index ec5834646dc..ec18410a267 100644 --- a/test/core/iomgr/resolve_address_test.cc +++ b/test/core/iomgr/resolve_address_test.cc @@ -240,7 +240,7 @@ const address_sorting_source_addr_factory_vtable } // namespace -TEST_F(ResolveAddressTest, LocalhostResultHasIPv4FirstWhenIPv6IsntAvalailable) { +TEST_F(ResolveAddressTest, LocalhostResultHasIPv4FirstWhenIPv6IsntAvailable) { if (std::string(g_resolver_type) != "ares") { GTEST_SKIP() << "this test is only valid with the c-ares resolver"; } @@ -326,7 +326,7 @@ TEST_F(ResolveAddressTest, InvalidIPv6Addresses) { TestInvalidIPAddress(this, "[2001:db8::11111]:1"); } -void TestUnparseableHostPort(ResolveAddressTest* test, const char* target) { +void TestUnparsableHostPort(ResolveAddressTest* test, const char* target) { grpc_core::ExecCtx exec_ctx; grpc_core::GetDNSResolver()->LookupHostname( absl::bind_front(&ResolveAddressTest::MustFail, test), target, "1", @@ -335,28 +335,28 @@ void TestUnparseableHostPort(ResolveAddressTest* test, const char* target) { test->PollPollsetUntilRequestDone(); } -TEST_F(ResolveAddressTest, UnparseableHostPortsOnlyBracket) { - TestUnparseableHostPort(this, "["); +TEST_F(ResolveAddressTest, UnparsableHostPortsOnlyBracket) { + TestUnparsableHostPort(this, "["); } -TEST_F(ResolveAddressTest, UnparseableHostPortsMissingRightBracket) { - TestUnparseableHostPort(this, "[::1"); +TEST_F(ResolveAddressTest, UnparsableHostPortsMissingRightBracket) { + TestUnparsableHostPort(this, "[::1"); } -TEST_F(ResolveAddressTest, UnparseableHostPortsBadPort) { - TestUnparseableHostPort(this, "[::1]bad"); +TEST_F(ResolveAddressTest, UnparsableHostPortsBadPort) { + TestUnparsableHostPort(this, "[::1]bad"); } -TEST_F(ResolveAddressTest, UnparseableHostPortsBadIPv6) { - TestUnparseableHostPort(this, "[1.2.3.4]"); +TEST_F(ResolveAddressTest, UnparsableHostPortsBadIPv6) { + TestUnparsableHostPort(this, "[1.2.3.4]"); } -TEST_F(ResolveAddressTest, UnparseableHostPortsBadLocalhost) { - TestUnparseableHostPort(this, "[localhost]"); +TEST_F(ResolveAddressTest, UnparsableHostPortsBadLocalhost) { + TestUnparsableHostPort(this, "[localhost]"); } -TEST_F(ResolveAddressTest, UnparseableHostPortsBadLocalhostWithPort) { - TestUnparseableHostPort(this, "[localhost]:1"); +TEST_F(ResolveAddressTest, UnparsableHostPortsBadLocalhostWithPort) { + TestUnparsableHostPort(this, "[localhost]:1"); } // Kick off a simple DNS resolution and then immediately cancel. This 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..1bfef19d2df 100644 --- a/test/core/load_balancing/rls_lb_config_parser_test.cc +++ b/test/core/load_balancing/rls_lb_config_parser_test.cc @@ -90,7 +90,7 @@ TEST_F(RlsConfigParsingTest, TopLevelRequiredFieldsMissing) { EXPECT_THAT( service_config.status().message(), ::testing::HasSubstr( - "errors validing RLS LB policy config: [" + "errors validating RLS LB policy config: [" "field:childPolicy error:field not present; " "field:childPolicyConfigTargetFieldName error:field not present; " "field:routeLookupConfig error:field not present]")) @@ -115,7 +115,7 @@ TEST_F(RlsConfigParsingTest, TopLevelFieldsWrongTypes) { EXPECT_EQ(service_config.status().message(), "errors validating service config: [" "field:loadBalancingConfig " - "error:errors validing RLS LB policy config: [" + "error:errors validating RLS LB policy config: [" "field:childPolicy error:is not an array; " "field:childPolicyConfigTargetFieldName error:is not a string; " "field:routeLookupChannelServiceConfig error:is not an object; " @@ -141,7 +141,7 @@ TEST_F(RlsConfigParsingTest, TopLevelFieldsInvalidValues) { EXPECT_THAT( service_config.status().message(), ::testing::HasSubstr( - "errors validing RLS LB policy config: [" + "errors validating RLS LB policy config: [" "field:childPolicy error:No known policies in list: unknown; " "field:childPolicyConfigTargetFieldName error:must be non-empty; " "field:routeLookupConfig error:field not present]")) @@ -165,7 +165,7 @@ TEST_F(RlsConfigParsingTest, InvalidChildPolicyConfig) { EXPECT_EQ(service_config.status().code(), absl::StatusCode::kInvalidArgument); EXPECT_THAT( service_config.status().message(), - ::testing::HasSubstr("errors validing RLS LB policy config: [" + ::testing::HasSubstr("errors validating RLS LB policy config: [" "field:childPolicy error:" "errors validating grpclb LB policy config: [" "field:childPolicy error:type should be array]; " @@ -194,7 +194,7 @@ TEST_F(RlsConfigParsingTest, InvalidRlsChannelServiceConfig) { EXPECT_EQ(service_config.status().message(), "errors validating service config: [" "field:loadBalancingConfig " - "error:errors validing RLS LB policy config: [" + "error:errors validating RLS LB policy config: [" "field:routeLookupChannelServiceConfig.loadBalancingPolicy " "error:unknown LB policy \"unknown\"; " "field:routeLookupConfig error:field not present]]") @@ -221,7 +221,7 @@ TEST_F(RlsConfigParsingTest, RouteLookupConfigRequiredFieldsMissing) { EXPECT_THAT( service_config.status().message(), ::testing::HasSubstr( - "errors validing RLS LB policy config: [" + "errors validating RLS LB policy config: [" "field:childPolicy error:field not present; " "field:childPolicyConfigTargetFieldName error:field not present; " "field:routeLookupConfig.cacheSizeBytes error:field not present; " @@ -254,7 +254,7 @@ TEST_F(RlsConfigParsingTest, RouteLookupConfigFieldsWrongTypes) { EXPECT_THAT( service_config.status().message(), ::testing::HasSubstr( - "errors validing RLS LB policy config: [" + "errors validating RLS LB policy config: [" "field:childPolicy error:field not present; " "field:childPolicyConfigTargetFieldName error:field not present; " "field:routeLookupConfig.cacheSizeBytes error:" @@ -286,7 +286,7 @@ TEST_F(RlsConfigParsingTest, RouteLookupConfigFieldsInvalidValues) { EXPECT_THAT( service_config.status().message(), ::testing::HasSubstr( - "errors validing RLS LB policy config: [" + "errors validating RLS LB policy config: [" "field:childPolicy error:field not present; " "field:childPolicyConfigTargetFieldName error:field not present; " "field:routeLookupConfig.cacheSizeBytes error:" @@ -321,7 +321,7 @@ TEST_F(RlsConfigParsingTest, GrpcKeybuilderRequiredFieldsMissing) { EXPECT_THAT( service_config.status().message(), ::testing::HasSubstr( - "errors validing RLS LB policy config: [" + "errors validating RLS LB policy config: [" "field:childPolicy error:field not present; " "field:childPolicyConfigTargetFieldName error:field not present; " "field:routeLookupConfig.cacheSizeBytes error:field not present; " @@ -355,7 +355,7 @@ TEST_F(RlsConfigParsingTest, GrpcKeybuilderWrongFieldTypes) { EXPECT_THAT( service_config.status().message(), ::testing::HasSubstr( - "errors validing RLS LB policy config: [" + "errors validating RLS LB policy config: [" "field:childPolicy error:field not present; " "field:childPolicyConfigTargetFieldName error:field not present; " "field:routeLookupConfig.cacheSizeBytes error:field not present; " @@ -400,7 +400,7 @@ TEST_F(RlsConfigParsingTest, GrpcKeybuilderInvalidValues) { EXPECT_THAT( service_config.status().message(), ::testing::HasSubstr( - "errors validing RLS LB policy config: [" + "errors validating RLS LB policy config: [" "field:childPolicy error:field not present; " "field:childPolicyConfigTargetFieldName error:field not present; " "field:routeLookupConfig.cacheSizeBytes error:field not present; " @@ -458,7 +458,7 @@ TEST_F(RlsConfigParsingTest, GrpcKeybuilderInvalidHeaders) { EXPECT_THAT( service_config.status().message(), ::testing::HasSubstr( - "errors validing RLS LB policy config: [" + "errors validating RLS LB policy config: [" "field:childPolicy error:field not present; " "field:childPolicyConfigTargetFieldName error:field not present; " "field:routeLookupConfig.cacheSizeBytes error:field not present; " @@ -515,7 +515,7 @@ TEST_F(RlsConfigParsingTest, GrpcKeybuilderNameWrongFieldTypes) { EXPECT_THAT( service_config.status().message(), ::testing::HasSubstr( - "errors validing RLS LB policy config: [" + "errors validating RLS LB policy config: [" "field:childPolicy error:field not present; " "field:childPolicyConfigTargetFieldName error:field not present; " "field:routeLookupConfig.cacheSizeBytes error:field not present; " @@ -559,7 +559,7 @@ TEST_F(RlsConfigParsingTest, DuplicateMethodNamesInSameKeyBuilder) { EXPECT_THAT( service_config.status().message(), ::testing::HasSubstr( - "errors validing RLS LB policy config: [" + "errors validating RLS LB policy config: [" "field:childPolicy error:field not present; " "field:childPolicyConfigTargetFieldName error:field not present; " "field:routeLookupConfig.cacheSizeBytes error:field not present; " @@ -603,7 +603,7 @@ TEST_F(RlsConfigParsingTest, DuplicateMethodNamesInDifferentKeyBuilders) { EXPECT_THAT( service_config.status().message(), ::testing::HasSubstr( - "errors validing RLS LB policy config: [" + "errors validating RLS LB policy config: [" "field:childPolicy error:field not present; " "field:childPolicyConfigTargetFieldName error:field not present; " "field:routeLookupConfig.cacheSizeBytes error:field not present; " diff --git a/test/core/security/credentials_test.cc b/test/core/security/credentials_test.cc index 3731f5ca189..4a999142988 100644 --- a/test/core/security/credentials_test.cc +++ b/test/core/security/credentials_test.cc @@ -213,7 +213,7 @@ const char "\"headers\":{\"Metadata-Flavor\":\"Google\"}}"; const char - valid_url_external_account_creds_options_credential_source_with_qurey_params_format_text + valid_url_external_account_creds_options_credential_source_with_query_params_format_text [] = "{\"url\":\"https://foo.com:5555/" "path/to/url/creds?p1=v1&p2=v2\"," "\"headers\":{\"Metadata-Flavor\":\"Google\"}}"; @@ -2122,7 +2122,7 @@ TEST_F(CredentialsTest, TestAuthMetadataContext) { } } -void validate_external_account_creds_token_exchage_request( +void validate_external_account_creds_token_exchange_request( const grpc_http_request* request, const URI& request_uri, absl::string_view body) { // Check that the body is constructed properly. @@ -2154,7 +2154,7 @@ void validate_external_account_creds_token_exchage_request( "Basic Y2xpZW50X2lkOmNsaWVudF9zZWNyZXQ="); } -void validate_external_account_creds_token_exchage_request_with_url_encode( +void validate_external_account_creds_token_exchange_request_with_url_encode( const grpc_http_request* request, const URI& uri, absl::string_view body) { // Check that the body is constructed properly. EXPECT_EQ( @@ -2214,7 +2214,7 @@ int external_acc_creds_serv_acc_imp_custom_lifetime_httpcli_post_success( Timestamp /*deadline*/, grpc_closure* on_done, grpc_http_response* response) { if (uri.path() == "/token") { - validate_external_account_creds_token_exchage_request(request, uri, body); + validate_external_account_creds_token_exchange_request(request, uri, body); *response = http_response( 200, valid_external_account_creds_token_exchange_response); } else if (uri.path() == "/service_account_impersonation") { @@ -2233,7 +2233,7 @@ int external_account_creds_httpcli_post_success( Timestamp /*deadline*/, grpc_closure* on_done, grpc_http_response* response) { if (uri.path() == "/token") { - validate_external_account_creds_token_exchage_request(request, uri, body); + validate_external_account_creds_token_exchange_request(request, uri, body); *response = http_response( 200, valid_external_account_creds_token_exchange_response); } else if (uri.path() == "/service_account_impersonation") { @@ -2243,7 +2243,7 @@ int external_account_creds_httpcli_post_success( 200, valid_external_account_creds_service_account_impersonation_response); } else if (uri.path() == "/token_url_encode") { - validate_external_account_creds_token_exchage_request_with_url_encode( + validate_external_account_creds_token_exchange_request_with_url_encode( request, uri, body); *response = http_response( 200, valid_external_account_creds_token_exchange_response); @@ -2291,7 +2291,7 @@ int url_external_account_creds_httpcli_get_success( return 1; } -void validate_aws_external_account_creds_token_exchage_request( +void validate_aws_external_account_creds_token_exchange_request( const grpc_http_request* request, const URI& request_uri, absl::string_view body) { // Check that the regional_cred_verification_url got constructed @@ -2380,8 +2380,8 @@ int aws_external_account_creds_httpcli_post_success( Timestamp /*deadline*/, grpc_closure* on_done, grpc_http_response* response) { if (uri.path() == "/token") { - validate_aws_external_account_creds_token_exchage_request(request, uri, - body); + validate_aws_external_account_creds_token_exchange_request(request, uri, + body); *response = http_response( 200, valid_external_account_creds_token_exchange_response); } @@ -3205,12 +3205,12 @@ TEST_F(ExternalAccountCredentialsTest, } TEST_F(ExternalAccountCredentialsTest, - UrlExternalAccountCredsSuccessWithQureyParamsFormatText) { + UrlExternalAccountCredsSuccessWithQueryParamsFormatText) { std::map emd = { {"authorization", "Bearer token_exchange_access_token"}}; ExecCtx exec_ctx; auto credential_source = JsonParse( - valid_url_external_account_creds_options_credential_source_with_qurey_params_format_text); + valid_url_external_account_creds_options_credential_source_with_query_params_format_text); ASSERT_TRUE(credential_source.ok()) << credential_source.status(); TestExternalAccountCredentials::ServiceAccountImpersonation service_account_impersonation; @@ -4469,7 +4469,7 @@ TEST_F(CredentialsTest, TestTlsCredentialsWithVerifierCompareFailure) { grpc_channel_credentials_release(tls_creds_2); } -TEST_F(CredentialsTest, TestXdsCredentialsCompareSucces) { +TEST_F(CredentialsTest, TestXdsCredentialsCompareSuccess) { auto* insecure_creds = grpc_insecure_credentials_create(); auto* xds_creds_1 = grpc_xds_credentials_create(insecure_creds); auto* xds_creds_2 = grpc_xds_credentials_create(insecure_creds); diff --git a/test/core/surface/server_chttp2_test.cc b/test/core/surface/server_chttp2_test.cc index d3fd84b544b..9c11f06037d 100644 --- a/test/core/surface/server_chttp2_test.cc +++ b/test/core/surface/server_chttp2_test.cc @@ -32,7 +32,7 @@ #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" -TEST(ServerChttp2, UnparseableTarget) { +TEST(ServerChttp2, UnparsableTarget) { grpc_channel_args args = {0, nullptr}; grpc_server* server = grpc_server_create(&args, nullptr); grpc_server_credentials* server_creds = diff --git a/test/core/xds/xds_client_test.cc b/test/core/xds/xds_client_test.cc index a970e217360..9ad6dce3d59 100644 --- a/test/core/xds/xds_client_test.cc +++ b/test/core/xds/xds_client_test.cc @@ -3506,7 +3506,7 @@ TEST_F(XdsClientTest, FederationWithUnknownAuthority) { << *error; } -TEST_F(XdsClientTest, FederationWithUnparseableXdstpResourceName) { +TEST_F(XdsClientTest, FederationWithUnparsableXdstpResourceName) { // Note: Not adding authority to bootstrap config. InitXdsClient(); // Start a watch for the xdstp resource name. diff --git a/test/core/xds/xds_cluster_resource_type_test.cc b/test/core/xds/xds_cluster_resource_type_test.cc index 23ce91782d3..2ce68f2e0a3 100644 --- a/test/core/xds/xds_cluster_resource_type_test.cc +++ b/test/core/xds/xds_cluster_resource_type_test.cc @@ -136,7 +136,7 @@ TEST_F(XdsClusterTest, Definition) { EXPECT_TRUE(resource_type->AllResourcesRequiredInSotW()); } -TEST_F(XdsClusterTest, UnparseableProto) { +TEST_F(XdsClusterTest, UnparsableProto) { std::string serialized_resource("\0", 1); auto* resource_type = XdsClusterResourceType::Get(); auto decode_result = @@ -586,7 +586,7 @@ TEST_F(ClusterTypeTest, AggregateClusterValid) { ::testing::ElementsAre("bar", "baz", "quux")); } -TEST_F(ClusterTypeTest, AggregateClusterUnparseableProto) { +TEST_F(ClusterTypeTest, AggregateClusterUnparsableProto) { Cluster cluster; cluster.set_name("foo"); cluster.mutable_cluster_type()->set_name("envoy.clusters.aggregate"); @@ -1031,7 +1031,7 @@ TEST_F(TlsConfigTest, UnknownTransportSocketType) { << decode_result.resource.status(); } -TEST_F(TlsConfigTest, UnparseableUpstreamTlsContext) { +TEST_F(TlsConfigTest, UnparsableUpstreamTlsContext) { Cluster cluster; cluster.set_name("foo"); cluster.set_type(cluster.EDS); @@ -1275,7 +1275,7 @@ TEST_F(UpstreamConfigTest, UnknownUpstreamConfigType) { << decode_result.resource.status(); } -TEST_F(UpstreamConfigTest, UnparseableHttpProtocolOptions) { +TEST_F(UpstreamConfigTest, UnparsableHttpProtocolOptions) { Cluster cluster; cluster.set_name("foo"); cluster.set_type(cluster.EDS); diff --git a/test/core/xds/xds_endpoint_resource_type_test.cc b/test/core/xds/xds_endpoint_resource_type_test.cc index bd365c63836..353e5727a5f 100644 --- a/test/core/xds/xds_endpoint_resource_type_test.cc +++ b/test/core/xds/xds_endpoint_resource_type_test.cc @@ -111,7 +111,7 @@ TEST_F(XdsEndpointTest, Definition) { EXPECT_FALSE(resource_type->AllResourcesRequiredInSotW()); } -TEST_F(XdsEndpointTest, UnparseableProto) { +TEST_F(XdsEndpointTest, UnparsableProto) { std::string serialized_resource("\0", 1); auto* resource_type = XdsEndpointResourceType::Get(); auto decode_result = diff --git a/test/core/xds/xds_http_filters_test.cc b/test/core/xds/xds_http_filters_test.cc index f1811d7c6ad..c720f72fef5 100644 --- a/test/core/xds/xds_http_filters_test.cc +++ b/test/core/xds/xds_http_filters_test.cc @@ -238,7 +238,7 @@ TEST_F(XdsRouterFilterTest, GenerateFilterConfigTypedStruct) { << status; } -TEST_F(XdsRouterFilterTest, GenerateFilterConfigUnparseable) { +TEST_F(XdsRouterFilterTest, GenerateFilterConfigUnparsable) { XdsExtension extension = MakeXdsExtension(Router()); std::string serialized_resource("\0", 1); extension.value = absl::string_view(serialized_resource); @@ -469,7 +469,7 @@ TEST_P(XdsFaultInjectionFilterConfigTest, TypedStruct) { << status; } -TEST_P(XdsFaultInjectionFilterConfigTest, Unparseable) { +TEST_P(XdsFaultInjectionFilterConfigTest, Unparsable) { XdsExtension extension = MakeXdsExtension(HTTPFault()); std::string serialized_resource("\0", 1); extension.value = absl::string_view(serialized_resource); @@ -544,7 +544,7 @@ TEST_F(XdsRbacFilterTest, GenerateFilterConfigTypedStruct) { << status; } -TEST_F(XdsRbacFilterTest, GenerateFilterConfigUnparseable) { +TEST_F(XdsRbacFilterTest, GenerateFilterConfigUnparsable) { XdsExtension extension = MakeXdsExtension(RBAC()); std::string serialized_resource("\0", 1); extension.value = absl::string_view(serialized_resource); @@ -587,7 +587,7 @@ TEST_F(XdsRbacFilterTest, GenerateFilterConfigOverrideTypedStruct) { << status; } -TEST_F(XdsRbacFilterTest, GenerateFilterConfigOverrideUnparseable) { +TEST_F(XdsRbacFilterTest, GenerateFilterConfigOverrideUnparsable) { XdsExtension extension = MakeXdsExtension(RBACPerRoute()); std::string serialized_resource("\0", 1); extension.value = absl::string_view(serialized_resource); @@ -1219,7 +1219,7 @@ TEST_F(XdsStatefulSessionFilterTest, GenerateFilterConfigTypedStruct) { << status; } -TEST_F(XdsStatefulSessionFilterTest, GenerateFilterConfigUnparseable) { +TEST_F(XdsStatefulSessionFilterTest, GenerateFilterConfigUnparsable) { XdsExtension extension = MakeXdsExtension(StatefulSession()); std::string serialized_resource("\0", 1); extension.value = absl::string_view(serialized_resource); @@ -1254,7 +1254,7 @@ TEST_F(XdsStatefulSessionFilterTest, GenerateFilterConfigOverrideTypedStruct) { << status; } -TEST_F(XdsStatefulSessionFilterTest, GenerateFilterConfigOverrideUnparseable) { +TEST_F(XdsStatefulSessionFilterTest, GenerateFilterConfigOverrideUnparsable) { XdsExtension extension = MakeXdsExtension(StatefulSessionPerRoute()); std::string serialized_resource("\0", 1); extension.value = absl::string_view(serialized_resource); @@ -1457,7 +1457,7 @@ TEST_P(XdsStatefulSessionFilterConfigTest, TypedStructSessionState) { << status; } -TEST_P(XdsStatefulSessionFilterConfigTest, UnparseableSessionState) { +TEST_P(XdsStatefulSessionFilterConfigTest, UnparsableSessionState) { StatefulSession stateful_session; stateful_session.mutable_session_state()->mutable_typed_config()->PackFrom( CookieBasedSessionState()); diff --git a/test/core/xds/xds_listener_resource_type_test.cc b/test/core/xds/xds_listener_resource_type_test.cc index 39419318b74..629d069b259 100644 --- a/test/core/xds/xds_listener_resource_type_test.cc +++ b/test/core/xds/xds_listener_resource_type_test.cc @@ -134,7 +134,7 @@ TEST_F(XdsListenerTest, Definition) { EXPECT_TRUE(resource_type->AllResourcesRequiredInSotW()); } -TEST_F(XdsListenerTest, UnparseableProto) { +TEST_F(XdsListenerTest, UnparsableProto) { std::string serialized_resource("\0", 1); auto* resource_type = XdsListenerResourceType::Get(); auto decode_result = @@ -911,7 +911,7 @@ TEST_F(ApiListenerTest, DoesNotContainHttpConnectionManager) { << decode_result.resource.status(); } -TEST_F(ApiListenerTest, UnparseableHttpConnectionManagerConfig) { +TEST_F(ApiListenerTest, UnparsableHttpConnectionManagerConfig) { Listener listener; listener.set_name("foo"); auto* any = listener.mutable_api_listener()->mutable_api_listener(); @@ -1753,7 +1753,7 @@ TEST_F(TcpListenerTest, UnknownTransportSocketType) { << decode_result.resource.status(); } -TEST_F(TcpListenerTest, UnparseableDownstreamTlsContext) { +TEST_F(TcpListenerTest, UnparsableDownstreamTlsContext) { Listener listener; listener.set_name("foo"); HttpConnectionManager hcm; 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 de1bb3e245f..4fa3a11bc20 100644 --- a/test/core/xds/xds_route_config_resource_type_test.cc +++ b/test/core/xds/xds_route_config_resource_type_test.cc @@ -125,7 +125,7 @@ TEST_F(XdsRouteConfigTest, Definition) { EXPECT_FALSE(resource_type->AllResourcesRequiredInSotW()); } -TEST_F(XdsRouteConfigTest, UnparseableProto) { +TEST_F(XdsRouteConfigTest, UnparsableProto) { std::string serialized_resource("\0", 1); auto* resource_type = XdsRouteConfigResourceType::Get(); auto decode_result = @@ -561,7 +561,7 @@ TEST_P(TypedPerFilterConfigTest, FilterConfigWrapperInTypedStruct) { << decode_result.resource.status(); } -TEST_P(TypedPerFilterConfigTest, FilterConfigWrapperUnparseable) { +TEST_P(TypedPerFilterConfigTest, FilterConfigWrapperUnparsable) { auto* typed_per_filter_config_proto = GetTypedPerFilterConfigProto(&route_config_); auto& any = (*typed_per_filter_config_proto)["fault"]; @@ -2200,7 +2200,7 @@ TEST_F(RlsTest, InvalidGrpcLbPolicyConfig) { "errors validating RouteConfiguration resource: [" "field:cluster_specifier_plugins[0].extension.typed_config " "error:ClusterSpecifierPlugin returned invalid LB policy config: " - "errors validing RLS LB policy config: [" + "errors validating RLS LB policy config: [" "field:routeLookupConfig.lookupService error:field not present]]") << decode_result.resource.status(); } @@ -2237,7 +2237,7 @@ TEST_F(RlsTest, RlsInTypedStruct) { << decode_result.resource.status(); } -TEST_F(RlsTest, RlsConfigUnparseable) { +TEST_F(RlsTest, RlsConfigUnparsable) { ScopedExperimentalEnvVar env_var("GRPC_EXPERIMENTAL_XDS_RLS_LB"); RouteConfiguration route_config; route_config.set_name("foo"); diff --git a/test/cpp/common/alts_util_test.cc b/test/cpp/common/alts_util_test.cc index b48ac400f55..5fe52338ff4 100644 --- a/test/cpp/common/alts_util_test.cc +++ b/test/cpp/common/alts_util_test.cc @@ -85,8 +85,8 @@ TEST(AltsUtilTest, AuthContextWithGoodAltsContextWithoutRpcVersions) { std::string expected_rp("record protocol"); std::string expected_peer("peer"); std::string expected_local("local"); - std::string expected_peer_atrributes_key("peer"); - std::string expected_peer_atrributes_value("attributes"); + std::string expected_peer_attributes_key("peer"); + std::string expected_peer_attributes_value("attributes"); grpc_security_level expected_sl = GRPC_INTEGRITY_ONLY; upb::Arena context_arena; grpc_gcp_AltsContext* context = grpc_gcp_AltsContext_new(context_arena.ptr()); @@ -105,10 +105,10 @@ TEST(AltsUtilTest, AuthContextWithGoodAltsContextWithoutRpcVersions) { expected_local.length())); grpc_gcp_AltsContext_peer_attributes_set( context, - upb_StringView_FromDataAndSize(expected_peer_atrributes_key.data(), - expected_peer_atrributes_key.length()), - upb_StringView_FromDataAndSize(expected_peer_atrributes_value.data(), - expected_peer_atrributes_value.length()), + upb_StringView_FromDataAndSize(expected_peer_attributes_key.data(), + expected_peer_attributes_key.length()), + upb_StringView_FromDataAndSize(expected_peer_attributes_value.data(), + expected_peer_attributes_value.length()), context_arena.ptr()); size_t serialized_ctx_length; char* serialized_ctx = grpc_gcp_AltsContext_serialize( @@ -131,8 +131,8 @@ TEST(AltsUtilTest, AuthContextWithGoodAltsContextWithoutRpcVersions) { EXPECT_EQ(0, rpc_protocol_versions.max_rpc_version.minor_version); EXPECT_EQ(0, rpc_protocol_versions.min_rpc_version.major_version); EXPECT_EQ(0, rpc_protocol_versions.min_rpc_version.minor_version); - EXPECT_EQ(expected_peer_atrributes_value, - alts_context->peer_attributes().at(expected_peer_atrributes_key)); + EXPECT_EQ(expected_peer_attributes_value, + alts_context->peer_attributes().at(expected_peer_attributes_key)); } TEST(AltsUtilTest, AuthContextWithGoodAltsContext) { diff --git a/test/cpp/end2end/xds/xds_cluster_end2end_test.cc b/test/cpp/end2end/xds/xds_cluster_end2end_test.cc index 1190111fe1a..24398adf7f3 100644 --- a/test/cpp/end2end/xds/xds_cluster_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_cluster_end2end_test.cc @@ -108,7 +108,7 @@ TEST_P(CdsTest, InvalidClusterStillExistsIfPreviouslyCached) { CheckRpcSendOk(DEBUG_LOCATION); } -// Tests round robin is not implacted by the endpoint weight, and that the +// Tests round robin is not impacted by the endpoint weight, and that the // localities in a locality map are picked according to their weights. TEST_P(CdsTest, EndpointWeightDoesNotImpactWeightedRoundRobin) { CreateAndStartBackends(2); @@ -507,7 +507,7 @@ TEST_P(EdsTest, IgnoresUnhealthyEndpoints) { CreateAndStartBackends(2); const size_t kNumRpcsPerAddress = 100; auto endpoints = CreateEndpointsForBackends(); - endpoints.push_back(MakeNonExistantEndpoint()); + endpoints.push_back(MakeNonExistentEndpoint()); endpoints.back().health_status = HealthStatus::DRAINING; EdsResourceArgs args({ {"locality0", std::move(endpoints), kDefaultLocalityWeight, @@ -607,12 +607,12 @@ TEST_P(EdsTest, AllServersUnreachableFailFast) { const size_t kNumUnreachableServers = 5; std::vector endpoints; for (size_t i = 0; i < kNumUnreachableServers; ++i) { - endpoints.emplace_back(MakeNonExistantEndpoint()); + endpoints.emplace_back(MakeNonExistentEndpoint()); } EdsResourceArgs args({{"locality0", std::move(endpoints)}}); balancer_->ads_service()->SetEdsResource(BuildEdsResource(args)); // The error shouldn't be DEADLINE_EXCEEDED because timeout is set to 5 - // seconds, and we should disocver in that time that the target backend is + // seconds, and we should discover in that time that the target backend is // down. CheckRpcSendFailure(DEBUG_LOCATION, StatusCode::UNAVAILABLE, MakeConnectionFailureRegex( @@ -677,7 +677,7 @@ TEST_P(EdsTest, IgnoresDuplicateUpdates) { // of the invalid cases. TEST_P(EdsTest, NacksInvalidResource) { EdsResourceArgs args({ - {"locality0", {MakeNonExistantEndpoint()}, kDefaultLocalityWeight, 1}, + {"locality0", {MakeNonExistentEndpoint()}, kDefaultLocalityWeight, 1}, }); balancer_->ads_service()->SetEdsResource(BuildEdsResource(args)); const auto response_state = WaitForEdsNack(DEBUG_LOCATION); @@ -1179,10 +1179,10 @@ TEST_P(EdsAuthorityRewriteTest, AutoAuthorityRewrite) { { CreateEndpoint(0), CreateEndpoint(1, ::envoy::config::core::v3::HealthStatus::UNKNOWN, - /*lb_weight=*/1, /*additional_backend_indxes=*/{}, + /*lb_weight=*/1, /*additional_backend_indexes=*/{}, /*hostname=*/kAltAuthority1), CreateEndpoint(2, ::envoy::config::core::v3::HealthStatus::UNKNOWN, - /*lb_weight=*/1, /*additional_backend_indxes=*/{}, + /*lb_weight=*/1, /*additional_backend_indexes=*/{}, /*hostname=*/kAltAuthority2), }}}); balancer_->ads_service()->SetEdsResource(BuildEdsResource(args)); @@ -1219,7 +1219,7 @@ TEST_P(EdsAuthorityRewriteTest, NoRewriteWithoutEnvVar) { EdsResourceArgs args( {{"locality0", {CreateEndpoint(0, ::envoy::config::core::v3::HealthStatus::UNKNOWN, - /*lb_weight=*/1, /*additional_backend_indxes=*/{}, + /*lb_weight=*/1, /*additional_backend_indexes=*/{}, /*hostname=*/kAltAuthority)}}}); balancer_->ads_service()->SetEdsResource(BuildEdsResource(args)); // Send an RPC and check the authority seen on the server side. @@ -1249,7 +1249,7 @@ TEST_P(EdsAuthorityRewriteTest, NoRewriteIfServerNotTrustedInBootstrap) { EdsResourceArgs args( {{"locality0", {CreateEndpoint(0, ::envoy::config::core::v3::HealthStatus::UNKNOWN, - /*lb_weight=*/1, /*additional_backend_indxes=*/{}, + /*lb_weight=*/1, /*additional_backend_indexes=*/{}, /*hostname=*/kAltAuthority)}}}); balancer_->ads_service()->SetEdsResource(BuildEdsResource(args)); // Send an RPC and check the authority seen on the server side. @@ -1296,7 +1296,7 @@ TEST_P(EdsAuthorityRewriteTest, NoRewriteIfNotEnabledInRoute) { EdsResourceArgs args( {{"locality0", {CreateEndpoint(0, ::envoy::config::core::v3::HealthStatus::UNKNOWN, - /*lb_weight=*/1, /*additional_backend_indxes=*/{}, + /*lb_weight=*/1, /*additional_backend_indexes=*/{}, /*hostname=*/kAltAuthority)}}}); balancer_->ads_service()->SetEdsResource(BuildEdsResource(args)); // Send an RPC and check the authority seen on the server side. @@ -1383,12 +1383,12 @@ TEST_P(FailoverTest, DoesNotUseLocalityWithNoEndpoints) { TEST_P(FailoverTest, Failover) { CreateAndStartBackends(2); EdsResourceArgs args({ - {"locality0", {MakeNonExistantEndpoint()}, kDefaultLocalityWeight, 1}, + {"locality0", {MakeNonExistentEndpoint()}, kDefaultLocalityWeight, 1}, {"locality1", CreateEndpointsForBackends(0, 1), kDefaultLocalityWeight, 2}, {"locality2", CreateEndpointsForBackends(1, 2), kDefaultLocalityWeight, 3}, - {"locality3", {MakeNonExistantEndpoint()}, kDefaultLocalityWeight, 0}, + {"locality3", {MakeNonExistentEndpoint()}, kDefaultLocalityWeight, 0}, }); balancer_->ads_service()->SetEdsResource(BuildEdsResource(args)); WaitForBackend(DEBUG_LOCATION, 0, /*check_status=*/nullptr, @@ -1401,7 +1401,7 @@ TEST_P(FailoverTest, ReportsConnectingDuringFailover) { CreateAndStartBackends(1); // Priority 0 will be unreachable, so we'll use priority 1. EdsResourceArgs args({ - {"locality0", {MakeNonExistantEndpoint()}, kDefaultLocalityWeight, 0}, + {"locality0", {MakeNonExistentEndpoint()}, kDefaultLocalityWeight, 0}, {"locality1", CreateEndpointsForBackends(), kDefaultLocalityWeight, 1}, }); balancer_->ads_service()->SetEdsResource(BuildEdsResource(args)); @@ -1458,8 +1458,8 @@ TEST_P(FailoverTest, SwitchBackToHigherPriority) { TEST_P(FailoverTest, UpdateInitialUnavailable) { CreateAndStartBackends(2); EdsResourceArgs args({ - {"locality0", {MakeNonExistantEndpoint()}, kDefaultLocalityWeight, 0}, - {"locality1", {MakeNonExistantEndpoint()}, kDefaultLocalityWeight, 1}, + {"locality0", {MakeNonExistentEndpoint()}, kDefaultLocalityWeight, 0}, + {"locality1", {MakeNonExistentEndpoint()}, kDefaultLocalityWeight, 1}, }); balancer_->ads_service()->SetEdsResource(BuildEdsResource(args)); CheckRpcSendFailure(DEBUG_LOCATION, StatusCode::UNAVAILABLE, @@ -1522,12 +1522,12 @@ TEST_P(FailoverTest, UpdatePriority) { // Moves all localities in the current priority to a higher priority. TEST_P(FailoverTest, MoveAllLocalitiesInCurrentPriorityToHigherPriority) { CreateAndStartBackends(3); - auto non_existant_endpoint = MakeNonExistantEndpoint(); + auto non_existent_endpoint = MakeNonExistentEndpoint(); // First update: // - Priority 0 is locality 0, containing an unreachable backend. // - Priority 1 is locality 1, containing backends 0 and 1. EdsResourceArgs args({ - {"locality0", {non_existant_endpoint}, kDefaultLocalityWeight, 0}, + {"locality0", {non_existent_endpoint}, kDefaultLocalityWeight, 0}, {"locality1", CreateEndpointsForBackends(0, 2), kDefaultLocalityWeight, 1}, }); @@ -1544,7 +1544,7 @@ TEST_P(FailoverTest, MoveAllLocalitiesInCurrentPriorityToHigherPriority) { // - We add backend 2 to locality 1, just so we have a way to know // when the update has been seen by the client. args = EdsResourceArgs({ - {"locality0", {non_existant_endpoint}, kDefaultLocalityWeight, 0}, + {"locality0", {non_existent_endpoint}, kDefaultLocalityWeight, 0}, {"locality1", CreateEndpointsForBackends(0, 3), kDefaultLocalityWeight, 0}, }); @@ -1558,13 +1558,13 @@ TEST_P(FailoverTest, MoveAllLocalitiesInCurrentPriorityToHigherPriority) { // present but deactivated. TEST_P(FailoverTest, PriorityChildNameChurn) { CreateAndStartBackends(4); - auto non_existant_endpoint = MakeNonExistantEndpoint(); + auto non_existent_endpoint = MakeNonExistentEndpoint(); // Initial update: // - P0:locality0, child number 0 (unreachable) // - P1:locality1, child number 1 // - P2:locality2, child number 2 EdsResourceArgs args({ - {"locality0", {non_existant_endpoint}, kDefaultLocalityWeight, 0}, + {"locality0", {non_existent_endpoint}, kDefaultLocalityWeight, 0}, {"locality1", CreateEndpointsForBackends(0, 1), kDefaultLocalityWeight, 1}, {"locality2", CreateEndpointsForBackends(1, 2), kDefaultLocalityWeight, @@ -1578,7 +1578,7 @@ TEST_P(FailoverTest, PriorityChildNameChurn) { // - P2:locality3, child number 3 (new child) // Child number 1 will be deactivated. args = EdsResourceArgs({ - {"locality0", {non_existant_endpoint}, kDefaultLocalityWeight, 0}, + {"locality0", {non_existent_endpoint}, kDefaultLocalityWeight, 0}, {"locality2", CreateEndpointsForBackends(1, 2), kDefaultLocalityWeight, 1}, {"locality3", CreateEndpointsForBackends(2, 3), kDefaultLocalityWeight, @@ -1592,7 +1592,7 @@ TEST_P(FailoverTest, PriorityChildNameChurn) { // - P2:locality3, child number 3 // Child number 1 will be deactivated. args = EdsResourceArgs({ - {"locality0", {non_existant_endpoint}, kDefaultLocalityWeight, 0}, + {"locality0", {non_existent_endpoint}, kDefaultLocalityWeight, 0}, {"locality4", CreateEndpointsForBackends(3, 4), kDefaultLocalityWeight, 1}, {"locality3", CreateEndpointsForBackends(2, 3), kDefaultLocalityWeight, 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 b0af0178e8e..19ba50ecd8c 100644 --- a/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc @@ -757,9 +757,9 @@ TEST_P(AggregateClusterTest, ReconfigEdsWhileLogicalDnsChildFails) { // - Priority 0: locality0 // - Priority 1: locality1, locality2 EdsResourceArgs args1({ - {"locality0", {MakeNonExistantEndpoint()}, kDefaultLocalityWeight, 0}, - {"locality1", {MakeNonExistantEndpoint()}, kDefaultLocalityWeight, 1}, - {"locality2", {MakeNonExistantEndpoint()}, kDefaultLocalityWeight, 1}, + {"locality0", {MakeNonExistentEndpoint()}, kDefaultLocalityWeight, 0}, + {"locality1", {MakeNonExistentEndpoint()}, kDefaultLocalityWeight, 1}, + {"locality2", {MakeNonExistentEndpoint()}, kDefaultLocalityWeight, 1}, }); balancer_->ads_service()->SetEdsResource( BuildEdsResource(args1, kNewEdsService1Name)); @@ -829,7 +829,7 @@ TEST_P(AggregateClusterTest, MultipleClustersWithSameLocalities) { const char* kNewClusterName2 = "new_cluster_2"; const char* kNewEdsServiceName2 = "new_eds_service_name_2"; // Populate EDS resource for cluster 1 with unreachable endpoint. - EdsResourceArgs args1({{"locality0", {MakeNonExistantEndpoint()}}}); + EdsResourceArgs args1({{"locality0", {MakeNonExistentEndpoint()}}}); balancer_->ads_service()->SetEdsResource( BuildEdsResource(args1, kNewEdsServiceName1)); // Populate CDS resource for cluster 1. diff --git a/test/cpp/end2end/xds/xds_core_end2end_test.cc b/test/cpp/end2end/xds/xds_core_end2end_test.cc index 04642dc873f..e8d0ed404eb 100644 --- a/test/cpp/end2end/xds/xds_core_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_core_end2end_test.cc @@ -540,7 +540,7 @@ TEST_P(TimeoutTest, EdsSecondResourceNotPresentInRequest) { EdsResourceArgs args({{"locality0", CreateEndpointsForBackends()}}); balancer_->ads_service()->SetEdsResource(BuildEdsResource(args)); CheckRpcSendOk(DEBUG_LOCATION, 1, RpcOptions().set_timeout_ms(4000)); - // New cluster that points to a non-existant EDS resource. + // New cluster that points to a non-existent EDS resource. const char* kNewClusterName = "new_cluster_name"; Cluster cluster = default_cluster_; cluster.set_name(kNewClusterName); diff --git a/test/cpp/end2end/xds/xds_end2end_test_lib.h b/test/cpp/end2end/xds/xds_end2end_test_lib.h index 409f4a46b28..5183e9cd562 100644 --- a/test/cpp/end2end/xds/xds_end2end_test_lib.h +++ b/test/cpp/end2end/xds/xds_end2end_test_lib.h @@ -476,11 +476,11 @@ class XdsEnd2endTest : public ::testing::TestWithParam, size_t backend_idx, ::envoy::config::core::v3::HealthStatus health_status = ::envoy::config::core::v3::HealthStatus::UNKNOWN, - int lb_weight = 1, std::vector additional_backend_indxes = {}, + int lb_weight = 1, std::vector additional_backend_indexes = {}, absl::string_view hostname = "") { std::vector additional_ports; - additional_ports.reserve(additional_backend_indxes.size()); - for (size_t idx : additional_backend_indxes) { + additional_ports.reserve(additional_backend_indexes.size()); + for (size_t idx : additional_backend_indexes) { additional_ports.push_back(backends_[idx]->port()); } return EdsResourceArgs::Endpoint(backends_[backend_idx]->port(), @@ -498,7 +498,7 @@ class XdsEnd2endTest : public ::testing::TestWithParam, // Returns an endpoint for an unused port, for use in constructing an // EDS resource. - EdsResourceArgs::Endpoint MakeNonExistantEndpoint() { + EdsResourceArgs::Endpoint MakeNonExistentEndpoint() { return EdsResourceArgs::Endpoint(grpc_pick_unused_port_or_die()); } @@ -748,7 +748,7 @@ class XdsEnd2endTest : public ::testing::TestWithParam, const RpcOptions& rpc_options = RpcOptions()); // Sends num_rpcs RPCs, counting how many of them fail with a message - // matching the specfied expected_message_prefix. + // matching the specified expected_message_prefix. // Any failure with a non-matching status or message is a test failure. size_t SendRpcsAndCountFailuresWithMessage( const grpc_core::DebugLocation& debug_location, size_t num_rpcs, @@ -944,7 +944,7 @@ class XdsEnd2endTest : public ::testing::TestWithParam, // sigma (standard deviation) to cover the probability area of 99.99994%. In // another word, for a sample with size "n" probability "p" error-tolerance // "k", we want the error always land within 5.00 sigma. The sigma of - // binominal distribution and be computed as sqrt(np(1-p)). Hence, we have + // binomial distribution and be computed as sqrt(np(1-p)). Hence, we have // the equation: // // kn <= 5.00 * sqrt(np(1-p)) diff --git a/test/cpp/end2end/xds/xds_fault_injection_end2end_test.cc b/test/cpp/end2end/xds/xds_fault_injection_end2end_test.cc index 7334afd0eda..3c560fc5c5e 100644 --- a/test/cpp/end2end/xds/xds_fault_injection_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_fault_injection_end2end_test.cc @@ -108,7 +108,7 @@ INSTANTIATE_TEST_SUITE_P( TEST_P(FaultInjectionTest, XdsFaultInjectionAlwaysAbort) { const uint32_t kAbortPercentagePerHundred = 100; // Create an EDS resource - EdsResourceArgs args({{"locality0", {MakeNonExistantEndpoint()}}}); + EdsResourceArgs args({{"locality0", {MakeNonExistentEndpoint()}}}); balancer_->ads_service()->SetEdsResource(BuildEdsResource(args)); // Construct the fault injection filter config HTTPFault http_fault; diff --git a/test/cpp/end2end/xds/xds_outlier_detection_end2end_test.cc b/test/cpp/end2end/xds/xds_outlier_detection_end2end_test.cc index 99c5b38ded1..17df1d08cac 100644 --- a/test/cpp/end2end/xds/xds_outlier_detection_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_outlier_detection_end2end_test.cc @@ -266,7 +266,7 @@ TEST_P(OutlierDetectionTest, SuccessRateStdevFactor) { gpr_sleep_until(grpc_timeout_milliseconds_to_deadline( 3000 * grpc_test_slowdown_factor())); ResetBackendCounters(); - // 1 backend experenced failure, but since the stdev_factor is high, no + // 1 backend experienced failure, but since the stdev_factor is high, no // backend will be noticed as an outlier so no ejection. // Both backends are still getting the RPCs intended for them. CheckRpcSendOk(DEBUG_LOCATION, 100, rpc_options); @@ -326,9 +326,9 @@ TEST_P(OutlierDetectionTest, SuccessRateEnforcementPercentage) { gpr_sleep_until(grpc_timeout_milliseconds_to_deadline( 3000 * grpc_test_slowdown_factor())); ResetBackendCounters(); - // 1 backend experenced failure, but since the enforcement percentage is 0, no - // backend will be ejected. - // Both backends are still getting the RPCs intended for them. + // 1 backend experienced failure, but since the enforcement percentage is 0, + // no backend will be ejected. Both backends are still getting the RPCs + // intended for them. CheckRpcSendOk(DEBUG_LOCATION, 100, rpc_options); CheckRpcSendOk(DEBUG_LOCATION, 100, rpc_options1); EXPECT_EQ(100, backends_[0]->backend_service()->request_count()); @@ -677,7 +677,7 @@ TEST_P(OutlierDetectionTest, FailurePercentageThreshold) { gpr_sleep_until(grpc_timeout_milliseconds_to_deadline( 3000 * grpc_test_slowdown_factor())); ResetBackendCounters(); - // 1 backend experenced 1 failure, but since the threshold is 50 % no + // 1 backend experienced 1 failure, but since the threshold is 50 % no // backend will be noticed as an outlier so no ejection. // Both backends are still getting the RPCs intended for them. CheckRpcSendOk(DEBUG_LOCATION, 100, rpc_options); @@ -738,9 +738,9 @@ TEST_P(OutlierDetectionTest, FailurePercentageEnforcementPercentage) { gpr_sleep_until(grpc_timeout_milliseconds_to_deadline( 3000 * grpc_test_slowdown_factor())); ResetBackendCounters(); - // 1 backend experenced failure, but since the enforcement percentage is 0, no - // backend will be ejected. - // Both backends are still getting the RPCs intended for them. + // 1 backend experienced failure, but since the enforcement percentage is 0, + // no backend will be ejected. Both backends are still getting the RPCs + // intended for them. CheckRpcSendOk(DEBUG_LOCATION, 100, rpc_options); CheckRpcSendOk(DEBUG_LOCATION, 100, rpc_options1); EXPECT_EQ(100, backends_[0]->backend_service()->request_count()); @@ -935,7 +935,7 @@ TEST_P(OutlierDetectionTest, SuccessRateAndFailurePercentage) { // Cause 2 errors on 1 backend and 1 error on 2 backends and wait for 2 // backends to be ejected. The 2 errors to the 1 backend will make exactly 1 // outlier from the success rate algorithm; all 4 errors will make 3 outliers - // from the failure pecentage algorithm because the threahold is set to 0. I + // from the failure percentage algorithm because the threshold is set to 0. I // have verified through debug logs we eject 1 backend because of success // rate, 1 backend because of failure percentage; but as we attempt to eject // another backend because of failure percentage we will stop as we have @@ -1037,7 +1037,7 @@ TEST_P(OutlierDetectionTest, SuccessRateAndFailurePercentageBothDisabled) { gpr_sleep_until(grpc_timeout_milliseconds_to_deadline( 3000 * grpc_test_slowdown_factor())); ResetBackendCounters(); - // 1 backend experenced failure, but since there is no counting there is no + // 1 backend experienced failure, but since there is no counting there is no // ejection. Both backends are still getting the RPCs intended for them. CheckRpcSendOk(DEBUG_LOCATION, 100, rpc_options); CheckRpcSendOk(DEBUG_LOCATION, 100, rpc_options1); @@ -1136,7 +1136,7 @@ TEST_P(OutlierDetectionTest, EjectionRetainedAcrossPriorities) { // Priority 0: backend 0 and a non-existent backend. // Priority 1: backend 1. EdsResourceArgs args({ - {"locality0", {CreateEndpoint(0), MakeNonExistantEndpoint()}}, + {"locality0", {CreateEndpoint(0), MakeNonExistentEndpoint()}}, {"locality1", {CreateEndpoint(1)}, kDefaultLocalityWeight, 1}, }); balancer_->ads_service()->SetEdsResource(BuildEdsResource(args)); @@ -1156,7 +1156,7 @@ TEST_P(OutlierDetectionTest, EjectionRetainedAcrossPriorities) { // Now send an EDS update that moves backend 0 to priority 1. // We also add backend 2, so that we know when the client sees the update. args = EdsResourceArgs({ - {"locality0", {MakeNonExistantEndpoint()}}, + {"locality0", {MakeNonExistentEndpoint()}}, {"locality1", CreateEndpointsForBackends(), kDefaultLocalityWeight, 1}, }); balancer_->ads_service()->SetEdsResource(BuildEdsResource(args)); 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..cfa4440d21d 100644 --- a/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc @@ -105,7 +105,7 @@ TEST_P(RingHashTest, AggregateClusterFallBackFromRingHashAtStartup) { const char* kNewEdsService2Name = "new_eds_service_name_2"; // Populate new EDS resources. EdsResourceArgs args1({ - {"locality0", {MakeNonExistantEndpoint(), MakeNonExistantEndpoint()}}, + {"locality0", {MakeNonExistentEndpoint(), MakeNonExistentEndpoint()}}, }); EdsResourceArgs args2({ {"locality0", CreateEndpointsForBackends()}, @@ -166,11 +166,11 @@ TEST_P(RingHashTest, // Populate EDS resource. EdsResourceArgs args({ {"locality0", - {MakeNonExistantEndpoint(), MakeNonExistantEndpoint()}, + {MakeNonExistentEndpoint(), MakeNonExistentEndpoint()}, kDefaultLocalityWeight, 0}, {"locality1", - {MakeNonExistantEndpoint(), MakeNonExistantEndpoint()}, + {MakeNonExistentEndpoint(), MakeNonExistentEndpoint()}, kDefaultLocalityWeight, 1}, }); @@ -234,11 +234,11 @@ TEST_P(RingHashTest, // Populate EDS resource. EdsResourceArgs args({ {"locality0", - {MakeNonExistantEndpoint(), MakeNonExistantEndpoint()}, + {MakeNonExistentEndpoint(), MakeNonExistentEndpoint()}, kDefaultLocalityWeight, 0}, {"locality1", - {MakeNonExistantEndpoint(), MakeNonExistantEndpoint()}, + {MakeNonExistentEndpoint(), MakeNonExistentEndpoint()}, kDefaultLocalityWeight, 1}, }); @@ -786,9 +786,9 @@ TEST_P(RingHashTest, IdleToReady) { TEST_P(RingHashTest, ContinuesConnectingWithoutPicks) { // Create EDS resource. CreateAndStartBackends(1); - auto non_existant_endpoint = MakeNonExistantEndpoint(); + auto non_existent_endpoint = MakeNonExistentEndpoint(); EdsResourceArgs args( - {{"locality0", {non_existant_endpoint, CreateEndpoint(0)}}}); + {{"locality0", {non_existent_endpoint, CreateEndpoint(0)}}}); balancer_->ads_service()->SetEdsResource(BuildEdsResource(args)); // Change CDS resource to use RING_HASH. auto cluster = default_cluster_; @@ -804,12 +804,12 @@ TEST_P(RingHashTest, ContinuesConnectingWithoutPicks) { // Start connection attempt injector and add a hold for the P0 // connection attempt. ConnectionAttemptInjector injector; - auto hold = injector.AddHold(non_existant_endpoint.port); + auto hold = injector.AddHold(non_existent_endpoint.port); // A long-running RPC, just used to send the RPC in another thread. LongRunningRpc rpc; std::vector> metadata = { {"address_hash", - CreateMetadataValueThatHashesToBackendPort(non_existant_endpoint.port)}}; + CreateMetadataValueThatHashesToBackendPort(non_existent_endpoint.port)}}; rpc.StartRpc(stub_.get(), RpcOptions().set_timeout_ms(0).set_metadata( std::move(metadata))); // Wait for the RPC to trigger the P0 connection attempt, then cancel it, @@ -829,12 +829,12 @@ TEST_P(RingHashTest, ContinuesConnectingWithoutPicks) { TEST_P(RingHashTest, ContinuesConnectingWithoutPicksOneSubchannelAtATime) { // Create EDS resource. CreateAndStartBackends(1); - auto non_existant_endpoint0 = MakeNonExistantEndpoint(); - auto non_existant_endpoint1 = MakeNonExistantEndpoint(); - auto non_existant_endpoint2 = MakeNonExistantEndpoint(); + auto non_existent_endpoint0 = MakeNonExistentEndpoint(); + auto non_existent_endpoint1 = MakeNonExistentEndpoint(); + auto non_existent_endpoint2 = MakeNonExistentEndpoint(); EdsResourceArgs args({{"locality0", - {non_existant_endpoint0, non_existant_endpoint1, - non_existant_endpoint2, CreateEndpoint(0)}}}); + {non_existent_endpoint0, non_existent_endpoint1, + non_existent_endpoint2, CreateEndpoint(0)}}}); balancer_->ads_service()->SetEdsResource(BuildEdsResource(args)); // Change CDS resource to use RING_HASH. auto cluster = default_cluster_; @@ -849,59 +849,59 @@ TEST_P(RingHashTest, ContinuesConnectingWithoutPicksOneSubchannelAtATime) { new_route_config); // Start connection attempt injector. ConnectionAttemptInjector injector; - auto hold_non_existant0 = injector.AddHold(non_existant_endpoint0.port); - auto hold_non_existant1 = injector.AddHold(non_existant_endpoint1.port); - auto hold_non_existant2 = injector.AddHold(non_existant_endpoint2.port); + auto hold_non_existent0 = injector.AddHold(non_existent_endpoint0.port); + auto hold_non_existent1 = injector.AddHold(non_existent_endpoint1.port); + auto hold_non_existent2 = injector.AddHold(non_existent_endpoint2.port); auto hold_good = injector.AddHold(backends_[0]->port()); // A long-running RPC, just used to send the RPC in another thread. LongRunningRpc rpc; std::vector> metadata = { {"address_hash", CreateMetadataValueThatHashesToBackendPort( - non_existant_endpoint0.port)}}; + non_existent_endpoint0.port)}}; rpc.StartRpc(stub_.get(), RpcOptions().set_timeout_ms(0).set_metadata( std::move(metadata))); // Wait for the RPC to trigger a connection attempt to the first address, // then cancel the RPC. No other connection attempts should be started yet. - hold_non_existant0->Wait(); + hold_non_existent0->Wait(); rpc.CancelRpc(); - EXPECT_FALSE(hold_non_existant1->IsStarted()); - EXPECT_FALSE(hold_non_existant2->IsStarted()); + EXPECT_FALSE(hold_non_existent1->IsStarted()); + EXPECT_FALSE(hold_non_existent2->IsStarted()); EXPECT_FALSE(hold_good->IsStarted()); // Allow the connection attempt to the first address to resume and wait // for the attempt for the second address. No other connection // attempts should be started yet. - auto hold_non_existant0_again = injector.AddHold(non_existant_endpoint0.port); - hold_non_existant0->Resume(); - hold_non_existant1->Wait(); - EXPECT_FALSE(hold_non_existant0_again->IsStarted()); - EXPECT_FALSE(hold_non_existant2->IsStarted()); + auto hold_non_existent0_again = injector.AddHold(non_existent_endpoint0.port); + hold_non_existent0->Resume(); + hold_non_existent1->Wait(); + EXPECT_FALSE(hold_non_existent0_again->IsStarted()); + EXPECT_FALSE(hold_non_existent2->IsStarted()); EXPECT_FALSE(hold_good->IsStarted()); // Allow the connection attempt to the second address to resume and wait // for the attempt for the third address. No other connection // attempts should be started yet. - auto hold_non_existant1_again = injector.AddHold(non_existant_endpoint1.port); - hold_non_existant1->Resume(); - hold_non_existant2->Wait(); - EXPECT_FALSE(hold_non_existant0_again->IsStarted()); - EXPECT_FALSE(hold_non_existant1_again->IsStarted()); + auto hold_non_existent1_again = injector.AddHold(non_existent_endpoint1.port); + hold_non_existent1->Resume(); + hold_non_existent2->Wait(); + EXPECT_FALSE(hold_non_existent0_again->IsStarted()); + EXPECT_FALSE(hold_non_existent1_again->IsStarted()); EXPECT_FALSE(hold_good->IsStarted()); // Allow the connection attempt to the third address to resume and wait // for the attempt for the final address. No other connection // attempts should be started yet. - auto hold_non_existant2_again = injector.AddHold(non_existant_endpoint2.port); - hold_non_existant2->Resume(); + auto hold_non_existent2_again = injector.AddHold(non_existent_endpoint2.port); + hold_non_existent2->Resume(); hold_good->Wait(); - EXPECT_FALSE(hold_non_existant0_again->IsStarted()); - EXPECT_FALSE(hold_non_existant1_again->IsStarted()); - EXPECT_FALSE(hold_non_existant2_again->IsStarted()); + EXPECT_FALSE(hold_non_existent0_again->IsStarted()); + EXPECT_FALSE(hold_non_existent1_again->IsStarted()); + EXPECT_FALSE(hold_non_existent2_again->IsStarted()); // Allow the final attempt to resume. hold_good->Resume(); // Wait for channel to become connected without any pending RPC. EXPECT_TRUE(channel_->WaitForConnected(grpc_timeout_seconds_to_deadline(10))); // No other connection attempts should have been started. - EXPECT_FALSE(hold_non_existant0_again->IsStarted()); - EXPECT_FALSE(hold_non_existant1_again->IsStarted()); - EXPECT_FALSE(hold_non_existant2_again->IsStarted()); + EXPECT_FALSE(hold_non_existent0_again->IsStarted()); + EXPECT_FALSE(hold_non_existent1_again->IsStarted()); + EXPECT_FALSE(hold_non_existent2_again->IsStarted()); // RPC should have been cancelled. EXPECT_EQ(StatusCode::CANCELLED, rpc.GetStatus().error_code()); // Make sure the backend did not get any requests. @@ -940,7 +940,7 @@ TEST_P(RingHashTest, TransientFailureCheckNextOne) { // Test that when a backend goes down, we will move on to the next subchannel // (with a lower priority). When the backend comes back up, traffic will move // back. -TEST_P(RingHashTest, SwitchToLowerPrioirtyAndThenBack) { +TEST_P(RingHashTest, SwitchToLowerPriorityAndThenBack) { CreateAndStartBackends(2); auto cluster = default_cluster_; cluster.set_lb_policy(Cluster::RING_HASH); @@ -990,7 +990,7 @@ TEST_P(RingHashTest, ReattemptWhenAllEndpointsUnreachable) { SetListenerAndRouteConfiguration(balancer_.get(), default_listener_, new_route_config); EdsResourceArgs args( - {{"locality0", {MakeNonExistantEndpoint(), CreateEndpoint(0)}}}); + {{"locality0", {MakeNonExistentEndpoint(), CreateEndpoint(0)}}}); balancer_->ads_service()->SetEdsResource(BuildEdsResource(args)); std::vector> metadata = { {"address_hash", CreateMetadataValueThatHashesToBackend(0)}}; @@ -1024,8 +1024,8 @@ TEST_P(RingHashTest, TransientFailureSkipToAvailableReady) { // Make sure we include some unused ports to fill the ring. EdsResourceArgs args({ {"locality0", - {CreateEndpoint(0), CreateEndpoint(1), MakeNonExistantEndpoint(), - MakeNonExistantEndpoint()}}, + {CreateEndpoint(0), CreateEndpoint(1), MakeNonExistentEndpoint(), + MakeNonExistentEndpoint()}}, }); balancer_->ads_service()->SetEdsResource(BuildEdsResource(args)); std::vector> metadata = { @@ -1124,7 +1124,7 @@ TEST_P(RingHashTest, ReattemptWhenGoingFromTransientFailureToIdle) { EXPECT_EQ(GRPC_CHANNEL_READY, channel_->GetState(false)); } -// Test unspported hash policy types are all ignored before a supported +// Test unsupported hash policy types are all ignored before a supported // policy. TEST_P(RingHashTest, UnsupportedHashPolicyUntilChannelIdHashing) { CreateAndStartBackends(2); diff --git a/test/cpp/end2end/xds/xds_routing_end2end_test.cc b/test/cpp/end2end/xds/xds_routing_end2end_test.cc index 1c6369f0cc3..7b7a2be9a52 100644 --- a/test/cpp/end2end/xds/xds_routing_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_routing_end2end_test.cc @@ -472,7 +472,7 @@ TEST_P(LdsRdsTest, ChooseLastRoute) { } TEST_P(LdsRdsTest, NoMatchingRoute) { - EdsResourceArgs args({{"locality0", {MakeNonExistantEndpoint()}}}); + EdsResourceArgs args({{"locality0", {MakeNonExistentEndpoint()}}}); balancer_->ads_service()->SetEdsResource(BuildEdsResource(args)); RouteConfiguration route_config = default_route_config_; route_config.mutable_virtual_hosts(0) @@ -531,7 +531,7 @@ TEST_P(LdsRdsTest, NacksInvalidRouteConfig) { // Tests that LDS client should fail RPCs with UNAVAILABLE status code if the // matching route has an action other than RouteAction. TEST_P(LdsRdsTest, MatchingRouteHasNoRouteAction) { - EdsResourceArgs args({{"locality0", {MakeNonExistantEndpoint()}}}); + EdsResourceArgs args({{"locality0", {MakeNonExistentEndpoint()}}}); balancer_->ads_service()->SetEdsResource(BuildEdsResource(args)); RouteConfiguration route_config = default_route_config_; // Set a route with an inappropriate route action @@ -1548,10 +1548,10 @@ TEST_P(LdsRdsTest, XdsRoutingApplyXdsTimeout) { const char* kNewCluster3Name = "new_cluster_3"; const char* kNewEdsService3Name = "new_eds_service_name_3"; // Populate new EDS resources. - EdsResourceArgs args({{"locality0", {MakeNonExistantEndpoint()}}}); - EdsResourceArgs args1({{"locality0", {MakeNonExistantEndpoint()}}}); - EdsResourceArgs args2({{"locality0", {MakeNonExistantEndpoint()}}}); - EdsResourceArgs args3({{"locality0", {MakeNonExistantEndpoint()}}}); + EdsResourceArgs args({{"locality0", {MakeNonExistentEndpoint()}}}); + EdsResourceArgs args1({{"locality0", {MakeNonExistentEndpoint()}}}); + EdsResourceArgs args2({{"locality0", {MakeNonExistentEndpoint()}}}); + EdsResourceArgs args3({{"locality0", {MakeNonExistentEndpoint()}}}); balancer_->ads_service()->SetEdsResource(BuildEdsResource(args)); balancer_->ads_service()->SetEdsResource( BuildEdsResource(args1, kNewEdsService1Name)); @@ -1661,9 +1661,9 @@ TEST_P(LdsRdsTest, XdsRoutingApplyApplicationTimeoutWhenXdsTimeoutExplicit) { const char* kNewCluster2Name = "new_cluster_2"; const char* kNewEdsService2Name = "new_eds_service_name_2"; // Populate new EDS resources. - EdsResourceArgs args({{"locality0", {MakeNonExistantEndpoint()}}}); - EdsResourceArgs args1({{"locality0", {MakeNonExistantEndpoint()}}}); - EdsResourceArgs args2({{"locality0", {MakeNonExistantEndpoint()}}}); + EdsResourceArgs args({{"locality0", {MakeNonExistentEndpoint()}}}); + EdsResourceArgs args1({{"locality0", {MakeNonExistentEndpoint()}}}); + EdsResourceArgs args2({{"locality0", {MakeNonExistentEndpoint()}}}); balancer_->ads_service()->SetEdsResource(BuildEdsResource(args)); balancer_->ads_service()->SetEdsResource( BuildEdsResource(args1, kNewEdsService1Name)); @@ -1749,7 +1749,7 @@ TEST_P(LdsRdsTest, XdsRoutingApplyApplicationTimeoutWhenXdsTimeoutExplicit) { TEST_P(LdsRdsTest, XdsRoutingApplyApplicationTimeoutWhenHttpTimeoutExplicit) { const auto kTimeoutApplication = grpc_core::Duration::Milliseconds(4500); // Populate new EDS resources. - EdsResourceArgs args({{"locality0", {MakeNonExistantEndpoint()}}}); + EdsResourceArgs args({{"locality0", {MakeNonExistentEndpoint()}}}); balancer_->ads_service()->SetEdsResource(BuildEdsResource(args)); auto listener = default_listener_; HttpConnectionManager http_connection_manager; @@ -1784,7 +1784,7 @@ TEST_P(LdsRdsTest, XdsRoutingApplyApplicationTimeoutWhenHttpTimeoutExplicit) { TEST_P(LdsRdsTest, XdsRoutingWithOnlyApplicationTimeout) { const auto kTimeoutApplication = grpc_core::Duration::Milliseconds(4500); // Populate new EDS resources. - EdsResourceArgs args({{"locality0", {MakeNonExistantEndpoint()}}}); + EdsResourceArgs args({{"locality0", {MakeNonExistentEndpoint()}}}); balancer_->ads_service()->SetEdsResource(BuildEdsResource(args)); auto t0 = system_clock::now(); CheckRpcSendFailure( diff --git a/test/cpp/util/channel_trace_proto_helper.cc b/test/cpp/util/channel_trace_proto_helper.cc index 8acb762a889..e92f496e62a 100644 --- a/test/cpp/util/channel_trace_proto_helper.cc +++ b/test/cpp/util/channel_trace_proto_helper.cc @@ -40,7 +40,7 @@ namespace { // then back to json. This ensures that the json string was correctly formatted // according to https://developers.google.com/protocol-buffers/docs/proto3#json template -void VaidateProtoJsonTranslation(absl::string_view json_str) { +void ValidateProtoJsonTranslation(absl::string_view json_str) { Message msg; grpc::protobuf::json::JsonParseOptions parse_options; // If the following line is failing, then uncomment the last line of the @@ -73,42 +73,42 @@ void VaidateProtoJsonTranslation(absl::string_view json_str) { namespace testing { void ValidateChannelTraceProtoJsonTranslation(absl::string_view json_string) { - VaidateProtoJsonTranslation(json_string); + ValidateProtoJsonTranslation(json_string); } void ValidateChannelProtoJsonTranslation(absl::string_view json_string) { - VaidateProtoJsonTranslation(json_string); + ValidateProtoJsonTranslation(json_string); } void ValidateGetTopChannelsResponseProtoJsonTranslation( absl::string_view json_string) { - VaidateProtoJsonTranslation( + ValidateProtoJsonTranslation( json_string); } void ValidateGetChannelResponseProtoJsonTranslation( absl::string_view json_string) { - VaidateProtoJsonTranslation( + ValidateProtoJsonTranslation( json_string); } void ValidateGetServerResponseProtoJsonTranslation( absl::string_view json_string) { - VaidateProtoJsonTranslation( + ValidateProtoJsonTranslation( json_string); } void ValidateSubchannelProtoJsonTranslation(absl::string_view json_string) { - VaidateProtoJsonTranslation(json_string); + ValidateProtoJsonTranslation(json_string); } void ValidateServerProtoJsonTranslation(absl::string_view json_string) { - VaidateProtoJsonTranslation(json_string); + ValidateProtoJsonTranslation(json_string); } void ValidateGetServersResponseProtoJsonTranslation( absl::string_view json_string) { - VaidateProtoJsonTranslation( + ValidateProtoJsonTranslation( json_string); } diff --git a/test/cpp/util/channelz_sampler.cc b/test/cpp/util/channelz_sampler.cc index d689319f52c..043625afa4d 100644 --- a/test/cpp/util/channelz_sampler.cc +++ b/test/cpp/util/channelz_sampler.cc @@ -178,9 +178,9 @@ class ChannelzSampler final { return get_socket_response.socket(); } - // get the descedent channels/subchannels/sockets of a channel - // push descedent channels/subchannels to queue for layer traverse - // store descedent channels/subchannels/sockets for dumping data + // get the descendant channels/subchannels/sockets of a channel + // push descendant channels/subchannels to queue for layer traverse + // store descendant channels/subchannels/sockets for dumping data void GetChannelDescedence( const grpc::channelz::v1::Channel& channel, std::queue& channel_queue, @@ -232,9 +232,9 @@ class ChannelzSampler final { std::cout << std::endl; } - // get the descedent channels/subchannels/sockets of a subchannel - // push descedent channels/subchannels to queue for layer traverse - // store descedent channels/subchannels/sockets for dumping data + // get the descendant channels/subchannels/sockets of a subchannel + // push descendant channels/subchannels to queue for layer traverse + // store descendant channels/subchannels/sockets for dumping data void GetSubchannelDescedence( grpc::channelz::v1::Subchannel& subchannel, std::queue& channel_queue, From f55bf225da0eafeeebffd507dcb57c625933d105 Mon Sep 17 00:00:00 2001 From: alto-ruby Date: Tue, 17 Sep 2024 18:09:05 -0700 Subject: [PATCH 17/30] [Ruby] fix incompatible pointer type of grpc_compression_algorithm_name (#37741) fixes #37731 Closes #37741 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37741 from alto-ruby:fix-incompatible-pointer-type-in-grpc_compression_algorithm_name 18a89be44d54e8c8bd614f1cee626d1db598a45a PiperOrigin-RevId: 675779382 --- src/ruby/ext/grpc/rb_compression_options.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ruby/ext/grpc/rb_compression_options.c b/src/ruby/ext/grpc/rb_compression_options.c index 7bdc33004e8..a38790faf79 100644 --- a/src/ruby/ext/grpc/rb_compression_options.c +++ b/src/ruby/ext/grpc/rb_compression_options.c @@ -296,7 +296,7 @@ VALUE grpc_rb_compression_options_level_value_to_name_internal( * Fails if the enum value is invalid. */ VALUE grpc_rb_compression_options_algorithm_value_to_name_internal( grpc_compression_algorithm internal_value) { - char* algorithm_name = NULL; + const char* algorithm_name = NULL; if (!grpc_compression_algorithm_name(internal_value, &algorithm_name)) { rb_raise(rb_eArgError, "Failed to convert algorithm value to name"); From dbdb035f590b24d2fa35115891fe21f72e537ab8 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 17 Sep 2024 21:59:34 -0700 Subject: [PATCH 18/30] [party] Fix use after free in tracer (#37748) It's possible for `LogStateChange` to be called after the party is destroyed (one thread calls Unref, which calls LogStateChange after the atomic op; another calls Unref concurrently, frees the last ref, deletes the object) Consequently, it's not safe to call `DebugTag()` here - remove that. Closes #37748 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37748 from ctiller:flake-fightas-10 ddef3993092b105b72b534030a572e37487989b1 PiperOrigin-RevId: 675833221 --- src/core/lib/promise/party.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/lib/promise/party.h b/src/core/lib/promise/party.h index b42c392d51f..d9a2e2ccb57 100644 --- a/src/core/lib/promise/party.h +++ b/src/core/lib/promise/party.h @@ -394,7 +394,7 @@ class Party : public Activity, private Wakeable { const char* op, uint64_t prev_state, uint64_t new_state, DebugLocation loc = {}) { GRPC_TRACE_LOG(party_state, INFO).AtLocation(loc.file(), loc.line()) - << DebugTag() << " " << op << " " + << this << " " << op << " " << absl::StrFormat("%016" PRIx64 " -> %016" PRIx64, prev_state, new_state); } From e80625a06eb8f9f62de7bbed8afa77c82ab828ed Mon Sep 17 00:00:00 2001 From: AJ Heller Date: Wed, 18 Sep 2024 09:46:16 -0700 Subject: [PATCH 19/30] [testing] Fix end2end Proxy fixture metadata race (#37738) The gRPC Core API currently requires callers to provide initial metadata before trailing metadata. You can see the C++ Callback API do this bookkeeping, for example. There is an eventual goal to be able to provide these in any order, and have gRPC do the right thing, but core is not there yet. The proxy fixture in our end2end tests had a rare scenario in which trailing metadata from the server would show up at the proxy before initial metadata. This is part of the proxy's job: to split up batches into singular-operations that can complete in any order. There was, however, a rare flake wherein trailing metadata would complete before initial metadata, and the result was both client and server waiting on each other to respond. This change adds a way for the proxy to defer sending trailing metadata back to the client, until after initial metadata has been sent to the client. In my testing, this eliminates the flake I had been able to reproduce 1 in 10k times using a single test. It happened more frequently across the full set of tests in our CI test suites. Closes #37738 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37738 from drfloob:fix-proxy-fixture 6e0d7b7e6f2070c32516f89d16e59886cf84413f PiperOrigin-RevId: 676026493 --- test/core/end2end/fixtures/proxy.cc | 102 ++++++++++++++++++++++------ 1 file changed, 80 insertions(+), 22 deletions(-) diff --git a/test/core/end2end/fixtures/proxy.cc b/test/core/end2end/fixtures/proxy.cc index febdb809838..fd8a0f59763 100644 --- a/test/core/end2end/fixtures/proxy.cc +++ b/test/core/end2end/fixtures/proxy.cc @@ -20,6 +20,7 @@ #include +#include #include #include @@ -82,6 +83,10 @@ typedef struct { grpc_metadata_array c2p_initial_metadata; grpc_metadata_array p2s_initial_metadata; + grpc_core::Mutex* initial_metadata_mu; + bool p2s_initial_metadata_received ABSL_GUARDED_BY(initial_metadata_mu); + grpc_op* deferred_trailing_metadata_op ABSL_GUARDED_BY(initial_metadata_mu); + grpc_byte_buffer* c2p_msg; grpc_byte_buffer* p2s_msg; @@ -166,6 +171,13 @@ static void unrefpc(proxy_call* pc, const char* /*reason*/) { grpc_metadata_array_destroy(&pc->p2s_initial_metadata); grpc_metadata_array_destroy(&pc->p2s_trailing_metadata); grpc_slice_unref(pc->p2s_status_details); + { + grpc_core::MutexLock lock(pc->initial_metadata_mu); + if (pc->deferred_trailing_metadata_op != nullptr) { + gpr_free(pc->deferred_trailing_metadata_op); + } + } + delete pc->initial_metadata_mu; gpr_free(pc); } } @@ -179,25 +191,45 @@ static void on_c2p_sent_initial_metadata(void* arg, int /*success*/) { unrefpc(pc, "on_c2p_sent_initial_metadata"); } +static void on_c2p_sent_status(void* arg, int /*success*/) { + proxy_call* pc = static_cast(arg); + unrefpc(pc, "on_c2p_sent_status"); +} + static void on_p2s_recv_initial_metadata(void* arg, int /*success*/) { proxy_call* pc = static_cast(arg); grpc_op op; grpc_call_error err; - memset(&op, 0, sizeof(op)); - if (!pc->proxy->shutdown && !grpc_call_is_trailers_only(pc->p2s)) { - op.op = GRPC_OP_SEND_INITIAL_METADATA; - op.flags = 0; - op.reserved = nullptr; - op.data.send_initial_metadata.count = pc->p2s_initial_metadata.count; - op.data.send_initial_metadata.metadata = pc->p2s_initial_metadata.metadata; - refpc(pc, "on_c2p_sent_initial_metadata"); - err = grpc_call_start_batch(pc->c2p, &op, 1, - new_closure(on_c2p_sent_initial_metadata, pc), - nullptr); - CHECK_EQ(err, GRPC_CALL_OK); + if (!pc->proxy->shutdown) { + if (!grpc_call_is_trailers_only(pc->p2s)) { + op.op = GRPC_OP_SEND_INITIAL_METADATA; + op.flags = 0; + op.reserved = nullptr; + op.data.send_initial_metadata.count = pc->p2s_initial_metadata.count; + op.data.send_initial_metadata.metadata = + pc->p2s_initial_metadata.metadata; + refpc(pc, "on_c2p_sent_initial_metadata"); + err = grpc_call_start_batch(pc->c2p, &op, 1, + new_closure(on_c2p_sent_initial_metadata, pc), + nullptr); + CHECK_EQ(err, GRPC_CALL_OK); + } + grpc_op* deferred_trailing_metadata_op = nullptr; + { + grpc_core::MutexLock lock(pc->initial_metadata_mu); + // Start the batch without the mutex held, just in case. + // This will be nullptr if the trailing metadata has not yet been seen. + deferred_trailing_metadata_op = pc->deferred_trailing_metadata_op; + pc->p2s_initial_metadata_received = true; + } + if (deferred_trailing_metadata_op != nullptr) { + refpc(pc, "on_c2p_sent_status"); + err = grpc_call_start_batch(pc->c2p, deferred_trailing_metadata_op, 1, + new_closure(on_c2p_sent_status, pc), nullptr); + CHECK_EQ(err, GRPC_CALL_OK); + } } - unrefpc(pc, "on_p2s_recv_initial_metadata"); } @@ -308,11 +340,6 @@ static void on_p2s_recv_msg(void* arg, int success) { unrefpc(pc, "on_p2s_recv_msg"); } -static void on_c2p_sent_status(void* arg, int /*success*/) { - proxy_call* pc = static_cast(arg); - unrefpc(pc, "on_c2p_sent_status"); -} - static void on_p2s_status(void* arg, int success) { proxy_call* pc = static_cast(arg); grpc_op op[2]; // Possibly send empty initial metadata also if trailers-only @@ -340,10 +367,29 @@ static void on_p2s_status(void* arg, int success) { op[op_count].data.send_status_from_server.status_details = &pc->p2s_status_details; op_count++; - refpc(pc, "on_c2p_sent_status"); - err = grpc_call_start_batch(pc->c2p, op, op_count, - new_closure(on_c2p_sent_status, pc), nullptr); - CHECK_EQ(err, GRPC_CALL_OK); + + // TODO(ctiller): The current core implementation requires initial + // metadata batches to be started *after* initial metadata batches have + // been completed. The C++ Callback API does this accounting too, for + // example. + // + // This entire fixture will need a redesign when the batch API goes away. + bool op_deferred = false; + { + grpc_core::MutexLock lock(pc->initial_metadata_mu); + if (!pc->p2s_initial_metadata_received) { + op_deferred = true; + pc->deferred_trailing_metadata_op = + static_cast(gpr_malloc(sizeof(op))); + memcpy(pc->deferred_trailing_metadata_op, &op, sizeof(op)); + } + } + if (!op_deferred) { + refpc(pc, "on_c2p_sent_status"); + err = grpc_call_start_batch(pc->c2p, op, op_count, + new_closure(on_c2p_sent_status, pc), nullptr); + CHECK_EQ(err, GRPC_CALL_OK); + } } unrefpc(pc, "on_p2s_status"); @@ -365,6 +411,12 @@ static void on_new_call(void* arg, int success) { memset(pc, 0, sizeof(*pc)); pc->proxy = proxy; std::swap(pc->c2p_initial_metadata, proxy->new_call_metadata); + pc->initial_metadata_mu = new grpc_core::Mutex(); + { + grpc_core::MutexLock lock(pc->initial_metadata_mu); + pc->p2s_initial_metadata_received = false; + pc->deferred_trailing_metadata_op = nullptr; + } pc->c2p = proxy->new_call; pc->p2s = grpc_channel_create_call( proxy->client, pc->c2p, GRPC_PROPAGATE_DEFAULTS, proxy->cq, @@ -374,6 +426,7 @@ static void on_new_call(void* arg, int success) { op.reserved = nullptr; + // Proxy: receive initial metadata from the server op.op = GRPC_OP_RECV_INITIAL_METADATA; op.flags = 0; op.data.recv_initial_metadata.recv_initial_metadata = @@ -384,6 +437,7 @@ static void on_new_call(void* arg, int success) { nullptr); CHECK_EQ(err, GRPC_CALL_OK); + // Proxy: send initial metadata to the server op.op = GRPC_OP_SEND_INITIAL_METADATA; op.flags = 0; op.data.send_initial_metadata.count = pc->c2p_initial_metadata.count; @@ -394,6 +448,7 @@ static void on_new_call(void* arg, int success) { nullptr); CHECK_EQ(err, GRPC_CALL_OK); + // Client: receive message from the proxy op.op = GRPC_OP_RECV_MESSAGE; op.flags = 0; op.data.recv_message.recv_message = &pc->c2p_msg; @@ -402,6 +457,7 @@ static void on_new_call(void* arg, int success) { new_closure(on_c2p_recv_msg, pc), nullptr); CHECK_EQ(err, GRPC_CALL_OK); + // Proxy: receive message from the server op.op = GRPC_OP_RECV_MESSAGE; op.flags = 0; op.data.recv_message.recv_message = &pc->p2s_msg; @@ -410,6 +466,7 @@ static void on_new_call(void* arg, int success) { new_closure(on_p2s_recv_msg, pc), nullptr); CHECK_EQ(err, GRPC_CALL_OK); + // Proxy: receive status from the server op.op = GRPC_OP_RECV_STATUS_ON_CLIENT; op.flags = 0; op.data.recv_status_on_client.trailing_metadata = @@ -421,6 +478,7 @@ static void on_new_call(void* arg, int success) { nullptr); CHECK_EQ(err, GRPC_CALL_OK); + // Client: receive close-ack from the proxy op.op = GRPC_OP_RECV_CLOSE_ON_SERVER; op.flags = 0; op.data.recv_close_on_server.cancelled = &pc->c2p_server_cancelled; From 48aa0c85ff5282b0f918afd99f563d53cc542816 Mon Sep 17 00:00:00 2001 From: Hannah Shi Date: Wed, 18 Sep 2024 10:27:50 -0700 Subject: [PATCH 20/30] [ObjC] increase objc example build timeout to 1h (#37747) 20min is often not enough to build these samples. timeout log: https://btx.cloud.google.com/invocations/f48a9835-6e92-4651-b649-21a98a5dc0c3/targets Closes #37747 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37747 from HannahShiSFB:bump-build-objc-example-timeout 8f2f027798946e6c267fea23b85446b2e2344da5 PiperOrigin-RevId: 676042240 --- tools/run_tests/run_tests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 8f265a34540..16f05533882 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -1113,7 +1113,7 @@ class ObjCLanguage(object): out.append( self.config.job_spec( ["src/objective-c/tests/build_one_example.sh"], - timeout_seconds=20 * 60, + timeout_seconds=60 * 60, shortname="ios-buildtest-example-sample", cpu_cost=1e6, environ={ @@ -1126,7 +1126,7 @@ class ObjCLanguage(object): out.append( self.config.job_spec( ["src/objective-c/tests/build_one_example.sh"], - timeout_seconds=20 * 60, + timeout_seconds=60 * 60, shortname="ios-buildtest-example-switftsample", cpu_cost=1e6, environ={ @@ -1138,7 +1138,7 @@ class ObjCLanguage(object): out.append( self.config.job_spec( ["src/objective-c/tests/build_one_example.sh"], - timeout_seconds=20 * 60, + timeout_seconds=60 * 60, shortname="ios-buildtest-example-switft-use-frameworks", cpu_cost=1e6, environ={ From e3aa78868fde1b55cd61387909e4fc1f984e851d Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Wed, 18 Sep 2024 20:51:23 -0700 Subject: [PATCH 21/30] [chaotic-good] Fix race between call finishing and adding to the stream map (#37749) Previously, if we pulled server trailing metadata *before* the call was added to the client transport then we'd never call `on_done_` on the spine and consequently never remove the call from the map. This change fixes that edge case. In fixing it, I noticed a state in `CallState` that was both complicating the fix and completely irrelevant because we respecced earlier this year to say that ServerTrailingMetadata processing cannot be asynchronous, so I'm removing that state also. Closes #37749 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37749 from ctiller:flake-fightas-11 847814a286c4e9606b747ac3e33fd1fbd96ad4eb PiperOrigin-RevId: 676246259 --- .../chaotic_good/client_transport.cc | 64 +++++++++++-------- .../chaotic_good/server_transport.cc | 7 +- src/core/lib/transport/call_filters.h | 5 +- src/core/lib/transport/call_spine.h | 24 ++++--- src/core/lib/transport/call_state.h | 55 ++++++---------- test/core/transport/call_state_test.cc | 6 -- 6 files changed, 81 insertions(+), 80 deletions(-) diff --git a/src/core/ext/transport/chaotic_good/client_transport.cc b/src/core/ext/transport/chaotic_good/client_transport.cc index 3249ff33b3a..2c2c208f31d 100644 --- a/src/core/ext/transport/chaotic_good/client_transport.cc +++ b/src/core/ext/transport/chaotic_good/client_transport.cc @@ -250,19 +250,20 @@ void ChaoticGoodClientTransport::AbortWithError() { } uint32_t ChaoticGoodClientTransport::MakeStream(CallHandler call_handler) { - ReleasableMutexLock lock(&mu_); + MutexLock lock(&mu_); const uint32_t stream_id = next_stream_id_++; + const bool on_done_added = + call_handler.OnDone([self = RefAsSubclass(), + stream_id](bool cancelled) { + if (cancelled) { + self->outgoing_frames_.MakeSender().UnbufferedImmediateSend( + CancelFrame{stream_id}); + } + MutexLock lock(&self->mu_); + self->stream_map_.erase(stream_id); + }); + if (!on_done_added) return 0; stream_map_.emplace(stream_id, call_handler); - lock.Release(); - call_handler.OnDone([self = RefAsSubclass(), - stream_id](bool cancelled) { - if (cancelled) { - self->outgoing_frames_.MakeSender().UnbufferedImmediateSend( - CancelFrame{stream_id}); - } - MutexLock lock(&self->mu_); - self->stream_map_.erase(stream_id); - }); return stream_id; } @@ -322,23 +323,30 @@ void ChaoticGoodClientTransport::StartCall(CallHandler call_handler) { "outbound_loop", [self = RefAsSubclass(), call_handler]() mutable { const uint32_t stream_id = self->MakeStream(call_handler); - return Map( - self->CallOutboundLoop(stream_id, call_handler), - [stream_id, sender = self->outgoing_frames_.MakeSender()]( - absl::Status result) mutable { - GRPC_TRACE_LOG(chaotic_good, INFO) - << "CHAOTIC_GOOD: Call " << stream_id << " finished with " - << result.ToString(); - if (!result.ok()) { - GRPC_TRACE_LOG(chaotic_good, INFO) - << "CHAOTIC_GOOD: Send cancel"; - if (!sender.UnbufferedImmediateSend(CancelFrame{stream_id})) { - GRPC_TRACE_LOG(chaotic_good, INFO) - << "CHAOTIC_GOOD: Send cancel failed"; - } - } - return result; - }); + return If( + stream_id != 0, + [stream_id, call_handler = std::move(call_handler), + self = std::move(self)]() { + return Map( + self->CallOutboundLoop(stream_id, call_handler), + [stream_id, sender = self->outgoing_frames_.MakeSender()]( + absl::Status result) mutable { + GRPC_TRACE_LOG(chaotic_good, INFO) + << "CHAOTIC_GOOD: Call " << stream_id + << " finished with " << result.ToString(); + if (!result.ok()) { + GRPC_TRACE_LOG(chaotic_good, INFO) + << "CHAOTIC_GOOD: Send cancel"; + if (!sender.UnbufferedImmediateSend( + CancelFrame{stream_id})) { + GRPC_TRACE_LOG(chaotic_good, INFO) + << "CHAOTIC_GOOD: Send cancel failed"; + } + } + return result; + }); + }, + []() { return absl::OkStatus(); }); }); } diff --git a/src/core/ext/transport/chaotic_good/server_transport.cc b/src/core/ext/transport/chaotic_good/server_transport.cc index d6c5faf3574..0261223e823 100644 --- a/src/core/ext/transport/chaotic_good/server_transport.cc +++ b/src/core/ext/transport/chaotic_good/server_transport.cc @@ -439,8 +439,7 @@ absl::Status ChaoticGoodServerTransport::NewStream( if (stream_id <= last_seen_new_stream_id_) { return absl::InternalError("Stream id is not increasing"); } - stream_map_.emplace(stream_id, call_initiator); - call_initiator.OnDone( + const bool on_done_added = call_initiator.OnDone( [self = RefAsSubclass(), stream_id](bool) { GRPC_TRACE_LOG(chaotic_good, INFO) << "CHAOTIC_GOOD " << self.get() << " OnDone " << stream_id; @@ -454,6 +453,10 @@ absl::Status ChaoticGoodServerTransport::NewStream( }); } }); + if (!on_done_added) { + return absl::CancelledError(); + } + stream_map_.emplace(stream_id, call_initiator); return absl::OkStatus(); } diff --git a/src/core/lib/transport/call_filters.h b/src/core/lib/transport/call_filters.h index 1cbe428de5f..7f2b0b2f3a6 100644 --- a/src/core/lib/transport/call_filters.h +++ b/src/core/lib/transport/call_filters.h @@ -1485,7 +1485,6 @@ class CallFilters { std::move(value)); } } - call_state_.FinishPullServerTrailingMetadata(); return value; }); } @@ -1497,6 +1496,10 @@ class CallFilters { GRPC_MUST_USE_RESULT auto WasCancelled() { return [this]() { return call_state_.PollWasCancelled(); }; } + // Returns true if server trailing metadata has been pulled + bool WasServerTrailingMetadataPulled() const { + return call_state_.WasServerTrailingMetadataPulled(); + } // Client & server: fill in final_info with the final status of the call. void Finalize(const grpc_call_final_info* final_info); diff --git a/src/core/lib/transport/call_spine.h b/src/core/lib/transport/call_spine.h index 99944b301fc..b1051049a43 100644 --- a/src/core/lib/transport/call_spine.h +++ b/src/core/lib/transport/call_spine.h @@ -54,17 +54,23 @@ class CallSpine final : public Party { CallFilters& call_filters() { return call_filters_; } - // Add a callback to be called when server trailing metadata is received. - void OnDone(absl::AnyInvocable fn) { + // Add a callback to be called when server trailing metadata is received and + // return true. + // If CallOnDone has already been invoked, does nothing and returns false. + GRPC_MUST_USE_RESULT bool OnDone(absl::AnyInvocable fn) { + if (call_filters().WasServerTrailingMetadataPulled()) { + return false; + } if (on_done_ == nullptr) { on_done_ = std::move(fn); - return; + return true; } on_done_ = [first = std::move(fn), next = std::move(on_done_)](bool cancelled) mutable { first(cancelled); next(cancelled); }; + return true; } void CallOnDone(bool cancelled) { if (on_done_ != nullptr) std::exchange(on_done_, nullptr)(cancelled); @@ -232,8 +238,8 @@ class CallInitiator { spine_->PushServerTrailingMetadata(std::move(status)); } - void OnDone(absl::AnyInvocable fn) { - spine_->OnDone(std::move(fn)); + GRPC_MUST_USE_RESULT bool OnDone(absl::AnyInvocable fn) { + return spine_->OnDone(std::move(fn)); } template @@ -281,8 +287,8 @@ class CallHandler { spine_->PushServerTrailingMetadata(std::move(status)); } - void OnDone(absl::AnyInvocable fn) { - spine_->OnDone(std::move(fn)); + GRPC_MUST_USE_RESULT bool OnDone(absl::AnyInvocable fn) { + return spine_->OnDone(std::move(fn)); } template @@ -336,8 +342,8 @@ class UnstartedCallHandler { spine_->PushServerTrailingMetadata(std::move(status)); } - void OnDone(absl::AnyInvocable fn) { - spine_->OnDone(std::move(fn)); + GRPC_MUST_USE_RESULT bool OnDone(absl::AnyInvocable fn) { + return spine_->OnDone(std::move(fn)); } template diff --git a/src/core/lib/transport/call_state.h b/src/core/lib/transport/call_state.h index 3e9acd99c16..67facf8c007 100644 --- a/src/core/lib/transport/call_state.h +++ b/src/core/lib/transport/call_state.h @@ -52,7 +52,7 @@ class CallState { Poll> PollPullServerToClientMessageAvailable(); void FinishPullServerToClientMessage(); Poll PollServerTrailingMetadataAvailable(); - void FinishPullServerTrailingMetadata(); + bool WasServerTrailingMetadataPulled() const; Poll PollWasCancelled(); // Debug std::string DebugString() const; @@ -147,8 +147,6 @@ class CallState { kReading, // Main call loop: processing one message kProcessingServerToClientMessage, - // Processing server trailing metadata - kProcessingServerTrailingMetadata, kTerminated, }; static const char* ServerToClientPullStateString( @@ -172,8 +170,6 @@ class CallState { return "Reading"; case ServerToClientPullState::kProcessingServerToClientMessage: return "ProcessingServerToClientMessage"; - case ServerToClientPullState::kProcessingServerTrailingMetadata: - return "ProcessingServerTrailingMetadata"; case ServerToClientPullState::kTerminated: return "Terminated"; } @@ -294,7 +290,6 @@ GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline void CallState::Start() { case ServerToClientPullState::kReading: case ServerToClientPullState::kProcessingServerToClientMessage: LOG(FATAL) << "Start called twice"; - case ServerToClientPullState::kProcessingServerTrailingMetadata: case ServerToClientPullState::kTerminated: break; } @@ -644,7 +639,6 @@ CallState::PollPullServerInitialMetadataAvailable() { case ServerToClientPullState::kIdle: case ServerToClientPullState::kReading: case ServerToClientPullState::kProcessingServerToClientMessage: - case ServerToClientPullState::kProcessingServerTrailingMetadata: LOG(FATAL) << "PollPullServerInitialMetadataAvailable called twice"; case ServerToClientPullState::kTerminated: return false; @@ -703,7 +697,6 @@ CallState::FinishPullServerInitialMetadata() { case ServerToClientPullState::kIdle: case ServerToClientPullState::kReading: case ServerToClientPullState::kProcessingServerToClientMessage: - case ServerToClientPullState::kProcessingServerTrailingMetadata: LOG(FATAL) << "Out of order FinishPullServerInitialMetadata"; case ServerToClientPullState::kTerminated: return; @@ -766,9 +759,6 @@ CallState::PollPullServerToClientMessageAvailable() { case ServerToClientPullState::kProcessingServerToClientMessage: LOG(FATAL) << "PollPullServerToClientMessageAvailable called while " "processing a message"; - case ServerToClientPullState::kProcessingServerTrailingMetadata: - LOG(FATAL) << "PollPullServerToClientMessageAvailable called while " - "processing trailing metadata"; case ServerToClientPullState::kTerminated: return Failure{}; } @@ -826,9 +816,6 @@ CallState::FinishPullServerToClientMessage() { server_to_client_pull_state_ = ServerToClientPullState::kIdle; server_to_client_pull_waiter_.Wake(); break; - case ServerToClientPullState::kProcessingServerTrailingMetadata: - LOG(FATAL) << "FinishPullServerToClientMessage called while processing " - "trailing metadata"; case ServerToClientPullState::kTerminated: break; } @@ -875,10 +862,7 @@ CallState::PollServerTrailingMetadataAvailable() { case ServerToClientPushState::kFinished: if (server_trailing_metadata_state_ != ServerTrailingMetadataState::kNotPushed) { - server_to_client_pull_state_ = - ServerToClientPullState::kProcessingServerTrailingMetadata; - server_to_client_pull_waiter_.Wake(); - return Empty{}; + break; // Ready for processing } ABSL_FALLTHROUGH_INTENDED; case ServerToClientPushState::kPushedServerInitialMetadata: @@ -894,26 +878,14 @@ CallState::PollServerTrailingMetadataAvailable() { case ServerToClientPullState::kIdle: if (server_trailing_metadata_state_ != ServerTrailingMetadataState::kNotPushed) { - server_to_client_pull_state_ = - ServerToClientPullState::kProcessingServerTrailingMetadata; - server_to_client_pull_waiter_.Wake(); - return Empty{}; + break; // Ready for processing } return server_trailing_metadata_waiter_.pending(); - case ServerToClientPullState::kProcessingServerTrailingMetadata: - LOG(FATAL) << "PollServerTrailingMetadataAvailable called twice"; case ServerToClientPullState::kTerminated: - return Empty{}; + break; } - Crash("Unreachable"); -} - -GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline void -CallState::FinishPullServerTrailingMetadata() { - GRPC_TRACE_LOG(call_state, INFO) - << "[call_state] FinishPullServerTrailingMetadata: " - << GRPC_DUMP_ARGS(this, server_trailing_metadata_state_, - server_trailing_metadata_waiter_.DebugString()); + server_to_client_pull_state_ = ServerToClientPullState::kTerminated; + server_to_client_pull_waiter_.Wake(); switch (server_trailing_metadata_state_) { case ServerTrailingMetadataState::kNotPushed: LOG(FATAL) << "FinishPullServerTrailingMetadata called before " @@ -931,6 +903,21 @@ CallState::FinishPullServerTrailingMetadata() { case ServerTrailingMetadataState::kPulledCancel: LOG(FATAL) << "FinishPullServerTrailingMetadata called twice"; } + return Empty{}; +} + +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool +CallState::WasServerTrailingMetadataPulled() const { + switch (server_trailing_metadata_state_) { + case ServerTrailingMetadataState::kNotPushed: + case ServerTrailingMetadataState::kPushed: + case ServerTrailingMetadataState::kPushedCancel: + return false; + case ServerTrailingMetadataState::kPulled: + case ServerTrailingMetadataState::kPulledCancel: + return true; + } + GPR_UNREACHABLE_CODE(Crash("unreachable")); } GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline Poll diff --git a/test/core/transport/call_state_test.cc b/test/core/transport/call_state_test.cc index cc35b5b7ec5..c8dcca2825b 100644 --- a/test/core/transport/call_state_test.cc +++ b/test/core/transport/call_state_test.cc @@ -245,7 +245,6 @@ TEST(CallStateTest, ReceiveTrailersOnly) { EXPECT_THAT(state.PollPullServerInitialMetadataAvailable(), IsReady(false)); state.FinishPullServerInitialMetadata(); EXPECT_THAT(state.PollServerTrailingMetadataAvailable(), IsReady()); - state.FinishPullServerTrailingMetadata(); } TEST(CallStateTest, ReceiveTrailersOnlySkipsInitialMetadataOnUnstartedCalls) { @@ -256,7 +255,6 @@ TEST(CallStateTest, ReceiveTrailersOnlySkipsInitialMetadataOnUnstartedCalls) { EXPECT_THAT(state.PollPullServerInitialMetadataAvailable(), IsReady(false)); state.FinishPullServerInitialMetadata(); EXPECT_THAT(state.PollServerTrailingMetadataAvailable(), IsReady()); - state.FinishPullServerTrailingMetadata(); } TEST(CallStateTest, RecallNoCancellation) { @@ -268,8 +266,6 @@ TEST(CallStateTest, RecallNoCancellation) { EXPECT_THAT(state.PollPullServerInitialMetadataAvailable(), IsReady(false)); state.FinishPullServerInitialMetadata(); EXPECT_THAT(state.PollServerTrailingMetadataAvailable(), IsReady()); - EXPECT_THAT(state.PollWasCancelled(), IsPending()); - EXPECT_WAKEUP(activity, state.FinishPullServerTrailingMetadata()); EXPECT_THAT(state.PollWasCancelled(), IsReady(false)); } @@ -282,8 +278,6 @@ TEST(CallStateTest, RecallCancellation) { EXPECT_THAT(state.PollPullServerInitialMetadataAvailable(), IsReady(false)); state.FinishPullServerInitialMetadata(); EXPECT_THAT(state.PollServerTrailingMetadataAvailable(), IsReady()); - EXPECT_THAT(state.PollWasCancelled(), IsPending()); - EXPECT_WAKEUP(activity, state.FinishPullServerTrailingMetadata()); EXPECT_THAT(state.PollWasCancelled(), IsReady(true)); } From e0c6055d21b40ed0baccd38472f4c6d7acc517ea Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Wed, 18 Sep 2024 21:25:24 -0700 Subject: [PATCH 22/30] [party] Fix bad log line (#37750) This log line was printing an incorrect new state, and that led me down a multi-hour garden path whereby I was fixing a bug that did not exist. Closes #37750 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37750 from ctiller:flake-fightas-12 020dd7379c498a072fe7e0063e3e08a7c73f2441 PiperOrigin-RevId: 676253730 --- src/core/lib/promise/party.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/lib/promise/party.cc b/src/core/lib/promise/party.cc index 1fbc01fd3da..aaa273d16a2 100644 --- a/src/core/lib/promise/party.cc +++ b/src/core/lib/promise/party.cc @@ -322,7 +322,7 @@ void Party::RunPartyAndUnref(uint64_t prev_state) { (prev_state & (kRefMask | keep_allocated_mask)) - kOneRef, std::memory_order_acq_rel, std::memory_order_acquire)) { LogStateChange("Run:End", prev_state, - prev_state & (kRefMask | kAllocatedMask) - kOneRef); + (prev_state & (kRefMask | keep_allocated_mask)) - kOneRef); if ((prev_state & kRefMask) == kOneRef) { // We're done with the party. PartyIsOver(); From 4b53c2bac3bfd17c6f9ab9f790d63b8c9d5fea67 Mon Sep 17 00:00:00 2001 From: Yousuk Seung Date: Thu, 19 Sep 2024 10:33:02 -0700 Subject: [PATCH 23/30] Don't grab GIL from C-Core during shutdown (#37762) MetadataPluginCallCredentials passes a function pointer to C-core to be called during destruction. This function grabs GIL which may race between GIL destruction during process shutdown. Since GIL destruction happens after Python's exit handlers, we cana mark that Python is shutting down from an exit handler and don't grab GIL in this function afterwards using a C mutex. Closes #37762 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37762 from yousukseung:gil-shutdown 945eca9c6ad89031f87ef16bd8be397bac7d94fe PiperOrigin-RevId: 676471627 --- .../grpc/_cython/_cygrpc/credentials.pyx.pxi | 38 ++++++++++++++++++- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi index 181704cb85a..0f9f3f629a0 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import atexit def _spawn_callback_in_thread(cb_func, args): t = ForkManagedThread(target=cb_func, args=args) @@ -65,11 +66,43 @@ cdef int _get_metadata(void *state, return 0 # Asynchronous return -cdef void _destroy(void *state) except * with gil: - cpython.Py_DECREF(state) +# Protects access to GIL from _destroy() and to g_shutting_down. +cdef mutex g_shutdown_mu +cdef int g_shutting_down = 0 + +# This is called by C-core when the plugin is destroyed, which may race between +# GIL destruction during process shutdown. Since GIL destruction happens after +# Python's exit handlers, we mark that Python is shutting down from an exit +# handler and don't grab GIL in this function afterwards using a C mutex. +# Access to g_shutting_down and GIL must be mutex protected here. +cdef void _destroy(void *state) nogil: + global g_shutdown_mu + global g_shutting_down + g_shutdown_mu.lock() + if g_shutting_down == 0: + with gil: + cpython.Py_DECREF(state) + g_shutdown_mu.unlock() grpc_shutdown() +g_shutdown_handler_registered = False + +def _maybe_register_shutdown_handler(): + global g_shutdown_handler_registered + if g_shutdown_handler_registered: + return + g_shutdown_handler_registered = True + atexit.register(_on_shutdown) + +def _on_shutdown(): + global g_shutdown_mu + global g_shutting_down + g_shutdown_mu.lock() + g_shutting_down = 1 + g_shutdown_mu.unlock() + + cdef class MetadataPluginCallCredentials(CallCredentials): def __cinit__(self, metadata_plugin, name): @@ -83,6 +116,7 @@ cdef class MetadataPluginCallCredentials(CallCredentials): c_metadata_plugin.state = self._metadata_plugin c_metadata_plugin.type = self._name cpython.Py_INCREF(self._metadata_plugin) + _maybe_register_shutdown_handler() fork_handlers_and_grpc_init() # TODO(yihuazhang): Expose min_security_level via the Python API so that # applications can decide what minimum security level their plugins require. From 656f325b53029374f121e8bc2c5ce6b2091fc19b Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Thu, 19 Sep 2024 11:33:32 -0700 Subject: [PATCH 24/30] [HealthCheck] Make status message better (#37724) Closes #37724 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37724 from yashykt:PickFirstHealthWatchErrorMsg fc09a026bbb36a2a4a3f01f1cf18818f63ee83da PiperOrigin-RevId: 676497230 --- src/core/BUILD | 5 +++- src/core/client_channel/client_channel.cc | 2 ++ .../client_channel/client_channel_filter.cc | 3 ++ src/core/client_channel/subchannel.h | 6 +++- .../load_balancing/health_check_client.cc | 6 ++-- .../outlier_detection/outlier_detection.cc | 29 ++++++++++++------- .../load_balancing/pick_first/pick_first.cc | 12 ++++---- .../load_balancing/subchannel_interface.h | 8 +++++ .../bm_load_balanced_call_destination.cc | 2 ++ .../load_balanced_call_destination_test.cc | 2 ++ test/core/load_balancing/bm_picker.cc | 2 ++ test/core/load_balancing/lb_policy_test_lib.h | 2 ++ 12 files changed, 57 insertions(+), 22 deletions(-) diff --git a/src/core/BUILD b/src/core/BUILD index dee69ed3bd7..b10dbc28550 100644 --- a/src/core/BUILD +++ b/src/core/BUILD @@ -3606,7 +3606,10 @@ grpc_cc_library( grpc_cc_library( name = "subchannel_interface", hdrs = ["load_balancing/subchannel_interface.h"], - external_deps = ["absl/status"], + external_deps = [ + "absl/status", + "absl/strings", + ], deps = [ "dual_ref_counted", "iomgr_fwd", diff --git a/src/core/client_channel/client_channel.cc b/src/core/client_channel/client_channel.cc index f700b39463e..d2f3dd5858a 100644 --- a/src/core/client_channel/client_channel.cc +++ b/src/core/client_channel/client_channel.cc @@ -57,6 +57,7 @@ #include "src/core/client_channel/subchannel.h" #include "src/core/client_channel/subchannel_interface_internal.h" #include "src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h" +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/status_util.h" #include "src/core/lib/config/core_configuration.h" @@ -167,6 +168,7 @@ class ClientChannel::SubchannelWrapper void CancelDataWatcher(DataWatcherInterface* watcher) override ABSL_EXCLUSIVE_LOCKS_REQUIRED(*client_channel_->work_serializer_); void ThrottleKeepaliveTime(int new_keepalive_time); + std::string address() const override { return subchannel_->address(); } private: class WatcherWrapper; diff --git a/src/core/client_channel/client_channel_filter.cc b/src/core/client_channel/client_channel_filter.cc index 70ef58f52ca..6252be05b8e 100644 --- a/src/core/client_channel/client_channel_filter.cc +++ b/src/core/client_channel/client_channel_filter.cc @@ -63,6 +63,7 @@ #include "src/core/client_channel/subchannel.h" #include "src/core/client_channel/subchannel_interface_internal.h" #include "src/core/handshaker/proxy_mapper_registry.h" +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/status_util.h" @@ -616,6 +617,8 @@ class ClientChannelFilter::SubchannelWrapper final subchannel_->ThrottleKeepaliveTime(new_keepalive_time); } + std::string address() const override { return subchannel_->address(); } + private: // This wrapper provides a bridge between the internal Subchannel API // and the SubchannelInterface API that we expose to LB policies. diff --git a/src/core/client_channel/subchannel.h b/src/core/client_channel/subchannel.h index 6ae44a5675e..502df2b4844 100644 --- a/src/core/client_channel/subchannel.h +++ b/src/core/client_channel/subchannel.h @@ -33,6 +33,7 @@ #include "src/core/client_channel/connector.h" #include "src/core/client_channel/subchannel_pool_interface.h" +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/backoff/backoff.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" @@ -215,7 +216,10 @@ class Subchannel final : public DualRefCounted { channelz::SubchannelNode* channelz_node(); - const grpc_resolved_address& address() const { return key_.address(); } + std::string address() const { + return grpc_sockaddr_to_uri(&key_.address()) + .value_or(""); + } // Starts watching the subchannel's connectivity state. // The first callback to the watcher will be delivered ~immediately. diff --git a/src/core/load_balancing/health_check_client.cc b/src/core/load_balancing/health_check_client.cc index 430c59f28f5..3dd0cefb202 100644 --- a/src/core/load_balancing/health_check_client.cc +++ b/src/core/load_balancing/health_check_client.cc @@ -166,11 +166,9 @@ void HealthProducer::HealthChecker::OnHealthWatchStatusChange( // Prepend the subchannel's address to the status if needed. absl::Status use_status; if (!status.ok()) { - std::string address_str = - grpc_sockaddr_to_uri(&producer_->subchannel_->address()) - .value_or(""); use_status = absl::Status( - status.code(), absl::StrCat(address_str, ": ", status.message())); + status.code(), absl::StrCat(producer_->subchannel_->address(), ": ", + status.message())); } work_serializer_->Schedule( [self = Ref(), state, status = std::move(use_status)]() mutable { diff --git a/src/core/load_balancing/outlier_detection/outlier_detection.cc b/src/core/load_balancing/outlier_detection/outlier_detection.cc index 87cffdefe81..bc5a2a01aa8 100644 --- a/src/core/load_balancing/outlier_detection/outlier_detection.cc +++ b/src/core/load_balancing/outlier_detection/outlier_detection.cc @@ -159,11 +159,14 @@ class OutlierDetectionLb final : public LoadBalancingPolicy { class WatcherWrapper final : public SubchannelInterface::ConnectivityStateWatcherInterface { public: - WatcherWrapper(std::shared_ptr< + WatcherWrapper(WeakRefCountedPtr subchannel_wrapper, + std::shared_ptr< SubchannelInterface::ConnectivityStateWatcherInterface> health_watcher, bool ejected) - : watcher_(std::move(health_watcher)), ejected_(ejected) {} + : subchannel_wrapper_(std::move(subchannel_wrapper)), + watcher_(std::move(health_watcher)), + ejected_(ejected) {} void Eject() { ejected_ = true; @@ -171,7 +174,8 @@ class OutlierDetectionLb final : public LoadBalancingPolicy { watcher_->OnConnectivityStateChange( GRPC_CHANNEL_TRANSIENT_FAILURE, absl::UnavailableError( - "subchannel ejected by outlier detection")); + absl::StrCat(subchannel_wrapper_->address(), + ": subchannel ejected by outlier detection"))); } } @@ -192,7 +196,8 @@ class OutlierDetectionLb final : public LoadBalancingPolicy { if (ejected_) { new_state = GRPC_CHANNEL_TRANSIENT_FAILURE; status = absl::UnavailableError( - "subchannel ejected by outlier detection"); + absl::StrCat(subchannel_wrapper_->address(), + ": subchannel ejected by outlier detection")); } watcher_->OnConnectivityStateChange(new_state, status); } @@ -203,6 +208,7 @@ class OutlierDetectionLb final : public LoadBalancingPolicy { } private: + WeakRefCountedPtr subchannel_wrapper_; std::shared_ptr watcher_; absl::optional last_seen_state_; @@ -463,7 +469,8 @@ void OutlierDetectionLb::SubchannelWrapper::AddDataWatcher( if (w->type() == HealthProducer::Type()) { auto* health_watcher = static_cast(watcher.get()); auto watcher_wrapper = std::make_shared( - health_watcher->TakeWatcher(), ejected_); + WeakRefAsSubclass(), health_watcher->TakeWatcher(), + ejected_); watcher_wrapper_ = watcher_wrapper.get(); health_watcher->SetWatcher(std::move(watcher_wrapper)); } @@ -534,8 +541,8 @@ OutlierDetectionLb::Picker::Picker(OutlierDetectionLb* outlier_detection_lb, : picker_(std::move(picker)), counting_enabled_(counting_enabled) { GRPC_TRACE_LOG(outlier_detection_lb, INFO) << "[outlier_detection_lb " << outlier_detection_lb - << "] constructed new picker " << this << " and counting " - << "is " << (counting_enabled ? "enabled" : "disabled"); + << "] constructed new picker " << this << " and counting " << "is " + << (counting_enabled ? "enabled" : "disabled"); } LoadBalancingPolicy::PickResult OutlierDetectionLb::Picker::Pick( @@ -904,8 +911,8 @@ void OutlierDetectionLb::EjectionTimer::OnTimerLocked() { config.success_rate_ejection->minimum_hosts) { GRPC_TRACE_LOG(outlier_detection_lb, INFO) << "[outlier_detection_lb " << parent_.get() - << "] running success rate algorithm: " - << "stdev_factor=" << config.success_rate_ejection->stdev_factor + << "] running success rate algorithm: " << "stdev_factor=" + << config.success_rate_ejection->stdev_factor << ", enforcement_percentage=" << config.success_rate_ejection->enforcement_percentage; // calculate ejection threshold: (mean - stdev * @@ -957,8 +964,8 @@ void OutlierDetectionLb::EjectionTimer::OnTimerLocked() { config.failure_percentage_ejection->minimum_hosts) { GRPC_TRACE_LOG(outlier_detection_lb, INFO) << "[outlier_detection_lb " << parent_.get() - << "] running failure percentage algorithm: " - << "threshold=" << config.failure_percentage_ejection->threshold + << "] running failure percentage algorithm: " << "threshold=" + << config.failure_percentage_ejection->threshold << ", enforcement_percentage=" << config.failure_percentage_ejection->enforcement_percentage; for (auto& candidate : failure_percentage_ejection_candidates) { diff --git a/src/core/load_balancing/pick_first/pick_first.cc b/src/core/load_balancing/pick_first/pick_first.cc index c63424cada4..430b150d312 100644 --- a/src/core/load_balancing/pick_first/pick_first.cc +++ b/src/core/load_balancing/pick_first/pick_first.cc @@ -648,7 +648,8 @@ void PickFirst::HealthWatcher::OnConnectivityStateChange( case GRPC_CHANNEL_TRANSIENT_FAILURE: policy_->channel_control_helper()->UpdateState( GRPC_CHANNEL_TRANSIENT_FAILURE, status, - MakeRefCounted(status)); + MakeRefCounted(absl::UnavailableError( + absl::StrCat("health watch: ", status.message())))); break; case GRPC_CHANNEL_SHUTDOWN: Crash("health watcher reported state SHUTDOWN"); @@ -1552,7 +1553,8 @@ void OldPickFirst::HealthWatcher::OnConnectivityStateChange( case GRPC_CHANNEL_TRANSIENT_FAILURE: policy_->channel_control_helper()->UpdateState( GRPC_CHANNEL_TRANSIENT_FAILURE, status, - MakeRefCounted(status)); + MakeRefCounted(absl::UnavailableError( + absl::StrCat("health watch: ", status.message())))); break; case GRPC_CHANNEL_SHUTDOWN: Crash("health watcher reported state SHUTDOWN"); @@ -1644,9 +1646,9 @@ void OldPickFirst::SubchannelList::SubchannelData::OnConnectivityStateChange( // If there is a pending update, switch to the pending update. if (p->latest_pending_subchannel_list_ != nullptr) { GRPC_TRACE_LOG(pick_first, INFO) - << "Pick First " << p << " promoting pending subchannel " - << "list " << p->latest_pending_subchannel_list_.get() - << " to replace " << p->subchannel_list_.get(); + << "Pick First " << p << " promoting pending subchannel list " + << p->latest_pending_subchannel_list_.get() << " to replace " + << p->subchannel_list_.get(); p->UnsetSelectedSubchannel(); p->subchannel_list_ = std::move(p->latest_pending_subchannel_list_); // Set our state to that of the pending subchannel list. diff --git a/src/core/load_balancing/subchannel_interface.h b/src/core/load_balancing/subchannel_interface.h index 3610da9a07e..9d49f30ac26 100644 --- a/src/core/load_balancing/subchannel_interface.h +++ b/src/core/load_balancing/subchannel_interface.h @@ -21,6 +21,7 @@ #include #include "absl/status/status.h" +#include "absl/strings/string_view.h" #include #include @@ -102,6 +103,9 @@ class SubchannelInterface : public DualRefCounted { // make this API public. virtual void CancelDataWatcher(DataWatcherInterface* watcher) = 0; + // Return the address in URI format. + virtual std::string address() const = 0; + protected: void Orphaned() override {} }; @@ -136,6 +140,10 @@ class DelegatingSubchannel : public SubchannelInterface { wrapped_subchannel_->CancelDataWatcher(watcher); } + std::string address() const override { + return wrapped_subchannel_->address(); + } + private: RefCountedPtr wrapped_subchannel_; }; diff --git a/test/core/client_channel/bm_load_balanced_call_destination.cc b/test/core/client_channel/bm_load_balanced_call_destination.cc index a9024edb768..f3a52f40ae9 100644 --- a/test/core/client_channel/bm_load_balanced_call_destination.cc +++ b/test/core/client_channel/bm_load_balanced_call_destination.cc @@ -80,6 +80,8 @@ class LoadBalancedCallDestinationTraits { return call_destination_; } + std::string address() const override { return "test"; } + private: const RefCountedPtr call_destination_; }; diff --git a/test/core/client_channel/load_balanced_call_destination_test.cc b/test/core/client_channel/load_balanced_call_destination_test.cc index ba92f44958c..399f7bddc5a 100644 --- a/test/core/client_channel/load_balanced_call_destination_test.cc +++ b/test/core/client_channel/load_balanced_call_destination_test.cc @@ -118,6 +118,8 @@ class LoadBalancedCallDestinationTest : public YodelTest { return call_destination_; } + std::string address() const override { return "test"; } + private: const RefCountedPtr call_destination_; }; diff --git a/test/core/load_balancing/bm_picker.cc b/test/core/load_balancing/bm_picker.cc index fb16691674e..51aee364d3f 100644 --- a/test/core/load_balancing/bm_picker.cc +++ b/test/core/load_balancing/bm_picker.cc @@ -124,6 +124,8 @@ class BenchmarkHelper : public std::enable_shared_from_this { void CancelDataWatcher(DataWatcherInterface* watcher) override {} + std::string address() const override { return "test"; } + private: void AddConnectivityWatcherInternal( std::shared_ptr watcher) { diff --git a/test/core/load_balancing/lb_policy_test_lib.h b/test/core/load_balancing/lb_policy_test_lib.h index fcd85c8928e..3066fbbc590 100644 --- a/test/core/load_balancing/lb_policy_test_lib.h +++ b/test/core/load_balancing/lb_policy_test_lib.h @@ -121,6 +121,8 @@ class LoadBalancingPolicyTest : public ::testing::Test { SubchannelState* state() const { return state_; } + std::string address() const override { return state_->address_; } + private: // Converts between // SubchannelInterface::ConnectivityStateWatcherInterface and From 44165b780843006f1169ae0dac9d5a8f825b41b2 Mon Sep 17 00:00:00 2001 From: erm-g <110920239+erm-g@users.noreply.github.com> Date: Thu, 19 Sep 2024 13:05:26 -0700 Subject: [PATCH 25/30] [flake] Increase timeout to fix h2_test flakiness (#37767) In some rare occasions on Win machines (0,2-0,5%), the tests are stuck before the handshake when we execute `grpc_call_start_batch`. We receive OP_COMPLETE with `Deadline Exceeded {grpc_status:4}` for such cases. The PR bumps it from 5 to 30s (no flakes for --runs_per_test=1000). Closes #37767 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37767 from erm-g:h2test 9d1208ee1f8ef1c8fa4e96a19982eaa0df1c98a7 PiperOrigin-RevId: 676531975 --- test/core/end2end/h2_ssl_cert_test.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/core/end2end/h2_ssl_cert_test.cc b/test/core/end2end/h2_ssl_cert_test.cc index 68173c02155..84050e4c4e0 100644 --- a/test/core/end2end/h2_ssl_cert_test.cc +++ b/test/core/end2end/h2_ssl_cert_test.cc @@ -42,6 +42,7 @@ #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/tmpfile.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/data/ssl_test_data.h" @@ -196,7 +197,7 @@ static CoreTestConfigWrapper configs[] = { static void simple_request_body(grpc_core::CoreTestFixture* f, test_result expected_result) { grpc_call* c; - gpr_timespec deadline = grpc_timeout_seconds_to_deadline(5); + gpr_timespec deadline = grpc_timeout_seconds_to_deadline(30); grpc_completion_queue* cq = grpc_completion_queue_create_for_next(nullptr); grpc_core::CqVerifier cqv(cq); grpc_op ops[6]; @@ -226,13 +227,13 @@ static void simple_request_body(grpc_core::CoreTestFixture* f, CHECK_EQ(error, GRPC_CALL_OK); cqv.Expect(grpc_core::CqVerifier::tag(1), expected_result == SUCCESS); - cqv.Verify(); + cqv.Verify(grpc_core::Duration::Seconds(60)); grpc_call_unref(c); grpc_channel_destroy(client); grpc_server_shutdown_and_notify(server, cq, nullptr); cqv.Expect(nullptr, true); - cqv.Verify(); + cqv.Verify(grpc_core::Duration::Seconds(60)); grpc_server_destroy(server); grpc_completion_queue_shutdown(cq); CHECK(grpc_completion_queue_next(cq, gpr_inf_future(GPR_CLOCK_REALTIME), From 571adaf2a02d16e8fa511c193eb056cd08810f10 Mon Sep 17 00:00:00 2001 From: Yousuk Seung Date: Thu, 19 Sep 2024 14:33:14 -0700 Subject: [PATCH 26/30] Revert "Don't grab GIL from C-Core during shutdown (#37762)" (#37769) This change appears to cause a deadlock. This reverts commit 4b53c2bac3bfd17c6f9ab9f790d63b8c9d5fea67. Closes #37769 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37769 from yousukseung:python_atexit_rollback 9218d1066ebf4d728549474e95bf8c0173253e35 PiperOrigin-RevId: 676566209 --- .../grpc/_cython/_cygrpc/credentials.pyx.pxi | 38 +------------------ 1 file changed, 2 insertions(+), 36 deletions(-) diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi index 0f9f3f629a0..181704cb85a 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import atexit def _spawn_callback_in_thread(cb_func, args): t = ForkManagedThread(target=cb_func, args=args) @@ -66,43 +65,11 @@ cdef int _get_metadata(void *state, return 0 # Asynchronous return -# Protects access to GIL from _destroy() and to g_shutting_down. -cdef mutex g_shutdown_mu -cdef int g_shutting_down = 0 - -# This is called by C-core when the plugin is destroyed, which may race between -# GIL destruction during process shutdown. Since GIL destruction happens after -# Python's exit handlers, we mark that Python is shutting down from an exit -# handler and don't grab GIL in this function afterwards using a C mutex. -# Access to g_shutting_down and GIL must be mutex protected here. -cdef void _destroy(void *state) nogil: - global g_shutdown_mu - global g_shutting_down - g_shutdown_mu.lock() - if g_shutting_down == 0: - with gil: - cpython.Py_DECREF(state) - g_shutdown_mu.unlock() +cdef void _destroy(void *state) except * with gil: + cpython.Py_DECREF(state) grpc_shutdown() -g_shutdown_handler_registered = False - -def _maybe_register_shutdown_handler(): - global g_shutdown_handler_registered - if g_shutdown_handler_registered: - return - g_shutdown_handler_registered = True - atexit.register(_on_shutdown) - -def _on_shutdown(): - global g_shutdown_mu - global g_shutting_down - g_shutdown_mu.lock() - g_shutting_down = 1 - g_shutdown_mu.unlock() - - cdef class MetadataPluginCallCredentials(CallCredentials): def __cinit__(self, metadata_plugin, name): @@ -116,7 +83,6 @@ cdef class MetadataPluginCallCredentials(CallCredentials): c_metadata_plugin.state = self._metadata_plugin c_metadata_plugin.type = self._name cpython.Py_INCREF(self._metadata_plugin) - _maybe_register_shutdown_handler() fork_handlers_and_grpc_init() # TODO(yihuazhang): Expose min_security_level via the Python API so that # applications can decide what minimum security level their plugins require. From c1512de73d639db8ee089823d039f39e12c034af Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Fri, 20 Sep 2024 09:23:35 -0700 Subject: [PATCH 27/30] [flakes] Increase sharding on end2end test to reduce per-shard runtime (#37780) Looks like our MSAN build is just taking longer at the moment, so increase sharding to reduce per-shard runtime. Closes #37780 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37780 from ctiller:flake-fightas-13 07c422e977098467f5a56ae801cc2666c39003a3 PiperOrigin-RevId: 676869265 --- test/cpp/end2end/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/cpp/end2end/BUILD b/test/cpp/end2end/BUILD index 4a424354c39..011c52d7ca6 100644 --- a/test/cpp/end2end/BUILD +++ b/test/cpp/end2end/BUILD @@ -373,7 +373,7 @@ grpc_cc_test( name = "end2end_test", size = "large", flaky = True, # TODO(b/151704375) - shard_count = 10, + shard_count = 30, tags = [ "cpp_end2end_test", "no_test_ios", From c6c461bc0ec8ee91c33b6f39f3413fb5ec7bbd3f Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Fri, 20 Sep 2024 09:39:25 -0700 Subject: [PATCH 28/30] [Chttp2Server] Fix race between connection manager updates and handshake (#37772) We were failing to shutdown the connection in the case where we want to send goaways on the connection because we've gotten an update from the `ConnectionManager`, but the handshake hasn't completed. Verified with 1000 runs of xds_end2end_test with the filter `*XdsRbacTestWithActionPermutations*` Link to sample test failure - https://btx.cloud.google.com/invocations/d0dbd55e-25f8-44c9-8d90-0eb1f7717d95/targets/%2F%2Ftest%2Fcpp%2Fend2end%2Fxds:xds_end2end_test@poller%3Depoll1;config=1a7dc092b28796b045d00aec96c95b85c1d4dc656912e0021a1fc84b3ecb2ac9/tests Closes #37772 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37772 from yashykt:Chttp2ServerConnectionShutdownRace 84a3206eb1cb507ce0895c0662c066b0e6d8709b PiperOrigin-RevId: 676874525 --- .../transport/chttp2/server/chttp2_server.cc | 58 ++++++++++++------- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc index 50f165cd325..ac507e79b00 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.cc +++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc @@ -183,24 +183,27 @@ class Chttp2ServerListener : public Server::ListenerInterface { void Start(OrphanablePtr endpoint, const ChannelArgs& args); + void ShutdownLocked(absl::Status status) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ActiveConnection::mu_); + // Needed to be able to grab an external ref in // ActiveConnection::Start() using InternallyRefCounted::Ref; private: - void OnTimeout() ABSL_LOCKS_EXCLUDED(&connection_->mu_); + void OnTimeout() ABSL_LOCKS_EXCLUDED(&ActiveConnection::mu_); static void OnReceiveSettings(void* arg, grpc_error_handle /* error */); void OnHandshakeDone(absl::StatusOr result); RefCountedPtr const connection_; grpc_pollset* const accepting_pollset_; AcceptorPtr acceptor_; RefCountedPtr handshake_mgr_ - ABSL_GUARDED_BY(&connection_->mu_); + ABSL_GUARDED_BY(&ActiveConnection::mu_); // State for enforcing handshake timeout on receiving HTTP/2 settings. Timestamp const deadline_; absl::optional timer_handle_ - ABSL_GUARDED_BY(&connection_->mu_); - grpc_closure on_receive_settings_ ABSL_GUARDED_BY(&connection_->mu_); + ABSL_GUARDED_BY(&ActiveConnection::mu_); + grpc_closure on_receive_settings_ ABSL_GUARDED_BY(&ActiveConnection::mu_); grpc_pollset_set* const interested_parties_; }; @@ -400,9 +403,7 @@ Chttp2ServerListener::ActiveConnection::HandshakingState::~HandshakingState() { void Chttp2ServerListener::ActiveConnection::HandshakingState::Orphan() { { MutexLock lock(&connection_->mu_); - if (handshake_mgr_ != nullptr) { - handshake_mgr_->Shutdown(GRPC_ERROR_CREATE("Listener stopped serving.")); - } + ShutdownLocked(absl::UnavailableError("Listener stopped serving.")); } Unref(); } @@ -422,6 +423,13 @@ void Chttp2ServerListener::ActiveConnection::HandshakingState::Start( }); } +void Chttp2ServerListener::ActiveConnection::HandshakingState::ShutdownLocked( + absl::Status status) { + if (handshake_mgr_ != nullptr) { + handshake_mgr_->Shutdown(std::move(status)); + } +} + void Chttp2ServerListener::ActiveConnection::HandshakingState::OnTimeout() { grpc_chttp2_transport* transport = nullptr; { @@ -584,20 +592,28 @@ void Chttp2ServerListener::ActiveConnection::SendGoAway() { grpc_chttp2_transport* transport = nullptr; { MutexLock lock(&mu_); - if (transport_ != nullptr && !shutdown_) { - transport = transport_.get(); - drain_grace_timer_handle_ = event_engine_->RunAfter( - std::max(Duration::Zero(), - listener_->args_ - .GetDurationFromIntMillis( - GRPC_ARG_SERVER_CONFIG_CHANGE_DRAIN_GRACE_TIME_MS) - .value_or(Duration::Minutes(10))), - [self = Ref(DEBUG_LOCATION, "drain_grace_timer")]() mutable { - ApplicationCallbackExecCtx callback_exec_ctx; - ExecCtx exec_ctx; - self->OnDrainGraceTimeExpiry(); - self.reset(DEBUG_LOCATION, "drain_grace_timer"); - }); + if (!shutdown_) { + // Send a GOAWAY if the transport exists + if (transport_ != nullptr) { + transport = transport_.get(); + drain_grace_timer_handle_ = event_engine_->RunAfter( + std::max(Duration::Zero(), + listener_->args_ + .GetDurationFromIntMillis( + GRPC_ARG_SERVER_CONFIG_CHANGE_DRAIN_GRACE_TIME_MS) + .value_or(Duration::Minutes(10))), + [self = Ref(DEBUG_LOCATION, "drain_grace_timer")]() mutable { + ApplicationCallbackExecCtx callback_exec_ctx; + ExecCtx exec_ctx; + self->OnDrainGraceTimeExpiry(); + self.reset(DEBUG_LOCATION, "drain_grace_timer"); + }); + } + // Shutdown the handshaker if it's still in progress. + if (handshaking_state_ != nullptr) { + handshaking_state_->ShutdownLocked( + absl::UnavailableError("Connection going away")); + } shutdown_ = true; } } From 23715aca4c3949dc97c3edbea544244ef6bffad8 Mon Sep 17 00:00:00 2001 From: Yijie Ma Date: Fri, 20 Sep 2024 10:39:19 -0700 Subject: [PATCH 29/30] [Test] Mitigate `AltsConcurrentConnectivityTest` msan timeout with reduced concurrent level (#37773) Closes #37773 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37773 from yijiem:alts-concurrent-connect-timeout 99e371f3ac1d049c60e6c90bc580c9db6ebe0a0d PiperOrigin-RevId: 676895049 --- .../tsi/alts/handshaker/alts_concurrent_connectivity_test.cc | 4 ++++ 1 file changed, 4 insertions(+) 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 913224a88cc..a6327cb31bb 100644 --- a/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc +++ b/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc @@ -57,6 +57,7 @@ #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/util/useful.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/test_util/build.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" @@ -293,6 +294,9 @@ TEST(AltsConcurrentConnectivityTest, TestConcurrentClientServerHandshakes) { { TestServer test_server; size_t num_concurrent_connects = 50; + if (BuiltUnderMsan()) { + num_concurrent_connects = 25; + } std::vector> connect_loop_runners; VLOG(2) << "start performing concurrent expected-to-succeed connects"; for (size_t i = 0; i < num_concurrent_connects; i++) { From f6c57b63843844bdd162d028fe5237406f0df55a Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Fri, 20 Sep 2024 13:15:58 -0700 Subject: [PATCH 30/30] [reorg] move a bunch of stuff to src/core/util (#36792) The following files have been moved: - src/core/lib/avl/* - src/core/lib/backoff/* - src/core/lib/debug/event_log* - src/core/lib/iomgr/gethostname* - src/core/lib/iomgr/grpc_if_nametoindex* - src/core/lib/matchers/* - src/core/lib/uri/* (renamed from uri_parser.* to uri.*) - src/core/lib/gprpp/* (existing src/core/util/time.cc was renamed to gpr_time.cc to avoid conflict) Closes #36792 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36792 from markdroth:reorg_util d4e8996f481c611ffbb06a8b04924ff81bc1bc2b PiperOrigin-RevId: 676947640 --- BUILD | 96 +- CMakeLists.txt | 546 +++---- Makefile | 76 +- Package.swift | 190 +-- build_autogenerated.yaml | 1302 ++++++++--------- config.m4 | 83 +- config.w32 | 83 +- examples/cpp/csm/csm_greeter_server.cc | 2 +- .../chttp2/hpack_encoder_timeout_test.cc | 2 +- gRPC-C++.podspec | 228 +-- gRPC-Core.podspec | 304 ++-- grpc.gemspec | 190 +-- include/grpcpp/impl/sync.h | 4 +- package.xml | 190 +-- src/core/BUILD | 164 +-- src/core/channelz/channel_trace.cc | 2 +- src/core/channelz/channel_trace.h | 4 +- src/core/channelz/channelz.cc | 2 +- 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 | 8 +- src/core/client_channel/client_channel.h | 2 +- .../client_channel/client_channel_factory.h | 2 +- .../client_channel/client_channel_filter.cc | 16 +- .../client_channel/client_channel_filter.h | 12 +- .../client_channel/client_channel_internal.h | 4 +- .../client_channel_service_config.h | 6 +- src/core/client_channel/config_selector.h | 6 +- src/core/client_channel/connector.h | 6 +- src/core/client_channel/direct_channel.cc | 2 +- src/core/client_channel/dynamic_filters.cc | 2 +- src/core/client_channel/dynamic_filters.h | 8 +- .../client_channel/global_subchannel_pool.h | 4 +- .../load_balanced_call_destination.cc | 2 +- .../client_channel/local_subchannel_pool.h | 2 +- src/core/client_channel/retry_filter.cc | 4 +- src/core/client_channel/retry_filter.h | 2 +- .../retry_filter_legacy_call_data.cc | 16 +- .../retry_filter_legacy_call_data.h | 12 +- .../client_channel/retry_service_config.h | 4 +- src/core/client_channel/retry_throttle.h | 6 +- src/core/client_channel/subchannel.cc | 14 +- src/core/client_channel/subchannel.h | 20 +- .../subchannel_interface_internal.h | 2 +- .../subchannel_pool_interface.h | 4 +- .../subchannel_stream_client.cc | 8 +- .../client_channel/subchannel_stream_client.h | 8 +- .../legacy_channel_idle_filter.cc | 12 +- .../channel_idle/legacy_channel_idle_filter.h | 8 +- .../fault_injection/fault_injection_filter.cc | 2 +- .../fault_injection/fault_injection_filter.h | 2 +- .../fault_injection_service_config_parser.h | 4 +- .../gcp_authentication_filter.h | 4 +- ...gcp_authentication_service_config_parser.h | 2 +- .../server_load_reporting_filter.cc | 2 +- .../ext/filters/logging/logging_filter.cc | 6 +- src/core/ext/filters/logging/logging_sink.h | 2 +- .../message_size/message_size_filter.h | 2 +- .../rbac/rbac_service_config_parser.cc | 2 +- .../filters/rbac/rbac_service_config_parser.h | 2 +- .../stateful_session_filter.cc | 4 +- .../stateful_session_filter.h | 4 +- .../stateful_session_service_config_parser.h | 4 +- .../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 | 16 +- .../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 +- .../transport/chttp2/transport/hpack_parser.h | 2 +- .../chttp2/transport/hpack_parser_table.h | 2 +- .../ext/transport/chttp2/transport/internal.h | 10 +- .../ext/transport/chttp2/transport/parsing.cc | 6 +- .../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 | 4 +- .../inproc/legacy_inproc_transport.cc | 8 +- .../endpoint_info/endpoint_info_handshaker.cc | 4 +- src/core/handshaker/handshaker.cc | 7 +- src/core/handshaker/handshaker.h | 10 +- .../http_connect/http_connect_handshaker.cc | 5 +- .../http_connect/http_proxy_mapper.cc | 8 +- .../handshaker/security/secure_endpoint.cc | 8 +- .../handshaker/security/secure_endpoint.h | 2 +- .../security/security_handshaker.cc | 8 +- .../handshaker/security/security_handshaker.h | 2 +- .../tcp_connect/tcp_connect_handshaker.cc | 8 +- src/core/lib/address_utils/parse_address.cc | 6 +- src/core/lib/address_utils/parse_address.h | 2 +- src/core/lib/address_utils/sockaddr_utils.cc | 6 +- src/core/lib/channel/channel_args.h | 14 +- src/core/lib/channel/channel_stack.h | 8 +- 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/debug/trace.cc | 2 +- src/core/lib/debug/trace_flags.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 | 6 +- .../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 | 12 +- .../thread_pool/work_stealing_thread_pool.h | 8 +- .../thready_event_engine.cc | 6 +- 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 | 8 +- .../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 | 241 --- 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 | 7 +- 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 | 10 +- src/core/lib/iomgr/tcp_server_posix.cc | 2 +- .../iomgr/tcp_server_utils_posix_common.cc | 2 +- .../iomgr/tcp_server_utils_posix_ifaddrs.cc | 2 +- src/core/lib/iomgr/tcp_server_windows.cc | 2 +- src/core/lib/iomgr/tcp_windows.cc | 2 +- src/core/lib/iomgr/timer_generic.cc | 8 +- src/core/lib/iomgr/timer_manager.cc | 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 | 10 +- 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 | 4 +- .../grpc_authorization_policy_provider.cc | 4 +- .../grpc_authorization_policy_provider.h | 6 +- .../authorization/grpc_server_authz_filter.h | 2 +- .../lib/security/authorization/matchers.h | 2 +- .../lib/security/authorization/rbac_policy.h | 2 +- .../security/authorization/rbac_translator.cc | 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 | 1 - .../lib/security/credentials/credentials.h | 8 +- .../aws_external_account_credentials.cc | 4 +- .../aws_external_account_credentials.h | 4 +- .../credentials/external/aws_request_signer.h | 2 +- .../external/external_account_credentials.cc | 4 +- .../external/external_account_credentials.h | 6 +- .../file_external_account_credentials.cc | 2 +- .../file_external_account_credentials.h | 2 +- .../url_external_account_credentials.h | 6 +- .../credentials/fake/fake_credentials.cc | 2 +- .../credentials/fake/fake_credentials.h | 4 +- ...cp_service_account_identity_credentials.cc | 6 +- ...gcp_service_account_identity_credentials.h | 8 +- .../google_default/credentials_generic.cc | 2 +- .../google_default_credentials.cc | 16 +- .../google_default_credentials.h | 4 +- .../credentials/iam/iam_credentials.cc | 2 +- .../credentials/iam/iam_credentials.h | 2 +- .../insecure/insecure_credentials.h | 4 +- .../credentials/jwt/jwt_credentials.cc | 4 +- .../credentials/jwt/jwt_credentials.h | 4 +- .../security/credentials/jwt/jwt_verifier.cc | 8 +- .../security/credentials/jwt/jwt_verifier.h | 2 +- .../credentials/local/local_credentials.h | 4 +- .../credentials/oauth2/oauth2_credentials.cc | 10 +- .../credentials/oauth2/oauth2_credentials.h | 12 +- .../credentials/plugin/plugin_credentials.h | 6 +- .../credentials/ssl/ssl_credentials.h | 4 +- .../tls/grpc_tls_certificate_distributor.h | 4 +- .../tls/grpc_tls_certificate_provider.cc | 6 +- .../tls/grpc_tls_certificate_provider.h | 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 +- .../token_fetcher/token_fetcher_credentials.h | 12 +- .../credentials/xds/xds_credentials.h | 6 +- .../alts/alts_security_connector.cc | 4 +- .../alts/alts_security_connector.h | 2 +- .../fake/fake_security_connector.cc | 8 +- .../fake/fake_security_connector.h | 2 +- .../insecure/insecure_security_connector.cc | 4 +- .../insecure/insecure_security_connector.h | 2 +- .../load_system_roots_supported.cc | 2 +- .../local/local_security_connector.cc | 6 +- .../local/local_security_connector.h | 2 +- .../security_connector/security_connector.cc | 2 +- .../security_connector/security_connector.h | 6 +- .../ssl/ssl_security_connector.cc | 8 +- .../ssl/ssl_security_connector.h | 2 +- .../security/security_connector/ssl_utils.cc | 6 +- .../security/security_connector/ssl_utils.h | 2 +- .../tls/tls_security_connector.cc | 6 +- .../tls/tls_security_connector.h | 4 +- .../lib/security/transport/auth_filters.h | 2 +- .../security/transport/client_auth_filter.cc | 4 +- .../security/transport/server_auth_filter.cc | 6 +- src/core/lib/slice/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 | 18 +- src/core/lib/surface/call.h | 4 +- src/core/lib/surface/call_utils.cc | 6 +- src/core/lib/surface/call_utils.h | 2 +- src/core/lib/surface/channel.h | 10 +- src/core/lib/surface/channel_init.cc | 6 +- src/core/lib/surface/channel_init.h | 4 +- src/core/lib/surface/client_call.cc | 8 +- src/core/lib/surface/client_call.h | 8 +- src/core/lib/surface/completion_queue.cc | 10 +- src/core/lib/surface/completion_queue.h | 4 +- src/core/lib/surface/filter_stack_call.cc | 10 +- src/core/lib/surface/filter_stack_call.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/server_call.cc | 2 +- src/core/lib/surface/server_call.h | 6 +- src/core/lib/surface/validate_metadata.cc | 2 +- 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/call_state.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 | 20 +- .../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 | 24 +- .../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 | 6 +- .../resolver/dns/c_ares/dns_resolver_ares.cc | 16 +- .../resolver/dns/c_ares/grpc_ares_ev_driver.h | 2 +- .../dns/c_ares/grpc_ares_ev_driver_posix.cc | 2 +- .../dns/c_ares/grpc_ares_ev_driver_windows.cc | 4 +- .../resolver/dns/c_ares/grpc_ares_wrapper.cc | 8 +- .../resolver/dns/c_ares/grpc_ares_wrapper.h | 2 +- src/core/resolver/dns/dns_resolver_plugin.cc | 2 +- .../event_engine_client_channel_resolver.cc | 12 +- .../event_engine_client_channel_resolver.h | 4 +- .../dns/event_engine/service_config_helper.cc | 4 +- src/core/resolver/dns/native/dns_resolver.cc | 12 +- src/core/resolver/fake/fake_resolver.cc | 8 +- src/core/resolver/fake/fake_resolver.h | 8 +- .../google_c2p/google_c2p_resolver.cc | 14 +- src/core/resolver/polling_resolver.cc | 10 +- src/core/resolver/polling_resolver.h | 8 +- src/core/resolver/resolver.h | 4 +- src/core/resolver/resolver_factory.h | 4 +- src/core/resolver/resolver_registry.h | 4 +- .../resolver/sockaddr/sockaddr_resolver.cc | 4 +- src/core/resolver/xds/xds_config.cc | 2 +- src/core/resolver/xds/xds_config.h | 2 +- .../resolver/xds/xds_dependency_manager.cc | 4 +- .../resolver/xds/xds_dependency_manager.h | 2 +- src/core/resolver/xds/xds_resolver.cc | 20 +- .../resolver/xds/xds_resolver_attributes.h | 2 +- src/core/server/server.cc | 10 +- src/core/server/server.h | 14 +- src/core/server/server_config_selector.h | 6 +- .../server/server_config_selector_filter.cc | 6 +- src/core/server/xds_channel_stack_modifier.h | 4 +- src/core/server/xds_server_config_fetcher.cc | 14 +- src/core/service_config/service_config.h | 2 +- .../service_config/service_config_call_data.h | 8 +- .../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 | 5 +- 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/{lib/gprpp => util}/atomic_utils.h | 10 +- src/core/{lib/avl => util}/avl.h | 14 +- src/core/{lib/backoff => util}/backoff.cc | 4 +- src/core/{lib/backoff => util}/backoff.h | 8 +- src/core/{lib/gprpp => util}/bitset.h | 10 +- src/core/{lib/gprpp => util}/chunked_vector.h | 12 +- .../{lib/gprpp => util}/construct_destruct.h | 10 +- src/core/{lib/gprpp => util}/cpp_impl_of.h | 6 +- src/core/{lib/gprpp => util}/crash.cc | 6 +- src/core/{lib/gprpp => util}/crash.h | 12 +- src/core/{lib/gprpp => util}/debug_location.h | 10 +- .../{lib/gprpp => util}/directory_reader.h | 10 +- src/core/{lib/gprpp => util}/down_cast.h | 10 +- .../{lib/gprpp => util}/dual_ref_counted.h | 20 +- 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 | 10 +- src/core/{lib/debug => util}/event_log.cc | 6 +- src/core/{lib/debug => util}/event_log.h | 14 +- src/core/{lib/gprpp => util}/examine_stack.cc | 4 +- src/core/{lib/gprpp => util}/examine_stack.h | 10 +- src/core/{lib/gprpp => util}/fork.cc | 7 +- src/core/{lib/gprpp => util}/fork.h | 10 +- src/core/util/gcp_metadata_query.cc | 8 +- src/core/util/gcp_metadata_query.h | 4 +- src/core/{lib/iomgr => util}/gethostname.h | 6 +- .../iomgr => util}/gethostname_fallback.cc | 2 +- .../gethostname_host_name_max.cc | 2 +- .../iomgr => util}/gethostname_sysconf.cc | 2 +- src/core/{lib/gprpp => util}/glob.cc | 0 src/core/{lib/gprpp => util}/glob.h | 6 +- src/core/util/gpr_time.cc | 271 ++++ .../{lib/iomgr => util}/grpc_if_nametoindex.h | 10 +- .../grpc_if_nametoindex_posix.cc | 4 +- .../grpc_if_nametoindex_unsupported.cc | 4 +- src/core/{lib/gprpp => util}/host_port.cc | 6 +- src/core/{lib/gprpp => util}/host_port.h | 10 +- src/core/util/http_client/httpcli.cc | 2 +- src/core/util/http_client/httpcli.h | 12 +- .../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/latent_see.cc | 2 +- src/core/util/latent_see.h | 4 +- src/core/util/linux/cpu.cc | 4 +- src/core/{lib/gprpp => util}/linux/env.cc | 6 +- src/core/{lib/gprpp => util}/load_file.cc | 5 +- src/core/{lib/gprpp => util}/load_file.h | 10 +- src/core/util/log.cc | 2 +- .../{lib/gprpp => util}/manual_constructor.h | 12 +- src/core/{lib/gprpp => util}/match.h | 12 +- src/core/{lib/matchers => util}/matchers.cc | 6 +- src/core/{lib/matchers => util}/matchers.h | 10 +- src/core/{lib/gprpp => util}/memory.h | 9 +- src/core/{lib/gprpp => util}/mpscq.cc | 4 +- src/core/{lib/gprpp => util}/mpscq.h | 12 +- src/core/util/msys/tmpfile.cc | 2 +- src/core/{lib/gprpp => util}/no_destruct.h | 12 +- src/core/{lib/gprpp => util}/notification.h | 12 +- src/core/{lib/gprpp => util}/orphanable.h | 18 +- src/core/{lib/gprpp => util}/overload.h | 10 +- src/core/{lib/gprpp => util}/packed_table.h | 10 +- src/core/{lib/gprpp => util}/per_cpu.cc | 5 +- src/core/{lib/gprpp => util}/per_cpu.h | 9 +- src/core/util/posix/cpu.cc | 2 +- .../gprpp => util}/posix/directory_reader.cc | 6 +- src/core/{lib/gprpp => util}/posix/env.cc | 2 +- src/core/{lib/gprpp => util}/posix/stat.cc | 8 +- src/core/util/posix/sync.cc | 2 +- src/core/{lib/gprpp => util}/posix/thd.cc | 12 +- src/core/util/posix/time.cc | 6 +- src/core/util/posix/tmpfile.cc | 4 +- .../random_early_detection.cc | 6 +- .../backoff => util}/random_early_detection.h | 10 +- src/core/{lib/gprpp => util}/ref_counted.h | 18 +- .../{lib/gprpp => util}/ref_counted_ptr.h | 14 +- .../{lib/gprpp => util}/ref_counted_string.cc | 5 +- .../{lib/gprpp => util}/ref_counted_string.h | 14 +- src/core/{lib/gprpp => util}/single_set_ptr.h | 10 +- src/core/{lib/gprpp => util}/sorted_pack.h | 12 +- src/core/{lib/gprpp => util}/stat.h | 10 +- src/core/{lib/gprpp => util}/status_helper.cc | 6 +- src/core/{lib/gprpp => util}/status_helper.h | 12 +- src/core/{lib/gprpp => util}/strerror.cc | 6 +- src/core/{lib/gprpp => util}/strerror.h | 10 +- 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 | 11 +- src/core/util/sync_abseil.cc | 4 +- src/core/{lib/gprpp => util}/table.h | 12 +- src/core/{lib/gprpp => util}/tchar.cc | 4 +- src/core/{lib/gprpp => util}/tchar.h | 6 +- src/core/{lib/gprpp => util}/thd.h | 9 +- src/core/util/time.cc | 380 +++-- src/core/{lib/gprpp => util}/time.h | 9 +- .../gprpp => util}/time_averaged_stats.cc | 4 +- .../{lib/gprpp => util}/time_averaged_stats.h | 6 +- src/core/util/time_precise.cc | 2 +- src/core/{lib/gprpp => util}/time_util.cc | 5 +- src/core/{lib/gprpp => util}/time_util.h | 9 +- src/core/{lib/gprpp => util}/type_list.h | 6 +- .../{lib/gprpp => util}/unique_type_name.h | 10 +- .../{lib/uri/uri_parser.cc => util/uri.cc} | 6 +- src/core/{lib/uri/uri_parser.h => util/uri.h} | 10 +- src/core/{lib/gprpp => util}/uuid_v4.cc | 6 +- src/core/{lib/gprpp => util}/uuid_v4.h | 10 +- .../{lib/gprpp => util}/validation_errors.cc | 6 +- .../{lib/gprpp => util}/validation_errors.h | 10 +- src/core/util/windows/cpu.cc | 2 +- .../windows/directory_reader.cc | 3 +- src/core/{lib/gprpp => util}/windows/env.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 | 13 +- .../{lib/gprpp => util}/work_serializer.h | 13 +- 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 | 3 +- src/core/xds/grpc/xds_bootstrap_grpc.h | 3 +- src/core/xds/grpc/xds_certificate_provider.h | 8 +- 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 | 4 +- src/core/xds/grpc/xds_cluster_parser.cc | 6 +- .../xds/grpc/xds_cluster_specifier_plugin.h | 2 +- src/core/xds/grpc/xds_common_types.cc | 2 +- src/core/xds/grpc/xds_common_types.h | 4 +- src/core/xds/grpc/xds_common_types_parser.cc | 2 +- src/core/xds/grpc/xds_common_types_parser.h | 4 +- src/core/xds/grpc/xds_endpoint.h | 6 +- src/core/xds/grpc/xds_endpoint_parser.cc | 4 +- 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_filter.h | 2 +- src/core/xds/grpc/xds_http_filter_registry.h | 2 +- .../xds/grpc/xds_http_gcp_authn_filter.cc | 2 +- src/core/xds/grpc/xds_http_gcp_authn_filter.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 | 2 +- src/core/xds/grpc/xds_listener.h | 2 +- src/core/xds/grpc/xds_listener_parser.cc | 7 +- src/core/xds/grpc/xds_metadata.h | 4 +- src/core/xds/grpc/xds_metadata_parser.cc | 4 +- src/core/xds/grpc/xds_metadata_parser.h | 2 +- src/core/xds/grpc/xds_route_config.cc | 4 +- src/core/xds/grpc/xds_route_config.h | 4 +- src/core/xds/grpc/xds_route_config_parser.cc | 10 +- src/core/xds/grpc/xds_route_config_parser.h | 5 +- src/core/xds/grpc/xds_routing.cc | 2 +- src/core/xds/grpc/xds_server_grpc.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 | 12 +- src/core/xds/xds_client/xds_client.h | 16 +- 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/BUILD | 2 +- src/cpp/ext/csm/csm_observability.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 | 76 +- .../observability_lib_deps.py | 36 +- .../parse_address_with_named_scope_id_test.cc | 6 +- .../sockaddr_utils_fuzzer_test.cc | 2 +- test/core/avl/BUILD | 47 - test/core/backoff/BUILD | 52 - test/core/bad_client/bad_client.cc | 2 +- .../core/bad_client/tests/duplicate_header.cc | 2 +- test/core/bad_connection/close_fd_test.cc | 6 +- test/core/bad_ssl/bad_ssl_test.cc | 4 +- test/core/call/client_call_test.cc | 2 +- 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 | 5 +- 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 | 6 +- test/core/end2end/fuzzers/connector_fuzzer.cc | 2 +- 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 +- test/core/end2end/h2_ssl_cert_test.cc | 2 +- .../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_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 | 6 +- .../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 | 6 +- ...etry_transparent_max_concurrent_streams.cc | 2 +- .../retry_transparent_not_sent_on_wire.cc | 6 +- .../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 | 6 +- .../event_engine/event_engine_test_utils.h | 4 +- test/core/event_engine/forkable_test.cc | 2 +- .../fuzzing_event_engine.cc | 6 +- .../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 | 8 +- .../rbac/rbac_service_config_parser_test.cc | 2 +- test/core/filters/client_auth_filter_test.cc | 4 +- test/core/filters/filter_test.cc | 2 +- test/core/filters/filter_test.h | 2 +- .../filters/gcp_authentication_filter_test.cc | 4 +- test/core/gprpp/BUILD | 516 ------- test/core/gprpp/time_test.cc | 113 -- test/core/handshake/client_ssl.cc | 6 +- .../readahead_handshaker_server_ssl.cc | 4 +- 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 | 12 +- 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 | 4 +- test/core/iomgr/fd_conservation_posix_test.cc | 2 +- test/core/iomgr/fd_posix_test.cc | 4 +- .../grpc_ipv6_loopback_available_test.cc | 2 +- .../iomgr/pollset_windows_starvation_test.cc | 2 +- test/core/iomgr/resolve_address_posix_test.cc | 8 +- test/core/iomgr/resolve_address_test.cc | 6 +- test/core/iomgr/socket_utils_test.cc | 2 +- test/core/iomgr/tcp_client_posix_test.cc | 4 +- test/core/iomgr/tcp_posix_test.cc | 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 | 18 +- ...outlier_detection_lb_config_parser_test.cc | 2 +- .../load_balancing/outlier_detection_test.cc | 6 +- test/core/load_balancing/pick_first_test.cc | 10 +- test/core/load_balancing/ring_hash_test.cc | 4 +- .../rls_lb_config_parser_test.cc | 2 +- test/core/load_balancing/round_robin_test.cc | 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 | 3 +- test/core/matchers/BUILD | 32 - 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 | 4 +- .../resolver/dns_resolver_cooldown_test.cc | 14 +- test/core/resolver/dns_resolver_test.cc | 6 +- test/core/resolver/endpoint_addresses_test.cc | 2 +- test/core/resolver/fake_resolver_test.cc | 10 +- .../core/resolver/google_c2p_resolver_test.cc | 2 +- test/core/resolver/sockaddr_resolver_test.cc | 6 +- test/core/resource_quota/arena_test.cc | 4 +- .../resource_quota/memory_quota_fuzzer.cc | 2 +- .../memory_quota_stress_test.cc | 2 +- test/core/security/alts_credentials_fuzzer.cc | 4 +- .../security/alts_security_connector_test.cc | 2 +- test/core/security/auth_context_test.cc | 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 | 12 +- 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 | 2 +- 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/BUILD | 6 +- 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 +- test/core/test_util/mock_endpoint.cc | 2 +- .../core/test_util/one_corpus_entry_fuzzer.cc | 2 +- test/core/test_util/passthrough_endpoint.h | 2 +- test/core/test_util/port.cc | 2 +- .../port_isolated_runtime_environment.cc | 2 +- test/core/test_util/port_server_client.cc | 10 +- 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 | 12 +- 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 +- .../transport/call_arena_allocator_test.cc | 4 +- test/core/transport/call_spine_benchmarks.h | 2 +- test/core/transport/chaotic_good/BUILD | 2 +- .../chaotic_good/chaotic_good_server_test.cc | 6 +- .../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 | 8 +- .../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 | 3 +- .../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 | 10 +- 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/uri/BUILD | 53 - test/core/util/BUILD | 607 +++++++- test/core/{avl => util}/avl_fuzzer.cc | 4 +- test/core/{avl => util}/avl_fuzzer.proto | 0 test/core/{avl => util}/avl_fuzzer_corpus/0 | 0 ...h-060a9a897130ba7bb2f4313daa604c47f7c7c907 | 0 ...h-1fbe8edb82f9a7aa4c2dffe4a6eaa40c34b1e360 | 0 test/core/{avl => util}/avl_test.cc | 2 +- test/core/{backoff => util}/backoff_test.cc | 4 +- test/core/{gprpp => util}/bitset_test.cc | 2 +- ...h-a0868ce3a0f76feefcc715148ed9e71fa0738c2a | 0 .../testcase-5405829431427072 | 0 .../{gprpp => util}/chunked_vector_fuzzer.cc | 6 +- .../chunked_vector_fuzzer.proto | 0 .../{gprpp => util}/chunked_vector_test.cc | 4 +- test/core/{gprpp => util}/cpp_impl_of_test.cc | 2 +- test/core/util/cpu_test.cc | 2 +- .../{gprpp => util}/directory_reader_test.cc | 2 +- test/core/{gprpp => util}/down_cast_test.cc | 2 +- .../{gprpp => util}/dual_ref_counted_test.cc | 6 +- test/core/{gprpp => util}/dump_args_test.cc | 2 +- test/core/util/env_test.cc | 2 +- .../{gprpp => util}/examine_stack_test.cc | 2 +- test/core/{gprpp => util}/fork_test.cc | 4 +- test/core/{gprpp => util}/glob_test.cc | 2 +- test/core/util/gpr_time_test.cc | 268 ++++ test/core/{gprpp => util}/host_port_test.cc | 2 +- test/core/{gprpp => util}/if_list_test.cc | 2 +- test/core/{gprpp => util}/load_file_test.cc | 2 +- test/core/{gprpp => util}/match_test.cc | 2 +- test/core/{matchers => util}/matchers_test.cc | 2 +- test/core/{gprpp => util}/mpscq_test.cc | 4 +- test/core/{gprpp => util}/no_destruct_test.cc | 2 +- .../core/{gprpp => util}/notification_test.cc | 2 +- test/core/{gprpp => util}/orphanable_test.cc | 2 +- test/core/{gprpp => util}/overload_test.cc | 2 +- .../random_early_detection_test.cc | 2 +- .../{gprpp => util}/ref_counted_ptr_test.cc | 6 +- test/core/{gprpp => util}/ref_counted_test.cc | 2 +- .../{gprpp => util}/single_set_ptr_test.cc | 2 +- test/core/{gprpp => util}/sorted_pack_test.cc | 2 +- test/core/util/spinlock_test.cc | 2 +- test/core/{gprpp => util}/stat_test.cc | 2 +- .../{gprpp => util}/status_helper_test.cc | 2 +- test/core/util/sync_test.cc | 2 +- test/core/{gprpp => util}/table_test.cc | 2 +- test/core/{gprpp => util}/thd_test.cc | 2 +- .../time_averaged_stats_test.cc | 2 +- test/core/util/time_test.cc | 297 +--- test/core/{gprpp => util}/time_util_test.cc | 2 +- .../{gprpp => util}/unique_type_name_test.cc | 2 +- .../02d156dc5e6f2c11c90c2e06fcee04adf036a342 | 0 .../042dc4512fa3d391c5170cf3aa61e6a638f84342 | 0 .../0e9bbe975f2027e8c39c89f85f667530368e7d11 | 0 .../1155aa6ea7ef262a81a63692513ea395f84dad6f | 0 .../13856a5569ffd085a4d5c07af5f8e9310835a118 | 0 .../14b57bcbf1e17b1db1de491ef2ba3768f704b7dc | 0 .../1794310671a060eead6e5ee66ac978a18ec7e84f | 0 .../1d30b2a79afbaf2828ff42b9a9647e942ba1ab80 | 0 .../1fcf5d9c333b70596cf5ba04d1f7affdf445b971 | 0 .../23162c8a8936e20b195404c21337ee734d02a6bc | 0 .../23f3198b815ca60bdadcaae682b9f965dda387f1 | 0 .../2ef3893b43f1f60b77b59ce06a6bce9815d78eaf | 0 .../356c3c129e203b5c74550b4209764d74b9caefce | 0 .../396568fc41c8ccb31ec925b4a862e4d29ead1327 | 0 .../3b1e7526a99918006b87e499d2beb6c4ac9c3c0c | 0 .../3b58860f3451d3e7aad99690a8d39782ca5116fc | 0 .../41963cc10752f70c3af7e3d85868efb097a0ea9c | 0 .../47b5228404451fc9d4071fa69192514bb4ce33c1 | 0 .../56a2da4b2e6fb795243901023ed8d0aa083d1aab | 0 .../574c2f13858a9a6d724654bd913ede9ae3abf822 | 0 .../582f789c19033a152094cbf8565f14154a778ddb | 0 .../636c5606fc23713a1bae88c8899c0541cfad4fd8 | 0 .../63fe493b270b17426d77a27cbf3abac5b2c2794a | 0 .../655300a902b62662296a8e46bfb04fbcb07182cb | 0 .../6ae3acd9d8507b61bf235748026080a4138dba58 | 0 .../6b70979a70a038ff6607d6cf85485ee95baf58e6 | 0 .../7314ab3545a7535a26e0e8aad67caea5534d68b1 | 0 .../7ff4d8b8d1ffd0d42c48bbb91e5856a9ec31aecb | 0 .../87daa131e0973b77a232a870ed749ef29cf58e6d | 0 .../884dcaee2908ffe5f12b65b8eba81016099c4266 | 0 .../8d7e944fd5d0ede94097fcc98b47b09a3f9c76cb | 0 .../9671149af0b444f59bbdf71340d3441dadd8a7b4 | 0 .../96c8d266b7dc037288ef305c996608270f72e7fb | 0 .../975536c71ade4800415a7e9c2f1b45c35a6d5ea8 | 0 .../99750aa67d30beaea8af565c829d4999aa8cb91b | 0 .../a1140f3f8b5cffc1010221b9a4084a25fb75c1f6 | 0 .../a1f0f9b75bb354eb063d7cba4fcfa2d0b88d63de | 0 .../a296eb3d1d436ed7df7195b10aa3c4de3896f98d | 0 .../a8b8e66050b424f1b8c07d46f868199fb7f60e38 | 0 .../aba1472880406a318ce207ee79815b7acf087757 | 0 .../af55baf8c8855e563befdf1eefbcbd46c5ddb8d2 | 0 .../b3c0bf66c2bf5d24ef1daf4cc5a9d6d5bd0e8bfd | 0 .../c28a47409cf5d95bb372238d01e73d8b831408e4 | 0 .../c3ef1d41888063a08700c3add1e4465aabcf8807 | 0 .../c550a76af21f9b9cc92a386d5c8998b26f8f2e4d | 0 .../c79721406d0ab80495f186fd88e37fba98637ae9 | 0 .../ceb4e2264ba7a8d5be47d276b37ec09489e00245 | 0 .../cf4395958f5bfb46fd6f535a39657d016c75114c | 0 .../d46668372b7e20154a89409a7430a28e642afdca | 0 .../d6fe7412a0a1d1c733160246f3fa425f4f97682a | 0 test/core/{uri => util}/uri_corpus/dns.txt | 0 .../e241f29957b0e30ec11aaaf91b2339f7015fa5fd | 0 .../ea02d9fea9bad5b89cf353a0169238f584177e71 | 0 .../ec4731dddf94ed3ea92ae4d5a71f145ab6e3f6ee | 0 .../ed2f78646f19fc47dd85ff0877c232b71913ece2 | 0 .../f6889f4a6350fea1596a3adea5cdac02bd5d1ff3 | 0 .../f6f3bd030f0d321efe7c51ca3f057de23509af67 | 0 .../f97598cff03306af3c70400608fec47268b5075d | 0 .../f9e1ec1fc642b575bc9955618b7065747f56b101 | 0 .../fe0630a3aeed2ec6f474f362e4c839478290d5c4 | 0 test/core/{uri => util}/uri_corpus/ipv4.txt | 0 test/core/{uri => util}/uri_corpus/ipv6.txt | 0 test/core/{uri => util}/uri_corpus/unix.txt | 0 test/core/{uri => util}/uri_fuzzer_test.cc | 2 +- .../uri_parser_test.cc => util/uri_test.cc} | 2 +- test/core/{gprpp => util}/uuid_v4_test.cc | 2 +- .../{gprpp => util}/validation_errors_test.cc | 2 +- .../{gprpp => util}/work_serializer_test.cc | 6 +- .../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 | 10 +- .../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 +- test/core/xds/xds_metadata_test.cc | 4 +- .../xds_route_config_resource_type_test.cc | 8 +- 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 | 6 +- 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 | 14 +- .../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 | 6 +- 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 | 6 +- test/cpp/end2end/raw_end2end_test.cc | 4 +- .../resource_quota_end2end_stress_test.cc | 2 +- test/cpp/end2end/rls_end2end_test.cc | 8 +- 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 | 8 +- 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 +- .../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 | 6 +- 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.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 | 10 +- 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 | 4 +- tools/codegen/core/gen_if_list.py | 8 +- 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 | 5 +- tools/distrib/fix_build_deps.py | 4 +- tools/doxygen/Doxyfile.c++.internal | 190 +-- tools/doxygen/Doxyfile.core.internal | 191 ++- tools/run_tests/generated/tests.json | 50 +- tools/run_tests/sanity/check_absl_mutex.sh | 2 +- .../run_tests/sanity/cpp_banned_constructs.sh | 4 +- 1363 files changed, 6082 insertions(+), 6242 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/avl => util}/avl.h (97%) rename src/core/{lib/backoff => util}/backoff.cc (94%) rename src/core/{lib/backoff => util}/backoff.h (93%) 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 (87%) 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 (97%) rename src/core/{lib/gprpp => util}/dump_args.h (95%) rename src/core/{lib/gprpp => util}/env.h (92%) rename src/core/{lib/debug => util}/event_log.cc (98%) rename src/core/{lib/debug => util}/event_log.h (91%) 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%) rename src/core/{lib/iomgr => util}/gethostname.h (83%) rename src/core/{lib/iomgr => util}/gethostname_fallback.cc (94%) rename src/core/{lib/iomgr => util}/gethostname_host_name_max.cc (95%) rename src/core/{lib/iomgr => util}/gethostname_sysconf.cc (95%) rename src/core/{lib/gprpp => util}/glob.cc (100%) rename src/core/{lib/gprpp => util}/glob.h (88%) create mode 100644 src/core/util/gpr_time.cc rename src/core/{lib/iomgr => util}/grpc_if_nametoindex.h (83%) rename src/core/{lib/iomgr => util}/grpc_if_nametoindex_posix.cc (92%) rename src/core/{lib/iomgr => util}/grpc_if_nametoindex_unsupported.cc (92%) 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/matchers => util}/matchers.cc (99%) rename src/core/{lib/matchers => util}/matchers.h (97%) 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/backoff => util}/random_early_detection.cc (94%) rename src/core/{lib/backoff => util}/random_early_detection.h (91%) 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 (99%) 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 (95%) rename src/core/{lib/uri/uri_parser.cc => util/uri.cc} (99%) rename src/core/{lib/uri/uri_parser.h => util/uri.h} (96%) 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 (97%) 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 (98%) rename src/core/{lib/gprpp => util}/work_serializer.h (94%) rename src/core/{lib/gprpp => util}/xxhash_inline.h (86%) delete mode 100644 test/core/avl/BUILD delete mode 100644 test/core/backoff/BUILD delete mode 100644 test/core/gprpp/BUILD delete mode 100644 test/core/gprpp/time_test.cc delete mode 100644 test/core/matchers/BUILD delete mode 100644 test/core/uri/BUILD rename test/core/{avl => util}/avl_fuzzer.cc (97%) rename test/core/{avl => util}/avl_fuzzer.proto (100%) rename test/core/{avl => util}/avl_fuzzer_corpus/0 (100%) rename test/core/{avl => util}/avl_fuzzer_corpus/crash-060a9a897130ba7bb2f4313daa604c47f7c7c907 (100%) rename test/core/{avl => util}/avl_fuzzer_corpus/crash-1fbe8edb82f9a7aa4c2dffe4a6eaa40c34b1e360 (100%) rename test/core/{avl => util}/avl_test.cc (97%) rename test/core/{backoff => util}/backoff_test.cc (98%) rename test/core/{gprpp => util}/bitset_test.cc (98%) rename test/core/{gprpp => util}/chunked_vector_corpora/crash-a0868ce3a0f76feefcc715148ed9e71fa0738c2a (100%) rename test/core/{gprpp => util}/chunked_vector_corpora/testcase-5405829431427072 (100%) rename test/core/{gprpp => util}/chunked_vector_fuzzer.cc (97%) rename test/core/{gprpp => util}/chunked_vector_fuzzer.proto (100%) rename test/core/{gprpp => util}/chunked_vector_test.cc (97%) rename test/core/{gprpp => util}/cpp_impl_of_test.cc (95%) rename test/core/{gprpp => util}/directory_reader_test.cc (97%) rename test/core/{gprpp => util}/down_cast_test.cc (96%) rename test/core/{gprpp => util}/dual_ref_counted_test.cc (96%) rename test/core/{gprpp => util}/dump_args_test.cc (96%) rename test/core/{gprpp => util}/examine_stack_test.cc (98%) rename test/core/{gprpp => util}/fork_test.cc (98%) rename test/core/{gprpp => util}/glob_test.cc (98%) create mode 100644 test/core/util/gpr_time_test.cc rename test/core/{gprpp => util}/host_port_test.cc (98%) rename test/core/{gprpp => util}/if_list_test.cc (96%) rename test/core/{gprpp => util}/load_file_test.cc (98%) rename test/core/{gprpp => util}/match_test.cc (98%) rename test/core/{matchers => util}/matchers_test.cc (99%) rename test/core/{gprpp => util}/mpscq_test.cc (98%) rename test/core/{gprpp => util}/no_destruct_test.cc (97%) rename test/core/{gprpp => util}/notification_test.cc (97%) rename test/core/{gprpp => util}/orphanable_test.cc (98%) rename test/core/{gprpp => util}/overload_test.cc (96%) rename test/core/{backoff => util}/random_early_detection_test.cc (97%) rename test/core/{gprpp => util}/ref_counted_ptr_test.cc (99%) rename test/core/{gprpp => util}/ref_counted_test.cc (99%) rename test/core/{gprpp => util}/single_set_ptr_test.cc (97%) rename test/core/{gprpp => util}/sorted_pack_test.cc (97%) rename test/core/{gprpp => util}/stat_test.cc (98%) rename test/core/{gprpp => util}/status_helper_test.cc (99%) rename test/core/{gprpp => util}/table_test.cc (99%) rename test/core/{gprpp => util}/thd_test.cc (98%) rename test/core/{gprpp => util}/time_averaged_stats_test.cc (99%) rename test/core/{gprpp => util}/time_util_test.cc (99%) rename test/core/{gprpp => util}/unique_type_name_test.cc (98%) rename test/core/{uri => util}/uri_corpus/02d156dc5e6f2c11c90c2e06fcee04adf036a342 (100%) rename test/core/{uri => util}/uri_corpus/042dc4512fa3d391c5170cf3aa61e6a638f84342 (100%) rename test/core/{uri => util}/uri_corpus/0e9bbe975f2027e8c39c89f85f667530368e7d11 (100%) rename test/core/{uri => util}/uri_corpus/1155aa6ea7ef262a81a63692513ea395f84dad6f (100%) rename test/core/{uri => util}/uri_corpus/13856a5569ffd085a4d5c07af5f8e9310835a118 (100%) rename test/core/{uri => util}/uri_corpus/14b57bcbf1e17b1db1de491ef2ba3768f704b7dc (100%) rename test/core/{uri => util}/uri_corpus/1794310671a060eead6e5ee66ac978a18ec7e84f (100%) rename test/core/{uri => util}/uri_corpus/1d30b2a79afbaf2828ff42b9a9647e942ba1ab80 (100%) rename test/core/{uri => util}/uri_corpus/1fcf5d9c333b70596cf5ba04d1f7affdf445b971 (100%) rename test/core/{uri => util}/uri_corpus/23162c8a8936e20b195404c21337ee734d02a6bc (100%) rename test/core/{uri => util}/uri_corpus/23f3198b815ca60bdadcaae682b9f965dda387f1 (100%) rename test/core/{uri => util}/uri_corpus/2ef3893b43f1f60b77b59ce06a6bce9815d78eaf (100%) rename test/core/{uri => util}/uri_corpus/356c3c129e203b5c74550b4209764d74b9caefce (100%) rename test/core/{uri => util}/uri_corpus/396568fc41c8ccb31ec925b4a862e4d29ead1327 (100%) rename test/core/{uri => util}/uri_corpus/3b1e7526a99918006b87e499d2beb6c4ac9c3c0c (100%) rename test/core/{uri => util}/uri_corpus/3b58860f3451d3e7aad99690a8d39782ca5116fc (100%) rename test/core/{uri => util}/uri_corpus/41963cc10752f70c3af7e3d85868efb097a0ea9c (100%) rename test/core/{uri => util}/uri_corpus/47b5228404451fc9d4071fa69192514bb4ce33c1 (100%) rename test/core/{uri => util}/uri_corpus/56a2da4b2e6fb795243901023ed8d0aa083d1aab (100%) rename test/core/{uri => util}/uri_corpus/574c2f13858a9a6d724654bd913ede9ae3abf822 (100%) rename test/core/{uri => util}/uri_corpus/582f789c19033a152094cbf8565f14154a778ddb (100%) rename test/core/{uri => util}/uri_corpus/636c5606fc23713a1bae88c8899c0541cfad4fd8 (100%) rename test/core/{uri => util}/uri_corpus/63fe493b270b17426d77a27cbf3abac5b2c2794a (100%) rename test/core/{uri => util}/uri_corpus/655300a902b62662296a8e46bfb04fbcb07182cb (100%) rename test/core/{uri => util}/uri_corpus/6ae3acd9d8507b61bf235748026080a4138dba58 (100%) rename test/core/{uri => util}/uri_corpus/6b70979a70a038ff6607d6cf85485ee95baf58e6 (100%) rename test/core/{uri => util}/uri_corpus/7314ab3545a7535a26e0e8aad67caea5534d68b1 (100%) rename test/core/{uri => util}/uri_corpus/7ff4d8b8d1ffd0d42c48bbb91e5856a9ec31aecb (100%) rename test/core/{uri => util}/uri_corpus/87daa131e0973b77a232a870ed749ef29cf58e6d (100%) rename test/core/{uri => util}/uri_corpus/884dcaee2908ffe5f12b65b8eba81016099c4266 (100%) rename test/core/{uri => util}/uri_corpus/8d7e944fd5d0ede94097fcc98b47b09a3f9c76cb (100%) rename test/core/{uri => util}/uri_corpus/9671149af0b444f59bbdf71340d3441dadd8a7b4 (100%) rename test/core/{uri => util}/uri_corpus/96c8d266b7dc037288ef305c996608270f72e7fb (100%) rename test/core/{uri => util}/uri_corpus/975536c71ade4800415a7e9c2f1b45c35a6d5ea8 (100%) rename test/core/{uri => util}/uri_corpus/99750aa67d30beaea8af565c829d4999aa8cb91b (100%) rename test/core/{uri => util}/uri_corpus/a1140f3f8b5cffc1010221b9a4084a25fb75c1f6 (100%) rename test/core/{uri => util}/uri_corpus/a1f0f9b75bb354eb063d7cba4fcfa2d0b88d63de (100%) rename test/core/{uri => util}/uri_corpus/a296eb3d1d436ed7df7195b10aa3c4de3896f98d (100%) rename test/core/{uri => util}/uri_corpus/a8b8e66050b424f1b8c07d46f868199fb7f60e38 (100%) rename test/core/{uri => util}/uri_corpus/aba1472880406a318ce207ee79815b7acf087757 (100%) rename test/core/{uri => util}/uri_corpus/af55baf8c8855e563befdf1eefbcbd46c5ddb8d2 (100%) rename test/core/{uri => util}/uri_corpus/b3c0bf66c2bf5d24ef1daf4cc5a9d6d5bd0e8bfd (100%) rename test/core/{uri => util}/uri_corpus/c28a47409cf5d95bb372238d01e73d8b831408e4 (100%) rename test/core/{uri => util}/uri_corpus/c3ef1d41888063a08700c3add1e4465aabcf8807 (100%) rename test/core/{uri => util}/uri_corpus/c550a76af21f9b9cc92a386d5c8998b26f8f2e4d (100%) rename test/core/{uri => util}/uri_corpus/c79721406d0ab80495f186fd88e37fba98637ae9 (100%) rename test/core/{uri => util}/uri_corpus/ceb4e2264ba7a8d5be47d276b37ec09489e00245 (100%) rename test/core/{uri => util}/uri_corpus/cf4395958f5bfb46fd6f535a39657d016c75114c (100%) rename test/core/{uri => util}/uri_corpus/d46668372b7e20154a89409a7430a28e642afdca (100%) rename test/core/{uri => util}/uri_corpus/d6fe7412a0a1d1c733160246f3fa425f4f97682a (100%) rename test/core/{uri => util}/uri_corpus/dns.txt (100%) rename test/core/{uri => util}/uri_corpus/e241f29957b0e30ec11aaaf91b2339f7015fa5fd (100%) rename test/core/{uri => util}/uri_corpus/ea02d9fea9bad5b89cf353a0169238f584177e71 (100%) rename test/core/{uri => util}/uri_corpus/ec4731dddf94ed3ea92ae4d5a71f145ab6e3f6ee (100%) rename test/core/{uri => util}/uri_corpus/ed2f78646f19fc47dd85ff0877c232b71913ece2 (100%) rename test/core/{uri => util}/uri_corpus/f6889f4a6350fea1596a3adea5cdac02bd5d1ff3 (100%) rename test/core/{uri => util}/uri_corpus/f6f3bd030f0d321efe7c51ca3f057de23509af67 (100%) rename test/core/{uri => util}/uri_corpus/f97598cff03306af3c70400608fec47268b5075d (100%) rename test/core/{uri => util}/uri_corpus/f9e1ec1fc642b575bc9955618b7065747f56b101 (100%) rename test/core/{uri => util}/uri_corpus/fe0630a3aeed2ec6f474f362e4c839478290d5c4 (100%) rename test/core/{uri => util}/uri_corpus/ipv4.txt (100%) rename test/core/{uri => util}/uri_corpus/ipv6.txt (100%) rename test/core/{uri => util}/uri_corpus/unix.txt (100%) rename test/core/{uri => util}/uri_fuzzer_test.cc (96%) rename test/core/{uri/uri_parser_test.cc => util/uri_test.cc} (99%) rename test/core/{gprpp => util}/uuid_v4_test.cc (96%) rename test/core/{gprpp => util}/validation_errors_test.cc (98%) rename test/core/{gprpp => util}/work_serializer_test.cc (99%) diff --git a/BUILD b/BUILD index c8c1d72af9d..b5a5a5754b9 100644 --- a/BUILD +++ b/BUILD @@ -681,7 +681,7 @@ grpc_cc_library( "server", "sockaddr_utils", "tsi_base", - "uri_parser", + "uri", "//src/core:channel_args", "//src/core:channel_init", "//src/core:channel_stack_type", @@ -719,50 +719,50 @@ 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/alloc.cc", + "//src/core:util/crash.cc", + "//src/core:util/fork.cc", + "//src/core:util/gpr_time.cc", + "//src/core:util/host_port.cc", "//src/core:util/iphone/cpu.cc", "//src/core:util/linux/cpu.cc", "//src/core:util/log.cc", + "//src/core:util/mpscq.cc", "//src/core:util/msys/tmpfile.cc", "//src/core:util/posix/cpu.cc", + "//src/core:util/posix/stat.cc", "//src/core:util/posix/string.cc", "//src/core:util/posix/sync.cc", + "//src/core:util/posix/thd.cc", "//src/core:util/posix/time.cc", "//src/core:util/posix/tmpfile.cc", "//src/core:util/string.cc", "//src/core:util/sync.cc", "//src/core:util/sync_abseil.cc", - "//src/core:util/time.cc", "//src/core:util/time_precise.cc", + "//src/core:util/time_util.cc", "//src/core:util/windows/cpu.cc", + "//src/core:util/windows/stat.cc", "//src/core:util/windows/string.cc", "//src/core:util/windows/string_util.cc", "//src/core:util/windows/sync.cc", + "//src/core:util/windows/thd.cc", "//src/core:util/windows/time.cc", "//src/core:util/windows/tmpfile.cc", ], hdrs = [ - "//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/alloc.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/string.h", + "//src/core:util/sync.h", + "//src/core:util/thd.h", "//src/core:util/time_precise.h", + "//src/core:util/time_util.h", "//src/core:util/tmpfile.h", ], external_deps = [ @@ -820,7 +820,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++", ) @@ -1392,7 +1392,7 @@ grpc_cc_library( "parse_address", "ref_counted_ptr", "sockaddr_utils", - "uri_parser", + "uri", "//src/core:channel_args", "//src/core:connectivity_state", "//src/core:json", @@ -1507,9 +1507,6 @@ grpc_cc_library( "//src/core:lib/iomgr/ev_posix.cc", "//src/core:lib/iomgr/fork_posix.cc", "//src/core:lib/iomgr/fork_windows.cc", - "//src/core:lib/iomgr/gethostname_fallback.cc", - "//src/core:lib/iomgr/gethostname_host_name_max.cc", - "//src/core:lib/iomgr/gethostname_sysconf.cc", "//src/core:lib/iomgr/iocp_windows.cc", "//src/core:lib/iomgr/iomgr.cc", "//src/core:lib/iomgr/iomgr_posix.cc", @@ -1548,6 +1545,9 @@ grpc_cc_library( "//src/core:lib/iomgr/wakeup_fd_nospecial.cc", "//src/core:lib/iomgr/wakeup_fd_pipe.cc", "//src/core:lib/iomgr/wakeup_fd_posix.cc", + "//src/core:util/gethostname_fallback.cc", + "//src/core:util/gethostname_host_name_max.cc", + "//src/core:util/gethostname_sysconf.cc", ] + # TODO(vigneshbabu): remove these # These headers used to be vended by this target, but they have to be @@ -1568,7 +1568,6 @@ grpc_cc_library( "//src/core:lib/iomgr/ev_epoll1_linux.h", "//src/core:lib/iomgr/ev_poll_posix.h", "//src/core:lib/iomgr/ev_posix.h", - "//src/core:lib/iomgr/gethostname.h", "//src/core:lib/iomgr/iocp_windows.h", "//src/core:lib/iomgr/iomgr.h", "//src/core:lib/iomgr/lockfree_event.h", @@ -1599,6 +1598,7 @@ grpc_cc_library( "//src/core:lib/iomgr/vsock.h", "//src/core:lib/iomgr/wakeup_fd_pipe.h", "//src/core:lib/iomgr/wakeup_fd_posix.h", + "//src/core:util/gethostname.h", ] + # TODO(vigneshbabu): remove these # These headers used to be vended by this target, but they have to be @@ -2982,10 +2982,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", @@ -3114,7 +3114,7 @@ grpc_cc_library( name = "debug_location", external_deps = ["absl/strings"], 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"], ) @@ -3122,7 +3122,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", @@ -3159,7 +3159,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", @@ -3306,7 +3306,7 @@ grpc_cc_library( visibility = ["@grpc:alt_grpc_base_legacy"], deps = [ "gpr", - "uri_parser", + "uri", "//src/core:grpc_sockaddr", "//src/core:iomgr_port", "//src/core:resolved_address", @@ -3398,12 +3398,12 @@ grpc_cc_library( ) grpc_cc_library( - name = "uri_parser", + name = "uri", srcs = [ - "//src/core:lib/uri/uri_parser.cc", + "//src/core:util/uri.cc", ], hdrs = [ - "//src/core:lib/uri/uri_parser.h", + "//src/core:util/uri.h", ], external_deps = [ "absl/log:check", @@ -3420,12 +3420,12 @@ grpc_cc_library( name = "parse_address", srcs = [ "//src/core:lib/address_utils/parse_address.cc", - "//src/core:lib/iomgr/grpc_if_nametoindex_posix.cc", - "//src/core:lib/iomgr/grpc_if_nametoindex_unsupported.cc", + "//src/core:util/grpc_if_nametoindex_posix.cc", + "//src/core:util/grpc_if_nametoindex_unsupported.cc", ], hdrs = [ "//src/core:lib/address_utils/parse_address.h", - "//src/core:lib/iomgr/grpc_if_nametoindex.h", + "//src/core:util/grpc_if_nametoindex.h", ], external_deps = [ "absl/log:check", @@ -3437,7 +3437,7 @@ grpc_cc_library( visibility = ["@grpc:alt_grpc_base_legacy"], deps = [ "gpr", - "uri_parser", + "uri", "//src/core:error", "//src/core:grpc_sockaddr", "//src/core:iomgr_port", @@ -3449,10 +3449,10 @@ grpc_cc_library( grpc_cc_library( name = "backoff", srcs = [ - "//src/core:lib/backoff/backoff.cc", + "//src/core:util/backoff.cc", ], hdrs = [ - "//src/core:lib/backoff/backoff.h", + "//src/core:util/backoff.h", ], external_deps = ["absl/random"], language = "c++", @@ -3612,7 +3612,7 @@ grpc_cc_library( "orphanable", "ref_counted_ptr", "server_address", - "uri_parser", + "uri", "//src/core:channel_args", "//src/core:grpc_service_config", "//src/core:iomgr_fwd", @@ -3770,7 +3770,7 @@ grpc_cc_library( "ref_counted_ptr", "sockaddr_utils", "stats", - "uri_parser", + "uri", "work_serializer", "//src/core:arena", "//src/core:arena_promise", @@ -3893,7 +3893,7 @@ grpc_cc_library( "parse_address", "ref_counted_ptr", "sockaddr_utils", - "uri_parser", + "uri", "//src/core:channel_args", "//src/core:closure", "//src/core:error", @@ -3952,7 +3952,7 @@ grpc_cc_library( "ref_counted_ptr", "resource_quota_api", "sockaddr_utils", - "uri_parser", + "uri", "//src/core:channel_args", "//src/core:channel_args_preconditioning", "//src/core:closure", @@ -4082,7 +4082,7 @@ grpc_cc_library( "orphanable", "promise", "ref_counted_ptr", - "uri_parser", + "uri", "//src/core:arena_promise", "//src/core:closure", "//src/core:error", @@ -4451,7 +4451,7 @@ grpc_cc_library( "protobuf_struct_upb", "protobuf_timestamp_upb", "ref_counted_ptr", - "uri_parser", + "uri", "work_serializer", "//src/core:default_event_engine", "//src/core:dual_ref_counted", @@ -4512,7 +4512,7 @@ grpc_cc_library( "grpc_resolver", "orphanable", "ref_counted_ptr", - "uri_parser", + "uri", "work_serializer", "//src/core:channel_args", "//src/core:notification", diff --git a/CMakeLists.txt b/CMakeLists.txt index 169d6d553e3..30472acaacf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1128,6 +1128,7 @@ if(gRPC_BUILD_TESTS) add_dependencies(buildtests_cxx glob_test) add_dependencies(buildtests_cxx goaway_server_test) add_dependencies(buildtests_cxx google_c2p_resolver_test) + add_dependencies(buildtests_cxx gpr_time_test) add_dependencies(buildtests_cxx graceful_server_shutdown_test) add_dependencies(buildtests_cxx graceful_shutdown_test) add_dependencies(buildtests_cxx grpc_alts_credentials_options_test) @@ -1482,7 +1483,6 @@ if(gRPC_BUILD_TESTS) add_dependencies(buildtests_cxx test_core_event_engine_posix_timer_heap_test) add_dependencies(buildtests_cxx test_core_event_engine_posix_timer_list_test) add_dependencies(buildtests_cxx test_core_event_engine_slice_buffer_test) - add_dependencies(buildtests_cxx test_core_gprpp_time_test) add_dependencies(buildtests_cxx test_core_iomgr_timer_heap_test) add_dependencies(buildtests_cxx test_core_security_credentials_test) add_dependencies(buildtests_cxx test_core_security_ssl_credentials_test) @@ -1535,7 +1535,7 @@ if(gRPC_BUILD_TESTS) add_dependencies(buildtests_cxx unique_ptr_with_bitset_test) add_dependencies(buildtests_cxx unique_type_name_test) add_dependencies(buildtests_cxx unknown_frame_bad_client_test) - add_dependencies(buildtests_cxx uri_parser_test) + add_dependencies(buildtests_cxx uri_test) add_dependencies(buildtests_cxx useful_test) add_dependencies(buildtests_cxx uuid_v4_test) add_dependencies(buildtests_cxx validation_errors_test) @@ -1691,41 +1691,41 @@ 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/alloc.cc src/core/util/atm.cc + src/core/util/crash.cc + src/core/util/examine_stack.cc + src/core/util/fork.cc + src/core/util/gpr_time.cc + src/core/util/host_port.cc src/core/util/iphone/cpu.cc src/core/util/linux/cpu.cc + src/core/util/linux/env.cc src/core/util/log.cc + src/core/util/mpscq.cc src/core/util/msys/tmpfile.cc src/core/util/posix/cpu.cc + src/core/util/posix/env.cc + src/core/util/posix/stat.cc src/core/util/posix/string.cc src/core/util/posix/sync.cc + src/core/util/posix/thd.cc src/core/util/posix/time.cc src/core/util/posix/tmpfile.cc + src/core/util/strerror.cc src/core/util/string.cc src/core/util/sync.cc src/core/util/sync_abseil.cc - src/core/util/time.cc + src/core/util/tchar.cc src/core/util/time_precise.cc + src/core/util/time_util.cc src/core/util/windows/cpu.cc + src/core/util/windows/env.cc + src/core/util/windows/stat.cc src/core/util/windows/string.cc src/core/util/windows/string_util.cc src/core/util/windows/sync.cc + src/core/util/windows/thd.cc src/core/util/windows/time.cc src/core/util/windows/tmpfile.cc ) @@ -2255,8 +2255,6 @@ add_library(grpc src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc src/core/lib/address_utils/parse_address.cc src/core/lib/address_utils/sockaddr_utils.cc - src/core/lib/backoff/backoff.cc - src/core/lib/backoff/random_early_detection.cc src/core/lib/channel/channel_args.cc src/core/lib/channel/channel_args_preconditioning.cc src/core/lib/channel/channel_stack.cc @@ -2269,7 +2267,6 @@ add_library(grpc src/core/lib/compression/compression_internal.cc src/core/lib/compression/message_compress.cc src/core/lib/config/core_configuration.cc - src/core/lib/debug/event_log.cc src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc src/core/lib/event_engine/ares_resolver.cc @@ -2320,19 +2317,6 @@ add_library(grpc src/core/lib/event_engine/work_queue/basic_work_queue.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.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/lib/iomgr/buffer_list.cc src/core/lib/iomgr/call_combiner.cc src/core/lib/iomgr/cfstream_handle.cc @@ -2356,11 +2340,6 @@ add_library(grpc src/core/lib/iomgr/executor.cc src/core/lib/iomgr/fork_posix.cc src/core/lib/iomgr/fork_windows.cc - src/core/lib/iomgr/gethostname_fallback.cc - src/core/lib/iomgr/gethostname_host_name_max.cc - src/core/lib/iomgr/gethostname_sysconf.cc - src/core/lib/iomgr/grpc_if_nametoindex_posix.cc - src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc src/core/lib/iomgr/internal_errqueue.cc src/core/lib/iomgr/iocp_windows.cc src/core/lib/iomgr/iomgr.cc @@ -2409,7 +2388,6 @@ add_library(grpc src/core/lib/iomgr/wakeup_fd_nospecial.cc src/core/lib/iomgr/wakeup_fd_pipe.cc src/core/lib/iomgr/wakeup_fd_posix.cc - src/core/lib/matchers/matchers.cc src/core/lib/promise/activity.cc src/core/lib/promise/party.cc src/core/lib/promise/sleep.cc @@ -2529,7 +2507,6 @@ add_library(grpc src/core/lib/transport/timeout_encoding.cc src/core/lib/transport/transport.cc src/core/lib/transport/transport_op_string.cc - src/core/lib/uri/uri_parser.cc src/core/load_balancing/address_filtering.cc src/core/load_balancing/backend_metric_parser.cc src/core/load_balancing/child_policy_handler.cc @@ -2622,7 +2599,16 @@ add_library(grpc src/core/tsi/ssl_transport_security_utils.cc src/core/tsi/transport_security.cc src/core/tsi/transport_security_grpc.cc + src/core/util/backoff.cc + src/core/util/dump_args.cc + src/core/util/event_log.cc src/core/util/gcp_metadata_query.cc + src/core/util/gethostname_fallback.cc + src/core/util/gethostname_host_name_max.cc + src/core/util/gethostname_sysconf.cc + src/core/util/glob.cc + src/core/util/grpc_if_nametoindex_posix.cc + src/core/util/grpc_if_nametoindex_unsupported.cc src/core/util/http_client/format_request.cc src/core/util/http_client/httpcli.cc src/core/util/http_client/httpcli_security_connector.cc @@ -2632,6 +2618,20 @@ add_library(grpc src/core/util/json/json_util.cc src/core/util/json/json_writer.cc src/core/util/latent_see.cc + src/core/util/load_file.cc + src/core/util/matchers.cc + src/core/util/per_cpu.cc + src/core/util/posix/directory_reader.cc + src/core/util/random_early_detection.cc + src/core/util/ref_counted_string.cc + src/core/util/status_helper.cc + src/core/util/time.cc + src/core/util/time_averaged_stats.cc + src/core/util/uri.cc + src/core/util/uuid_v4.cc + src/core/util/validation_errors.cc + src/core/util/windows/directory_reader.cc + src/core/util/work_serializer.cc src/core/xds/grpc/certificate_provider_store.cc src/core/xds/grpc/file_watcher_certificate_provider_factory.cc src/core/xds/grpc/xds_audit_logger_registry.cc @@ -3061,8 +3061,6 @@ add_library(grpc_unsecure src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc src/core/lib/address_utils/parse_address.cc src/core/lib/address_utils/sockaddr_utils.cc - src/core/lib/backoff/backoff.cc - src/core/lib/backoff/random_early_detection.cc src/core/lib/channel/channel_args.cc src/core/lib/channel/channel_args_preconditioning.cc src/core/lib/channel/channel_stack.cc @@ -3075,7 +3073,6 @@ add_library(grpc_unsecure src/core/lib/compression/compression_internal.cc src/core/lib/compression/message_compress.cc src/core/lib/config/core_configuration.cc - src/core/lib/debug/event_log.cc src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc src/core/lib/event_engine/ares_resolver.cc @@ -3126,17 +3123,6 @@ add_library(grpc_unsecure src/core/lib/event_engine/work_queue/basic_work_queue.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.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/lib/iomgr/buffer_list.cc src/core/lib/iomgr/call_combiner.cc src/core/lib/iomgr/cfstream_handle.cc @@ -3160,11 +3146,6 @@ add_library(grpc_unsecure src/core/lib/iomgr/executor.cc src/core/lib/iomgr/fork_posix.cc src/core/lib/iomgr/fork_windows.cc - src/core/lib/iomgr/gethostname_fallback.cc - src/core/lib/iomgr/gethostname_host_name_max.cc - src/core/lib/iomgr/gethostname_sysconf.cc - src/core/lib/iomgr/grpc_if_nametoindex_posix.cc - src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc src/core/lib/iomgr/internal_errqueue.cc src/core/lib/iomgr/iocp_windows.cc src/core/lib/iomgr/iomgr.cc @@ -3296,7 +3277,6 @@ add_library(grpc_unsecure src/core/lib/transport/timeout_encoding.cc src/core/lib/transport/transport.cc src/core/lib/transport/transport_op_string.cc - src/core/lib/uri/uri_parser.cc src/core/load_balancing/address_filtering.cc src/core/load_balancing/backend_metric_parser.cc src/core/load_balancing/child_policy_handler.cc @@ -3352,6 +3332,15 @@ add_library(grpc_unsecure src/core/tsi/local_transport_security.cc src/core/tsi/transport_security.cc src/core/tsi/transport_security_grpc.cc + src/core/util/backoff.cc + src/core/util/dump_args.cc + src/core/util/event_log.cc + src/core/util/gethostname_fallback.cc + src/core/util/gethostname_host_name_max.cc + src/core/util/gethostname_sysconf.cc + src/core/util/glob.cc + src/core/util/grpc_if_nametoindex_posix.cc + src/core/util/grpc_if_nametoindex_unsupported.cc src/core/util/http_client/format_request.cc src/core/util/http_client/httpcli.cc src/core/util/http_client/parser.cc @@ -3359,6 +3348,17 @@ add_library(grpc_unsecure src/core/util/json/json_reader.cc src/core/util/json/json_writer.cc src/core/util/latent_see.cc + src/core/util/load_file.cc + src/core/util/per_cpu.cc + src/core/util/random_early_detection.cc + src/core/util/ref_counted_string.cc + src/core/util/status_helper.cc + src/core/util/time.cc + src/core/util/time_averaged_stats.cc + src/core/util/uri.cc + src/core/util/uuid_v4.cc + src/core/util/validation_errors.cc + src/core/util/work_serializer.cc ${gRPC_ADDITIONAL_DLL_SRC} ) @@ -5282,7 +5282,6 @@ add_library(grpc_authorization_provider src/core/handshaker/security/security_handshaker.cc src/core/lib/address_utils/parse_address.cc src/core/lib/address_utils/sockaddr_utils.cc - src/core/lib/backoff/backoff.cc src/core/lib/channel/channel_args.cc src/core/lib/channel/channel_args_preconditioning.cc src/core/lib/channel/channel_stack.cc @@ -5295,7 +5294,6 @@ add_library(grpc_authorization_provider src/core/lib/compression/compression_internal.cc src/core/lib/compression/message_compress.cc src/core/lib/config/core_configuration.cc - src/core/lib/debug/event_log.cc src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc src/core/lib/event_engine/ares_resolver.cc @@ -5346,16 +5344,6 @@ add_library(grpc_authorization_provider src/core/lib/event_engine/work_queue/basic_work_queue.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.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/lib/iomgr/buffer_list.cc src/core/lib/iomgr/call_combiner.cc src/core/lib/iomgr/cfstream_handle.cc @@ -5379,11 +5367,6 @@ add_library(grpc_authorization_provider src/core/lib/iomgr/executor.cc src/core/lib/iomgr/fork_posix.cc src/core/lib/iomgr/fork_windows.cc - src/core/lib/iomgr/gethostname_fallback.cc - src/core/lib/iomgr/gethostname_host_name_max.cc - src/core/lib/iomgr/gethostname_sysconf.cc - src/core/lib/iomgr/grpc_if_nametoindex_posix.cc - src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc src/core/lib/iomgr/internal_errqueue.cc src/core/lib/iomgr/iocp_windows.cc src/core/lib/iomgr/iomgr.cc @@ -5432,7 +5415,6 @@ add_library(grpc_authorization_provider src/core/lib/iomgr/wakeup_fd_nospecial.cc src/core/lib/iomgr/wakeup_fd_pipe.cc src/core/lib/iomgr/wakeup_fd_posix.cc - src/core/lib/matchers/matchers.cc src/core/lib/promise/activity.cc src/core/lib/promise/party.cc src/core/lib/resource_quota/api.cc @@ -5513,7 +5495,6 @@ add_library(grpc_authorization_provider src/core/lib/transport/timeout_encoding.cc src/core/lib/transport/transport.cc src/core/lib/transport/transport_op_string.cc - src/core/lib/uri/uri_parser.cc src/core/load_balancing/lb_policy.cc src/core/load_balancing/lb_policy_registry.cc src/core/resolver/endpoint_addresses.cc @@ -5528,9 +5509,28 @@ add_library(grpc_authorization_provider src/core/tsi/alts/handshaker/transport_security_common_api.cc src/core/tsi/transport_security.cc src/core/tsi/transport_security_grpc.cc + src/core/util/backoff.cc + src/core/util/dump_args.cc + src/core/util/event_log.cc + src/core/util/gethostname_fallback.cc + src/core/util/gethostname_host_name_max.cc + src/core/util/gethostname_sysconf.cc + src/core/util/glob.cc + src/core/util/grpc_if_nametoindex_posix.cc + src/core/util/grpc_if_nametoindex_unsupported.cc src/core/util/json/json_reader.cc src/core/util/json/json_writer.cc src/core/util/latent_see.cc + src/core/util/load_file.cc + src/core/util/matchers.cc + src/core/util/per_cpu.cc + src/core/util/ref_counted_string.cc + src/core/util/status_helper.cc + src/core/util/time.cc + src/core/util/time_averaged_stats.cc + src/core/util/uri.cc + src/core/util/validation_errors.cc + src/core/util/work_serializer.cc ) target_compile_features(grpc_authorization_provider PUBLIC cxx_std_14) @@ -6089,11 +6089,11 @@ if(gRPC_BUILD_TESTS) add_executable(activity_test src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/per_cpu.cc src/core/lib/promise/activity.cc + src/core/util/dump_args.cc + src/core/util/glob.cc src/core/util/latent_see.cc + src/core/util/per_cpu.cc test/core/promise/activity_test.cc ) if(WIN32 AND MSVC) @@ -6367,7 +6367,7 @@ if(gRPC_BUILD_TESTS) add_executable(all_ok_test src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc - src/core/lib/gprpp/glob.cc + src/core/util/glob.cc test/core/promise/all_ok_test.cc ) if(WIN32 AND MSVC) @@ -7422,7 +7422,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(avl_test - test/core/avl/avl_test.cc + test/core/util/avl_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -7575,7 +7575,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(backoff_test - test/core/backoff/backoff_test.cc + test/core/util/backoff_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -8370,7 +8370,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(bitset_test - test/core/gprpp/bitset_test.cc + test/core/util/bitset_test.cc ) target_compile_features(bitset_test PUBLIC cxx_std_14) target_include_directories(bitset_test @@ -8656,12 +8656,6 @@ add_executable(call_filters_test src/core/lib/debug/trace_flags.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.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/iomgr/closure.cc src/core/lib/iomgr/combiner.cc src/core/lib/iomgr/error.cc @@ -8690,7 +8684,13 @@ add_executable(call_filters_test src/core/lib/transport/parsed_metadata.cc src/core/lib/transport/status_conversion.cc src/core/lib/transport/timeout_encoding.cc + src/core/util/dump_args.cc + src/core/util/glob.cc src/core/util/latent_see.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 test/core/transport/call_filters_test.cc ) if(WIN32 AND MSVC) @@ -8903,12 +8903,12 @@ if(gRPC_BUILD_TESTS) add_executable(call_state_test src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/per_cpu.cc src/core/lib/promise/activity.cc src/core/lib/transport/call_state.cc + src/core/util/dump_args.cc + src/core/util/glob.cc src/core/util/latent_see.cc + src/core/util/per_cpu.cc test/core/transport/call_state_test.cc ) if(WIN32 AND MSVC) @@ -9010,7 +9010,6 @@ add_executable(call_utils_test src/core/handshaker/proxy_mapper_registry.cc src/core/lib/address_utils/parse_address.cc src/core/lib/address_utils/sockaddr_utils.cc - src/core/lib/backoff/backoff.cc src/core/lib/channel/channel_args.cc src/core/lib/channel/channel_args_preconditioning.cc src/core/lib/channel/channel_stack.cc @@ -9023,7 +9022,6 @@ add_executable(call_utils_test src/core/lib/compression/compression_internal.cc src/core/lib/compression/message_compress.cc src/core/lib/config/core_configuration.cc - src/core/lib/debug/event_log.cc src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc src/core/lib/event_engine/ares_resolver.cc @@ -9074,16 +9072,6 @@ add_executable(call_utils_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/glob.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/lib/iomgr/buffer_list.cc src/core/lib/iomgr/call_combiner.cc src/core/lib/iomgr/cfstream_handle.cc @@ -9107,11 +9095,6 @@ add_executable(call_utils_test src/core/lib/iomgr/executor.cc src/core/lib/iomgr/fork_posix.cc src/core/lib/iomgr/fork_windows.cc - src/core/lib/iomgr/gethostname_fallback.cc - src/core/lib/iomgr/gethostname_host_name_max.cc - src/core/lib/iomgr/gethostname_sysconf.cc - src/core/lib/iomgr/grpc_if_nametoindex_posix.cc - src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc src/core/lib/iomgr/internal_errqueue.cc src/core/lib/iomgr/iocp_windows.cc src/core/lib/iomgr/iomgr.cc @@ -9217,7 +9200,6 @@ add_executable(call_utils_test src/core/lib/transport/timeout_encoding.cc src/core/lib/transport/transport.cc src/core/lib/transport/transport_op_string.cc - src/core/lib/uri/uri_parser.cc src/core/load_balancing/lb_policy.cc src/core/load_balancing/lb_policy_registry.cc src/core/resolver/endpoint_addresses.cc @@ -9230,8 +9212,26 @@ add_executable(call_utils_test src/core/telemetry/stats.cc src/core/telemetry/stats_data.cc src/core/tsi/alts/handshaker/transport_security_common_api.cc + src/core/util/backoff.cc + src/core/util/dump_args.cc + src/core/util/event_log.cc + src/core/util/gethostname_fallback.cc + src/core/util/gethostname_host_name_max.cc + src/core/util/gethostname_sysconf.cc + src/core/util/glob.cc + src/core/util/grpc_if_nametoindex_posix.cc + src/core/util/grpc_if_nametoindex_unsupported.cc src/core/util/json/json_writer.cc src/core/util/latent_see.cc + src/core/util/load_file.cc + src/core/util/per_cpu.cc + src/core/util/ref_counted_string.cc + src/core/util/status_helper.cc + src/core/util/time.cc + src/core/util/time_averaged_stats.cc + src/core/util/uri.cc + src/core/util/validation_errors.cc + src/core/util/work_serializer.cc test/core/call/call_utils_test.cc ) if(WIN32 AND MSVC) @@ -9657,11 +9657,6 @@ add_executable(cancel_callback_test src/core/lib/debug/trace_flags.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/per_cpu.cc - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc src/core/lib/iomgr/closure.cc src/core/lib/iomgr/combiner.cc src/core/lib/iomgr/error.cc @@ -9678,7 +9673,12 @@ add_executable(cancel_callback_test src/core/lib/slice/percent_encoding.cc src/core/lib/slice/slice.cc src/core/lib/slice/slice_string_helpers.cc + src/core/util/dump_args.cc + src/core/util/glob.cc src/core/util/latent_see.cc + src/core/util/per_cpu.cc + src/core/util/status_helper.cc + src/core/util/time.cc test/core/promise/cancel_callback_test.cc ) if(WIN32 AND MSVC) @@ -10757,11 +10757,6 @@ add_executable(chunked_vector_test src/core/lib/debug/trace_flags.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/per_cpu.cc - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc src/core/lib/iomgr/closure.cc src/core/lib/iomgr/combiner.cc src/core/lib/iomgr/error.cc @@ -10778,8 +10773,13 @@ add_executable(chunked_vector_test src/core/lib/slice/percent_encoding.cc src/core/lib/slice/slice.cc src/core/lib/slice/slice_string_helpers.cc + src/core/util/dump_args.cc + src/core/util/glob.cc src/core/util/latent_see.cc - test/core/gprpp/chunked_vector_test.cc + src/core/util/per_cpu.cc + src/core/util/status_helper.cc + src/core/util/time.cc + test/core/util/chunked_vector_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -12380,7 +12380,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(cpp_impl_of_test - test/core/gprpp/cpp_impl_of_test.cc + test/core/util/cpp_impl_of_test.cc ) target_compile_features(cpp_impl_of_test PUBLIC cxx_std_14) target_include_directories(cpp_impl_of_test @@ -12767,7 +12767,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(directory_reader_test - test/core/gprpp/directory_reader_test.cc + test/core/util/directory_reader_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -12956,7 +12956,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(down_cast_test - test/core/gprpp/down_cast_test.cc + test/core/util/down_cast_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -12998,7 +12998,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(dual_ref_counted_test - test/core/gprpp/dual_ref_counted_test.cc + test/core/util/dual_ref_counted_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -13085,8 +13085,8 @@ endif() if(gRPC_BUILD_TESTS) add_executable(dump_args_test - src/core/lib/gprpp/dump_args.cc - test/core/gprpp/dump_args_test.cc + src/core/util/dump_args.cc + test/core/util/dump_args_test.cc ) target_compile_features(dump_args_test PUBLIC cxx_std_14) target_include_directories(dump_args_test @@ -13512,9 +13512,9 @@ if(gRPC_BUILD_TESTS) add_executable(endpoint_config_test src/core/lib/channel/channel_args.cc src/core/lib/event_engine/channel_args_endpoint_config.cc - src/core/lib/gprpp/ref_counted_string.cc - src/core/lib/gprpp/time.cc src/core/lib/surface/channel_stack_type.cc + src/core/util/ref_counted_string.cc + src/core/util/time.cc test/core/event_engine/endpoint_config_test.cc ) if(WIN32 AND MSVC) @@ -13952,7 +13952,7 @@ if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(examine_stack_test - test/core/gprpp/examine_stack_test.cc + test/core/util/examine_stack_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -14060,11 +14060,6 @@ add_executable(exec_ctx_wakeup_scheduler_test src/core/lib/debug/trace_flags.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/per_cpu.cc - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc src/core/lib/iomgr/closure.cc src/core/lib/iomgr/combiner.cc src/core/lib/iomgr/error.cc @@ -14075,7 +14070,12 @@ add_executable(exec_ctx_wakeup_scheduler_test src/core/lib/slice/percent_encoding.cc src/core/lib/slice/slice.cc src/core/lib/slice/slice_string_helpers.cc + src/core/util/dump_args.cc + src/core/util/glob.cc src/core/util/latent_see.cc + src/core/util/per_cpu.cc + src/core/util/status_helper.cc + src/core/util/time.cc test/core/promise/exec_ctx_wakeup_scheduler_test.cc ) if(WIN32 AND MSVC) @@ -14854,11 +14854,6 @@ add_executable(flow_control_test src/core/lib/debug/trace_flags.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/per_cpu.cc - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc src/core/lib/iomgr/closure.cc src/core/lib/iomgr/combiner.cc src/core/lib/iomgr/error.cc @@ -14876,7 +14871,12 @@ add_executable(flow_control_test src/core/lib/slice/slice_buffer.cc src/core/lib/slice/slice_string_helpers.cc src/core/lib/transport/bdp_estimator.cc + src/core/util/dump_args.cc + src/core/util/glob.cc src/core/util/latent_see.cc + src/core/util/per_cpu.cc + src/core/util/status_helper.cc + src/core/util/time.cc test/core/transport/chttp2/flow_control_test.cc ) if(WIN32 AND MSVC) @@ -14933,11 +14933,6 @@ add_executable(for_each_test src/core/lib/debug/trace_flags.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/per_cpu.cc - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc src/core/lib/iomgr/closure.cc src/core/lib/iomgr/combiner.cc src/core/lib/iomgr/error.cc @@ -14954,7 +14949,12 @@ add_executable(for_each_test src/core/lib/slice/percent_encoding.cc src/core/lib/slice/slice.cc src/core/lib/slice/slice_string_helpers.cc + src/core/util/dump_args.cc + src/core/util/glob.cc src/core/util/latent_see.cc + src/core/util/per_cpu.cc + src/core/util/status_helper.cc + src/core/util/time.cc test/core/promise/for_each_test.cc ) if(WIN32 AND MSVC) @@ -15005,7 +15005,7 @@ if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(fork_test - test/core/gprpp/fork_test.cc + test/core/util/fork_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -15051,7 +15051,7 @@ add_executable(forkable_test src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc src/core/lib/event_engine/forkable.cc - src/core/lib/gprpp/glob.cc + src/core/util/glob.cc test/core/event_engine/forkable_test.cc ) if(WIN32 AND MSVC) @@ -15196,10 +15196,10 @@ add_executable(frame_test src/core/ext/transport/chttp2/transport/frame.cc src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc - src/core/lib/gprpp/glob.cc src/core/lib/slice/slice.cc src/core/lib/slice/slice_buffer.cc src/core/lib/slice/slice_string_helpers.cc + src/core/util/glob.cc test/core/transport/chttp2/frame_test.cc ) if(WIN32 AND MSVC) @@ -15460,7 +15460,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(glob_test - test/core/gprpp/glob_test.cc + test/core/util/glob_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -15585,6 +15585,48 @@ target_link_libraries(google_c2p_resolver_test ) +endif() +if(gRPC_BUILD_TESTS) + +add_executable(gpr_time_test + test/core/util/gpr_time_test.cc +) +if(WIN32 AND MSVC) + if(BUILD_SHARED_LIBS) + target_compile_definitions(gpr_time_test + PRIVATE + "GPR_DLL_IMPORTS" + "GRPC_DLL_IMPORTS" + ) + endif() +endif() +target_compile_features(gpr_time_test PUBLIC cxx_std_14) +target_include_directories(gpr_time_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_RE2_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_XXHASH_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} +) + +target_link_libraries(gpr_time_test + ${_gRPC_ALLTARGETS_LIBRARIES} + gtest + grpc_test_util +) + + endif() if(gRPC_BUILD_TESTS) @@ -17461,7 +17503,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(host_port_test - test/core/gprpp/host_port_test.cc + test/core/util/host_port_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -18108,7 +18150,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(if_list_test - test/core/gprpp/if_list_test.cc + test/core/util/if_list_test.cc ) target_compile_features(if_list_test PUBLIC cxx_std_14) target_include_directories(if_list_test @@ -18422,11 +18464,11 @@ if(gRPC_BUILD_TESTS) add_executable(inter_activity_pipe_test src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/per_cpu.cc src/core/lib/promise/activity.cc + src/core/util/dump_args.cc + src/core/util/glob.cc src/core/util/latent_see.cc + src/core/util/per_cpu.cc test/core/promise/inter_activity_pipe_test.cc ) if(WIN32 AND MSVC) @@ -18521,11 +18563,6 @@ add_executable(interceptor_list_test src/core/lib/debug/trace_flags.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/per_cpu.cc - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc src/core/lib/iomgr/closure.cc src/core/lib/iomgr/combiner.cc src/core/lib/iomgr/error.cc @@ -18542,7 +18579,12 @@ add_executable(interceptor_list_test src/core/lib/slice/percent_encoding.cc src/core/lib/slice/slice.cc src/core/lib/slice/slice_string_helpers.cc + src/core/util/dump_args.cc + src/core/util/glob.cc src/core/util/latent_see.cc + src/core/util/per_cpu.cc + src/core/util/status_helper.cc + src/core/util/time.cc test/core/promise/interceptor_list_test.cc ) if(WIN32 AND MSVC) @@ -18904,7 +18946,7 @@ if(gRPC_BUILD_TESTS) add_executable(join_test src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc - src/core/lib/gprpp/glob.cc + src/core/util/glob.cc test/core/promise/join_test.cc ) if(WIN32 AND MSVC) @@ -19306,11 +19348,11 @@ if(gRPC_BUILD_TESTS) add_executable(latch_test src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/per_cpu.cc src/core/lib/promise/activity.cc + src/core/util/dump_args.cc + src/core/util/glob.cc src/core/util/latent_see.cc + src/core/util/per_cpu.cc test/core/promise/latch_test.cc ) if(WIN32 AND MSVC) @@ -19585,7 +19627,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(load_file_test - test/core/gprpp/load_file_test.cc + test/core/util/load_file_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -19673,7 +19715,7 @@ if(gRPC_BUILD_TESTS) add_executable(loop_test src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc - src/core/lib/gprpp/glob.cc + src/core/util/glob.cc test/core/promise/loop_test.cc ) if(WIN32 AND MSVC) @@ -19760,11 +19802,6 @@ add_executable(map_pipe_test src/core/lib/debug/trace_flags.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/per_cpu.cc - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc src/core/lib/iomgr/closure.cc src/core/lib/iomgr/combiner.cc src/core/lib/iomgr/error.cc @@ -19781,7 +19818,12 @@ add_executable(map_pipe_test src/core/lib/slice/percent_encoding.cc src/core/lib/slice/slice.cc src/core/lib/slice/slice_string_helpers.cc + src/core/util/dump_args.cc + src/core/util/glob.cc src/core/util/latent_see.cc + src/core/util/per_cpu.cc + src/core/util/status_helper.cc + src/core/util/time.cc test/core/promise/map_pipe_test.cc ) if(WIN32 AND MSVC) @@ -19831,7 +19873,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(match_test - test/core/gprpp/match_test.cc + test/core/util/match_test.cc ) target_compile_features(match_test PUBLIC cxx_std_14) target_include_directories(match_test @@ -19863,7 +19905,6 @@ endif() if(gRPC_BUILD_TESTS) add_executable(matchers_test - test/core/matchers/matchers_test.cc test/core/test_util/cmdline.cc test/core/test_util/fuzzer_util.cc test/core/test_util/grpc_profiler.cc @@ -19873,6 +19914,7 @@ add_executable(matchers_test test/core/test_util/resolve_localhost_ip46.cc test/core/test_util/slice_splitter.cc test/core/test_util/tracer_util.cc + test/core/util/matchers_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -20697,11 +20739,11 @@ if(gRPC_BUILD_TESTS) add_executable(mpsc_test src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/per_cpu.cc src/core/lib/promise/activity.cc + src/core/util/dump_args.cc + src/core/util/glob.cc src/core/util/latent_see.cc + src/core/util/per_cpu.cc test/core/promise/mpsc_test.cc ) if(WIN32 AND MSVC) @@ -20749,7 +20791,7 @@ if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(mpscq_test - test/core/gprpp/mpscq_test.cc + test/core/util/mpscq_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -20855,7 +20897,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(no_destruct_test - test/core/gprpp/no_destruct_test.cc + test/core/util/no_destruct_test.cc ) target_compile_features(no_destruct_test PUBLIC cxx_std_14) target_include_directories(no_destruct_test @@ -21115,7 +21157,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(notification_test - test/core/gprpp/notification_test.cc + test/core/util/notification_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -21200,11 +21242,11 @@ if(gRPC_BUILD_TESTS) add_executable(observable_test src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/per_cpu.cc src/core/lib/promise/activity.cc + src/core/util/dump_args.cc + src/core/util/glob.cc src/core/util/latent_see.cc + src/core/util/per_cpu.cc test/core/promise/observable_test.cc ) if(WIN32 AND MSVC) @@ -21352,7 +21394,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(orphanable_test - test/core/gprpp/orphanable_test.cc + test/core/util/orphanable_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -21629,7 +21671,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(overload_test - test/core/gprpp/overload_test.cc + test/core/util/overload_test.cc ) target_compile_features(overload_test PUBLIC cxx_std_14) target_include_directories(overload_test @@ -21997,10 +22039,6 @@ add_executable(periodic_update_test src/core/lib/debug/trace_flags.cc src/core/lib/experiments/config.cc src/core/lib/experiments/experiments.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/per_cpu.cc - src/core/lib/gprpp/status_helper.cc - src/core/lib/gprpp/time.cc src/core/lib/iomgr/closure.cc src/core/lib/iomgr/combiner.cc src/core/lib/iomgr/error.cc @@ -22011,7 +22049,11 @@ add_executable(periodic_update_test src/core/lib/slice/percent_encoding.cc src/core/lib/slice/slice.cc src/core/lib/slice/slice_string_helpers.cc + src/core/util/glob.cc src/core/util/latent_see.cc + src/core/util/per_cpu.cc + src/core/util/status_helper.cc + src/core/util/time.cc test/core/resource_quota/periodic_update_test.cc ) if(WIN32 AND MSVC) @@ -23077,11 +23119,11 @@ if(gRPC_BUILD_TESTS) add_executable(promise_mutex_test src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/per_cpu.cc src/core/lib/promise/activity.cc + src/core/util/dump_args.cc + src/core/util/glob.cc src/core/util/latent_see.cc + src/core/util/per_cpu.cc test/core/promise/promise_mutex_test.cc ) if(WIN32 AND MSVC) @@ -23664,8 +23706,8 @@ endif() if(gRPC_BUILD_TESTS) add_executable(random_early_detection_test - src/core/lib/backoff/random_early_detection.cc - test/core/backoff/random_early_detection_test.cc + src/core/util/random_early_detection.cc + test/core/util/random_early_detection_test.cc ) target_compile_features(random_early_detection_test PUBLIC cxx_std_14) target_include_directories(random_early_detection_test @@ -23858,7 +23900,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(ref_counted_ptr_test - test/core/gprpp/ref_counted_ptr_test.cc + test/core/util/ref_counted_ptr_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -23900,7 +23942,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(ref_counted_test - test/core/gprpp/ref_counted_test.cc + test/core/util/ref_counted_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -27212,7 +27254,7 @@ if(gRPC_BUILD_TESTS) add_executable(seq_test src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc - src/core/lib/gprpp/glob.cc + src/core/util/glob.cc test/core/promise/seq_test.cc ) if(WIN32 AND MSVC) @@ -28757,7 +28799,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(single_set_ptr_test - test/core/gprpp/single_set_ptr_test.cc + test/core/util/single_set_ptr_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -28842,9 +28884,9 @@ if(gRPC_BUILD_TESTS) add_executable(slice_string_helpers_test src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc - src/core/lib/gprpp/glob.cc src/core/lib/slice/slice.cc src/core/lib/slice/slice_string_helpers.cc + src/core/util/glob.cc test/core/slice/slice_string_helpers_test.cc ) if(WIN32 AND MSVC) @@ -29068,7 +29110,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(sorted_pack_test - test/core/gprpp/sorted_pack_test.cc + test/core/util/sorted_pack_test.cc ) target_compile_features(sorted_pack_test PUBLIC cxx_std_14) target_include_directories(sorted_pack_test @@ -29276,7 +29318,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(stat_test - test/core/gprpp/stat_test.cc + test/core/util/stat_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -29496,7 +29538,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(status_helper_test - test/core/gprpp/status_helper_test.cc + test/core/util/status_helper_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -30066,7 +30108,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(table_test - test/core/gprpp/table_test.cc + test/core/util/table_test.cc ) target_compile_features(table_test PUBLIC cxx_std_14) target_include_directories(table_test @@ -30463,8 +30505,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) @@ -30509,8 +30551,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) @@ -30559,10 +30601,10 @@ add_executable(test_core_event_engine_slice_buffer_test src/core/lib/event_engine/resolved_address.cc src/core/lib/event_engine/slice.cc src/core/lib/event_engine/slice_buffer.cc - src/core/lib/gprpp/glob.cc src/core/lib/slice/slice.cc src/core/lib/slice/slice_buffer.cc src/core/lib/slice/slice_string_helpers.cc + src/core/util/glob.cc test/core/event_engine/slice_buffer_test.cc ) if(WIN32 AND MSVC) @@ -30604,49 +30646,6 @@ target_link_libraries(test_core_event_engine_slice_buffer_test ) -endif() -if(gRPC_BUILD_TESTS) - -add_executable(test_core_gprpp_time_test - src/core/lib/gprpp/time.cc - test/core/gprpp/time_test.cc -) -if(WIN32 AND MSVC) - if(BUILD_SHARED_LIBS) - target_compile_definitions(test_core_gprpp_time_test - PRIVATE - "GPR_DLL_IMPORTS" - ) - endif() -endif() -target_compile_features(test_core_gprpp_time_test PUBLIC cxx_std_14) -target_include_directories(test_core_gprpp_time_test - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_RE2_INCLUDE_DIR} - ${_gRPC_SSL_INCLUDE_DIR} - ${_gRPC_UPB_GENERATED_DIR} - ${_gRPC_UPB_GRPC_GENERATED_DIR} - ${_gRPC_UPB_INCLUDE_DIR} - ${_gRPC_XXHASH_INCLUDE_DIR} - ${_gRPC_ZLIB_INCLUDE_DIR} - third_party/googletest/googletest/include - third_party/googletest/googletest - third_party/googletest/googlemock/include - third_party/googletest/googlemock - ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(test_core_gprpp_time_test - ${_gRPC_ALLTARGETS_LIBRARIES} - gtest - absl::statusor - gpr -) - - endif() if(gRPC_BUILD_TESTS) @@ -30959,6 +30958,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(test_core_util_time_test + src/core/util/time.cc test/core/util/time_test.cc ) if(WIN32 AND MSVC) @@ -30966,7 +30966,6 @@ if(WIN32 AND MSVC) target_compile_definitions(test_core_util_time_test PRIVATE "GPR_DLL_IMPORTS" - "GRPC_DLL_IMPORTS" ) endif() endif() @@ -30993,7 +30992,8 @@ target_include_directories(test_core_util_time_test target_link_libraries(test_core_util_time_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest - grpc_test_util + absl::statusor + gpr ) @@ -31290,7 +31290,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(thd_test - test/core/gprpp/thd_test.cc + test/core/util/thd_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -31624,7 +31624,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(time_util_test - test/core/gprpp/time_util_test.cc + test/core/util/time_util_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -32471,7 +32471,7 @@ if(gRPC_BUILD_TESTS) add_executable(try_join_test src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc - src/core/lib/gprpp/glob.cc + src/core/util/glob.cc test/core/promise/try_join_test.cc ) if(WIN32 AND MSVC) @@ -32561,7 +32561,7 @@ if(gRPC_BUILD_TESTS) add_executable(try_seq_test src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc - src/core/lib/gprpp/glob.cc + src/core/util/glob.cc test/core/promise/try_seq_test.cc ) if(WIN32 AND MSVC) @@ -32640,7 +32640,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(unique_type_name_test - test/core/gprpp/unique_type_name_test.cc + test/core/util/unique_type_name_test.cc ) target_compile_features(unique_type_name_test PUBLIC cxx_std_14) target_include_directories(unique_type_name_test @@ -32719,20 +32719,20 @@ target_link_libraries(unknown_frame_bad_client_test endif() if(gRPC_BUILD_TESTS) -add_executable(uri_parser_test - test/core/uri/uri_parser_test.cc +add_executable(uri_test + test/core/util/uri_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) - target_compile_definitions(uri_parser_test + target_compile_definitions(uri_test PRIVATE "GPR_DLL_IMPORTS" "GRPC_DLL_IMPORTS" ) endif() endif() -target_compile_features(uri_parser_test PUBLIC cxx_std_14) -target_include_directories(uri_parser_test +target_compile_features(uri_test PUBLIC cxx_std_14) +target_include_directories(uri_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include @@ -32751,7 +32751,7 @@ target_include_directories(uri_parser_test ${_gRPC_PROTO_GENS_DIR} ) -target_link_libraries(uri_parser_test +target_link_libraries(uri_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest grpc_test_util_unsecure @@ -32796,7 +32796,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(uuid_v4_test - test/core/gprpp/uuid_v4_test.cc + test/core/util/uuid_v4_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -32838,7 +32838,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(validation_errors_test - test/core/gprpp/validation_errors_test.cc + test/core/util/validation_errors_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -32924,11 +32924,11 @@ if(gRPC_BUILD_TESTS) add_executable(wait_for_callback_test src/core/lib/debug/trace.cc src/core/lib/debug/trace_flags.cc - src/core/lib/gprpp/dump_args.cc - src/core/lib/gprpp/glob.cc - src/core/lib/gprpp/per_cpu.cc src/core/lib/promise/activity.cc + src/core/util/dump_args.cc + src/core/util/glob.cc src/core/util/latent_see.cc + src/core/util/per_cpu.cc test/core/promise/wait_for_callback_test.cc ) if(WIN32 AND MSVC) @@ -33470,7 +33470,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_executable(work_serializer_test test/core/event_engine/event_engine_test_utils.cc - test/core/gprpp/work_serializer_test.cc + test/core/util/work_serializer_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) @@ -33640,7 +33640,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 767a9f3a335..17e4b30baa4 100644 --- a/Makefile +++ b/Makefile @@ -1068,8 +1068,6 @@ LIBGRPC_SRC = \ src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc \ src/core/lib/address_utils/parse_address.cc \ src/core/lib/address_utils/sockaddr_utils.cc \ - src/core/lib/backoff/backoff.cc \ - src/core/lib/backoff/random_early_detection.cc \ src/core/lib/channel/channel_args.cc \ src/core/lib/channel/channel_args_preconditioning.cc \ src/core/lib/channel/channel_stack.cc \ @@ -1085,7 +1083,6 @@ LIBGRPC_SRC = \ src/core/lib/config/config_vars_non_generated.cc \ src/core/lib/config/core_configuration.cc \ src/core/lib/config/load_config.cc \ - src/core/lib/debug/event_log.cc \ src/core/lib/debug/trace.cc \ src/core/lib/debug/trace_flags.cc \ src/core/lib/event_engine/ares_resolver.cc \ @@ -1137,34 +1134,6 @@ LIBGRPC_SRC = \ src/core/lib/event_engine/work_queue/basic_work_queue.cc \ src/core/lib/experiments/config.cc \ src/core/lib/experiments/experiments.cc \ - src/core/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/glob.cc \ - src/core/lib/gprpp/host_port.cc \ - src/core/lib/gprpp/linux/env.cc \ - src/core/lib/gprpp/load_file.cc \ - src/core/lib/gprpp/mpscq.cc \ - src/core/lib/gprpp/per_cpu.cc \ - src/core/lib/gprpp/posix/directory_reader.cc \ - src/core/lib/gprpp/posix/env.cc \ - src/core/lib/gprpp/posix/stat.cc \ - src/core/lib/gprpp/posix/thd.cc \ - src/core/lib/gprpp/ref_counted_string.cc \ - src/core/lib/gprpp/status_helper.cc \ - src/core/lib/gprpp/strerror.cc \ - src/core/lib/gprpp/tchar.cc \ - src/core/lib/gprpp/time.cc \ - src/core/lib/gprpp/time_averaged_stats.cc \ - src/core/lib/gprpp/time_util.cc \ - src/core/lib/gprpp/uuid_v4.cc \ - src/core/lib/gprpp/validation_errors.cc \ - src/core/lib/gprpp/windows/directory_reader.cc \ - src/core/lib/gprpp/windows/env.cc \ - src/core/lib/gprpp/windows/stat.cc \ - src/core/lib/gprpp/windows/thd.cc \ - src/core/lib/gprpp/work_serializer.cc \ src/core/lib/iomgr/buffer_list.cc \ src/core/lib/iomgr/call_combiner.cc \ src/core/lib/iomgr/cfstream_handle.cc \ @@ -1188,11 +1157,6 @@ LIBGRPC_SRC = \ src/core/lib/iomgr/executor.cc \ src/core/lib/iomgr/fork_posix.cc \ src/core/lib/iomgr/fork_windows.cc \ - src/core/lib/iomgr/gethostname_fallback.cc \ - src/core/lib/iomgr/gethostname_host_name_max.cc \ - src/core/lib/iomgr/gethostname_sysconf.cc \ - src/core/lib/iomgr/grpc_if_nametoindex_posix.cc \ - src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc \ src/core/lib/iomgr/internal_errqueue.cc \ src/core/lib/iomgr/iocp_windows.cc \ src/core/lib/iomgr/iomgr.cc \ @@ -1241,7 +1205,6 @@ LIBGRPC_SRC = \ src/core/lib/iomgr/wakeup_fd_nospecial.cc \ src/core/lib/iomgr/wakeup_fd_pipe.cc \ src/core/lib/iomgr/wakeup_fd_posix.cc \ - src/core/lib/matchers/matchers.cc \ src/core/lib/promise/activity.cc \ src/core/lib/promise/party.cc \ src/core/lib/promise/sleep.cc \ @@ -1361,7 +1324,6 @@ LIBGRPC_SRC = \ src/core/lib/transport/timeout_encoding.cc \ src/core/lib/transport/transport.cc \ src/core/lib/transport/transport_op_string.cc \ - src/core/lib/uri/uri_parser.cc \ src/core/load_balancing/address_filtering.cc \ src/core/load_balancing/backend_metric_parser.cc \ src/core/load_balancing/child_policy_handler.cc \ @@ -1456,7 +1418,21 @@ LIBGRPC_SRC = \ src/core/tsi/transport_security_grpc.cc \ src/core/util/alloc.cc \ src/core/util/atm.cc \ + src/core/util/backoff.cc \ + src/core/util/crash.cc \ + src/core/util/dump_args.cc \ + src/core/util/event_log.cc \ + src/core/util/examine_stack.cc \ + src/core/util/fork.cc \ src/core/util/gcp_metadata_query.cc \ + src/core/util/gethostname_fallback.cc \ + src/core/util/gethostname_host_name_max.cc \ + src/core/util/gethostname_sysconf.cc \ + src/core/util/glob.cc \ + src/core/util/gpr_time.cc \ + src/core/util/grpc_if_nametoindex_posix.cc \ + src/core/util/grpc_if_nametoindex_unsupported.cc \ + src/core/util/host_port.cc \ src/core/util/http_client/format_request.cc \ src/core/util/http_client/httpcli.cc \ src/core/util/http_client/httpcli_security_connector.cc \ @@ -1468,24 +1444,48 @@ LIBGRPC_SRC = \ src/core/util/json/json_writer.cc \ src/core/util/latent_see.cc \ src/core/util/linux/cpu.cc \ + src/core/util/linux/env.cc \ + src/core/util/load_file.cc \ src/core/util/log.cc \ + src/core/util/matchers.cc \ + src/core/util/mpscq.cc \ src/core/util/msys/tmpfile.cc \ + src/core/util/per_cpu.cc \ src/core/util/posix/cpu.cc \ + src/core/util/posix/directory_reader.cc \ + src/core/util/posix/env.cc \ + src/core/util/posix/stat.cc \ src/core/util/posix/string.cc \ src/core/util/posix/sync.cc \ + src/core/util/posix/thd.cc \ src/core/util/posix/time.cc \ src/core/util/posix/tmpfile.cc \ + src/core/util/random_early_detection.cc \ + src/core/util/ref_counted_string.cc \ + src/core/util/status_helper.cc \ + src/core/util/strerror.cc \ src/core/util/string.cc \ src/core/util/sync.cc \ src/core/util/sync_abseil.cc \ + src/core/util/tchar.cc \ src/core/util/time.cc \ + src/core/util/time_averaged_stats.cc \ src/core/util/time_precise.cc \ + src/core/util/time_util.cc \ + src/core/util/uri.cc \ + src/core/util/uuid_v4.cc \ + src/core/util/validation_errors.cc \ src/core/util/windows/cpu.cc \ + src/core/util/windows/directory_reader.cc \ + src/core/util/windows/env.cc \ + src/core/util/windows/stat.cc \ src/core/util/windows/string.cc \ src/core/util/windows/string_util.cc \ src/core/util/windows/sync.cc \ + src/core/util/windows/thd.cc \ src/core/util/windows/time.cc \ src/core/util/windows/tmpfile.cc \ + src/core/util/work_serializer.cc \ src/core/xds/grpc/certificate_provider_store.cc \ src/core/xds/grpc/file_watcher_certificate_provider_factory.cc \ src/core/xds/grpc/xds_audit_logger_registry.cc \ diff --git a/Package.swift b/Package.swift index a550e5f6dac..64e851e770a 100644 --- a/Package.swift +++ b/Package.swift @@ -1093,11 +1093,6 @@ let package = Package( "src/core/lib/address_utils/parse_address.h", "src/core/lib/address_utils/sockaddr_utils.cc", "src/core/lib/address_utils/sockaddr_utils.h", - "src/core/lib/avl/avl.h", - "src/core/lib/backoff/backoff.cc", - "src/core/lib/backoff/backoff.h", - "src/core/lib/backoff/random_early_detection.cc", - "src/core/lib/backoff/random_early_detection.h", "src/core/lib/channel/call_finalization.h", "src/core/lib/channel/channel_args.cc", "src/core/lib/channel/channel_args.h", @@ -1128,8 +1123,6 @@ let package = Package( "src/core/lib/config/core_configuration.h", "src/core/lib/config/load_config.cc", "src/core/lib/config/load_config.h", - "src/core/lib/debug/event_log.cc", - "src/core/lib/debug/event_log.h", "src/core/lib/debug/trace.cc", "src/core/lib/debug/trace.h", "src/core/lib/debug/trace_flags.cc", @@ -1250,83 +1243,6 @@ 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/glob.cc", - "src/core/lib/gprpp/glob.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/lib/iomgr/block_annotate.h", "src/core/lib/iomgr/buffer_list.cc", "src/core/lib/iomgr/buffer_list.h", @@ -1371,13 +1287,6 @@ let package = Package( "src/core/lib/iomgr/executor.h", "src/core/lib/iomgr/fork_posix.cc", "src/core/lib/iomgr/fork_windows.cc", - "src/core/lib/iomgr/gethostname.h", - "src/core/lib/iomgr/gethostname_fallback.cc", - "src/core/lib/iomgr/gethostname_host_name_max.cc", - "src/core/lib/iomgr/gethostname_sysconf.cc", - "src/core/lib/iomgr/grpc_if_nametoindex.h", - "src/core/lib/iomgr/grpc_if_nametoindex_posix.cc", - "src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc", "src/core/lib/iomgr/internal_errqueue.cc", "src/core/lib/iomgr/internal_errqueue.h", "src/core/lib/iomgr/iocp_windows.cc", @@ -1468,8 +1377,6 @@ let package = Package( "src/core/lib/iomgr/wakeup_fd_pipe.h", "src/core/lib/iomgr/wakeup_fd_posix.cc", "src/core/lib/iomgr/wakeup_fd_posix.h", - "src/core/lib/matchers/matchers.cc", - "src/core/lib/matchers/matchers.h", "src/core/lib/promise/activity.cc", "src/core/lib/promise/activity.h", "src/core/lib/promise/all_ok.h", @@ -1734,8 +1641,6 @@ let package = Package( "src/core/lib/transport/transport.h", "src/core/lib/transport/transport_fwd.h", "src/core/lib/transport/transport_op_string.cc", - "src/core/lib/uri/uri_parser.cc", - "src/core/lib/uri/uri_parser.h", "src/core/load_balancing/address_filtering.cc", "src/core/load_balancing/address_filtering.h", "src/core/load_balancing/backend_metric_data.h", @@ -1920,8 +1825,43 @@ let package = Package( "src/core/util/alloc.cc", "src/core/util/alloc.h", "src/core/util/atm.cc", + "src/core/util/atomic_utils.h", + "src/core/util/avl.h", + "src/core/util/backoff.cc", + "src/core/util/backoff.h", + "src/core/util/bitset.h", + "src/core/util/chunked_vector.h", + "src/core/util/construct_destruct.h", + "src/core/util/cpp_impl_of.h", + "src/core/util/crash.cc", + "src/core/util/crash.h", + "src/core/util/debug_location.h", + "src/core/util/directory_reader.h", + "src/core/util/down_cast.h", + "src/core/util/dual_ref_counted.h", + "src/core/util/dump_args.cc", + "src/core/util/dump_args.h", + "src/core/util/env.h", + "src/core/util/event_log.cc", + "src/core/util/event_log.h", + "src/core/util/examine_stack.cc", + "src/core/util/examine_stack.h", + "src/core/util/fork.cc", + "src/core/util/fork.h", "src/core/util/gcp_metadata_query.cc", "src/core/util/gcp_metadata_query.h", + "src/core/util/gethostname.h", + "src/core/util/gethostname_fallback.cc", + "src/core/util/gethostname_host_name_max.cc", + "src/core/util/gethostname_sysconf.cc", + "src/core/util/glob.cc", + "src/core/util/glob.h", + "src/core/util/gpr_time.cc", + "src/core/util/grpc_if_nametoindex.h", + "src/core/util/grpc_if_nametoindex_posix.cc", + "src/core/util/grpc_if_nametoindex_unsupported.cc", + "src/core/util/host_port.cc", + "src/core/util/host_port.h", "src/core/util/http_client/format_request.cc", "src/core/util/http_client/format_request.h", "src/core/util/http_client/httpcli.cc", @@ -1930,6 +1870,7 @@ let package = Package( "src/core/util/http_client/httpcli_ssl_credentials.h", "src/core/util/http_client/parser.cc", "src/core/util/http_client/parser.h", + "src/core/util/if_list.h", "src/core/util/iphone/cpu.cc", "src/core/util/json/json.h", "src/core/util/json/json_args.h", @@ -1945,33 +1886,92 @@ let package = Package( "src/core/util/latent_see.cc", "src/core/util/latent_see.h", "src/core/util/linux/cpu.cc", + "src/core/util/linux/env.cc", + "src/core/util/load_file.cc", + "src/core/util/load_file.h", "src/core/util/log.cc", "src/core/util/lru_cache.h", + "src/core/util/manual_constructor.h", + "src/core/util/match.h", + "src/core/util/matchers.cc", + "src/core/util/matchers.h", + "src/core/util/memory.h", + "src/core/util/mpscq.cc", + "src/core/util/mpscq.h", "src/core/util/msys/tmpfile.cc", + "src/core/util/no_destruct.h", + "src/core/util/notification.h", + "src/core/util/orphanable.h", + "src/core/util/overload.h", + "src/core/util/packed_table.h", + "src/core/util/per_cpu.cc", + "src/core/util/per_cpu.h", "src/core/util/posix/cpu.cc", + "src/core/util/posix/directory_reader.cc", + "src/core/util/posix/env.cc", + "src/core/util/posix/stat.cc", "src/core/util/posix/string.cc", "src/core/util/posix/sync.cc", + "src/core/util/posix/thd.cc", "src/core/util/posix/time.cc", "src/core/util/posix/tmpfile.cc", + "src/core/util/random_early_detection.cc", + "src/core/util/random_early_detection.h", + "src/core/util/ref_counted.h", + "src/core/util/ref_counted_ptr.h", + "src/core/util/ref_counted_string.cc", + "src/core/util/ref_counted_string.h", "src/core/util/ring_buffer.h", + "src/core/util/single_set_ptr.h", + "src/core/util/sorted_pack.h", "src/core/util/spinlock.h", + "src/core/util/stat.h", + "src/core/util/status_helper.cc", + "src/core/util/status_helper.h", + "src/core/util/strerror.cc", + "src/core/util/strerror.h", "src/core/util/string.cc", "src/core/util/string.h", "src/core/util/sync.cc", + "src/core/util/sync.h", "src/core/util/sync_abseil.cc", + "src/core/util/table.h", + "src/core/util/tchar.cc", + "src/core/util/tchar.h", + "src/core/util/thd.h", "src/core/util/time.cc", + "src/core/util/time.h", + "src/core/util/time_averaged_stats.cc", + "src/core/util/time_averaged_stats.h", "src/core/util/time_precise.cc", "src/core/util/time_precise.h", + "src/core/util/time_util.cc", + "src/core/util/time_util.h", "src/core/util/tmpfile.h", + "src/core/util/type_list.h", "src/core/util/unique_ptr_with_bitset.h", + "src/core/util/unique_type_name.h", "src/core/util/upb_utils.h", + "src/core/util/uri.cc", + "src/core/util/uri.h", "src/core/util/useful.h", + "src/core/util/uuid_v4.cc", + "src/core/util/uuid_v4.h", + "src/core/util/validation_errors.cc", + "src/core/util/validation_errors.h", "src/core/util/windows/cpu.cc", + "src/core/util/windows/directory_reader.cc", + "src/core/util/windows/env.cc", + "src/core/util/windows/stat.cc", "src/core/util/windows/string.cc", "src/core/util/windows/string_util.cc", "src/core/util/windows/sync.cc", + "src/core/util/windows/thd.cc", "src/core/util/windows/time.cc", "src/core/util/windows/tmpfile.cc", + "src/core/util/work_serializer.cc", + "src/core/util/work_serializer.h", + "src/core/util/xxhash_inline.h", "src/core/xds/grpc/certificate_provider_store.cc", "src/core/xds/grpc/certificate_provider_store.h", "src/core/xds/grpc/file_watcher_certificate_provider_factory.cc", diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index 2d75546550c..c70e708cea4 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -55,25 +55,25 @@ 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/alloc.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/string.h + - src/core/util/sync.h + - src/core/util/tchar.h + - src/core/util/thd.h - src/core/util/time_precise.h + - src/core/util/time_util.h - src/core/util/tmpfile.h - src/core/util/useful.h src: @@ -81,41 +81,41 @@ 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/alloc.cc - src/core/util/atm.cc + - src/core/util/crash.cc + - src/core/util/examine_stack.cc + - src/core/util/fork.cc + - src/core/util/gpr_time.cc + - src/core/util/host_port.cc - src/core/util/iphone/cpu.cc - src/core/util/linux/cpu.cc + - src/core/util/linux/env.cc - src/core/util/log.cc + - src/core/util/mpscq.cc - src/core/util/msys/tmpfile.cc - src/core/util/posix/cpu.cc + - src/core/util/posix/env.cc + - src/core/util/posix/stat.cc - src/core/util/posix/string.cc - src/core/util/posix/sync.cc + - src/core/util/posix/thd.cc - src/core/util/posix/time.cc - src/core/util/posix/tmpfile.cc + - src/core/util/strerror.cc - src/core/util/string.cc - src/core/util/sync.cc - src/core/util/sync_abseil.cc - - src/core/util/time.cc + - src/core/util/tchar.cc - src/core/util/time_precise.cc + - src/core/util/time_util.cc - src/core/util/windows/cpu.cc + - src/core/util/windows/env.cc + - src/core/util/windows/stat.cc - src/core/util/windows/string.cc - src/core/util/windows/string_util.cc - src/core/util/windows/sync.cc + - src/core/util/windows/thd.cc - src/core/util/windows/time.cc - src/core/util/windows/tmpfile.cc deps: @@ -793,9 +793,6 @@ libs: - src/core/handshaker/tcp_connect/tcp_connect_handshaker.h - src/core/lib/address_utils/parse_address.h - src/core/lib/address_utils/sockaddr_utils.h - - src/core/lib/avl/avl.h - - src/core/lib/backoff/backoff.h - - src/core/lib/backoff/random_early_detection.h - src/core/lib/channel/call_finalization.h - src/core/lib/channel/channel_args.h - src/core/lib/channel/channel_args_preconditioning.h @@ -809,7 +806,6 @@ libs: - src/core/lib/compression/compression_internal.h - src/core/lib/compression/message_compress.h - src/core/lib/config/core_configuration.h - - src/core/lib/debug/event_log.h - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h @@ -878,39 +874,6 @@ libs: - src/core/lib/event_engine/work_queue/work_queue.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/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/glob.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/lib/iomgr/block_annotate.h - src/core/lib/iomgr/buffer_list.h - src/core/lib/iomgr/call_combiner.h @@ -932,8 +895,6 @@ libs: - src/core/lib/iomgr/event_engine_shims/tcp_client.h - src/core/lib/iomgr/exec_ctx.h - src/core/lib/iomgr/executor.h - - src/core/lib/iomgr/gethostname.h - - src/core/lib/iomgr/grpc_if_nametoindex.h - src/core/lib/iomgr/internal_errqueue.h - src/core/lib/iomgr/iocp_windows.h - src/core/lib/iomgr/iomgr.h @@ -976,7 +937,6 @@ libs: - src/core/lib/iomgr/vsock.h - src/core/lib/iomgr/wakeup_fd_pipe.h - src/core/lib/iomgr/wakeup_fd_posix.h - - src/core/lib/matchers/matchers.h - src/core/lib/promise/activity.h - src/core/lib/promise/all_ok.h - src/core/lib/promise/arena_promise.h @@ -1118,7 +1078,6 @@ libs: - src/core/lib/transport/timeout_encoding.h - src/core/lib/transport/transport.h - src/core/lib/transport/transport_fwd.h - - src/core/lib/uri/uri_parser.h - src/core/load_balancing/address_filtering.h - src/core/load_balancing/backend_metric_data.h - src/core/load_balancing/backend_metric_parser.h @@ -1208,11 +1167,26 @@ libs: - src/core/tsi/transport_security.h - src/core/tsi/transport_security_grpc.h - src/core/tsi/transport_security_interface.h + - src/core/util/atomic_utils.h + - src/core/util/avl.h + - src/core/util/backoff.h + - src/core/util/bitset.h + - src/core/util/chunked_vector.h + - src/core/util/cpp_impl_of.h + - src/core/util/directory_reader.h + - src/core/util/down_cast.h + - src/core/util/dual_ref_counted.h + - src/core/util/dump_args.h + - src/core/util/event_log.h - src/core/util/gcp_metadata_query.h + - src/core/util/gethostname.h + - src/core/util/glob.h + - src/core/util/grpc_if_nametoindex.h - src/core/util/http_client/format_request.h - src/core/util/http_client/httpcli.h - src/core/util/http_client/httpcli_ssl_credentials.h - src/core/util/http_client/parser.h + - src/core/util/if_list.h - src/core/util/json/json.h - src/core/util/json/json_args.h - src/core/util/json/json_channel_args.h @@ -1221,11 +1195,37 @@ libs: - src/core/util/json/json_util.h - src/core/util/json/json_writer.h - src/core/util/latent_see.h + - src/core/util/load_file.h - src/core/util/lru_cache.h + - src/core/util/manual_constructor.h + - src/core/util/match.h + - src/core/util/matchers.h + - src/core/util/notification.h + - src/core/util/orphanable.h + - src/core/util/overload.h + - src/core/util/packed_table.h + - src/core/util/per_cpu.h + - src/core/util/random_early_detection.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h + - src/core/util/ref_counted_string.h - src/core/util/ring_buffer.h + - src/core/util/single_set_ptr.h + - src/core/util/sorted_pack.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/table.h + - src/core/util/time.h + - src/core/util/time_averaged_stats.h + - src/core/util/type_list.h - src/core/util/unique_ptr_with_bitset.h + - src/core/util/unique_type_name.h - src/core/util/upb_utils.h + - src/core/util/uri.h + - src/core/util/uuid_v4.h + - src/core/util/validation_errors.h + - src/core/util/work_serializer.h + - src/core/util/xxhash_inline.h - src/core/xds/grpc/certificate_provider_store.h - src/core/xds/grpc/file_watcher_certificate_provider_factory.h - src/core/xds/grpc/xds_audit_logger_registry.h @@ -1670,8 +1670,6 @@ libs: - src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc - src/core/lib/address_utils/parse_address.cc - src/core/lib/address_utils/sockaddr_utils.cc - - src/core/lib/backoff/backoff.cc - - src/core/lib/backoff/random_early_detection.cc - src/core/lib/channel/channel_args.cc - src/core/lib/channel/channel_args_preconditioning.cc - src/core/lib/channel/channel_stack.cc @@ -1684,7 +1682,6 @@ libs: - src/core/lib/compression/compression_internal.cc - src/core/lib/compression/message_compress.cc - src/core/lib/config/core_configuration.cc - - src/core/lib/debug/event_log.cc - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - src/core/lib/event_engine/ares_resolver.cc @@ -1735,19 +1732,6 @@ libs: - src/core/lib/event_engine/work_queue/basic_work_queue.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.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/lib/iomgr/buffer_list.cc - src/core/lib/iomgr/call_combiner.cc - src/core/lib/iomgr/cfstream_handle.cc @@ -1771,11 +1755,6 @@ libs: - src/core/lib/iomgr/executor.cc - src/core/lib/iomgr/fork_posix.cc - src/core/lib/iomgr/fork_windows.cc - - src/core/lib/iomgr/gethostname_fallback.cc - - src/core/lib/iomgr/gethostname_host_name_max.cc - - src/core/lib/iomgr/gethostname_sysconf.cc - - src/core/lib/iomgr/grpc_if_nametoindex_posix.cc - - src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc - src/core/lib/iomgr/internal_errqueue.cc - src/core/lib/iomgr/iocp_windows.cc - src/core/lib/iomgr/iomgr.cc @@ -1824,7 +1803,6 @@ libs: - src/core/lib/iomgr/wakeup_fd_nospecial.cc - src/core/lib/iomgr/wakeup_fd_pipe.cc - src/core/lib/iomgr/wakeup_fd_posix.cc - - src/core/lib/matchers/matchers.cc - src/core/lib/promise/activity.cc - src/core/lib/promise/party.cc - src/core/lib/promise/sleep.cc @@ -1944,7 +1922,6 @@ libs: - src/core/lib/transport/timeout_encoding.cc - src/core/lib/transport/transport.cc - src/core/lib/transport/transport_op_string.cc - - src/core/lib/uri/uri_parser.cc - src/core/load_balancing/address_filtering.cc - src/core/load_balancing/backend_metric_parser.cc - src/core/load_balancing/child_policy_handler.cc @@ -2037,7 +2014,16 @@ libs: - src/core/tsi/ssl_transport_security_utils.cc - src/core/tsi/transport_security.cc - src/core/tsi/transport_security_grpc.cc + - src/core/util/backoff.cc + - src/core/util/dump_args.cc + - src/core/util/event_log.cc - src/core/util/gcp_metadata_query.cc + - src/core/util/gethostname_fallback.cc + - src/core/util/gethostname_host_name_max.cc + - src/core/util/gethostname_sysconf.cc + - src/core/util/glob.cc + - src/core/util/grpc_if_nametoindex_posix.cc + - src/core/util/grpc_if_nametoindex_unsupported.cc - src/core/util/http_client/format_request.cc - src/core/util/http_client/httpcli.cc - src/core/util/http_client/httpcli_security_connector.cc @@ -2047,6 +2033,20 @@ libs: - src/core/util/json/json_util.cc - src/core/util/json/json_writer.cc - src/core/util/latent_see.cc + - src/core/util/load_file.cc + - src/core/util/matchers.cc + - src/core/util/per_cpu.cc + - src/core/util/posix/directory_reader.cc + - src/core/util/random_early_detection.cc + - src/core/util/ref_counted_string.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc + - src/core/util/time_averaged_stats.cc + - src/core/util/uri.cc + - src/core/util/uuid_v4.cc + - src/core/util/validation_errors.cc + - src/core/util/windows/directory_reader.cc + - src/core/util/work_serializer.cc - src/core/xds/grpc/certificate_provider_store.cc - src/core/xds/grpc/file_watcher_certificate_provider_factory.cc - src/core/xds/grpc/xds_audit_logger_registry.cc @@ -2367,9 +2367,6 @@ libs: - src/core/handshaker/tcp_connect/tcp_connect_handshaker.h - src/core/lib/address_utils/parse_address.h - src/core/lib/address_utils/sockaddr_utils.h - - src/core/lib/avl/avl.h - - src/core/lib/backoff/backoff.h - - src/core/lib/backoff/random_early_detection.h - src/core/lib/channel/call_finalization.h - src/core/lib/channel/channel_args.h - src/core/lib/channel/channel_args_preconditioning.h @@ -2383,7 +2380,6 @@ libs: - src/core/lib/compression/compression_internal.h - src/core/lib/compression/message_compress.h - src/core/lib/config/core_configuration.h - - src/core/lib/debug/event_log.h - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h @@ -2452,37 +2448,6 @@ libs: - src/core/lib/event_engine/work_queue/work_queue.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/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/glob.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/iomgr/block_annotate.h - src/core/lib/iomgr/buffer_list.h - src/core/lib/iomgr/call_combiner.h @@ -2504,8 +2469,6 @@ libs: - src/core/lib/iomgr/event_engine_shims/tcp_client.h - src/core/lib/iomgr/exec_ctx.h - src/core/lib/iomgr/executor.h - - src/core/lib/iomgr/gethostname.h - - src/core/lib/iomgr/grpc_if_nametoindex.h - src/core/lib/iomgr/internal_errqueue.h - src/core/lib/iomgr/iocp_windows.h - src/core/lib/iomgr/iomgr.h @@ -2656,7 +2619,6 @@ libs: - src/core/lib/transport/timeout_encoding.h - src/core/lib/transport/transport.h - src/core/lib/transport/transport_fwd.h - - src/core/lib/uri/uri_parser.h - src/core/load_balancing/address_filtering.h - src/core/load_balancing/backend_metric_data.h - src/core/load_balancing/backend_metric_parser.h @@ -2714,9 +2676,23 @@ libs: - src/core/tsi/transport_security.h - src/core/tsi/transport_security_grpc.h - src/core/tsi/transport_security_interface.h + - src/core/util/atomic_utils.h + - src/core/util/avl.h + - src/core/util/backoff.h + - src/core/util/bitset.h + - src/core/util/chunked_vector.h + - src/core/util/cpp_impl_of.h + - src/core/util/down_cast.h + - src/core/util/dual_ref_counted.h + - src/core/util/dump_args.h + - src/core/util/event_log.h + - src/core/util/gethostname.h + - src/core/util/glob.h + - src/core/util/grpc_if_nametoindex.h - src/core/util/http_client/format_request.h - src/core/util/http_client/httpcli.h - src/core/util/http_client/parser.h + - src/core/util/if_list.h - src/core/util/json/json.h - src/core/util/json/json_args.h - src/core/util/json/json_channel_args.h @@ -2724,10 +2700,34 @@ libs: - src/core/util/json/json_reader.h - src/core/util/json/json_writer.h - src/core/util/latent_see.h + - src/core/util/load_file.h + - src/core/util/manual_constructor.h + - src/core/util/match.h + - src/core/util/notification.h + - src/core/util/orphanable.h + - src/core/util/overload.h + - src/core/util/packed_table.h + - src/core/util/per_cpu.h + - src/core/util/random_early_detection.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h + - src/core/util/ref_counted_string.h - src/core/util/ring_buffer.h + - src/core/util/single_set_ptr.h + - src/core/util/sorted_pack.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/table.h + - src/core/util/time.h + - src/core/util/time_averaged_stats.h + - src/core/util/type_list.h - src/core/util/unique_ptr_with_bitset.h + - src/core/util/unique_type_name.h - src/core/util/upb_utils.h + - src/core/util/uri.h + - src/core/util/uuid_v4.h + - src/core/util/validation_errors.h + - src/core/util/work_serializer.h - third_party/upb/upb/generated_code_support.h src: - src/core/channelz/channel_trace.cc @@ -2825,8 +2825,6 @@ libs: - src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc - src/core/lib/address_utils/parse_address.cc - src/core/lib/address_utils/sockaddr_utils.cc - - src/core/lib/backoff/backoff.cc - - src/core/lib/backoff/random_early_detection.cc - src/core/lib/channel/channel_args.cc - src/core/lib/channel/channel_args_preconditioning.cc - src/core/lib/channel/channel_stack.cc @@ -2839,7 +2837,6 @@ libs: - src/core/lib/compression/compression_internal.cc - src/core/lib/compression/message_compress.cc - src/core/lib/config/core_configuration.cc - - src/core/lib/debug/event_log.cc - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - src/core/lib/event_engine/ares_resolver.cc @@ -2890,17 +2887,6 @@ libs: - src/core/lib/event_engine/work_queue/basic_work_queue.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.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/lib/iomgr/buffer_list.cc - src/core/lib/iomgr/call_combiner.cc - src/core/lib/iomgr/cfstream_handle.cc @@ -2924,11 +2910,6 @@ libs: - src/core/lib/iomgr/executor.cc - src/core/lib/iomgr/fork_posix.cc - src/core/lib/iomgr/fork_windows.cc - - src/core/lib/iomgr/gethostname_fallback.cc - - src/core/lib/iomgr/gethostname_host_name_max.cc - - src/core/lib/iomgr/gethostname_sysconf.cc - - src/core/lib/iomgr/grpc_if_nametoindex_posix.cc - - src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc - src/core/lib/iomgr/internal_errqueue.cc - src/core/lib/iomgr/iocp_windows.cc - src/core/lib/iomgr/iomgr.cc @@ -3060,7 +3041,6 @@ libs: - src/core/lib/transport/timeout_encoding.cc - src/core/lib/transport/transport.cc - src/core/lib/transport/transport_op_string.cc - - src/core/lib/uri/uri_parser.cc - src/core/load_balancing/address_filtering.cc - src/core/load_balancing/backend_metric_parser.cc - src/core/load_balancing/child_policy_handler.cc @@ -3116,6 +3096,15 @@ libs: - src/core/tsi/local_transport_security.cc - src/core/tsi/transport_security.cc - src/core/tsi/transport_security_grpc.cc + - src/core/util/backoff.cc + - src/core/util/dump_args.cc + - src/core/util/event_log.cc + - src/core/util/gethostname_fallback.cc + - src/core/util/gethostname_host_name_max.cc + - src/core/util/gethostname_sysconf.cc + - src/core/util/glob.cc + - src/core/util/grpc_if_nametoindex_posix.cc + - src/core/util/grpc_if_nametoindex_unsupported.cc - src/core/util/http_client/format_request.cc - src/core/util/http_client/httpcli.cc - src/core/util/http_client/parser.cc @@ -3123,6 +3112,17 @@ libs: - src/core/util/json/json_reader.cc - src/core/util/json/json_writer.cc - src/core/util/latent_see.cc + - src/core/util/load_file.cc + - src/core/util/per_cpu.cc + - src/core/util/random_early_detection.cc + - src/core/util/ref_counted_string.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc + - src/core/util/time_averaged_stats.cc + - src/core/util/uri.cc + - src/core/util/uuid_v4.cc + - src/core/util/validation_errors.cc + - src/core/util/work_serializer.cc deps: - upb_mini_descriptor_lib - upb_wire_lib @@ -4465,8 +4465,6 @@ libs: - src/core/handshaker/security/security_handshaker.h - src/core/lib/address_utils/parse_address.h - src/core/lib/address_utils/sockaddr_utils.h - - src/core/lib/avl/avl.h - - src/core/lib/backoff/backoff.h - src/core/lib/channel/call_finalization.h - src/core/lib/channel/channel_args.h - src/core/lib/channel/channel_args_preconditioning.h @@ -4480,7 +4478,6 @@ libs: - src/core/lib/compression/compression_internal.h - src/core/lib/compression/message_compress.h - src/core/lib/config/core_configuration.h - - src/core/lib/debug/event_log.h - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h @@ -4549,36 +4546,6 @@ libs: - src/core/lib/event_engine/work_queue/work_queue.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/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/glob.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/validation_errors.h - - src/core/lib/gprpp/work_serializer.h - src/core/lib/iomgr/block_annotate.h - src/core/lib/iomgr/buffer_list.h - src/core/lib/iomgr/call_combiner.h @@ -4600,8 +4567,6 @@ libs: - src/core/lib/iomgr/event_engine_shims/tcp_client.h - src/core/lib/iomgr/exec_ctx.h - src/core/lib/iomgr/executor.h - - src/core/lib/iomgr/gethostname.h - - src/core/lib/iomgr/grpc_if_nametoindex.h - src/core/lib/iomgr/internal_errqueue.h - src/core/lib/iomgr/iocp_windows.h - src/core/lib/iomgr/iomgr.h @@ -4644,7 +4609,6 @@ libs: - src/core/lib/iomgr/vsock.h - src/core/lib/iomgr/wakeup_fd_pipe.h - src/core/lib/iomgr/wakeup_fd_posix.h - - src/core/lib/matchers/matchers.h - src/core/lib/promise/activity.h - src/core/lib/promise/all_ok.h - src/core/lib/promise/arena_promise.h @@ -4749,7 +4713,6 @@ libs: - src/core/lib/transport/timeout_encoding.h - src/core/lib/transport/transport.h - src/core/lib/transport/transport_fwd.h - - src/core/lib/uri/uri_parser.h - src/core/load_balancing/backend_metric_data.h - src/core/load_balancing/lb_policy.h - src/core/load_balancing/lb_policy_factory.h @@ -4774,13 +4737,50 @@ libs: - src/core/tsi/transport_security.h - src/core/tsi/transport_security_grpc.h - src/core/tsi/transport_security_interface.h + - src/core/util/atomic_utils.h + - src/core/util/avl.h + - src/core/util/backoff.h + - src/core/util/bitset.h + - src/core/util/chunked_vector.h + - src/core/util/cpp_impl_of.h + - src/core/util/down_cast.h + - src/core/util/dual_ref_counted.h + - src/core/util/dump_args.h + - src/core/util/event_log.h + - src/core/util/gethostname.h + - src/core/util/glob.h + - src/core/util/grpc_if_nametoindex.h + - src/core/util/if_list.h - src/core/util/json/json.h - src/core/util/json/json_args.h - src/core/util/json/json_reader.h - src/core/util/json/json_writer.h - src/core/util/latent_see.h + - src/core/util/load_file.h + - src/core/util/manual_constructor.h + - src/core/util/match.h + - src/core/util/matchers.h + - src/core/util/notification.h + - src/core/util/orphanable.h + - src/core/util/overload.h + - src/core/util/packed_table.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h + - src/core/util/ref_counted_string.h - src/core/util/ring_buffer.h + - src/core/util/single_set_ptr.h + - src/core/util/sorted_pack.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/table.h + - src/core/util/time.h + - src/core/util/time_averaged_stats.h + - src/core/util/type_list.h + - src/core/util/unique_type_name.h + - src/core/util/uri.h + - src/core/util/validation_errors.h + - src/core/util/work_serializer.h - third_party/upb/upb/generated_code_support.h src: - src/core/channelz/channel_trace.cc @@ -4799,7 +4799,6 @@ libs: - src/core/handshaker/security/security_handshaker.cc - src/core/lib/address_utils/parse_address.cc - src/core/lib/address_utils/sockaddr_utils.cc - - src/core/lib/backoff/backoff.cc - src/core/lib/channel/channel_args.cc - src/core/lib/channel/channel_args_preconditioning.cc - src/core/lib/channel/channel_stack.cc @@ -4812,7 +4811,6 @@ libs: - src/core/lib/compression/compression_internal.cc - src/core/lib/compression/message_compress.cc - src/core/lib/config/core_configuration.cc - - src/core/lib/debug/event_log.cc - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - src/core/lib/event_engine/ares_resolver.cc @@ -4863,16 +4861,6 @@ libs: - src/core/lib/event_engine/work_queue/basic_work_queue.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.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/lib/iomgr/buffer_list.cc - src/core/lib/iomgr/call_combiner.cc - src/core/lib/iomgr/cfstream_handle.cc @@ -4896,11 +4884,6 @@ libs: - src/core/lib/iomgr/executor.cc - src/core/lib/iomgr/fork_posix.cc - src/core/lib/iomgr/fork_windows.cc - - src/core/lib/iomgr/gethostname_fallback.cc - - src/core/lib/iomgr/gethostname_host_name_max.cc - - src/core/lib/iomgr/gethostname_sysconf.cc - - src/core/lib/iomgr/grpc_if_nametoindex_posix.cc - - src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc - src/core/lib/iomgr/internal_errqueue.cc - src/core/lib/iomgr/iocp_windows.cc - src/core/lib/iomgr/iomgr.cc @@ -4949,7 +4932,6 @@ libs: - src/core/lib/iomgr/wakeup_fd_nospecial.cc - src/core/lib/iomgr/wakeup_fd_pipe.cc - src/core/lib/iomgr/wakeup_fd_posix.cc - - src/core/lib/matchers/matchers.cc - src/core/lib/promise/activity.cc - src/core/lib/promise/party.cc - src/core/lib/resource_quota/api.cc @@ -5030,7 +5012,6 @@ libs: - src/core/lib/transport/timeout_encoding.cc - src/core/lib/transport/transport.cc - src/core/lib/transport/transport_op_string.cc - - src/core/lib/uri/uri_parser.cc - src/core/load_balancing/lb_policy.cc - src/core/load_balancing/lb_policy_registry.cc - src/core/resolver/endpoint_addresses.cc @@ -5045,9 +5026,28 @@ libs: - src/core/tsi/alts/handshaker/transport_security_common_api.cc - src/core/tsi/transport_security.cc - src/core/tsi/transport_security_grpc.cc + - src/core/util/backoff.cc + - src/core/util/dump_args.cc + - src/core/util/event_log.cc + - src/core/util/gethostname_fallback.cc + - src/core/util/gethostname_host_name_max.cc + - src/core/util/gethostname_sysconf.cc + - src/core/util/glob.cc + - src/core/util/grpc_if_nametoindex_posix.cc + - src/core/util/grpc_if_nametoindex_unsupported.cc - src/core/util/json/json_reader.cc - src/core/util/json/json_writer.cc - src/core/util/latent_see.cc + - src/core/util/load_file.cc + - src/core/util/matchers.cc + - src/core/util/per_cpu.cc + - src/core/util/ref_counted_string.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc + - src/core/util/time_averaged_stats.cc + - src/core/util/uri.cc + - src/core/util/validation_errors.cc + - src/core/util/work_serializer.cc deps: - upb_mini_descriptor_lib - upb_wire_lib @@ -5230,15 +5230,6 @@ targets: - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.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/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/orphanable.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/promise/activity.h - src/core/lib/promise/context.h - src/core/lib/promise/detail/basic_seq.h @@ -5253,17 +5244,26 @@ targets: - src/core/lib/promise/promise.h - src/core/lib/promise/seq.h - src/core/lib/promise/wait_set.h + - src/core/util/atomic_utils.h + - src/core/util/bitset.h + - src/core/util/down_cast.h + - src/core/util/dump_args.h + - src/core/util/glob.h - src/core/util/latent_see.h + - src/core/util/orphanable.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/ring_buffer.h - test/core/promise/test_wakeup_schedulers.h src: - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/per_cpu.cc - src/core/lib/promise/activity.cc + - src/core/util/dump_args.cc + - src/core/util/glob.cc - src/core/util/latent_see.cc + - src/core/util/per_cpu.cc - test/core/promise/activity_test.cc deps: - gtest @@ -5395,8 +5395,6 @@ targets: - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/glob.h - src/core/lib/promise/all_ok.h - src/core/lib/promise/detail/join_state.h - src/core/lib/promise/detail/promise_like.h @@ -5404,10 +5402,12 @@ targets: - src/core/lib/promise/map.h - src/core/lib/promise/poll.h - src/core/lib/promise/status_flag.h + - src/core/util/bitset.h + - src/core/util/glob.h src: - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - - src/core/lib/gprpp/glob.cc + - src/core/util/glob.cc - test/core/promise/all_ok_test.cc deps: - gtest @@ -5750,13 +5750,13 @@ targets: build: test language: c++ headers: - - src/core/lib/avl/avl.h - - 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/avl.h + - src/core/util/down_cast.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h src: - - test/core/avl/avl_test.cc + - test/core/util/avl_test.cc deps: - gtest - absl/base:config @@ -5816,7 +5816,7 @@ targets: language: c++ headers: [] src: - - test/core/backoff/backoff_test.cc + - test/core/util/backoff_test.cc deps: - gtest - grpc_test_util @@ -6257,10 +6257,10 @@ 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 + - test/core/util/bitset_test.cc deps: - gtest - absl/log:check @@ -6405,7 +6405,6 @@ targets: - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h - src/core/ext/upb-gen/google/rpc/status.upb.h - src/core/ext/upb-gen/google/rpc/status.upb_minitable.h - - src/core/lib/avl/avl.h - src/core/lib/channel/channel_args.h - src/core/lib/compression/compression_internal.h - src/core/lib/debug/trace.h @@ -6413,27 +6412,6 @@ targets: - src/core/lib/debug/trace_impl.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/glob.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/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/type_list.h - src/core/lib/iomgr/closure.h - src/core/lib/iomgr/combiner.h - src/core/lib/iomgr/error.h @@ -6485,9 +6463,31 @@ targets: - src/core/lib/transport/simple_slice_based_metadata.h - src/core/lib/transport/status_conversion.h - src/core/lib/transport/timeout_encoding.h + - src/core/util/atomic_utils.h + - src/core/util/avl.h + - src/core/util/bitset.h + - src/core/util/chunked_vector.h + - src/core/util/cpp_impl_of.h + - src/core/util/down_cast.h + - src/core/util/dual_ref_counted.h + - src/core/util/dump_args.h + - src/core/util/glob.h + - src/core/util/if_list.h - src/core/util/latent_see.h + - src/core/util/manual_constructor.h + - src/core/util/orphanable.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/ring_buffer.h + - src/core/util/sorted_pack.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/table.h + - src/core/util/time.h + - src/core/util/type_list.h - test/core/promise/poll_matcher.h - third_party/upb/upb/generated_code_support.h src: @@ -6500,12 +6500,6 @@ targets: - src/core/lib/debug/trace_flags.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.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/iomgr/closure.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/error.cc @@ -6534,7 +6528,13 @@ targets: - src/core/lib/transport/parsed_metadata.cc - src/core/lib/transport/status_conversion.cc - src/core/lib/transport/timeout_encoding.cc + - src/core/util/dump_args.cc + - src/core/util/glob.cc - src/core/util/latent_see.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 - test/core/transport/call_filters_test.cc deps: - gtest @@ -6657,14 +6657,6 @@ targets: - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/orphanable.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/promise/activity.h - src/core/lib/promise/context.h - src/core/lib/promise/detail/promise_factory.h @@ -6673,18 +6665,26 @@ targets: - src/core/lib/promise/poll.h - src/core/lib/promise/status_flag.h - src/core/lib/transport/call_state.h + - src/core/util/atomic_utils.h + - src/core/util/down_cast.h + - src/core/util/dump_args.h + - src/core/util/glob.h - src/core/util/latent_see.h + - src/core/util/orphanable.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/ring_buffer.h - test/core/promise/poll_matcher.h src: - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/per_cpu.cc - src/core/lib/promise/activity.cc - src/core/lib/transport/call_state.cc + - src/core/util/dump_args.cc + - src/core/util/glob.cc - src/core/util/latent_see.cc + - src/core/util/per_cpu.cc - test/core/transport/call_state_test.cc deps: - gtest @@ -6732,8 +6732,6 @@ targets: - src/core/handshaker/proxy_mapper_registry.h - src/core/lib/address_utils/parse_address.h - src/core/lib/address_utils/sockaddr_utils.h - - src/core/lib/avl/avl.h - - src/core/lib/backoff/backoff.h - src/core/lib/channel/call_finalization.h - src/core/lib/channel/channel_args.h - src/core/lib/channel/channel_args_preconditioning.h @@ -6747,7 +6745,6 @@ targets: - src/core/lib/compression/compression_internal.h - src/core/lib/compression/message_compress.h - src/core/lib/config/core_configuration.h - - src/core/lib/debug/event_log.h - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h @@ -6816,36 +6813,6 @@ targets: - src/core/lib/event_engine/work_queue/work_queue.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/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/glob.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/validation_errors.h - - src/core/lib/gprpp/work_serializer.h - src/core/lib/iomgr/block_annotate.h - src/core/lib/iomgr/buffer_list.h - src/core/lib/iomgr/call_combiner.h @@ -6867,8 +6834,6 @@ targets: - src/core/lib/iomgr/event_engine_shims/tcp_client.h - src/core/lib/iomgr/exec_ctx.h - src/core/lib/iomgr/executor.h - - src/core/lib/iomgr/gethostname.h - - src/core/lib/iomgr/grpc_if_nametoindex.h - src/core/lib/iomgr/internal_errqueue.h - src/core/lib/iomgr/iocp_windows.h - src/core/lib/iomgr/iomgr.h @@ -6993,7 +6958,6 @@ targets: - src/core/lib/transport/timeout_encoding.h - src/core/lib/transport/transport.h - src/core/lib/transport/transport_fwd.h - - src/core/lib/uri/uri_parser.h - src/core/load_balancing/backend_metric_data.h - src/core/load_balancing/lb_policy.h - src/core/load_balancing/lb_policy_factory.h @@ -7015,12 +6979,48 @@ targets: - src/core/telemetry/stats_data.h - src/core/telemetry/tcp_tracer.h - src/core/tsi/alts/handshaker/transport_security_common_api.h + - src/core/util/atomic_utils.h + - src/core/util/avl.h + - src/core/util/backoff.h + - src/core/util/bitset.h + - src/core/util/chunked_vector.h + - src/core/util/cpp_impl_of.h + - src/core/util/down_cast.h + - src/core/util/dual_ref_counted.h + - src/core/util/dump_args.h + - src/core/util/event_log.h + - src/core/util/gethostname.h + - src/core/util/glob.h + - src/core/util/grpc_if_nametoindex.h + - src/core/util/if_list.h - src/core/util/json/json.h - src/core/util/json/json_args.h - src/core/util/json/json_writer.h - src/core/util/latent_see.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/ring_buffer.h + - src/core/util/single_set_ptr.h + - src/core/util/sorted_pack.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/table.h + - src/core/util/time.h + - src/core/util/time_averaged_stats.h + - src/core/util/type_list.h + - src/core/util/unique_type_name.h + - src/core/util/uri.h + - src/core/util/validation_errors.h + - src/core/util/work_serializer.h - third_party/upb/upb/generated_code_support.h src: - src/core/channelz/channel_trace.cc @@ -7035,7 +7035,6 @@ targets: - src/core/handshaker/proxy_mapper_registry.cc - src/core/lib/address_utils/parse_address.cc - src/core/lib/address_utils/sockaddr_utils.cc - - src/core/lib/backoff/backoff.cc - src/core/lib/channel/channel_args.cc - src/core/lib/channel/channel_args_preconditioning.cc - src/core/lib/channel/channel_stack.cc @@ -7048,7 +7047,6 @@ targets: - src/core/lib/compression/compression_internal.cc - src/core/lib/compression/message_compress.cc - src/core/lib/config/core_configuration.cc - - src/core/lib/debug/event_log.cc - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - src/core/lib/event_engine/ares_resolver.cc @@ -7099,16 +7097,6 @@ targets: - src/core/lib/event_engine/work_queue/basic_work_queue.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.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/lib/iomgr/buffer_list.cc - src/core/lib/iomgr/call_combiner.cc - src/core/lib/iomgr/cfstream_handle.cc @@ -7132,11 +7120,6 @@ targets: - src/core/lib/iomgr/executor.cc - src/core/lib/iomgr/fork_posix.cc - src/core/lib/iomgr/fork_windows.cc - - src/core/lib/iomgr/gethostname_fallback.cc - - src/core/lib/iomgr/gethostname_host_name_max.cc - - src/core/lib/iomgr/gethostname_sysconf.cc - - src/core/lib/iomgr/grpc_if_nametoindex_posix.cc - - src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc - src/core/lib/iomgr/internal_errqueue.cc - src/core/lib/iomgr/iocp_windows.cc - src/core/lib/iomgr/iomgr.cc @@ -7242,7 +7225,6 @@ targets: - src/core/lib/transport/timeout_encoding.cc - src/core/lib/transport/transport.cc - src/core/lib/transport/transport_op_string.cc - - src/core/lib/uri/uri_parser.cc - src/core/load_balancing/lb_policy.cc - src/core/load_balancing/lb_policy_registry.cc - src/core/resolver/endpoint_addresses.cc @@ -7255,8 +7237,26 @@ targets: - src/core/telemetry/stats.cc - src/core/telemetry/stats_data.cc - src/core/tsi/alts/handshaker/transport_security_common_api.cc + - src/core/util/backoff.cc + - src/core/util/dump_args.cc + - src/core/util/event_log.cc + - src/core/util/gethostname_fallback.cc + - src/core/util/gethostname_host_name_max.cc + - src/core/util/gethostname_sysconf.cc + - src/core/util/glob.cc + - src/core/util/grpc_if_nametoindex_posix.cc + - src/core/util/grpc_if_nametoindex_unsupported.cc - src/core/util/json/json_writer.cc - src/core/util/latent_see.cc + - src/core/util/load_file.cc + - src/core/util/per_cpu.cc + - src/core/util/ref_counted_string.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc + - src/core/util/time_averaged_stats.cc + - src/core/util/uri.cc + - src/core/util/validation_errors.cc + - src/core/util/work_serializer.cc - test/core/call/call_utils_test.cc deps: - gtest @@ -7628,19 +7628,6 @@ targets: - src/core/lib/debug/trace_impl.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/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/manual_constructor.h - - src/core/lib/gprpp/orphanable.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/status_helper.h - - src/core/lib/gprpp/time.h - src/core/lib/iomgr/closure.h - src/core/lib/iomgr/combiner.h - src/core/lib/iomgr/error.h @@ -7672,9 +7659,22 @@ targets: - src/core/lib/slice/slice_internal.h - src/core/lib/slice/slice_refcount.h - src/core/lib/slice/slice_string_helpers.h + - src/core/util/atomic_utils.h + - src/core/util/bitset.h + - src/core/util/cpp_impl_of.h + - src/core/util/down_cast.h + - src/core/util/dump_args.h + - src/core/util/glob.h - src/core/util/latent_see.h + - src/core/util/manual_constructor.h + - src/core/util/orphanable.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/ring_buffer.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/time.h - third_party/upb/upb/generated_code_support.h src: - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c @@ -7683,11 +7683,6 @@ targets: - src/core/lib/debug/trace_flags.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/per_cpu.cc - - src/core/lib/gprpp/status_helper.cc - - src/core/lib/gprpp/time.cc - src/core/lib/iomgr/closure.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/error.cc @@ -7704,7 +7699,12 @@ targets: - src/core/lib/slice/percent_encoding.cc - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_string_helpers.cc + - src/core/util/dump_args.cc + - src/core/util/glob.cc - src/core/util/latent_see.cc + - src/core/util/per_cpu.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc - test/core/promise/cancel_callback_test.cc deps: - gtest @@ -8424,20 +8424,6 @@ targets: - src/core/lib/debug/trace_impl.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/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/manual_constructor.h - - src/core/lib/gprpp/orphanable.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/status_helper.h - - src/core/lib/gprpp/time.h - src/core/lib/iomgr/closure.h - src/core/lib/iomgr/combiner.h - src/core/lib/iomgr/error.h @@ -8468,9 +8454,23 @@ targets: - src/core/lib/slice/slice_internal.h - src/core/lib/slice/slice_refcount.h - src/core/lib/slice/slice_string_helpers.h + - src/core/util/atomic_utils.h + - src/core/util/bitset.h + - src/core/util/chunked_vector.h + - src/core/util/cpp_impl_of.h + - src/core/util/down_cast.h + - src/core/util/dump_args.h + - src/core/util/glob.h - src/core/util/latent_see.h + - src/core/util/manual_constructor.h + - src/core/util/orphanable.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/ring_buffer.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/time.h - third_party/upb/upb/generated_code_support.h src: - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c @@ -8479,11 +8479,6 @@ targets: - src/core/lib/debug/trace_flags.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/per_cpu.cc - - src/core/lib/gprpp/status_helper.cc - - src/core/lib/gprpp/time.cc - src/core/lib/iomgr/closure.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/error.cc @@ -8500,8 +8495,13 @@ targets: - src/core/lib/slice/percent_encoding.cc - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_string_helpers.cc + - src/core/util/dump_args.cc + - src/core/util/glob.cc - src/core/util/latent_see.cc - - test/core/gprpp/chunked_vector_test.cc + - src/core/util/per_cpu.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc + - test/core/util/chunked_vector_test.cc deps: - gtest - upb_mini_descriptor_lib @@ -8905,7 +8905,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: @@ -9170,8 +9170,8 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/down_cast.h - src/core/lib/promise/context.h + - src/core/util/down_cast.h src: - test/core/promise/context_test.cc deps: @@ -9196,9 +9196,9 @@ 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 + - test/core/util/cpp_impl_of_test.cc deps: - gtest uses_polling: false @@ -9351,7 +9351,7 @@ targets: language: c++ headers: [] src: - - test/core/gprpp/directory_reader_test.cc + - test/core/util/directory_reader_test.cc deps: - gtest - grpc_test_util @@ -9445,9 +9445,9 @@ 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 + - test/core/util/down_cast_test.cc deps: - gtest - absl/base:config @@ -9459,7 +9459,7 @@ targets: language: c++ headers: [] src: - - test/core/gprpp/dual_ref_counted_test.cc + - test/core/util/dual_ref_counted_test.cc deps: - gtest - grpc_test_util @@ -9484,10 +9484,10 @@ 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 - - test/core/gprpp/dump_args_test.cc + - src/core/util/dump_args.cc + - test/core/util/dump_args_test.cc deps: - gtest - absl/functional:any_invocable @@ -9744,24 +9744,24 @@ targets: build: test language: c++ headers: - - src/core/lib/avl/avl.h - 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/lib/surface/channel_stack_type.h + - src/core/util/atomic_utils.h + - src/core/util/avl.h + - src/core/util/down_cast.h + - src/core/util/dual_ref_counted.h + - src/core/util/orphanable.h + - 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: - 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/lib/surface/channel_stack_type.cc + - src/core/util/ref_counted_string.cc + - src/core/util/time.cc - test/core/event_engine/endpoint_config_test.cc deps: - gtest @@ -9951,7 +9951,7 @@ targets: language: c++ headers: [] src: - - test/core/gprpp/examine_stack_test.cc + - test/core/util/examine_stack_test.cc deps: - gtest - grpc_test_util @@ -9988,18 +9988,6 @@ targets: - src/core/lib/debug/trace_impl.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/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/manual_constructor.h - - src/core/lib/gprpp/orphanable.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/status_helper.h - - src/core/lib/gprpp/time.h - src/core/lib/iomgr/closure.h - src/core/lib/iomgr/combiner.h - src/core/lib/iomgr/error.h @@ -10018,9 +10006,21 @@ targets: - src/core/lib/slice/slice_internal.h - src/core/lib/slice/slice_refcount.h - src/core/lib/slice/slice_string_helpers.h + - src/core/util/atomic_utils.h + - src/core/util/bitset.h + - src/core/util/down_cast.h + - src/core/util/dump_args.h + - src/core/util/glob.h - src/core/util/latent_see.h + - src/core/util/manual_constructor.h + - src/core/util/orphanable.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/ring_buffer.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/time.h - third_party/upb/upb/generated_code_support.h src: - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c @@ -10029,11 +10029,6 @@ targets: - src/core/lib/debug/trace_flags.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/per_cpu.cc - - src/core/lib/gprpp/status_helper.cc - - src/core/lib/gprpp/time.cc - src/core/lib/iomgr/closure.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/error.cc @@ -10044,7 +10039,12 @@ targets: - src/core/lib/slice/percent_encoding.cc - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_string_helpers.cc + - src/core/util/dump_args.cc + - src/core/util/glob.cc - src/core/util/latent_see.cc + - src/core/util/per_cpu.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc - test/core/promise/exec_ctx_wakeup_scheduler_test.cc deps: - gtest @@ -10525,19 +10525,6 @@ targets: - src/core/lib/debug/trace_impl.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/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/manual_constructor.h - - src/core/lib/gprpp/orphanable.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/status_helper.h - - src/core/lib/gprpp/time.h - src/core/lib/iomgr/closure.h - src/core/lib/iomgr/combiner.h - src/core/lib/iomgr/error.h @@ -10570,9 +10557,22 @@ targets: - src/core/lib/slice/slice_string_helpers.h - src/core/lib/transport/bdp_estimator.h - src/core/lib/transport/http2_errors.h + - src/core/util/atomic_utils.h + - src/core/util/bitset.h + - src/core/util/cpp_impl_of.h + - src/core/util/down_cast.h + - src/core/util/dump_args.h + - src/core/util/glob.h - src/core/util/latent_see.h + - src/core/util/manual_constructor.h + - src/core/util/orphanable.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/ring_buffer.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/time.h - third_party/upb/upb/generated_code_support.h src: - src/core/ext/transport/chttp2/transport/flow_control.cc @@ -10584,11 +10584,6 @@ targets: - src/core/lib/debug/trace_flags.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/per_cpu.cc - - src/core/lib/gprpp/status_helper.cc - - src/core/lib/gprpp/time.cc - src/core/lib/iomgr/closure.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/error.cc @@ -10606,7 +10601,12 @@ targets: - src/core/lib/slice/slice_buffer.cc - src/core/lib/slice/slice_string_helpers.cc - src/core/lib/transport/bdp_estimator.cc + - src/core/util/dump_args.cc + - src/core/util/glob.cc - src/core/util/latent_see.cc + - src/core/util/per_cpu.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc - test/core/transport/chttp2/flow_control_test.cc deps: - gtest @@ -10635,19 +10635,6 @@ targets: - src/core/lib/debug/trace_impl.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/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/manual_constructor.h - - src/core/lib/gprpp/orphanable.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/status_helper.h - - src/core/lib/gprpp/time.h - src/core/lib/iomgr/closure.h - src/core/lib/iomgr/combiner.h - src/core/lib/iomgr/error.h @@ -10687,9 +10674,22 @@ targets: - src/core/lib/slice/slice_internal.h - src/core/lib/slice/slice_refcount.h - src/core/lib/slice/slice_string_helpers.h + - src/core/util/atomic_utils.h + - src/core/util/bitset.h + - src/core/util/cpp_impl_of.h + - src/core/util/down_cast.h + - src/core/util/dump_args.h + - src/core/util/glob.h - src/core/util/latent_see.h + - src/core/util/manual_constructor.h + - src/core/util/orphanable.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/ring_buffer.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/time.h - test/core/promise/test_wakeup_schedulers.h - third_party/upb/upb/generated_code_support.h src: @@ -10699,11 +10699,6 @@ targets: - src/core/lib/debug/trace_flags.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/per_cpu.cc - - src/core/lib/gprpp/status_helper.cc - - src/core/lib/gprpp/time.cc - src/core/lib/iomgr/closure.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/error.cc @@ -10720,7 +10715,12 @@ targets: - src/core/lib/slice/percent_encoding.cc - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_string_helpers.cc + - src/core/util/dump_args.cc + - src/core/util/glob.cc - src/core/util/latent_see.cc + - src/core/util/per_cpu.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc - test/core/promise/for_each_test.cc deps: - gtest @@ -10740,7 +10740,7 @@ targets: language: c++ headers: [] src: - - test/core/gprpp/fork_test.cc + - test/core/util/fork_test.cc deps: - gtest - grpc_test_util @@ -10758,12 +10758,12 @@ targets: - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h - src/core/lib/event_engine/forkable.h - - src/core/lib/gprpp/glob.h + - src/core/util/glob.h src: - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - src/core/lib/event_engine/forkable.cc - - src/core/lib/gprpp/glob.cc + - src/core/util/glob.cc - test/core/event_engine/forkable_test.cc deps: - gtest @@ -10825,21 +10825,21 @@ targets: - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h - - src/core/lib/gprpp/glob.h - src/core/lib/slice/slice.h - src/core/lib/slice/slice_buffer.h - src/core/lib/slice/slice_internal.h - src/core/lib/slice/slice_refcount.h - src/core/lib/slice/slice_string_helpers.h - src/core/lib/transport/http2_errors.h + - src/core/util/glob.h src: - src/core/ext/transport/chttp2/transport/frame.cc - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - - src/core/lib/gprpp/glob.cc - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_buffer.cc - src/core/lib/slice/slice_string_helpers.cc + - src/core/util/glob.cc - test/core/transport/chttp2/frame_test.cc deps: - gtest @@ -10929,7 +10929,7 @@ targets: language: c++ headers: [] src: - - test/core/gprpp/glob_test.cc + - test/core/util/glob_test.cc deps: - gtest - grpc_test_util @@ -10958,6 +10958,17 @@ targets: deps: - gtest - grpc++_test_util +- name: gpr_time_test + gtest: true + build: test + language: c++ + headers: [] + src: + - test/core/util/gpr_time_test.cc + deps: + - gtest + - grpc_test_util + uses_polling: false - name: graceful_server_shutdown_test gtest: true build: test @@ -11814,7 +11825,7 @@ targets: language: c++ headers: [] src: - - test/core/gprpp/host_port_test.cc + - test/core/util/host_port_test.cc deps: - gtest - grpc_test_util @@ -12143,9 +12154,9 @@ 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 + - test/core/util/if_list_test.cc deps: - gtest uses_polling: false @@ -12271,14 +12282,6 @@ targets: - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/orphanable.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/promise/activity.h - src/core/lib/promise/context.h - src/core/lib/promise/detail/basic_seq.h @@ -12289,17 +12292,25 @@ targets: - src/core/lib/promise/inter_activity_pipe.h - src/core/lib/promise/poll.h - src/core/lib/promise/seq.h + - src/core/util/atomic_utils.h + - src/core/util/down_cast.h + - src/core/util/dump_args.h + - src/core/util/glob.h - src/core/util/latent_see.h + - src/core/util/orphanable.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/ring_buffer.h - test/core/promise/test_wakeup_schedulers.h src: - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/per_cpu.cc - src/core/lib/promise/activity.cc + - src/core/util/dump_args.cc + - src/core/util/glob.cc - src/core/util/latent_see.cc + - src/core/util/per_cpu.cc - test/core/promise/inter_activity_pipe_test.cc deps: - gtest @@ -12336,19 +12347,6 @@ targets: - src/core/lib/debug/trace_impl.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/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/manual_constructor.h - - src/core/lib/gprpp/orphanable.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/status_helper.h - - src/core/lib/gprpp/time.h - src/core/lib/iomgr/closure.h - src/core/lib/iomgr/combiner.h - src/core/lib/iomgr/error.h @@ -12380,9 +12378,22 @@ targets: - src/core/lib/slice/slice_internal.h - src/core/lib/slice/slice_refcount.h - src/core/lib/slice/slice_string_helpers.h + - src/core/util/atomic_utils.h + - src/core/util/bitset.h + - src/core/util/cpp_impl_of.h + - src/core/util/down_cast.h + - src/core/util/dump_args.h + - src/core/util/glob.h - src/core/util/latent_see.h + - src/core/util/manual_constructor.h + - src/core/util/orphanable.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/ring_buffer.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/time.h - test/core/promise/test_context.h - third_party/upb/upb/generated_code_support.h src: @@ -12392,11 +12403,6 @@ targets: - src/core/lib/debug/trace_flags.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/per_cpu.cc - - src/core/lib/gprpp/status_helper.cc - - src/core/lib/gprpp/time.cc - src/core/lib/iomgr/closure.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/error.cc @@ -12413,7 +12419,12 @@ targets: - src/core/lib/slice/percent_encoding.cc - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_string_helpers.cc + - src/core/util/dump_args.cc + - src/core/util/glob.cc - src/core/util/latent_see.cc + - src/core/util/per_cpu.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc - test/core/promise/interceptor_list_test.cc deps: - gtest @@ -12581,18 +12592,18 @@ targets: - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/glob.h - src/core/lib/promise/detail/join_state.h - src/core/lib/promise/detail/promise_like.h - src/core/lib/promise/join.h - src/core/lib/promise/map.h - src/core/lib/promise/poll.h + - src/core/util/bitset.h + - src/core/util/glob.h - test/core/promise/poll_matcher.h src: - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - - src/core/lib/gprpp/glob.cc + - src/core/util/glob.cc - test/core/promise/join_test.cc deps: - gtest @@ -12831,15 +12842,6 @@ targets: - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.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/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/orphanable.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/promise/activity.h - src/core/lib/promise/context.h - src/core/lib/promise/detail/basic_seq.h @@ -12853,17 +12855,26 @@ targets: - src/core/lib/promise/map.h - src/core/lib/promise/poll.h - src/core/lib/promise/seq.h + - src/core/util/atomic_utils.h + - src/core/util/bitset.h + - src/core/util/down_cast.h + - src/core/util/dump_args.h + - src/core/util/glob.h - src/core/util/latent_see.h + - src/core/util/orphanable.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/ring_buffer.h - test/core/promise/test_wakeup_schedulers.h src: - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/per_cpu.cc - src/core/lib/promise/activity.cc + - src/core/util/dump_args.cc + - src/core/util/glob.cc - src/core/util/latent_see.cc + - src/core/util/per_cpu.cc - test/core/promise/latch_test.cc deps: - gtest @@ -12954,7 +12965,7 @@ targets: language: c++ headers: [] src: - - test/core/gprpp/load_file_test.cc + - test/core/util/load_file_test.cc deps: - gtest - grpc_test_util @@ -12982,7 +12993,6 @@ targets: - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h - - src/core/lib/gprpp/glob.h - src/core/lib/promise/detail/basic_seq.h - src/core/lib/promise/detail/promise_factory.h - src/core/lib/promise/detail/promise_like.h @@ -12990,10 +13000,11 @@ targets: - src/core/lib/promise/loop.h - src/core/lib/promise/poll.h - src/core/lib/promise/seq.h + - src/core/util/glob.h src: - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - - src/core/lib/gprpp/glob.cc + - src/core/util/glob.cc - test/core/promise/loop_test.cc deps: - gtest @@ -13031,19 +13042,6 @@ targets: - src/core/lib/debug/trace_impl.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/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/manual_constructor.h - - src/core/lib/gprpp/orphanable.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/status_helper.h - - src/core/lib/gprpp/time.h - src/core/lib/iomgr/closure.h - src/core/lib/iomgr/combiner.h - src/core/lib/iomgr/error.h @@ -13083,9 +13081,22 @@ targets: - src/core/lib/slice/slice_internal.h - src/core/lib/slice/slice_refcount.h - src/core/lib/slice/slice_string_helpers.h + - src/core/util/atomic_utils.h + - src/core/util/bitset.h + - src/core/util/cpp_impl_of.h + - src/core/util/down_cast.h + - src/core/util/dump_args.h + - src/core/util/glob.h - src/core/util/latent_see.h + - src/core/util/manual_constructor.h + - src/core/util/orphanable.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/ring_buffer.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/time.h - test/core/promise/test_wakeup_schedulers.h - third_party/upb/upb/generated_code_support.h src: @@ -13095,11 +13106,6 @@ targets: - src/core/lib/debug/trace_flags.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/per_cpu.cc - - src/core/lib/gprpp/status_helper.cc - - src/core/lib/gprpp/time.cc - src/core/lib/iomgr/closure.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/error.cc @@ -13116,7 +13122,12 @@ targets: - src/core/lib/slice/percent_encoding.cc - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_string_helpers.cc + - src/core/util/dump_args.cc + - src/core/util/glob.cc - src/core/util/latent_see.cc + - src/core/util/per_cpu.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc - test/core/promise/map_pipe_test.cc deps: - gtest @@ -13135,10 +13146,10 @@ 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 + - test/core/util/match_test.cc deps: - gtest uses_polling: false @@ -13158,7 +13169,6 @@ targets: - test/core/test_util/slice_splitter.h - test/core/test_util/tracer_util.h src: - - test/core/matchers/matchers_test.cc - test/core/test_util/cmdline.cc - test/core/test_util/fuzzer_util.cc - test/core/test_util/grpc_profiler.cc @@ -13168,6 +13178,7 @@ targets: - test/core/test_util/resolve_localhost_ip46.cc - test/core/test_util/slice_splitter.cc - test/core/test_util/tracer_util.cc + - test/core/util/matchers_test.cc deps: - gtest - grpc_test_util @@ -13609,14 +13620,6 @@ targets: - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/orphanable.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/promise/activity.h - src/core/lib/promise/context.h - src/core/lib/promise/detail/promise_factory.h @@ -13626,17 +13629,25 @@ targets: - src/core/lib/promise/poll.h - src/core/lib/promise/promise.h - src/core/lib/promise/wait_set.h + - src/core/util/atomic_utils.h + - src/core/util/down_cast.h + - src/core/util/dump_args.h + - src/core/util/glob.h - src/core/util/latent_see.h + - src/core/util/orphanable.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/ring_buffer.h - test/core/promise/poll_matcher.h src: - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/per_cpu.cc - src/core/lib/promise/activity.cc + - src/core/util/dump_args.cc + - src/core/util/glob.cc - src/core/util/latent_see.cc + - src/core/util/per_cpu.cc - test/core/promise/mpsc_test.cc deps: - gtest @@ -13653,7 +13664,7 @@ targets: language: c++ headers: [] src: - - test/core/gprpp/mpscq_test.cc + - test/core/util/mpscq_test.cc deps: - gtest - grpc_test_util @@ -13731,10 +13742,10 @@ 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 + - test/core/util/no_destruct_test.cc deps: - gtest uses_polling: false @@ -13897,9 +13908,9 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/notification.h + - src/core/util/notification.h src: - - test/core/gprpp/notification_test.cc + - test/core/util/notification_test.cc deps: - gtest - gpr @@ -13922,15 +13933,6 @@ targets: - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/notification.h - - src/core/lib/gprpp/orphanable.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/promise/activity.h - src/core/lib/promise/context.h - src/core/lib/promise/detail/promise_factory.h @@ -13940,17 +13942,26 @@ targets: - src/core/lib/promise/map.h - src/core/lib/promise/observable.h - src/core/lib/promise/poll.h + - src/core/util/atomic_utils.h + - src/core/util/down_cast.h + - src/core/util/dump_args.h + - src/core/util/glob.h - src/core/util/latent_see.h + - src/core/util/notification.h + - src/core/util/orphanable.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/ring_buffer.h - test/core/promise/poll_matcher.h src: - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/per_cpu.cc - src/core/lib/promise/activity.cc + - src/core/util/dump_args.cc + - src/core/util/glob.cc - src/core/util/latent_see.cc + - src/core/util/per_cpu.cc - test/core/promise/observable_test.cc deps: - gtest @@ -14004,7 +14015,7 @@ targets: language: c++ headers: [] src: - - test/core/gprpp/orphanable_test.cc + - test/core/util/orphanable_test.cc deps: - gtest - grpc_test_util @@ -14098,9 +14109,9 @@ targets: build: test language: c++ headers: - - src/core/lib/gprpp/overload.h + - src/core/util/overload.h src: - - test/core/gprpp/overload_test.cc + - test/core/util/overload_test.cc deps: - gtest uses_polling: false @@ -14277,12 +14288,6 @@ targets: - src/core/lib/debug/trace_impl.h - src/core/lib/experiments/config.h - src/core/lib/experiments/experiments.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/manual_constructor.h - - src/core/lib/gprpp/per_cpu.h - - src/core/lib/gprpp/status_helper.h - - src/core/lib/gprpp/time.h - src/core/lib/iomgr/closure.h - src/core/lib/iomgr/combiner.h - src/core/lib/iomgr/error.h @@ -14295,9 +14300,15 @@ targets: - src/core/lib/slice/slice_internal.h - src/core/lib/slice/slice_refcount.h - src/core/lib/slice/slice_string_helpers.h + - src/core/util/bitset.h + - src/core/util/glob.h - src/core/util/latent_see.h + - src/core/util/manual_constructor.h + - src/core/util/per_cpu.h - src/core/util/ring_buffer.h - src/core/util/spinlock.h + - src/core/util/status_helper.h + - src/core/util/time.h - third_party/upb/upb/generated_code_support.h src: - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c @@ -14306,10 +14317,6 @@ targets: - src/core/lib/debug/trace_flags.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/per_cpu.cc - - src/core/lib/gprpp/status_helper.cc - - src/core/lib/gprpp/time.cc - src/core/lib/iomgr/closure.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/error.cc @@ -14320,7 +14327,11 @@ targets: - src/core/lib/slice/percent_encoding.cc - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_string_helpers.cc + - src/core/util/glob.cc - src/core/util/latent_see.cc + - src/core/util/per_cpu.cc + - src/core/util/status_helper.cc + - src/core/util/time.cc - test/core/resource_quota/periodic_update_test.cc deps: - gtest @@ -14838,15 +14849,6 @@ targets: - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.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/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/orphanable.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/promise/activity.h - src/core/lib/promise/context.h - src/core/lib/promise/detail/basic_seq.h @@ -14861,17 +14863,26 @@ targets: - src/core/lib/promise/promise.h - src/core/lib/promise/promise_mutex.h - src/core/lib/promise/seq.h + - src/core/util/atomic_utils.h + - src/core/util/bitset.h + - src/core/util/down_cast.h + - src/core/util/dump_args.h + - src/core/util/glob.h - src/core/util/latent_see.h + - src/core/util/orphanable.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/ring_buffer.h - test/core/promise/test_wakeup_schedulers.h src: - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/per_cpu.cc - src/core/lib/promise/activity.cc + - src/core/util/dump_args.cc + - src/core/util/glob.cc - src/core/util/latent_see.cc + - src/core/util/per_cpu.cc - test/core/promise/promise_mutex_test.cc deps: - gtest @@ -15120,10 +15131,10 @@ targets: build: test language: c++ headers: - - src/core/lib/backoff/random_early_detection.h + - src/core/util/random_early_detection.h src: - - src/core/lib/backoff/random_early_detection.cc - - test/core/backoff/random_early_detection_test.cc + - src/core/util/random_early_detection.cc + - test/core/util/random_early_detection_test.cc deps: - gtest - absl/random:bit_gen_ref @@ -15194,7 +15205,7 @@ targets: language: c++ headers: [] src: - - test/core/gprpp/ref_counted_ptr_test.cc + - test/core/util/ref_counted_ptr_test.cc deps: - gtest - grpc_test_util @@ -15204,7 +15215,7 @@ targets: language: c++ headers: [] src: - - test/core/gprpp/ref_counted_test.cc + - test/core/util/ref_counted_test.cc deps: - gtest - grpc_test_util @@ -18011,17 +18022,17 @@ targets: - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h - - src/core/lib/gprpp/glob.h - src/core/lib/promise/detail/basic_seq.h - src/core/lib/promise/detail/promise_factory.h - src/core/lib/promise/detail/promise_like.h - src/core/lib/promise/detail/seq_state.h - src/core/lib/promise/poll.h - src/core/lib/promise/seq.h + - src/core/util/glob.h src: - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - - src/core/lib/gprpp/glob.cc + - src/core/util/glob.cc - test/core/promise/seq_test.cc deps: - gtest @@ -18852,9 +18863,9 @@ 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 + - test/core/util/single_set_ptr_test.cc deps: - gtest - gpr @@ -18880,17 +18891,17 @@ targets: - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h - - src/core/lib/gprpp/glob.h - src/core/lib/slice/slice.h - src/core/lib/slice/slice_internal.h - src/core/lib/slice/slice_refcount.h - src/core/lib/slice/slice_string_helpers.h + - src/core/util/glob.h src: - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - - src/core/lib/gprpp/glob.cc - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_string_helpers.cc + - src/core/util/glob.cc - test/core/slice/slice_string_helpers_test.cc deps: - gtest @@ -18967,10 +18978,10 @@ 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 + - test/core/util/sorted_pack_test.cc deps: - gtest uses_polling: false @@ -19038,7 +19049,7 @@ targets: language: c++ headers: [] src: - - test/core/gprpp/stat_test.cc + - test/core/util/stat_test.cc deps: - gtest - grpc_test_util @@ -19118,7 +19129,7 @@ targets: language: c++ headers: [] src: - - test/core/gprpp/status_helper_test.cc + - test/core/util/status_helper_test.cc deps: - gtest - grpc_test_util @@ -19355,11 +19366,11 @@ 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 + - test/core/util/table_test.cc deps: - gtest - absl/log:check @@ -19580,14 +19591,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 @@ -19601,13 +19612,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 @@ -19625,7 +19636,6 @@ targets: - src/core/lib/event_engine/extensions/can_track_errors.h - src/core/lib/event_engine/handle_containers.h - src/core/lib/event_engine/resolved_address_internal.h - - src/core/lib/gprpp/glob.h - src/core/lib/iomgr/port.h - src/core/lib/iomgr/resolved_address.h - src/core/lib/slice/slice.h @@ -19633,6 +19643,7 @@ targets: - src/core/lib/slice/slice_internal.h - src/core/lib/slice/slice_refcount.h - src/core/lib/slice/slice_string_helpers.h + - src/core/util/glob.h src: - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc @@ -19640,10 +19651,10 @@ targets: - src/core/lib/event_engine/resolved_address.cc - src/core/lib/event_engine/slice.cc - src/core/lib/event_engine/slice_buffer.cc - - src/core/lib/gprpp/glob.cc - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_buffer.cc - src/core/lib/slice/slice_string_helpers.cc + - src/core/util/glob.cc - test/core/event_engine/slice_buffer_test.cc deps: - gtest @@ -19652,20 +19663,6 @@ targets: - absl/status:statusor - absl/utility:utility - gpr -- name: test_core_gprpp_time_test - gtest: true - build: test - language: c++ - headers: - - src/core/lib/gprpp/time.h - src: - - src/core/lib/gprpp/time.cc - - test/core/gprpp/time_test.cc - deps: - - gtest - - absl/status:statusor - - gpr - uses_polling: false - name: test_core_iomgr_timer_heap_test gtest: true build: test @@ -19834,12 +19831,15 @@ targets: gtest: true build: test language: c++ - headers: [] + headers: + - src/core/util/time.h src: + - src/core/util/time.cc - test/core/util/time_test.cc deps: - gtest - - grpc_test_util + - absl/status:statusor + - gpr uses_polling: false - name: test_cpp_client_credentials_test gtest: true @@ -19948,7 +19948,7 @@ targets: language: c++ headers: [] src: - - test/core/gprpp/thd_test.cc + - test/core/util/thd_test.cc deps: - gtest - grpc_test_util @@ -19980,11 +19980,11 @@ 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/lib/resource_quota/thread_quota.h + - src/core/util/atomic_utils.h + - src/core/util/down_cast.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h src: - src/core/lib/resource_quota/thread_quota.cc - test/core/resource_quota/thread_quota_test.cc @@ -20061,7 +20061,7 @@ targets: language: c++ headers: [] src: - - test/core/gprpp/time_util_test.cc + - test/core/util/time_util_test.cc deps: - gtest - grpc_test_util @@ -20497,8 +20497,6 @@ targets: - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h - - src/core/lib/gprpp/bitset.h - - src/core/lib/gprpp/glob.h - src/core/lib/promise/detail/join_state.h - src/core/lib/promise/detail/promise_like.h - src/core/lib/promise/detail/status.h @@ -20506,10 +20504,12 @@ targets: - src/core/lib/promise/poll.h - src/core/lib/promise/status_flag.h - src/core/lib/promise/try_join.h + - src/core/util/bitset.h + - src/core/util/glob.h src: - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - - src/core/lib/gprpp/glob.cc + - src/core/util/glob.cc - test/core/promise/try_join_test.cc deps: - gtest @@ -20538,7 +20538,6 @@ targets: - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h - - src/core/lib/gprpp/glob.h - src/core/lib/promise/detail/basic_seq.h - src/core/lib/promise/detail/promise_factory.h - src/core/lib/promise/detail/promise_like.h @@ -20547,10 +20546,11 @@ targets: - src/core/lib/promise/poll.h - src/core/lib/promise/status_flag.h - src/core/lib/promise/try_seq.h + - src/core/util/glob.h src: - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - - src/core/lib/gprpp/glob.cc + - src/core/util/glob.cc - test/core/promise/try_seq_test.cc deps: - gtest @@ -20577,10 +20577,10 @@ 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 + - test/core/util/unique_type_name_test.cc deps: - gtest - absl/container:flat_hash_map @@ -20602,13 +20602,13 @@ targets: deps: - gtest - grpc_test_util -- name: uri_parser_test +- name: uri_test gtest: true build: test language: c++ headers: [] src: - - test/core/uri/uri_parser_test.cc + - test/core/util/uri_test.cc deps: - gtest - grpc_test_util_unsecure @@ -20631,7 +20631,7 @@ targets: language: c++ headers: [] src: - - test/core/gprpp/uuid_v4_test.cc + - test/core/util/uuid_v4_test.cc deps: - gtest - grpc_test_util @@ -20642,7 +20642,7 @@ targets: language: c++ headers: [] src: - - test/core/gprpp/validation_errors_test.cc + - test/core/util/validation_errors_test.cc deps: - gtest - grpc_test_util @@ -20665,15 +20665,6 @@ targets: - src/core/lib/debug/trace.h - src/core/lib/debug/trace_flags.h - src/core/lib/debug/trace_impl.h - - src/core/lib/gprpp/atomic_utils.h - - src/core/lib/gprpp/down_cast.h - - src/core/lib/gprpp/dump_args.h - - src/core/lib/gprpp/glob.h - - src/core/lib/gprpp/notification.h - - src/core/lib/gprpp/orphanable.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/promise/activity.h - src/core/lib/promise/context.h - src/core/lib/promise/detail/promise_factory.h @@ -20682,17 +20673,26 @@ targets: - src/core/lib/promise/map.h - src/core/lib/promise/poll.h - src/core/lib/promise/wait_for_callback.h + - src/core/util/atomic_utils.h + - src/core/util/down_cast.h + - src/core/util/dump_args.h + - src/core/util/glob.h - src/core/util/latent_see.h + - src/core/util/notification.h + - src/core/util/orphanable.h + - src/core/util/per_cpu.h + - src/core/util/ref_counted.h + - src/core/util/ref_counted_ptr.h - src/core/util/ring_buffer.h - test/core/promise/test_wakeup_schedulers.h src: - src/core/lib/debug/trace.cc - src/core/lib/debug/trace_flags.cc - - src/core/lib/gprpp/dump_args.cc - - src/core/lib/gprpp/glob.cc - - src/core/lib/gprpp/per_cpu.cc - src/core/lib/promise/activity.cc + - src/core/util/dump_args.cc + - src/core/util/glob.cc - src/core/util/latent_see.cc + - src/core/util/per_cpu.cc - test/core/promise/wait_for_callback_test.cc deps: - gtest @@ -21031,7 +21031,7 @@ targets: - test/core/event_engine/event_engine_test_utils.h src: - test/core/event_engine/event_engine_test_utils.cc - - test/core/gprpp/work_serializer_test.cc + - test/core/util/work_serializer_test.cc deps: - gtest - grpc_test_util @@ -21173,10 +21173,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 4f5d7504dc7..e8a2b6321f8 100644 --- a/config.m4 +++ b/config.m4 @@ -443,8 +443,6 @@ if test "$PHP_GRPC" != "no"; then src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc \ src/core/lib/address_utils/parse_address.cc \ src/core/lib/address_utils/sockaddr_utils.cc \ - src/core/lib/backoff/backoff.cc \ - src/core/lib/backoff/random_early_detection.cc \ src/core/lib/channel/channel_args.cc \ src/core/lib/channel/channel_args_preconditioning.cc \ src/core/lib/channel/channel_stack.cc \ @@ -460,7 +458,6 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/config/config_vars_non_generated.cc \ src/core/lib/config/core_configuration.cc \ src/core/lib/config/load_config.cc \ - src/core/lib/debug/event_log.cc \ src/core/lib/debug/trace.cc \ src/core/lib/debug/trace_flags.cc \ src/core/lib/event_engine/ares_resolver.cc \ @@ -512,34 +509,6 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/event_engine/work_queue/basic_work_queue.cc \ src/core/lib/experiments/config.cc \ src/core/lib/experiments/experiments.cc \ - src/core/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/glob.cc \ - src/core/lib/gprpp/host_port.cc \ - src/core/lib/gprpp/linux/env.cc \ - src/core/lib/gprpp/load_file.cc \ - src/core/lib/gprpp/mpscq.cc \ - src/core/lib/gprpp/per_cpu.cc \ - src/core/lib/gprpp/posix/directory_reader.cc \ - src/core/lib/gprpp/posix/env.cc \ - src/core/lib/gprpp/posix/stat.cc \ - src/core/lib/gprpp/posix/thd.cc \ - src/core/lib/gprpp/ref_counted_string.cc \ - src/core/lib/gprpp/status_helper.cc \ - src/core/lib/gprpp/strerror.cc \ - src/core/lib/gprpp/tchar.cc \ - src/core/lib/gprpp/time.cc \ - src/core/lib/gprpp/time_averaged_stats.cc \ - src/core/lib/gprpp/time_util.cc \ - src/core/lib/gprpp/uuid_v4.cc \ - src/core/lib/gprpp/validation_errors.cc \ - src/core/lib/gprpp/windows/directory_reader.cc \ - src/core/lib/gprpp/windows/env.cc \ - src/core/lib/gprpp/windows/stat.cc \ - src/core/lib/gprpp/windows/thd.cc \ - src/core/lib/gprpp/work_serializer.cc \ src/core/lib/iomgr/buffer_list.cc \ src/core/lib/iomgr/call_combiner.cc \ src/core/lib/iomgr/cfstream_handle.cc \ @@ -563,11 +532,6 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/iomgr/executor.cc \ src/core/lib/iomgr/fork_posix.cc \ src/core/lib/iomgr/fork_windows.cc \ - src/core/lib/iomgr/gethostname_fallback.cc \ - src/core/lib/iomgr/gethostname_host_name_max.cc \ - src/core/lib/iomgr/gethostname_sysconf.cc \ - src/core/lib/iomgr/grpc_if_nametoindex_posix.cc \ - src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc \ src/core/lib/iomgr/internal_errqueue.cc \ src/core/lib/iomgr/iocp_windows.cc \ src/core/lib/iomgr/iomgr.cc \ @@ -616,7 +580,6 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/iomgr/wakeup_fd_nospecial.cc \ src/core/lib/iomgr/wakeup_fd_pipe.cc \ src/core/lib/iomgr/wakeup_fd_posix.cc \ - src/core/lib/matchers/matchers.cc \ src/core/lib/promise/activity.cc \ src/core/lib/promise/party.cc \ src/core/lib/promise/sleep.cc \ @@ -736,7 +699,6 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/transport/timeout_encoding.cc \ src/core/lib/transport/transport.cc \ src/core/lib/transport/transport_op_string.cc \ - src/core/lib/uri/uri_parser.cc \ src/core/load_balancing/address_filtering.cc \ src/core/load_balancing/backend_metric_parser.cc \ src/core/load_balancing/child_policy_handler.cc \ @@ -831,7 +793,21 @@ if test "$PHP_GRPC" != "no"; then src/core/tsi/transport_security_grpc.cc \ src/core/util/alloc.cc \ src/core/util/atm.cc \ + src/core/util/backoff.cc \ + src/core/util/crash.cc \ + src/core/util/dump_args.cc \ + src/core/util/event_log.cc \ + src/core/util/examine_stack.cc \ + src/core/util/fork.cc \ src/core/util/gcp_metadata_query.cc \ + src/core/util/gethostname_fallback.cc \ + src/core/util/gethostname_host_name_max.cc \ + src/core/util/gethostname_sysconf.cc \ + src/core/util/glob.cc \ + src/core/util/gpr_time.cc \ + src/core/util/grpc_if_nametoindex_posix.cc \ + src/core/util/grpc_if_nametoindex_unsupported.cc \ + src/core/util/host_port.cc \ src/core/util/http_client/format_request.cc \ src/core/util/http_client/httpcli.cc \ src/core/util/http_client/httpcli_security_connector.cc \ @@ -843,24 +819,48 @@ if test "$PHP_GRPC" != "no"; then src/core/util/json/json_writer.cc \ src/core/util/latent_see.cc \ src/core/util/linux/cpu.cc \ + src/core/util/linux/env.cc \ + src/core/util/load_file.cc \ src/core/util/log.cc \ + src/core/util/matchers.cc \ + src/core/util/mpscq.cc \ src/core/util/msys/tmpfile.cc \ + src/core/util/per_cpu.cc \ src/core/util/posix/cpu.cc \ + src/core/util/posix/directory_reader.cc \ + src/core/util/posix/env.cc \ + src/core/util/posix/stat.cc \ src/core/util/posix/string.cc \ src/core/util/posix/sync.cc \ + src/core/util/posix/thd.cc \ src/core/util/posix/time.cc \ src/core/util/posix/tmpfile.cc \ + src/core/util/random_early_detection.cc \ + src/core/util/ref_counted_string.cc \ + src/core/util/status_helper.cc \ + src/core/util/strerror.cc \ src/core/util/string.cc \ src/core/util/sync.cc \ src/core/util/sync_abseil.cc \ + src/core/util/tchar.cc \ src/core/util/time.cc \ + src/core/util/time_averaged_stats.cc \ src/core/util/time_precise.cc \ + src/core/util/time_util.cc \ + src/core/util/uri.cc \ + src/core/util/uuid_v4.cc \ + src/core/util/validation_errors.cc \ src/core/util/windows/cpu.cc \ + src/core/util/windows/directory_reader.cc \ + src/core/util/windows/env.cc \ + src/core/util/windows/stat.cc \ src/core/util/windows/string.cc \ src/core/util/windows/string_util.cc \ src/core/util/windows/sync.cc \ + src/core/util/windows/thd.cc \ src/core/util/windows/time.cc \ src/core/util/windows/tmpfile.cc \ + src/core/util/work_serializer.cc \ src/core/xds/grpc/certificate_provider_store.cc \ src/core/xds/grpc/file_watcher_certificate_provider_factory.cc \ src/core/xds/grpc/xds_audit_logger_registry.cc \ @@ -1531,7 +1531,6 @@ if test "$PHP_GRPC" != "no"; then PHP_ADD_BUILD_DIR($ext_builddir/src/core/handshaker/security) PHP_ADD_BUILD_DIR($ext_builddir/src/core/handshaker/tcp_connect) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/address_utils) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/backoff) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/channel) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/compression) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/config) @@ -1544,13 +1543,8 @@ if test "$PHP_GRPC" != "no"; then PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/event_engine/windows) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/event_engine/work_queue) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/experiments) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/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/lib/iomgr) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/iomgr/event_engine_shims) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/matchers) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/promise) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/resource_quota) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/authorization) @@ -1585,7 +1579,6 @@ if test "$PHP_GRPC" != "no"; then PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/slice) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/surface) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/transport) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/uri) PHP_ADD_BUILD_DIR($ext_builddir/src/core/load_balancing) PHP_ADD_BUILD_DIR($ext_builddir/src/core/load_balancing/grpclb) PHP_ADD_BUILD_DIR($ext_builddir/src/core/load_balancing/outlier_detection) diff --git a/config.w32 b/config.w32 index 08788eafbb5..7a5aa5f8b17 100644 --- a/config.w32 +++ b/config.w32 @@ -408,8 +408,6 @@ if (PHP_GRPC != "no") { "src\\core\\handshaker\\tcp_connect\\tcp_connect_handshaker.cc " + "src\\core\\lib\\address_utils\\parse_address.cc " + "src\\core\\lib\\address_utils\\sockaddr_utils.cc " + - "src\\core\\lib\\backoff\\backoff.cc " + - "src\\core\\lib\\backoff\\random_early_detection.cc " + "src\\core\\lib\\channel\\channel_args.cc " + "src\\core\\lib\\channel\\channel_args_preconditioning.cc " + "src\\core\\lib\\channel\\channel_stack.cc " + @@ -425,7 +423,6 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\config\\config_vars_non_generated.cc " + "src\\core\\lib\\config\\core_configuration.cc " + "src\\core\\lib\\config\\load_config.cc " + - "src\\core\\lib\\debug\\event_log.cc " + "src\\core\\lib\\debug\\trace.cc " + "src\\core\\lib\\debug\\trace_flags.cc " + "src\\core\\lib\\event_engine\\ares_resolver.cc " + @@ -477,34 +474,6 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\event_engine\\work_queue\\basic_work_queue.cc " + "src\\core\\lib\\experiments\\config.cc " + "src\\core\\lib\\experiments\\experiments.cc " + - "src\\core\\lib\\gprpp\\crash.cc " + - "src\\core\\lib\\gprpp\\dump_args.cc " + - "src\\core\\lib\\gprpp\\examine_stack.cc " + - "src\\core\\lib\\gprpp\\fork.cc " + - "src\\core\\lib\\gprpp\\glob.cc " + - "src\\core\\lib\\gprpp\\host_port.cc " + - "src\\core\\lib\\gprpp\\linux\\env.cc " + - "src\\core\\lib\\gprpp\\load_file.cc " + - "src\\core\\lib\\gprpp\\mpscq.cc " + - "src\\core\\lib\\gprpp\\per_cpu.cc " + - "src\\core\\lib\\gprpp\\posix\\directory_reader.cc " + - "src\\core\\lib\\gprpp\\posix\\env.cc " + - "src\\core\\lib\\gprpp\\posix\\stat.cc " + - "src\\core\\lib\\gprpp\\posix\\thd.cc " + - "src\\core\\lib\\gprpp\\ref_counted_string.cc " + - "src\\core\\lib\\gprpp\\status_helper.cc " + - "src\\core\\lib\\gprpp\\strerror.cc " + - "src\\core\\lib\\gprpp\\tchar.cc " + - "src\\core\\lib\\gprpp\\time.cc " + - "src\\core\\lib\\gprpp\\time_averaged_stats.cc " + - "src\\core\\lib\\gprpp\\time_util.cc " + - "src\\core\\lib\\gprpp\\uuid_v4.cc " + - "src\\core\\lib\\gprpp\\validation_errors.cc " + - "src\\core\\lib\\gprpp\\windows\\directory_reader.cc " + - "src\\core\\lib\\gprpp\\windows\\env.cc " + - "src\\core\\lib\\gprpp\\windows\\stat.cc " + - "src\\core\\lib\\gprpp\\windows\\thd.cc " + - "src\\core\\lib\\gprpp\\work_serializer.cc " + "src\\core\\lib\\iomgr\\buffer_list.cc " + "src\\core\\lib\\iomgr\\call_combiner.cc " + "src\\core\\lib\\iomgr\\cfstream_handle.cc " + @@ -528,11 +497,6 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\iomgr\\executor.cc " + "src\\core\\lib\\iomgr\\fork_posix.cc " + "src\\core\\lib\\iomgr\\fork_windows.cc " + - "src\\core\\lib\\iomgr\\gethostname_fallback.cc " + - "src\\core\\lib\\iomgr\\gethostname_host_name_max.cc " + - "src\\core\\lib\\iomgr\\gethostname_sysconf.cc " + - "src\\core\\lib\\iomgr\\grpc_if_nametoindex_posix.cc " + - "src\\core\\lib\\iomgr\\grpc_if_nametoindex_unsupported.cc " + "src\\core\\lib\\iomgr\\internal_errqueue.cc " + "src\\core\\lib\\iomgr\\iocp_windows.cc " + "src\\core\\lib\\iomgr\\iomgr.cc " + @@ -581,7 +545,6 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\iomgr\\wakeup_fd_nospecial.cc " + "src\\core\\lib\\iomgr\\wakeup_fd_pipe.cc " + "src\\core\\lib\\iomgr\\wakeup_fd_posix.cc " + - "src\\core\\lib\\matchers\\matchers.cc " + "src\\core\\lib\\promise\\activity.cc " + "src\\core\\lib\\promise\\party.cc " + "src\\core\\lib\\promise\\sleep.cc " + @@ -701,7 +664,6 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\transport\\timeout_encoding.cc " + "src\\core\\lib\\transport\\transport.cc " + "src\\core\\lib\\transport\\transport_op_string.cc " + - "src\\core\\lib\\uri\\uri_parser.cc " + "src\\core\\load_balancing\\address_filtering.cc " + "src\\core\\load_balancing\\backend_metric_parser.cc " + "src\\core\\load_balancing\\child_policy_handler.cc " + @@ -796,7 +758,21 @@ if (PHP_GRPC != "no") { "src\\core\\tsi\\transport_security_grpc.cc " + "src\\core\\util\\alloc.cc " + "src\\core\\util\\atm.cc " + + "src\\core\\util\\backoff.cc " + + "src\\core\\util\\crash.cc " + + "src\\core\\util\\dump_args.cc " + + "src\\core\\util\\event_log.cc " + + "src\\core\\util\\examine_stack.cc " + + "src\\core\\util\\fork.cc " + "src\\core\\util\\gcp_metadata_query.cc " + + "src\\core\\util\\gethostname_fallback.cc " + + "src\\core\\util\\gethostname_host_name_max.cc " + + "src\\core\\util\\gethostname_sysconf.cc " + + "src\\core\\util\\glob.cc " + + "src\\core\\util\\gpr_time.cc " + + "src\\core\\util\\grpc_if_nametoindex_posix.cc " + + "src\\core\\util\\grpc_if_nametoindex_unsupported.cc " + + "src\\core\\util\\host_port.cc " + "src\\core\\util\\http_client\\format_request.cc " + "src\\core\\util\\http_client\\httpcli.cc " + "src\\core\\util\\http_client\\httpcli_security_connector.cc " + @@ -808,24 +784,48 @@ if (PHP_GRPC != "no") { "src\\core\\util\\json\\json_writer.cc " + "src\\core\\util\\latent_see.cc " + "src\\core\\util\\linux\\cpu.cc " + + "src\\core\\util\\linux\\env.cc " + + "src\\core\\util\\load_file.cc " + "src\\core\\util\\log.cc " + + "src\\core\\util\\matchers.cc " + + "src\\core\\util\\mpscq.cc " + "src\\core\\util\\msys\\tmpfile.cc " + + "src\\core\\util\\per_cpu.cc " + "src\\core\\util\\posix\\cpu.cc " + + "src\\core\\util\\posix\\directory_reader.cc " + + "src\\core\\util\\posix\\env.cc " + + "src\\core\\util\\posix\\stat.cc " + "src\\core\\util\\posix\\string.cc " + "src\\core\\util\\posix\\sync.cc " + + "src\\core\\util\\posix\\thd.cc " + "src\\core\\util\\posix\\time.cc " + "src\\core\\util\\posix\\tmpfile.cc " + + "src\\core\\util\\random_early_detection.cc " + + "src\\core\\util\\ref_counted_string.cc " + + "src\\core\\util\\status_helper.cc " + + "src\\core\\util\\strerror.cc " + "src\\core\\util\\string.cc " + "src\\core\\util\\sync.cc " + "src\\core\\util\\sync_abseil.cc " + + "src\\core\\util\\tchar.cc " + "src\\core\\util\\time.cc " + + "src\\core\\util\\time_averaged_stats.cc " + "src\\core\\util\\time_precise.cc " + + "src\\core\\util\\time_util.cc " + + "src\\core\\util\\uri.cc " + + "src\\core\\util\\uuid_v4.cc " + + "src\\core\\util\\validation_errors.cc " + "src\\core\\util\\windows\\cpu.cc " + + "src\\core\\util\\windows\\directory_reader.cc " + + "src\\core\\util\\windows\\env.cc " + + "src\\core\\util\\windows\\stat.cc " + "src\\core\\util\\windows\\string.cc " + "src\\core\\util\\windows\\string_util.cc " + "src\\core\\util\\windows\\sync.cc " + + "src\\core\\util\\windows\\thd.cc " + "src\\core\\util\\windows\\time.cc " + "src\\core\\util\\windows\\tmpfile.cc " + + "src\\core\\util\\work_serializer.cc " + "src\\core\\xds\\grpc\\certificate_provider_store.cc " + "src\\core\\xds\\grpc\\file_watcher_certificate_provider_factory.cc " + "src\\core\\xds\\grpc\\xds_audit_logger_registry.cc " + @@ -1670,7 +1670,6 @@ if (PHP_GRPC != "no") { FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\handshaker\\tcp_connect"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\address_utils"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\backoff"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\channel"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\compression"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\config"); @@ -1683,13 +1682,8 @@ if (PHP_GRPC != "no") { FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\event_engine\\windows"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\event_engine\\work_queue"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\experiments"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gprpp"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gprpp\\linux"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gprpp\\posix"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gprpp\\windows"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\iomgr"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\iomgr\\event_engine_shims"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\matchers"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\promise"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\resource_quota"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security"); @@ -1725,7 +1719,6 @@ if (PHP_GRPC != "no") { FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\slice"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\surface"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\transport"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\uri"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\load_balancing"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\load_balancing\\grpclb"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\load_balancing\\outlier_detection"); diff --git a/examples/cpp/csm/csm_greeter_server.cc b/examples/cpp/csm/csm_greeter_server.cc index 910e3f65749..7f66a5cc9a9 100644 --- a/examples/cpp/csm/csm_greeter_server.cc +++ b/examples/cpp/csm/csm_greeter_server.cc @@ -35,7 +35,7 @@ #include #include -#include "src/core/lib/iomgr/gethostname.h" +#include "src/core/util/gethostname.h" #ifdef BAZEL_BUILD #include "examples/protos/helloworld.grpc.pb.h" 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 350aedf9150..4f6a4bc1b1f 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -882,9 +882,6 @@ Pod::Spec.new do |s| 'src/core/handshaker/tcp_connect/tcp_connect_handshaker.h', 'src/core/lib/address_utils/parse_address.h', 'src/core/lib/address_utils/sockaddr_utils.h', - 'src/core/lib/avl/avl.h', - 'src/core/lib/backoff/backoff.h', - 'src/core/lib/backoff/random_early_detection.h', 'src/core/lib/channel/call_finalization.h', 'src/core/lib/channel/channel_args.h', 'src/core/lib/channel/channel_args_preconditioning.h', @@ -900,7 +897,6 @@ Pod::Spec.new do |s| 'src/core/lib/config/config_vars.h', 'src/core/lib/config/core_configuration.h', 'src/core/lib/config/load_config.h', - 'src/core/lib/debug/event_log.h', 'src/core/lib/debug/trace.h', 'src/core/lib/debug/trace_flags.h', 'src/core/lib/debug/trace_impl.h', @@ -970,55 +966,6 @@ Pod::Spec.new do |s| 'src/core/lib/event_engine/work_queue/work_queue.h', 'src/core/lib/experiments/config.h', 'src/core/lib/experiments/experiments.h', - 'src/core/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/glob.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/lib/iomgr/block_annotate.h', 'src/core/lib/iomgr/buffer_list.h', 'src/core/lib/iomgr/call_combiner.h', @@ -1040,8 +987,6 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/event_engine_shims/tcp_client.h', 'src/core/lib/iomgr/exec_ctx.h', 'src/core/lib/iomgr/executor.h', - 'src/core/lib/iomgr/gethostname.h', - 'src/core/lib/iomgr/grpc_if_nametoindex.h', 'src/core/lib/iomgr/internal_errqueue.h', 'src/core/lib/iomgr/iocp_windows.h', 'src/core/lib/iomgr/iomgr.h', @@ -1084,7 +1029,6 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/vsock.h', 'src/core/lib/iomgr/wakeup_fd_pipe.h', 'src/core/lib/iomgr/wakeup_fd_posix.h', - 'src/core/lib/matchers/matchers.h', 'src/core/lib/promise/activity.h', 'src/core/lib/promise/all_ok.h', 'src/core/lib/promise/arena_promise.h', @@ -1226,7 +1170,6 @@ Pod::Spec.new do |s| 'src/core/lib/transport/timeout_encoding.h', 'src/core/lib/transport/transport.h', 'src/core/lib/transport/transport_fwd.h', - 'src/core/lib/uri/uri_parser.h', 'src/core/load_balancing/address_filtering.h', 'src/core/load_balancing/backend_metric_data.h', 'src/core/load_balancing/backend_metric_parser.h', @@ -1317,11 +1260,33 @@ Pod::Spec.new do |s| 'src/core/tsi/transport_security_grpc.h', 'src/core/tsi/transport_security_interface.h', 'src/core/util/alloc.h', + 'src/core/util/atomic_utils.h', + 'src/core/util/avl.h', + 'src/core/util/backoff.h', + 'src/core/util/bitset.h', + 'src/core/util/chunked_vector.h', + 'src/core/util/construct_destruct.h', + 'src/core/util/cpp_impl_of.h', + 'src/core/util/crash.h', + 'src/core/util/debug_location.h', + 'src/core/util/directory_reader.h', + 'src/core/util/down_cast.h', + 'src/core/util/dual_ref_counted.h', + 'src/core/util/dump_args.h', + 'src/core/util/env.h', + 'src/core/util/event_log.h', + 'src/core/util/examine_stack.h', + 'src/core/util/fork.h', 'src/core/util/gcp_metadata_query.h', + 'src/core/util/gethostname.h', + 'src/core/util/glob.h', + 'src/core/util/grpc_if_nametoindex.h', + 'src/core/util/host_port.h', 'src/core/util/http_client/format_request.h', 'src/core/util/http_client/httpcli.h', 'src/core/util/http_client/httpcli_ssl_credentials.h', 'src/core/util/http_client/parser.h', + 'src/core/util/if_list.h', 'src/core/util/json/json.h', 'src/core/util/json/json_args.h', 'src/core/util/json/json_channel_args.h', @@ -1330,15 +1295,50 @@ Pod::Spec.new do |s| 'src/core/util/json/json_util.h', 'src/core/util/json/json_writer.h', 'src/core/util/latent_see.h', + 'src/core/util/load_file.h', 'src/core/util/lru_cache.h', + 'src/core/util/manual_constructor.h', + 'src/core/util/match.h', + 'src/core/util/matchers.h', + 'src/core/util/memory.h', + 'src/core/util/mpscq.h', + 'src/core/util/no_destruct.h', + 'src/core/util/notification.h', + 'src/core/util/orphanable.h', + 'src/core/util/overload.h', + 'src/core/util/packed_table.h', + 'src/core/util/per_cpu.h', + 'src/core/util/random_early_detection.h', + 'src/core/util/ref_counted.h', + 'src/core/util/ref_counted_ptr.h', + 'src/core/util/ref_counted_string.h', 'src/core/util/ring_buffer.h', + 'src/core/util/single_set_ptr.h', + 'src/core/util/sorted_pack.h', 'src/core/util/spinlock.h', + 'src/core/util/stat.h', + 'src/core/util/status_helper.h', + 'src/core/util/strerror.h', 'src/core/util/string.h', + 'src/core/util/sync.h', + 'src/core/util/table.h', + 'src/core/util/tchar.h', + 'src/core/util/thd.h', + 'src/core/util/time.h', + 'src/core/util/time_averaged_stats.h', 'src/core/util/time_precise.h', + 'src/core/util/time_util.h', 'src/core/util/tmpfile.h', + 'src/core/util/type_list.h', 'src/core/util/unique_ptr_with_bitset.h', + 'src/core/util/unique_type_name.h', 'src/core/util/upb_utils.h', + 'src/core/util/uri.h', 'src/core/util/useful.h', + 'src/core/util/uuid_v4.h', + 'src/core/util/validation_errors.h', + 'src/core/util/work_serializer.h', + 'src/core/util/xxhash_inline.h', 'src/core/xds/grpc/certificate_provider_store.h', 'src/core/xds/grpc/file_watcher_certificate_provider_factory.h', 'src/core/xds/grpc/xds_audit_logger_registry.h', @@ -2179,9 +2179,6 @@ Pod::Spec.new do |s| 'src/core/handshaker/tcp_connect/tcp_connect_handshaker.h', 'src/core/lib/address_utils/parse_address.h', 'src/core/lib/address_utils/sockaddr_utils.h', - 'src/core/lib/avl/avl.h', - 'src/core/lib/backoff/backoff.h', - 'src/core/lib/backoff/random_early_detection.h', 'src/core/lib/channel/call_finalization.h', 'src/core/lib/channel/channel_args.h', 'src/core/lib/channel/channel_args_preconditioning.h', @@ -2197,7 +2194,6 @@ Pod::Spec.new do |s| 'src/core/lib/config/config_vars.h', 'src/core/lib/config/core_configuration.h', 'src/core/lib/config/load_config.h', - 'src/core/lib/debug/event_log.h', 'src/core/lib/debug/trace.h', 'src/core/lib/debug/trace_flags.h', 'src/core/lib/debug/trace_impl.h', @@ -2267,55 +2263,6 @@ Pod::Spec.new do |s| 'src/core/lib/event_engine/work_queue/work_queue.h', 'src/core/lib/experiments/config.h', 'src/core/lib/experiments/experiments.h', - 'src/core/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/glob.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/lib/iomgr/block_annotate.h', 'src/core/lib/iomgr/buffer_list.h', 'src/core/lib/iomgr/call_combiner.h', @@ -2337,8 +2284,6 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/event_engine_shims/tcp_client.h', 'src/core/lib/iomgr/exec_ctx.h', 'src/core/lib/iomgr/executor.h', - 'src/core/lib/iomgr/gethostname.h', - 'src/core/lib/iomgr/grpc_if_nametoindex.h', 'src/core/lib/iomgr/internal_errqueue.h', 'src/core/lib/iomgr/iocp_windows.h', 'src/core/lib/iomgr/iomgr.h', @@ -2381,7 +2326,6 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/vsock.h', 'src/core/lib/iomgr/wakeup_fd_pipe.h', 'src/core/lib/iomgr/wakeup_fd_posix.h', - 'src/core/lib/matchers/matchers.h', 'src/core/lib/promise/activity.h', 'src/core/lib/promise/all_ok.h', 'src/core/lib/promise/arena_promise.h', @@ -2523,7 +2467,6 @@ Pod::Spec.new do |s| 'src/core/lib/transport/timeout_encoding.h', 'src/core/lib/transport/transport.h', 'src/core/lib/transport/transport_fwd.h', - 'src/core/lib/uri/uri_parser.h', 'src/core/load_balancing/address_filtering.h', 'src/core/load_balancing/backend_metric_data.h', 'src/core/load_balancing/backend_metric_parser.h', @@ -2614,11 +2557,33 @@ Pod::Spec.new do |s| 'src/core/tsi/transport_security_grpc.h', 'src/core/tsi/transport_security_interface.h', 'src/core/util/alloc.h', + 'src/core/util/atomic_utils.h', + 'src/core/util/avl.h', + 'src/core/util/backoff.h', + 'src/core/util/bitset.h', + 'src/core/util/chunked_vector.h', + 'src/core/util/construct_destruct.h', + 'src/core/util/cpp_impl_of.h', + 'src/core/util/crash.h', + 'src/core/util/debug_location.h', + 'src/core/util/directory_reader.h', + 'src/core/util/down_cast.h', + 'src/core/util/dual_ref_counted.h', + 'src/core/util/dump_args.h', + 'src/core/util/env.h', + 'src/core/util/event_log.h', + 'src/core/util/examine_stack.h', + 'src/core/util/fork.h', 'src/core/util/gcp_metadata_query.h', + 'src/core/util/gethostname.h', + 'src/core/util/glob.h', + 'src/core/util/grpc_if_nametoindex.h', + 'src/core/util/host_port.h', 'src/core/util/http_client/format_request.h', 'src/core/util/http_client/httpcli.h', 'src/core/util/http_client/httpcli_ssl_credentials.h', 'src/core/util/http_client/parser.h', + 'src/core/util/if_list.h', 'src/core/util/json/json.h', 'src/core/util/json/json_args.h', 'src/core/util/json/json_channel_args.h', @@ -2627,15 +2592,50 @@ Pod::Spec.new do |s| 'src/core/util/json/json_util.h', 'src/core/util/json/json_writer.h', 'src/core/util/latent_see.h', + 'src/core/util/load_file.h', 'src/core/util/lru_cache.h', + 'src/core/util/manual_constructor.h', + 'src/core/util/match.h', + 'src/core/util/matchers.h', + 'src/core/util/memory.h', + 'src/core/util/mpscq.h', + 'src/core/util/no_destruct.h', + 'src/core/util/notification.h', + 'src/core/util/orphanable.h', + 'src/core/util/overload.h', + 'src/core/util/packed_table.h', + 'src/core/util/per_cpu.h', + 'src/core/util/random_early_detection.h', + 'src/core/util/ref_counted.h', + 'src/core/util/ref_counted_ptr.h', + 'src/core/util/ref_counted_string.h', 'src/core/util/ring_buffer.h', + 'src/core/util/single_set_ptr.h', + 'src/core/util/sorted_pack.h', 'src/core/util/spinlock.h', + 'src/core/util/stat.h', + 'src/core/util/status_helper.h', + 'src/core/util/strerror.h', 'src/core/util/string.h', + 'src/core/util/sync.h', + 'src/core/util/table.h', + 'src/core/util/tchar.h', + 'src/core/util/thd.h', + 'src/core/util/time.h', + 'src/core/util/time_averaged_stats.h', 'src/core/util/time_precise.h', + 'src/core/util/time_util.h', 'src/core/util/tmpfile.h', + 'src/core/util/type_list.h', 'src/core/util/unique_ptr_with_bitset.h', + 'src/core/util/unique_type_name.h', 'src/core/util/upb_utils.h', + 'src/core/util/uri.h', 'src/core/util/useful.h', + 'src/core/util/uuid_v4.h', + 'src/core/util/validation_errors.h', + 'src/core/util/work_serializer.h', + 'src/core/util/xxhash_inline.h', 'src/core/xds/grpc/certificate_provider_store.h', 'src/core/xds/grpc/file_watcher_certificate_provider_factory.h', 'src/core/xds/grpc/xds_audit_logger_registry.h', diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index cff65146c64..3ebf0103b56 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -1213,11 +1213,6 @@ Pod::Spec.new do |s| 'src/core/lib/address_utils/parse_address.h', 'src/core/lib/address_utils/sockaddr_utils.cc', 'src/core/lib/address_utils/sockaddr_utils.h', - 'src/core/lib/avl/avl.h', - 'src/core/lib/backoff/backoff.cc', - 'src/core/lib/backoff/backoff.h', - 'src/core/lib/backoff/random_early_detection.cc', - 'src/core/lib/backoff/random_early_detection.h', 'src/core/lib/channel/call_finalization.h', 'src/core/lib/channel/channel_args.cc', 'src/core/lib/channel/channel_args.h', @@ -1248,8 +1243,6 @@ Pod::Spec.new do |s| 'src/core/lib/config/core_configuration.h', 'src/core/lib/config/load_config.cc', 'src/core/lib/config/load_config.h', - 'src/core/lib/debug/event_log.cc', - 'src/core/lib/debug/event_log.h', 'src/core/lib/debug/trace.cc', 'src/core/lib/debug/trace.h', 'src/core/lib/debug/trace_flags.cc', @@ -1370,83 +1363,6 @@ Pod::Spec.new do |s| 'src/core/lib/experiments/config.h', 'src/core/lib/experiments/experiments.cc', 'src/core/lib/experiments/experiments.h', - 'src/core/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/glob.cc', - 'src/core/lib/gprpp/glob.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/lib/iomgr/block_annotate.h', 'src/core/lib/iomgr/buffer_list.cc', 'src/core/lib/iomgr/buffer_list.h', @@ -1491,13 +1407,6 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/executor.h', 'src/core/lib/iomgr/fork_posix.cc', 'src/core/lib/iomgr/fork_windows.cc', - 'src/core/lib/iomgr/gethostname.h', - 'src/core/lib/iomgr/gethostname_fallback.cc', - 'src/core/lib/iomgr/gethostname_host_name_max.cc', - 'src/core/lib/iomgr/gethostname_sysconf.cc', - 'src/core/lib/iomgr/grpc_if_nametoindex.h', - 'src/core/lib/iomgr/grpc_if_nametoindex_posix.cc', - 'src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc', 'src/core/lib/iomgr/internal_errqueue.cc', 'src/core/lib/iomgr/internal_errqueue.h', 'src/core/lib/iomgr/iocp_windows.cc', @@ -1588,8 +1497,6 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/wakeup_fd_pipe.h', 'src/core/lib/iomgr/wakeup_fd_posix.cc', 'src/core/lib/iomgr/wakeup_fd_posix.h', - 'src/core/lib/matchers/matchers.cc', - 'src/core/lib/matchers/matchers.h', 'src/core/lib/promise/activity.cc', 'src/core/lib/promise/activity.h', 'src/core/lib/promise/all_ok.h', @@ -1850,8 +1757,6 @@ Pod::Spec.new do |s| 'src/core/lib/transport/transport.h', 'src/core/lib/transport/transport_fwd.h', 'src/core/lib/transport/transport_op_string.cc', - 'src/core/lib/uri/uri_parser.cc', - 'src/core/lib/uri/uri_parser.h', 'src/core/load_balancing/address_filtering.cc', 'src/core/load_balancing/address_filtering.h', 'src/core/load_balancing/backend_metric_data.h', @@ -2036,8 +1941,43 @@ Pod::Spec.new do |s| 'src/core/util/alloc.cc', 'src/core/util/alloc.h', 'src/core/util/atm.cc', + 'src/core/util/atomic_utils.h', + 'src/core/util/avl.h', + 'src/core/util/backoff.cc', + 'src/core/util/backoff.h', + 'src/core/util/bitset.h', + 'src/core/util/chunked_vector.h', + 'src/core/util/construct_destruct.h', + 'src/core/util/cpp_impl_of.h', + 'src/core/util/crash.cc', + 'src/core/util/crash.h', + 'src/core/util/debug_location.h', + 'src/core/util/directory_reader.h', + 'src/core/util/down_cast.h', + 'src/core/util/dual_ref_counted.h', + 'src/core/util/dump_args.cc', + 'src/core/util/dump_args.h', + 'src/core/util/env.h', + 'src/core/util/event_log.cc', + 'src/core/util/event_log.h', + 'src/core/util/examine_stack.cc', + 'src/core/util/examine_stack.h', + 'src/core/util/fork.cc', + 'src/core/util/fork.h', 'src/core/util/gcp_metadata_query.cc', 'src/core/util/gcp_metadata_query.h', + 'src/core/util/gethostname.h', + 'src/core/util/gethostname_fallback.cc', + 'src/core/util/gethostname_host_name_max.cc', + 'src/core/util/gethostname_sysconf.cc', + 'src/core/util/glob.cc', + 'src/core/util/glob.h', + 'src/core/util/gpr_time.cc', + 'src/core/util/grpc_if_nametoindex.h', + 'src/core/util/grpc_if_nametoindex_posix.cc', + 'src/core/util/grpc_if_nametoindex_unsupported.cc', + 'src/core/util/host_port.cc', + 'src/core/util/host_port.h', 'src/core/util/http_client/format_request.cc', 'src/core/util/http_client/format_request.h', 'src/core/util/http_client/httpcli.cc', @@ -2046,6 +1986,7 @@ Pod::Spec.new do |s| 'src/core/util/http_client/httpcli_ssl_credentials.h', 'src/core/util/http_client/parser.cc', 'src/core/util/http_client/parser.h', + 'src/core/util/if_list.h', 'src/core/util/iphone/cpu.cc', 'src/core/util/json/json.h', 'src/core/util/json/json_args.h', @@ -2061,33 +2002,92 @@ Pod::Spec.new do |s| 'src/core/util/latent_see.cc', 'src/core/util/latent_see.h', 'src/core/util/linux/cpu.cc', + 'src/core/util/linux/env.cc', + 'src/core/util/load_file.cc', + 'src/core/util/load_file.h', 'src/core/util/log.cc', 'src/core/util/lru_cache.h', + 'src/core/util/manual_constructor.h', + 'src/core/util/match.h', + 'src/core/util/matchers.cc', + 'src/core/util/matchers.h', + 'src/core/util/memory.h', + 'src/core/util/mpscq.cc', + 'src/core/util/mpscq.h', 'src/core/util/msys/tmpfile.cc', + 'src/core/util/no_destruct.h', + 'src/core/util/notification.h', + 'src/core/util/orphanable.h', + 'src/core/util/overload.h', + 'src/core/util/packed_table.h', + 'src/core/util/per_cpu.cc', + 'src/core/util/per_cpu.h', 'src/core/util/posix/cpu.cc', + 'src/core/util/posix/directory_reader.cc', + 'src/core/util/posix/env.cc', + 'src/core/util/posix/stat.cc', 'src/core/util/posix/string.cc', 'src/core/util/posix/sync.cc', + 'src/core/util/posix/thd.cc', 'src/core/util/posix/time.cc', 'src/core/util/posix/tmpfile.cc', + 'src/core/util/random_early_detection.cc', + 'src/core/util/random_early_detection.h', + 'src/core/util/ref_counted.h', + 'src/core/util/ref_counted_ptr.h', + 'src/core/util/ref_counted_string.cc', + 'src/core/util/ref_counted_string.h', 'src/core/util/ring_buffer.h', + 'src/core/util/single_set_ptr.h', + 'src/core/util/sorted_pack.h', 'src/core/util/spinlock.h', + 'src/core/util/stat.h', + 'src/core/util/status_helper.cc', + 'src/core/util/status_helper.h', + 'src/core/util/strerror.cc', + 'src/core/util/strerror.h', 'src/core/util/string.cc', 'src/core/util/string.h', 'src/core/util/sync.cc', + 'src/core/util/sync.h', 'src/core/util/sync_abseil.cc', + 'src/core/util/table.h', + 'src/core/util/tchar.cc', + 'src/core/util/tchar.h', + 'src/core/util/thd.h', 'src/core/util/time.cc', + 'src/core/util/time.h', + 'src/core/util/time_averaged_stats.cc', + 'src/core/util/time_averaged_stats.h', 'src/core/util/time_precise.cc', 'src/core/util/time_precise.h', + 'src/core/util/time_util.cc', + 'src/core/util/time_util.h', 'src/core/util/tmpfile.h', + 'src/core/util/type_list.h', 'src/core/util/unique_ptr_with_bitset.h', + 'src/core/util/unique_type_name.h', 'src/core/util/upb_utils.h', + 'src/core/util/uri.cc', + 'src/core/util/uri.h', 'src/core/util/useful.h', + 'src/core/util/uuid_v4.cc', + 'src/core/util/uuid_v4.h', + 'src/core/util/validation_errors.cc', + 'src/core/util/validation_errors.h', 'src/core/util/windows/cpu.cc', + 'src/core/util/windows/directory_reader.cc', + 'src/core/util/windows/env.cc', + 'src/core/util/windows/stat.cc', 'src/core/util/windows/string.cc', 'src/core/util/windows/string_util.cc', 'src/core/util/windows/sync.cc', + 'src/core/util/windows/thd.cc', 'src/core/util/windows/time.cc', 'src/core/util/windows/tmpfile.cc', + 'src/core/util/work_serializer.cc', + 'src/core/util/work_serializer.h', + 'src/core/util/xxhash_inline.h', 'src/core/xds/grpc/certificate_provider_store.cc', 'src/core/xds/grpc/certificate_provider_store.h', 'src/core/xds/grpc/file_watcher_certificate_provider_factory.cc', @@ -2963,9 +2963,6 @@ Pod::Spec.new do |s| 'src/core/handshaker/tcp_connect/tcp_connect_handshaker.h', 'src/core/lib/address_utils/parse_address.h', 'src/core/lib/address_utils/sockaddr_utils.h', - 'src/core/lib/avl/avl.h', - 'src/core/lib/backoff/backoff.h', - 'src/core/lib/backoff/random_early_detection.h', 'src/core/lib/channel/call_finalization.h', 'src/core/lib/channel/channel_args.h', 'src/core/lib/channel/channel_args_preconditioning.h', @@ -2981,7 +2978,6 @@ Pod::Spec.new do |s| 'src/core/lib/config/config_vars.h', 'src/core/lib/config/core_configuration.h', 'src/core/lib/config/load_config.h', - 'src/core/lib/debug/event_log.h', 'src/core/lib/debug/trace.h', 'src/core/lib/debug/trace_flags.h', 'src/core/lib/debug/trace_impl.h', @@ -3051,55 +3047,6 @@ Pod::Spec.new do |s| 'src/core/lib/event_engine/work_queue/work_queue.h', 'src/core/lib/experiments/config.h', 'src/core/lib/experiments/experiments.h', - 'src/core/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/glob.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/lib/iomgr/block_annotate.h', 'src/core/lib/iomgr/buffer_list.h', 'src/core/lib/iomgr/call_combiner.h', @@ -3121,8 +3068,6 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/event_engine_shims/tcp_client.h', 'src/core/lib/iomgr/exec_ctx.h', 'src/core/lib/iomgr/executor.h', - 'src/core/lib/iomgr/gethostname.h', - 'src/core/lib/iomgr/grpc_if_nametoindex.h', 'src/core/lib/iomgr/internal_errqueue.h', 'src/core/lib/iomgr/iocp_windows.h', 'src/core/lib/iomgr/iomgr.h', @@ -3165,7 +3110,6 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/vsock.h', 'src/core/lib/iomgr/wakeup_fd_pipe.h', 'src/core/lib/iomgr/wakeup_fd_posix.h', - 'src/core/lib/matchers/matchers.h', 'src/core/lib/promise/activity.h', 'src/core/lib/promise/all_ok.h', 'src/core/lib/promise/arena_promise.h', @@ -3307,7 +3251,6 @@ Pod::Spec.new do |s| 'src/core/lib/transport/timeout_encoding.h', 'src/core/lib/transport/transport.h', 'src/core/lib/transport/transport_fwd.h', - 'src/core/lib/uri/uri_parser.h', 'src/core/load_balancing/address_filtering.h', 'src/core/load_balancing/backend_metric_data.h', 'src/core/load_balancing/backend_metric_parser.h', @@ -3398,11 +3341,33 @@ Pod::Spec.new do |s| 'src/core/tsi/transport_security_grpc.h', 'src/core/tsi/transport_security_interface.h', 'src/core/util/alloc.h', + 'src/core/util/atomic_utils.h', + 'src/core/util/avl.h', + 'src/core/util/backoff.h', + 'src/core/util/bitset.h', + 'src/core/util/chunked_vector.h', + 'src/core/util/construct_destruct.h', + 'src/core/util/cpp_impl_of.h', + 'src/core/util/crash.h', + 'src/core/util/debug_location.h', + 'src/core/util/directory_reader.h', + 'src/core/util/down_cast.h', + 'src/core/util/dual_ref_counted.h', + 'src/core/util/dump_args.h', + 'src/core/util/env.h', + 'src/core/util/event_log.h', + 'src/core/util/examine_stack.h', + 'src/core/util/fork.h', 'src/core/util/gcp_metadata_query.h', + 'src/core/util/gethostname.h', + 'src/core/util/glob.h', + 'src/core/util/grpc_if_nametoindex.h', + 'src/core/util/host_port.h', 'src/core/util/http_client/format_request.h', 'src/core/util/http_client/httpcli.h', 'src/core/util/http_client/httpcli_ssl_credentials.h', 'src/core/util/http_client/parser.h', + 'src/core/util/if_list.h', 'src/core/util/json/json.h', 'src/core/util/json/json_args.h', 'src/core/util/json/json_channel_args.h', @@ -3411,15 +3376,50 @@ Pod::Spec.new do |s| 'src/core/util/json/json_util.h', 'src/core/util/json/json_writer.h', 'src/core/util/latent_see.h', + 'src/core/util/load_file.h', 'src/core/util/lru_cache.h', + 'src/core/util/manual_constructor.h', + 'src/core/util/match.h', + 'src/core/util/matchers.h', + 'src/core/util/memory.h', + 'src/core/util/mpscq.h', + 'src/core/util/no_destruct.h', + 'src/core/util/notification.h', + 'src/core/util/orphanable.h', + 'src/core/util/overload.h', + 'src/core/util/packed_table.h', + 'src/core/util/per_cpu.h', + 'src/core/util/random_early_detection.h', + 'src/core/util/ref_counted.h', + 'src/core/util/ref_counted_ptr.h', + 'src/core/util/ref_counted_string.h', 'src/core/util/ring_buffer.h', + 'src/core/util/single_set_ptr.h', + 'src/core/util/sorted_pack.h', 'src/core/util/spinlock.h', + 'src/core/util/stat.h', + 'src/core/util/status_helper.h', + 'src/core/util/strerror.h', 'src/core/util/string.h', + 'src/core/util/sync.h', + 'src/core/util/table.h', + 'src/core/util/tchar.h', + 'src/core/util/thd.h', + 'src/core/util/time.h', + 'src/core/util/time_averaged_stats.h', 'src/core/util/time_precise.h', + 'src/core/util/time_util.h', 'src/core/util/tmpfile.h', + 'src/core/util/type_list.h', 'src/core/util/unique_ptr_with_bitset.h', + 'src/core/util/unique_type_name.h', 'src/core/util/upb_utils.h', + 'src/core/util/uri.h', 'src/core/util/useful.h', + 'src/core/util/uuid_v4.h', + 'src/core/util/validation_errors.h', + 'src/core/util/work_serializer.h', + 'src/core/util/xxhash_inline.h', 'src/core/xds/grpc/certificate_provider_store.h', 'src/core/xds/grpc/file_watcher_certificate_provider_factory.h', 'src/core/xds/grpc/xds_audit_logger_registry.h', diff --git a/grpc.gemspec b/grpc.gemspec index ba4316386ff..6784a5f4eed 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -1099,11 +1099,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/address_utils/parse_address.h ) s.files += %w( src/core/lib/address_utils/sockaddr_utils.cc ) s.files += %w( src/core/lib/address_utils/sockaddr_utils.h ) - s.files += %w( src/core/lib/avl/avl.h ) - s.files += %w( src/core/lib/backoff/backoff.cc ) - s.files += %w( src/core/lib/backoff/backoff.h ) - s.files += %w( src/core/lib/backoff/random_early_detection.cc ) - s.files += %w( src/core/lib/backoff/random_early_detection.h ) s.files += %w( src/core/lib/channel/call_finalization.h ) s.files += %w( src/core/lib/channel/channel_args.cc ) s.files += %w( src/core/lib/channel/channel_args.h ) @@ -1134,8 +1129,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/config/core_configuration.h ) s.files += %w( src/core/lib/config/load_config.cc ) s.files += %w( src/core/lib/config/load_config.h ) - s.files += %w( src/core/lib/debug/event_log.cc ) - s.files += %w( src/core/lib/debug/event_log.h ) s.files += %w( src/core/lib/debug/trace.cc ) s.files += %w( src/core/lib/debug/trace.h ) s.files += %w( src/core/lib/debug/trace_flags.cc ) @@ -1256,83 +1249,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/experiments/config.h ) s.files += %w( src/core/lib/experiments/experiments.cc ) s.files += %w( src/core/lib/experiments/experiments.h ) - s.files += %w( src/core/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/glob.cc ) - s.files += %w( src/core/lib/gprpp/glob.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/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 ) @@ -1377,13 +1293,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/iomgr/executor.h ) s.files += %w( src/core/lib/iomgr/fork_posix.cc ) s.files += %w( src/core/lib/iomgr/fork_windows.cc ) - s.files += %w( src/core/lib/iomgr/gethostname.h ) - s.files += %w( src/core/lib/iomgr/gethostname_fallback.cc ) - s.files += %w( src/core/lib/iomgr/gethostname_host_name_max.cc ) - s.files += %w( src/core/lib/iomgr/gethostname_sysconf.cc ) - s.files += %w( src/core/lib/iomgr/grpc_if_nametoindex.h ) - s.files += %w( src/core/lib/iomgr/grpc_if_nametoindex_posix.cc ) - s.files += %w( src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc ) s.files += %w( src/core/lib/iomgr/internal_errqueue.cc ) s.files += %w( src/core/lib/iomgr/internal_errqueue.h ) s.files += %w( src/core/lib/iomgr/iocp_windows.cc ) @@ -1474,8 +1383,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/iomgr/wakeup_fd_pipe.h ) s.files += %w( src/core/lib/iomgr/wakeup_fd_posix.cc ) s.files += %w( src/core/lib/iomgr/wakeup_fd_posix.h ) - s.files += %w( src/core/lib/matchers/matchers.cc ) - s.files += %w( src/core/lib/matchers/matchers.h ) s.files += %w( src/core/lib/promise/activity.cc ) s.files += %w( src/core/lib/promise/activity.h ) s.files += %w( src/core/lib/promise/all_ok.h ) @@ -1736,8 +1643,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/transport/transport.h ) s.files += %w( src/core/lib/transport/transport_fwd.h ) s.files += %w( src/core/lib/transport/transport_op_string.cc ) - s.files += %w( src/core/lib/uri/uri_parser.cc ) - s.files += %w( src/core/lib/uri/uri_parser.h ) s.files += %w( src/core/load_balancing/address_filtering.cc ) s.files += %w( src/core/load_balancing/address_filtering.h ) s.files += %w( src/core/load_balancing/backend_metric_data.h ) @@ -1922,8 +1827,43 @@ Gem::Specification.new do |s| s.files += %w( src/core/util/alloc.cc ) s.files += %w( src/core/util/alloc.h ) s.files += %w( src/core/util/atm.cc ) + s.files += %w( src/core/util/atomic_utils.h ) + s.files += %w( src/core/util/avl.h ) + s.files += %w( src/core/util/backoff.cc ) + s.files += %w( src/core/util/backoff.h ) + s.files += %w( src/core/util/bitset.h ) + s.files += %w( src/core/util/chunked_vector.h ) + s.files += %w( src/core/util/construct_destruct.h ) + s.files += %w( src/core/util/cpp_impl_of.h ) + s.files += %w( src/core/util/crash.cc ) + s.files += %w( src/core/util/crash.h ) + s.files += %w( src/core/util/debug_location.h ) + s.files += %w( src/core/util/directory_reader.h ) + s.files += %w( src/core/util/down_cast.h ) + s.files += %w( src/core/util/dual_ref_counted.h ) + s.files += %w( src/core/util/dump_args.cc ) + s.files += %w( src/core/util/dump_args.h ) + s.files += %w( src/core/util/env.h ) + s.files += %w( src/core/util/event_log.cc ) + s.files += %w( src/core/util/event_log.h ) + s.files += %w( src/core/util/examine_stack.cc ) + s.files += %w( src/core/util/examine_stack.h ) + s.files += %w( src/core/util/fork.cc ) + s.files += %w( src/core/util/fork.h ) s.files += %w( src/core/util/gcp_metadata_query.cc ) s.files += %w( src/core/util/gcp_metadata_query.h ) + s.files += %w( src/core/util/gethostname.h ) + s.files += %w( src/core/util/gethostname_fallback.cc ) + s.files += %w( src/core/util/gethostname_host_name_max.cc ) + s.files += %w( src/core/util/gethostname_sysconf.cc ) + s.files += %w( src/core/util/glob.cc ) + s.files += %w( src/core/util/glob.h ) + s.files += %w( src/core/util/gpr_time.cc ) + s.files += %w( src/core/util/grpc_if_nametoindex.h ) + s.files += %w( src/core/util/grpc_if_nametoindex_posix.cc ) + s.files += %w( src/core/util/grpc_if_nametoindex_unsupported.cc ) + s.files += %w( src/core/util/host_port.cc ) + s.files += %w( src/core/util/host_port.h ) s.files += %w( src/core/util/http_client/format_request.cc ) s.files += %w( src/core/util/http_client/format_request.h ) s.files += %w( src/core/util/http_client/httpcli.cc ) @@ -1932,6 +1872,7 @@ Gem::Specification.new do |s| s.files += %w( src/core/util/http_client/httpcli_ssl_credentials.h ) s.files += %w( src/core/util/http_client/parser.cc ) s.files += %w( src/core/util/http_client/parser.h ) + s.files += %w( src/core/util/if_list.h ) s.files += %w( src/core/util/iphone/cpu.cc ) s.files += %w( src/core/util/json/json.h ) s.files += %w( src/core/util/json/json_args.h ) @@ -1947,33 +1888,92 @@ Gem::Specification.new do |s| s.files += %w( src/core/util/latent_see.cc ) s.files += %w( src/core/util/latent_see.h ) s.files += %w( src/core/util/linux/cpu.cc ) + s.files += %w( src/core/util/linux/env.cc ) + s.files += %w( src/core/util/load_file.cc ) + s.files += %w( src/core/util/load_file.h ) s.files += %w( src/core/util/log.cc ) s.files += %w( src/core/util/lru_cache.h ) + s.files += %w( src/core/util/manual_constructor.h ) + s.files += %w( src/core/util/match.h ) + s.files += %w( src/core/util/matchers.cc ) + s.files += %w( src/core/util/matchers.h ) + s.files += %w( src/core/util/memory.h ) + s.files += %w( src/core/util/mpscq.cc ) + s.files += %w( src/core/util/mpscq.h ) s.files += %w( src/core/util/msys/tmpfile.cc ) + s.files += %w( src/core/util/no_destruct.h ) + s.files += %w( src/core/util/notification.h ) + s.files += %w( src/core/util/orphanable.h ) + s.files += %w( src/core/util/overload.h ) + s.files += %w( src/core/util/packed_table.h ) + s.files += %w( src/core/util/per_cpu.cc ) + s.files += %w( src/core/util/per_cpu.h ) s.files += %w( src/core/util/posix/cpu.cc ) + s.files += %w( src/core/util/posix/directory_reader.cc ) + s.files += %w( src/core/util/posix/env.cc ) + s.files += %w( src/core/util/posix/stat.cc ) s.files += %w( src/core/util/posix/string.cc ) s.files += %w( src/core/util/posix/sync.cc ) + s.files += %w( src/core/util/posix/thd.cc ) s.files += %w( src/core/util/posix/time.cc ) s.files += %w( src/core/util/posix/tmpfile.cc ) + s.files += %w( src/core/util/random_early_detection.cc ) + s.files += %w( src/core/util/random_early_detection.h ) + s.files += %w( src/core/util/ref_counted.h ) + s.files += %w( src/core/util/ref_counted_ptr.h ) + s.files += %w( src/core/util/ref_counted_string.cc ) + s.files += %w( src/core/util/ref_counted_string.h ) s.files += %w( src/core/util/ring_buffer.h ) + s.files += %w( src/core/util/single_set_ptr.h ) + s.files += %w( src/core/util/sorted_pack.h ) s.files += %w( src/core/util/spinlock.h ) + s.files += %w( src/core/util/stat.h ) + s.files += %w( src/core/util/status_helper.cc ) + s.files += %w( src/core/util/status_helper.h ) + s.files += %w( src/core/util/strerror.cc ) + s.files += %w( src/core/util/strerror.h ) s.files += %w( src/core/util/string.cc ) s.files += %w( src/core/util/string.h ) s.files += %w( src/core/util/sync.cc ) + s.files += %w( src/core/util/sync.h ) s.files += %w( src/core/util/sync_abseil.cc ) + s.files += %w( src/core/util/table.h ) + s.files += %w( src/core/util/tchar.cc ) + s.files += %w( src/core/util/tchar.h ) + s.files += %w( src/core/util/thd.h ) s.files += %w( src/core/util/time.cc ) + s.files += %w( src/core/util/time.h ) + s.files += %w( src/core/util/time_averaged_stats.cc ) + s.files += %w( src/core/util/time_averaged_stats.h ) s.files += %w( src/core/util/time_precise.cc ) s.files += %w( src/core/util/time_precise.h ) + s.files += %w( src/core/util/time_util.cc ) + s.files += %w( src/core/util/time_util.h ) s.files += %w( src/core/util/tmpfile.h ) + s.files += %w( src/core/util/type_list.h ) s.files += %w( src/core/util/unique_ptr_with_bitset.h ) + s.files += %w( src/core/util/unique_type_name.h ) s.files += %w( src/core/util/upb_utils.h ) + s.files += %w( src/core/util/uri.cc ) + s.files += %w( src/core/util/uri.h ) s.files += %w( src/core/util/useful.h ) + s.files += %w( src/core/util/uuid_v4.cc ) + s.files += %w( src/core/util/uuid_v4.h ) + s.files += %w( src/core/util/validation_errors.cc ) + s.files += %w( src/core/util/validation_errors.h ) s.files += %w( src/core/util/windows/cpu.cc ) + s.files += %w( src/core/util/windows/directory_reader.cc ) + s.files += %w( src/core/util/windows/env.cc ) + s.files += %w( src/core/util/windows/stat.cc ) s.files += %w( src/core/util/windows/string.cc ) s.files += %w( src/core/util/windows/string_util.cc ) s.files += %w( src/core/util/windows/sync.cc ) + s.files += %w( src/core/util/windows/thd.cc ) s.files += %w( src/core/util/windows/time.cc ) s.files += %w( src/core/util/windows/tmpfile.cc ) + s.files += %w( src/core/util/work_serializer.cc ) + s.files += %w( src/core/util/work_serializer.h ) + s.files += %w( src/core/util/xxhash_inline.h ) s.files += %w( src/core/xds/grpc/certificate_provider_store.cc ) s.files += %w( src/core/xds/grpc/certificate_provider_store.h ) s.files += %w( src/core/xds/grpc/file_watcher_certificate_provider_factory.cc ) diff --git a/include/grpcpp/impl/sync.h b/include/grpcpp/impl/sync.h index a7ec965a009..c4aa00bc07d 100644 --- a/include/grpcpp/impl/sync.h +++ b/include/grpcpp/impl/sync.h @@ -36,9 +36,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 d9b37b47eec..341c3a6d827 100644 --- a/package.xml +++ b/package.xml @@ -1081,11 +1081,6 @@ - - - - - @@ -1116,8 +1111,6 @@ - - @@ -1238,83 +1231,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1359,13 +1275,6 @@ - - - - - - - @@ -1456,8 +1365,6 @@ - - @@ -1718,8 +1625,6 @@ - - @@ -1904,8 +1809,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1914,6 +1854,7 @@ + @@ -1929,33 +1870,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/core/BUILD b/src/core/BUILD index b10dbc28550..8220654c837 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", @@ -211,7 +211,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"], ) @@ -305,10 +305,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"], @@ -340,7 +340,7 @@ grpc_cc_library( name = "gpr_manual_constructor", srcs = [], hdrs = [ - "lib/gprpp/manual_constructor.h", + "util/manual_constructor.h", ], language = "c++", deps = [ @@ -365,12 +365,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 = [ @@ -382,11 +382,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", @@ -402,7 +402,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", ], @@ -416,17 +416,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", @@ -451,7 +451,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 = [ @@ -463,10 +463,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", @@ -480,7 +480,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"], ) @@ -488,7 +488,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", @@ -502,7 +502,7 @@ grpc_cc_library( "absl/utility", ], language = "c++", - public_hdrs = ["lib/gprpp/table.h"], + public_hdrs = ["util/table.h"], deps = [ "bitset", "//:gpr_platform", @@ -511,7 +511,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", @@ -523,7 +523,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", @@ -533,7 +533,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", @@ -543,10 +543,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"], ) @@ -1264,7 +1264,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", @@ -1281,7 +1281,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", @@ -1295,10 +1295,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++", @@ -1311,10 +1311,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"], ) @@ -1387,7 +1387,7 @@ grpc_cc_library( "//:iomgr", "//:parse_address", "//:ref_counted_ptr", - "//:uri_parser", + "//:uri", ], ) @@ -1727,10 +1727,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", @@ -1787,7 +1787,7 @@ grpc_cc_library( grpc_cc_library( name = "avl", hdrs = [ - "lib/avl/avl.h", + "util/avl.h", ], deps = [ "ref_counted", @@ -1799,9 +1799,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"], ) @@ -2707,7 +2707,7 @@ grpc_cc_library( "//:gpr", "//:gpr_platform", "//:parse_address", - "//:uri_parser", + "//:uri", ], ) @@ -3041,10 +3041,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", @@ -3055,10 +3055,10 @@ grpc_cc_library( grpc_cc_library( name = "event_log", srcs = [ - "lib/debug/event_log.cc", + "util/event_log.cc", ], hdrs = [ - "lib/debug/event_log.h", + "util/event_log.h", ], external_deps = [ "absl/base:core_headers", @@ -3075,10 +3075,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", @@ -3160,7 +3160,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", @@ -3218,7 +3218,7 @@ grpc_cc_library( grpc_cc_library( name = "notification", hdrs = [ - "lib/gprpp/notification.h", + "util/notification.h", ], external_deps = ["absl/time"], deps = ["//:gpr"], @@ -3722,7 +3722,7 @@ grpc_cc_library( "//:iomgr", "//:parse_address", "//:sockaddr_utils", - "//:uri_parser", + "//:uri", ], ) @@ -3786,7 +3786,7 @@ grpc_cc_library( grpc_cc_library( name = "sorted_pack", hdrs = [ - "lib/gprpp/sorted_pack.h", + "util/sorted_pack.h", ], language = "c++", deps = [ @@ -3798,7 +3798,7 @@ grpc_cc_library( grpc_cc_library( name = "type_list", hdrs = [ - "lib/gprpp/type_list.h", + "util/type_list.h", ], language = "c++", ) @@ -3806,7 +3806,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"], @@ -3916,7 +3916,7 @@ grpc_cc_library( "//:parse_address", "//:promise", "//:ref_counted_ptr", - "//:uri_parser", + "//:uri", ], ) @@ -4102,7 +4102,7 @@ grpc_cc_library( "//:ref_counted_ptr", "//:sockaddr_utils", "//:tsi_base", - "//:uri_parser", + "//:uri", ], ) @@ -4205,17 +4205,17 @@ grpc_cc_library( "//:iomgr", "//:orphanable", "//:ref_counted_ptr", - "//:uri_parser", + "//:uri", ], ) 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"], @@ -4399,7 +4399,7 @@ grpc_cc_library( "//:orphanable", "//:promise", "//:ref_counted_ptr", - "//:uri_parser", + "//:uri", ], ) @@ -4454,7 +4454,7 @@ grpc_cc_library( "//:orphanable", "//:promise", "//:ref_counted_ptr", - "//:uri_parser", + "//:uri", ], ) @@ -4511,7 +4511,7 @@ grpc_cc_library( "//:iomgr", "//:orphanable", "//:ref_counted_ptr", - "//:uri_parser", + "//:uri", ], ) @@ -4567,10 +4567,10 @@ grpc_cc_library( grpc_cc_library( name = "grpc_matchers", srcs = [ - "lib/matchers/matchers.cc", + "util/matchers.cc", ], hdrs = [ - "lib/matchers/matchers.h", + "util/matchers.h", ], external_deps = [ "absl/status", @@ -5134,10 +5134,10 @@ grpc_cc_library( grpc_cc_library( name = "random_early_detection", srcs = [ - "lib/backoff/random_early_detection.cc", + "util/random_early_detection.cc", ], hdrs = [ - "lib/backoff/random_early_detection.h", + "util/random_early_detection.h", ], external_deps = [ "absl/random:bit_gen_ref", @@ -5845,7 +5845,7 @@ grpc_cc_library( "//:ref_counted_ptr", "//:sockaddr_utils", "//:tsi_ssl_credentials", - "//:uri_parser", + "//:uri", "//:work_serializer", "//:xds_client", ], @@ -5931,7 +5931,7 @@ grpc_cc_library( "//:ref_counted_ptr", "//:server", "//:sockaddr_utils", - "//:uri_parser", + "//:uri", "//:xds_client", ], ) @@ -6329,7 +6329,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", @@ -6339,8 +6339,8 @@ grpc_cc_library( grpc_cc_library( name = "glob", - srcs = ["lib/gprpp/glob.cc"], - hdrs = ["lib/gprpp/glob.h"], + srcs = ["util/glob.cc"], + hdrs = ["util/glob.h"], external_deps = ["absl/strings"], ) @@ -6402,7 +6402,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"], @@ -6839,7 +6839,7 @@ grpc_cc_library( "//:grpc_security_base", "//:parse_address", "//:promise", - "//:uri_parser", + "//:uri", ], alwayslink = 1, ) @@ -6915,7 +6915,7 @@ grpc_cc_library( "//:grpc_trace", "//:orphanable", "//:ref_counted_ptr", - "//:uri_parser", + "//:uri", "//:work_serializer", ], ) @@ -6988,7 +6988,7 @@ grpc_cc_library( "//:iomgr", "//:orphanable", "//:ref_counted_ptr", - "//:uri_parser", + "//:uri", ], ) @@ -7051,7 +7051,7 @@ grpc_cc_library( "//:iomgr", "//:orphanable", "//:ref_counted_ptr", - "//:uri_parser", + "//:uri", ], ) @@ -7076,7 +7076,7 @@ grpc_cc_library( "//:grpc_resolver", "//:orphanable", "//:parse_address", - "//:uri_parser", + "//:uri", ], ) @@ -7103,7 +7103,7 @@ grpc_cc_library( "//:gpr", "//:grpc_resolver", "//:orphanable", - "//:uri_parser", + "//:uri", ], ) @@ -7238,7 +7238,7 @@ grpc_cc_library( "//:grpc_trace", "//:orphanable", "//:ref_counted_ptr", - "//:uri_parser", + "//:uri", "//:work_serializer", "//:xds_client", ], @@ -7275,7 +7275,7 @@ grpc_cc_library( "//:iomgr", "//:orphanable", "//:ref_counted_ptr", - "//:uri_parser", + "//:uri", "//:work_serializer", "//:xds_client", ], @@ -7598,7 +7598,7 @@ grpc_cc_library( "//:ref_counted_ptr", "//:server", "//:sockaddr_utils", - "//:uri_parser", + "//:uri", ], ) @@ -7763,7 +7763,7 @@ grpc_cc_library( "//:iomgr", "//:orphanable", "//:ref_counted_ptr", - "//:uri_parser", + "//:uri", ], ) @@ -7829,7 +7829,7 @@ grpc_cc_library( "//:grpc_client_channel", "//:grpc_public_hdrs", "//:grpc_resolver", - "//:uri_parser", + "//:uri", ], ) diff --git a/src/core/channelz/channel_trace.cc b/src/core/channelz/channel_trace.cc index 6e6884cd703..ee1de5e87c5 100644 --- a/src/core/channelz/channel_trace.cc +++ b/src/core/channelz/channel_trace.cc @@ -28,10 +28,10 @@ #include #include "src/core/channelz/channelz.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/util/string.h" +#include "src/core/util/time.h" namespace grpc_core { namespace channelz { diff --git a/src/core/channelz/channel_trace.h b/src/core/channelz/channel_trace.h index c6c245c5cf5..82ac733e4c7 100644 --- a/src/core/channelz/channel_trace.h +++ b/src/core/channelz/channel_trace.h @@ -28,9 +28,9 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/util/json/json.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/channelz/channelz.cc b/src/core/channelz/channelz.cc index 9487b9161ef..ef27e51ffbf 100644 --- a/src/core/channelz/channelz.cc +++ b/src/core/channelz/channelz.cc @@ -38,9 +38,9 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/transport/connectivity_state.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/util/json/json_writer.h" #include "src/core/util/string.h" +#include "src/core/util/uri.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/channelz/channelz.h b/src/core/channelz/channelz.h index e441edc81a6..6938ec99437 100644 --- a/src/core/channelz/channelz.h +++ b/src/core/channelz/channelz.h @@ -38,11 +38,11 @@ #include #include "src/core/channelz/channel_trace.h" -#include "src/core/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/json/json.h" +#include "src/core/util/per_cpu.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" #include "src/core/util/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 63f6e557c7f..4393675c831 100644 --- a/src/core/channelz/channelz_registry.cc +++ b/src/core/channelz/channelz_registry.cc @@ -33,10 +33,10 @@ #include #include "src/core/channelz/channelz.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/sync.h" namespace grpc_core { namespace channelz { diff --git a/src/core/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 61056c47675..37914688a7e 100644 --- a/src/core/client_channel/backup_poller.cc +++ b/src/core/client_channel/backup_poller.cc @@ -29,14 +29,14 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/timer.h" +#include "src/core/util/memory.h" +#include "src/core/util/time.h" #define DEFAULT_POLL_INTERVAL_MS 5000 diff --git a/src/core/client_channel/client_channel.cc b/src/core/client_channel/client_channel.cc index d2f3dd5858a..bf87078b474 100644 --- a/src/core/client_channel/client_channel.cc +++ b/src/core/client_channel/client_channel.cc @@ -63,10 +63,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/exec_ctx_wakeup_scheduler.h" @@ -94,8 +90,12 @@ #include "src/core/resolver/resolver_registry.h" #include "src/core/service_config/service_config_impl.h" #include "src/core/telemetry/metrics.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" +#include "src/core/util/sync.h" #include "src/core/util/useful.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/client_channel/client_channel.h b/src/core/client_channel/client_channel.h index 7a73a2259d0..f268f6bfcb7 100644 --- a/src/core/client_channel/client_channel.h +++ b/src/core/client_channel/client_channel.h @@ -27,13 +27,13 @@ #include "src/core/client_channel/config_selector.h" #include "src/core/client_channel/subchannel.h" #include "src/core/ext/filters/channel_idle/idle_filter_state.h" -#include "src/core/lib/gprpp/single_set_ptr.h" #include "src/core/lib/promise/observable.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/transport/metadata.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/resolver/resolver.h" #include "src/core/service_config/service_config.h" +#include "src/core/util/single_set_ptr.h" namespace grpc_core { diff --git a/src/core/client_channel/client_channel_factory.h b/src/core/client_channel/client_channel_factory.h index e72f9923dd1..fee6cd9f628 100644 --- a/src/core/client_channel/client_channel_factory.h +++ b/src/core/client_channel/client_channel_factory.h @@ -23,8 +23,8 @@ #include "src/core/client_channel/subchannel.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/resolved_address.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/client_channel/client_channel_filter.cc b/src/core/client_channel/client_channel_filter.cc index 6252be05b8e..8bedc588914 100644 --- a/src/core/client_channel/client_channel_filter.cc +++ b/src/core/client_channel/client_channel_filter.cc @@ -70,13 +70,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/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/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/iomgr/pollset_set.h" @@ -104,8 +97,15 @@ #include "src/core/resolver/resolver_registry.h" #include "src/core/service_config/service_config_call_data.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" +#include "src/core/util/manual_constructor.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/sync.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" +#include "src/core/util/work_serializer.h" // // Client channel filter @@ -1621,7 +1621,7 @@ void ClientChannelFilter::UpdateStateAndPickerLocked( namespace { -// TODO(roth): Remove this in favor of the gprpp Match() function once +// TODO(roth): Remove this in favor of src/core/util/match.h once // we can do that without breaking lock annotations. template T HandlePickResult( diff --git a/src/core/client_channel/client_channel_filter.h b/src/core/client_channel/client_channel_filter.h index 7ecf787ca74..2741006a38a 100644 --- a/src/core/client_channel/client_channel_filter.h +++ b/src/core/client_channel/client_channel_filter.h @@ -46,12 +46,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" -#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/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" @@ -67,7 +61,13 @@ #include "src/core/resolver/resolver.h" #include "src/core/service_config/service_config.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #include "src/core/util/time_precise.h" +#include "src/core/util/work_serializer.h" // // Client channel filter diff --git a/src/core/client_channel/client_channel_internal.h b/src/core/client_channel/client_channel_internal.h index b9acdd883ec..1806bf057c9 100644 --- a/src/core/client_channel/client_channel_internal.h +++ b/src/core/client_channel/client_channel_internal.h @@ -24,13 +24,13 @@ #include "absl/functional/any_invocable.h" #include "absl/log/check.h" -#include "src/core/lib/gprpp/down_cast.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/transport/call_destination.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/service_config/service_config_call_data.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/down_cast.h" +#include "src/core/util/unique_type_name.h" // // This file contains internal interfaces used to allow various plugins diff --git a/src/core/client_channel/client_channel_service_config.h b/src/core/client_channel/client_channel_service_config.h index 60340e2685f..e985b8e92e0 100644 --- a/src/core/client_channel/client_channel_service_config.h +++ b/src/core/client_channel/client_channel_service_config.h @@ -29,14 +29,14 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/service_config/service_config_parser.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { namespace internal { diff --git a/src/core/client_channel/config_selector.h b/src/core/client_channel/config_selector.h index 1fb1ddab78a..76572369fe4 100644 --- a/src/core/client_channel/config_selector.h +++ b/src/core/client_channel/config_selector.h @@ -32,14 +32,14 @@ #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/lib/gprpp/unique_type_name.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/interception_chain.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/service_config/service_config.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" // Channel arg key for ConfigSelector. diff --git a/src/core/client_channel/connector.h b/src/core/client_channel/connector.h index 5c218dd7d41..927b1024318 100644 --- a/src/core/client_channel/connector.h +++ b/src/core/client_channel/connector.h @@ -21,14 +21,14 @@ #include "src/core/channelz/channelz.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/client_channel/direct_channel.cc b/src/core/client_channel/direct_channel.cc index 7a87774dc20..6ccde807dcc 100644 --- a/src/core/client_channel/direct_channel.cc +++ b/src/core/client_channel/direct_channel.cc @@ -16,10 +16,10 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/event_engine_context.h" -#include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/surface/client_call.h" #include "src/core/lib/transport/interception_chain.h" +#include "src/core/util/orphanable.h" namespace grpc_core { diff --git a/src/core/client_channel/dynamic_filters.cc b/src/core/client_channel/dynamic_filters.cc index f6658343e0a..45e7d4ffcbc 100644 --- a/src/core/client_channel/dynamic_filters.cc +++ b/src/core/client_channel/dynamic_filters.cc @@ -31,10 +31,10 @@ #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack_builder_impl.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/surface/lame_client.h" #include "src/core/util/alloc.h" +#include "src/core/util/status_helper.h" // Conversion between call and call stack. #define CALL_TO_CALL_STACK(call) \ diff --git a/src/core/client_channel/dynamic_filters.h b/src/core/client_channel/dynamic_filters.h index bbde6e6c806..142217d72d3 100644 --- a/src/core/client_channel/dynamic_filters.h +++ b/src/core/client_channel/dynamic_filters.h @@ -27,16 +27,16 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" -#include "src/core/lib/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/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/core/util/time_precise.h" namespace grpc_core { diff --git a/src/core/client_channel/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/load_balanced_call_destination.cc b/src/core/client_channel/load_balanced_call_destination.cc index a54a249616a..5d7c0b3c66c 100644 --- a/src/core/client_channel/load_balanced_call_destination.cc +++ b/src/core/client_channel/load_balanced_call_destination.cc @@ -53,7 +53,7 @@ class LbCallState : public ClientChannelLbCallState { } }; -// TODO(roth): Remove this in favor of the gprpp Match() function once +// TODO(roth): Remove this in favor of src/core/util/match.h function once // we can do that without breaking lock annotations. template T HandlePickResult( 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 754a543d7eb..73de1a4ebe1 100644 --- a/src/core/client_channel/retry_filter.cc +++ b/src/core/client_channel/retry_filter.cc @@ -33,11 +33,11 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/error.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_call_data.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/uri.h" // // Retry filter diff --git a/src/core/client_channel/retry_filter.h b/src/core/client_channel/retry_filter.h index 8e30d1e7b66..402fa047691 100644 --- a/src/core/client_channel/retry_filter.h +++ b/src/core/client_channel/retry_filter.h @@ -37,9 +37,9 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/useful.h" namespace grpc_core { 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 4bb4bf3f9a3..dda37fd4c62 100644 --- a/src/core/client_channel/retry_filter_legacy_call_data.cc +++ b/src/core/client_channel/retry_filter_legacy_call_data.cc @@ -29,17 +29,9 @@ #include "src/core/client_channel/client_channel_internal.h" #include "src/core/client_channel/retry_service_config.h" #include "src/core/client_channel/retry_throttle.h" -#include "src/core/lib/backoff/backoff.h" #include "src/core/lib/channel/channel_stack.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/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" @@ -51,6 +43,14 @@ #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/backoff.h" +#include "src/core/util/construct_destruct.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/client_channel/retry_filter_legacy_call_data.h b/src/core/client_channel/retry_filter_legacy_call_data.h index dd308b72366..a4336072f1b 100644 --- a/src/core/client_channel/retry_filter_legacy_call_data.h +++ b/src/core/client_channel/retry_filter_legacy_call_data.h @@ -34,14 +34,8 @@ #include "src/core/client_channel/retry_filter.h" #include "src/core/client_channel/retry_service_config.h" #include "src/core/client_channel/retry_throttle.h" -#include "src/core/lib/backoff/backoff.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.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/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" @@ -50,6 +44,12 @@ #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/backoff.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/client_channel/retry_service_config.h b/src/core/client_channel/retry_service_config.h index 6e4bbc29753..237e3b93bcc 100644 --- a/src/core/client_channel/retry_service_config.h +++ b/src/core/client_channel/retry_service_config.h @@ -30,12 +30,12 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/status_util.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/service_config/service_config_parser.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { namespace internal { diff --git a/src/core/client_channel/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 298c7d78516..26f76b77709 100644 --- a/src/core/client_channel/subchannel.cc +++ b/src/core/client_channel/subchannel.cc @@ -44,19 +44,12 @@ #include "src/core/client_channel/subchannel_pool_interface.h" #include "src/core/handshaker/proxy_mapper_registry.h" #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/backoff/backoff.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack_builder_impl.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/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/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/promise/cancel_callback.h" @@ -72,6 +65,13 @@ #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" #include "src/core/util/alloc.h" +#include "src/core/util/backoff.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/sync.h" #include "src/core/util/useful.h" // Backoff parameters. diff --git a/src/core/client_channel/subchannel.h b/src/core/client_channel/subchannel.h index 502df2b4844..06a414363b1 100644 --- a/src/core/client_channel/subchannel.h +++ b/src/core/client_channel/subchannel.h @@ -34,18 +34,8 @@ #include "src/core/client_channel/connector.h" #include "src/core/client_channel/subchannel_pool_interface.h" #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/backoff/backoff.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.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/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" @@ -58,7 +48,17 @@ #include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/backoff.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/dual_ref_counted.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #include "src/core/util/time_precise.h" +#include "src/core/util/unique_type_name.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/client_channel/subchannel_interface_internal.h b/src/core/client_channel/subchannel_interface_internal.h index fc5b9faaed5..9d93984b598 100644 --- a/src/core/client_channel/subchannel_interface_internal.h +++ b/src/core/client_channel/subchannel_interface_internal.h @@ -20,8 +20,8 @@ #include #include "src/core/client_channel/subchannel.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/load_balancing/subchannel_interface.h" +#include "src/core/util/unique_type_name.h" namespace grpc_core { diff --git a/src/core/client_channel/subchannel_pool_interface.h b/src/core/client_channel/subchannel_pool_interface.h index 6a073ed9cb5..d7cab8f1e99 100644 --- a/src/core/client_channel/subchannel_pool_interface.h +++ b/src/core/client_channel/subchannel_pool_interface.h @@ -27,9 +27,9 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/resolved_address.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/client_channel/subchannel_stream_client.cc b/src/core/client_channel/subchannel_stream_client.cc index afdafe398e9..a01165e3d11 100644 --- a/src/core/client_channel/subchannel_stream_client.cc +++ b/src/core/client_channel/subchannel_stream_client.cc @@ -29,13 +29,13 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/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/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #include "src/core/util/time_precise.h" #define SUBCHANNEL_STREAM_INITIAL_CONNECT_BACKOFF_SECONDS 1 diff --git a/src/core/client_channel/subchannel_stream_client.h b/src/core/client_channel/subchannel_stream_client.h index 3945c1c9eba..f50314e0ace 100644 --- a/src/core/client_channel/subchannel_stream_client.h +++ b/src/core/client_channel/subchannel_stream_client.h @@ -33,10 +33,6 @@ #include #include "src/core/client_channel/subchannel.h" -#include "src/core/lib/backoff/backoff.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/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" @@ -48,6 +44,10 @@ #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/backoff.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc b/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc index 6b0582afc0c..bc4e834a10d 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 @@ -35,12 +35,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -54,6 +48,12 @@ #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/http2_errors.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/per_cpu.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h b/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h index 74bf3a2f09b..b4b61f10bb3 100644 --- a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h +++ b/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h @@ -29,14 +29,14 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/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/lib/promise/activity.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/single_set_ptr.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/ext/filters/fault_injection/fault_injection_filter.cc b/src/core/ext/filters/fault_injection/fault_injection_filter.cc index 6576c6df96d..e52ca7906ee 100644 --- a/src/core/ext/filters/fault_injection/fault_injection_filter.cc +++ b/src/core/ext/filters/fault_injection/fault_injection_filter.cc @@ -43,13 +43,13 @@ #include "src/core/lib/channel/status_util.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/sleep.h" #include "src/core/lib/promise/try_seq.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" #include "src/core/service_config/service_config_call_data.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/ext/filters/fault_injection/fault_injection_filter.h b/src/core/ext/filters/fault_injection/fault_injection_filter.h index 7bcd2227060..40b839c1033 100644 --- a/src/core/ext/filters/fault_injection/fault_injection_filter.h +++ b/src/core/ext/filters/fault_injection/fault_injection_filter.h @@ -30,9 +30,9 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h b/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h index bef8185fe27..0016c552c8e 100644 --- a/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h +++ b/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h @@ -33,12 +33,12 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/service_config/service_config_parser.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" // Channel arg key for enabling parsing fault injection via method config. #define GRPC_ARG_PARSE_FAULT_INJECTION_METHOD_CONFIG \ diff --git a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h index 927e2de05ef..18109c70c1b 100644 --- a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h +++ b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h @@ -28,12 +28,12 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/transport/transport.h" #include "src/core/resolver/xds/xds_config.h" #include "src/core/util/lru_cache.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h b/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h index 97df008e968..2c64a694485 100644 --- a/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h +++ b/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h @@ -28,11 +28,11 @@ #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/service_config/service_config_parser.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/validation_errors.h" // Channel arg key for enabling parsing fault injection via method config. #define GRPC_ARG_PARSE_GCP_AUTHENTICATION_METHOD_CONFIG \ diff --git a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc index 2023fb436d6..928a50867e3 100644 --- a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc +++ b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc @@ -61,7 +61,7 @@ #include "src/core/lib/slice/slice.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/metadata_batch.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/uri.h" #include "src/cpp/server/load_reporter/constants.h" // IWYU pragma: no_include "opencensus/stats/recording.h" diff --git a/src/core/ext/filters/logging/logging_filter.cc b/src/core/ext/filters/logging/logging_filter.cc index 67d1b274691..1963f823665 100644 --- a/src/core/ext/filters/logging/logging_filter.cc +++ b/src/core/ext/filters/logging/logging_filter.cc @@ -53,8 +53,6 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/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" @@ -66,9 +64,11 @@ #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/resolver_registry.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/host_port.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" namespace grpc_core { diff --git a/src/core/ext/filters/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 3ed3b2b735b..2bc36cfde31 100644 --- a/src/core/ext/filters/message_size/message_size_filter.h +++ b/src/core/ext/filters/message_size/message_size_filter.h @@ -32,13 +32,13 @@ #include "src/core/lib/channel/channel_fwd.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/lib/promise/arena_promise.h" #include "src/core/lib/transport/transport.h" #include "src/core/service_config/service_config_parser.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/ext/filters/rbac/rbac_service_config_parser.cc b/src/core/ext/filters/rbac/rbac_service_config_parser.cc index 000440f5274..56195fe4625 100644 --- a/src/core/ext/filters/rbac/rbac_service_config_parser.cc +++ b/src/core/ext/filters/rbac/rbac_service_config_parser.cc @@ -31,10 +31,10 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/matchers/matchers.h" #include "src/core/lib/security/authorization/audit_logging.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/matchers.h" namespace grpc_core { diff --git a/src/core/ext/filters/rbac/rbac_service_config_parser.h b/src/core/ext/filters/rbac/rbac_service_config_parser.h index 728a92e1bf0..f9a4c29c34e 100644 --- a/src/core/ext/filters/rbac/rbac_service_config_parser.h +++ b/src/core/ext/filters/rbac/rbac_service_config_parser.h @@ -30,11 +30,11 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/lib/security/authorization/grpc_authorization_engine.h" #include "src/core/lib/security/authorization/rbac_policy.h" #include "src/core/service_config/service_config_parser.h" #include "src/core/util/json/json.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/ext/filters/stateful_session/stateful_session_filter.cc b/src/core/ext/filters/stateful_session/stateful_session_filter.cc index cf83e5db1ff..953a32a511b 100644 --- a/src/core/ext/filters/stateful_session/stateful_session_filter.cc +++ b/src/core/ext/filters/stateful_session/stateful_session_filter.cc @@ -41,8 +41,6 @@ #include "src/core/lib/channel/channel_stack.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/lib/promise/context.h" #include "src/core/lib/promise/map.h" #include "src/core/lib/promise/pipe.h" @@ -52,6 +50,8 @@ #include "src/core/lib/transport/transport.h" #include "src/core/resolver/xds/xds_resolver_attributes.h" #include "src/core/service_config/service_config_call_data.h" +#include "src/core/util/crash.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/ext/filters/stateful_session/stateful_session_filter.h b/src/core/ext/filters/stateful_session/stateful_session_filter.h index 3bffbaa8547..b7bde679c17 100644 --- a/src/core/ext/filters/stateful_session/stateful_session_filter.h +++ b/src/core/ext/filters/stateful_session/stateful_session_filter.h @@ -30,11 +30,11 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/lib/gprpp/ref_counted_string.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/transport/transport.h" #include "src/core/service_config/service_config_call_data.h" +#include "src/core/util/ref_counted_string.h" +#include "src/core/util/unique_type_name.h" namespace grpc_core { diff --git a/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h b/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h index ccb6245b28f..edf6f55a79d 100644 --- a/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h +++ b/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h @@ -30,12 +30,12 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/service_config/service_config_parser.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" // Channel arg key for enabling parsing fault injection via method config. #define GRPC_ARG_PARSE_STATEFUL_SESSION_METHOD_CONFIG \ diff --git a/src/core/ext/transport/binder/client/channel_create.cc b/src/core/ext/transport/binder/client/channel_create.cc index f5dd12c9991..6ccf25f5b9b 100644 --- a/src/core/ext/transport/binder/client/channel_create.cc +++ b/src/core/ext/transport/binder/client/channel_create.cc @@ -29,7 +29,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 04190d01a3c..8fc4f629c3c 100644 --- a/src/core/ext/transport/binder/client/jni_utils.cc +++ b/src/core/ext/transport/binder/client/jni_utils.cc @@ -21,7 +21,7 @@ #ifndef GRPC_NO_BINDER -#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 07304767336..4fe4ee4d159 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 @@ -27,7 +27,7 @@ #include "absl/log/log.h" #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 5014ff85ccc..06ed2da8798 100644 --- a/src/core/ext/transport/binder/transport/binder_transport.cc +++ b/src/core/ext/transport/binder/transport/binder_transport.cc @@ -36,12 +36,12 @@ #include "src/core/ext/transport/binder/wire_format/wire_reader_impl.h" #include "src/core/ext/transport/binder/wire_format/wire_writer.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/crash.h" #ifndef NDEBUG static void grpc_binder_stream_ref(grpc_binder_stream* s, const char* reason) { diff --git a/src/core/ext/transport/binder/transport/binder_transport.h b/src/core/ext/transport/binder/transport/binder_transport.h index 1d7b43a7d11..108926f25df 100644 --- a/src/core/ext/transport/binder/transport/binder_transport.h +++ b/src/core/ext/transport/binder/transport/binder_transport.h @@ -32,9 +32,9 @@ #include "src/core/ext/transport/binder/wire_format/binder.h" #include "src/core/ext/transport/binder/wire_format/wire_reader.h" #include "src/core/ext/transport/binder/wire_format/wire_writer.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/crash.h" struct grpc_binder_stream; diff --git a/src/core/ext/transport/binder/utils/ndk_binder.cc b/src/core/ext/transport/binder/utils/ndk_binder.cc index 79227a44c67..95b52789803 100644 --- a/src/core/ext/transport/binder/utils/ndk_binder.cc +++ b/src/core/ext/transport/binder/utils/ndk_binder.cc @@ -25,8 +25,8 @@ #include "absl/log/check.h" #include "absl/log/log.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 { 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 5e33262cd66..e2a55df6b01 100644 --- a/src/core/ext/transport/binder/wire_format/binder_android.cc +++ b/src/core/ext/transport/binder/wire_format/binder_android.cc @@ -26,8 +26,8 @@ #include "absl/strings/str_cat.h" #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 971b3bdb9ac..eda30d093a5 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 "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 bb01c892319..d877b9cd9c1 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 @@ -33,8 +33,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 1b954e1d26a..1cefd1bd5f2 100644 --- a/src/core/ext/transport/binder/wire_format/wire_writer.cc +++ b/src/core/ext/transport/binder/wire_format/wire_writer.cc @@ -26,7 +26,7 @@ #include "absl/types/variant.h" #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..81041c68c02 100644 --- a/src/core/ext/transport/binder/wire_format/wire_writer.h +++ b/src/core/ext/transport/binder/wire_format/wire_writer.h @@ -25,8 +25,8 @@ #include "src/core/ext/transport/binder/wire_format/binder.h" #include "src/core/ext/transport/binder/wire_format/transaction.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/combiner.h" +#include "src/core/util/sync.h" namespace grpc_binder { diff --git a/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc b/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc index be3dfa83f53..d8743703a04 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 @@ -41,10 +41,6 @@ #include "src/core/lib/event_engine/extensions/chaotic_good_extension.h" #include "src/core/lib/event_engine/query_extensions.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" @@ -65,6 +61,10 @@ #include "src/core/lib/surface/channel_create.h" #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/transport/promise_endpoint.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" namespace grpc_core { namespace chaotic_good { diff --git a/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h b/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h index 5078d384369..59ef8fd4376 100644 --- a/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h +++ b/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h @@ -31,9 +31,6 @@ #include "src/core/handshaker/handshaker.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -45,6 +42,9 @@ #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/transport/promise_endpoint.h" +#include "src/core/util/notification.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" namespace grpc_core { namespace chaotic_good { diff --git a/src/core/ext/transport/chaotic_good/client_transport.cc b/src/core/ext/transport/chaotic_good/client_transport.cc index 2c2c208f31d..17aff601d45 100644 --- a/src/core/ext/transport/chaotic_good/client_transport.cc +++ b/src/core/ext/transport/chaotic_good/client_transport.cc @@ -36,8 +36,6 @@ #include "src/core/ext/transport/chaotic_good/frame.h" #include "src/core/ext/transport/chaotic_good/frame_header.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" -#include "src/core/lib/gprpp/match.h" -#include "src/core/lib/gprpp/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" @@ -53,6 +51,8 @@ #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/transport/promise_endpoint.h" +#include "src/core/util/match.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { namespace chaotic_good { diff --git a/src/core/ext/transport/chaotic_good/client_transport.h b/src/core/ext/transport/chaotic_good/client_transport.h index 47dacc23bc7..8f2941947d3 100644 --- a/src/core/ext/transport/chaotic_good/client_transport.h +++ b/src/core/ext/transport/chaotic_good/client_transport.h @@ -43,7 +43,6 @@ #include "src/core/ext/transport/chaotic_good/frame_header.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/for_each.h" @@ -61,6 +60,7 @@ #include "src/core/lib/transport/metadata_batch.h" // IWYU pragma: keep #include "src/core/lib/transport/promise_endpoint.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/sync.h" namespace grpc_core { namespace chaotic_good { diff --git a/src/core/ext/transport/chaotic_good/frame.cc b/src/core/ext/transport/chaotic_good/frame.cc index 243d8ef4ca2..dccdf7f0dc5 100644 --- a/src/core/ext/transport/chaotic_good/frame.cc +++ b/src/core/ext/transport/chaotic_good/frame.cc @@ -28,13 +28,13 @@ #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/lib/promise/context.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_buffer.h" +#include "src/core/util/bitset.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/status_helper.h" namespace grpc_core { namespace chaotic_good { diff --git a/src/core/ext/transport/chaotic_good/frame.h b/src/core/ext/transport/chaotic_good/frame.h index 548280858bf..a328c3c80ce 100644 --- a/src/core/ext/transport/chaotic_good/frame.h +++ b/src/core/ext/transport/chaotic_good/frame.h @@ -28,11 +28,11 @@ #include "src/core/ext/transport/chaotic_good/frame_header.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" -#include "src/core/lib/gprpp/match.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/match.h" namespace grpc_core { namespace chaotic_good { diff --git a/src/core/ext/transport/chaotic_good/frame_header.h b/src/core/ext/transport/chaotic_good/frame_header.h index 760c9c0d07d..91a83eed4a8 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 ac044244bd2..f5c8dc2d685 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 @@ -44,11 +44,6 @@ #include "src/core/lib/event_engine/query_extensions.h" #include "src/core/lib/event_engine/resolved_address_internal.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/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/iomgr/error.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" #include "src/core/lib/promise/activity.h" @@ -68,6 +63,11 @@ #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/promise_endpoint.h" #include "src/core/server/server.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" namespace grpc_core { namespace chaotic_good { diff --git a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h index d5ec23b5de3..167da14458d 100644 --- a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h +++ b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h @@ -34,8 +34,6 @@ #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" #include "src/core/handshaker/handshaker.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" @@ -46,6 +44,8 @@ #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/promise_endpoint.h" #include "src/core/server/server.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" namespace grpc_core { namespace chaotic_good { diff --git a/src/core/ext/transport/chaotic_good/server_transport.cc b/src/core/ext/transport/chaotic_good/server_transport.cc index 0261223e823..4110af2fbcc 100644 --- a/src/core/ext/transport/chaotic_good/server_transport.cc +++ b/src/core/ext/transport/chaotic_good/server_transport.cc @@ -35,7 +35,6 @@ #include "src/core/ext/transport/chaotic_good/frame_header.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/lib/event_engine/event_engine_context.h" -#include "src/core/lib/gprpp/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" @@ -48,6 +47,7 @@ #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/promise_endpoint.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { namespace chaotic_good { diff --git a/src/core/ext/transport/chaotic_good/server_transport.h b/src/core/ext/transport/chaotic_good/server_transport.h index 246b25f7313..23909768b68 100644 --- a/src/core/ext/transport/chaotic_good/server_transport.h +++ b/src/core/ext/transport/chaotic_good/server_transport.h @@ -50,8 +50,6 @@ #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" #include "src/core/lib/event_engine/default_event_engine.h" // IWYU pragma: keep -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/if.h" @@ -73,6 +71,8 @@ #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/promise_endpoint.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" namespace grpc_core { namespace chaotic_good { diff --git a/src/core/ext/transport/chaotic_good/settings_metadata.cc b/src/core/ext/transport/chaotic_good/settings_metadata.cc index a6e5cc02993..3d952be719a 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 48204fd2c6c..2f6e070ae6a 100644 --- a/src/core/ext/transport/chttp2/client/chttp2_connector.cc +++ b/src/core/ext/transport/chttp2/client/chttp2_connector.cc @@ -54,11 +54,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/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/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/resolved_address.h" @@ -71,6 +66,11 @@ #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/transport/transport.h" #include "src/core/resolver/resolver_registry.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" +#include "src/core/util/unique_type_name.h" #ifdef GPR_SUPPORT_CHANNELS_FROM_FD diff --git a/src/core/ext/transport/chttp2/client/chttp2_connector.h b/src/core/ext/transport/chttp2/client/chttp2_connector.h index 0cb08474ca6..4c7eaa614da 100644 --- a/src/core/ext/transport/chttp2/client/chttp2_connector.h +++ b/src/core/ext/transport/chttp2/client/chttp2_connector.h @@ -27,11 +27,11 @@ #include "src/core/client_channel/connector.h" #include "src/core/handshaker/handshaker.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc index ac507e79b00..212493f95f7 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.cc +++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc @@ -61,13 +61,6 @@ #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/extensions/supports_fd.h" #include "src/core/lib/event_engine/query_extensions.h" -#include "src/core/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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" @@ -86,8 +79,15 @@ #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/transport/transport.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/server/server.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/unique_type_name.h" +#include "src/core/util/uri.h" #ifdef GPR_SUPPORT_CHANNELS_FROM_FD #include "src/core/lib/iomgr/ev_posix.h" diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc index d3c5d994c1d..f25e8b2c672 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc @@ -75,12 +75,6 @@ #include "src/core/lib/event_engine/extensions/tcp_trace.h" #include "src/core/lib/event_engine/query_extensions.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/lib/iomgr/combiner.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -108,8 +102,14 @@ #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" #include "src/core/telemetry/tcp_tracer.h" +#include "src/core/util/bitset.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" #include "src/core/util/http_client/parser.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/status_helper.h" #include "src/core/util/string.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" #define DEFAULT_CONNECTION_WINDOW_TARGET (1024 * 1024) diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.h b/src/core/ext/transport/chttp2/transport/chttp2_transport.h index d2b93298038..c832da4ed9e 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.h +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.h @@ -31,14 +31,14 @@ #include "src/core/ext/transport/chttp2/transport/flow_control.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/buffer_list.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/transport/transport.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" /// Creates a CHTTP2 Transport. This takes ownership of a \a resource_user ref /// from the caller; if the caller still needs the resource_user after creating diff --git a/src/core/ext/transport/chttp2/transport/flow_control.h b/src/core/ext/transport/chttp2/transport/flow_control.h index b15e8603c22..d3f1202a217 100644 --- a/src/core/ext/transport/chttp2/transport/flow_control.h +++ b/src/core/ext/transport/chttp2/transport/flow_control.h @@ -36,9 +36,9 @@ #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/lib/resource_quota/memory_quota.h" #include "src/core/lib/transport/bdp_estimator.h" +#include "src/core/util/time.h" namespace grpc { namespace testing { diff --git a/src/core/ext/transport/chttp2/transport/frame.cc b/src/core/ext/transport/chttp2/transport/frame.cc index 92788903f15..65bb1660248 100644 --- a/src/core/ext/transport/chttp2/transport/frame.cc +++ b/src/core/ext/transport/chttp2/transport/frame.cc @@ -25,7 +25,7 @@ #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 77739c30883..b20f1630add 100644 --- a/src/core/ext/transport/chttp2/transport/frame_data.cc +++ b/src/core/ext/transport/chttp2/transport/frame_data.cc @@ -29,10 +29,10 @@ #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/lib/slice/slice.h" #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/status_helper.h" absl::Status grpc_chttp2_data_parser_begin_frame(uint8_t flags, uint32_t stream_id, diff --git a/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc b/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc index 93e33a14a0f..14d91329eae 100644 --- a/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc +++ b/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc @@ -35,9 +35,9 @@ #include "src/core/ext/transport/chttp2/transport/ping_callbacks.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/transport/http2_errors.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/status_helper.h" grpc_slice grpc_chttp2_rst_stream_create( uint32_t id, uint32_t code, grpc_core::CallTracerInterface* call_tracer) { diff --git a/src/core/ext/transport/chttp2/transport/frame_settings.cc b/src/core/ext/transport/chttp2/transport/frame_settings.cc index e0a12218cab..817097a57b2 100644 --- a/src/core/ext/transport/chttp2/transport/frame_settings.cc +++ b/src/core/ext/transport/chttp2/transport/frame_settings.cc @@ -36,9 +36,9 @@ #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/debug_location.h" #include "src/core/util/useful.h" static uint8_t* fill_header(uint8_t* out, uint32_t length, uint8_t flags) { diff --git a/src/core/ext/transport/chttp2/transport/frame_settings.h b/src/core/ext/transport/chttp2/transport/frame_settings.h index ba653c6a11c..011862f5888 100644 --- a/src/core/ext/transport/chttp2/transport/frame_settings.h +++ b/src/core/ext/transport/chttp2/transport/frame_settings.h @@ -27,8 +27,8 @@ #include "src/core/ext/transport/chttp2/transport/http2_settings.h" #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" -#include "src/core/lib/gprpp/manual_constructor.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/manual_constructor.h" typedef enum { GRPC_CHTTP2_SPS_ID0, diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc index 9fa6aa79645..5c573a0beb6 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc @@ -34,9 +34,9 @@ #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" #include "src/core/ext/transport/chttp2/transport/varint.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/surface/validate_metadata.h" #include "src/core/lib/transport/timeout_encoding.h" +#include "src/core/util/crash.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder.h b/src/core/ext/transport/chttp2/transport/hpack_encoder.h index cfbf2426ec9..1dab0871ff2 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_encoder.h +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.h @@ -35,7 +35,6 @@ #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/lib/slice/slice.h" #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/metadata_batch.h" @@ -43,6 +42,7 @@ #include "src/core/lib/transport/timeout_encoding.h" #include "src/core/lib/transport/transport.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/transport/hpack_parse_result.cc b/src/core/ext/transport/chttp2/transport/hpack_parse_result.cc index c8a93a6a0ee..aa4b69623ad 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parse_result.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_parse_result.cc @@ -22,9 +22,9 @@ #include #include "src/core/ext/transport/chttp2/transport/hpack_constants.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/status_helper.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/transport/hpack_parse_result.h b/src/core/ext/transport/chttp2/transport/hpack_parse_result.h index b810264a367..628b3327f5b 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parse_result.h +++ b/src/core/ext/transport/chttp2/transport/hpack_parse_result.h @@ -29,11 +29,11 @@ #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/lib/surface/validate_metadata.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/crash.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.cc b/src/core/ext/transport/chttp2/transport/hpack_parser.cc index 04c64dd5df9..fb2e9b301a9 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parser.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_parser.cc @@ -45,7 +45,6 @@ #include "src/core/ext/transport/chttp2/transport/hpack_parse_result.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser_table.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/match.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_refcount.h" #include "src/core/lib/surface/validate_metadata.h" @@ -54,6 +53,7 @@ #include "src/core/telemetry/call_tracer.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/match.h" // IWYU pragma: no_include diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.h b/src/core/ext/transport/chttp2/transport/hpack_parser.h index 9df4487f31a..af2c1a9c7f0 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parser.h +++ b/src/core/ext/transport/chttp2/transport/hpack_parser.h @@ -39,12 +39,12 @@ #include "src/core/ext/transport/chttp2/transport/hpack_parse_result.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser_table.h" #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" -#include "src/core/lib/backoff/random_early_detection.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_refcount.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/random_early_detection.h" // IWYU pragma: no_include diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser_table.h b/src/core/ext/transport/chttp2/transport/hpack_parser_table.h index 06e0aeb7f42..2d790bb2e21 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parser_table.h +++ b/src/core/ext/transport/chttp2/transport/hpack_parser_table.h @@ -33,9 +33,9 @@ #include "src/core/ext/transport/chttp2/transport/hpack_constants.h" #include "src/core/ext/transport/chttp2/transport/hpack_parse_result.h" -#include "src/core/lib/gprpp/no_destruct.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/parsed_metadata.h" +#include "src/core/util/no_destruct.h" #include "src/core/util/unique_ptr_with_bitset.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/transport/internal.h b/src/core/ext/transport/chttp2/transport/internal.h index 64f398807ba..80e214ca1f2 100644 --- a/src/core/ext/transport/chttp2/transport/internal.h +++ b/src/core/ext/transport/chttp2/transport/internal.h @@ -58,11 +58,6 @@ #include "src/core/ext/transport/chttp2/transport/write_size_policy.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/iomgr/endpoint.h" @@ -78,6 +73,11 @@ #include "src/core/lib/transport/transport.h" #include "src/core/telemetry/call_tracer.h" #include "src/core/telemetry/tcp_tracer.h" +#include "src/core/util/bitset.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" // Flag that this closure barrier may be covering a write in a pollset, and so // we should not complete this closure until we can prove that the write got diff --git a/src/core/ext/transport/chttp2/transport/parsing.cc b/src/core/ext/transport/chttp2/transport/parsing.cc index d8c1680c3b2..cd102ff85df 100644 --- a/src/core/ext/transport/chttp2/transport/parsing.cc +++ b/src/core/ext/transport/chttp2/transport/parsing.cc @@ -56,11 +56,8 @@ #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" #include "src/core/ext/transport/chttp2/transport/ping_rate_policy.h" -#include "src/core/lib/backoff/random_early_detection.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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/iomgr/endpoint.h" @@ -72,6 +69,9 @@ #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/random_early_detection.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" using grpc_core::HPackParser; diff --git a/src/core/ext/transport/chttp2/transport/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 6bbe07e0c8f..1e558eda836 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" namespace grpc_core { 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 f2ac00e957a..f4ee3e58eb8 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 29c3b67e82a..13797c1f1b5 100644 --- a/src/core/ext/transport/chttp2/transport/writing.cc +++ b/src/core/ext/transport/chttp2/transport/writing.cc @@ -54,10 +54,6 @@ #include "src/core/ext/transport/chttp2/transport/write_size_policy.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/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/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -70,9 +66,13 @@ #include "src/core/telemetry/call_tracer.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/match.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" -// IWYU pragma: no_include "src/core/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 d78069c312c..a7c59b26d94 100644 --- a/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc +++ b/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc @@ -28,12 +28,12 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/channel_create.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" GRPCAPI grpc_channel* grpc_cronet_secure_channel_create( void* engine, const char* target, const grpc_channel_args* args, diff --git a/src/core/ext/transport/cronet/transport/cronet_transport.cc b/src/core/ext/transport/cronet/transport/cronet_transport.cc index 26b09382285..4d47895f9bb 100644 --- a/src/core/ext/transport/cronet/transport/cronet_transport.cc +++ b/src/core/ext/transport/cronet/transport/cronet_transport.cc @@ -47,9 +47,6 @@ #include "src/core/ext/transport/chttp2/transport/bin_encoder.h" #include "src/core/ext/transport/cronet/transport/cronet_status.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -61,6 +58,9 @@ #include "src/core/lib/surface/validate_metadata.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/status_helper.h" // IWYU pragma: no_include diff --git a/src/core/ext/transport/inproc/inproc_transport.cc b/src/core/ext/transport/inproc/inproc_transport.cc index a967b4c0d9b..a656d8b7fde 100644 --- a/src/core/ext/transport/inproc/inproc_transport.cc +++ b/src/core/ext/transport/inproc/inproc_transport.cc @@ -28,8 +28,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/event_engine_context.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/promise/promise.h" #include "src/core/lib/promise/try_seq.h" #include "src/core/lib/resource_quota/resource_quota.h" @@ -37,6 +35,8 @@ #include "src/core/lib/transport/metadata.h" #include "src/core/lib/transport/transport.h" #include "src/core/server/server.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" namespace grpc_core { diff --git a/src/core/ext/transport/inproc/legacy_inproc_transport.cc b/src/core/ext/transport/inproc/legacy_inproc_transport.cc index ae2441db5d4..b93fc97a160 100644 --- a/src/core/ext/transport/inproc/legacy_inproc_transport.cc +++ b/src/core/ext/transport/inproc/legacy_inproc_transport.cc @@ -47,10 +47,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -66,6 +62,10 @@ #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" #include "src/core/server/server.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" namespace { struct inproc_stream; diff --git a/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc b/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc index 153eddbeecc..151f4e8c9d4 100644 --- a/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc +++ b/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc @@ -28,11 +28,11 @@ #include "src/core/handshaker/handshaker_factory.h" #include "src/core/handshaker/handshaker_registry.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/handshaker/handshaker.cc b/src/core/handshaker/handshaker.cc index 3949dccbe59..b476e550f75 100644 --- a/src/core/handshaker/handshaker.cc +++ b/src/core/handshaker/handshaker.cc @@ -38,13 +38,12 @@ #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/lib/gprpp/time.h" #include "src/core/lib/iomgr/endpoint.h" -#include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" using ::grpc_event_engine::experimental::EventEngine; diff --git a/src/core/handshaker/handshaker.h b/src/core/handshaker/handshaker.h index 04beed4a966..12ea2b4b8bf 100644 --- a/src/core/handshaker/handshaker.h +++ b/src/core/handshaker/handshaker.h @@ -31,16 +31,16 @@ #include #include "src/core/lib/channel/channel_args.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/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/tcp_server.h" #include "src/core/lib/slice/slice_buffer.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" namespace grpc_core { diff --git a/src/core/handshaker/http_connect/http_connect_handshaker.cc b/src/core/handshaker/http_connect/http_connect_handshaker.cc index 2954860fe5e..3ec778ed4b1 100644 --- a/src/core/handshaker/http_connect/http_connect_handshaker.cc +++ b/src/core/handshaker/http_connect/http_connect_handshaker.cc @@ -42,9 +42,6 @@ #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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -55,7 +52,9 @@ #include "src/core/lib/slice/slice_buffer.h" #include "src/core/util/http_client/format_request.h" #include "src/core/util/http_client/parser.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/string.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/handshaker/http_connect/http_proxy_mapper.cc b/src/core/handshaker/http_connect/http_proxy_mapper.cc index 93c8e2fe8eb..f22e6d67423 100644 --- a/src/core/handshaker/http_connect/http_proxy_mapper.cc +++ b/src/core/handshaker/http_connect/http_proxy_mapper.cc @@ -47,12 +47,12 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/memory.h" #include "src/core/lib/iomgr/resolve_address.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/env.h" +#include "src/core/util/host_port.h" +#include "src/core/util/memory.h" #include "src/core/util/string.h" +#include "src/core/util/uri.h" namespace grpc_core { namespace { diff --git a/src/core/handshaker/security/secure_endpoint.cc b/src/core/handshaker/security/secure_endpoint.cc index cf720f19d21..c57b56b4d26 100644 --- a/src/core/handshaker/security/secure_endpoint.cc +++ b/src/core/handshaker/security/secure_endpoint.cc @@ -42,10 +42,6 @@ #include #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/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -58,7 +54,11 @@ #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/tsi/transport_security_grpc.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/string.h" +#include "src/core/util/sync.h" #define STAGING_BUFFER_SIZE 8192 diff --git a/src/core/handshaker/security/secure_endpoint.h b/src/core/handshaker/security/secure_endpoint.h index 43add1a816b..0d81fec090b 100644 --- a/src/core/handshaker/security/secure_endpoint.h +++ b/src/core/handshaker/security/secure_endpoint.h @@ -26,8 +26,8 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/iomgr/endpoint.h" +#include "src/core/util/orphanable.h" // Takes ownership of protector, zero_copy_protector, and to_wrap, and refs // leftover_slices. If zero_copy_protector is not NULL, protector will never be diff --git a/src/core/handshaker/security/security_handshaker.cc b/src/core/handshaker/security/security_handshaker.cc index e54735e53a6..65fec6243a7 100644 --- a/src/core/handshaker/security/security_handshaker.cc +++ b/src/core/handshaker/security/security_handshaker.cc @@ -50,10 +50,6 @@ #include "src/core/handshaker/security/secure_endpoint.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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -66,6 +62,10 @@ #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" #include "src/core/tsi/transport_security_grpc.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/unique_type_name.h" #define GRPC_INITIAL_HANDSHAKE_BUFFER_SIZE 256 diff --git a/src/core/handshaker/security/security_handshaker.h b/src/core/handshaker/security/security_handshaker.h index 9aa3bcfabc0..3e6096d6c47 100644 --- a/src/core/handshaker/security/security_handshaker.h +++ b/src/core/handshaker/security/security_handshaker.h @@ -27,9 +27,9 @@ #include "src/core/handshaker/handshaker.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc b/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc index 77ae19ef7db..a02ccfa8cc3 100644 --- a/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc +++ b/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc @@ -40,9 +40,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/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/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -53,7 +50,10 @@ #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/tcp_server.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/uri.h" namespace grpc_core { diff --git a/src/core/lib/address_utils/parse_address.cc b/src/core/lib/address_utils/parse_address.cc index ee94d002d5f..ce75321ce31 100644 --- a/src/core/lib/address_utils/parse_address.cc +++ b/src/core/lib/address_utils/parse_address.cc @@ -47,11 +47,11 @@ #include "absl/strings/str_cat.h" #include "absl/strings/strip.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/iomgr/grpc_if_nametoindex.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils.h" +#include "src/core/util/grpc_if_nametoindex.h" +#include "src/core/util/host_port.h" +#include "src/core/util/status_helper.h" #include "src/core/util/string.h" // IWYU pragma: no_include diff --git a/src/core/lib/address_utils/parse_address.h b/src/core/lib/address_utils/parse_address.h index b3093f1fd88..c11789885ab 100644 --- a/src/core/lib/address_utils/parse_address.h +++ b/src/core/lib/address_utils/parse_address.h @@ -28,7 +28,7 @@ #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/uri.h" /// Populate \a resolved_addr from \a uri, whose path is expected to contain a /// unix socket path. Returns true upon success. diff --git a/src/core/lib/address_utils/sockaddr_utils.cc b/src/core/lib/address_utils/sockaddr_utils.cc index a12eb907899..41564ba5242 100644 --- a/src/core/lib/address_utils/sockaddr_utils.cc +++ b/src/core/lib/address_utils/sockaddr_utils.cc @@ -37,12 +37,12 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/crash.h" +#include "src/core/util/host_port.h" +#include "src/core/util/uri.h" #ifdef GRPC_HAVE_UNIX_SOCKET #ifdef GPR_WINDOWS diff --git a/src/core/lib/channel/channel_args.h b/src/core/lib/channel/channel_args.h index 301c0c287c5..9274c453988 100644 --- a/src/core/lib/channel/channel_args.h +++ b/src/core/lib/channel/channel_args.h @@ -37,14 +37,14 @@ #include #include -#include "src/core/lib/avl/avl.h" -#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/lib/surface/channel_stack_type.h" +#include "src/core/util/avl.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/dual_ref_counted.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/ref_counted_string.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" // TODO(hork): When we're ready to allow setting via a channel arg from the diff --git a/src/core/lib/channel/channel_stack.h b/src/core/lib/channel/channel_stack.h index 451cba6be90..8ed7b4eafe1 100644 --- a/src/core/lib/channel/channel_stack.h +++ b/src/core/lib/channel/channel_stack.h @@ -59,10 +59,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.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/lib/gprpp/unique_type_name.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" @@ -72,7 +68,11 @@ #include "src/core/lib/transport/call_final_info.h" #include "src/core/lib/transport/transport.h" #include "src/core/telemetry/metrics.h" +#include "src/core/util/manual_constructor.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/core/util/time_precise.h" +#include "src/core/util/unique_type_name.h" struct grpc_channel_element_args { grpc_channel_stack* channel_stack; diff --git a/src/core/lib/channel/channel_stack_builder.h b/src/core/lib/channel/channel_stack_builder.h index 82a0592bc4f..6b3155fcbdb 100644 --- a/src/core/lib/channel/channel_stack_builder.h +++ b/src/core/lib/channel/channel_stack_builder.h @@ -25,8 +25,8 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/surface/channel_stack_type.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/channel/channel_stack_builder_impl.cc b/src/core/lib/channel/channel_stack_builder_impl.cc index a5d93d81edc..953a60a9232 100644 --- a/src/core/lib/channel/channel_stack_builder_impl.cc +++ b/src/core/lib/channel/channel_stack_builder_impl.cc @@ -38,8 +38,6 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/no_destruct.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/promise/activity.h" @@ -49,6 +47,8 @@ #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/lib/channel/channel_stack_builder_impl.h b/src/core/lib/channel/channel_stack_builder_impl.h index a76e322b71b..3bce0f5db3f 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 9977ecdabfe..f65f5f74f29 100644 --- a/src/core/lib/channel/connected_channel.cc +++ b/src/core/lib/channel/connected_channel.cc @@ -43,10 +43,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/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/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" @@ -76,6 +72,10 @@ #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" #include "src/core/util/alloc.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" typedef struct connected_channel_channel_data { grpc_core::Transport* transport; diff --git a/src/core/lib/channel/promise_based_filter.cc b/src/core/lib/channel/promise_based_filter.cc index 5f0879dda27..bf5dadfc804 100644 --- a/src/core/lib/channel/promise_based_filter.cc +++ b/src/core/lib/channel/promise_based_filter.cc @@ -34,12 +34,12 @@ #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/lib/iomgr/error.h" #include "src/core/lib/promise/seq.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/crash.h" +#include "src/core/util/manual_constructor.h" +#include "src/core/util/status_helper.h" namespace grpc_core { namespace promise_filter_detail { diff --git a/src/core/lib/channel/promise_based_filter.h b/src/core/lib/channel/promise_based_filter.h index 3c9c64dbaa8..0ac59932e0f 100644 --- a/src/core/lib/channel/promise_based_filter.h +++ b/src/core/lib/channel/promise_based_filter.h @@ -48,9 +48,6 @@ #include "src/core/lib/channel/channel_stack.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/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" @@ -72,6 +69,9 @@ #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/match.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/lib/compression/compression_internal.cc b/src/core/lib/compression/compression_internal.cc index c643b1cd817..3bb8a7f2882 100644 --- a/src/core/lib/compression/compression_internal.cc +++ b/src/core/lib/compression/compression_internal.cc @@ -33,9 +33,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..45a24faa998 100644 --- a/src/core/lib/compression/compression_internal.h +++ b/src/core/lib/compression/compression_internal.h @@ -30,8 +30,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/bitset.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/bitset.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/debug/trace.cc b/src/core/lib/debug/trace.cc index 642976a0e6b..920c5d491c9 100644 --- a/src/core/lib/debug/trace.cc +++ b/src/core/lib/debug/trace.cc @@ -33,7 +33,7 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/glob.h" +#include "src/core/util/glob.h" int grpc_tracer_set_enabled(const char* name, int enabled); diff --git a/src/core/lib/debug/trace_flags.cc b/src/core/lib/debug/trace_flags.cc index 85b5f6f9ee2..03bfe06312c 100644 --- a/src/core/lib/debug/trace_flags.cc +++ b/src/core/lib/debug/trace_flags.cc @@ -19,7 +19,7 @@ #include "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/src/core/lib/event_engine/ares_resolver.cc b/src/core/lib/event_engine/ares_resolver.cc index 3fca4efad49..f1faf409241 100644 --- a/src/core/lib/event_engine/ares_resolver.cc +++ b/src/core/lib/event_engine/ares_resolver.cc @@ -68,12 +68,12 @@ #include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/grpc_polled_fd.h" #include "src/core/lib/event_engine/time_util.h" -#include "src/core/lib/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/lib/iomgr/resolved_address.h" #include "src/core/lib/iomgr/sockaddr.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/host_port.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" #ifdef GRPC_POSIX_SOCKET_ARES_EV_DRIVER #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h" #endif diff --git a/src/core/lib/event_engine/ares_resolver.h b/src/core/lib/event_engine/ares_resolver.h index c36cf49f767..331e533b35f 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 ffd936cd510..cc80e9977b6 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/tcp_socket_utils.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.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..6529e649117 100644 --- a/src/core/lib/event_engine/cf_engine/cf_engine.h +++ b/src/core/lib/event_engine/cf_engine/cf_engine.h @@ -26,8 +26,8 @@ #include "src/core/lib/event_engine/posix_engine/lockfree_event.h" #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h" #include "src/core/lib/event_engine/posix_engine/timer_manager.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/surface/init_internally.h" +#include "src/core/util/sync.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc b/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc index 4721437860b..7a5f15b4208 100644 --- a/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc +++ b/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc @@ -23,7 +23,7 @@ #include "absl/strings/str_format.h" #include "src/core/lib/event_engine/cf_engine/cfstream_endpoint.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 adf52ecc2f3..a4fd9758ae5 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 @@ -26,7 +26,7 @@ #include "src/core/lib/event_engine/cf_engine/dns_service_resolver.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/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 45520f581ed..24282e7921b 100644 --- a/src/core/lib/event_engine/default_event_engine.cc +++ b/src/core/lib/event_engine/default_event_engine.cc @@ -26,9 +26,9 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/default_event_engine_factory.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 402822e27ed..f59c6616bd9 100644 --- a/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc +++ b/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc @@ -31,8 +31,8 @@ #include "src/core/lib/event_engine/poller.h" #include "src/core/lib/event_engine/time_util.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/crash.h" // This polling engine is only relevant on linux kernels supporting epoll // epoll_create() or epoll_create1() @@ -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 ed6b480bdeb..42c61446659 100644 --- a/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h +++ b/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h @@ -30,8 +30,8 @@ #include "src/core/lib/event_engine/posix_engine/event_poller.h" #include "src/core/lib/event_engine/posix_engine/internal_errqueue.h" #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/sync.h" #ifdef GRPC_LINUX_EPOLL #include diff --git a/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc b/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc index e573be30642..c62c9e1a8e2 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 @@ -37,8 +37,8 @@ #include "src/core/lib/event_engine/poller.h" #include "src/core/lib/event_engine/posix_engine/event_poller.h" #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/crash.h" #ifdef GRPC_POSIX_SOCKET_EV_POLL @@ -54,11 +54,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; @@ -852,7 +852,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..7f11bbb05a0 100644 --- a/src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc +++ b/src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc @@ -25,8 +25,8 @@ #include "src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h" #include "src/core/lib/event_engine/posix_engine/ev_poll_posix.h" #include "src/core/lib/event_engine/posix_engine/event_poller.h" -#include "src/core/lib/gprpp/no_destruct.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/no_destruct.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h b/src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h index d1d17f8c809..7c9f8a5f742 100644 --- a/src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h +++ b/src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h @@ -20,8 +20,8 @@ #include #include -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/sync.h" #if GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER) diff --git a/src/core/lib/event_engine/posix_engine/internal_errqueue.cc b/src/core/lib/event_engine/posix_engine/internal_errqueue.cc index 2c1cc84e778..dd4d3711f9d 100644 --- a/src/core/lib/event_engine/posix_engine/internal_errqueue.cc +++ b/src/core/lib/event_engine/posix_engine/internal_errqueue.cc @@ -30,7 +30,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 dc7900646a0..e0cb157b922 100644 --- a/src/core/lib/event_engine/posix_engine/lockfree_event.cc +++ b/src/core/lib/event_engine/posix_engine/lockfree_event.cc @@ -24,8 +24,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 8cde00153a1..7d4c7a0ac7b 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 c5708db02c5..c603f940359 100644 --- a/src/core/lib/event_engine/posix_engine/posix_endpoint.cc +++ b/src/core/lib/event_engine/posix_engine/posix_endpoint.cc @@ -45,16 +45,16 @@ #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/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/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/load_file.h" +#include "src/core/util/ref_counted_ptr.h" +#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" #ifdef GRPC_POSIX_SOCKET_TCP #ifdef GRPC_LINUX_ERRQUEUE diff --git a/src/core/lib/event_engine/posix_engine/posix_endpoint.h b/src/core/lib/event_engine/posix_engine/posix_endpoint.h index 80964556b0c..81ec03c7f0f 100644 --- a/src/core/lib/event_engine/posix_engine/posix_endpoint.h +++ b/src/core/lib/event_engine/posix_engine/posix_endpoint.h @@ -45,11 +45,11 @@ #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h" #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h" #include "src/core/lib/event_engine/posix_engine/traced_buffer_list.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/resource_quota/memory_quota.h" +#include "src/core/util/crash.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/sync.h" #ifdef GRPC_POSIX_SOCKET_TCP 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 7dfc2535623..d0683677795 100644 --- a/src/core/lib/event_engine/posix_engine/posix_engine.cc +++ b/src/core/lib/event_engine/posix_engine/posix_engine.cc @@ -49,9 +49,9 @@ #include "src/core/lib/event_engine/posix_engine/timer.h" #include "src/core/lib/event_engine/tcp_socket_utils.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..f2483d11653 100644 --- a/src/core/lib/event_engine/posix_engine/posix_engine.h +++ b/src/core/lib/event_engine/posix_engine/posix_engine.h @@ -39,10 +39,10 @@ #include "src/core/lib/event_engine/posix_engine/timer_manager.h" #include "src/core/lib/event_engine/ref_counted_dns_resolver_interface.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/surface/init_internally.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/sync.h" #ifdef GRPC_POSIX_SOCKET_TCP #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h" diff --git a/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc b/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc index fcc98fe4c8f..d8b40ab2f71 100644 --- a/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc +++ b/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc @@ -46,10 +46,10 @@ #include "src/core/lib/event_engine/posix_engine/posix_engine_listener.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/status_helper.h" -#include "src/core/lib/gprpp/strerror.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/socket_mutator.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/strerror.h" +#include "src/core/util/time.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/posix_engine/posix_engine_listener.h b/src/core/lib/event_engine/posix_engine/posix_engine_listener.h index 73a921a35e4..40c43de8c12 100644 --- a/src/core/lib/event_engine/posix_engine/posix_engine_listener.h +++ b/src/core/lib/event_engine/posix_engine/posix_engine_listener.h @@ -34,8 +34,8 @@ #include #include "src/core/lib/event_engine/posix.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/sync.h" #ifdef GRPC_POSIX_SOCKET_TCP #include "src/core/lib/event_engine/posix_engine/event_poller.h" @@ -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 7aa624fc3cb..b3532e2d860 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 @@ -33,10 +33,10 @@ #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/gprpp/crash.h" // IWYU pragma: keep -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/socket_mutator.h" +#include "src/core/util/crash.h" // IWYU pragma: keep +#include "src/core/util/status_helper.h" #define MIN_SAFE_ACCEPT_QUEUE_SIZE 100 diff --git a/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc b/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc index ae193ff2beb..fad1a7f6730 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 @@ -27,9 +27,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" // IWYU pragma: keep -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/crash.h" // IWYU pragma: keep +#include "src/core/util/time.h" #include "src/core/util/useful.h" #ifdef GRPC_POSIX_SOCKET_UTILS_COMMON @@ -53,8 +53,8 @@ #include "absl/status/status.h" #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 412fafcad32..07bd3308d1d 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 @@ -29,10 +29,10 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/socket_mutator.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" #ifdef GRPC_POSIX_SOCKET_UTILS_COMMON #include diff --git a/src/core/lib/event_engine/posix_engine/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 d4cdfac8b7f..d908ca76943 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 @@ -27,8 +27,8 @@ #include #include -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/sync.h" #ifdef GRPC_LINUX_ERRQUEUE #include // IWYU pragma: keep @@ -317,7 +317,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..1df29a14243 100644 --- a/src/core/lib/event_engine/posix_engine/traced_buffer_list.h +++ b/src/core/lib/event_engine/posix_engine/traced_buffer_list.h @@ -25,8 +25,8 @@ #include #include "src/core/lib/event_engine/posix_engine/internal_errqueue.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/sync.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.cc b/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.cc index c05fd8d4d50..d6efbd26671 100644 --- a/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.cc +++ b/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.cc @@ -18,8 +18,8 @@ #include -#include "src/core/lib/gprpp/crash.h" // IWYU pragma: keep #include "src/core/lib/iomgr/port.h" +#include "src/core/util/crash.h" // IWYU pragma: keep #ifdef GRPC_LINUX_EVENTFD @@ -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..9f2a0959df3 100644 --- a/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.cc +++ b/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.cc @@ -19,8 +19,8 @@ #include -#include "src/core/lib/gprpp/crash.h" // IWYU pragma: keep #include "src/core/lib/iomgr/port.h" +#include "src/core/util/crash.h" // IWYU pragma: keep #ifdef GRPC_POSIX_WAKEUP_FD #include @@ -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 2037eff91ea..1353249817d 100644 --- a/src/core/lib/event_engine/tcp_socket_utils.cc +++ b/src/core/lib/event_engine/tcp_socket_utils.cc @@ -59,10 +59,10 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/host_port.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/uri.h" namespace grpc_event_engine { namespace experimental { 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 6fc6a43c213..faeffe1f896 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 "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 dcb0aabaf7e..852cf0f3915 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 @@ -35,17 +35,17 @@ #include #include -#include "src/core/lib/backoff/backoff.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/common_closures.h" #include "src/core/lib/event_engine/thread_local.h" #include "src/core/lib/event_engine/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/backoff.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 7543db92900..69beaa7cddd 100644 --- a/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h +++ b/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h @@ -32,14 +32,14 @@ #include #include -#include "src/core/lib/backoff/backoff.h" #include "src/core/lib/event_engine/thread_pool/thread_count.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.h" #include "src/core/lib/event_engine/work_queue/basic_work_queue.h" #include "src/core/lib/event_engine/work_queue/work_queue.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/backoff.h" +#include "src/core/util/notification.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" 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 3be7a0e0b32..5475f2e45a0 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,9 +21,9 @@ #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" 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 b9542b0bb6b..3723b3463ed 100644 --- a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc +++ b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc @@ -34,10 +34,10 @@ #include "src/core/lib/event_engine/grpc_polled_fd.h" #include "src/core/lib/event_engine/windows/grpc_polled_fd_windows.h" #include "src/core/lib/event_engine/windows/win_socket.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/sync.h" // TODO(apolcyn): remove this hack after fixing upstream. // Our grpc/c-ares code on Windows uses the ares_set_socket_functions API, diff --git a/src/core/lib/event_engine/windows/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 b81ec3dc500..74d875ba2ab 100644 --- a/src/core/lib/event_engine/windows/iocp.cc +++ b/src/core/lib/event_engine/windows/iocp.cc @@ -27,8 +27,8 @@ #include "src/core/lib/event_engine/time_util.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/lib/iomgr/error.h" +#include "src/core/util/crash.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/windows/native_windows_dns_resolver.cc b/src/core/lib/event_engine/windows/native_windows_dns_resolver.cc index a23ba405ab9..d8114497b11 100644 --- a/src/core/lib/event_engine/windows/native_windows_dns_resolver.cc +++ b/src/core/lib/event_engine/windows/native_windows_dns_resolver.cc @@ -26,9 +26,9 @@ #include #include "src/core/lib/event_engine/windows/native_windows_dns_resolver.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/host_port.h" +#include "src/core/util/status_helper.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/windows/win_socket.cc b/src/core/lib/event_engine/windows/win_socket.cc index 8c18b09ae42..79fc2bec4fe 100644 --- a/src/core/lib/event_engine/windows/win_socket.cc +++ b/src/core/lib/event_engine/windows/win_socket.cc @@ -23,9 +23,9 @@ #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.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/lib/iomgr/error.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/sync.h" #if defined(__MSYS__) && defined(GPR_ARCH_64) // Nasty workaround for nasty bug when using the 64 bits msys compiler diff --git a/src/core/lib/event_engine/windows/win_socket.h b/src/core/lib/event_engine/windows/win_socket.h index be453d26e6d..4256179c070 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 d3bda779dd3..ec4118c7fd2 100644 --- a/src/core/lib/event_engine/windows/windows_endpoint.cc +++ b/src/core/lib/event_engine/windows/windows_endpoint.cc @@ -28,9 +28,9 @@ #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.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/lib/iomgr/error.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/status_helper.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/windows/windows_engine.cc b/src/core/lib/event_engine/windows/windows_engine.cc index c691859bdfb..31e2eb03569 100644 --- a/src/core/lib/event_engine/windows/windows_engine.cc +++ b/src/core/lib/event_engine/windows/windows_engine.cc @@ -43,11 +43,11 @@ #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/dump_args.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/crash.h" +#include "src/core/util/dump_args.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/windows/windows_engine.h b/src/core/lib/event_engine/windows/windows_engine.h index 2047ab6cd84..98ca81e1a52 100644 --- a/src/core/lib/event_engine/windows/windows_engine.h +++ b/src/core/lib/event_engine/windows/windows_engine.h @@ -37,9 +37,9 @@ #include "src/core/lib/event_engine/thread_pool/thread_pool.h" #include "src/core/lib/event_engine/windows/iocp.h" #include "src/core/lib/event_engine/windows/windows_endpoint.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/surface/init_internally.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/windows/windows_listener.cc b/src/core/lib/event_engine/windows/windows_listener.cc index c04346fb9be..2bba1a6e818 100644 --- a/src/core/lib/event_engine/windows/windows_listener.cc +++ b/src/core/lib/event_engine/windows/windows_listener.cc @@ -25,10 +25,10 @@ #include "src/core/lib/event_engine/windows/win_socket.h" #include "src/core/lib/event_engine/windows/windows_endpoint.h" #include "src/core/lib/event_engine/windows/windows_listener.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/crash.h" +#include "src/core/util/sync.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/event_engine/windows/windows_listener.h b/src/core/lib/event_engine/windows/windows_listener.h index 2773f3afbf3..8e0a5bd0f95 100644 --- a/src/core/lib/event_engine/windows/windows_listener.h +++ b/src/core/lib/event_engine/windows/windows_listener.h @@ -29,8 +29,8 @@ #include "src/core/lib/event_engine/common_closures.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.h" #include "src/core/lib/event_engine/windows/iocp.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/sync.h" #ifdef GRPC_HAVE_UNIX_SOCKET // clang-format off diff --git a/src/core/lib/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 52483218793..3abe6870f81 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 db657a0880b..00000000000 --- a/src/core/lib/gprpp/time.cc +++ /dev/null @@ -1,241 +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/log/log.h" -#include "absl/strings/str_format.h" - -#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; - } - LOG(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 dd59b4e7d49..91bfc45a021 100644 --- a/src/core/lib/iomgr/buffer_list.cc +++ b/src/core/lib/iomgr/buffer_list.cc @@ -23,9 +23,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/crash.h" +#include "src/core/util/sync.h" #ifdef GRPC_LINUX_ERRQUEUE #include diff --git a/src/core/lib/iomgr/buffer_list.h b/src/core/lib/iomgr/buffer_list.h index 9e57c818e17..6805c53c08d 100644 --- a/src/core/lib/iomgr/buffer_list.h +++ b/src/core/lib/iomgr/buffer_list.h @@ -24,10 +24,10 @@ #include #include -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/internal_errqueue.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/lib/iomgr/call_combiner.cc b/src/core/lib/iomgr/call_combiner.cc index 26bb7b881db..e20cc0a0986 100644 --- a/src/core/lib/iomgr/call_combiner.cc +++ b/src/core/lib/iomgr/call_combiner.cc @@ -25,9 +25,9 @@ #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/crash.h" namespace grpc_core { diff --git a/src/core/lib/iomgr/call_combiner.h b/src/core/lib/iomgr/call_combiner.h index 87ad024880f..23488f51cfc 100644 --- a/src/core/lib/iomgr/call_combiner.h +++ b/src/core/lib/iomgr/call_combiner.h @@ -27,12 +27,12 @@ #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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/dynamic_annotations.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/mpscq.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" // A simple, lock-free mechanism for serializing activity related to a // single call. This is similar to a combiner but is more lightweight. diff --git a/src/core/lib/iomgr/cfstream_handle.cc b/src/core/lib/iomgr/cfstream_handle.cc index 55604791a7b..e70393f6abd 100644 --- a/src/core/lib/iomgr/cfstream_handle.cc +++ b/src/core/lib/iomgr/cfstream_handle.cc @@ -18,8 +18,8 @@ #include -#include "src/core/lib/gprpp/memory.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/memory.h" #ifdef GRPC_CFSTREAM #import diff --git a/src/core/lib/iomgr/cfstream_handle.h b/src/core/lib/iomgr/cfstream_handle.h index 7dd156de2e0..d373eadfd37 100644 --- a/src/core/lib/iomgr/cfstream_handle.h +++ b/src/core/lib/iomgr/cfstream_handle.h @@ -29,9 +29,9 @@ #ifdef GRPC_CFSTREAM #import -#include "src/core/lib/gprpp/memory.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/lockfree_event.h" +#include "src/core/util/memory.h" class GrpcLibraryInitHolder { public: diff --git a/src/core/lib/iomgr/closure.h b/src/core/lib/iomgr/closure.h index 9f8a22493d3..cb08c23e7c7 100644 --- a/src/core/lib/iomgr/closure.h +++ b/src/core/lib/iomgr/closure.h @@ -28,11 +28,11 @@ #include #include -#include "src/core/lib/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/lib/iomgr/error.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/manual_constructor.h" +#include "src/core/util/mpscq.h" struct grpc_closure; typedef struct grpc_closure grpc_closure; diff --git a/src/core/lib/iomgr/combiner.cc b/src/core/lib/iomgr/combiner.cc index 56db07f5627..31f7b204af9 100644 --- a/src/core/lib/iomgr/combiner.cc +++ b/src/core/lib/iomgr/combiner.cc @@ -29,10 +29,10 @@ #include #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/mpscq.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr_internal.h" +#include "src/core/util/crash.h" +#include "src/core/util/mpscq.h" #define STATE_UNORPHANED 1 #define STATE_ELEM_COUNT_LOW_BIT 2 diff --git a/src/core/lib/iomgr/endpoint_pair_posix.cc b/src/core/lib/iomgr/endpoint_pair_posix.cc index 4043f9a8120..85fb3849f29 100644 --- a/src/core/lib/iomgr/endpoint_pair_posix.cc +++ b/src/core/lib/iomgr/endpoint_pair_posix.cc @@ -36,12 +36,12 @@ #include #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/endpoint_pair.h" #include "src/core/lib/iomgr/socket_utils_posix.h" #include "src/core/lib/iomgr/tcp_posix.h" #include "src/core/lib/iomgr/unix_sockets_posix.h" #include "src/core/lib/resource_quota/api.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" static void create_sockets(int sv[2]) { diff --git a/src/core/lib/iomgr/endpoint_pair_windows.cc b/src/core/lib/iomgr/endpoint_pair_windows.cc index 2fd37b4127e..f8a746624e6 100644 --- a/src/core/lib/iomgr/endpoint_pair_windows.cc +++ b/src/core/lib/iomgr/endpoint_pair_windows.cc @@ -29,11 +29,11 @@ #include "absl/log/log.h" #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/endpoint_pair.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_windows.h" #include "src/core/lib/iomgr/tcp_windows.h" +#include "src/core/util/crash.h" static void create_sockets(SOCKET sv[2]) { SOCKET svr_sock = INVALID_SOCKET; diff --git a/src/core/lib/iomgr/error.cc b/src/core/lib/iomgr/error.cc index d1303834559..d637ab6d20c 100644 --- a/src/core/lib/iomgr/error.cc +++ b/src/core/lib/iomgr/error.cc @@ -30,15 +30,15 @@ #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/lib/slice/slice_internal.h" +#include "src/core/util/strerror.h" #include "src/core/util/useful.h" absl::Status grpc_status_create(absl::StatusCode code, absl::string_view msg, diff --git a/src/core/lib/iomgr/error.h b/src/core/lib/iomgr/error.h index b31173121f2..e1fb98107c1 100644 --- a/src/core/lib/iomgr/error.h +++ b/src/core/lib/iomgr/error.h @@ -31,10 +31,10 @@ #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/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" #include "src/core/util/spinlock.h" +#include "src/core/util/status_helper.h" /// Opaque representation of an error. diff --git a/src/core/lib/iomgr/ev_apple.cc b/src/core/lib/iomgr/ev_apple.cc index 88f07921f3a..73ded9294d7 100644 --- a/src/core/lib/iomgr/ev_apple.cc +++ b/src/core/lib/iomgr/ev_apple.cc @@ -35,9 +35,9 @@ #include "absl/time/time.h" -#include "src/core/lib/gprpp/thd.h" -#include "src/core/lib/gprpp/time_util.h" #include "src/core/lib/iomgr/ev_apple.h" +#include "src/core/util/thd.h" +#include "src/core/util/time_util.h" #define GRPC_POLLSET_KICK_BROADCAST ((grpc_pollset_worker*)1) diff --git a/src/core/lib/iomgr/ev_epoll1_linux.cc b/src/core/lib/iomgr/ev_epoll1_linux.cc index c2c60e9663a..ff347ac69d6 100644 --- a/src/core/lib/iomgr/ev_epoll1_linux.cc +++ b/src/core/lib/iomgr/ev_epoll1_linux.cc @@ -18,8 +18,8 @@ #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/crash.h" // This polling engine is only relevant on linux kernels supporting epoll // epoll_create() or epoll_create1() @@ -47,8 +47,6 @@ #include #include -#include "src/core/lib/gprpp/manual_constructor.h" -#include "src/core/lib/gprpp/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" @@ -57,6 +55,8 @@ #include "src/core/lib/iomgr/wakeup_fd_posix.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/manual_constructor.h" +#include "src/core/util/strerror.h" #include "src/core/util/string.h" #include "src/core/util/useful.h" diff --git a/src/core/lib/iomgr/ev_poll_posix.cc b/src/core/lib/iomgr/ev_poll_posix.cc index a95adea7c85..9e955d8c094 100644 --- a/src/core/lib/iomgr/ev_poll_posix.cc +++ b/src/core/lib/iomgr/ev_poll_posix.cc @@ -40,14 +40,14 @@ #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/block_annotate.h" #include "src/core/lib/iomgr/ev_poll_posix.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/wakeup_fd_posix.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/crash.h" +#include "src/core/util/thd.h" #include "src/core/util/useful.h" #define GRPC_POLLSET_KICK_BROADCAST ((grpc_pollset_worker*)1) diff --git a/src/core/lib/iomgr/ev_posix.cc b/src/core/lib/iomgr/ev_posix.cc index 70ee372c4fd..e195c940d87 100644 --- a/src/core/lib/iomgr/ev_posix.cc +++ b/src/core/lib/iomgr/ev_posix.cc @@ -34,11 +34,11 @@ #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/lib/iomgr/ev_epoll1_linux.h" #include "src/core/lib/iomgr/ev_poll_posix.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/internal_errqueue.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" /// Default poll() function - a pointer so that it can be overridden by some diff --git a/src/core/lib/iomgr/event_engine_shims/endpoint.cc b/src/core/lib/iomgr/event_engine_shims/endpoint.cc index 08fcbc61997..28b1ef42bf1 100644 --- a/src/core/lib/iomgr/event_engine_shims/endpoint.cc +++ b/src/core/lib/iomgr/event_engine_shims/endpoint.cc @@ -36,9 +36,6 @@ #include "src/core/lib/event_engine/extensions/supports_fd.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/construct_destruct.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -47,7 +44,10 @@ #include "src/core/lib/iomgr/port.h" #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/util/construct_destruct.h" +#include "src/core/util/debug_location.h" #include "src/core/util/string.h" +#include "src/core/util/sync.h" namespace grpc_event_engine { namespace experimental { diff --git a/src/core/lib/iomgr/exec_ctx.cc b/src/core/lib/iomgr/exec_ctx.cc index 804ae6f6494..6bb16390008 100644 --- a/src/core/lib/iomgr/exec_ctx.cc +++ b/src/core/lib/iomgr/exec_ctx.cc @@ -25,9 +25,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/crash.h" static void exec_ctx_run(grpc_closure* closure) { #ifndef NDEBUG diff --git a/src/core/lib/iomgr/exec_ctx.h b/src/core/lib/iomgr/exec_ctx.h index bcdb1a743d7..0bda1d9af88 100644 --- a/src/core/lib/iomgr/exec_ctx.h +++ b/src/core/lib/iomgr/exec_ctx.h @@ -36,12 +36,11 @@ #include #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/fork.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/fork.h" #include "src/core/util/latent_see.h" +#include "src/core/util/time.h" #include "src/core/util/time_precise.h" #if !defined(_WIN32) || !defined(_DLL) diff --git a/src/core/lib/iomgr/executor.cc b/src/core/lib/iomgr/executor.cc index 02f21cf796b..9c427b6fd12 100644 --- a/src/core/lib/iomgr/executor.cc +++ b/src/core/lib/iomgr/executor.cc @@ -30,10 +30,10 @@ #include #include "src/core/lib/debug/trace_impl.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/memory.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr_internal.h" +#include "src/core/util/crash.h" +#include "src/core/util/memory.h" #include "src/core/util/useful.h" #define MAX_DEPTH 2 diff --git a/src/core/lib/iomgr/executor.h b/src/core/lib/iomgr/executor.h index e20f2f0242e..b029fd503d3 100644 --- a/src/core/lib/iomgr/executor.h +++ b/src/core/lib/iomgr/executor.h @@ -21,9 +21,9 @@ #include -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/util/spinlock.h" +#include "src/core/util/thd.h" namespace grpc_core { diff --git a/src/core/lib/iomgr/fork_posix.cc b/src/core/lib/iomgr/fork_posix.cc index 91f94755fb7..37059aaa815 100644 --- a/src/core/lib/iomgr/fork_posix.cc +++ b/src/core/lib/iomgr/fork_posix.cc @@ -33,14 +33,14 @@ #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/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/timer_manager.h" #include "src/core/lib/iomgr/wakeup_fd_posix.h" #include "src/core/lib/surface/init_internally.h" +#include "src/core/util/crash.h" +#include "src/core/util/fork.h" +#include "src/core/util/thd.h" // // NOTE: FORKING IS NOT GENERALLY SUPPORTED, THIS IS ONLY INTENDED TO WORK diff --git a/src/core/lib/iomgr/internal_errqueue.cc b/src/core/lib/iomgr/internal_errqueue.cc index dbf001b4cc6..65199cd8e35 100644 --- a/src/core/lib/iomgr/internal_errqueue.cc +++ b/src/core/lib/iomgr/internal_errqueue.cc @@ -27,7 +27,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 bc931a4f44b..51eae975fbc 100644 --- a/src/core/lib/iomgr/iocp_windows.cc +++ b/src/core/lib/iomgr/iocp_windows.cc @@ -32,14 +32,14 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/socket_windows.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/crash.h" +#include "src/core/util/thd.h" static ULONG g_iocp_kick_token; static OVERLAPPED g_iocp_custom_overlap; diff --git a/src/core/lib/iomgr/iomgr.cc b/src/core/lib/iomgr/iomgr.cc index 1687880a0f7..a4fce10be34 100644 --- a/src/core/lib/iomgr/iomgr.cc +++ b/src/core/lib/iomgr/iomgr.cc @@ -30,8 +30,6 @@ #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/lib/iomgr/buffer_list.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/executor.h" @@ -39,7 +37,9 @@ #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/iomgr/timer_manager.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" +#include "src/core/util/thd.h" #include "src/core/util/useful.h" static gpr_mu g_mu; diff --git a/src/core/lib/iomgr/iomgr_windows.cc b/src/core/lib/iomgr/iomgr_windows.cc index ae35534186f..fe1d24a3492 100644 --- a/src/core/lib/iomgr/iomgr_windows.cc +++ b/src/core/lib/iomgr/iomgr_windows.cc @@ -25,7 +25,6 @@ #include "absl/log/check.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/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" @@ -36,6 +35,7 @@ #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/tcp_server.h" #include "src/core/lib/iomgr/timer.h" +#include "src/core/util/crash.h" extern grpc_tcp_server_vtable grpc_windows_tcp_server_vtable; extern grpc_tcp_server_vtable grpc_windows_event_engine_tcp_server_vtable; diff --git a/src/core/lib/iomgr/lockfree_event.cc b/src/core/lib/iomgr/lockfree_event.cc index 51e46ab9764..53700d13749 100644 --- a/src/core/lib/iomgr/lockfree_event.cc +++ b/src/core/lib/iomgr/lockfree_event.cc @@ -24,8 +24,8 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/crash.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/iomgr/polling_entity.cc b/src/core/lib/iomgr/polling_entity.cc index 2a3e9c77060..918af4a7f65 100644 --- a/src/core/lib/iomgr/polling_entity.cc +++ b/src/core/lib/iomgr/polling_entity.cc @@ -24,7 +24,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 32925c61a93..28931294f3c 100644 --- a/src/core/lib/iomgr/pollset_windows.cc +++ b/src/core/lib/iomgr/pollset_windows.cc @@ -22,12 +22,12 @@ #ifdef GRPC_WINSOCK_SOCKET -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/iomgr/pollset_windows.h" +#include "src/core/util/crash.h" +#include "src/core/util/thd.h" #define GRPC_POLLSET_KICK_BROADCAST ((grpc_pollset_worker*)1) diff --git a/src/core/lib/iomgr/resolve_address.cc b/src/core/lib/iomgr/resolve_address.cc index db7b891bcc7..a6130701fec 100644 --- a/src/core/lib/iomgr/resolve_address.cc +++ b/src/core/lib/iomgr/resolve_address.cc @@ -23,8 +23,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..c8c94b00c0b 100644 --- a/src/core/lib/iomgr/resolve_address.h +++ b/src/core/lib/iomgr/resolve_address.h @@ -28,11 +28,11 @@ #include #include "src/core/lib/event_engine/handle_containers.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/resolved_address.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/time.h" #define GRPC_MAX_SOCKADDR_SIZE 128 diff --git a/src/core/lib/iomgr/resolve_address_posix.cc b/src/core/lib/iomgr/resolve_address_posix.cc index 8a161fcc6c4..0dd2e449575 100644 --- a/src/core/lib/iomgr/resolve_address_posix.cc +++ b/src/core/lib/iomgr/resolve_address_posix.cc @@ -29,9 +29,6 @@ #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/lib/iomgr/block_annotate.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/executor.h" @@ -41,7 +38,10 @@ #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/unix_sockets_posix.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/util/crash.h" +#include "src/core/util/host_port.h" #include "src/core/util/string.h" +#include "src/core/util/thd.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/lib/iomgr/resolve_address_windows.cc b/src/core/lib/iomgr/resolve_address_windows.cc index 6db705774a6..9db5b689954 100644 --- a/src/core/lib/iomgr/resolve_address_windows.cc +++ b/src/core/lib/iomgr/resolve_address_windows.cc @@ -34,9 +34,6 @@ #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/lib/iomgr/block_annotate.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/executor.h" @@ -45,7 +42,10 @@ #include "src/core/lib/iomgr/resolve_address_windows.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/util/crash.h" +#include "src/core/util/host_port.h" #include "src/core/util/string.h" +#include "src/core/util/thd.h" namespace grpc_core { namespace { diff --git a/src/core/lib/iomgr/sockaddr_utils_posix.cc b/src/core/lib/iomgr/sockaddr_utils_posix.cc index 62d5bcac84d..8fc4d5a186e 100644 --- a/src/core/lib/iomgr/sockaddr_utils_posix.cc +++ b/src/core/lib/iomgr/sockaddr_utils_posix.cc @@ -42,8 +42,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/sockaddr.h" +#include "src/core/util/crash.h" uint16_t grpc_htons(uint16_t hostshort) { return htons(hostshort); } diff --git a/src/core/lib/iomgr/socket_mutator.cc b/src/core/lib/iomgr/socket_mutator.cc index f77661969ce..d2afe272f12 100644 --- a/src/core/lib/iomgr/socket_mutator.cc +++ b/src/core/lib/iomgr/socket_mutator.cc @@ -23,7 +23,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 19c6ccab152..49b1c349795 100644 --- a/src/core/lib/iomgr/socket_utils_common_posix.cc +++ b/src/core/lib/iomgr/socket_utils_common_posix.cc @@ -52,9 +52,9 @@ #include #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/strerror.h" #include "src/core/lib/iomgr/sockaddr.h" +#include "src/core/util/crash.h" +#include "src/core/util/strerror.h" #include "src/core/util/string.h" // set a socket to use zerocopy diff --git a/src/core/lib/iomgr/socket_utils_linux.cc b/src/core/lib/iomgr/socket_utils_linux.cc index d699a1d5fe5..27e0b53fb86 100644 --- a/src/core/lib/iomgr/socket_utils_linux.cc +++ b/src/core/lib/iomgr/socket_utils_linux.cc @@ -25,9 +25,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils_posix.h" +#include "src/core/util/crash.h" int grpc_accept4(int sockfd, grpc_resolved_address* resolved_addr, int nonblock, int cloexec) { diff --git a/src/core/lib/iomgr/socket_utils_posix.cc b/src/core/lib/iomgr/socket_utils_posix.cc index 88b5d9a6bcf..ebd2d586069 100644 --- a/src/core/lib/iomgr/socket_utils_posix.cc +++ b/src/core/lib/iomgr/socket_utils_posix.cc @@ -29,16 +29,16 @@ #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils_posix.h" +#include "src/core/util/crash.h" #endif #ifdef GRPC_POSIX_SOCKET_TCP #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/lib/gprpp/strerror.h" #include "src/core/lib/iomgr/socket_utils_posix.h" +#include "src/core/util/strerror.h" using ::grpc_event_engine::experimental::EndpointConfig; diff --git a/src/core/lib/iomgr/socket_utils_windows.cc b/src/core/lib/iomgr/socket_utils_windows.cc index 195a838598b..eb7e91f76a7 100644 --- a/src/core/lib/iomgr/socket_utils_windows.cc +++ b/src/core/lib/iomgr/socket_utils_windows.cc @@ -22,9 +22,9 @@ #ifdef GRPC_WINDOWS_SOCKETUTILS -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils.h" +#include "src/core/util/crash.h" uint16_t grpc_htons(uint16_t hostshort) { return htons(hostshort); } diff --git a/src/core/lib/iomgr/socket_windows.cc b/src/core/lib/iomgr/socket_windows.cc index e7a8b1e5fdd..6ace1af6bc4 100644 --- a/src/core/lib/iomgr/socket_windows.cc +++ b/src/core/lib/iomgr/socket_windows.cc @@ -34,13 +34,13 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/iomgr/pollset_windows.h" #include "src/core/lib/iomgr/sockaddr_windows.h" #include "src/core/lib/iomgr/socket_windows.h" +#include "src/core/util/crash.h" static DWORD s_wsa_socket_flags; diff --git a/src/core/lib/iomgr/tcp_client_cfstream.cc b/src/core/lib/iomgr/tcp_client_cfstream.cc index f3228ad20ca..c091737b96c 100644 --- a/src/core/lib/iomgr/tcp_client_cfstream.cc +++ b/src/core/lib/iomgr/tcp_client_cfstream.cc @@ -35,8 +35,6 @@ #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/lib/iomgr/cfstream_handle.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint_cfstream.h" @@ -45,6 +43,8 @@ #include "src/core/lib/iomgr/event_engine_shims/tcp_client.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/timer.h" +#include "src/core/util/crash.h" +#include "src/core/util/host_port.h" struct CFStreamConnect { gpr_mu mu; diff --git a/src/core/lib/iomgr/tcp_client_posix.cc b/src/core/lib/iomgr/tcp_client_posix.cc index b0d983df9b6..a66807cf111 100644 --- a/src/core/lib/iomgr/tcp_client_posix.cc +++ b/src/core/lib/iomgr/tcp_client_posix.cc @@ -39,7 +39,6 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/event_engine/resolved_address_internal.h" #include "src/core/lib/event_engine/shim.h" -#include "src/core/lib/gprpp/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" @@ -53,6 +52,7 @@ #include "src/core/lib/iomgr/unix_sockets_posix.h" #include "src/core/lib/iomgr/vsock.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" using ::grpc_event_engine::experimental::EndpointConfig; diff --git a/src/core/lib/iomgr/tcp_client_windows.cc b/src/core/lib/iomgr/tcp_client_windows.cc index 4086d45a577..c19e81d8131 100644 --- a/src/core/lib/iomgr/tcp_client_windows.cc +++ b/src/core/lib/iomgr/tcp_client_windows.cc @@ -33,7 +33,6 @@ #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/iomgr/event_engine_shims/tcp_client.h" #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/sockaddr.h" @@ -44,6 +43,7 @@ #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/resource_quota/api.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" using ::grpc_event_engine::experimental::EndpointConfig; diff --git a/src/core/lib/iomgr/tcp_posix.cc b/src/core/lib/iomgr/tcp_posix.cc index 37e409d1235..a53d983db33 100644 --- a/src/core/lib/iomgr/tcp_posix.cc +++ b/src/core/lib/iomgr/tcp_posix.cc @@ -55,13 +55,8 @@ #include #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/debug/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/lib/iomgr/buffer_list.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" @@ -74,7 +69,12 @@ #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/crash.h" +#include "src/core/util/event_log.h" +#include "src/core/util/strerror.h" #include "src/core/util/string.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" #ifndef SOL_TCP diff --git a/src/core/lib/iomgr/tcp_server_posix.cc b/src/core/lib/iomgr/tcp_server_posix.cc index a45a0c8e32f..fdd3d96c63e 100644 --- a/src/core/lib/iomgr/tcp_server_posix.cc +++ b/src/core/lib/iomgr/tcp_server_posix.cc @@ -62,7 +62,6 @@ #include "src/core/lib/event_engine/query_extensions.h" #include "src/core/lib/event_engine/resolved_address_internal.h" #include "src/core/lib/event_engine/shim.h" -#include "src/core/lib/gprpp/strerror.h" #include "src/core/lib/iomgr/event_engine_shims/closure.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -76,6 +75,7 @@ #include "src/core/lib/iomgr/unix_sockets_posix.h" #include "src/core/lib/iomgr/vsock.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/util/strerror.h" static std::atomic num_dropped_connections{0}; static constexpr grpc_core::Duration kRetryAcceptWaitTime{ diff --git a/src/core/lib/iomgr/tcp_server_utils_posix_common.cc b/src/core/lib/iomgr/tcp_server_utils_posix_common.cc index ab2e73fb999..7ec14525002 100644 --- a/src/core/lib/iomgr/tcp_server_utils_posix_common.cc +++ b/src/core/lib/iomgr/tcp_server_utils_posix_common.cc @@ -39,12 +39,12 @@ #include #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/tcp_server_utils_posix.h" #include "src/core/lib/iomgr/unix_sockets_posix.h" #include "src/core/lib/iomgr/vsock.h" +#include "src/core/util/crash.h" #define MIN_SAFE_ACCEPT_QUEUE_SIZE 100 diff --git a/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc b/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc index ff80141ef8d..89c69d8beb2 100644 --- a/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc +++ b/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc @@ -37,10 +37,10 @@ #include #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/tcp_server_utils_posix.h" +#include "src/core/util/crash.h" // Return the listener in s with address addr or NULL. static grpc_tcp_listener* find_listener_with_addr(grpc_tcp_server* s, diff --git a/src/core/lib/iomgr/tcp_server_windows.cc b/src/core/lib/iomgr/tcp_server_windows.cc index 1e0bb260c46..ed32fcb25b0 100644 --- a/src/core/lib/iomgr/tcp_server_windows.cc +++ b/src/core/lib/iomgr/tcp_server_windows.cc @@ -46,7 +46,6 @@ #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/event_engine/windows/windows_engine.h" #include "src/core/lib/event_engine/windows/windows_listener.h" -#include "src/core/lib/gprpp/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" @@ -60,6 +59,7 @@ #include "src/core/lib/resource_quota/api.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" #define MIN_SAFE_ACCEPT_QUEUE_SIZE 100 diff --git a/src/core/lib/iomgr/tcp_windows.cc b/src/core/lib/iomgr/tcp_windows.cc index b94ffcfe912..9574531c57d 100644 --- a/src/core/lib/iomgr/tcp_windows.cc +++ b/src/core/lib/iomgr/tcp_windows.cc @@ -32,7 +32,6 @@ #include #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/gprpp/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" @@ -42,6 +41,7 @@ #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_string_helpers.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" #include "src/core/util/useful.h" diff --git a/src/core/lib/iomgr/timer_generic.cc b/src/core/lib/iomgr/timer_generic.cc index 7b1c9d205c2..4d940942c47 100644 --- a/src/core/lib/iomgr/timer_generic.cc +++ b/src/core/lib/iomgr/timer_generic.cc @@ -31,15 +31,15 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/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/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/iomgr/timer_heap.h" +#include "src/core/util/crash.h" +#include "src/core/util/manual_constructor.h" #include "src/core/util/spinlock.h" +#include "src/core/util/time.h" +#include "src/core/util/time_averaged_stats.h" #include "src/core/util/useful.h" #define INVALID_HEAP_INDEX 0xffffffffu diff --git a/src/core/lib/iomgr/timer_manager.cc b/src/core/lib/iomgr/timer_manager.cc index 312ed68a025..5d2015ef50c 100644 --- a/src/core/lib/iomgr/timer_manager.cc +++ b/src/core/lib/iomgr/timer_manager.cc @@ -27,9 +27,9 @@ #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/lib/iomgr/timer.h" +#include "src/core/util/crash.h" +#include "src/core/util/thd.h" struct completed_thread { grpc_core::Thread thd; diff --git a/src/core/lib/iomgr/unix_sockets_posix.cc b/src/core/lib/iomgr/unix_sockets_posix.cc index 904cb10faa2..01a18602ff6 100644 --- a/src/core/lib/iomgr/unix_sockets_posix.cc +++ b/src/core/lib/iomgr/unix_sockets_posix.cc @@ -39,10 +39,10 @@ #include #include "src/core/lib/address_utils/parse_address.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/unix_sockets_posix.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" void grpc_create_socketpair_if_unix(int sv[2]) { diff --git a/src/core/lib/iomgr/unix_sockets_posix_noop.cc b/src/core/lib/iomgr/unix_sockets_posix_noop.cc index 1f9038e9537..ca5086d9f70 100644 --- a/src/core/lib/iomgr/unix_sockets_posix_noop.cc +++ b/src/core/lib/iomgr/unix_sockets_posix_noop.cc @@ -26,8 +26,6 @@ #include "absl/log/check.h" -#include "src/core/lib/gprpp/crash.h" - void grpc_create_socketpair_if_unix(int /* sv */[2]) { // TODO: Either implement this for the non-Unix socket case or make // sure that it is never called in any such case. Until then, leave an diff --git a/src/core/lib/iomgr/vsock.cc b/src/core/lib/iomgr/vsock.cc index c6dc71a8430..45a769998bf 100644 --- a/src/core/lib/iomgr/vsock.cc +++ b/src/core/lib/iomgr/vsock.cc @@ -30,9 +30,9 @@ #include #include "src/core/lib/address_utils/parse_address.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" absl::StatusOr> grpc_resolve_vsock_address( diff --git a/src/core/lib/iomgr/wakeup_fd_eventfd.cc b/src/core/lib/iomgr/wakeup_fd_eventfd.cc index fcdb63b2e5b..cf2ee410c02 100644 --- a/src/core/lib/iomgr/wakeup_fd_eventfd.cc +++ b/src/core/lib/iomgr/wakeup_fd_eventfd.cc @@ -26,9 +26,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/strerror.h" #include "src/core/lib/iomgr/wakeup_fd_posix.h" +#include "src/core/util/crash.h" +#include "src/core/util/strerror.h" static grpc_error_handle eventfd_create(grpc_wakeup_fd* fd_info) { fd_info->read_fd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC); diff --git a/src/core/lib/iomgr/wakeup_fd_pipe.cc b/src/core/lib/iomgr/wakeup_fd_pipe.cc index 65bcc8589f7..e2640d263c9 100644 --- a/src/core/lib/iomgr/wakeup_fd_pipe.cc +++ b/src/core/lib/iomgr/wakeup_fd_pipe.cc @@ -28,11 +28,11 @@ #include "absl/log/log.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/strerror.h" #include "src/core/lib/iomgr/socket_utils_posix.h" #include "src/core/lib/iomgr/wakeup_fd_pipe.h" #include "src/core/lib/iomgr/wakeup_fd_posix.h" +#include "src/core/util/crash.h" +#include "src/core/util/strerror.h" static grpc_error_handle pipe_init(grpc_wakeup_fd* fd_info) { int pipefd[2]; diff --git a/src/core/lib/promise/activity.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 59d504fd6d1..b84fc473b62 100644 --- a/src/core/lib/promise/activity.h +++ b/src/core/lib/promise/activity.h @@ -32,16 +32,16 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/construct_destruct.h" -#include "src/core/lib/gprpp/dump_args.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/lib/promise/context.h" #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/detail/status.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/construct_destruct.h" +#include "src/core/util/dump_args.h" #include "src/core/util/latent_see.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/lib/promise/arena_promise.h b/src/core/lib/promise/arena_promise.h index 287d1c650f3..7f4bb0de563 100644 --- a/src/core/lib/promise/arena_promise.h +++ b/src/core/lib/promise/arena_promise.h @@ -26,10 +26,10 @@ #include -#include "src/core/lib/gprpp/construct_destruct.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/poll.h" #include "src/core/lib/resource_quota/arena.h" +#include "src/core/util/construct_destruct.h" namespace grpc_core { diff --git a/src/core/lib/promise/context.h b/src/core/lib/promise/context.h index 61520707d29..c720dfe35b1 100644 --- a/src/core/lib/promise/context.h +++ b/src/core/lib/promise/context.h @@ -22,7 +22,7 @@ #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 5f4199e5df3..d48dcd61505 100644 --- a/src/core/lib/promise/detail/basic_seq.h +++ b/src/core/lib/promise/detail/basic_seq.h @@ -17,8 +17,8 @@ #include -#include "src/core/lib/gprpp/construct_destruct.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/construct_destruct.h" namespace grpc_core { namespace promise_detail { diff --git a/src/core/lib/promise/detail/join_state.h b/src/core/lib/promise/detail/join_state.h index 403ec38b067..032f6b304f0 100644 --- a/src/core/lib/promise/detail/join_state.h +++ b/src/core/lib/promise/detail/join_state.h @@ -27,10 +27,10 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/bitset.h" -#include "src/core/lib/gprpp/construct_destruct.h" #include "src/core/lib/promise/detail/promise_like.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/bitset.h" +#include "src/core/util/construct_destruct.h" namespace grpc_core { namespace promise_detail { diff --git a/src/core/lib/promise/detail/seq_state.h b/src/core/lib/promise/detail/seq_state.h index 245b8ac26f6..47810f19141 100644 --- a/src/core/lib/promise/detail/seq_state.h +++ b/src/core/lib/promise/detail/seq_state.h @@ -29,11 +29,11 @@ #include #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/promise/detail/promise_factory.h" #include "src/core/lib/promise/detail/promise_like.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/construct_destruct.h" +#include "src/core/util/debug_location.h" // A sequence under some traits for some set of callables P, Fs. // P should be a promise-like object that yields a value. diff --git a/src/core/lib/promise/exec_ctx_wakeup_scheduler.h b/src/core/lib/promise/exec_ctx_wakeup_scheduler.h index 865381f76b0..cc36e1ff747 100644 --- a/src/core/lib/promise/exec_ctx_wakeup_scheduler.h +++ b/src/core/lib/promise/exec_ctx_wakeup_scheduler.h @@ -19,10 +19,10 @@ #include -#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/debug_location.h" namespace grpc_core { diff --git a/src/core/lib/promise/for_each.h b/src/core/lib/promise/for_each.h index 60eb19b713a..5fcaf0094a0 100644 --- a/src/core/lib/promise/for_each.h +++ b/src/core/lib/promise/for_each.h @@ -28,12 +28,12 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/construct_destruct.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/detail/status.h" #include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/status_flag.h" +#include "src/core/util/construct_destruct.h" namespace grpc_core { diff --git a/src/core/lib/promise/if.h b/src/core/lib/promise/if.h index ed50744b40f..d75aec9a5ff 100644 --- a/src/core/lib/promise/if.h +++ b/src/core/lib/promise/if.h @@ -23,10 +23,10 @@ #include -#include "src/core/lib/gprpp/construct_destruct.h" #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/detail/promise_like.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/construct_destruct.h" namespace grpc_core { diff --git a/src/core/lib/promise/inter_activity_latch.h b/src/core/lib/promise/inter_activity_latch.h index 38ef2a0aa4e..c5e89626505 100644 --- a/src/core/lib/promise/inter_activity_latch.h +++ b/src/core/lib/promise/inter_activity_latch.h @@ -26,10 +26,10 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/wait_set.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/lib/promise/inter_activity_pipe.h b/src/core/lib/promise/inter_activity_pipe.h index e03901b76ce..f6a2144dadb 100644 --- a/src/core/lib/promise/inter_activity_pipe.h +++ b/src/core/lib/promise/inter_activity_pipe.h @@ -25,11 +25,11 @@ #include -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/lib/promise/interceptor_list.h b/src/core/lib/promise/interceptor_list.h index dc9b63d3f8c..d75e6452892 100644 --- a/src/core/lib/promise/interceptor_list.h +++ b/src/core/lib/promise/interceptor_list.h @@ -30,12 +30,12 @@ #include -#include "src/core/lib/gprpp/construct_destruct.h" -#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/poll.h" #include "src/core/lib/resource_quota/arena.h" +#include "src/core/util/construct_destruct.h" +#include "src/core/util/debug_location.h" namespace grpc_core { diff --git a/src/core/lib/promise/loop.h b/src/core/lib/promise/loop.h index acfabce2e7f..a7e4195cdea 100644 --- a/src/core/lib/promise/loop.h +++ b/src/core/lib/promise/loop.h @@ -23,9 +23,9 @@ #include -#include "src/core/lib/gprpp/construct_destruct.h" #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/construct_destruct.h" namespace grpc_core { diff --git a/src/core/lib/promise/mpsc.h b/src/core/lib/promise/mpsc.h index 4df3e61a512..02c8d2f97a4 100644 --- a/src/core/lib/promise/mpsc.h +++ b/src/core/lib/promise/mpsc.h @@ -28,12 +28,12 @@ #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/promise/activity.h" #include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/wait_set.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" // Multi producer single consumer inter-activity comms. diff --git a/src/core/lib/promise/observable.h b/src/core/lib/promise/observable.h index 9337feace3f..0f500d66317 100644 --- a/src/core/lib/promise/observable.h +++ b/src/core/lib/promise/observable.h @@ -21,9 +21,9 @@ #include -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/lib/promise/party.cc b/src/core/lib/promise/party.cc index aaa273d16a2..cfc34ebedee 100644 --- a/src/core/lib/promise/party.cc +++ b/src/core/lib/promise/party.cc @@ -25,14 +25,14 @@ #include #include "src/core/lib/event_engine/event_engine_context.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/activity.h" #include "src/core/util/latent_see.h" +#include "src/core/util/sync.h" #ifdef GRPC_MAXIMIZE_THREADYNESS -#include "src/core/lib/gprpp/thd.h" // IWYU pragma: keep #include "src/core/lib/iomgr/exec_ctx.h" // IWYU pragma: keep +#include "src/core/util/thd.h" // IWYU pragma: keep #endif namespace grpc_core { diff --git a/src/core/lib/promise/party.h b/src/core/lib/promise/party.h index d9a2e2ccb57..a38467a924b 100644 --- a/src/core/lib/promise/party.h +++ b/src/core/lib/promise/party.h @@ -32,16 +32,16 @@ #include #include "src/core/lib/debug/trace.h" -#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/lib/promise/activity.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/poll.h" #include "src/core/lib/resource_quota/arena.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/util/useful.h" namespace grpc_core { diff --git a/src/core/lib/promise/pipe.h b/src/core/lib/promise/pipe.h index 59ec003f47d..f3dac4532af 100644 --- a/src/core/lib/promise/pipe.h +++ b/src/core/lib/promise/pipe.h @@ -30,8 +30,6 @@ #include -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/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" @@ -40,6 +38,8 @@ #include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/seq.h" #include "src/core/lib/resource_quota/arena.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/promise/poll.h b/src/core/lib/promise/poll.h index 36570a56fbc..9b895cea032 100644 --- a/src/core/lib/promise/poll.h +++ b/src/core/lib/promise/poll.h @@ -24,7 +24,7 @@ #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 d25a8caefbc..40051ae4939 100644 --- a/src/core/lib/promise/seq.h +++ b/src/core/lib/promise/seq.h @@ -21,11 +21,11 @@ #include -#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/promise/detail/basic_seq.h" #include "src/core/lib/promise/detail/promise_like.h" #include "src/core/lib/promise/detail/seq_state.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/debug_location.h" namespace grpc_core { diff --git a/src/core/lib/promise/sleep.cc b/src/core/lib/promise/sleep.cc index 1b793367149..d31e2a82595 100644 --- a/src/core/lib/promise/sleep.cc +++ b/src/core/lib/promise/sleep.cc @@ -20,11 +20,11 @@ #include #include "src/core/lib/event_engine/event_engine_context.h" // IWYU pragma: keep -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/lib/promise/sleep.h b/src/core/lib/promise/sleep.h index b595b7100e3..0ae4232d7b7 100644 --- a/src/core/lib/promise/sleep.h +++ b/src/core/lib/promise/sleep.h @@ -23,9 +23,9 @@ #include #include -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/lib/promise/wait_for_callback.h b/src/core/lib/promise/wait_for_callback.h index 519253bbb24..6aabfe57970 100644 --- a/src/core/lib/promise/wait_for_callback.h +++ b/src/core/lib/promise/wait_for_callback.h @@ -22,9 +22,9 @@ #include -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/lib/resource_quota/api.cc b/src/core/lib/resource_quota/api.cc index 7e2f9594e65..113685e08f4 100644 --- a/src/core/lib/resource_quota/api.cc +++ b/src/core/lib/resource_quota/api.cc @@ -28,11 +28,11 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/resource_quota/thread_quota.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/resource_quota/arena.h b/src/core/lib/resource_quota/arena.h index c80528fa39f..fd962df93a8 100644 --- a/src/core/lib/resource_quota/arena.h +++ b/src/core/lib/resource_quota/arena.h @@ -35,10 +35,10 @@ #include #include -#include "src/core/lib/gprpp/construct_destruct.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/util/alloc.h" +#include "src/core/util/construct_destruct.h" namespace grpc_core { diff --git a/src/core/lib/resource_quota/connection_quota.h b/src/core/lib/resource_quota/connection_quota.h index fcaddc1b58a..ac0aa6cdb29 100644 --- a/src/core/lib/resource_quota/connection_quota.h +++ b/src/core/lib/resource_quota/connection_quota.h @@ -22,10 +22,10 @@ #include -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/resource_quota/memory_quota.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/lib/resource_quota/memory_quota.cc b/src/core/lib/resource_quota/memory_quota.cc index 29b3a581a92..ee785e62adf 100644 --- a/src/core/lib/resource_quota/memory_quota.cc +++ b/src/core/lib/resource_quota/memory_quota.cc @@ -35,13 +35,13 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/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" #include "src/core/lib/promise/race.h" #include "src/core/lib/promise/seq.h" #include "src/core/lib/slice/slice_refcount.h" +#include "src/core/util/mpscq.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/lib/resource_quota/memory_quota.h b/src/core/lib/resource_quota/memory_quota.h index f1281cc5bac..39c7d83a48a 100644 --- a/src/core/lib/resource_quota/memory_quota.h +++ b/src/core/lib/resource_quota/memory_quota.h @@ -39,13 +39,13 @@ #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/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" #include "src/core/lib/resource_quota/periodic_update.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/lib/resource_quota/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..0704a162eef 100644 --- a/src/core/lib/resource_quota/resource_quota.h +++ b/src/core/lib/resource_quota/resource_quota.h @@ -24,11 +24,11 @@ #include #include -#include "src/core/lib/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/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/thread_quota.h" +#include "src/core/util/cpp_impl_of.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/useful.h" namespace grpc_core { 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 d5c8f95705e..2f8ac055c1c 100644 --- a/src/core/lib/security/authorization/audit_logging.cc +++ b/src/core/lib/security/authorization/audit_logging.cc @@ -32,8 +32,8 @@ #include #include -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/security/authorization/stdout_logger.h" +#include "src/core/util/sync.h" namespace grpc_core { namespace experimental { diff --git a/src/core/lib/security/authorization/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..4dca42bea85 100644 --- a/src/core/lib/security/authorization/authorization_engine.h +++ b/src/core/lib/security/authorization/authorization_engine.h @@ -19,8 +19,8 @@ #include -#include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/security/authorization/evaluate_args.h" +#include "src/core/util/ref_counted.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/authorization_policy_provider.h b/src/core/lib/security/authorization/authorization_policy_provider.h index a4dbc5e8a08..6dfdc8fb875 100644 --- a/src/core/lib/security/authorization/authorization_policy_provider.h +++ b/src/core/lib/security/authorization/authorization_policy_provider.h @@ -21,9 +21,9 @@ #include #include -#include "src/core/lib/gprpp/dual_ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/authorization/authorization_engine.h" +#include "src/core/util/dual_ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/useful.h" struct grpc_authorization_policy_provider diff --git a/src/core/lib/security/authorization/authorization_policy_provider_vtable.cc b/src/core/lib/security/authorization/authorization_policy_provider_vtable.cc index 8c8236e2367..315c655b0bc 100644 --- a/src/core/lib/security/authorization/authorization_policy_provider_vtable.cc +++ b/src/core/lib/security/authorization/authorization_policy_provider_vtable.cc @@ -16,8 +16,8 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/authorization/authorization_policy_provider.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/useful.h" namespace { diff --git a/src/core/lib/security/authorization/evaluate_args.cc b/src/core/lib/security/authorization/evaluate_args.cc index 9a420347c09..0a4e23d1923 100644 --- a/src/core/lib/security/authorization/evaluate_args.cc +++ b/src/core/lib/security/authorization/evaluate_args.cc @@ -27,10 +27,10 @@ #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/lib/security/credentials/tls/tls_utils.h" #include "src/core/lib/slice/slice.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/host_port.h" +#include "src/core/util/uri.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc b/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc index 4380e09086a..171fd61b3f1 100644 --- a/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc +++ b/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc @@ -30,14 +30,14 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/load_file.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/authorization/grpc_authorization_engine.h" #include "src/core/lib/security/authorization/rbac_policy.h" #include "src/core/lib/security/authorization/rbac_translator.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/load_file.h" +#include "src/core/util/status_helper.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/grpc_authorization_policy_provider.h b/src/core/lib/security/authorization/grpc_authorization_policy_provider.h index b61db3131b1..f7e6aff40d7 100644 --- a/src/core/lib/security/authorization/grpc_authorization_policy_provider.h +++ b/src/core/lib/security/authorization/grpc_authorization_policy_provider.h @@ -28,12 +28,12 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/security/authorization/authorization_engine.h" #include "src/core/lib/security/authorization/authorization_policy_provider.h" #include "src/core/lib/security/authorization/rbac_translator.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/thd.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/grpc_server_authz_filter.h b/src/core/lib/security/authorization/grpc_server_authz_filter.h index cfd9c3bbd26..733142cfca3 100644 --- a/src/core/lib/security/authorization/grpc_server_authz_filter.h +++ b/src/core/lib/security/authorization/grpc_server_authz_filter.h @@ -23,12 +23,12 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/authorization/authorization_policy_provider.h" #include "src/core/lib/security/authorization/evaluate_args.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/matchers.h b/src/core/lib/security/authorization/matchers.h index 354d7c0cb3e..eaadd07b4e7 100644 --- a/src/core/lib/security/authorization/matchers.h +++ b/src/core/lib/security/authorization/matchers.h @@ -26,9 +26,9 @@ #include #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/lib/matchers/matchers.h" #include "src/core/lib/security/authorization/evaluate_args.h" #include "src/core/lib/security/authorization/rbac_policy.h" +#include "src/core/util/matchers.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/rbac_policy.h b/src/core/lib/security/authorization/rbac_policy.h index b3a2c6db6aa..03b4e283cde 100644 --- a/src/core/lib/security/authorization/rbac_policy.h +++ b/src/core/lib/security/authorization/rbac_policy.h @@ -27,7 +27,7 @@ #include #include -#include "src/core/lib/matchers/matchers.h" +#include "src/core/util/matchers.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/rbac_translator.cc b/src/core/lib/security/authorization/rbac_translator.cc index d427ce8ea07..342f9248371 100644 --- a/src/core/lib/security/authorization/rbac_translator.cc +++ b/src/core/lib/security/authorization/rbac_translator.cc @@ -36,10 +36,10 @@ #include #include -#include "src/core/lib/matchers/matchers.h" #include "src/core/lib/security/authorization/audit_logging.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" +#include "src/core/util/matchers.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/lib/security/certificate_provider/certificate_provider_factory.h b/src/core/lib/security/certificate_provider/certificate_provider_factory.h index 719561a1eec..9da32e9233f 100644 --- a/src/core/lib/security/certificate_provider/certificate_provider_factory.h +++ b/src/core/lib/security/certificate_provider/certificate_provider_factory.h @@ -27,11 +27,11 @@ #include #include -#include "src/core/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/json/json.h" #include "src/core/util/json/json_args.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/lib/security/context/security_context.cc b/src/core/lib/security/context/security_context.cc index feade8cd9dd..67a219d9038 100644 --- a/src/core/lib/security/context/security_context.cc +++ b/src/core/lib/security/context/security_context.cc @@ -33,11 +33,11 @@ #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/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/surface/call.h" +#include "src/core/util/ref_counted_ptr.h" // --- grpc_call --- diff --git a/src/core/lib/security/context/security_context.h b/src/core/lib/security/context/security_context.h index 7240ba955bd..cc3b21620a5 100644 --- a/src/core/lib/security/context/security_context.h +++ b/src/core/lib/security/context/security_context.h @@ -33,11 +33,11 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/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/resource_quota/arena.h" #include "src/core/lib/security/credentials/credentials.h" // IWYU pragma: keep +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/useful.h" // --- grpc_auth_context --- diff --git a/src/core/lib/security/credentials/alts/alts_credentials.h b/src/core/lib/security/credentials/alts/alts_credentials.h index e49ef34be4e..3aa072789ff 100644 --- a/src/core/lib/security/credentials/alts/alts_credentials.h +++ b/src/core/lib/security/credentials/alts/alts_credentials.h @@ -25,10 +25,10 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" // Main struct for grpc ALTS channel credential. diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc index d9078a4c81a..4de3a24eae6 100644 --- a/src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc +++ b/src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc @@ -22,8 +22,8 @@ #include "absl/log/log.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" +#include "src/core/util/crash.h" bool grpc_alts_is_running_on_gcp() { VLOG(2) << "ALTS: Platforms other than Linux and Windows are not supported"; 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 85639e51840..df6a6240974 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 @@ -28,8 +28,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" +#include "src/core/util/crash.h" namespace grpc_core { namespace internal { diff --git a/src/core/lib/security/credentials/call_creds_util.cc b/src/core/lib/security/credentials/call_creds_util.cc index 037d60196c9..71c3da6dfa3 100644 --- a/src/core/lib/security/credentials/call_creds_util.cc +++ b/src/core/lib/security/credentials/call_creds_util.cc @@ -25,10 +25,10 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/channel_creds_registry.h b/src/core/lib/security/credentials/channel_creds_registry.h index 8fa2462f2ba..17771ff8d9e 100644 --- a/src/core/lib/security/credentials/channel_creds_registry.h +++ b/src/core/lib/security/credentials/channel_creds_registry.h @@ -26,11 +26,11 @@ #include -#include "src/core/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/json/json.h" #include "src/core/util/json/json_args.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/validation_errors.h" struct grpc_channel_credentials; diff --git a/src/core/lib/security/credentials/channel_creds_registry_init.cc b/src/core/lib/security/credentials/channel_creds_registry_init.cc index 832daba1284..de2f7d143b9 100644 --- a/src/core/lib/security/credentials/channel_creds_registry_init.cc +++ b/src/core/lib/security/credentials/channel_creds_registry_init.cc @@ -31,9 +31,6 @@ #include #include "src/core/lib/config/core_configuration.h" -#include "src/core/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/security/credentials/channel_creds_registry.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" @@ -44,6 +41,9 @@ #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/composite/composite_credentials.cc b/src/core/lib/security/credentials/composite/composite_credentials.cc index db5d3079cbc..d5d8c76baf4 100644 --- a/src/core/lib/security/credentials/composite/composite_credentials.cc +++ b/src/core/lib/security/credentials/composite/composite_credentials.cc @@ -29,9 +29,9 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/promise/try_seq.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/ref_counted_ptr.h" // // grpc_composite_channel_credentials diff --git a/src/core/lib/security/credentials/composite/composite_credentials.h b/src/core/lib/security/credentials/composite/composite_credentials.h index 6bd13f0dea8..64b05de2cf1 100644 --- a/src/core/lib/security/credentials/composite/composite_credentials.h +++ b/src/core/lib/security/credentials/composite/composite_credentials.h @@ -33,12 +33,12 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" // -- Composite channel credentials. -- diff --git a/src/core/lib/security/credentials/credentials.cc b/src/core/lib/security/credentials/credentials.cc index 6cdb1399ce5..6f43677d8f0 100644 --- a/src/core/lib/security/credentials/credentials.cc +++ b/src/core/lib/security/credentials/credentials.cc @@ -28,7 +28,6 @@ #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/iomgr/exec_ctx.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 3066cbfeb33..57f0eaaa62b 100644 --- a/src/core/lib/security/credentials/credentials.h +++ b/src/core/lib/security/credentials/credentials.h @@ -35,14 +35,14 @@ #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/lib/promise/arena_promise.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/crash.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" // --- Constants. --- diff --git a/src/core/lib/security/credentials/external/aws_external_account_credentials.cc b/src/core/lib/security/credentials/external/aws_external_account_credentials.cc index c2e06861019..23061f1679a 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 @@ -37,14 +37,14 @@ #include #include -#include "src/core/lib/gprpp/env.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/security/credentials/credentials.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/env.h" #include "src/core/util/http_client/httpcli_ssl_credentials.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/uri.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/external/aws_external_account_credentials.h b/src/core/lib/security/credentials/external/aws_external_account_credentials.h index 588001e480b..466094cbe23 100644 --- a/src/core/lib/security/credentials/external/aws_external_account_credentials.h +++ b/src/core/lib/security/credentials/external/aws_external_account_credentials.h @@ -26,13 +26,13 @@ #include -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/credentials/external/aws_request_signer.h" #include "src/core/lib/security/credentials/external/external_account_credentials.h" #include "src/core/util/http_client/httpcli.h" #include "src/core/util/http_client/parser.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/external/aws_request_signer.h b/src/core/lib/security/credentials/external/aws_request_signer.h index 239abe090e6..59a5390f795 100644 --- a/src/core/lib/security/credentials/external/aws_request_signer.h +++ b/src/core/lib/security/credentials/external/aws_request_signer.h @@ -23,7 +23,7 @@ #include #include "src/core/lib/iomgr/error.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/uri.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/external/external_account_credentials.cc b/src/core/lib/security/credentials/external/external_account_credentials.cc index c83351e67e2..7c4955bc09d 100644 --- a/src/core/lib/security/credentials/external/external_account_credentials.cc +++ b/src/core/lib/security/credentials/external/external_account_credentials.cc @@ -45,17 +45,17 @@ #include #include -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/external/aws_external_account_credentials.h" #include "src/core/lib/security/credentials/external/file_external_account_credentials.h" #include "src/core/lib/security/credentials/external/url_external_account_credentials.h" #include "src/core/lib/security/util/json_util.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/util/http_client/httpcli_ssl_credentials.h" #include "src/core/util/http_client/parser.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/uri.h" #define EXTERNAL_ACCOUNT_CREDENTIALS_GRANT_TYPE \ "urn:ietf:params:oauth:grant-type:token-exchange" diff --git a/src/core/lib/security/credentials/external/external_account_credentials.h b/src/core/lib/security/credentials/external/external_account_credentials.h index 5dfbb24a36e..3323d21bbf0 100644 --- a/src/core/lib/security/credentials/external/external_account_credentials.h +++ b/src/core/lib/security/credentials/external/external_account_credentials.h @@ -29,9 +29,6 @@ #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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/polling_entity.h" @@ -40,6 +37,9 @@ #include "src/core/util/http_client/httpcli.h" #include "src/core/util/http_client/parser.h" #include "src/core/util/json/json.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/external/file_external_account_credentials.cc b/src/core/lib/security/credentials/external/file_external_account_credentials.cc index 086af8c79c7..c38adc83dc6 100644 --- a/src/core/lib/security/credentials/external/file_external_account_credentials.cc +++ b/src/core/lib/security/credentials/external/file_external_account_credentials.cc @@ -26,11 +26,11 @@ #include #include -#include "src/core/lib/gprpp/load_file.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" +#include "src/core/util/load_file.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/external/file_external_account_credentials.h b/src/core/lib/security/credentials/external/file_external_account_credentials.h index 8ed7b146537..7d4721a0bf4 100644 --- a/src/core/lib/security/credentials/external/file_external_account_credentials.h +++ b/src/core/lib/security/credentials/external/file_external_account_credentials.h @@ -25,9 +25,9 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/credentials/external/external_account_credentials.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/external/url_external_account_credentials.h b/src/core/lib/security/credentials/external/url_external_account_credentials.h index 65dcae9176e..bf44736edf6 100644 --- a/src/core/lib/security/credentials/external/url_external_account_credentials.h +++ b/src/core/lib/security/credentials/external/url_external_account_credentials.h @@ -26,12 +26,12 @@ #include -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/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/lib/uri/uri_parser.h" #include "src/core/util/http_client/httpcli.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/uri.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/fake/fake_credentials.cc b/src/core/lib/security/credentials/fake/fake_credentials.cc index 2eb12fa1039..1e0f6f33eb4 100644 --- a/src/core/lib/security/credentials/fake/fake_credentials.cc +++ b/src/core/lib/security/credentials/fake/fake_credentials.cc @@ -28,11 +28,11 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/security/security_connector/fake/fake_security_connector.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/ref_counted_ptr.h" // -- Fake transport security credentials. -- diff --git a/src/core/lib/security/credentials/fake/fake_credentials.h b/src/core/lib/security/credentials/fake/fake_credentials.h index d4b00d6eb40..fe4fb414593 100644 --- a/src/core/lib/security/credentials/fake/fake_credentials.h +++ b/src/core/lib/security/credentials/fake/fake_credentials.h @@ -30,13 +30,13 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" #define GRPC_ARG_FAKE_SECURITY_EXPECTED_TARGETS \ diff --git a/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc b/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc index 11aa4e158d7..8b3c8c8701d 100644 --- a/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc +++ b/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc @@ -26,16 +26,16 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/transport/metadata.h" #include "src/core/lib/transport/status_conversion.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" #include "src/core/util/json/json_reader.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/uri.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h b/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h index 231e9bbccc6..2e75547c402 100644 --- a/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h +++ b/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h @@ -23,10 +23,6 @@ #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/lib/gprpp/unique_type_name.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/security/credentials/credentials.h" @@ -35,6 +31,10 @@ #include "src/core/lib/transport/metadata.h" #include "src/core/util/http_client/httpcli.h" #include "src/core/util/http_client/parser.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" +#include "src/core/util/unique_type_name.h" namespace grpc_core { 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 cf748049b98..f09e5681c88 100644 --- a/src/core/lib/security/credentials/google_default/credentials_generic.cc +++ b/src/core/lib/security/credentials/google_default/credentials_generic.cc @@ -24,9 +24,9 @@ #include -#include "src/core/lib/gprpp/env.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/google_default/google_default_credentials.h" +#include "src/core/util/env.h" std::string grpc_get_well_known_google_credentials_file_path_impl(void) { auto base = grpc_core::GetEnv(GRPC_GOOGLE_CREDENTIALS_PATH_ENV_VAR); diff --git a/src/core/lib/security/credentials/google_default/google_default_credentials.cc b/src/core/lib/security/credentials/google_default/google_default_credentials.cc index d649eb5512b..ba9aeca2942 100644 --- a/src/core/lib/security/credentials/google_default/google_default_credentials.cc +++ b/src/core/lib/security/credentials/google_default/google_default_credentials.cc @@ -42,13 +42,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -64,13 +57,20 @@ #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/transport/error_utils.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/load_balancing/grpclb/grpclb.h" #include "src/core/load_balancing/xds/xds_channel_args.h" +#include "src/core/util/env.h" #include "src/core/util/http_client/httpcli.h" #include "src/core/util/http_client/parser.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" +#include "src/core/util/load_file.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" using grpc_core::Json; diff --git a/src/core/lib/security/credentials/google_default/google_default_credentials.h b/src/core/lib/security/credentials/google_default/google_default_credentials.h index 8611cbdc254..58f9ae40cdc 100644 --- a/src/core/lib/security/credentials/google_default/google_default_credentials.h +++ b/src/core/lib/security/credentials/google_default/google_default_credentials.h @@ -26,10 +26,10 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" #define GRPC_GOOGLE_CLOUD_SDK_CONFIG_DIRECTORY "gcloud" diff --git a/src/core/lib/security/credentials/iam/iam_credentials.cc b/src/core/lib/security/credentials/iam/iam_credentials.cc index 876851555da..8d855978676 100644 --- a/src/core/lib/security/credentials/iam/iam_credentials.cc +++ b/src/core/lib/security/credentials/iam/iam_credentials.cc @@ -30,10 +30,10 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/ref_counted_ptr.h" grpc_core::ArenaPromise> grpc_google_iam_credentials::GetRequestMetadata( diff --git a/src/core/lib/security/credentials/iam/iam_credentials.h b/src/core/lib/security/credentials/iam/iam_credentials.h index 8fa67a9048d..aa8426048f1 100644 --- a/src/core/lib/security/credentials/iam/iam_credentials.h +++ b/src/core/lib/security/credentials/iam/iam_credentials.h @@ -28,11 +28,11 @@ #include #include -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" class grpc_google_iam_credentials : public grpc_call_credentials { diff --git a/src/core/lib/security/credentials/insecure/insecure_credentials.h b/src/core/lib/security/credentials/insecure/insecure_credentials.h index e9bf9327e72..9e89970f219 100644 --- a/src/core/lib/security/credentials/insecure/insecure_credentials.h +++ b/src/core/lib/security/credentials/insecure/insecure_credentials.h @@ -25,10 +25,10 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/jwt/jwt_credentials.cc b/src/core/lib/security/credentials/jwt/jwt_credentials.cc index 33636819c4f..ab3cb4af773 100644 --- a/src/core/lib/security/credentials/jwt/jwt_credentials.cc +++ b/src/core/lib/security/credentials/jwt/jwt_credentials.cc @@ -37,15 +37,15 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/security/credentials/call_creds_util.h" #include "src/core/lib/transport/metadata_batch.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/uri.h" using grpc_core::Json; diff --git a/src/core/lib/security/credentials/jwt/jwt_credentials.h b/src/core/lib/security/credentials/jwt/jwt_credentials.h index 751ff187fc6..26dfa169ad4 100644 --- a/src/core/lib/security/credentials/jwt/jwt_credentials.h +++ b/src/core/lib/security/credentials/jwt/jwt_credentials.h @@ -35,13 +35,13 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/jwt/json_token.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" class grpc_service_account_jwt_access_credentials diff --git a/src/core/lib/security/credentials/jwt/jwt_verifier.cc b/src/core/lib/security/credentials/jwt/jwt_verifier.cc index 14da6885097..5f45ece8056 100644 --- a/src/core/lib/security/credentials/jwt/jwt_verifier.cc +++ b/src/core/lib/security/credentials/jwt/jwt_verifier.cc @@ -54,9 +54,6 @@ #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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -65,13 +62,16 @@ #include "src/core/lib/security/credentials/credentials.h" // IWYU pragma: keep #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/tsi/ssl_types.h" #include "src/core/util/http_client/httpcli.h" #include "src/core/util/http_client/httpcli_ssl_credentials.h" #include "src/core/util/http_client/parser.h" #include "src/core/util/json/json_reader.h" +#include "src/core/util/manual_constructor.h" +#include "src/core/util/memory.h" +#include "src/core/util/orphanable.h" #include "src/core/util/string.h" +#include "src/core/util/uri.h" using grpc_core::Json; diff --git a/src/core/lib/security/credentials/jwt/jwt_verifier.h b/src/core/lib/security/credentials/jwt/jwt_verifier.h index 922da79d4c9..9ff8ca53831 100644 --- a/src/core/lib/security/credentials/jwt/jwt_verifier.h +++ b/src/core/lib/security/credentials/jwt/jwt_verifier.h @@ -24,9 +24,9 @@ #include #include -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/util/json/json.h" +#include "src/core/util/time.h" // --- Constants. --- diff --git a/src/core/lib/security/credentials/local/local_credentials.h b/src/core/lib/security/credentials/local/local_credentials.h index 9665db5d082..e0a5d37f8c9 100644 --- a/src/core/lib/security/credentials/local/local_credentials.h +++ b/src/core/lib/security/credentials/local/local_credentials.h @@ -26,10 +26,10 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" // Main class for grpc local channel credential. diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc index 4e366d0bb69..216c038cbf2 100644 --- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc +++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc @@ -46,10 +46,6 @@ #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/lib/iomgr/error.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/promise/context.h" @@ -58,10 +54,14 @@ #include "src/core/lib/security/util/json_util.h" #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/transport/metadata_batch.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/util/http_client/httpcli_ssl_credentials.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" +#include "src/core/util/load_file.h" +#include "src/core/util/memory.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/uri.h" using grpc_core::Json; diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.h b/src/core/lib/security/credentials/oauth2/oauth2_credentials.h index ea9315ba012..bb91c8a524f 100644 --- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.h +++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.h @@ -33,11 +33,6 @@ #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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/polling_entity.h" @@ -47,10 +42,15 @@ #include "src/core/lib/security/credentials/token_fetcher/token_fetcher_credentials.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/transport.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/util/http_client/httpcli.h" #include "src/core/util/http_client/parser.h" #include "src/core/util/json/json.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" +#include "src/core/util/unique_type_name.h" +#include "src/core/util/uri.h" #include "src/core/util/useful.h" // Constants. diff --git a/src/core/lib/security/credentials/plugin/plugin_credentials.h b/src/core/lib/security/credentials/plugin/plugin_credentials.h index 9cffc05b3dc..113955240c1 100644 --- a/src/core/lib/security/credentials/plugin/plugin_credentials.h +++ b/src/core/lib/security/credentials/plugin/plugin_credentials.h @@ -36,9 +36,6 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/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/promise/activity.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/promise/poll.h" @@ -46,6 +43,9 @@ #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" // This type is forward declared as a C struct and we cannot define it as a diff --git a/src/core/lib/security/credentials/ssl/ssl_credentials.h b/src/core/lib/security/credentials/ssl/ssl_credentials.h index 32c450de90f..ab4c9a12767 100644 --- a/src/core/lib/security/credentials/ssl/ssl_credentials.h +++ b/src/core/lib/security/credentials/ssl/ssl_credentials.h @@ -29,12 +29,12 @@ #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/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/security/security_connector/ssl/ssl_security_connector.h" #include "src/core/tsi/ssl_transport_security.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" class grpc_ssl_credentials : public grpc_channel_credentials { diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h b/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h index 5a0de70f093..f34e664d581 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h +++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h @@ -30,10 +30,10 @@ #include -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/security_connector/ssl_utils.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/sync.h" struct grpc_tls_identity_pairs { grpc_core::PemKeyCertPairList pem_key_cert_pairs; diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc b/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc index 82a56f43ebc..30bc3e462c7 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,13 +33,13 @@ #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/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/load_file.h" +#include "src/core/util/stat.h" +#include "src/core/util/status_helper.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h b/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h index c3703cd56f9..73b9cd70864 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 @@ -32,13 +32,13 @@ #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/lib/security/credentials/tls/grpc_tls_certificate_distributor.h" #include "src/core/lib/security/security_connector/ssl_utils.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/thd.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" // Interface for a grpc_tls_certificate_provider that handles the process to diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.cc b/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.cc index f4c2c75bb44..1be015dcba7 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 @@ -29,9 +29,9 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/security/credentials/tls/tls_utils.h" +#include "src/core/util/host_port.h" namespace grpc_core { 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 0c5c2e7f5ae..5e021948d2f 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 @@ -29,9 +29,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 82a6dd55620..3176dc10caa 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 @@ -27,9 +27,9 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/tsi/ssl_transport_security.h" +#include "src/core/util/debug_location.h" /// -- Wrapper APIs declared in grpc_security.h -- * diff --git a/src/core/lib/security/credentials/tls/grpc_tls_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 4db21c2885c..ce1fc4dd1d0 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 @@ -43,10 +43,10 @@ #include "absl/types/span.h" #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/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/directory_reader.h" +#include "src/core/util/load_file.h" namespace grpc_core { namespace experimental { diff --git a/src/core/lib/security/credentials/tls/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..fd78967d8f5 100644 --- a/src/core/lib/security/credentials/tls/tls_credentials.h +++ b/src/core/lib/security/credentials/tls/tls_credentials.h @@ -25,10 +25,10 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" class TlsCredentials final : public grpc_channel_credentials { public: diff --git a/src/core/lib/security/credentials/token_fetcher/token_fetcher_credentials.h b/src/core/lib/security/credentials/token_fetcher/token_fetcher_credentials.h index c73d469234b..6283c044be8 100644 --- a/src/core/lib/security/credentials/token_fetcher/token_fetcher_credentials.h +++ b/src/core/lib/security/credentials/token_fetcher/token_fetcher_credentials.h @@ -28,17 +28,17 @@ #include -#include "src/core/lib/backoff/backoff.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/iomgr/polling_entity.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/transport/metadata.h" +#include "src/core/util/backoff.h" #include "src/core/util/http_client/httpcli.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/useful.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/xds/xds_credentials.h b/src/core/lib/security/credentials/xds/xds_credentials.h index dc363ac52b2..554d7a57f26 100644 --- a/src/core/lib/security/credentials/xds/xds_credentials.h +++ b/src/core/lib/security/credentials/xds/xds_credentials.h @@ -34,12 +34,12 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.h" -#include "src/core/lib/matchers/matchers.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h" #include "src/core/lib/security/security_connector/security_connector.h" +#include "src/core/util/matchers.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" #include "src/core/xds/grpc/xds_certificate_provider.h" namespace grpc_core { diff --git a/src/core/lib/security/security_connector/alts/alts_security_connector.cc b/src/core/lib/security/security_connector/alts/alts_security_connector.cc index 370f21555d0..f30cecdd01a 100644 --- a/src/core/lib/security/security_connector/alts/alts_security_connector.cc +++ b/src/core/lib/security/security_connector/alts/alts_security_connector.cc @@ -40,8 +40,6 @@ #include "src/core/handshaker/handshaker.h" #include "src/core/handshaker/security/security_handshaker.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -56,6 +54,8 @@ #include "src/core/lib/transport/transport.h" #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h" #include "src/core/tsi/transport_security.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" void grpc_alts_set_rpc_protocol_versions( grpc_gcp_rpc_protocol_versions* rpc_versions) { diff --git a/src/core/lib/security/security_connector/alts/alts_security_connector.h b/src/core/lib/security/security_connector/alts/alts_security_connector.h index 1f0c13a3618..5fe144a5e7d 100644 --- a/src/core/lib/security/security_connector/alts/alts_security_connector.h +++ b/src/core/lib/security/security_connector/alts/alts_security_connector.h @@ -23,10 +23,10 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/tsi/alts/handshaker/transport_security_common_api.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/ref_counted_ptr.h" #define GRPC_ALTS_TRANSPORT_SECURITY_TYPE "alts" diff --git a/src/core/lib/security/security_connector/fake/fake_security_connector.cc b/src/core/lib/security/security_connector/fake/fake_security_connector.cc index b83eda46ee1..20425dc2c91 100644 --- a/src/core/lib/security/security_connector/fake/fake_security_connector.cc +++ b/src/core/lib/security/security_connector/fake/fake_security_connector.cc @@ -41,10 +41,6 @@ #include "src/core/handshaker/handshaker.h" #include "src/core/handshaker/security/security_handshaker.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -58,6 +54,10 @@ #include "src/core/load_balancing/grpclb/grpclb.h" #include "src/core/tsi/fake_transport_security.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/host_port.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/string.h" #include "src/core/util/useful.h" diff --git a/src/core/lib/security/security_connector/fake/fake_security_connector.h b/src/core/lib/security/security_connector/fake/fake_security_connector.h index 1edc40c0b95..3801af09fbc 100644 --- a/src/core/lib/security/security_connector/fake/fake_security_connector.h +++ b/src/core/lib/security/security_connector/fake/fake_security_connector.h @@ -24,8 +24,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/security_connector/security_connector.h" +#include "src/core/util/ref_counted_ptr.h" // Creates a fake connector that emulates real channel security. grpc_core::RefCountedPtr diff --git a/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc b/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc index 08e897bebc3..79ea0cd337c 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 @@ -27,12 +27,12 @@ #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/iomgr/exec_ctx.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/tsi/local_transport_security.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/security/security_connector/insecure/insecure_security_connector.h b/src/core/lib/security/security_connector/insecure/insecure_security_connector.h index 151264f35ae..9fc962b92ca 100644 --- a/src/core/lib/security/security_connector/insecure/insecure_security_connector.h +++ b/src/core/lib/security/security_connector/insecure/insecure_security_connector.h @@ -31,7 +31,6 @@ #include "src/core/handshaker/handshaker.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -40,6 +39,7 @@ #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/security/security_connector/load_system_roots_supported.cc b/src/core/lib/security/security_connector/load_system_roots_supported.cc index 26d49e67cad..52b657185a6 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 @@ -37,10 +37,10 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/load_file.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/security_connector/load_system_roots.h" #include "src/core/lib/security/security_connector/load_system_roots_supported.h" +#include "src/core/util/load_file.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/lib/security/security_connector/local/local_security_connector.cc b/src/core/lib/security/security_connector/local/local_security_connector.cc index b78ddbe4830..c118f330923 100644 --- a/src/core/lib/security/security_connector/local/local_security_connector.cc +++ b/src/core/lib/security/security_connector/local/local_security_connector.cc @@ -43,8 +43,6 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -59,10 +57,12 @@ #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/local/local_credentials.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/tsi/local_transport_security.h" #include "src/core/tsi/transport_security.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/uri.h" #define GRPC_UDS_URI_PATTERN "unix:" #define GRPC_ABSTRACT_UDS_URI_PATTERN "unix-abstract:" diff --git a/src/core/lib/security/security_connector/local/local_security_connector.h b/src/core/lib/security/security_connector/local/local_security_connector.h index 09020552f1c..3475d8f033a 100644 --- a/src/core/lib/security/security_connector/local/local_security_connector.h +++ b/src/core/lib/security/security_connector/local/local_security_connector.h @@ -24,8 +24,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/security_connector/security_connector.h" +#include "src/core/util/ref_counted_ptr.h" /// /// This method creates a local channel security connector. diff --git a/src/core/lib/security/security_connector/security_connector.cc b/src/core/lib/security/security_connector/security_connector.cc index d40b90cc3bf..d3c9906f8b6 100644 --- a/src/core/lib/security/security_connector/security_connector.cc +++ b/src/core/lib/security/security_connector/security_connector.cc @@ -28,8 +28,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/security/credentials/credentials.h" +#include "src/core/util/debug_location.h" #include "src/core/util/useful.h" grpc_channel_security_connector::grpc_channel_security_connector( diff --git a/src/core/lib/security/security_connector/security_connector.h b/src/core/lib/security/security_connector/security_connector.h index 1a8e7a67b76..2e44b14fe00 100644 --- a/src/core/lib/security/security_connector/security_connector.h +++ b/src/core/lib/security/security_connector/security_connector.h @@ -32,15 +32,15 @@ #include "src/core/handshaker/handshaker.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/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/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" // --- URL schemes. --- 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 b8fd066dab4..0ec65282f0c 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 @@ -37,10 +37,6 @@ #include "src/core/handshaker/handshaker.h" #include "src/core/handshaker/security/security_handshaker.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -55,6 +51,10 @@ #include "src/core/tsi/ssl_transport_security.h" #include "src/core/tsi/transport_security.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/host_port.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" namespace { grpc_error_handle ssl_check_peer( diff --git a/src/core/lib/security/security_connector/ssl/ssl_security_connector.h b/src/core/lib/security/security_connector/ssl/ssl_security_connector.h index 3ce665d587e..5362e7503bc 100644 --- a/src/core/lib/security/security_connector/ssl/ssl_security_connector.h +++ b/src/core/lib/security/security_connector/ssl/ssl_security_connector.h @@ -26,9 +26,9 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/tsi/ssl_transport_security.h" +#include "src/core/util/ref_counted_ptr.h" struct grpc_ssl_config { tsi_ssl_pem_key_cert_pair* pem_key_cert_pair; diff --git a/src/core/lib/security/security_connector/ssl_utils.cc b/src/core/lib/security/security_connector/ssl_utils.cc index a251ccdf86c..e3078062a89 100644 --- a/src/core/lib/security/security_connector/ssl_utils.cc +++ b/src/core/lib/security/security_connector/ssl_utils.cc @@ -43,13 +43,13 @@ #include "src/core/ext/transport/chttp2/alpn/alpn.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/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/lib/security/context/security_context.h" #include "src/core/lib/security/security_connector/load_system_roots.h" #include "src/core/tsi/ssl_transport_security.h" #include "src/core/tsi/transport_security.h" +#include "src/core/util/host_port.h" +#include "src/core/util/load_file.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/useful.h" // -- Constants. -- diff --git a/src/core/lib/security/security_connector/ssl_utils.h b/src/core/lib/security/security_connector/ssl_utils.h index dd37f0e9b98..f60b679c763 100644 --- a/src/core/lib/security/security_connector/ssl_utils.h +++ b/src/core/lib/security/security_connector/ssl_utils.h @@ -35,12 +35,12 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/tsi/ssl/key_logging/ssl_key_logging.h" #include "src/core/tsi/ssl_transport_security.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/ref_counted_ptr.h" // --- Util --- diff --git a/src/core/lib/security/security_connector/tls/tls_security_connector.cc b/src/core/lib/security/security_connector/tls/tls_security_connector.cc index 3707955d4bf..b6c492fe458 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 @@ -38,9 +38,6 @@ #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/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/security/context/security_context.h" @@ -49,6 +46,9 @@ #include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h" #include "src/core/lib/security/security_connector/ssl_utils.h" #include "src/core/tsi/ssl_transport_security.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/host_port.h" +#include "src/core/util/status_helper.h" namespace grpc_core { diff --git a/src/core/lib/security/security_connector/tls/tls_security_connector.h b/src/core/lib/security/security_connector/tls/tls_security_connector.h index 0053a9d46d3..3c4e90436dc 100644 --- a/src/core/lib/security/security_connector/tls/tls_security_connector.h +++ b/src/core/lib/security/security_connector/tls/tls_security_connector.h @@ -34,8 +34,6 @@ #include "src/core/handshaker/handshaker.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -47,6 +45,8 @@ #include "src/core/tsi/ssl/key_logging/ssl_key_logging.h" #include "src/core/tsi/ssl_transport_security.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" using TlsSessionKeyLogger = tsi::TlsSessionKeyLoggerCache::TlsSessionKeyLogger; diff --git a/src/core/lib/security/transport/auth_filters.h b/src/core/lib/security/transport/auth_filters.h index c3421f98876..71834db4403 100644 --- a/src/core/lib/security/transport/auth_filters.h +++ b/src/core/lib/security/transport/auth_filters.h @@ -30,11 +30,11 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/security/transport/client_auth_filter.cc b/src/core/lib/security/transport/client_auth_filter.cc index dcbeeccf149..a5740afcfa2 100644 --- a/src/core/lib/security/transport/client_auth_filter.cc +++ b/src/core/lib/security/transport/client_auth_filter.cc @@ -38,8 +38,6 @@ #include "src/core/lib/channel/channel_stack.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/lib/promise/arena_promise.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/promise.h" @@ -52,6 +50,8 @@ #include "src/core/lib/security/transport/auth_filters.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" #define MAX_CREDENTIALS_METADATA_COUNT 4 diff --git a/src/core/lib/security/transport/server_auth_filter.cc b/src/core/lib/security/transport/server_auth_filter.cc index 5b332aa9875..45e47aaa214 100644 --- a/src/core/lib/security/transport/server_auth_filter.cc +++ b/src/core/lib/security/transport/server_auth_filter.cc @@ -40,9 +40,6 @@ #include "src/core/lib/channel/channel_stack.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/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/activity.h" @@ -58,6 +55,9 @@ #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" namespace grpc_core { diff --git a/src/core/lib/slice/percent_encoding.cc b/src/core/lib/slice/percent_encoding.cc index 0d73ea3c06a..8b51c4d9059 100644 --- a/src/core/lib/slice/percent_encoding.cc +++ b/src/core/lib/slice/percent_encoding.cc @@ -27,7 +27,7 @@ #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 c0143684dfb..a7ff2198d03 100644 --- a/src/core/lib/slice/slice.cc +++ b/src/core/lib/slice/slice.cc @@ -28,9 +28,9 @@ #include #include -#include "src/core/lib/gprpp/memory.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_refcount.h" +#include "src/core/util/memory.h" char* grpc_slice_to_c_string(grpc_slice slice) { char* out = static_cast(gpr_malloc(GRPC_SLICE_LENGTH(slice) + 1)); diff --git a/src/core/lib/slice/slice.h b/src/core/lib/slice/slice.h index 88f9d76bcbc..5b70fa4ee52 100644 --- a/src/core/lib/slice/slice.h +++ b/src/core/lib/slice/slice.h @@ -29,9 +29,9 @@ #include #include -#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_refcount.h" +#include "src/core/util/debug_location.h" #include "src/core/util/string.h" // Herein lies grpc_core::Slice and its team of thin wrappers around grpc_slice. diff --git a/src/core/lib/slice/slice_internal.h b/src/core/lib/slice/slice_internal.h index e0fe8bd7e99..093a77ecfb0 100644 --- a/src/core/lib/slice/slice_internal.h +++ b/src/core/lib/slice/slice_internal.h @@ -31,7 +31,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 71a6e85abe5..c27bb07a8e7 100644 --- a/src/core/lib/slice/slice_refcount.h +++ b/src/core/lib/slice/slice_refcount.h @@ -23,7 +23,7 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/debug_location.h" +#include "src/core/util/debug_location.h" // grpc_slice_refcount : A reference count for grpc_slice. struct grpc_slice_refcount { diff --git a/src/core/lib/surface/call.cc b/src/core/lib/surface/call.cc index f8ee18a9f0c..29c4277d284 100644 --- a/src/core/lib/surface/call.cc +++ b/src/core/lib/surface/call.cc @@ -64,15 +64,6 @@ #include "src/core/lib/compression/compression_internal.h" #include "src/core/lib/event_engine/event_engine_context.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/match.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/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/polling_entity.h" @@ -105,6 +96,15 @@ #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" #include "src/core/util/alloc.h" +#include "src/core/util/bitset.h" +#include "src/core/util/cpp_impl_of.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/match.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/sync.h" #include "src/core/util/time_precise.h" #include "src/core/util/useful.h" diff --git a/src/core/lib/surface/call.h b/src/core/lib/surface/call.h index 99ab4af5c23..8c225b7379d 100644 --- a/src/core/lib/surface/call.h +++ b/src/core/lib/surface/call.h @@ -36,8 +36,6 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" @@ -48,6 +46,8 @@ #include "src/core/lib/surface/channel.h" #include "src/core/lib/transport/transport.h" #include "src/core/server/server_interface.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/core/util/time_precise.h" typedef void (*grpc_ioreq_completion_func)(grpc_call* call, int success, diff --git a/src/core/lib/surface/call_utils.cc b/src/core/lib/surface/call_utils.cc index f5c5f32b84e..18a78fb284e 100644 --- a/src/core/lib/surface/call_utils.cc +++ b/src/core/lib/surface/call_utils.cc @@ -49,9 +49,6 @@ #include #include "src/core/lib/channel/status_util.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/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/context.h" @@ -63,6 +60,9 @@ #include "src/core/lib/surface/validate_metadata.h" #include "src/core/lib/transport/metadata.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/match.h" namespace grpc_core { diff --git a/src/core/lib/surface/call_utils.h b/src/core/lib/surface/call_utils.h index 3d5039ab4cf..de9c928fa74 100644 --- a/src/core/lib/surface/call_utils.h +++ b/src/core/lib/surface/call_utils.h @@ -46,7 +46,6 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/cancel_callback.h" #include "src/core/lib/promise/map.h" @@ -57,6 +56,7 @@ #include "src/core/lib/transport/message.h" #include "src/core/lib/transport/metadata.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/crash.h" namespace grpc_core { diff --git a/src/core/lib/surface/channel.h b/src/core/lib/surface/channel.h index 7976fd00858..fa8ac5468c8 100644 --- a/src/core/lib/surface/channel.h +++ b/src/core/lib/surface/channel.h @@ -33,11 +33,6 @@ #include "src/core/channelz/channelz.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/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/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/resource_quota.h" @@ -46,6 +41,11 @@ #include "src/core/lib/transport/call_arena_allocator.h" #include "src/core/lib/transport/call_destination.h" #include "src/core/lib/transport/connectivity_state.h" +#include "src/core/util/cpp_impl_of.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" // Forward declaration to avoid dependency loop. struct grpc_channel_stack; diff --git a/src/core/lib/surface/channel_init.cc b/src/core/lib/surface/channel_init.cc index eb0744f760e..cebe053e34d 100644 --- a/src/core/lib/surface/channel_init.cc +++ b/src/core/lib/surface/channel_init.cc @@ -37,10 +37,10 @@ #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/unique_type_name.h" #include "src/core/lib/surface/channel_stack_type.h" +#include "src/core/util/crash.h" +#include "src/core/util/sync.h" +#include "src/core/util/unique_type_name.h" namespace grpc_core { diff --git a/src/core/lib/surface/channel_init.h b/src/core/lib/surface/channel_init.h index 435d3cff305..628620228c5 100644 --- a/src/core/lib/surface/channel_init.h +++ b/src/core/lib/surface/channel_init.h @@ -35,11 +35,11 @@ #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/lib/gprpp/unique_type_name.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/call_filters.h" #include "src/core/lib/transport/interception_chain.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/unique_type_name.h" /// This module provides a way for plugins (and the grpc core library itself) /// to register mutators for channel stacks. diff --git a/src/core/lib/surface/client_call.cc b/src/core/lib/surface/client_call.cc index db329e66ffa..05670b2e1bc 100644 --- a/src/core/lib/surface/client_call.cc +++ b/src/core/lib/surface/client_call.cc @@ -45,10 +45,6 @@ #include #include "src/core/lib/event_engine/event_engine_context.h" -#include "src/core/lib/gprpp/bitset.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/promise/all_ok.h" #include "src/core/lib/promise/status_flag.h" #include "src/core/lib/promise/try_seq.h" @@ -58,7 +54,11 @@ #include "src/core/lib/transport/metadata.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/bitset.h" +#include "src/core/util/crash.h" #include "src/core/util/latent_see.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/surface/client_call.h b/src/core/lib/surface/client_call.h index 484be4d13d1..014eafed11d 100644 --- a/src/core/lib/surface/client_call.h +++ b/src/core/lib/surface/client_call.h @@ -42,15 +42,15 @@ #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/lib/gprpp/single_set_ptr.h" #include "src/core/lib/promise/status_flag.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/surface/call.h" #include "src/core/lib/surface/call_utils.h" #include "src/core/lib/transport/metadata.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/single_set_ptr.h" namespace grpc_core { diff --git a/src/core/lib/surface/completion_queue.cc b/src/core/lib/surface/completion_queue.cc index 35e2f295990..9d958defc98 100644 --- a/src/core/lib/surface/completion_queue.cc +++ b/src/core/lib/surface/completion_queue.cc @@ -41,11 +41,6 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/executor.h" @@ -54,7 +49,12 @@ #include "src/core/lib/surface/event_string.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/atomic_utils.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted.h" #include "src/core/util/spinlock.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" #ifdef GPR_WINDOWS #include "src/core/lib/experiments/experiments.h" diff --git a/src/core/lib/surface/completion_queue.h b/src/core/lib/surface/completion_queue.h index 0abf4dc6c47..33dcb5ed5c1 100644 --- a/src/core/lib/surface/completion_queue.h +++ b/src/core/lib/surface/completion_queue.h @@ -26,10 +26,10 @@ #include #include -#include "src/core/lib/gprpp/manual_constructor.h" -#include "src/core/lib/gprpp/mpscq.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" +#include "src/core/util/manual_constructor.h" +#include "src/core/util/mpscq.h" typedef struct grpc_cq_completion { grpc_core::ManualConstructor< diff --git a/src/core/lib/surface/filter_stack_call.cc b/src/core/lib/surface/filter_stack_call.cc index a3a6e3d7b60..707d99a59fa 100644 --- a/src/core/lib/surface/filter_stack_call.cc +++ b/src/core/lib/surface/filter_stack_call.cc @@ -48,11 +48,6 @@ #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/event_engine/event_engine_context.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/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.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" @@ -71,6 +66,11 @@ #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" #include "src/core/util/alloc.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/time_precise.h" namespace grpc_core { diff --git a/src/core/lib/surface/filter_stack_call.h b/src/core/lib/surface/filter_stack_call.h index aa5d739d7ad..b4c304773c9 100644 --- a/src/core/lib/surface/filter_stack_call.h +++ b/src/core/lib/surface/filter_stack_call.h @@ -45,8 +45,6 @@ #include #include "src/core/lib/channel/channel_stack.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/promise/context.h" @@ -60,6 +58,8 @@ #include "src/core/server/server_interface.h" #include "src/core/telemetry/call_tracer.h" #include "src/core/util/alloc.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/surface/init.cc b/src/core/lib/surface/init.cc index 0adcbb39995..637941ccbd3 100644 --- a/src/core/lib/surface/init.cc +++ b/src/core/lib/surface/init.cc @@ -35,9 +35,6 @@ #include "src/core/lib/event_engine/posix_engine/timer_manager.h" #include "src/core/lib/experiments/config.h" #include "src/core/lib/experiments/experiments.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/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/timer_manager.h" @@ -47,6 +44,9 @@ #include "src/core/lib/security/transport/auth_filters.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/surface/init_internally.h" +#include "src/core/util/fork.h" +#include "src/core/util/sync.h" +#include "src/core/util/thd.h" // Remnants of the old plugin system void grpc_resolver_dns_ares_init(void); diff --git a/src/core/lib/surface/lame_client.cc b/src/core/lib/surface/lame_client.cc index 3ac1321b6c7..8acfd80986d 100644 --- a/src/core/lib/surface/lame_client.cc +++ b/src/core/lib/surface/lame_client.cc @@ -35,9 +35,6 @@ #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/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/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/pipe.h" #include "src/core/lib/promise/promise.h" @@ -46,10 +43,13 @@ #include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" #include "src/core/util/useful.h" // Avoid some IWYU confusion: -// 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 c5ff64d2a4d..970c7630c48 100644 --- a/src/core/lib/surface/lame_client.h +++ b/src/core/lib/surface/lame_client.h @@ -31,11 +31,11 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/sync.h" #define GRPC_ARG_LAME_FILTER_ERROR "grpc.lame_filter_error" diff --git a/src/core/lib/surface/legacy_channel.cc b/src/core/lib/surface/legacy_channel.cc index f68a653d843..ba306525f2c 100644 --- a/src/core/lib/surface/legacy_channel.cc +++ b/src/core/lib/surface/legacy_channel.cc @@ -38,11 +38,6 @@ #include "src/core/lib/channel/channel_stack_builder_impl.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/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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -58,6 +53,11 @@ #include "src/core/telemetry/metrics.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/crash.h" +#include "src/core/util/dual_ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/lib/surface/legacy_channel.h b/src/core/lib/surface/legacy_channel.h index ed5938437a5..7ca47a6bb22 100644 --- a/src/core/lib/surface/legacy_channel.h +++ b/src/core/lib/surface/legacy_channel.h @@ -32,8 +32,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" // IWYU pragma: keep -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/surface/channel.h" @@ -41,6 +39,8 @@ #include "src/core/lib/transport/call_arena_allocator.h" #include "src/core/lib/transport/transport.h" #include "src/core/telemetry/stats.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/lib/surface/server_call.cc b/src/core/lib/surface/server_call.cc index 0ac9064bedb..32aadc25da9 100644 --- a/src/core/lib/surface/server_call.cc +++ b/src/core/lib/surface/server_call.cc @@ -40,7 +40,6 @@ #include #include -#include "src/core/lib/gprpp/bitset.h" #include "src/core/lib/promise/all_ok.h" #include "src/core/lib/promise/map.h" #include "src/core/lib/promise/poll.h" @@ -52,6 +51,7 @@ #include "src/core/lib/transport/metadata.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/server/server_interface.h" +#include "src/core/util/bitset.h" namespace grpc_core { diff --git a/src/core/lib/surface/server_call.h b/src/core/lib/surface/server_call.h index 351ef21a35b..b8e4299731b 100644 --- a/src/core/lib/surface/server_call.h +++ b/src/core/lib/surface/server_call.h @@ -45,9 +45,6 @@ #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/lib/promise/poll.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/surface/call.h" @@ -57,6 +54,9 @@ #include "src/core/server/server_interface.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/crash.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/surface/validate_metadata.cc b/src/core/lib/surface/validate_metadata.cc index e3d4f5f9b04..3a68a673c04 100644 --- a/src/core/lib/surface/validate_metadata.cc +++ b/src/core/lib/surface/validate_metadata.cc @@ -24,9 +24,9 @@ #include #include -#include "src/core/lib/gprpp/bitset.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/bitset.h" namespace grpc_core { diff --git a/src/core/lib/transport/bdp_estimator.h b/src/core/lib/transport/bdp_estimator.h index e9fb28cceef..487b04eb35d 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" namespace grpc_core { diff --git a/src/core/lib/transport/call_arena_allocator.h b/src/core/lib/transport/call_arena_allocator.h index 4f63e0ae3ea..d52bdf4ecf7 100644 --- a/src/core/lib/transport/call_arena_allocator.h +++ b/src/core/lib/transport/call_arena_allocator.h @@ -22,9 +22,9 @@ #include -#include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" +#include "src/core/util/ref_counted.h" namespace grpc_core { diff --git a/src/core/lib/transport/call_destination.h b/src/core/lib/transport/call_destination.h index 04d402569c9..5caf299d387 100644 --- a/src/core/lib/transport/call_destination.h +++ b/src/core/lib/transport/call_destination.h @@ -17,8 +17,8 @@ #include -#include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/transport/call_spine.h" +#include "src/core/util/orphanable.h" namespace grpc_core { diff --git a/src/core/lib/transport/call_filters.cc b/src/core/lib/transport/call_filters.cc index 0e378a86d04..f15579db603 100644 --- a/src/core/lib/transport/call_filters.cc +++ b/src/core/lib/transport/call_filters.cc @@ -19,8 +19,8 @@ #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/transport/metadata.h" +#include "src/core/util/crash.h" namespace grpc_core { diff --git a/src/core/lib/transport/call_filters.h b/src/core/lib/transport/call_filters.h index 7f2b0b2f3a6..fb64eb95eca 100644 --- a/src/core/lib/transport/call_filters.h +++ b/src/core/lib/transport/call_filters.h @@ -25,9 +25,6 @@ #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/lib/promise/if.h" #include "src/core/lib/promise/latch.h" #include "src/core/lib/promise/map.h" @@ -39,6 +36,9 @@ #include "src/core/lib/transport/call_state.h" #include "src/core/lib/transport/message.h" #include "src/core/lib/transport/metadata.h" +#include "src/core/util/dump_args.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" // CallFilters tracks a list of filters that are attached to a call. // At a high level, a filter (for the purposes of this module) is a class diff --git a/src/core/lib/transport/call_spine.h b/src/core/lib/transport/call_spine.h index b1051049a43..6e8e20146be 100644 --- a/src/core/lib/transport/call_spine.h +++ b/src/core/lib/transport/call_spine.h @@ -19,7 +19,6 @@ #include -#include "src/core/lib/gprpp/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" @@ -33,6 +32,7 @@ #include "src/core/lib/transport/call_filters.h" #include "src/core/lib/transport/message.h" #include "src/core/lib/transport/metadata.h" +#include "src/core/util/dual_ref_counted.h" namespace grpc_core { diff --git a/src/core/lib/transport/call_state.h b/src/core/lib/transport/call_state.h index 67facf8c007..d741c541f2f 100644 --- a/src/core/lib/transport/call_state.h +++ b/src/core/lib/transport/call_state.h @@ -20,10 +20,10 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/status_flag.h" +#include "src/core/util/crash.h" namespace grpc_core { diff --git a/src/core/lib/transport/connectivity_state.cc b/src/core/lib/transport/connectivity_state.cc index 503ff1f7ea1..9239f34f2be 100644 --- a/src/core/lib/transport/connectivity_state.cc +++ b/src/core/lib/transport/connectivity_state.cc @@ -22,11 +22,11 @@ #include -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/transport/connectivity_state.h b/src/core/lib/transport/connectivity_state.h index b72933ba868..a986c66e9f5 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..4a59efe3deb 100644 --- a/src/core/lib/transport/error_utils.cc +++ b/src/core/lib/transport/error_utils.cc @@ -25,8 +25,8 @@ #include #include -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/transport/status_conversion.h" +#include "src/core/util/status_helper.h" static grpc_error_handle recursively_find_error_with_field( grpc_error_handle error, grpc_core::StatusIntProperty which) { diff --git a/src/core/lib/transport/error_utils.h b/src/core/lib/transport/error_utils.h index f10bfad63b6..9510081d004 100644 --- a/src/core/lib/transport/error_utils.h +++ b/src/core/lib/transport/error_utils.h @@ -26,9 +26,9 @@ #include #include -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/transport/http2_errors.h" +#include "src/core/util/time.h" /// A utility function to get the status code and message to be returned /// to the application. If not set in the top-level message, looks diff --git a/src/core/lib/transport/interception_chain.cc b/src/core/lib/transport/interception_chain.cc index d042f5d1f6c..317c6cfa93a 100644 --- a/src/core/lib/transport/interception_chain.cc +++ b/src/core/lib/transport/interception_chain.cc @@ -18,11 +18,11 @@ #include -#include "src/core/lib/gprpp/match.h" #include "src/core/lib/transport/call_destination.h" #include "src/core/lib/transport/call_filters.h" #include "src/core/lib/transport/call_spine.h" #include "src/core/lib/transport/metadata.h" +#include "src/core/util/match.h" namespace grpc_core { diff --git a/src/core/lib/transport/interception_chain.h b/src/core/lib/transport/interception_chain.h index d3942c6fcfc..82608e3a005 100644 --- a/src/core/lib/transport/interception_chain.h +++ b/src/core/lib/transport/interception_chain.h @@ -20,11 +20,11 @@ #include -#include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/transport/call_destination.h" #include "src/core/lib/transport/call_filters.h" #include "src/core/lib/transport/call_spine.h" #include "src/core/lib/transport/metadata.h" +#include "src/core/util/ref_counted.h" namespace grpc_core { diff --git a/src/core/lib/transport/metadata_batch.h b/src/core/lib/transport/metadata_batch.h index 6ede60d480c..4a2ca21bd27 100644 --- a/src/core/lib/transport/metadata_batch.h +++ b/src/core/lib/transport/metadata_batch.h @@ -40,17 +40,17 @@ #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/lib/promise/poll.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/custom_metadata.h" #include "src/core/lib/transport/metadata_compression_traits.h" #include "src/core/lib/transport/parsed_metadata.h" #include "src/core/lib/transport/simple_slice_based_metadata.h" +#include "src/core/util/chunked_vector.h" +#include "src/core/util/if_list.h" +#include "src/core/util/packed_table.h" +#include "src/core/util/time.h" +#include "src/core/util/type_list.h" namespace grpc_core { diff --git a/src/core/lib/transport/parsed_metadata.h b/src/core/lib/transport/parsed_metadata.h index 26e3264bb4c..1ea9c9a2e4a 100644 --- a/src/core/lib/transport/parsed_metadata.h +++ b/src/core/lib/transport/parsed_metadata.h @@ -32,8 +32,8 @@ #include #include -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/lib/transport/promise_endpoint.cc b/src/core/lib/transport/promise_endpoint.cc index 355cf44333f..90b2e0ce5b8 100644 --- a/src/core/lib/transport/promise_endpoint.cc +++ b/src/core/lib/transport/promise_endpoint.cc @@ -28,8 +28,8 @@ #include #include -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/slice/slice_buffer.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/lib/transport/promise_endpoint.h b/src/core/lib/transport/promise_endpoint.h index 4d810fbc75f..077a1a01f70 100644 --- a/src/core/lib/transport/promise_endpoint.h +++ b/src/core/lib/transport/promise_endpoint.h @@ -38,7 +38,6 @@ #include "src/core/lib/event_engine/extensions/chaotic_good_extension.h" #include "src/core/lib/event_engine/query_extensions.h" -#include "src/core/lib/gprpp/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" @@ -47,6 +46,7 @@ #include "src/core/lib/promise/poll.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_buffer.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/lib/transport/status_conversion.h b/src/core/lib/transport/status_conversion.h index 6691a84d729..713321d4ea4 100644 --- a/src/core/lib/transport/status_conversion.h +++ b/src/core/lib/transport/status_conversion.h @@ -22,8 +22,8 @@ #include #include -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/transport/http2_errors.h" +#include "src/core/util/time.h" // Conversion of grpc status codes to http2 error codes (for RST_STREAM) grpc_http2_error_code grpc_status_to_http2_error(grpc_status_code status); diff --git a/src/core/lib/transport/timeout_encoding.h b/src/core/lib/transport/timeout_encoding.h index 58346c98c6d..9957640a95b 100644 --- a/src/core/lib/transport/timeout_encoding.h +++ b/src/core/lib/transport/timeout_encoding.h @@ -25,8 +25,8 @@ #include -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/lib/transport/transport.cc b/src/core/lib/transport/transport.cc index d5c285aadd7..58d0869cf7e 100644 --- a/src/core/lib/transport/transport.cc +++ b/src/core/lib/transport/transport.cc @@ -32,13 +32,13 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/for_each.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/promise/try_seq.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/util/time.h" void grpc_stream_destroy(grpc_stream_refcount* refcount) { if ((grpc_core::ExecCtx::Get()->flags() & diff --git a/src/core/lib/transport/transport.h b/src/core/lib/transport/transport.h index 4c16314558c..9c34fb1efce 100644 --- a/src/core/lib/transport/transport.h +++ b/src/core/lib/transport/transport.h @@ -40,8 +40,6 @@ #include #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/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" @@ -62,6 +60,8 @@ #include "src/core/lib/transport/metadata.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport_fwd.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" // Minimum and maximum protocol accepted versions. #define GRPC_PROTOCOL_VERSION_MAX_MAJOR 2 diff --git a/src/core/lib/transport/transport_op_string.cc b/src/core/lib/transport/transport_op_string.cc index 40ea5bc2d8a..7141161ed08 100644 --- a/src/core/lib/transport/transport_op_string.cc +++ b/src/core/lib/transport/transport_op_string.cc @@ -25,12 +25,12 @@ #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/lib/slice/slice_buffer.h" #include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/status_helper.h" // These routines are here to facilitate debugging - they produce string // representations of various transport data structures diff --git a/src/core/load_balancing/address_filtering.cc b/src/core/load_balancing/address_filtering.cc index 4077eda12ab..fe9834b170d 100644 --- a/src/core/load_balancing/address_filtering.cc +++ b/src/core/load_balancing/address_filtering.cc @@ -25,8 +25,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/resolved_address.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/load_balancing/address_filtering.h b/src/core/load_balancing/address_filtering.h index 0c03092694e..7b7fda9ac74 100644 --- a/src/core/load_balancing/address_filtering.h +++ b/src/core/load_balancing/address_filtering.h @@ -27,9 +27,9 @@ #include -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_string.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_string.h" // The resolver returns a flat list of addresses. When a hierarchy of // LB policies is in use, each leaf of the hierarchy will need a diff --git a/src/core/load_balancing/child_policy_handler.cc b/src/core/load_balancing/child_policy_handler.cc index 869fb281a39..4ec9127b555 100644 --- a/src/core/load_balancing/child_policy_handler.cc +++ b/src/core/load_balancing/child_policy_handler.cc @@ -30,13 +30,13 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/transport/connectivity_state.h" #include "src/core/load_balancing/delegating_helper.h" #include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/load_balancing/subchannel_interface.h" +#include "src/core/util/debug_location.h" namespace grpc_core { diff --git a/src/core/load_balancing/child_policy_handler.h b/src/core/load_balancing/child_policy_handler.h index 9a964f020cd..79b056a4070 100644 --- a/src/core/load_balancing/child_policy_handler.h +++ b/src/core/load_balancing/child_policy_handler.h @@ -25,9 +25,9 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/load_balancing/lb_policy.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/load_balancing/delegating_helper.h b/src/core/load_balancing/delegating_helper.h index fea9d48e0d7..0852319d8a9 100644 --- a/src/core/load_balancing/delegating_helper.h +++ b/src/core/load_balancing/delegating_helper.h @@ -28,12 +28,12 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/load_balancing/subchannel_interface.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/load_balancing/endpoint_list.cc b/src/core/load_balancing/endpoint_list.cc index 87ef758ab07..7507aadc5b5 100644 --- a/src/core/load_balancing/endpoint_list.cc +++ b/src/core/load_balancing/endpoint_list.cc @@ -34,16 +34,16 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/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/iomgr/pollset_set.h" #include "src/core/load_balancing/delegating_helper.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/load_balancing/pick_first/pick_first.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/load_balancing/endpoint_list.h b/src/core/load_balancing/endpoint_list.h index f6d1851624e..eff8663d7e8 100644 --- a/src/core/load_balancing/endpoint_list.h +++ b/src/core/load_balancing/endpoint_list.h @@ -31,14 +31,14 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/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/lib/iomgr/resolved_address.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/load_balancing/subchannel_interface.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/load_balancing/grpclb/client_load_reporting_filter.cc b/src/core/load_balancing/grpclb/client_load_reporting_filter.cc index bb86bdc1048..40de9f0c2bc 100644 --- a/src/core/load_balancing/grpclb/client_load_reporting_filter.cc +++ b/src/core/load_balancing/grpclb/client_load_reporting_filter.cc @@ -28,7 +28,6 @@ #include #include "src/core/lib/channel/channel_stack.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/map.h" #include "src/core/lib/promise/pipe.h" @@ -36,6 +35,7 @@ #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" #include "src/core/load_balancing/grpclb/grpclb_client_stats.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/load_balancing/grpclb/grpclb.cc b/src/core/load_balancing/grpclb/grpclb.cc index e71ba9913a0..d6e82fbb134 100644 --- a/src/core/load_balancing/grpclb/grpclb.cc +++ b/src/core/load_balancing/grpclb/grpclb.cc @@ -97,20 +97,10 @@ #include "src/core/channelz/channelz.h" #include "src/core/client_channel/client_channel_filter.h" #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/backoff/backoff.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -139,11 +129,21 @@ #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/fake/fake_resolver.h" #include "src/core/resolver/resolver.h" +#include "src/core/util/backoff.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" #include "src/core/util/string.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" +#include "src/core/util/validation_errors.h" +#include "src/core/util/work_serializer.h" #define GRPC_GRPCLB_INITIAL_CONNECT_BACKOFF_SECONDS 1 #define GRPC_GRPCLB_RECONNECT_BACKOFF_MULTIPLIER 1.6 diff --git a/src/core/load_balancing/grpclb/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 cdfa14c88ca..8cda3230ed5 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..ebfdd0c84d6 100644 --- a/src/core/load_balancing/grpclb/load_balancer_api.h +++ b/src/core/load_balancing/grpclb/load_balancer_api.h @@ -28,8 +28,8 @@ #include #include -#include "src/core/lib/gprpp/time.h" #include "src/core/load_balancing/grpclb/grpclb_client_stats.h" +#include "src/core/util/time.h" #define GRPC_GRPCLB_SERVICE_NAME_MAX_LENGTH 128 #define GRPC_GRPCLB_SERVER_IP_ADDRESS_MAX_SIZE 16 diff --git a/src/core/load_balancing/health_check_client.cc b/src/core/load_balancing/health_check_client.cc index 3dd0cefb202..523c1bd342a 100644 --- a/src/core/load_balancing/health_check_client.cc +++ b/src/core/load_balancing/health_check_client.cc @@ -47,11 +47,6 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -61,6 +56,11 @@ #include "src/core/lib/transport/connectivity_state.h" #include "src/core/load_balancing/health_check_client_internal.h" #include "src/core/load_balancing/subchannel_interface.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/work_serializer.h" #include "src/proto/grpc/health/v1/health.upb.h" namespace grpc_core { diff --git a/src/core/load_balancing/health_check_client.h b/src/core/load_balancing/health_check_client.h index 03f42cd1e91..9fe4c1cdf17 100644 --- a/src/core/load_balancing/health_check_client.h +++ b/src/core/load_balancing/health_check_client.h @@ -22,8 +22,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/work_serializer.h" #include "src/core/load_balancing/subchannel_interface.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/load_balancing/health_check_client_internal.h b/src/core/load_balancing/health_check_client_internal.h index 0fc86ac2858..cded2e1df8c 100644 --- a/src/core/load_balancing/health_check_client_internal.h +++ b/src/core/load_balancing/health_check_client_internal.h @@ -34,14 +34,14 @@ #include "src/core/client_channel/subchannel.h" #include "src/core/client_channel/subchannel_interface_internal.h" #include "src/core/client_channel/subchannel_stream_client.h" -#include "src/core/lib/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/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/load_balancing/subchannel_interface.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/unique_type_name.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/load_balancing/lb_policy.h b/src/core/load_balancing/lb_policy.h index 37027c54bdf..bbfd775b028 100644 --- a/src/core/load_balancing/lb_policy.h +++ b/src/core/load_balancing/lb_policy.h @@ -40,19 +40,19 @@ #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/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/load_balancing/backend_metric_data.h" #include "src/core/load_balancing/subchannel_interface.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/telemetry/metrics.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/dual_ref_counted.h" +#include "src/core/util/orphanable.h" +#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" namespace grpc_core { diff --git a/src/core/load_balancing/lb_policy_factory.h b/src/core/load_balancing/lb_policy_factory.h index 697a5321667..d05d356b71d 100644 --- a/src/core/load_balancing/lb_policy_factory.h +++ b/src/core/load_balancing/lb_policy_factory.h @@ -22,10 +22,10 @@ #include -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/util/json/json.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/load_balancing/lb_policy_registry.h b/src/core/load_balancing/lb_policy_registry.h index 44d1e487522..e0587f4856a 100644 --- a/src/core/load_balancing/lb_policy_registry.h +++ b/src/core/load_balancing/lb_policy_registry.h @@ -25,11 +25,11 @@ #include -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/load_balancing/lb_policy_factory.h" #include "src/core/util/json/json.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/load_balancing/oob_backend_metric.cc b/src/core/load_balancing/oob_backend_metric.cc index 1073e743400..87e9528379e 100644 --- a/src/core/load_balancing/oob_backend_metric.cc +++ b/src/core/load_balancing/oob_backend_metric.cc @@ -42,12 +42,6 @@ #include "src/core/client_channel/subchannel.h" #include "src/core/client_channel/subchannel_stream_client.h" #include "src/core/lib/debug/trace.h" -#include "src/core/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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -56,6 +50,12 @@ #include "src/core/lib/slice/slice.h" #include "src/core/load_balancing/backend_metric_parser.h" #include "src/core/load_balancing/oob_backend_metric_internal.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/memory.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/load_balancing/oob_backend_metric.h b/src/core/load_balancing/oob_backend_metric.h index 26ac8b1b12d..1c594d8e93c 100644 --- a/src/core/load_balancing/oob_backend_metric.h +++ b/src/core/load_balancing/oob_backend_metric.h @@ -21,9 +21,9 @@ #include -#include "src/core/lib/gprpp/time.h" #include "src/core/load_balancing/backend_metric_data.h" #include "src/core/load_balancing/subchannel_interface.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/load_balancing/oob_backend_metric_internal.h b/src/core/load_balancing/oob_backend_metric_internal.h index 30f9ac158da..f39e852b01f 100644 --- a/src/core/load_balancing/oob_backend_metric_internal.h +++ b/src/core/load_balancing/oob_backend_metric_internal.h @@ -30,13 +30,13 @@ #include "src/core/client_channel/subchannel.h" #include "src/core/client_channel/subchannel_interface_internal.h" #include "src/core/client_channel/subchannel_stream_client.h" -#include "src/core/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/load_balancing/backend_metric_data.h" #include "src/core/load_balancing/oob_backend_metric.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/unique_type_name.h" namespace grpc_core { diff --git a/src/core/load_balancing/outlier_detection/outlier_detection.cc b/src/core/load_balancing/outlier_detection/outlier_detection.cc index bc5a2a01aa8..aef81b7363d 100644 --- a/src/core/load_balancing/outlier_detection/outlier_detection.cc +++ b/src/core/load_balancing/outlier_detection/outlier_detection.cc @@ -50,14 +50,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/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/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/pollset_set.h" @@ -71,7 +63,15 @@ #include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/load_balancing/subchannel_interface.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/unique_type_name.h" +#include "src/core/util/validation_errors.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/load_balancing/outlier_detection/outlier_detection.h b/src/core/load_balancing/outlier_detection/outlier_detection.h index ba5767914ec..d862941e1fa 100644 --- a/src/core/load_balancing/outlier_detection/outlier_detection.h +++ b/src/core/load_balancing/outlier_detection/outlier_detection.h @@ -23,11 +23,11 @@ #include -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/load_balancing/pick_first/pick_first.cc b/src/core/load_balancing/pick_first/pick_first.cc index 430b150d312..c977a032c5d 100644 --- a/src/core/load_balancing/pick_first/pick_first.cc +++ b/src/core/load_balancing/pick_first/pick_first.cc @@ -46,12 +46,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/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/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/resolved_address.h" @@ -62,10 +56,16 @@ #include "src/core/load_balancing/subchannel_interface.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/telemetry/metrics.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/load_balancing/priority/priority.cc b/src/core/load_balancing/priority/priority.cc index 07f9a529ddb..a747c2ce17f 100644 --- a/src/core/load_balancing/priority/priority.cc +++ b/src/core/load_balancing/priority/priority.cc @@ -42,13 +42,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/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/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/transport/connectivity_state.h" @@ -59,9 +52,16 @@ #include "src/core/load_balancing/lb_policy_factory.h" #include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/ref_counted_string.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/load_balancing/ring_hash/ring_hash.cc b/src/core/load_balancing/ring_hash/ring_hash.cc index da108603a04..5ca33543983 100644 --- a/src/core/load_balancing/ring_hash/ring_hash.cc +++ b/src/core/load_balancing/ring_hash/ring_hash.cc @@ -47,14 +47,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -67,7 +59,15 @@ #include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/load_balancing/pick_first/pick_first.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" +#include "src/core/util/work_serializer.h" +#include "src/core/util/xxhash_inline.h" namespace grpc_core { diff --git a/src/core/load_balancing/ring_hash/ring_hash.h b/src/core/load_balancing/ring_hash/ring_hash.h index c5f6205e170..da7e83b215a 100644 --- a/src/core/load_balancing/ring_hash/ring_hash.h +++ b/src/core/load_balancing/ring_hash/ring_hash.h @@ -21,12 +21,12 @@ #include -#include "src/core/lib/gprpp/unique_type_name.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/service_config/service_config_call_data.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/unique_type_name.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/load_balancing/rls/rls.cc b/src/core/load_balancing/rls/rls.cc index b425a326a8e..a02da17484c 100644 --- a/src/core/load_balancing/rls/rls.cc +++ b/src/core/load_balancing/rls/rls.cc @@ -68,21 +68,9 @@ #include "src/core/channelz/channelz.h" #include "src/core/client_channel/client_channel_filter.h" -#include "src/core/lib/backoff/backoff.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -103,11 +91,23 @@ #include "src/core/resolver/resolver_registry.h" #include "src/core/service_config/service_config_impl.h" #include "src/core/telemetry/metrics.h" +#include "src/core/util/backoff.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/dual_ref_counted.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/match.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #include "src/core/util/upb_utils.h" +#include "src/core/util/uuid_v4.h" +#include "src/core/util/validation_errors.h" +#include "src/core/util/work_serializer.h" #include "src/proto/grpc/lookup/v1/rls.upb.h" using ::grpc_event_engine::experimental::EventEngine; diff --git a/src/core/load_balancing/round_robin/round_robin.cc b/src/core/load_balancing/round_robin/round_robin.cc index 193c5a55821..1d9d5b2e2d9 100644 --- a/src/core/load_balancing/round_robin/round_robin.cc +++ b/src/core/load_balancing/round_robin/round_robin.cc @@ -40,16 +40,16 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/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/lib/transport/connectivity_state.h" #include "src/core/load_balancing/endpoint_list.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/load_balancing/lb_policy_factory.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/load_balancing/subchannel_interface.h b/src/core/load_balancing/subchannel_interface.h index 9d49f30ac26..b2d78fad05f 100644 --- a/src/core/load_balancing/subchannel_interface.h +++ b/src/core/load_balancing/subchannel_interface.h @@ -26,9 +26,9 @@ #include #include -#include "src/core/lib/gprpp/dual_ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/iomgr_fwd.h" +#include "src/core/util/dual_ref_counted.h" +#include "src/core/util/ref_counted_ptr.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 144f1b00888..d1276d417d3 100644 --- a/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc +++ b/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc @@ -48,14 +48,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/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/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/transport/connectivity_state.h" @@ -71,9 +63,17 @@ #include "src/core/telemetry/metrics.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/load_balancing/weighted_target/weighted_target.cc b/src/core/load_balancing/weighted_target/weighted_target.cc index 9724720fc65..8f5075a3409 100644 --- a/src/core/load_balancing/weighted_target/weighted_target.cc +++ b/src/core/load_balancing/weighted_target/weighted_target.cc @@ -45,13 +45,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/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/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/transport/connectivity_state.h" @@ -62,9 +55,16 @@ #include "src/core/load_balancing/lb_policy_factory.h" #include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" +#include "src/core/util/work_serializer.h" // IWYU pragma: no_include diff --git a/src/core/load_balancing/xds/cds.cc b/src/core/load_balancing/xds/cds.cc index 03ee2a00a18..98072442af5 100644 --- a/src/core/load_balancing/xds/cds.cc +++ b/src/core/load_balancing/xds/cds.cc @@ -40,14 +40,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/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/lib/iomgr/pollset_set.h" #include "src/core/load_balancing/address_filtering.h" #include "src/core/load_balancing/delegating_helper.h" @@ -57,10 +49,18 @@ #include "src/core/load_balancing/outlier_detection/outlier_detection.h" #include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/core/resolver/xds/xds_dependency_manager.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/env.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/match.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" +#include "src/core/util/unique_type_name.h" +#include "src/core/util/work_serializer.h" #include "src/core/xds/grpc/xds_cluster.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_health_status.h" diff --git a/src/core/load_balancing/xds/xds_cluster_impl.cc b/src/core/load_balancing/xds/xds_cluster_impl.cc index e66330a21da..66aed1e65d3 100644 --- a/src/core/load_balancing/xds/xds_cluster_impl.cc +++ b/src/core/load_balancing/xds/xds_cluster_impl.cc @@ -41,14 +41,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/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/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/security/credentials/xds/xds_credentials.h" @@ -65,9 +57,17 @@ #include "src/core/resolver/xds/xds_config.h" #include "src/core/resolver/xds/xds_resolver_attributes.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/match.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/ref_counted_string.h" +#include "src/core/util/sync.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_client_grpc.h" #include "src/core/xds/grpc/xds_endpoint.h" diff --git a/src/core/load_balancing/xds/xds_cluster_manager.cc b/src/core/load_balancing/xds/xds_cluster_manager.cc index 5d3dfd9e8bc..4e72ca1170c 100644 --- a/src/core/load_balancing/xds/xds_cluster_manager.cc +++ b/src/core/load_balancing/xds/xds_cluster_manager.cc @@ -41,12 +41,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/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/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/transport/connectivity_state.h" @@ -57,9 +51,15 @@ #include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/xds/xds_resolver_attributes.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/load_balancing/xds/xds_override_host.cc b/src/core/load_balancing/xds/xds_override_host.cc index 62a1632f2ca..1c64eeb0a13 100644 --- a/src/core/load_balancing/xds/xds_override_host.cc +++ b/src/core/load_balancing/xds/xds_override_host.cc @@ -55,14 +55,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -78,9 +70,17 @@ #include "src/core/load_balancing/subchannel_interface.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/xds/xds_config.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/match.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/ref_counted_string.h" +#include "src/core/util/sync.h" +#include "src/core/util/validation_errors.h" +#include "src/core/util/work_serializer.h" #include "src/core/xds/grpc/xds_health_status.h" namespace grpc_core { diff --git a/src/core/load_balancing/xds/xds_override_host.h b/src/core/load_balancing/xds/xds_override_host.h index 226b55dee01..387a5036491 100644 --- a/src/core/load_balancing/xds/xds_override_host.h +++ b/src/core/load_balancing/xds/xds_override_host.h @@ -21,12 +21,12 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/load_balancing/xds/xds_wrr_locality.cc b/src/core/load_balancing/xds/xds_wrr_locality.cc index 7435032ceeb..ce3f3079e22 100644 --- a/src/core/load_balancing/xds/xds_wrr_locality.cc +++ b/src/core/load_balancing/xds/xds_wrr_locality.cc @@ -34,11 +34,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/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/lib/iomgr/pollset_set.h" #include "src/core/load_balancing/delegating_helper.h" #include "src/core/load_balancing/lb_policy.h" @@ -46,10 +41,15 @@ #include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/ref_counted_string.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/xds_client/xds_client_stats.h" namespace grpc_core { diff --git a/src/core/resolver/binder/binder_resolver.cc b/src/core/resolver/binder/binder_resolver.cc index f8da4cfd5ed..30f7e46cc19 100644 --- a/src/core/resolver/binder/binder_resolver.cc +++ b/src/core/resolver/binder/binder_resolver.cc @@ -18,8 +18,8 @@ #include -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/port.h" // IWYU pragma: keep +#include "src/core/util/status_helper.h" #ifdef GRPC_HAVE_UNIX_SOCKET @@ -45,13 +45,13 @@ #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/iomgr/error.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/uri.h" namespace grpc_core { namespace { diff --git a/src/core/resolver/dns/c_ares/dns_resolver_ares.cc b/src/core/resolver/dns/c_ares/dns_resolver_ares.cc index dbd8fc34a3e..564fa165d8d 100644 --- a/src/core/resolver/dns/c_ares/dns_resolver_ares.cc +++ b/src/core/resolver/dns/c_ares/dns_resolver_ares.cc @@ -38,22 +38,22 @@ #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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/dns/event_engine/service_config_helper.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" #include "src/core/service_config/service_config.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" #if GRPC_ARES == 1 @@ -61,7 +61,6 @@ #include "absl/strings/str_cat.h" -#include "src/core/lib/backoff/backoff.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" #include "src/core/lib/iomgr/resolve_address.h" @@ -71,6 +70,7 @@ #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/polling_resolver.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/backoff.h" #define GRPC_DNS_INITIAL_CONNECT_BACKOFF_SECONDS 1 #define GRPC_DNS_RECONNECT_BACKOFF_MULTIPLIER 1.6 diff --git a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h index 652921cb668..5a75c6c7431 100644 --- a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h +++ b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h @@ -27,11 +27,11 @@ #include -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc index ce54f647f15..634ab525e84 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 @@ -39,7 +39,6 @@ #include "absl/log/check.h" #include "absl/strings/str_cat.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/ev_posix.h" @@ -47,6 +46,7 @@ #include "src/core/lib/iomgr/socket_utils_posix.h" #include "src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h" #include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc index 9b9a79b3206..d7757fb9fc4 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 @@ -38,8 +38,6 @@ #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/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/sockaddr_windows.h" #include "src/core/lib/iomgr/socket_windows.h" @@ -48,6 +46,8 @@ #include "src/core/lib/slice/slice_internal.h" #include "src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h" #include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h" +#include "src/core/util/crash.h" +#include "src/core/util/memory.h" #include "src/core/util/string.h" // TODO(apolcyn): remove this hack after fixing upstream. diff --git a/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc b/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc index be2116994bb..e0efc6075b6 100644 --- a/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc +++ b/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc @@ -24,8 +24,8 @@ #include #include -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/sockaddr.h" +#include "src/core/util/status_helper.h" // IWYU pragma: no_include // IWYU pragma: no_include @@ -60,9 +60,6 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/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 @@ -70,7 +67,10 @@ #include "src/core/lib/iomgr/timer.h" #include "src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h" #include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/host_port.h" #include "src/core/util/string.h" +#include "src/core/util/time.h" using grpc_core::EndpointAddresses; using grpc_core::EndpointAddressesList; diff --git a/src/core/resolver/dns/c_ares/grpc_ares_wrapper.h b/src/core/resolver/dns/c_ares/grpc_ares_wrapper.h index bd4fbe2720f..5ed2f9cc51e 100644 --- a/src/core/resolver/dns/c_ares/grpc_ares_wrapper.h +++ b/src/core/resolver/dns/c_ares/grpc_ares_wrapper.h @@ -31,11 +31,11 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/sync.h" #define GRPC_DNS_ARES_DEFAULT_QUERY_TIMEOUT_MS 120000 diff --git a/src/core/resolver/dns/dns_resolver_plugin.cc b/src/core/resolver/dns/dns_resolver_plugin.cc index 0a3c78488ed..7e9870543b2 100644 --- a/src/core/resolver/dns/dns_resolver_plugin.cc +++ b/src/core/resolver/dns/dns_resolver_plugin.cc @@ -22,11 +22,11 @@ #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/resolver/dns/c_ares/dns_resolver_ares.h" #include "src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h" #include "src/core/resolver/dns/native/dns_resolver.h" #include "src/core/resolver/resolver_factory.h" +#include "src/core/util/crash.h" namespace grpc_core { diff --git a/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc b/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc index 3efb937523d..c65b1d506fb 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 @@ -38,15 +38,9 @@ #include #include -#include "src/core/lib/backoff/backoff.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/resolved_address_internal.h" -#include "src/core/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/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/load_balancing/grpclb/grpclb_balancer_addresses.h" @@ -57,6 +51,12 @@ #include "src/core/resolver/resolver_factory.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/backoff.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" // IWYU pragma: no_include diff --git a/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h b/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h index 65a21e4a02f..555e91fedef 100644 --- a/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h +++ b/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h @@ -17,10 +17,10 @@ #include -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/uri.h" namespace grpc_core { diff --git a/src/core/resolver/dns/event_engine/service_config_helper.cc b/src/core/resolver/dns/event_engine/service_config_helper.cc index 92cea5ec517..ba0b910e327 100644 --- a/src/core/resolver/dns/event_engine/service_config_helper.cc +++ b/src/core/resolver/dns/event_engine/service_config_helper.cc @@ -23,13 +23,13 @@ #include -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/iomgr/gethostname.h" +#include "src/core/util/gethostname.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/status_helper.h" namespace grpc_core { diff --git a/src/core/resolver/dns/native/dns_resolver.cc b/src/core/resolver/dns/native/dns_resolver.cc index 1a3ca55f9b0..8ee4b549f65 100644 --- a/src/core/resolver/dns/native/dns_resolver.cc +++ b/src/core/resolver/dns/native/dns_resolver.cc @@ -31,21 +31,21 @@ #include #include -#include "src/core/lib/backoff/backoff.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/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/iomgr/resolve_address.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/polling_resolver.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" +#include "src/core/util/backoff.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" #define GRPC_DNS_INITIAL_CONNECT_BACKOFF_SECONDS 1 #define GRPC_DNS_RECONNECT_BACKOFF_MULTIPLIER 1.6 diff --git a/src/core/resolver/fake/fake_resolver.cc b/src/core/resolver/fake/fake_resolver.cc index b1659f84bf4..b2bbaf26193 100644 --- a/src/core/resolver/fake/fake_resolver.cc +++ b/src/core/resolver/fake/fake_resolver.cc @@ -30,12 +30,12 @@ #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/lib/uri/uri_parser.h" #include "src/core/resolver/resolver_factory.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/uri.h" #include "src/core/util/useful.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/resolver/fake/fake_resolver.h b/src/core/resolver/fake/fake_resolver.h index 75dc3ab0ca4..5126c741577 100644 --- a/src/core/resolver/fake/fake_resolver.h +++ b/src/core/resolver/fake/fake_resolver.h @@ -27,11 +27,11 @@ #include #include -#include "src/core/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/resolver/resolver.h" +#include "src/core/util/notification.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" #include "src/core/util/useful.h" #define GRPC_ARG_FAKE_RESOLVER_RESPONSE_GENERATOR \ diff --git a/src/core/resolver/google_c2p/google_c2p_resolver.cc b/src/core/resolver/google_c2p/google_c2p_resolver.cc index 79252738417..42e309f900c 100644 --- a/src/core/resolver/google_c2p/google_c2p_resolver.cc +++ b/src/core/resolver/google_c2p/google_c2p_resolver.cc @@ -34,22 +34,22 @@ #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/lib/iomgr/polling_entity.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" #include "src/core/resolver/resolver_registry.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/env.h" #include "src/core/util/gcp_metadata_query.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" +#include "src/core/util/work_serializer.h" #include "src/core/xds/grpc/xds_client_grpc.h" #include "src/core/xds/xds_client/xds_bootstrap.h" diff --git a/src/core/resolver/polling_resolver.cc b/src/core/resolver/polling_resolver.cc index ec1af270599..27806f1e5a9 100644 --- a/src/core/resolver/polling_resolver.cc +++ b/src/core/resolver/polling_resolver.cc @@ -32,15 +32,15 @@ #include -#include "src/core/lib/backoff/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/lib/iomgr/exec_ctx.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/service_config/service_config.h" +#include "src/core/util/backoff.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/uri.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/resolver/polling_resolver.h b/src/core/resolver/polling_resolver.h index 53b0270ec07..fe405c3f1d4 100644 --- a/src/core/resolver/polling_resolver.h +++ b/src/core/resolver/polling_resolver.h @@ -26,15 +26,15 @@ #include #include -#include "src/core/lib/backoff/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/lib/iomgr/iomgr_fwd.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" +#include "src/core/util/backoff.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/time.h" +#include "src/core/util/work_serializer.h" namespace grpc_core { diff --git a/src/core/resolver/resolver.h b/src/core/resolver/resolver.h index 6b6e92c6660..389096c3d8f 100644 --- a/src/core/resolver/resolver.h +++ b/src/core/resolver/resolver.h @@ -27,11 +27,11 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/server_address.h" // IWYU pragma: keep #include "src/core/service_config/service_config.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/resolver/resolver_factory.h b/src/core/resolver/resolver_factory.h index e4cc5347386..831b67c5cfc 100644 --- a/src/core/resolver/resolver_factory.h +++ b/src/core/resolver/resolver_factory.h @@ -26,10 +26,10 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/iomgr/iomgr_fwd.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/resolver.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/uri.h" namespace grpc_core { diff --git a/src/core/resolver/resolver_registry.h b/src/core/resolver/resolver_registry.h index cb8512d7e53..5e1d87fbf6b 100644 --- a/src/core/resolver/resolver_registry.h +++ b/src/core/resolver/resolver_registry.h @@ -27,11 +27,11 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/iomgr/iomgr_fwd.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/uri.h" namespace grpc_core { diff --git a/src/core/resolver/sockaddr/sockaddr_resolver.cc b/src/core/resolver/sockaddr/sockaddr_resolver.cc index 26e3fa2eed4..1cd1ac310cf 100644 --- a/src/core/resolver/sockaddr/sockaddr_resolver.cc +++ b/src/core/resolver/sockaddr/sockaddr_resolver.cc @@ -29,13 +29,13 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/uri.h" namespace grpc_core { diff --git a/src/core/resolver/xds/xds_config.cc b/src/core/resolver/xds/xds_config.cc index 1fcb2aa81c7..70158b1c365 100644 --- a/src/core/resolver/xds/xds_config.cc +++ b/src/core/resolver/xds/xds_config.cc @@ -24,7 +24,7 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" -#include "src/core/lib/gprpp/match.h" +#include "src/core/util/match.h" namespace grpc_core { diff --git a/src/core/resolver/xds/xds_config.h b/src/core/resolver/xds/xds_config.h index 9c328a20578..784db2fc487 100644 --- a/src/core/resolver/xds/xds_config.h +++ b/src/core/resolver/xds/xds_config.h @@ -27,7 +27,7 @@ #include "absl/strings/string_view.h" #include "absl/types/variant.h" -#include "src/core/lib/gprpp/ref_counted.h" +#include "src/core/util/ref_counted.h" #include "src/core/xds/grpc/xds_cluster.h" #include "src/core/xds/grpc/xds_endpoint.h" #include "src/core/xds/grpc/xds_listener.h" diff --git a/src/core/resolver/xds/xds_dependency_manager.cc b/src/core/resolver/xds/xds_dependency_manager.cc index 293586f40f5..3ed9fa1da92 100644 --- a/src/core/resolver/xds/xds_dependency_manager.cc +++ b/src/core/resolver/xds/xds_dependency_manager.cc @@ -22,12 +22,10 @@ #include "absl/log/log.h" #include "absl/strings/str_join.h" -#include - #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/match.h" #include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/core/resolver/fake/fake_resolver.h" +#include "src/core/util/match.h" #include "src/core/xds/grpc/xds_cluster_parser.h" #include "src/core/xds/grpc/xds_endpoint_parser.h" #include "src/core/xds/grpc/xds_listener_parser.h" diff --git a/src/core/resolver/xds/xds_dependency_manager.h b/src/core/resolver/xds/xds_dependency_manager.h index b2b62ddf222..dcb1738b4f1 100644 --- a/src/core/resolver/xds/xds_dependency_manager.h +++ b/src/core/resolver/xds/xds_dependency_manager.h @@ -21,9 +21,9 @@ #include "absl/container/flat_hash_set.h" #include "absl/strings/string_view.h" -#include "src/core/lib/gprpp/ref_counted.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/xds/xds_config.h" +#include "src/core/util/ref_counted.h" #include "src/core/xds/grpc/xds_client_grpc.h" #include "src/core/xds/grpc/xds_cluster.h" #include "src/core/xds/grpc/xds_endpoint.h" diff --git a/src/core/resolver/xds/xds_resolver.cc b/src/core/resolver/xds/xds_resolver.cc index 9013474cca7..833468a7b29 100644 --- a/src/core/resolver/xds/xds_resolver.cc +++ b/src/core/resolver/xds/xds_resolver.cc @@ -58,15 +58,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/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/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/promise/arena_promise.h" @@ -75,7 +66,6 @@ #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/load_balancing/ring_hash/ring_hash.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/resolver.h" @@ -84,6 +74,16 @@ #include "src/core/resolver/xds/xds_resolver_attributes.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/dual_ref_counted.h" +#include "src/core/util/match.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" +#include "src/core/util/work_serializer.h" +#include "src/core/util/xxhash_inline.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_client_grpc.h" #include "src/core/xds/grpc/xds_http_filter.h" diff --git a/src/core/resolver/xds/xds_resolver_attributes.h b/src/core/resolver/xds/xds_resolver_attributes.h index 385505a732d..63f2684f2a1 100644 --- a/src/core/resolver/xds/xds_resolver_attributes.h +++ b/src/core/resolver/xds/xds_resolver_attributes.h @@ -21,8 +21,8 @@ #include -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/service_config/service_config_call_data.h" +#include "src/core/util/unique_type_name.h" #include "src/core/xds/grpc/xds_route_config.h" namespace grpc_core { diff --git a/src/core/server/server.cc b/src/core/server/server.cc index c957fac6ae2..573cd66b224 100644 --- a/src/core/server/server.cc +++ b/src/core/server/server.cc @@ -52,11 +52,6 @@ #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/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/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/promise/activity.h" @@ -82,6 +77,11 @@ #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/transport/interception_chain.h" #include "src/core/telemetry/stats.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/mpscq.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/status_helper.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/server/server.h b/src/core/server/server.h index 974fbea5814..4bd2273eac3 100644 --- a/src/core/server/server.h +++ b/src/core/server/server.h @@ -46,17 +46,10 @@ #include #include "src/core/channelz/channelz.h" -#include "src/core/lib/backoff/random_early_detection.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/debug/trace.h" -#include "src/core/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/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" @@ -70,6 +63,13 @@ #include "src/core/lib/transport/transport.h" #include "src/core/server/server_interface.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/cpp_impl_of.h" +#include "src/core/util/dual_ref_counted.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/random_early_detection.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #define GRPC_ARG_SERVER_MAX_PENDING_REQUESTS "grpc.server.max_pending_requests" #define GRPC_ARG_SERVER_MAX_PENDING_REQUESTS_HARD_LIMIT \ diff --git a/src/core/server/server_config_selector.h b/src/core/server/server_config_selector.h index c6274f49f35..4d766419809 100644 --- a/src/core/server/server_config_selector.h +++ b/src/core/server/server_config_selector.h @@ -24,12 +24,12 @@ #include -#include "src/core/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/transport/metadata_batch.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_parser.h" +#include "src/core/util/dual_ref_counted.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/server/server_config_selector_filter.cc b/src/core/server/server_config_selector_filter.cc index 3773eeb3b78..b17ea44930a 100644 --- a/src/core/server/server_config_selector_filter.cc +++ b/src/core/server/server_config_selector_filter.cc @@ -29,9 +29,6 @@ #include "src/core/lib/channel/channel_args.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/lib/promise/arena_promise.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/promise.h" @@ -41,6 +38,9 @@ #include "src/core/server/server_config_selector.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_call_data.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/sync.h" namespace grpc_core { diff --git a/src/core/server/xds_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 433f399680a..f8b523a293e 100644 --- a/src/core/server/xds_server_config_fetcher.cc +++ b/src/core/server/xds_server_config_fetcher.cc @@ -54,12 +54,6 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/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/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr_fwd.h" @@ -71,13 +65,19 @@ #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" #include "src/core/lib/security/credentials/xds/xds_credentials.h" #include "src/core/lib/transport/metadata_batch.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/server/server.h" #include "src/core/server/server_config_selector.h" #include "src/core/server/server_config_selector_filter.h" #include "src/core/server/xds_channel_stack_modifier.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/host_port.h" +#include "src/core/util/match.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/unique_type_name.h" +#include "src/core/util/uri.h" #include "src/core/xds/grpc/certificate_provider_store.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_certificate_provider.h" diff --git a/src/core/service_config/service_config.h b/src/core/service_config/service_config.h index ba5fa8262ae..f9c43c35011 100644 --- a/src/core/service_config/service_config.h +++ b/src/core/service_config/service_config.h @@ -24,8 +24,8 @@ #include #include -#include "src/core/lib/gprpp/ref_counted.h" #include "src/core/service_config/service_config_parser.h" +#include "src/core/util/ref_counted.h" #include "src/core/util/useful.h" // The main purpose of the code here is to parse the service config in diff --git a/src/core/service_config/service_config_call_data.h b/src/core/service_config/service_config_call_data.h index 6d11caedab0..7c6bbcd2e39 100644 --- a/src/core/service_config/service_config_call_data.h +++ b/src/core/service_config/service_config_call_data.h @@ -24,13 +24,13 @@ #include -#include "src/core/lib/gprpp/chunked_vector.h" -#include "src/core/lib/gprpp/down_cast.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_parser.h" +#include "src/core/util/chunked_vector.h" +#include "src/core/util/down_cast.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" namespace grpc_core { diff --git a/src/core/service_config/service_config_channel_arg_filter.cc b/src/core/service_config/service_config_channel_arg_filter.cc index 063ecbd987a..54b1ae0d411 100644 --- a/src/core/service_config/service_config_channel_arg_filter.cc +++ b/src/core/service_config/service_config_channel_arg_filter.cc @@ -36,7 +36,6 @@ #include "src/core/lib/channel/channel_stack.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/lib/promise/arena_promise.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/resource_quota/arena.h" @@ -47,6 +46,7 @@ #include "src/core/service_config/service_config_call_data.h" #include "src/core/service_config/service_config_impl.h" #include "src/core/service_config/service_config_parser.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/service_config/service_config_impl.cc b/src/core/service_config/service_config_impl.cc index 034e635690b..a52442e09ec 100644 --- a/src/core/service_config/service_config_impl.cc +++ b/src/core/service_config/service_config_impl.cc @@ -29,8 +29,6 @@ #include #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/service_config/service_config_parser.h" @@ -39,6 +37,8 @@ #include "src/core/util/json/json_object_loader.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/memory.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/service_config/service_config_impl.h b/src/core/service_config/service_config_impl.h index a36a803abf3..ca1d3d17dfb 100644 --- a/src/core/service_config/service_config_impl.h +++ b/src/core/service_config/service_config_impl.h @@ -32,12 +32,12 @@ #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/lib/slice/slice_internal.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_parser.h" #include "src/core/util/json/json.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/validation_errors.h" // The main purpose of the code here is to parse the service config in // JSON form, which will look like this: diff --git a/src/core/service_config/service_config_parser.h b/src/core/service_config/service_config_parser.h index 9b7983a7680..caac10a4bc8 100644 --- a/src/core/service_config/service_config_parser.h +++ b/src/core/service_config/service_config_parser.h @@ -29,8 +29,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/util/json/json.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/telemetry/call_tracer.h b/src/core/telemetry/call_tracer.h index d822768d7e6..ab9185e2373 100644 --- a/src/core/telemetry/call_tracer.h +++ b/src/core/telemetry/call_tracer.h @@ -30,7 +30,6 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/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" @@ -38,6 +37,7 @@ #include "src/core/lib/transport/call_final_info.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/telemetry/tcp_tracer.h" +#include "src/core/util/ref_counted_string.h" namespace grpc_core { diff --git a/src/core/telemetry/metrics.cc b/src/core/telemetry/metrics.cc index adf5393942f..45e2ab64bfc 100644 --- a/src/core/telemetry/metrics.cc +++ b/src/core/telemetry/metrics.cc @@ -21,7 +21,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 2f60ff541dc..b61e30d1fef 100644 --- a/src/core/telemetry/metrics.h +++ b/src/core/telemetry/metrics.h @@ -29,11 +29,11 @@ #include #include "src/core/lib/channel/channel_args.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/lib/slice/slice.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/telemetry/stats.h b/src/core/telemetry/stats.h index b1026abbb28..8d783dea5d7 100644 --- a/src/core/telemetry/stats.h +++ b/src/core/telemetry/stats.h @@ -29,9 +29,9 @@ #include -#include "src/core/lib/gprpp/no_destruct.h" #include "src/core/telemetry/histogram_view.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/no_destruct.h" namespace grpc_core { diff --git a/src/core/telemetry/stats_data.h b/src/core/telemetry/stats_data.h index 89f360e2686..d0e7e5fd267 100644 --- a/src/core/telemetry/stats_data.h +++ b/src/core/telemetry/stats_data.h @@ -26,8 +26,8 @@ #include -#include "src/core/lib/gprpp/per_cpu.h" #include "src/core/telemetry/histogram_view.h" +#include "src/core/util/per_cpu.h" namespace grpc_core { class HistogramCollector_100000_20; diff --git a/src/core/tsi/alts/frame_protector/alts_frame_protector.cc b/src/core/tsi/alts/frame_protector/alts_frame_protector.cc index 09415c413d6..ee88688e4bb 100644 --- a/src/core/tsi/alts/frame_protector/alts_frame_protector.cc +++ b/src/core/tsi/alts/frame_protector/alts_frame_protector.cc @@ -30,11 +30,11 @@ #include #include -#include "src/core/lib/gprpp/memory.h" #include "src/core/tsi/alts/crypt/gsec.h" #include "src/core/tsi/alts/frame_protector/alts_crypter.h" #include "src/core/tsi/alts/frame_protector/frame_handler.h" #include "src/core/tsi/transport_security.h" +#include "src/core/util/memory.h" constexpr size_t kMinFrameLength = 1024; constexpr size_t kDefaultFrameLength = 16 * 1024; diff --git a/src/core/tsi/alts/frame_protector/frame_handler.cc b/src/core/tsi/alts/frame_protector/frame_handler.cc index be0d227759b..a4e86f97998 100644 --- a/src/core/tsi/alts/frame_protector/frame_handler.cc +++ b/src/core/tsi/alts/frame_protector/frame_handler.cc @@ -29,8 +29,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 5f402f8c8eb..f5513e574d4 100644 --- a/src/core/tsi/alts/handshaker/alts_handshaker_client.cc +++ b/src/core/tsi/alts/handshaker/alts_handshaker_client.cc @@ -29,15 +29,15 @@ #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/lib/slice/slice_internal.h" #include "src/core/lib/surface/call.h" #include "src/core/lib/surface/channel.h" #include "src/core/tsi/alts/handshaker/alts_shared_resource.h" #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h" #include "src/core/tsi/alts/handshaker/alts_tsi_utils.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" +#include "src/core/util/sync.h" #define TSI_ALTS_INITIAL_BUFFER_SIZE 256 diff --git a/src/core/tsi/alts/handshaker/alts_shared_resource.cc b/src/core/tsi/alts/handshaker/alts_shared_resource.cc index 8407ee7cac3..06d4e5e1936 100644 --- a/src/core/tsi/alts/handshaker/alts_shared_resource.cc +++ b/src/core/tsi/alts/handshaker/alts_shared_resource.cc @@ -23,8 +23,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/tsi/alts/handshaker/alts_handshaker_client.h" +#include "src/core/util/crash.h" static alts_shared_resource_dedicated g_alts_resource_dedicated; diff --git a/src/core/tsi/alts/handshaker/alts_shared_resource.h b/src/core/tsi/alts/handshaker/alts_shared_resource.h index 43265edfbfd..11d6b606578 100644 --- a/src/core/tsi/alts/handshaker/alts_shared_resource.h +++ b/src/core/tsi/alts/handshaker/alts_shared_resource.h @@ -23,9 +23,9 @@ #include #include -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/surface/completion_queue.h" +#include "src/core/util/thd.h" /// /// Main struct containing ALTS shared resources used when diff --git a/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc b/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc index 16d86e27856..79b497bda7e 100644 --- a/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc +++ b/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc @@ -34,8 +34,6 @@ #include #include -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/channel.h" @@ -43,6 +41,8 @@ #include "src/core/tsi/alts/handshaker/alts_handshaker_client.h" #include "src/core/tsi/alts/handshaker/alts_shared_resource.h" #include "src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h" +#include "src/core/util/memory.h" +#include "src/core/util/sync.h" // Main struct for ALTS TSI handshaker. struct alts_tsi_handshaker { diff --git a/src/core/tsi/alts/handshaker/transport_security_common_api.h b/src/core/tsi/alts/handshaker/transport_security_common_api.h index 81819c09e76..b59142aa68a 100644 --- a/src/core/tsi/alts/handshaker/transport_security_common_api.h +++ b/src/core/tsi/alts/handshaker/transport_security_common_api.h @@ -24,7 +24,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 c520f942683..89c5dcfaa6f 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 @@ -26,11 +26,11 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h" #include "src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h" +#include "src/core/util/crash.h" // Main struct for alts_grpc_integrity_only_record_protocol. typedef struct alts_grpc_integrity_only_record_protocol { diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc index c919522e4a1..2a568cd446e 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 @@ -23,11 +23,11 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h" #include "src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h" +#include "src/core/util/crash.h" // Privacy-integrity alts_grpc_record_protocol object uses the same struct // defined in alts_grpc_record_protocol_common.h. diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc index d8d7106bb71..d4e77898e35 100644 --- a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc +++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc @@ -26,9 +26,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" const size_t kInitialIovecBufferSize = 8; diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc b/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc index 2ae8bb534da..908ed2934fd 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 @@ -24,8 +24,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/tsi/alts/frame_protector/alts_counter.h" +#include "src/core/util/crash.h" struct alts_iovec_record_protocol { alts_counter* ctr; diff --git a/src/core/tsi/fake_transport_security.cc b/src/core/tsi/fake_transport_security.cc index 83af8b25c69..e01dce2c687 100644 --- a/src/core/tsi/fake_transport_security.cc +++ b/src/core/tsi/fake_transport_security.cc @@ -27,12 +27,11 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/dump_args.h" -#include "src/core/lib/gprpp/memory.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/tsi/transport_security_grpc.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/crash.h" +#include "src/core/util/memory.h" // --- Constants. --- #define TSI_FAKE_FRAME_HEADER_SIZE 4 diff --git a/src/core/tsi/local_transport_security.cc b/src/core/tsi/local_transport_security.cc index 30a2ef7f670..bb25a25db41 100644 --- a/src/core/tsi/local_transport_security.cc +++ b/src/core/tsi/local_transport_security.cc @@ -28,9 +28,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/tsi/transport_security_grpc.h" +#include "src/core/util/crash.h" namespace { diff --git a/src/core/tsi/ssl/key_logging/ssl_key_logging.cc b/src/core/tsi/ssl/key_logging/ssl_key_logging.cc index 4782dafb443..510a55bfc27 100644 --- a/src/core/tsi/ssl/key_logging/ssl_key_logging.cc +++ b/src/core/tsi/ssl/key_logging/ssl_key_logging.cc @@ -21,10 +21,10 @@ #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" +#include "src/core/util/sync.h" using TlsSessionKeyLogger = tsi::TlsSessionKeyLoggerCache::TlsSessionKeyLogger; diff --git a/src/core/tsi/ssl/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 d6c5d556b9c..7c27f36e2ab 100644 --- a/src/core/tsi/ssl/session_cache/ssl_session_cache.cc +++ b/src/core/tsi/ssl/session_cache/ssl_session_cache.cc @@ -24,10 +24,10 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/tsi/ssl/session_cache/ssl_session.h" +#include "src/core/util/crash.h" +#include "src/core/util/sync.h" namespace tsi { diff --git a/src/core/tsi/ssl/session_cache/ssl_session_cache.h b/src/core/tsi/ssl/session_cache/ssl_session_cache.h index 881a69cf006..024262c9c90 100644 --- a/src/core/tsi/ssl/session_cache/ssl_session_cache.h +++ b/src/core/tsi/ssl/session_cache/ssl_session_cache.h @@ -28,11 +28,11 @@ #include #include -#include "src/core/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/tsi/ssl/session_cache/ssl_session.h" +#include "src/core/util/cpp_impl_of.h" +#include "src/core/util/memory.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/sync.h" /// 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..ad78488415b 100644 --- a/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc +++ b/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc @@ -19,8 +19,8 @@ #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/tsi/ssl/session_cache/ssl_session.h" +#include "src/core/util/crash.h" #ifndef OPENSSL_IS_BORINGSSL diff --git a/src/core/tsi/ssl_transport_security.cc b/src/core/tsi/ssl_transport_security.cc index 3149eb283fe..8012dc8459c 100644 --- a/src/core/tsi/ssl_transport_security.cc +++ b/src/core/tsi/ssl_transport_security.cc @@ -60,13 +60,13 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h" #include "src/core/tsi/ssl/key_logging/ssl_key_logging.h" #include "src/core/tsi/ssl/session_cache/ssl_session_cache.h" #include "src/core/tsi/ssl_transport_security_utils.h" #include "src/core/tsi/ssl_types.h" #include "src/core/tsi/transport_security.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" // --- Constants. --- diff --git a/src/core/util/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 6afba483d4c..b89d49ff102 100644 --- a/src/core/util/alloc.cc +++ b/src/core/util/alloc.cc @@ -25,7 +25,7 @@ #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/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..bdf647159aa 100644 --- a/src/core/lib/gprpp/atomic_utils.h +++ b/src/core/util/atomic_utils.h @@ -16,13 +16,13 @@ // // -#ifndef GRPC_SRC_CORE_LIB_GPRPP_ATOMIC_UTILS_H -#define GRPC_SRC_CORE_LIB_GPRPP_ATOMIC_UTILS_H - -#include +#ifndef GRPC_SRC_CORE_UTIL_ATOMIC_UTILS_H +#define GRPC_SRC_CORE_UTIL_ATOMIC_UTILS_H #include +#include + namespace grpc_core { // Atomically increment a counter only if the counter value is not zero. @@ -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/lib/avl/avl.h b/src/core/util/avl.h similarity index 97% rename from src/core/lib/avl/avl.h rename to src/core/util/avl.h index 928db42ac93..23a510e949f 100644 --- a/src/core/lib/avl/avl.h +++ b/src/core/util/avl.h @@ -12,8 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_AVL_AVL_H -#define GRPC_SRC_CORE_LIB_AVL_AVL_H +#ifndef GRPC_SRC_CORE_UTIL_AVL_H +#define GRPC_SRC_CORE_UTIL_AVL_H + +#include #include @@ -21,10 +23,8 @@ #include #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 { @@ -322,4 +322,4 @@ class AVL { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_AVL_AVL_H +#endif // GRPC_SRC_CORE_UTIL_AVL_H diff --git a/src/core/lib/backoff/backoff.cc b/src/core/util/backoff.cc similarity index 94% rename from src/core/lib/backoff/backoff.cc rename to src/core/util/backoff.cc index b4a520d13d1..edae00cf3c8 100644 --- a/src/core/lib/backoff/backoff.cc +++ b/src/core/util/backoff.cc @@ -16,7 +16,9 @@ // // -#include "src/core/lib/backoff/backoff.h" +#include + +#include "src/core/util/backoff.h" #include diff --git a/src/core/lib/backoff/backoff.h b/src/core/util/backoff.h similarity index 93% rename from src/core/lib/backoff/backoff.h rename to src/core/util/backoff.h index 75e87d3d445..34860793647 100644 --- a/src/core/lib/backoff/backoff.h +++ b/src/core/util/backoff.h @@ -16,12 +16,12 @@ // // -#ifndef GRPC_SRC_CORE_LIB_BACKOFF_BACKOFF_H -#define GRPC_SRC_CORE_LIB_BACKOFF_BACKOFF_H +#ifndef GRPC_SRC_CORE_UTIL_BACKOFF_H +#define GRPC_SRC_CORE_UTIL_BACKOFF_H #include "absl/random/random.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" namespace grpc_core { @@ -84,4 +84,4 @@ class BackOff { }; } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_BACKOFF_BACKOFF_H +#endif // GRPC_SRC_CORE_UTIL_BACKOFF_H 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 c224bd257d5..eec06814586 100644 --- a/src/core/lib/gprpp/bitset.h +++ b/src/core/util/bitset.h @@ -12,16 +12,16 @@ // 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 #include #include -#include - #include "src/core/util/useful.h" namespace grpc_core { @@ -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 a90f455d46c..b85c7e2e7ae 100644 --- a/src/core/lib/gprpp/chunked_vector.h +++ b/src/core/util/chunked_vector.h @@ -12,8 +12,10 @@ // 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 #include @@ -21,10 +23,8 @@ #include "absl/log/check.h" -#include - -#include "src/core/lib/gprpp/manual_constructor.h" #include "src/core/lib/resource_quota/arena.h" +#include "src/core/util/manual_constructor.h" namespace grpc_core { @@ -254,4 +254,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 87% rename from src/core/lib/gprpp/construct_destruct.h rename to src/core/util/construct_destruct.h index 62e4df4bc59..fba1284a886 100644 --- a/src/core/lib/gprpp/construct_destruct.h +++ b/src/core/util/construct_destruct.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_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 #include -#include - namespace grpc_core { // Call the destructor of p without having to name the type of p. @@ -37,4 +37,4 @@ GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION 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 35128d73a11..9ab5a9852ba 100644 --- a/src/core/lib/gprpp/crash.cc +++ b/src/core/util/crash.cc @@ -12,7 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/crash.h" +#include + +#include "src/core/util/crash.h" #include #include @@ -22,8 +24,6 @@ #include "absl/log/log.h" #include "absl/strings/str_cat.h" -#include - namespace grpc_core { void Crash(absl::string_view message, SourceLocation location) { 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..9d0b19a5d0a 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 - -#include "absl/strings/string_view.h" +#ifndef GRPC_SRC_CORE_UTIL_CRASH_H +#define GRPC_SRC_CORE_UTIL_CRASH_H #include -#include "src/core/lib/gprpp/debug_location.h" +#include "absl/strings/string_view.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 89a948da7f6..ff52fb49a0c 100644 --- a/src/core/lib/gprpp/debug_location.h +++ b/src/core/util/debug_location.h @@ -16,15 +16,15 @@ // // -#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 #include #include "absl/strings/str_cat.h" -#include - #if defined(__has_builtin) #if __has_builtin(__builtin_FILE) #define GRPC_DEFAULT_FILE __builtin_FILE() @@ -103,4 +103,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..9b3be1a8838 100644 --- a/src/core/lib/gprpp/directory_reader.h +++ b/src/core/util/directory_reader.h @@ -16,8 +16,10 @@ // // -#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 #include @@ -25,8 +27,6 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" -#include - namespace grpc_core { class DirectoryReader { @@ -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 e7c05bf4b78..3a7bc3a14fc 100644 --- a/src/core/lib/gprpp/down_cast.h +++ b/src/core/util/down_cast.h @@ -12,16 +12,16 @@ // 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 #include #include "absl/base/config.h" #include "absl/log/check.h" -#include - namespace grpc_core { template @@ -45,4 +45,4 @@ GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION 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 2d5ed351889..6f3e3c43af6 100644 --- a/src/core/lib/gprpp/dual_ref_counted.h +++ b/src/core/util/dual_ref_counted.h @@ -14,8 +14,10 @@ // 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 #include @@ -23,13 +25,11 @@ #include "absl/log/check.h" #include "absl/log/log.h" -#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 { @@ -374,4 +374,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 97% rename from src/core/lib/gprpp/dump_args.cc rename to src/core/util/dump_args.cc index 1e2972f6dd7..bd82483bfcd 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 95% rename from src/core/lib/gprpp/dump_args.h rename to src/core/util/dump_args.h index 1e89fa48c65..02519075c36 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 @@ -114,4 +114,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 \ No newline at end of file +#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..558941deb09 100644 --- a/src/core/lib/gprpp/env.h +++ b/src/core/util/env.h @@ -16,15 +16,15 @@ // // -#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 #include #include "absl/types/optional.h" -#include - namespace grpc_core { // Gets the environment variable value with the specified name. */ @@ -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/lib/debug/event_log.cc b/src/core/util/event_log.cc similarity index 98% rename from src/core/lib/debug/event_log.cc rename to src/core/util/event_log.cc index 48dbb5809a8..6bb1427f89e 100644 --- a/src/core/lib/debug/event_log.cc +++ b/src/core/util/event_log.cc @@ -12,7 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/debug/event_log.h" +#include + +#include "src/core/util/event_log.h" #include #include @@ -21,8 +23,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" -#include - namespace grpc_core { std::atomic EventLog::g_instance_{nullptr}; diff --git a/src/core/lib/debug/event_log.h b/src/core/util/event_log.h similarity index 91% rename from src/core/lib/debug/event_log.h rename to src/core/util/event_log.h index dd8aa07aa3d..f77967d57f2 100644 --- a/src/core/lib/debug/event_log.h +++ b/src/core/util/event_log.h @@ -12,8 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_DEBUG_EVENT_LOG_H -#define GRPC_SRC_CORE_LIB_DEBUG_EVENT_LOG_H +#ifndef GRPC_SRC_CORE_UTIL_EVENT_LOG_H +#define GRPC_SRC_CORE_UTIL_EVENT_LOG_H + +#include #include @@ -25,10 +27,8 @@ #include "absl/strings/string_view.h" #include "absl/types/span.h" -#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 { @@ -78,4 +78,4 @@ class EventLog { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_DEBUG_EVENT_LOG_H +#endif // GRPC_SRC_CORE_UTIL_EVENT_LOG_H 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..96799b2a30c 100644 --- a/src/core/lib/gprpp/examine_stack.cc +++ b/src/core/util/examine_stack.cc @@ -16,10 +16,10 @@ // // -#include "src/core/lib/gprpp/examine_stack.h" - #include +#include "src/core/util/examine_stack.h" + namespace grpc_core { gpr_current_stack_trace_func g_current_stack_trace_provider = nullptr; diff --git a/src/core/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..b5abb9f15ef 100644 --- a/src/core/lib/gprpp/examine_stack.h +++ b/src/core/util/examine_stack.h @@ -16,15 +16,15 @@ // // -#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 #include #include "absl/types/optional.h" -#include - namespace grpc_core { typedef std::string (*gpr_current_stack_trace_func)(); @@ -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..35b211b42ff 100644 --- a/src/core/lib/gprpp/fork.cc +++ b/src/core/util/fork.cc @@ -16,18 +16,19 @@ // // -#include "src/core/lib/gprpp/fork.h" +#include + +#include "src/core/util/fork.h" #include #include -#include #include #include #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..047d35a4b0c 100644 --- a/src/core/lib/gprpp/fork.h +++ b/src/core/util/fork.h @@ -16,14 +16,14 @@ // // -#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 #include -#include - // // NOTE: FORKING IS NOT GENERALLY SUPPORTED, THIS IS ONLY INTENDED TO WORK // AROUND VERY SPECIFIC USE CASES. @@ -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/gcp_metadata_query.cc b/src/core/util/gcp_metadata_query.cc index 351f6e7a578..3543e46fa0e 100644 --- a/src/core/util/gcp_metadata_query.cc +++ b/src/core/util/gcp_metadata_query.cc @@ -37,11 +37,11 @@ #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/lib/security/credentials/credentials.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" namespace grpc_core { diff --git a/src/core/util/gcp_metadata_query.h b/src/core/util/gcp_metadata_query.h index fda085d1f9c..b2abde5cd4a 100644 --- a/src/core/util/gcp_metadata_query.h +++ b/src/core/util/gcp_metadata_query.h @@ -24,13 +24,13 @@ #include "absl/functional/any_invocable.h" #include "absl/status/statusor.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/polling_entity.h" #include "src/core/util/http_client/httpcli.h" #include "src/core/util/http_client/parser.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/lib/iomgr/gethostname.h b/src/core/util/gethostname.h similarity index 83% rename from src/core/lib/iomgr/gethostname.h rename to src/core/util/gethostname.h index 5ab2bd63009..ea3fa36fa43 100644 --- a/src/core/lib/iomgr/gethostname.h +++ b/src/core/util/gethostname.h @@ -16,11 +16,11 @@ // // -#ifndef GRPC_SRC_CORE_LIB_IOMGR_GETHOSTNAME_H -#define GRPC_SRC_CORE_LIB_IOMGR_GETHOSTNAME_H +#ifndef GRPC_SRC_CORE_UTIL_GETHOSTNAME_H +#define GRPC_SRC_CORE_UTIL_GETHOSTNAME_H // Returns the hostname of the local machine. // Caller takes ownership of result. char* grpc_gethostname(); -#endif // GRPC_SRC_CORE_LIB_IOMGR_GETHOSTNAME_H +#endif // GRPC_SRC_CORE_UTIL_GETHOSTNAME_H diff --git a/src/core/lib/iomgr/gethostname_fallback.cc b/src/core/util/gethostname_fallback.cc similarity index 94% rename from src/core/lib/iomgr/gethostname_fallback.cc rename to src/core/util/gethostname_fallback.cc index 3c3282ab9f8..6a5ec05d777 100644 --- a/src/core/lib/iomgr/gethostname_fallback.cc +++ b/src/core/util/gethostname_fallback.cc @@ -18,8 +18,8 @@ #include -#include "src/core/lib/iomgr/gethostname.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/gethostname.h" #ifdef GRPC_GETHOSTNAME_FALLBACK diff --git a/src/core/lib/iomgr/gethostname_host_name_max.cc b/src/core/util/gethostname_host_name_max.cc similarity index 95% rename from src/core/lib/iomgr/gethostname_host_name_max.cc rename to src/core/util/gethostname_host_name_max.cc index 98e933018f9..def6984395d 100644 --- a/src/core/lib/iomgr/gethostname_host_name_max.cc +++ b/src/core/util/gethostname_host_name_max.cc @@ -18,8 +18,8 @@ #include -#include "src/core/lib/iomgr/gethostname.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/gethostname.h" #ifdef GRPC_POSIX_HOST_NAME_MAX diff --git a/src/core/lib/iomgr/gethostname_sysconf.cc b/src/core/util/gethostname_sysconf.cc similarity index 95% rename from src/core/lib/iomgr/gethostname_sysconf.cc rename to src/core/util/gethostname_sysconf.cc index 24769a51f92..414a02118a0 100644 --- a/src/core/lib/iomgr/gethostname_sysconf.cc +++ b/src/core/util/gethostname_sysconf.cc @@ -18,8 +18,8 @@ #include -#include "src/core/lib/iomgr/gethostname.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/gethostname.h" #ifdef GRPC_POSIX_SYSCONF diff --git a/src/core/lib/gprpp/glob.cc b/src/core/util/glob.cc similarity index 100% rename from src/core/lib/gprpp/glob.cc rename to src/core/util/glob.cc diff --git a/src/core/lib/gprpp/glob.h b/src/core/util/glob.h similarity index 88% rename from src/core/lib/gprpp/glob.h rename to src/core/util/glob.h index dafcb9bf729..6c522450b65 100644 --- a/src/core/lib/gprpp/glob.h +++ b/src/core/util/glob.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_GLOB_H -#define GRPC_SRC_CORE_LIB_GPRPP_GLOB_H +#ifndef GRPC_SRC_CORE_UTIL_GLOB_H +#define GRPC_SRC_CORE_UTIL_GLOB_H #include "absl/strings/string_view.h" @@ -26,4 +26,4 @@ bool GlobMatch(absl::string_view name, absl::string_view pattern); } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_GPRPP_GLOB_H +#endif // GRPC_SRC_CORE_UTIL_GLOB_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/lib/iomgr/grpc_if_nametoindex.h b/src/core/util/grpc_if_nametoindex.h similarity index 83% rename from src/core/lib/iomgr/grpc_if_nametoindex.h rename to src/core/util/grpc_if_nametoindex.h index 9fa91a2b22f..ad1f3fcc224 100644 --- a/src/core/lib/iomgr/grpc_if_nametoindex.h +++ b/src/core/util/grpc_if_nametoindex.h @@ -16,15 +16,15 @@ // // -#ifndef GRPC_SRC_CORE_LIB_IOMGR_GRPC_IF_NAMETOINDEX_H -#define GRPC_SRC_CORE_LIB_IOMGR_GRPC_IF_NAMETOINDEX_H - -#include +#ifndef GRPC_SRC_CORE_UTIL_GRPC_IF_NAMETOINDEX_H +#define GRPC_SRC_CORE_UTIL_GRPC_IF_NAMETOINDEX_H #include +#include + // Returns the interface index corresponding to the interface "name" provided. // Returns non-zero upon success, and zero upon failure. uint32_t grpc_if_nametoindex(char* name); -#endif // GRPC_SRC_CORE_LIB_IOMGR_GRPC_IF_NAMETOINDEX_H +#endif // GRPC_SRC_CORE_UTIL_GRPC_IF_NAMETOINDEX_H diff --git a/src/core/lib/iomgr/grpc_if_nametoindex_posix.cc b/src/core/util/grpc_if_nametoindex_posix.cc similarity index 92% rename from src/core/lib/iomgr/grpc_if_nametoindex_posix.cc rename to src/core/util/grpc_if_nametoindex_posix.cc index 52b57d43f81..1ec5f15cc99 100644 --- a/src/core/lib/iomgr/grpc_if_nametoindex_posix.cc +++ b/src/core/util/grpc_if_nametoindex_posix.cc @@ -27,8 +27,8 @@ #include "absl/log/log.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/iomgr/grpc_if_nametoindex.h" +#include "src/core/util/crash.h" +#include "src/core/util/grpc_if_nametoindex.h" uint32_t grpc_if_nametoindex(char* name) { uint32_t out = if_nametoindex(name); diff --git a/src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc b/src/core/util/grpc_if_nametoindex_unsupported.cc similarity index 92% rename from src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc rename to src/core/util/grpc_if_nametoindex_unsupported.cc index 9d2092ae138..767f41b67f6 100644 --- a/src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc +++ b/src/core/util/grpc_if_nametoindex_unsupported.cc @@ -24,8 +24,8 @@ #include "absl/log/log.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/iomgr/grpc_if_nametoindex.h" +#include "src/core/util/crash.h" +#include "src/core/util/grpc_if_nametoindex.h" uint32_t grpc_if_nametoindex(char* name) { VLOG(2) << "Not attempting to convert interface name " << 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 fec43151109..dad028d0b4a 100644 --- a/src/core/lib/gprpp/host_port.cc +++ b/src/core/util/host_port.cc @@ -16,7 +16,9 @@ // // -#include "src/core/lib/gprpp/host_port.h" +#include + +#include "src/core/util/host_port.h" #include @@ -24,8 +26,6 @@ #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" -#include - namespace grpc_core { std::string JoinHostPort(absl::string_view host, int port) { 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..2d7d2c9e43a 100644 --- a/src/core/lib/gprpp/host_port.h +++ b/src/core/util/host_port.h @@ -16,15 +16,15 @@ // // -#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 #include #include "absl/strings/string_view.h" -#include - namespace grpc_core { // Given a host and port, creates a newly-allocated string of the form @@ -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 e28f9b8b758..c7b52e2de54 100644 --- a/src/core/util/http_client/httpcli.cc +++ b/src/core/util/http_client/httpcli.cc @@ -41,7 +41,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/pollset_set.h" @@ -53,6 +52,7 @@ #include "src/core/lib/transport/error_utils.h" #include "src/core/util/http_client/format_request.h" #include "src/core/util/http_client/parser.h" +#include "src/core/util/status_helper.h" namespace grpc_core { diff --git a/src/core/util/http_client/httpcli.h b/src/core/util/http_client/httpcli.h index c5939da61fa..b041d190e07 100644 --- a/src/core/util/http_client/httpcli.h +++ b/src/core/util/http_client/httpcli.h @@ -37,11 +37,6 @@ #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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -52,8 +47,13 @@ #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/resource_quota/resource_quota.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/debug_location.h" #include "src/core/util/http_client/parser.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" // User agent this library reports #define GRPC_HTTPCLI_USER_AGENT "grpc-httpcli/0.0" diff --git a/src/core/util/http_client/httpcli_security_connector.cc b/src/core/util/http_client/httpcli_security_connector.cc index c183f95a07e..45156af53d1 100644 --- a/src/core/util/http_client/httpcli_security_connector.cc +++ b/src/core/util/http_client/httpcli_security_connector.cc @@ -38,9 +38,6 @@ #include "src/core/handshaker/handshaker.h" #include "src/core/handshaker/security/security_handshaker.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -53,6 +50,9 @@ #include "src/core/lib/security/security_connector/ssl_utils.h" #include "src/core/tsi/ssl_transport_security.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" namespace grpc_core { diff --git a/src/core/util/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..1c1e8c565e1 100644 --- a/src/core/util/json/json_object_loader.h +++ b/src/core/util/json/json_object_loader.h @@ -32,12 +32,12 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" -#include "src/core/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/json/json.h" #include "src/core/util/json/json_args.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" // Provides a means to load JSON objects into C++ objects, with the aim of // minimizing object code size. diff --git a/src/core/util/json/json_reader.cc b/src/core/util/json/json_reader.cc index 20a1a04a75c..bda35becad4 100644 --- a/src/core/util/json/json_reader.cc +++ b/src/core/util/json/json_reader.cc @@ -37,8 +37,8 @@ #include -#include "src/core/lib/gprpp/match.h" #include "src/core/util/json/json.h" +#include "src/core/util/match.h" #define GRPC_JSON_MAX_DEPTH 255 #define GRPC_JSON_MAX_ERRORS 16 diff --git a/src/core/util/json/json_util.cc b/src/core/util/json/json_util.cc index 8faa7cd8f25..88fdbb6755c 100644 --- a/src/core/util/json/json_util.cc +++ b/src/core/util/json/json_util.cc @@ -20,10 +20,10 @@ #include "src/core/util/json/json_util.h" -#include "src/core/lib/gprpp/no_destruct.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/util/json/json_util.h b/src/core/util/json/json_util.h index da45b74b3c3..a8abf9efb88 100644 --- a/src/core/util/json/json_util.h +++ b/src/core/util/json/json_util.h @@ -32,9 +32,9 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/error.h" #include "src/core/util/json/json.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/src/core/util/latent_see.cc b/src/core/util/latent_see.cc index 6bb250b445f..508e853055a 100644 --- a/src/core/util/latent_see.cc +++ b/src/core/util/latent_see.cc @@ -25,8 +25,8 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/util/ring_buffer.h" +#include "src/core/util/sync.h" namespace grpc_core { namespace latent_see { diff --git a/src/core/util/latent_see.h b/src/core/util/latent_see.h index 4d4f1584b06..34a247abd0a 100644 --- a/src/core/util/latent_see.h +++ b/src/core/util/latent_see.h @@ -35,9 +35,9 @@ #include "absl/log/log.h" #include "absl/strings/string_view.h" -#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/ring_buffer.h" +#include "src/core/util/sync.h" #define TAGGED_POINTER_SIZE_BITS 48 diff --git a/src/core/util/linux/cpu.cc b/src/core/util/linux/cpu.cc index aa232a6ac5d..61f1d5d58ff 100644 --- a/src/core/util/linux/cpu.cc +++ b/src/core/util/linux/cpu.cc @@ -34,8 +34,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..ff1635f7a62 100644 --- a/src/core/lib/gprpp/linux/env.cc +++ b/src/core/util/linux/env.cc @@ -21,18 +21,18 @@ #define _GNU_SOURCE #endif +#include + #include #include "absl/types/optional.h" -#include - #ifdef GPR_LINUX_ENV #include #include -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/env.h" namespace grpc_core { 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 dd15004570a..91ec375ba65 100644 --- a/src/core/lib/gprpp/load_file.cc +++ b/src/core/util/load_file.cc @@ -12,7 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/load_file.h" +#include + +#include "src/core/util/load_file.h" #include #include @@ -24,7 +26,6 @@ #include #include -#include namespace grpc_core { 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..5d3f7aa784f 100644 --- a/src/core/lib/gprpp/load_file.h +++ b/src/core/util/load_file.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_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 #include #include "absl/status/statusor.h" -#include - #include "src/core/lib/slice/slice.h" namespace grpc_core { @@ -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 e2feca75993..cc353fcbd64 100644 --- a/src/core/util/log.cc +++ b/src/core/util/log.cc @@ -33,7 +33,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" void gpr_unreachable_code(const char* reason, const char* file, int line) { 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..38d4695753f 100644 --- a/src/core/lib/gprpp/manual_constructor.h +++ b/src/core/util/manual_constructor.h @@ -16,18 +16,18 @@ // // -#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 +#include + #include #include -#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..69b91f2fc9b 100644 --- a/src/core/lib/gprpp/match.h +++ b/src/core/util/match.h @@ -12,16 +12,16 @@ // 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 #include #include "absl/types/variant.h" -#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/matchers/matchers.cc b/src/core/util/matchers.cc similarity index 99% rename from src/core/lib/matchers/matchers.cc rename to src/core/util/matchers.cc index 38bea23b2b5..a0a8b786bec 100644 --- a/src/core/lib/matchers/matchers.cc +++ b/src/core/util/matchers.cc @@ -12,7 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/matchers/matchers.h" +#include + +#include "src/core/util/matchers.h" #include @@ -23,8 +25,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" -#include - namespace grpc_core { // diff --git a/src/core/lib/matchers/matchers.h b/src/core/util/matchers.h similarity index 97% rename from src/core/lib/matchers/matchers.h rename to src/core/util/matchers.h index b2055778ff7..69992106b45 100644 --- a/src/core/lib/matchers/matchers.h +++ b/src/core/util/matchers.h @@ -12,8 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_MATCHERS_MATCHERS_H -#define GRPC_SRC_CORE_LIB_MATCHERS_MATCHERS_H +#ifndef GRPC_SRC_CORE_UTIL_MATCHERS_H +#define GRPC_SRC_CORE_UTIL_MATCHERS_H + +#include #include @@ -25,8 +27,6 @@ #include "absl/types/optional.h" #include "re2/re2.h" -#include - namespace grpc_core { class StringMatcher { @@ -160,4 +160,4 @@ class HeaderMatcher { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_MATCHERS_MATCHERS_H +#endif // GRPC_SRC_CORE_UTIL_MATCHERS_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..eae0aaa4b83 100644 --- a/src/core/lib/gprpp/memory.h +++ b/src/core/util/memory.h @@ -16,14 +16,15 @@ // // -#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 #include #include -#include namespace grpc_core { @@ -49,4 +50,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..45258346443 100644 --- a/src/core/lib/gprpp/mpscq.cc +++ b/src/core/util/mpscq.cc @@ -16,10 +16,10 @@ // // -#include "src/core/lib/gprpp/mpscq.h" - #include +#include "src/core/util/mpscq.h" + namespace grpc_core { // 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 f6306d46822..b4d48f78c3d 100644 --- a/src/core/lib/gprpp/mpscq.h +++ b/src/core/util/mpscq.h @@ -16,16 +16,16 @@ // // -#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 #include #include "absl/log/check.h" -#include - -#include "src/core/lib/gprpp/sync.h" +#include "src/core/util/sync.h" namespace grpc_core { @@ -96,4 +96,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 dc1cdf7bc34..69eb209b149 100644 --- a/src/core/util/msys/tmpfile.cc +++ b/src/core/util/msys/tmpfile.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_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..4ba0161161f 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 - -#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..45acff0fda7 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 #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..82ad20c52e5 100644 --- a/src/core/lib/gprpp/orphanable.h +++ b/src/core/util/orphanable.h @@ -16,19 +16,19 @@ // // -#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 #include #include -#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..373a34c1210 100644 --- a/src/core/lib/gprpp/overload.h +++ b/src/core/util/overload.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_OVERLOAD_H -#define GRPC_SRC_CORE_LIB_GPRPP_OVERLOAD_H - -#include +#ifndef GRPC_SRC_CORE_UTIL_OVERLOAD_H +#define GRPC_SRC_CORE_UTIL_OVERLOAD_H #include +#include + namespace grpc_core { template @@ -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..8412f399173 100644 --- a/src/core/lib/gprpp/per_cpu.cc +++ b/src/core/util/per_cpu.cc @@ -12,10 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/per_cpu.h" +#include + +#include "src/core/util/per_cpu.h" #include -#include #include "src/core/util/useful.h" 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..492ea2832b4 100644 --- a/src/core/lib/gprpp/per_cpu.h +++ b/src/core/util/per_cpu.h @@ -12,8 +12,10 @@ // 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 #include @@ -23,7 +25,6 @@ #include #include -#include // Sharded collections of objects // This used to be per-cpu, now it's much less so - but still a way to limit @@ -100,4 +101,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 3aabc9adfe5..93e6cce0614 100644 --- a/src/core/util/posix/cpu.cc +++ b/src/core/util/posix/cpu.cc @@ -30,7 +30,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..d889c7b6c44 100644 --- a/src/core/lib/gprpp/posix/directory_reader.cc +++ b/src/core/util/posix/directory_reader.cc @@ -16,14 +16,14 @@ // // +#include + #include #include "absl/functional/function_ref.h" #include "absl/status/status.h" #include "absl/strings/string_view.h" -#include - #if defined(GPR_LINUX) || defined(GPR_ANDROID) || defined(GPR_FREEBSD) || \ defined(GPR_APPLE) @@ -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/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 e0d2e617506..e4c870f8dbd 100644 --- a/src/core/lib/gprpp/posix/stat.cc +++ b/src/core/util/posix/stat.cc @@ -14,10 +14,10 @@ // limitations under the License. // -#include - #include +#include + // IWYU pragma: no_include #include "absl/status/status.h" @@ -30,8 +30,8 @@ #include "absl/log/check.h" #include "absl/log/log.h" -#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 1ccaa281996..255eec517a3 100644 --- a/src/core/util/posix/sync.cc +++ b/src/core/util/posix/sync.cc @@ -30,7 +30,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 b481fa7c565..6987e3ff2cd 100644 --- a/src/core/lib/gprpp/posix/thd.cc +++ b/src/core/util/posix/thd.cc @@ -18,13 +18,13 @@ // Posix implementation for gpr threads. +#include + #include #include #include -#include - #ifdef GPR_POSIX_SYNC #include @@ -39,10 +39,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 5fea711d59f..a425a4721c6 100644 --- a/src/core/util/posix/time.cc +++ b/src/core/util/posix/time.cc @@ -33,7 +33,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; @@ -77,8 +77,8 @@ static gpr_timespec now_impl(gpr_clock_type clock_type) { } else { clock_gettime(clockid_for_gpr_clock[clock_type], &now); if (clock_type == GPR_CLOCK_MONOTONIC) { - // Add 5 seconds arbitrarily: avoids weird conditions in gprpp/time.cc - // when there's a small number of seconds returned. + // Add 5 seconds arbitrarily: avoids weird conditions in + // src/core/util/time.cc when there's a small number of seconds returned. now.tv_sec += 5; } return gpr_from_timespec(now, clock_type); diff --git a/src/core/util/posix/tmpfile.cc b/src/core/util/posix/tmpfile.cc index fd1524654a5..51b900a3527 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/backoff/random_early_detection.cc b/src/core/util/random_early_detection.cc similarity index 94% rename from src/core/lib/backoff/random_early_detection.cc rename to src/core/util/random_early_detection.cc index c25e3792cdb..882a7d530e9 100644 --- a/src/core/lib/backoff/random_early_detection.cc +++ b/src/core/util/random_early_detection.cc @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/backoff/random_early_detection.h" +#include -#include "absl/random/distributions.h" +#include "src/core/util/random_early_detection.h" -#include +#include "absl/random/distributions.h" namespace grpc_core { diff --git a/src/core/lib/backoff/random_early_detection.h b/src/core/util/random_early_detection.h similarity index 91% rename from src/core/lib/backoff/random_early_detection.h rename to src/core/util/random_early_detection.h index 400a0d3d57f..fb2ea8f51a4 100644 --- a/src/core/lib/backoff/random_early_detection.h +++ b/src/core/util/random_early_detection.h @@ -12,8 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_BACKOFF_RANDOM_EARLY_DETECTION_H -#define GRPC_SRC_CORE_LIB_BACKOFF_RANDOM_EARLY_DETECTION_H +#ifndef GRPC_SRC_CORE_UTIL_RANDOM_EARLY_DETECTION_H +#define GRPC_SRC_CORE_UTIL_RANDOM_EARLY_DETECTION_H + +#include #include @@ -21,8 +23,6 @@ #include "absl/random/bit_gen_ref.h" -#include - namespace grpc_core { // Implements the random early detection algorithm - allows items to be rejected @@ -59,4 +59,4 @@ class RandomEarlyDetection { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_BACKOFF_RANDOM_EARLY_DETECTION_H +#endif // GRPC_SRC_CORE_UTIL_RANDOM_EARLY_DETECTION_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 e8b6347f4b9..e32472d1c80 100644 --- a/src/core/lib/gprpp/ref_counted.h +++ b/src/core/util/ref_counted.h @@ -16,8 +16,10 @@ // // -#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 #include @@ -26,12 +28,10 @@ #include "absl/log/check.h" #include "absl/log/log.h" -#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 { @@ -400,4 +400,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..28829bc0d20 100644 --- a/src/core/lib/gprpp/ref_counted_ptr.h +++ b/src/core/util/ref_counted_ptr.h @@ -16,8 +16,10 @@ // // -#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 #include @@ -27,10 +29,8 @@ #include "absl/hash/hash.h" -#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..2b3f6f66b36 100644 --- a/src/core/lib/gprpp/ref_counted_string.cc +++ b/src/core/util/ref_counted_string.cc @@ -14,14 +14,15 @@ // limitations under the License. // -#include "src/core/lib/gprpp/ref_counted_string.h" +#include + +#include "src/core/util/ref_counted_string.h" #include #include #include -#include namespace grpc_core { 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..ed3e93089ae 100644 --- a/src/core/lib/gprpp/ref_counted_string.h +++ b/src/core/util/ref_counted_string.h @@ -14,8 +14,10 @@ // 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 #include @@ -23,10 +25,8 @@ #include "absl/strings/string_view.h" -#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 016967b5f49..9508e53eb6d 100644 --- a/src/core/lib/gprpp/single_set_ptr.h +++ b/src/core/util/single_set_ptr.h @@ -12,16 +12,16 @@ // 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 #include #include "absl/log/check.h" -#include - namespace grpc_core { template > @@ -86,4 +86,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..bb0d2415a15 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 - -#include +#ifndef GRPC_SRC_CORE_UTIL_SORTED_PACK_H +#define GRPC_SRC_CORE_UTIL_SORTED_PACK_H #include -#include "src/core/lib/gprpp/type_list.h" +#include + +#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..e947c0a5de9 100644 --- a/src/core/lib/gprpp/stat.h +++ b/src/core/util/stat.h @@ -14,15 +14,15 @@ // 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 #include #include "absl/status/status.h" -#include - namespace grpc_core { // Gets the last-modified timestamp of a file or a directory. @@ -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 b3563592b55..339500e2b0c 100644 --- a/src/core/lib/gprpp/status_helper.cc +++ b/src/core/util/status_helper.cc @@ -16,7 +16,9 @@ // // -#include "src/core/lib/gprpp/status_helper.h" +#include + +#include "src/core/util/status_helper.h" #include @@ -35,8 +37,6 @@ #include "upb/base/string_view.h" #include "upb/mem/arena.hpp" -#include - #include "src/core/lib/slice/percent_encoding.h" #include "src/core/lib/slice/slice.h" 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 3f561d21b9b..e2e089ce25e 100644 --- a/src/core/lib/gprpp/status_helper.h +++ b/src/core/util/status_helper.h @@ -16,8 +16,10 @@ // // -#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 #include @@ -29,9 +31,7 @@ #include "absl/time/time.h" #include "absl/types/optional.h" -#include - -#include "src/core/lib/gprpp/debug_location.h" +#include "src/core/util/debug_location.h" extern "C" { struct google_rpc_Status; @@ -159,4 +159,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..868acee2c06 100644 --- a/src/core/lib/gprpp/strerror.cc +++ b/src/core/util/strerror.cc @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/strerror.h" +#include + +#include "src/core/util/strerror.h" #include #include "absl/strings/str_format.h" -#include - namespace grpc_core { #ifdef GPR_WINDOWS diff --git a/src/core/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..24f285b6d76 100644 --- a/src/core/lib/gprpp/strerror.h +++ b/src/core/util/strerror.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_STRERROR_H -#define GRPC_SRC_CORE_LIB_GPRPP_STRERROR_H - -#include +#ifndef GRPC_SRC_CORE_UTIL_STRERROR_H +#define GRPC_SRC_CORE_UTIL_STRERROR_H #include +#include + namespace grpc_core { // Returns a string describing the posix error code. @@ -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 56cc040809d..3048a432a63 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 961c68de8ad..b421d50549c 100644 --- a/src/core/util/subprocess_posix.cc +++ b/src/core/util/subprocess_posix.cc @@ -34,8 +34,8 @@ #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 2824cb61071..c8760ec3ee7 100644 --- a/src/core/util/subprocess_windows.cc +++ b/src/core/util/subprocess_windows.cc @@ -30,10 +30,10 @@ #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/string.h" #include "src/core/util/subprocess.h" +#include "src/core/util/tchar.h" struct gpr_subprocess { PROCESS_INFORMATION pi; diff --git a/src/core/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 3b80a7bc91e..c85d9e2ad77 100644 --- a/src/core/lib/gprpp/sync.h +++ b/src/core/util/sync.h @@ -16,18 +16,19 @@ // // -#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 #include "absl/base/thread_annotations.h" #include "absl/log/check.h" #include "absl/synchronization/mutex.h" -#include #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. @@ -196,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 1d826f6565c..9e837022532 100644 --- a/src/core/util/sync_abseil.cc +++ b/src/core/util/sync_abseil.cc @@ -32,8 +32,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 99% rename from src/core/lib/gprpp/table.h rename to src/core/util/table.h index 7085bae0357..bd35c4963a8 100644 --- a/src/core/lib/gprpp/table.h +++ b/src/core/util/table.h @@ -12,8 +12,10 @@ // 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 #include @@ -25,9 +27,7 @@ #include "absl/meta/type_traits.h" #include "absl/utility/utility.h" -#include - -#include "src/core/lib/gprpp/bitset.h" +#include "src/core/util/bitset.h" namespace grpc_core { @@ -485,4 +485,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..f558b4cbc1d 100644 --- a/src/core/lib/gprpp/tchar.cc +++ b/src/core/util/tchar.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/tchar.h" - #include +#include "src/core/util/tchar.h" + #ifdef GPR_WINDOWS namespace grpc_core { 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 6662610cd68..ec0ae599f7f 100644 --- a/src/core/lib/gprpp/thd.h +++ b/src/core/util/thd.h @@ -16,11 +16,13 @@ // // -#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. +#include + #include #include @@ -29,7 +31,6 @@ #include "absl/functional/any_invocable.h" #include "absl/log/check.h" -#include #include namespace grpc_core { @@ -191,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 d71cee90ca9..c5f899bc473 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,258 +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 -#include -#include -#include +#include "src/core/util/time.h" + +#include +#include +#include +#include +#include #include "absl/log/check.h" +#include "absl/log/log.h" +#include "absl/strings/str_format.h" #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; -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; +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; + } + LOG(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 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 8f1c65cfa34..cf242eba1cb 100644 --- a/src/core/lib/gprpp/time.h +++ b/src/core/util/time.h @@ -12,8 +12,10 @@ // 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 #include @@ -24,7 +26,6 @@ #include "absl/types/optional.h" #include -#include #include #include "src/core/util/time_precise.h" @@ -384,4 +385,4 @@ void TestOnlySetProcessEpoch(gpr_timespec epoch); } // 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..dc6db49a011 100644 --- a/src/core/lib/gprpp/time_averaged_stats.cc +++ b/src/core/util/time_averaged_stats.cc @@ -16,10 +16,10 @@ // // -#include "src/core/lib/gprpp/time_averaged_stats.h" - #include +#include "src/core/util/time_averaged_stats.h" + namespace grpc_core { TimeAveragedStats::TimeAveragedStats(double init_avg, double regress_weight, diff --git a/src/core/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 8e5de7b5334..5274789c70e 100644 --- a/src/core/util/time_precise.cc +++ b/src/core/util/time_precise.cc @@ -29,7 +29,7 @@ #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 94ca4e08d88..4730e79184a 100644 --- a/src/core/lib/gprpp/time_util.cc +++ b/src/core/util/time_util.cc @@ -14,14 +14,15 @@ // limitations under the License. // -#include "src/core/lib/gprpp/time_util.h" +#include + +#include "src/core/util/time_util.h" #include #include #include "absl/log/check.h" -#include #include namespace grpc_core { 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..61ad6d11a5b 100644 --- a/src/core/lib/gprpp/time_util.h +++ b/src/core/util/time_util.h @@ -14,12 +14,13 @@ // 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 #include "absl/time/time.h" -#include #include namespace grpc_core { @@ -38,4 +39,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 95% rename from src/core/lib/gprpp/unique_type_name.h rename to src/core/util/unique_type_name.h index 4fc7c75ed4b..29e63d8404f 100644 --- a/src/core/lib/gprpp/unique_type_name.h +++ b/src/core/util/unique_type_name.h @@ -14,15 +14,15 @@ // 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 #include #include "absl/strings/string_view.h" -#include - #include "src/core/util/useful.h" // Provides a type name that is unique by instance rather than by @@ -121,4 +121,4 @@ UniqueTypeName UniqueTypeNameFor() { return factory.Create(); \ }()) -#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/uri/uri_parser.cc b/src/core/util/uri.cc similarity index 99% rename from src/core/lib/uri/uri_parser.cc rename to src/core/util/uri.cc index 95d92663194..82fb29d46e1 100644 --- a/src/core/lib/uri/uri_parser.cc +++ b/src/core/util/uri.cc @@ -14,7 +14,9 @@ // limitations under the License. // -#include "src/core/lib/uri/uri_parser.h" +#include + +#include "src/core/util/uri.h" #include #include @@ -36,8 +38,6 @@ #include "absl/strings/str_split.h" #include "absl/strings/strip.h" -#include - namespace grpc_core { namespace { diff --git a/src/core/lib/uri/uri_parser.h b/src/core/util/uri.h similarity index 96% rename from src/core/lib/uri/uri_parser.h rename to src/core/util/uri.h index 2768bae179f..14e9274eaa8 100644 --- a/src/core/lib/uri/uri_parser.h +++ b/src/core/util/uri.h @@ -14,8 +14,10 @@ // limitations under the License. // -#ifndef GRPC_SRC_CORE_LIB_URI_URI_PARSER_H -#define GRPC_SRC_CORE_LIB_URI_URI_PARSER_H +#ifndef GRPC_SRC_CORE_UTIL_URI_H +#define GRPC_SRC_CORE_UTIL_URI_H + +#include #include #include @@ -24,8 +26,6 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" -#include - namespace grpc_core { class URI { @@ -98,4 +98,4 @@ class URI { }; } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_URI_URI_PARSER_H +#endif // GRPC_SRC_CORE_UTIL_URI_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..b0847a8d33e 100644 --- a/src/core/lib/gprpp/uuid_v4.cc +++ b/src/core/util/uuid_v4.cc @@ -16,11 +16,11 @@ // // -#include "src/core/lib/gprpp/uuid_v4.h" +#include -#include "absl/strings/str_format.h" +#include "src/core/util/uuid_v4.h" -#include +#include "absl/strings/str_format.h" namespace grpc_core { 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..e7bf52c6409 100644 --- a/src/core/lib/gprpp/uuid_v4.h +++ b/src/core/util/uuid_v4.h @@ -16,15 +16,15 @@ // // -#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 #include #include -#include - namespace grpc_core { // Generates string in the UUIDv4 form. \a hi and \a lo are expected to be @@ -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 84d8d75a2fb..047ea420161 100644 --- a/src/core/lib/gprpp/validation_errors.cc +++ b/src/core/util/validation_errors.cc @@ -12,7 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/gprpp/validation_errors.h" +#include + +#include "src/core/util/validation_errors.h" #include @@ -24,8 +26,6 @@ #include "absl/strings/str_join.h" #include "absl/strings/strip.h" -#include - namespace grpc_core { void ValidationErrors::PushField(absl::string_view ext) { 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..5c075c12cce 100644 --- a/src/core/lib/gprpp/validation_errors.h +++ b/src/core/util/validation_errors.h @@ -12,8 +12,10 @@ // 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 #include @@ -25,8 +27,6 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" -#include - namespace grpc_core { // Tracks errors that occur during validation of a data structure (e.g., @@ -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 a8ba5952f88..fcc1bd260dc 100644 --- a/src/core/util/windows/cpu.cc +++ b/src/core/util/windows/cpu.cc @@ -21,7 +21,7 @@ #ifdef GPR_WINDOWS #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 97% rename from src/core/lib/gprpp/windows/directory_reader.cc rename to src/core/util/windows/directory_reader.cc index 2deedb8ca5a..02c7916798c 100644 --- a/src/core/lib/gprpp/windows/directory_reader.cc +++ b/src/core/util/windows/directory_reader.cc @@ -30,7 +30,8 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" -#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/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 aa1017a1d4a..8a08d087a5e 100644 --- a/src/core/lib/gprpp/windows/stat.cc +++ b/src/core/util/windows/stat.cc @@ -25,9 +25,9 @@ #include "absl/log/check.h" #include "absl/log/log.h" -#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..105ce0636c9 100644 --- a/src/core/util/windows/string_util.cc +++ b/src/core/util/windows/string_util.cc @@ -36,8 +36,8 @@ #include #include -#include "src/core/lib/gprpp/tchar.h" #include "src/core/util/string.h" +#include "src/core/util/tchar.h" char* gpr_format_message(int messageid) { LPTSTR tmessage; diff --git a/src/core/util/windows/sync.cc b/src/core/util/windows/sync.cc index 0f7fd78868d..84c06503e2f 100644 --- a/src/core/util/windows/sync.cc +++ b/src/core/util/windows/sync.cc @@ -28,7 +28,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 1e754e916b9..0423e21baa2 100644 --- a/src/core/lib/gprpp/windows/thd.cc +++ b/src/core/util/windows/thd.cc @@ -31,9 +31,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 21cfed52a13..62151a2b6a5 100644 --- a/src/core/util/windows/time.cc +++ b/src/core/util/windows/time.cc @@ -30,7 +30,7 @@ #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 23d647a2b8e..44119406582 100644 --- a/src/core/util/windows/tmpfile.cc +++ b/src/core/util/windows/tmpfile.cc @@ -28,8 +28,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 98% rename from src/core/lib/gprpp/work_serializer.cc rename to src/core/util/work_serializer.cc index 16ed3fd6e68..35c509f5828 100644 --- a/src/core/lib/gprpp/work_serializer.cc +++ b/src/core/util/work_serializer.cc @@ -14,7 +14,9 @@ // limitations under the License. // -#include "src/core/lib/gprpp/work_serializer.h" +#include + +#include "src/core/util/work_serializer.h" #include @@ -31,18 +33,17 @@ #include "absl/log/log.h" #include -#include #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/lib/iomgr/exec_ctx.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/debug_location.h" #include "src/core/util/latent_see.h" +#include "src/core/util/mpscq.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/sync.h" namespace grpc_core { 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..780fa4fb05e 100644 --- a/src/core/lib/gprpp/work_serializer.h +++ b/src/core/util/work_serializer.h @@ -14,8 +14,10 @@ // 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 #include @@ -23,10 +25,9 @@ #include "absl/base/thread_annotations.h" #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 +104,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..239d5ca74af 100644 --- a/src/core/xds/grpc/certificate_provider_store.h +++ b/src/core/xds/grpc/certificate_provider_store.h @@ -29,18 +29,18 @@ #include #include -#include "src/core/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/lib/security/certificate_provider/certificate_provider_factory.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/xds/grpc/file_watcher_certificate_provider_factory.h b/src/core/xds/grpc/file_watcher_certificate_provider_factory.h index 0306dbe4370..493e993648c 100644 --- a/src/core/xds/grpc/file_watcher_certificate_provider_factory.h +++ b/src/core/xds/grpc/file_watcher_certificate_provider_factory.h @@ -26,13 +26,13 @@ #include #include -#include "src/core/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/security/certificate_provider/certificate_provider_factory.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_audit_logger_registry.cc b/src/core/xds/grpc/xds_audit_logger_registry.cc index 7ec3a98edf1..ef041a4c933 100644 --- a/src/core/xds/grpc/xds_audit_logger_registry.cc +++ b/src/core/xds/grpc/xds_audit_logger_registry.cc @@ -28,9 +28,9 @@ #include -#include "src/core/lib/gprpp/match.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/lib/security/authorization/audit_logging.h" +#include "src/core/util/match.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_common_types_parser.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..92f7aadd302 100644 --- a/src/core/xds/grpc/xds_audit_logger_registry.h +++ b/src/core/xds/grpc/xds_audit_logger_registry.h @@ -25,8 +25,8 @@ #include -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/util/json/json.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/xds_client/xds_resource_type.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_bootstrap_grpc.cc b/src/core/xds/grpc/xds_bootstrap_grpc.cc index 87b3541ced6..34fbd8f1331 100644 --- a/src/core/xds/grpc/xds_bootstrap_grpc.cc +++ b/src/core/xds/grpc/xds_bootstrap_grpc.cc @@ -34,11 +34,12 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_object_loader.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/string.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_bootstrap_grpc.h b/src/core/xds/grpc/xds_bootstrap_grpc.h index 24c47e2eccb..ba13d2bddf3 100644 --- a/src/core/xds/grpc/xds_bootstrap_grpc.h +++ b/src/core/xds/grpc/xds_bootstrap_grpc.h @@ -28,10 +28,11 @@ #include -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/certificate_provider_store.h" #include "src/core/xds/grpc/xds_audit_logger_registry.h" #include "src/core/xds/grpc/xds_cluster_specifier_plugin.h" diff --git a/src/core/xds/grpc/xds_certificate_provider.h b/src/core/xds/grpc/xds_certificate_provider.h index 6c64de04571..52b535af2db 100644 --- a/src/core/xds/grpc/xds_certificate_provider.h +++ b/src/core/xds/grpc/xds_certificate_provider.h @@ -31,12 +31,12 @@ #include #include -#include "src/core/lib/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/matchers/matchers.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" +#include "src/core/util/matchers.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_client_grpc.cc b/src/core/xds/grpc/xds_client_grpc.cc index e3092c16f42..81425bb5d21 100644 --- a/src/core/xds/grpc/xds_client_grpc.cc +++ b/src/core/xds/grpc/xds_client_grpc.cc @@ -43,19 +43,19 @@ #include "src/core/lib/debug/trace.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/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/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/transport/error_utils.h" #include "src/core/telemetry/metrics.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/env.h" +#include "src/core/util/load_file.h" +#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/upb_utils.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_transport_grpc.h" diff --git a/src/core/xds/grpc/xds_client_grpc.h b/src/core/xds/grpc/xds_client_grpc.h index babfbf4bc37..3093bcab198 100644 --- a/src/core/xds/grpc/xds_client_grpc.h +++ b/src/core/xds/grpc/xds_client_grpc.h @@ -26,11 +26,11 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/telemetry/metrics.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/useful.h" #include "src/core/xds/grpc/certificate_provider_store.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" diff --git a/src/core/xds/grpc/xds_cluster.cc b/src/core/xds/grpc/xds_cluster.cc index 1f0c6b05cbf..1de3379682e 100644 --- a/src/core/xds/grpc/xds_cluster.cc +++ b/src/core/xds/grpc/xds_cluster.cc @@ -19,9 +19,9 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" -#include "src/core/lib/gprpp/match.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/match.h" +#include "src/core/util/time.h" #include "src/core/xds/grpc/xds_common_types.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_cluster_parser.cc b/src/core/xds/grpc/xds_cluster_parser.cc index bcf07881f4c..53a88d6ef9a 100644 --- a/src/core/xds/grpc/xds_cluster_parser.cc +++ b/src/core/xds/grpc/xds_cluster_parser.cc @@ -49,11 +49,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/time.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/load_balancing/lb_policy_registry.h" +#include "src/core/util/host_port.h" +#include "src/core/util/time.h" #include "src/core/util/upb_utils.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_common_types_parser.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..4735ab749bc 100644 --- a/src/core/xds/grpc/xds_cluster_specifier_plugin.h +++ b/src/core/xds/grpc/xds_cluster_specifier_plugin.h @@ -27,8 +27,8 @@ #include -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/util/json/json.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_common_types.cc b/src/core/xds/grpc/xds_common_types.cc index bb169304c68..f1a84590602 100644 --- a/src/core/xds/grpc/xds_common_types.cc +++ b/src/core/xds/grpc/xds_common_types.cc @@ -20,7 +20,7 @@ #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" -#include "src/core/lib/gprpp/match.h" +#include "src/core/util/match.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_common_types.h b/src/core/xds/grpc/xds_common_types.h index 2b0c746a5d1..5bd838f1b77 100644 --- a/src/core/xds/grpc/xds_common_types.h +++ b/src/core/xds/grpc/xds_common_types.h @@ -23,9 +23,9 @@ #include "absl/strings/string_view.h" #include "absl/types/variant.h" -#include "src/core/lib/gprpp/validation_errors.h" -#include "src/core/lib/matchers/matchers.h" #include "src/core/util/json/json.h" +#include "src/core/util/matchers.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_common_types_parser.cc b/src/core/xds/grpc/xds_common_types_parser.cc index 8b617a6143d..8470b87d6b1 100644 --- a/src/core/xds/grpc/xds_common_types_parser.cc +++ b/src/core/xds/grpc/xds_common_types_parser.cc @@ -44,7 +44,7 @@ #include #include -#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/upb_utils.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" diff --git a/src/core/xds/grpc/xds_common_types_parser.h b/src/core/xds/grpc/xds_common_types_parser.h index 4d145394166..0db17b5f847 100644 --- a/src/core/xds/grpc/xds_common_types_parser.h +++ b/src/core/xds/grpc/xds_common_types_parser.h @@ -24,8 +24,8 @@ #include "google/protobuf/struct.upb.h" #include "google/protobuf/wrappers.upb.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/xds/grpc/xds_common_types.h" #include "src/core/xds/xds_client/xds_resource_type.h" diff --git a/src/core/xds/grpc/xds_endpoint.h b/src/core/xds/grpc/xds_endpoint.h index e0bbc7c3934..191a3b73b42 100644 --- a/src/core/xds/grpc/xds_endpoint.h +++ b/src/core/xds/grpc/xds_endpoint.h @@ -25,10 +25,10 @@ #include "absl/base/thread_annotations.h" #include "absl/random/random.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/resolver/endpoint_addresses.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" #include "src/core/xds/xds_client/xds_client_stats.h" #include "src/core/xds/xds_client/xds_resource_type.h" #include "src/core/xds/xds_client/xds_resource_type_impl.h" diff --git a/src/core/xds/grpc/xds_endpoint_parser.cc b/src/core/xds/grpc/xds_endpoint_parser.cc index 011a739c4a1..bc11c1651e4 100644 --- a/src/core/xds/grpc/xds_endpoint_parser.cc +++ b/src/core/xds/grpc/xds_endpoint_parser.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/env.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/lib/iomgr/resolved_address.h" +#include "src/core/util/env.h" #include "src/core/util/string.h" #include "src/core/util/upb_utils.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types_parser.h" #include "src/core/xds/grpc/xds_health_status.h" #include "src/core/xds/xds_client/xds_resource_type.h" diff --git a/src/core/xds/grpc/xds_http_fault_filter.cc b/src/core/xds/grpc/xds_http_fault_filter.cc index 6bc74df8203..bf078f9d0d0 100644 --- a/src/core/xds/grpc/xds_http_fault_filter.cc +++ b/src/core/xds/grpc/xds_http_fault_filter.cc @@ -39,11 +39,11 @@ #include "src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/status_util.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/lib/transport/status_conversion.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_common_types_parser.h" #include "src/core/xds/grpc/xds_http_filter.h" diff --git a/src/core/xds/grpc/xds_http_fault_filter.h b/src/core/xds/grpc/xds_http_fault_filter.h index c269ff17f05..d36b7761e17 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_filter.h" #include "src/core/xds/xds_client/xds_resource_type.h" diff --git a/src/core/xds/grpc/xds_http_filter.h b/src/core/xds/grpc/xds_http_filter.h index 8a9c54c6ef8..888b5db75b0 100644 --- a/src/core/xds/grpc/xds_http_filter.h +++ b/src/core/xds/grpc/xds_http_filter.h @@ -27,10 +27,10 @@ #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/lib/transport/interception_chain.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/xds_client/xds_resource_type.h" diff --git a/src/core/xds/grpc/xds_http_filter_registry.h b/src/core/xds/grpc/xds_http_filter_registry.h index 37950d01f15..79547d35d86 100644 --- a/src/core/xds/grpc/xds_http_filter_registry.h +++ b/src/core/xds/grpc/xds_http_filter_registry.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/gprpp/validation_errors.h" #include "src/core/lib/transport/interception_chain.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_http_filter.h" #include "src/core/xds/xds_client/xds_resource_type.h" diff --git a/src/core/xds/grpc/xds_http_gcp_authn_filter.cc b/src/core/xds/grpc/xds_http_gcp_authn_filter.cc index 3378284c9c2..72e964fe74a 100644 --- a/src/core/xds/grpc/xds_http_gcp_authn_filter.cc +++ b/src/core/xds/grpc/xds_http_gcp_authn_filter.cc @@ -30,9 +30,9 @@ #include "src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h" #include "src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_common_types_parser.h" #include "src/core/xds/grpc/xds_http_filter.h" diff --git a/src/core/xds/grpc/xds_http_gcp_authn_filter.h b/src/core/xds/grpc/xds_http_gcp_authn_filter.h index 662e2c456a7..5a015e2ad81 100644 --- a/src/core/xds/grpc/xds_http_gcp_authn_filter.h +++ b/src/core/xds/grpc/xds_http_gcp_authn_filter.h @@ -24,7 +24,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_filter.h" #include "src/core/xds/xds_client/xds_resource_type.h" diff --git a/src/core/xds/grpc/xds_http_rbac_filter.cc b/src/core/xds/grpc/xds_http_rbac_filter.cc index 4508ae41b9b..381a2c31fdb 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 c7550575b72..47a0f01c33c 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_filter.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 8216d51ad06..a1442a1f392 100644 --- a/src/core/xds/grpc/xds_http_stateful_session_filter.cc +++ b/src/core/xds/grpc/xds_http_stateful_session_filter.cc @@ -35,11 +35,11 @@ #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/json/json.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/time.h" #include "src/core/util/upb_utils.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_common_types_parser.h" #include "src/core/xds/grpc/xds_http_filter.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 28df742b6c2..8327a7759f0 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_filter.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 67b98058272..f126855eb2b 100644 --- a/src/core/xds/grpc/xds_lb_policy_registry.cc +++ b/src/core/xds/grpc/xds_lb_policy_registry.cc @@ -36,9 +36,9 @@ #include #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/load_balancing/lb_policy_registry.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_common_types_parser.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..2396cb8a88d 100644 --- a/src/core/xds/grpc/xds_lb_policy_registry.h +++ b/src/core/xds/grpc/xds_lb_policy_registry.h @@ -25,8 +25,8 @@ #include -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/util/json/json.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/xds_client/xds_resource_type.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_listener.cc b/src/core/xds/grpc/xds_listener.cc index 46b971d7692..c67483c41a6 100644 --- a/src/core/xds/grpc/xds_listener.cc +++ b/src/core/xds/grpc/xds_listener.cc @@ -21,7 +21,7 @@ #include "absl/strings/str_join.h" #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/gprpp/match.h" +#include "src/core/util/match.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_listener.h b/src/core/xds/grpc/xds_listener.h index f6d49bf3f31..29b51923283 100644 --- a/src/core/xds/grpc/xds_listener.h +++ b/src/core/xds/grpc/xds_listener.h @@ -30,8 +30,8 @@ #include "absl/types/optional.h" #include "absl/types/variant.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/resolved_address.h" +#include "src/core/util/time.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_http_filter.h" #include "src/core/xds/grpc/xds_route_config.h" diff --git a/src/core/xds/grpc/xds_listener_parser.cc b/src/core/xds/grpc/xds_listener_parser.cc index e16efa43fae..3449b5875da 100644 --- a/src/core/xds/grpc/xds_listener_parser.cc +++ b/src/core/xds/grpc/xds_listener_parser.cc @@ -50,12 +50,11 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/match.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/lib/iomgr/sockaddr.h" -#include "src/core/lib/matchers/matchers.h" +#include "src/core/util/host_port.h" +#include "src/core/util/match.h" #include "src/core/util/upb_utils.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_common_types_parser.h" #include "src/core/xds/grpc/xds_route_config_parser.h" diff --git a/src/core/xds/grpc/xds_metadata.h b/src/core/xds/grpc/xds_metadata.h index 4e784d90d25..94857712136 100644 --- a/src/core/xds/grpc/xds_metadata.h +++ b/src/core/xds/grpc/xds_metadata.h @@ -25,10 +25,10 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" -#include "src/core/lib/gprpp/down_cast.h" -#include "src/core/lib/gprpp/validation_errors.h" +#include "src/core/util/down_cast.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/validation_errors.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_metadata_parser.cc b/src/core/xds/grpc/xds_metadata_parser.cc index 90f11a79cae..cb355371c47 100644 --- a/src/core/xds/grpc/xds_metadata_parser.cc +++ b/src/core/xds/grpc/xds_metadata_parser.cc @@ -26,10 +26,10 @@ #include "upb/base/string_view.h" #include "upb/text/encode.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/string.h" #include "src/core/util/upb_utils.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_common_types_parser.h" diff --git a/src/core/xds/grpc/xds_metadata_parser.h b/src/core/xds/grpc/xds_metadata_parser.h index f3d0a522ab1..a3cca589308 100644 --- a/src/core/xds/grpc/xds_metadata_parser.h +++ b/src/core/xds/grpc/xds_metadata_parser.h @@ -19,7 +19,7 @@ #include "envoy/config/core/v3/base.upb.h" -#include "src/core/lib/gprpp/validation_errors.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_metadata.h" #include "src/core/xds/xds_client/xds_resource_type.h" diff --git a/src/core/xds/grpc/xds_route_config.cc b/src/core/xds/grpc/xds_route_config.cc index 3c6bbe7f8a5..82d670207ee 100644 --- a/src/core/xds/grpc/xds_route_config.cc +++ b/src/core/xds/grpc/xds_route_config.cc @@ -27,8 +27,8 @@ #include "absl/types/variant.h" #include "re2/re2.h" -#include "src/core/lib/gprpp/match.h" -#include "src/core/lib/matchers/matchers.h" +#include "src/core/util/match.h" +#include "src/core/util/matchers.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_route_config.h b/src/core/xds/grpc/xds_route_config.h index c0d57b78517..b6af799af1c 100644 --- a/src/core/xds/grpc/xds_route_config.h +++ b/src/core/xds/grpc/xds_route_config.h @@ -30,8 +30,8 @@ #include "re2/re2.h" #include "src/core/lib/channel/status_util.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/matchers/matchers.h" +#include "src/core/util/matchers.h" +#include "src/core/util/time.h" #include "src/core/xds/grpc/xds_http_filter.h" #include "src/core/xds/xds_client/xds_resource_type.h" #include "src/core/xds/xds_client/xds_resource_type_impl.h" diff --git a/src/core/xds/grpc/xds_route_config_parser.cc b/src/core/xds/grpc/xds_route_config_parser.cc index d23f162456a..55ffc7ced1a 100644 --- a/src/core/xds/grpc/xds_route_config_parser.cc +++ b/src/core/xds/grpc/xds_route_config_parser.cc @@ -61,15 +61,15 @@ #include "src/core/lib/channel/status_util.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" -#include "src/core/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/lib/matchers/matchers.h" #include "src/core/load_balancing/lb_policy_registry.h" +#include "src/core/util/env.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/match.h" +#include "src/core/util/matchers.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/string.h" +#include "src/core/util/time.h" #include "src/core/util/upb_utils.h" #include "src/core/xds/grpc/xds_cluster_specifier_plugin.h" #include "src/core/xds/grpc/xds_common_types.h" diff --git a/src/core/xds/grpc/xds_route_config_parser.h b/src/core/xds/grpc/xds_route_config_parser.h index 2523f8caa7a..644c55e7198 100644 --- a/src/core/xds/grpc/xds_route_config_parser.h +++ b/src/core/xds/grpc/xds_route_config_parser.h @@ -36,9 +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/lib/matchers/matchers.h" +#include "src/core/util/time.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_cluster_specifier_plugin.h" #include "src/core/xds/grpc/xds_http_filter.h" diff --git a/src/core/xds/grpc/xds_routing.cc b/src/core/xds/grpc/xds_routing.cc index 2a3a29088d8..2d8668326be 100644 --- a/src/core/xds/grpc/xds_routing.cc +++ b/src/core/xds/grpc/xds_routing.cc @@ -34,7 +34,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/matchers/matchers.h" +#include "src/core/util/matchers.h" #include "src/core/xds/grpc/xds_http_filter.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_server_grpc.h b/src/core/xds/grpc/xds_server_grpc.h index 261cbbb45e7..9efc7fe8bd7 100644 --- a/src/core/xds/grpc/xds_server_grpc.h +++ b/src/core/xds/grpc/xds_server_grpc.h @@ -20,12 +20,12 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/lib/security/credentials/channel_creds_registry.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/xds_client/xds_bootstrap.h" namespace grpc_core { diff --git a/src/core/xds/grpc/xds_transport_grpc.cc b/src/core/xds/grpc/xds_transport_grpc.cc index 6af60f0516d..435a07083ba 100644 --- a/src/core/xds/grpc/xds_transport_grpc.cc +++ b/src/core/xds/grpc/xds_transport_grpc.cc @@ -42,10 +42,6 @@ #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/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/iomgr/closure.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset_set.h" @@ -58,6 +54,10 @@ #include "src/core/lib/surface/init_internally.h" #include "src/core/lib/surface/lame_client.h" #include "src/core/lib/transport/connectivity_state.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/xds_client/xds_bootstrap.h" diff --git a/src/core/xds/grpc/xds_transport_grpc.h b/src/core/xds/grpc/xds_transport_grpc.h index fc951f07594..90ff36aa41c 100644 --- a/src/core/xds/grpc/xds_transport_grpc.h +++ b/src/core/xds/grpc/xds_transport_grpc.h @@ -29,12 +29,12 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/surface/channel.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/xds/xds_client/xds_bootstrap.h" #include "src/core/xds/xds_client/xds_transport.h" diff --git a/src/core/xds/xds_client/xds_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 181bfbd3bba..5eb81d55af7 100644 --- a/src/core/xds/xds_client/xds_client.cc +++ b/src/core/xds/xds_client/xds_client.cc @@ -46,14 +46,14 @@ #include #include -#include "src/core/lib/backoff/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/lib/iomgr/exec_ctx.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/backoff.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" #include "src/core/util/upb_utils.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" #include "src/core/xds/xds_client/xds_client_stats.h" diff --git a/src/core/xds/xds_client/xds_client.h b/src/core/xds/xds_client/xds_client.h index 0535984afc2..d8afa1858bf 100644 --- a/src/core/xds/xds_client/xds_client.h +++ b/src/core/xds/xds_client/xds_client.h @@ -34,14 +34,14 @@ #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/lib/uri/uri_parser.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/uri.h" +#include "src/core/util/work_serializer.h" #include "src/core/xds/xds_client/xds_api.h" #include "src/core/xds/xds_client/xds_bootstrap.h" #include "src/core/xds/xds_client/xds_client_stats.h" diff --git a/src/core/xds/xds_client/xds_client_stats.cc b/src/core/xds/xds_client/xds_client_stats.cc index 3219b224a9e..12538303a53 100644 --- a/src/core/xds/xds_client/xds_client_stats.cc +++ b/src/core/xds/xds_client/xds_client_stats.cc @@ -23,7 +23,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..de9f924120d 100644 --- a/src/core/xds/xds_client/xds_client_stats.h +++ b/src/core/xds/xds_client/xds_client_stats.h @@ -31,12 +31,12 @@ #include -#include "src/core/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/resolver/endpoint_addresses.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/per_cpu.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" #include "src/core/util/useful.h" #include "src/core/xds/xds_client/xds_bootstrap.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 78c0bd16002..ac480c87153 100644 --- a/src/cpp/client/client_context.cc +++ b/src/cpp/client/client_context.cc @@ -41,7 +41,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..5c1804fbc66 100644 --- a/src/cpp/client/secure_credentials.cc +++ b/src/cpp/client/secure_credentials.cc @@ -47,11 +47,11 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/load_file.h" #include "src/core/lib/security/util/json_util.h" +#include "src/core/util/env.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" +#include "src/core/util/load_file.h" #include "src/cpp/common/secure_auth_context.h" #include "src/cpp/server/thread_pool_interface.h" diff --git a/src/cpp/common/alarm.cc b/src/cpp/common/alarm.cc index 041584eb489..770b07085e3 100644 --- a/src/cpp/common/alarm.cc +++ b/src/cpp/common/alarm.cc @@ -33,10 +33,10 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/completion_queue.h" +#include "src/core/util/time.h" namespace grpc { diff --git a/src/cpp/common/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..8da3e971c22 100644 --- a/src/cpp/common/secure_auth_context.h +++ b/src/cpp/common/secure_auth_context.h @@ -26,8 +26,8 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/context/security_context.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc { diff --git a/src/cpp/common/secure_create_auth_context.cc b/src/cpp/common/secure_create_auth_context.cc index 4658321520f..8492655b4aa 100644 --- a/src/cpp/common/secure_create_auth_context.cc +++ b/src/cpp/common/secure_create_auth_context.cc @@ -21,8 +21,8 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/context/security_context.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/cpp/common/secure_auth_context.h" namespace grpc { diff --git a/src/cpp/common/validate_service_config.cc b/src/cpp/common/validate_service_config.cc index bdd92f60e1a..f8f662d87b3 100644 --- a/src/cpp/common/validate_service_config.cc +++ b/src/cpp/common/validate_service_config.cc @@ -25,9 +25,9 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc { namespace experimental { diff --git a/src/cpp/ext/csm/BUILD b/src/cpp/ext/csm/BUILD index 6ee6bef1d4a..cfa4dd822cb 100644 --- a/src/cpp/ext/csm/BUILD +++ b/src/cpp/ext/csm/BUILD @@ -62,7 +62,7 @@ grpc_cc_library( "//:gpr_platform", "//:grpc_base", "//:protobuf_struct_upb", - "//:uri_parser", + "//:uri", "//src/core:channel_args", "//src/core:env", "//src/core:error", diff --git a/src/cpp/ext/csm/csm_observability.cc b/src/cpp/ext/csm/csm_observability.cc index c924db3fbdc..a5f61794660 100644 --- a/src/cpp/ext/csm/csm_observability.cc +++ b/src/cpp/ext/csm/csm_observability.cc @@ -35,7 +35,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/uri.h" #include "src/core/xds/grpc/xds_enabled_server.h" #include "src/cpp/ext/csm/metadata_exchange.h" #include "src/cpp/ext/otel/otel_plugin.h" diff --git a/src/cpp/ext/csm/metadata_exchange.cc b/src/cpp/ext/csm/metadata_exchange.cc index 21abe5029eb..bd922460fb9 100644 --- a/src/cpp/ext/csm/metadata_exchange.cc +++ b/src/cpp/ext/csm/metadata_exchange.cc @@ -39,14 +39,14 @@ #include #include -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/load_file.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/env.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" #include "src/core/util/json/json_reader.h" +#include "src/core/util/load_file.h" #include "src/cpp/ext/otel/key_value_iterable.h" namespace grpc { diff --git a/src/cpp/ext/filters/census/client_filter.cc b/src/cpp/ext/filters/census/client_filter.cc index cf0aac4c0d2..001c1fa8d18 100644 --- a/src/cpp/ext/filters/census/client_filter.cc +++ b/src/cpp/ext/filters/census/client_filter.cc @@ -53,7 +53,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/slice/slice.h" @@ -62,6 +61,7 @@ #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" #include "src/core/telemetry/tcp_tracer.h" +#include "src/core/util/sync.h" #include "src/cpp/ext/filters/census/context.h" #include "src/cpp/ext/filters/census/grpc_plugin.h" #include "src/cpp/ext/filters/census/measures.h" diff --git a/src/cpp/ext/filters/census/open_census_call_tracer.h b/src/cpp/ext/filters/census/open_census_call_tracer.h index 15575be5bb0..2b98d4cb861 100644 --- a/src/cpp/ext/filters/census/open_census_call_tracer.h +++ b/src/cpp/ext/filters/census/open_census_call_tracer.h @@ -38,7 +38,6 @@ #include #include -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/slice/slice.h" @@ -47,6 +46,7 @@ #include "src/core/lib/transport/transport.h" #include "src/core/telemetry/call_tracer.h" #include "src/core/telemetry/tcp_tracer.h" +#include "src/core/util/sync.h" // TODO(yashykt): This might not be the right place for this channel arg, but we // don't have a better place for this right now. diff --git a/src/cpp/ext/gcp/environment_autodetect.cc b/src/cpp/ext/gcp/environment_autodetect.cc index 90e958c55b2..77f74608ee3 100644 --- a/src/cpp/ext/gcp/environment_autodetect.cc +++ b/src/cpp/ext/gcp/environment_autodetect.cc @@ -35,12 +35,6 @@ #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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -48,7 +42,13 @@ #include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" #include "src/core/util/gcp_metadata_query.h" +#include "src/core/util/load_file.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" namespace grpc { namespace internal { diff --git a/src/cpp/ext/gcp/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..f6ffcf94d6a 100644 --- a/src/cpp/ext/gcp/observability_config.cc +++ b/src/cpp/ext/gcp/observability_config.cc @@ -32,15 +32,15 @@ #include #include -#include "src/core/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/lib/iomgr/error.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/util/env.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" +#include "src/core/util/load_file.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/validation_errors.h" namespace grpc { namespace internal { diff --git a/src/cpp/ext/gcp/observability_config.h b/src/cpp/ext/gcp/observability_config.h index 8854f860c95..5fb18f3fae6 100644 --- a/src/cpp/ext/gcp/observability_config.h +++ b/src/cpp/ext/gcp/observability_config.h @@ -29,10 +29,10 @@ #include -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/validation_errors.h" namespace grpc { namespace internal { diff --git a/src/cpp/ext/gcp/observability_logging_sink.cc b/src/cpp/ext/gcp/observability_logging_sink.cc index 27cbdb78c7d..0a370d87606 100644 --- a/src/cpp/ext/gcp/observability_logging_sink.cc +++ b/src/cpp/ext/gcp/observability_logging_sink.cc @@ -43,10 +43,10 @@ #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/json/json.h" +#include "src/core/util/time.h" +#include "src/core/util/uuid_v4.h" #include "src/cpp/ext/filters/census/open_census_call_tracer.h" // IWYU pragma: no_include "google/protobuf/struct.pb.h" diff --git a/src/cpp/ext/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 8e75cb82bba..88750fca3e3 100644 --- a/src/cpp/ext/otel/otel_client_call_tracer.cc +++ b/src/cpp/ext/otel/otel_client_call_tracer.cc @@ -47,13 +47,13 @@ #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/status_util.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/telemetry/tcp_tracer.h" +#include "src/core/util/sync.h" #include "src/cpp/ext/otel/key_value_iterable.h" #include "src/cpp/ext/otel/otel_plugin.h" diff --git a/src/cpp/ext/otel/otel_client_call_tracer.h b/src/cpp/ext/otel/otel_client_call_tracer.h index ed435311b20..c94219f2152 100644 --- a/src/cpp/ext/otel/otel_client_call_tracer.h +++ b/src/cpp/ext/otel/otel_client_call_tracer.h @@ -32,7 +32,6 @@ #include #include -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/slice/slice.h" @@ -41,6 +40,7 @@ #include "src/core/lib/transport/transport.h" #include "src/core/telemetry/call_tracer.h" #include "src/core/telemetry/tcp_tracer.h" +#include "src/core/util/sync.h" #include "src/cpp/ext/otel/otel_plugin.h" namespace grpc { diff --git a/src/cpp/ext/otel/otel_plugin.cc b/src/cpp/ext/otel/otel_plugin.cc index 44c653d58b8..c904df2e40a 100644 --- a/src/cpp/ext/otel/otel_plugin.cc +++ b/src/cpp/ext/otel/otel_plugin.cc @@ -37,9 +37,9 @@ #include "src/core/client_channel/client_channel_filter.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/match.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/match.h" #include "src/cpp/ext/otel/key_value_iterable.h" #include "src/cpp/ext/otel/otel_client_call_tracer.h" #include "src/cpp/ext/otel/otel_server_call_tracer.h" diff --git a/src/cpp/server/external_connection_acceptor_impl.h b/src/cpp/server/external_connection_acceptor_impl.h index 1d32263e604..3e23eb8a0c0 100644 --- a/src/cpp/server/external_connection_acceptor_impl.h +++ b/src/cpp/server/external_connection_acceptor_impl.h @@ -26,8 +26,8 @@ #include #include -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/tcp_server.h" +#include "src/core/util/sync.h" namespace grpc { namespace internal { diff --git a/src/cpp/server/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 d7cbad32455..80210b4af7d 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 @@ -35,8 +35,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 9cc09c9909e..45829844e8f 100644 --- a/src/cpp/server/orca/orca_service.cc +++ b/src/cpp/server/orca/orca_service.cc @@ -45,12 +45,12 @@ #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/lib/iomgr/exec_ctx.h" #include "src/core/load_balancing/backend_metric_data.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/cpp/server/backend_metric_recorder.h" namespace grpc { diff --git a/src/cpp/server/server_cc.cc b/src/cpp/server/server_cc.cc index d229e279a61..8996e78b4d8 100644 --- a/src/cpp/server/server_cc.cc +++ b/src/cpp/server/server_cc.cc @@ -69,12 +69,12 @@ #include #include "src/core/ext/transport/inproc/inproc_transport.h" -#include "src/core/lib/gprpp/manual_constructor.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/resource_quota/api.h" #include "src/core/lib/surface/completion_queue.h" #include "src/core/server/server.h" +#include "src/core/util/manual_constructor.h" #include "src/cpp/client/create_channel_internal.h" #include "src/cpp/server/external_connection_acceptor_impl.h" #include "src/cpp/server/health/default_health_check_service.h" diff --git a/src/cpp/server/server_context.cc b/src/cpp/server/server_context.cc index 648fee9d5da..ed1080aeaf6 100644 --- a/src/cpp/server/server_context.cc +++ b/src/cpp/server/server_context.cc @@ -56,11 +56,11 @@ #include #include -#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/lib/resource_quota/arena.h" #include "src/core/lib/surface/call.h" +#include "src/core/util/crash.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/sync.h" #include "src/cpp/server/backend_metric_recorder.h" namespace grpc { 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..3128e1c6f41 100644 --- a/src/cpp/thread_manager/thread_manager.cc +++ b/src/cpp/thread_manager/thread_manager.cc @@ -24,10 +24,10 @@ #include "absl/log/log.h" #include "absl/strings/str_format.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/crash.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/thd.h" namespace grpc { diff --git a/src/cpp/thread_manager/thread_manager.h b/src/cpp/thread_manager/thread_manager.h index c15eaa2be86..2c201bc6098 100644 --- a/src/cpp/thread_manager/thread_manager.h +++ b/src/cpp/thread_manager/thread_manager.h @@ -21,10 +21,10 @@ #include -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/resource_quota/api.h" #include "src/core/lib/resource_quota/thread_quota.h" +#include "src/core/util/sync.h" +#include "src/core/util/thd.h" namespace grpc { diff --git a/src/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 84a9cc37deb..3af16866c12 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -417,8 +417,6 @@ CORE_SOURCE_FILES = [ 'src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc', 'src/core/lib/address_utils/parse_address.cc', 'src/core/lib/address_utils/sockaddr_utils.cc', - 'src/core/lib/backoff/backoff.cc', - 'src/core/lib/backoff/random_early_detection.cc', 'src/core/lib/channel/channel_args.cc', 'src/core/lib/channel/channel_args_preconditioning.cc', 'src/core/lib/channel/channel_stack.cc', @@ -434,7 +432,6 @@ CORE_SOURCE_FILES = [ 'src/core/lib/config/config_vars_non_generated.cc', 'src/core/lib/config/core_configuration.cc', 'src/core/lib/config/load_config.cc', - 'src/core/lib/debug/event_log.cc', 'src/core/lib/debug/trace.cc', 'src/core/lib/debug/trace_flags.cc', 'src/core/lib/event_engine/ares_resolver.cc', @@ -486,34 +483,6 @@ CORE_SOURCE_FILES = [ 'src/core/lib/event_engine/work_queue/basic_work_queue.cc', 'src/core/lib/experiments/config.cc', 'src/core/lib/experiments/experiments.cc', - 'src/core/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/glob.cc', - 'src/core/lib/gprpp/host_port.cc', - 'src/core/lib/gprpp/linux/env.cc', - 'src/core/lib/gprpp/load_file.cc', - 'src/core/lib/gprpp/mpscq.cc', - 'src/core/lib/gprpp/per_cpu.cc', - 'src/core/lib/gprpp/posix/directory_reader.cc', - 'src/core/lib/gprpp/posix/env.cc', - 'src/core/lib/gprpp/posix/stat.cc', - 'src/core/lib/gprpp/posix/thd.cc', - 'src/core/lib/gprpp/ref_counted_string.cc', - 'src/core/lib/gprpp/status_helper.cc', - 'src/core/lib/gprpp/strerror.cc', - 'src/core/lib/gprpp/tchar.cc', - 'src/core/lib/gprpp/time.cc', - 'src/core/lib/gprpp/time_averaged_stats.cc', - 'src/core/lib/gprpp/time_util.cc', - 'src/core/lib/gprpp/uuid_v4.cc', - 'src/core/lib/gprpp/validation_errors.cc', - 'src/core/lib/gprpp/windows/directory_reader.cc', - 'src/core/lib/gprpp/windows/env.cc', - 'src/core/lib/gprpp/windows/stat.cc', - 'src/core/lib/gprpp/windows/thd.cc', - 'src/core/lib/gprpp/work_serializer.cc', 'src/core/lib/iomgr/buffer_list.cc', 'src/core/lib/iomgr/call_combiner.cc', 'src/core/lib/iomgr/cfstream_handle.cc', @@ -537,11 +506,6 @@ CORE_SOURCE_FILES = [ 'src/core/lib/iomgr/executor.cc', 'src/core/lib/iomgr/fork_posix.cc', 'src/core/lib/iomgr/fork_windows.cc', - 'src/core/lib/iomgr/gethostname_fallback.cc', - 'src/core/lib/iomgr/gethostname_host_name_max.cc', - 'src/core/lib/iomgr/gethostname_sysconf.cc', - 'src/core/lib/iomgr/grpc_if_nametoindex_posix.cc', - 'src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc', 'src/core/lib/iomgr/internal_errqueue.cc', 'src/core/lib/iomgr/iocp_windows.cc', 'src/core/lib/iomgr/iomgr.cc', @@ -590,7 +554,6 @@ CORE_SOURCE_FILES = [ 'src/core/lib/iomgr/wakeup_fd_nospecial.cc', 'src/core/lib/iomgr/wakeup_fd_pipe.cc', 'src/core/lib/iomgr/wakeup_fd_posix.cc', - 'src/core/lib/matchers/matchers.cc', 'src/core/lib/promise/activity.cc', 'src/core/lib/promise/party.cc', 'src/core/lib/promise/sleep.cc', @@ -710,7 +673,6 @@ CORE_SOURCE_FILES = [ 'src/core/lib/transport/timeout_encoding.cc', 'src/core/lib/transport/transport.cc', 'src/core/lib/transport/transport_op_string.cc', - 'src/core/lib/uri/uri_parser.cc', 'src/core/load_balancing/address_filtering.cc', 'src/core/load_balancing/backend_metric_parser.cc', 'src/core/load_balancing/child_policy_handler.cc', @@ -805,7 +767,21 @@ CORE_SOURCE_FILES = [ 'src/core/tsi/transport_security_grpc.cc', 'src/core/util/alloc.cc', 'src/core/util/atm.cc', + 'src/core/util/backoff.cc', + 'src/core/util/crash.cc', + 'src/core/util/dump_args.cc', + 'src/core/util/event_log.cc', + 'src/core/util/examine_stack.cc', + 'src/core/util/fork.cc', 'src/core/util/gcp_metadata_query.cc', + 'src/core/util/gethostname_fallback.cc', + 'src/core/util/gethostname_host_name_max.cc', + 'src/core/util/gethostname_sysconf.cc', + 'src/core/util/glob.cc', + 'src/core/util/gpr_time.cc', + 'src/core/util/grpc_if_nametoindex_posix.cc', + 'src/core/util/grpc_if_nametoindex_unsupported.cc', + 'src/core/util/host_port.cc', 'src/core/util/http_client/format_request.cc', 'src/core/util/http_client/httpcli.cc', 'src/core/util/http_client/httpcli_security_connector.cc', @@ -817,24 +793,48 @@ CORE_SOURCE_FILES = [ 'src/core/util/json/json_writer.cc', 'src/core/util/latent_see.cc', 'src/core/util/linux/cpu.cc', + 'src/core/util/linux/env.cc', + 'src/core/util/load_file.cc', 'src/core/util/log.cc', + 'src/core/util/matchers.cc', + 'src/core/util/mpscq.cc', 'src/core/util/msys/tmpfile.cc', + 'src/core/util/per_cpu.cc', 'src/core/util/posix/cpu.cc', + 'src/core/util/posix/directory_reader.cc', + 'src/core/util/posix/env.cc', + 'src/core/util/posix/stat.cc', 'src/core/util/posix/string.cc', 'src/core/util/posix/sync.cc', + 'src/core/util/posix/thd.cc', 'src/core/util/posix/time.cc', 'src/core/util/posix/tmpfile.cc', + 'src/core/util/random_early_detection.cc', + 'src/core/util/ref_counted_string.cc', + 'src/core/util/status_helper.cc', + 'src/core/util/strerror.cc', 'src/core/util/string.cc', 'src/core/util/sync.cc', 'src/core/util/sync_abseil.cc', + 'src/core/util/tchar.cc', 'src/core/util/time.cc', + 'src/core/util/time_averaged_stats.cc', 'src/core/util/time_precise.cc', + 'src/core/util/time_util.cc', + 'src/core/util/uri.cc', + 'src/core/util/uuid_v4.cc', + 'src/core/util/validation_errors.cc', 'src/core/util/windows/cpu.cc', + 'src/core/util/windows/directory_reader.cc', + 'src/core/util/windows/env.cc', + 'src/core/util/windows/stat.cc', 'src/core/util/windows/string.cc', 'src/core/util/windows/string_util.cc', 'src/core/util/windows/sync.cc', + 'src/core/util/windows/thd.cc', 'src/core/util/windows/time.cc', 'src/core/util/windows/tmpfile.cc', + 'src/core/util/work_serializer.cc', 'src/core/xds/grpc/certificate_provider_store.cc', 'src/core/xds/grpc/file_watcher_certificate_provider_factory.cc', 'src/core/xds/grpc/xds_audit_logger_registry.cc', diff --git a/src/python/grpcio_observability/observability_lib_deps.py b/src/python/grpcio_observability/observability_lib_deps.py index 290c367b440..471b6603806 100644 --- a/src/python/grpcio_observability/observability_lib_deps.py +++ b/src/python/grpcio_observability/observability_lib_deps.py @@ -23,45 +23,45 @@ CC_FILES=[ 'grpc_root/src/core/lib/event_engine/thread_local.cc', 'grpc_root/src/core/lib/experiments/config.cc', 'grpc_root/src/core/lib/experiments/experiments.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/glob.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/lib/slice/slice.cc', 'grpc_root/src/core/lib/slice/slice_string_helpers.cc', 'grpc_root/src/core/util/alloc.cc', 'grpc_root/src/core/util/atm.cc', + 'grpc_root/src/core/util/crash.cc', + 'grpc_root/src/core/util/examine_stack.cc', + 'grpc_root/src/core/util/fork.cc', + 'grpc_root/src/core/util/glob.cc', + 'grpc_root/src/core/util/gpr_time.cc', + 'grpc_root/src/core/util/host_port.cc', 'grpc_root/src/core/util/iphone/cpu.cc', 'grpc_root/src/core/util/linux/cpu.cc', + 'grpc_root/src/core/util/linux/env.cc', 'grpc_root/src/core/util/log.cc', + 'grpc_root/src/core/util/mpscq.cc', 'grpc_root/src/core/util/msys/tmpfile.cc', 'grpc_root/src/core/util/posix/cpu.cc', + 'grpc_root/src/core/util/posix/env.cc', + 'grpc_root/src/core/util/posix/stat.cc', 'grpc_root/src/core/util/posix/string.cc', 'grpc_root/src/core/util/posix/sync.cc', + 'grpc_root/src/core/util/posix/thd.cc', 'grpc_root/src/core/util/posix/time.cc', 'grpc_root/src/core/util/posix/tmpfile.cc', + 'grpc_root/src/core/util/ref_counted_string.cc', + 'grpc_root/src/core/util/strerror.cc', 'grpc_root/src/core/util/string.cc', 'grpc_root/src/core/util/sync.cc', 'grpc_root/src/core/util/sync_abseil.cc', - 'grpc_root/src/core/util/time.cc', + 'grpc_root/src/core/util/tchar.cc', 'grpc_root/src/core/util/time_precise.cc', + 'grpc_root/src/core/util/time_util.cc', 'grpc_root/src/core/util/windows/cpu.cc', + 'grpc_root/src/core/util/windows/env.cc', + 'grpc_root/src/core/util/windows/stat.cc', 'grpc_root/src/core/util/windows/string.cc', 'grpc_root/src/core/util/windows/string_util.cc', 'grpc_root/src/core/util/windows/sync.cc', + 'grpc_root/src/core/util/windows/thd.cc', 'grpc_root/src/core/util/windows/time.cc', 'grpc_root/src/core/util/windows/tmpfile.cc', 'third_party/abseil-cpp/absl/base/internal/cycleclock.cc', diff --git a/test/core/address_utils/parse_address_with_named_scope_id_test.cc b/test/core/address_utils/parse_address_with_named_scope_id_test.cc index 19b21f35027..c8e85ad1e26 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,12 +37,12 @@ #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/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/iomgr/sockaddr.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/crash.h" +#include "src/core/util/host_port.h" +#include "src/core/util/uri.h" #include "test/core/test_util/test_config.h" static void test_grpc_parse_ipv6_parity_with_getaddrinfo( diff --git a/test/core/address_utils/sockaddr_utils_fuzzer_test.cc b/test/core/address_utils/sockaddr_utils_fuzzer_test.cc index 593d99dd0e3..8c63854a203 100644 --- a/test/core/address_utils/sockaddr_utils_fuzzer_test.cc +++ b/test/core/address_utils/sockaddr_utils_fuzzer_test.cc @@ -25,7 +25,7 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/uri.h" bool squelch = true; diff --git a/test/core/avl/BUILD b/test/core/avl/BUILD deleted file mode 100644 index 6ccf0c29b65..00000000000 --- a/test/core/avl/BUILD +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 2018 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. - -load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_package") -load("//test/core/test_util:grpc_fuzzer.bzl", "grpc_proto_fuzzer") - -licenses(["notice"]) - -grpc_package(name = "test/core/avl") - -grpc_cc_test( - name = "avl_test", - srcs = ["avl_test.cc"], - external_deps = ["gtest"], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:avl", - ], -) - -grpc_proto_fuzzer( - name = "avl_fuzzer", - srcs = ["avl_fuzzer.cc"], - corpus = "avl_fuzzer_corpus", - language = "C++", - proto = "avl_fuzzer.proto", - tags = ["no_windows"], - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:avl", - "//test/core/test_util:grpc_test_util", - ], -) diff --git a/test/core/backoff/BUILD b/test/core/backoff/BUILD deleted file mode 100644 index 8ce13b5f6e5..00000000000 --- a/test/core/backoff/BUILD +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 2016 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. - -load("//bazel:grpc_build_system.bzl", "grpc_cc_test") - -licenses(["notice"]) - -package( - features = [ - "-layering_check", - "-parse_headers", - ], -) - -grpc_cc_test( - name = "backoff_test", - srcs = ["backoff_test.cc"], - external_deps = ["gtest"], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//:backoff", - "//:grpc", - "//src/core:time", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "random_early_detection_test", - srcs = ["random_early_detection_test.cc"], - external_deps = [ - "absl/random", - "gtest", - ], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = ["//src/core:random_early_detection"], -) diff --git a/test/core/bad_client/bad_client.cc b/test/core/bad_client/bad_client.cc index 012dd6abddb..f338e2dc0a4 100644 --- a/test/core/bad_client/bad_client.cc +++ b/test/core/bad_client/bad_client.cc @@ -35,7 +35,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/endpoint_pair.h" @@ -45,6 +44,7 @@ #include "src/core/lib/transport/transport.h" #include "src/core/server/server.h" #include "src/core/util/string.h" +#include "src/core/util/thd.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/bad_client/tests/duplicate_header.cc b/test/core/bad_client/tests/duplicate_header.cc index c4ed690c5b2..b31c9663218 100644 --- a/test/core/bad_client/tests/duplicate_header.cc +++ b/test/core/bad_client/tests/duplicate_header.cc @@ -24,7 +24,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 a2afa61fd89..41bd7021a0f 100644 --- a/test/core/bad_connection/close_fd_test.cc +++ b/test/core/bad_connection/close_fd_test.cc @@ -36,8 +36,6 @@ #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/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -45,6 +43,8 @@ #include "src/core/lib/surface/channel_create.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" // This test won't work except with posix sockets enabled #ifdef GRPC_POSIX_SOCKET_TCP @@ -57,11 +57,11 @@ #include #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/endpoint_pair.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/completion_queue.h" #include "src/core/server/server.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/bad_ssl/bad_ssl_test.cc b/test/core/bad_ssl/bad_ssl_test.cc index c548e188706..51fad155944 100644 --- a/test/core/bad_ssl/bad_ssl_test.cc +++ b/test/core/bad_ssl/bad_ssl_test.cc @@ -34,8 +34,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/client_call_test.cc b/test/core/call/client_call_test.cc index 4a4ccfff0e8..ef9ba6cd1a4 100644 --- a/test/core/call/client_call_test.cc +++ b/test/core/call/client_call_test.cc @@ -19,9 +19,9 @@ #include #include -#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/transport/metadata.h" +#include "src/core/util/debug_location.h" #include "test/core/call/batch_builder.h" #include "test/core/call/yodel/yodel_test.h" diff --git a/test/core/call/yodel/fuzzer_main.cc b/test/core/call/yodel/fuzzer_main.cc index ce9075485f9..0f14c28eb51 100644 --- a/test/core/call/yodel/fuzzer_main.cc +++ b/test/core/call/yodel/fuzzer_main.cc @@ -23,7 +23,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 add0950e76f..7ccb97e7d6a 100644 --- a/test/core/call/yodel/yodel_test.h +++ b/test/core/call/yodel/yodel_test.h @@ -24,13 +24,13 @@ #include #include "src/core/lib/event_engine/event_engine_context.h" -#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/promise/cancel_callback.h" #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/transport/call_arena_allocator.h" #include "src/core/lib/transport/call_spine.h" #include "src/core/lib/transport/metadata.h" +#include "src/core/util/debug_location.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/channel/call_finalization_test.cc b/test/core/channel/call_finalization_test.cc index 2539d753ac3..9e7ba84794d 100644 --- a/test/core/channel/call_finalization_test.cc +++ b/test/core/channel/call_finalization_test.cc @@ -22,9 +22,9 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/promise/test_context.h" namespace grpc_core { diff --git a/test/core/channel/channel_args_test.cc b/test/core/channel/channel_args_test.cc index 09f65577f0e..bb19b352e21 100644 --- a/test/core/channel/channel_args_test.cc +++ b/test/core/channel/channel_args_test.cc @@ -30,10 +30,10 @@ #include #include -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/notification.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/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 10d4ee8e5fb..1c722beb282 100644 --- a/test/core/channel/channel_stack_test.cc +++ b/test/core/channel/channel_stack_test.cc @@ -27,8 +27,8 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/status_helper.h" #include "test/core/test_util/test_config.h" static grpc_error_handle channel_init_func(grpc_channel_element* elem, diff --git a/test/core/channel/server_call_tracer_factory_test.cc b/test/core/channel/server_call_tracer_factory_test.cc index fd4b2bac8d9..821087f9d93 100644 --- a/test/core/channel/server_call_tracer_factory_test.cc +++ b/test/core/channel/server_call_tracer_factory_test.cc @@ -17,9 +17,9 @@ #include "gtest/gtest.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/crash.h" namespace grpc_core { namespace { diff --git a/test/core/channelz/channelz_test.cc b/test/core/channelz/channelz_test.cc index 06d11c08b73..a43950eefbb 100644 --- a/test/core/channelz/channelz_test.cc +++ b/test/core/channelz/channelz_test.cc @@ -42,12 +42,12 @@ #include "src/core/channelz/channelz_registry.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/channel.h" #include "src/core/server/server.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" +#include "src/core/util/notification.h" #include "src/core/util/useful.h" #include "test/core/event_engine/event_engine_test_utils.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/client_channel/client_channel_service_config_test.cc b/test/core/client_channel/client_channel_service_config_test.cc index e0c108fdb8d..28ffddf7f31 100644 --- a/test/core/client_channel/client_channel_service_config_test.cc +++ b/test/core/client_channel/client_channel_service_config_test.cc @@ -25,10 +25,10 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" #include "src/core/service_config/service_config_parser.h" +#include "src/core/util/time.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/client_channel/retry_service_config_test.cc b/test/core/client_channel/retry_service_config_test.cc index 410f064c9ec..5578e18ed11 100644 --- a/test/core/client_channel/retry_service_config_test.cc +++ b/test/core/client_channel/retry_service_config_test.cc @@ -27,11 +27,11 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" #include "src/core/service_config/service_config_parser.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/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 db615d1b098..f76151aa9d3 100644 --- a/test/core/end2end/bad_server_response_test.cc +++ b/test/core/end2end/bad_server_response_test.cc @@ -40,10 +40,6 @@ #include #include "src/core/lib/event_engine/shim.h" -#include "src/core/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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -51,7 +47,11 @@ #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/tcp_server.h" #include "src/core/lib/slice/slice_string_helpers.h" +#include "src/core/util/host_port.h" +#include "src/core/util/notification.h" +#include "src/core/util/status_helper.h" #include "src/core/util/string.h" +#include "src/core/util/thd.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/connection_refused_test.cc b/test/core/end2end/connection_refused_test.cc index f753cf7a86e..436b2fb5730 100644 --- a/test/core/end2end/connection_refused_test.cc +++ b/test/core/end2end/connection_refused_test.cc @@ -33,8 +33,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/host_port.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/cq_verifier.cc b/test/core/end2end/cq_verifier.cc index cb9e62f8f6a..d1a322bc989 100644 --- a/test/core/end2end/cq_verifier.cc +++ b/test/core/end2end/cq_verifier.cc @@ -45,10 +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/lib/surface/event_string.h" +#include "src/core/util/crash.h" +#include "src/core/util/match.h" #include "test/core/test_util/build.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..44fc736e5ca 100644 --- a/test/core/end2end/dualstack_socket_test.cc +++ b/test/core/end2end/dualstack_socket_test.cc @@ -50,11 +50,11 @@ #include #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/socket_utils_posix.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/util/host_port.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/end2end_test_fuzzer.cc b/test/core/end2end/end2end_test_fuzzer.cc index 98cad6424b5..e74627117a2 100644 --- a/test/core/end2end/end2end_test_fuzzer.cc +++ b/test/core/end2end/end2end_test_fuzzer.cc @@ -33,10 +33,10 @@ #include "src/core/lib/config/config_vars.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/config.h" -#include "src/core/lib/gprpp/env.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/timer_manager.h" +#include "src/core/util/env.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/fixtures/h2_tls_common.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" diff --git a/test/core/end2end/end2end_test_suites.cc b/test/core/end2end/end2end_test_suites.cc index 72c06d9d2c2..70553f9782f 100644 --- a/test/core/end2end/end2end_test_suites.cc +++ b/test/core/end2end/end2end_test_suites.cc @@ -49,14 +49,14 @@ #include "src/core/ext/transport/chaotic_good/server/chaotic_good_server.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/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/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" +#include "src/core/util/env.h" +#include "src/core/util/host_port.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/sync.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/fixtures/h2_oauth2_common.h" #include "test/core/end2end/fixtures/h2_ssl_cred_reload_fixture.h" diff --git a/test/core/end2end/end2end_tests.cc b/test/core/end2end/end2end_tests.cc index 9443758ee5c..856b700711c 100644 --- a/test/core/end2end/end2end_tests.cc +++ b/test/core/end2end/end2end_tests.cc @@ -33,7 +33,7 @@ #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 a08321b6f69..12ddb76abbe 100644 --- a/test/core/end2end/end2end_tests.h +++ b/test/core/end2end/end2end_tests.h @@ -50,13 +50,13 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.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/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/surface/call_test_only.h" #include "src/core/lib/surface/channel.h" +#include "src/core/util/bitset.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/time.h" #include "test/core/call/batch_builder.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/event_engine/event_engine_test_utils.h" diff --git a/test/core/end2end/fixtures/http_proxy_fixture.cc b/test/core/end2end/fixtures/http_proxy_fixture.cc index 957fb7101f0..88b65d3de94 100644 --- a/test/core/end2end/fixtures/http_proxy_fixture.cc +++ b/test/core/end2end/fixtures/http_proxy_fixture.cc @@ -46,11 +46,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/iomgr/endpoint.h" @@ -64,7 +59,12 @@ #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/tcp_server.h" +#include "src/core/util/host_port.h" #include "src/core/util/http_client/parser.h" +#include "src/core/util/memory.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/thd.h" +#include "src/core/util/time.h" #include "test/core/test_util/port.h" struct grpc_end2end_http_proxy { diff --git a/test/core/end2end/fixtures/proxy.cc b/test/core/end2end/fixtures/proxy.cc index fd8a0f59763..1d78ebcd2b7 100644 --- a/test/core/end2end/fixtures/proxy.cc +++ b/test/core/end2end/fixtures/proxy.cc @@ -37,10 +37,10 @@ #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/lib/surface/call.h" +#include "src/core/util/crash.h" +#include "src/core/util/host_port.h" +#include "src/core/util/thd.h" #include "test/core/test_util/port.h" struct grpc_end2end_proxy { diff --git a/test/core/end2end/fixtures/secure_fixture.h b/test/core/end2end/fixtures/secure_fixture.h index fc9ef450c98..4586994981b 100644 --- a/test/core/end2end/fixtures/secure_fixture.h +++ b/test/core/end2end/fixtures/secure_fixture.h @@ -26,7 +26,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 8731ab05acf..cedc002695f 100644 --- a/test/core/end2end/fixtures/sockpair_fixture.h +++ b/test/core/end2end/fixtures/sockpair_fixture.h @@ -32,7 +32,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/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" @@ -43,6 +42,7 @@ #include "src/core/lib/surface/completion_queue.h" #include "src/core/lib/transport/transport.h" #include "src/core/server/server.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/fuzzers/api_fuzzer.cc b/test/core/end2end/fuzzers/api_fuzzer.cc index b92fdb5655c..c4e960a7d9a 100644 --- a/test/core/end2end/fuzzers/api_fuzzer.cc +++ b/test/core/end2end/fuzzers/api_fuzzer.cc @@ -49,10 +49,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/config.h" -#include "src/core/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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr_fwd.h" @@ -60,6 +56,10 @@ #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/env.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/libfuzzer/libfuzzer_macro.h" #include "test/core/end2end/data/ssl_test_data.h" #include "test/core/end2end/fuzzers/api_fuzzer.pb.h" diff --git a/test/core/end2end/fuzzers/client_fuzzer.cc b/test/core/end2end/fuzzers/client_fuzzer.cc index 3d9d1778d8f..9278eb8d0e5 100644 --- a/test/core/end2end/fuzzers/client_fuzzer.cc +++ b/test/core/end2end/fuzzers/client_fuzzer.cc @@ -27,15 +27,15 @@ #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/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/channel_create.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/env.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/libfuzzer/libfuzzer_macro.h" #include "test/core/end2end/fuzzers/api_fuzzer.pb.h" #include "test/core/end2end/fuzzers/fuzzer_input.pb.h" diff --git a/test/core/end2end/fuzzers/connector_fuzzer.cc b/test/core/end2end/fuzzers/connector_fuzzer.cc index d1d93789f47..319e822cd03 100644 --- a/test/core/end2end/fuzzers/connector_fuzzer.cc +++ b/test/core/end2end/fuzzers/connector_fuzzer.cc @@ -18,9 +18,9 @@ #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/gprpp/env.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/timer_manager.h" +#include "src/core/util/env.h" #include "test/core/end2end/fuzzers/fuzzer_input.pb.h" #include "test/core/end2end/fuzzers/network_input.h" #include "test/core/test_util/fuzz_config_vars.h" diff --git a/test/core/end2end/fuzzers/fuzzing_common.cc b/test/core/end2end/fuzzers/fuzzing_common.cc index 2597694bf3b..820af4ab182 100644 --- a/test/core/end2end/fuzzers/fuzzing_common.cc +++ b/test/core/end2end/fuzzers/fuzzing_common.cc @@ -38,13 +38,13 @@ #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/config.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/timer_manager.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/surface/channel.h" +#include "src/core/util/crash.h" #include "test/core/end2end/fuzzers/api_fuzzer.pb.h" namespace grpc_core { diff --git a/test/core/end2end/fuzzers/fuzzing_common.h b/test/core/end2end/fuzzers/fuzzing_common.h index 95c48fd4f7e..b365c698e2d 100644 --- a/test/core/end2end/fuzzers/fuzzing_common.h +++ b/test/core/end2end/fuzzers/fuzzing_common.h @@ -33,9 +33,9 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "test/core/end2end/fuzzers/api_fuzzer.pb.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h" diff --git a/test/core/end2end/fuzzers/network_input.h b/test/core/end2end/fuzzers/network_input.h index afb6490d81d..c036e88f1b9 100644 --- a/test/core/end2end/fuzzers/network_input.h +++ b/test/core/end2end/fuzzers/network_input.h @@ -15,8 +15,8 @@ #ifndef GRPC_TEST_CORE_END2END_FUZZERS_NETWORK_INPUT_H #define GRPC_TEST_CORE_END2END_FUZZERS_NETWORK_INPUT_H -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/endpoint.h" +#include "src/core/util/time.h" #include "test/core/end2end/fuzzers/fuzzer_input.pb.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" #include "test/core/test_util/fuzzing_channel_args.h" diff --git a/test/core/end2end/fuzzers/server_fuzzer.cc b/test/core/end2end/fuzzers/server_fuzzer.cc index 05fef731cc4..ebf7034caec 100644 --- a/test/core/end2end/fuzzers/server_fuzzer.cc +++ b/test/core/end2end/fuzzers/server_fuzzer.cc @@ -23,8 +23,8 @@ #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/iomgr/exec_ctx.h" +#include "src/core/util/env.h" #include "test/core/end2end/fuzzers/api_fuzzer.pb.h" #include "test/core/end2end/fuzzers/fuzzer_input.pb.h" #include "test/core/end2end/fuzzers/fuzzing_common.h" diff --git a/test/core/end2end/goaway_server_test.cc b/test/core/end2end/goaway_server_test.cc index edf58074223..2ebc094e210 100644 --- a/test/core/end2end/goaway_server_test.cc +++ b/test/core/end2end/goaway_server_test.cc @@ -47,8 +47,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -60,6 +58,8 @@ #include "src/core/lib/iomgr/socket_utils.h" #include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/time.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/h2_ssl_cert_test.cc b/test/core/end2end/h2_ssl_cert_test.cc index 84050e4c4e0..d9509266d0f 100644 --- a/test/core/end2end/h2_ssl_cert_test.cc +++ b/test/core/end2end/h2_ssl_cert_test.cc @@ -42,7 +42,7 @@ #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/util/tmpfile.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/data/ssl_test_data.h" diff --git a/test/core/end2end/h2_ssl_session_reuse_test.cc b/test/core/end2end/h2_ssl_session_reuse_test.cc index 6fd220719e5..882f09995e8 100644 --- a/test/core/end2end/h2_ssl_session_reuse_test.cc +++ b/test/core/end2end/h2_ssl_session_reuse_test.cc @@ -37,9 +37,9 @@ #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/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/host_port.h" #include "src/core/util/useful.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/port.h" diff --git a/test/core/end2end/h2_tls_peer_property_external_verifier_test.cc b/test/core/end2end/h2_tls_peer_property_external_verifier_test.cc index 24fc3e7c3c0..a9f74bed935 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 @@ -37,9 +37,9 @@ #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/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/host_port.h" #include "src/core/util/useful.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/port.h" diff --git a/test/core/end2end/invalid_call_argument_test.cc b/test/core/end2end/invalid_call_argument_test.cc index 572c441d74d..ee7caff77ca 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 6f16b24ca6b..5e8d9add4fd 100644 --- a/test/core/end2end/no_server_test.cc +++ b/test/core/end2end/no_server_test.cc @@ -35,12 +35,12 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/fake/fake_resolver.h" #include "src/core/resolver/resolver.h" #include "src/core/service_config/service_config.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/tests/bad_ping.cc b/test/core/end2end/tests/bad_ping.cc index edd8760f82b..1a556d5ee52 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 e4032f73036..a96ce818304 100644 --- a/test/core/end2end/tests/binary_metadata.cc +++ b/test/core/end2end/tests/binary_metadata.cc @@ -24,8 +24,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/call_creds.cc b/test/core/end2end/tests/call_creds.cc index fd89930a967..6448243374e 100644 --- a/test/core/end2end/tests/call_creds.cc +++ b/test/core/end2end/tests/call_creds.cc @@ -28,8 +28,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/security/credentials/credentials.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/call_host_override.cc b/test/core/end2end/tests/call_host_override.cc index 66b70c042af..ee847552969 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 e79e664332a..e22063354de 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 c1255ae7587..8ca9e005ba8 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 e5dec969c87..aeaf45bd2f1 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 fbc54a0f51e..00f268683a4 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 e1dae672c16..4673ade3698 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 910495eeac4..dcd363a1051 100644 --- a/test/core/end2end/tests/channelz.cc +++ b/test/core/end2end/tests/channelz.cc @@ -27,9 +27,9 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/surface/channel.h" #include "src/core/server/server.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" using testing::HasSubstr; diff --git a/test/core/end2end/tests/client_streaming.cc b/test/core/end2end/tests/client_streaming.cc index e01d63d8f60..2cf6a617556 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 dbe9c350696..cbae272da8e 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 2cbff38e352..a42853b538b 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 8a77719e401..feae6776991 100644 --- a/test/core/end2end/tests/filter_causes_close.cc +++ b/test/core/end2end/tests/filter_causes_close.cc @@ -30,9 +30,6 @@ #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/promise_based_filter.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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/promise/arena_promise.h" @@ -40,6 +37,9 @@ #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/filter_init_fails.cc b/test/core/end2end/tests/filter_init_fails.cc index c2b08486fee..5183489db1e 100644 --- a/test/core/end2end/tests/filter_init_fails.cc +++ b/test/core/end2end/tests/filter_init_fails.cc @@ -30,8 +30,6 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/promise/arena_promise.h" @@ -39,6 +37,8 @@ #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" using ::testing::AnyOf; diff --git a/test/core/end2end/tests/filtered_metadata.cc b/test/core/end2end/tests/filtered_metadata.cc index a16afba692a..5f14a22a85b 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 1cd6fccb2f4..34390d02f07 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 710535ea5d3..48553dd0357 100644 --- a/test/core/end2end/tests/grpc_authz.cc +++ b/test/core/end2end/tests/grpc_authz.cc @@ -24,10 +24,10 @@ #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/lib/security/authorization/authorization_policy_provider.h" #include "src/core/lib/security/authorization/grpc_authorization_policy_provider.h" +#include "src/core/util/notification.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/end2end/tests/high_initial_seqno.cc b/test/core/end2end/tests/high_initial_seqno.cc index 03228d34d37..e9dd5cd39a7 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 bbd783aa29f..766a00cbe99 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 a8de51639f7..51561dbbe17 100644 --- a/test/core/end2end/tests/http2_stats.cc +++ b/test/core/end2end/tests/http2_stats.cc @@ -33,9 +33,6 @@ #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/promise/context.h" @@ -48,6 +45,9 @@ #include "src/core/telemetry/call_tracer.h" #include "src/core/telemetry/metrics.h" #include "src/core/telemetry/tcp_tracer.h" +#include "src/core/util/notification.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/test_util/fake_stats_plugin.h" diff --git a/test/core/end2end/tests/invoke_large_request.cc b/test/core/end2end/tests/invoke_large_request.cc index 283ec5cb7ae..3302ee48e89 100644 --- a/test/core/end2end/tests/invoke_large_request.cc +++ b/test/core/end2end/tests/invoke_large_request.cc @@ -26,8 +26,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/keepalive_timeout.cc b/test/core/end2end/tests/keepalive_timeout.cc index 64b2aa09caa..9c94b653c84 100644 --- a/test/core/end2end/tests/keepalive_timeout.cc +++ b/test/core/end2end/tests/keepalive_timeout.cc @@ -27,8 +27,8 @@ #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/large_metadata.cc b/test/core/end2end/tests/large_metadata.cc index eb0da4d38db..9f053983980 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 badbec90b1c..1b0d301b724 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 3b13e36458e..0938eb2393c 100644 --- a/test/core/end2end/tests/max_connection_age.cc +++ b/test/core/end2end/tests/max_connection_age.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" #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 ab9371485ab..1dfbd2f6ede 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 92c7aa2f120..c1c5392c1bf 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 c6d9db38d16..976c198ecb8 100644 --- a/test/core/end2end/tests/no_logging.cc +++ b/test/core/end2end/tests/no_logging.cc @@ -37,7 +37,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" namespace grpc_core { diff --git a/test/core/end2end/tests/payload.cc b/test/core/end2end/tests/payload.cc index 06cd8a7b78e..31c5456dee4 100644 --- a/test/core/end2end/tests/payload.cc +++ b/test/core/end2end/tests/payload.cc @@ -22,8 +22,8 @@ #include -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/ping.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 3538e89d5fb..9cfd8bb92a9 100644 --- a/test/core/end2end/tests/ping_pong_streaming.cc +++ b/test/core/end2end/tests/ping_pong_streaming.cc @@ -20,8 +20,8 @@ #include -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/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 1b2db49211c..1dc13b5acd5 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 fe36ebdaaa8..60db5aae583 100644 --- a/test/core/end2end/tests/request_with_flags.cc +++ b/test/core/end2end/tests/request_with_flags.cc @@ -30,8 +30,8 @@ #include #include -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/time.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/tests/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..4b25143b5ec 100644 --- a/test/core/end2end/tests/resource_quota_server.cc +++ b/test/core/end2end/tests/resource_quota_server.cc @@ -31,9 +31,9 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/crash.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.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 57c1c825b4d..255d31ffe87 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 a5b932a7ea0..0fa65238d88 100644 --- a/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc +++ b/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc @@ -32,13 +32,13 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/end2end/tests/retry_cancellation.cc b/test/core/end2end/tests/retry_cancellation.cc index 37000c08bf9..fd26c53c513 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 d53c680037d..abe92f8f9ac 100644 --- a/test/core/end2end/tests/retry_lb_drop.cc +++ b/test/core/end2end/tests/retry_lb_drop.cc @@ -31,12 +31,12 @@ #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/load_balancing/lb_policy.h" #include "src/core/load_balancing/lb_policy_factory.h" #include "src/core/util/json/json.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/test_util/test_lb_policies.h" diff --git a/test/core/end2end/tests/retry_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 c3057f88161..1260785976a 100644 --- a/test/core/end2end/tests/retry_recv_message_replay.cc +++ b/test/core/end2end/tests/retry_recv_message_replay.cc @@ -30,14 +30,14 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" +#include "src/core/util/unique_type_name.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc b/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc index cdbd9b75449..ab8a0fe4e34 100644 --- a/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc +++ b/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc @@ -28,13 +28,13 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_send_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 825745ab96a..46ac40cff79 100644 --- a/test/core/end2end/tests/retry_send_op_fails.cc +++ b/test/core/end2end/tests/retry_send_op_fails.cc @@ -30,13 +30,13 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_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..57b081803ac 100644 --- a/test/core/end2end/tests/retry_streaming.cc +++ b/test/core/end2end/tests/retry_streaming.cc @@ -27,8 +27,8 @@ #include "src/core/channelz/channelz.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/surface/channel.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" using testing::HasSubstr; diff --git a/test/core/end2end/tests/retry_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 90cea14dd77..b68b5c14853 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 be68169cc26..40352a5148f 100644 --- a/test/core/end2end/tests/retry_transparent_goaway.cc +++ b/test/core/end2end/tests/retry_transparent_goaway.cc @@ -27,15 +27,15 @@ #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/lib/gprpp/unique_type_name.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" +#include "src/core/util/unique_type_name.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { 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 7cb19fc15db..75e4c8a9264 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 b55ee605c4c..1a7ca65aae6 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,15 +29,15 @@ #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/lib/gprpp/unique_type_name.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" +#include "src/core/util/unique_type_name.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { 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 6061207fd4c..b1df0a39904 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 f1397b8e9d4..fd4e34d9afc 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 5474f263f09..03e83c57c62 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 93893c85118..4d1df2c05ff 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 a68816ec78c..5236e9692da 100644 --- a/test/core/end2end/tests/simple_request.cc +++ b/test/core/end2end/tests/simple_request.cc @@ -30,9 +30,9 @@ #include -#include "src/core/lib/gprpp/time.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" using testing::HasSubstr; diff --git a/test/core/end2end/tests/streaming_error_response.cc b/test/core/end2end/tests/streaming_error_response.cc index 47d1e2ea9f1..3ac939ed861 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 9d1635bd245..3a7217ed49d 100644 --- a/test/core/end2end/tests/timeout_before_request_call.cc +++ b/test/core/end2end/tests/timeout_before_request_call.cc @@ -24,8 +24,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/time.h" #include "test/core/end2end/end2end_tests.h" namespace grpc_core { diff --git a/test/core/end2end/tests/trailing_metadata.cc b/test/core/end2end/tests/trailing_metadata.cc index b20f996f625..268b699b427 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 a551eb02c8d..d3956f80031 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 684318d2186..064e979e8fb 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 c567ffa5f19..65b609a63d4 100644 --- a/test/core/event_engine/event_engine_test_utils.cc +++ b/test/core/event_engine/event_engine_test_utils.cc @@ -39,10 +39,10 @@ #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/crash.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/resource_quota/memory_quota.h" +#include "src/core/util/crash.h" +#include "src/core/util/notification.h" +#include "src/core/util/time.h" #include "test/core/test_util/build.h" // IWYU pragma: no_include diff --git a/test/core/event_engine/event_engine_test_utils.h b/test/core/event_engine/event_engine_test_utils.h index 1b71dc549f7..fa0f3622e1a 100644 --- a/test/core/event_engine/event_engine_test_utils.h +++ b/test/core/event_engine/event_engine_test_utils.h @@ -31,9 +31,9 @@ #include #include -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/resource_quota/memory_quota.h" +#include "src/core/util/notification.h" +#include "src/core/util/sync.h" using EventEngineFactory = std::function< std::unique_ptr()>; 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 913da903038..0a85dafe2b4 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,10 +32,10 @@ #include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/gprpp/dump_args.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/port.h" #include "src/core/telemetry/stats.h" +#include "src/core/util/dump_args.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h" #include "test/core/test_util/port.h" @@ -43,7 +43,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 93aa42c3563..23193ce99c6 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 @@ -42,8 +42,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..673c4f9c78a 100644 --- a/test/core/event_engine/posix/event_poller_posix_test.cc +++ b/test/core/event_engine/posix/event_poller_posix_test.cc @@ -35,8 +35,8 @@ #include "src/core/lib/event_engine/poller.h" #include "src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h" #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/ref_counted_ptr.h" // IWYU pragma: no_include // IWYU pragma: no_include @@ -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..a8ec3af12c5 100644 --- a/test/core/event_engine/posix/posix_endpoint_test.cc +++ b/test/core/event_engine/posix/posix_endpoint_test.cc @@ -45,10 +45,10 @@ #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h" #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/gprpp/dual_ref_counted.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/dual_ref_counted.h" +#include "src/core/util/notification.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/event_engine/event_engine_test_utils.h" #include "test/core/event_engine/posix/posix_engine_test_utils.h" #include "test/core/event_engine/test_suite/posix/oracle_event_engine_posix.h" diff --git a/test/core/event_engine/posix/posix_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..989e6c9f341 100644 --- a/test/core/event_engine/posix/posix_event_engine_connect_test.cc +++ b/test/core/event_engine/posix/posix_event_engine_connect_test.cc @@ -43,10 +43,10 @@ #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/posix_engine/posix_engine.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/crash.h" +#include "src/core/util/notification.h" #include "test/core/event_engine/event_engine_test_utils.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/event_engine/posix/timer_heap_test.cc b/test/core/event_engine/posix/timer_heap_test.cc index e9249444dd4..ee1a82e6e0b 100644 --- a/test/core/event_engine/posix/timer_heap_test.cc +++ b/test/core/event_engine/posix/timer_heap_test.cc @@ -29,7 +29,7 @@ #include "gtest/gtest.h" #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 b6c8c0b7b3d..9e267fe1d3f 100644 --- a/test/core/event_engine/posix/traced_buffer_list_test.cc +++ b/test/core/event_engine/posix/traced_buffer_list_test.cc @@ -24,9 +24,9 @@ #include #include -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" #ifdef GRPC_LINUX_ERRQUEUE diff --git a/test/core/event_engine/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 54cf3d599e8..3efef67009f 100644 --- a/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.cc +++ b/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.cc @@ -35,9 +35,9 @@ #include #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/strerror.h" #include "src/core/lib/iomgr/resolved_address.h" +#include "src/core/util/crash.h" +#include "src/core/util/strerror.h" namespace grpc_event_engine { namespace experimental { 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 52e9953c2b1..94fbb928832 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 331d59a6c57..c6bd435a3cb 100644 --- a/test/core/event_engine/test_suite/tests/client_test.cc +++ b/test/core/event_engine/test_suite/tests/client_test.cc @@ -37,10 +37,10 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/notification.h" #include "test/core/event_engine/event_engine_test_utils.h" #include "test/core/event_engine/test_suite/event_engine_test_framework.h" #include "test/core/test_util/port.h" diff --git a/test/core/event_engine/test_suite/tests/dns_test.cc b/test/core/event_engine/test_suite/tests/dns_test.cc index 635a796a1e4..a50102970ed 100644 --- a/test/core/event_engine/test_suite/tests/dns_test.cc +++ b/test/core/event_engine/test_suite/tests/dns_test.cc @@ -37,9 +37,9 @@ #include "src/core/lib/config/config_vars.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/gprpp/crash.h" // IWYU pragma: keep -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/iomgr/sockaddr.h" +#include "src/core/util/crash.h" // IWYU pragma: keep +#include "src/core/util/notification.h" #include "test/core/event_engine/test_suite/event_engine_test_framework.h" #include "test/core/test_util/fake_udp_and_tcp_server.h" #include "test/core/test_util/port.h" diff --git a/test/core/event_engine/test_suite/tests/server_test.cc b/test/core/event_engine/test_suite/tests/server_test.cc index e71bcd58cb8..88e64ef04e0 100644 --- a/test/core/event_engine/test_suite/tests/server_test.cc +++ b/test/core/event_engine/test_suite/tests/server_test.cc @@ -37,10 +37,10 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/notification.h" #include "test/core/event_engine/event_engine_test_utils.h" #include "test/core/event_engine/test_suite/event_engine_test_framework.h" #include "test/core/test_util/port.h" diff --git a/test/core/event_engine/test_suite/tests/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..76749f58309 100644 --- a/test/core/event_engine/test_suite/tools/echo_client.cc +++ b/test/core/event_engine/test_suite/tools/echo_client.cc @@ -53,9 +53,9 @@ #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/resolver/resolver_registry.h" +#include "src/core/util/notification.h" extern absl::AnyInvocable< std::unique_ptr(void)> diff --git a/test/core/event_engine/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..b5ee504c643 100644 --- a/test/core/event_engine/windows/iocp_test.cc +++ b/test/core/event_engine/windows/iocp_test.cc @@ -32,8 +32,8 @@ #include "src/core/lib/event_engine/thread_pool/thread_pool.h" #include "src/core/lib/event_engine/windows/iocp.h" #include "src/core/lib/event_engine/windows/win_socket.h" -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/notification.h" #include "test/core/event_engine/windows/create_sockpair.h" namespace { diff --git a/test/core/event_engine/windows/win_socket_test.cc b/test/core/event_engine/windows/win_socket_test.cc index fe780f8c190..daa3c5360f5 100644 --- a/test/core/event_engine/windows/win_socket_test.cc +++ b/test/core/event_engine/windows/win_socket_test.cc @@ -27,8 +27,8 @@ #include "src/core/lib/event_engine/thread_pool/thread_pool.h" #include "src/core/lib/event_engine/windows/iocp.h" #include "src/core/lib/event_engine/windows/win_socket.h" -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/notification.h" #include "test/core/event_engine/windows/create_sockpair.h" namespace { diff --git a/test/core/event_engine/windows/windows_endpoint_test.cc b/test/core/event_engine/windows/windows_endpoint_test.cc index a5682b7c356..9ada4bbf471 100644 --- a/test/core/event_engine/windows/windows_endpoint_test.cc +++ b/test/core/event_engine/windows/windows_endpoint_test.cc @@ -28,8 +28,8 @@ #include "src/core/lib/event_engine/windows/iocp.h" #include "src/core/lib/event_engine/windows/windows_endpoint.h" #include "src/core/lib/event_engine/windows/windows_engine.h" -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/resource_quota/memory_quota.h" +#include "src/core/util/notification.h" #include "test/core/event_engine/windows/create_sockpair.h" namespace grpc_event_engine { diff --git a/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc b/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc index a363e872eac..56e8783629b 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 @@ -33,13 +33,13 @@ #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/experiments/config.h" -#include "src/core/lib/gprpp/debug_location.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/work_serializer.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/uri.h" +#include "src/core/util/work_serializer.h" #include "src/libfuzzer/libfuzzer_macro.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h" diff --git a/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc b/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc index 0d5868881ec..369ebcc468d 100644 --- a/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc +++ b/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc @@ -28,11 +28,11 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/authorization/audit_logging.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/filters/client_auth_filter_test.cc b/test/core/filters/client_auth_filter_test.cc index a8659d9f3cd..f6a29e17d89 100644 --- a/test/core/filters/client_auth_filter_test.cc +++ b/test/core/filters/client_auth_filter_test.cc @@ -28,8 +28,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/security/context/security_context.h" @@ -39,6 +37,8 @@ #include "src/core/lib/security/transport/auth_filters.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" #include "src/core/util/useful.h" #include "test/core/filters/filter_test.h" diff --git a/test/core/filters/filter_test.cc b/test/core/filters/filter_test.cc index 694c26350b9..11ff4cfa087 100644 --- a/test/core/filters/filter_test.cc +++ b/test/core/filters/filter_test.cc @@ -29,7 +29,6 @@ #include "src/core/lib/channel/call_finalization.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/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" @@ -39,6 +38,7 @@ #include "src/core/lib/promise/seq.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/crash.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h" using grpc_event_engine::experimental::FuzzingEventEngine; diff --git a/test/core/filters/filter_test.h b/test/core/filters/filter_test.h index e905b84c8c6..4c193efce31 100644 --- a/test/core/filters/filter_test.h +++ b/test/core/filters/filter_test.h @@ -38,13 +38,13 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" #include "test/core/filters/filter_test.h" diff --git a/test/core/filters/gcp_authentication_filter_test.cc b/test/core/filters/gcp_authentication_filter_test.cc index 4c677df2b45..5f3880fa998 100644 --- a/test/core/filters/gcp_authentication_filter_test.cc +++ b/test/core/filters/gcp_authentication_filter_test.cc @@ -25,8 +25,6 @@ #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/lib/security/context/security_context.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h" @@ -34,6 +32,8 @@ #include "src/core/resolver/xds/xds_resolver_attributes.h" #include "src/core/service_config/service_config_call_data.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/unique_type_name.h" #include "test/core/filters/filter_test.h" namespace grpc_core { diff --git a/test/core/gprpp/BUILD b/test/core/gprpp/BUILD deleted file mode 100644 index 70ba9534766..00000000000 --- a/test/core/gprpp/BUILD +++ /dev/null @@ -1,516 +0,0 @@ -# Copyright 2016 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. - -load("//bazel:custom_exec_properties.bzl", "LARGE_MACHINE") -load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_package") -load("//test/core/test_util:grpc_fuzzer.bzl", "grpc_proto_fuzzer") - -licenses(["notice"]) - -grpc_package(name = "test/core/gprpp") - -grpc_cc_test( - name = "directory_reader_test", - srcs = ["directory_reader_test.cc"], - data = [ - "//test/core/tsi/test_creds/crl_data/crls:ab06acdd.r0", - "//test/core/tsi/test_creds/crl_data/crls:b9322cac.r0", - "//test/core/tsi/test_creds/crl_data/crls:current.crl", - "//test/core/tsi/test_creds/crl_data/crls:intermediate.crl", - ], - external_deps = [ - "gtest", - ], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:directory_reader", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "examine_stack_test", - srcs = ["examine_stack_test.cc"], - external_deps = [ - "absl/debugging:stacktrace", - "absl/debugging:symbolize", - "absl/log:log", - "gtest", - ], - language = "C++", - # TODO(https://github.com/grpc/grpc/issues/24627): Disable this on Windows - tags = ["no_windows"], - uses_event_engine = False, - uses_polling = False, - deps = [ - "//:gpr", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "dump_args_test", - srcs = ["dump_args_test.cc"], - external_deps = [ - "gtest", - ], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:dump_args", - ], -) - -# TODO(hork): solidify fork support requirements for EventEngines -grpc_cc_test( - name = "fork_test", - srcs = ["fork_test.cc"], - external_deps = ["gtest"], - language = "C++", - tags = ["no_windows"], - uses_event_engine = True, # engines should behave appropriately on Fork - uses_polling = False, - deps = [ - "//:gpr", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "bitset_test", - srcs = ["bitset_test.cc"], - external_deps = ["gtest"], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:bitset", - ], -) - -grpc_cc_test( - name = "if_list_test", - srcs = ["if_list_test.cc"], - external_deps = ["gtest"], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:if_list", - ], -) - -grpc_cc_test( - name = "no_destruct_test", - srcs = ["no_destruct_test.cc"], - external_deps = ["gtest"], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:no_destruct", - ], -) - -grpc_cc_test( - name = "match_test", - srcs = ["match_test.cc"], - external_deps = ["gtest"], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:match", - ], -) - -grpc_cc_test( - name = "overload_test", - srcs = ["overload_test.cc"], - external_deps = ["gtest"], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:overload", - ], -) - -grpc_cc_test( - name = "down_cast_test", - srcs = ["down_cast_test.cc"], - external_deps = ["gtest"], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:down_cast", - ], -) - -grpc_cc_test( - name = "table_test", - srcs = ["table_test.cc"], - external_deps = [ - "gtest", - "absl/types:optional", - ], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:table", - ], -) - -grpc_cc_test( - name = "host_port_test", - srcs = ["host_port_test.cc"], - external_deps = ["gtest"], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//:gpr", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "mpscq_test", - srcs = ["mpscq_test.cc"], - exec_properties = LARGE_MACHINE, - external_deps = [ - "absl/log:log", - "gtest", - ], - language = "C++", - tags = ["no_windows"], # LARGE_MACHINE is not configured for windows RBE - uses_event_engine = False, - uses_polling = False, - deps = [ - "//:gpr", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "orphanable_test", - srcs = ["orphanable_test.cc"], - external_deps = [ - "gtest", - ], - language = "C++", - deps = [ - "//:orphanable", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "ref_counted_test", - srcs = ["ref_counted_test.cc"], - external_deps = [ - "gtest", - ], - language = "C++", - deps = [ - "//src/core:ref_counted", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "dual_ref_counted_test", - srcs = ["dual_ref_counted_test.cc"], - external_deps = [ - "absl/log:check", - "gtest", - ], - language = "C++", - deps = [ - "//src/core:dual_ref_counted", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "ref_counted_ptr_test", - srcs = ["ref_counted_ptr_test.cc"], - external_deps = [ - "absl/container:flat_hash_set", - "absl/log:check", - "gtest", - ], - language = "C++", - deps = [ - "//:ref_counted_ptr", - "//src/core:dual_ref_counted", - "//src/core:ref_counted", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "thd_test", - srcs = ["thd_test.cc"], - external_deps = ["gtest"], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//:gpr", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "stat_test", - srcs = ["stat_test.cc"], - external_deps = [ - "gtest", - ], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//:gpr", - "//:grpc", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "status_helper_test", - srcs = ["status_helper_test.cc"], - external_deps = [ - "gtest", - ], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//:gpr", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "time_util_test", - srcs = ["time_util_test.cc"], - external_deps = [ - "gtest", - ], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//:gpr", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "cpp_impl_of_test", - srcs = ["cpp_impl_of_test.cc"], - external_deps = ["gtest"], - language = "c++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//:cpp_impl_of", - ], -) - -grpc_cc_test( - name = "chunked_vector_test", - srcs = ["chunked_vector_test.cc"], - external_deps = ["gtest"], - language = "c++", - tags = [ - "resource_quota_test", - ], - uses_event_engine = False, - uses_polling = False, - deps = [ - "//:gpr", - "//src/core:chunked_vector", - "//src/core:resource_quota", - ], -) - -grpc_proto_fuzzer( - name = "chunked_vector_fuzzer", - srcs = ["chunked_vector_fuzzer.cc"], - corpus = "chunked_vector_corpora", - external_deps = ["absl/log:check"], - language = "C++", - proto = "chunked_vector_fuzzer.proto", - tags = ["no_windows"], - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:chunked_vector", - "//src/core:resource_quota", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "time_test", - srcs = ["time_test.cc"], - external_deps = ["gtest"], - language = "c++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:time", - ], -) - -grpc_cc_test( - name = "single_set_ptr_test", - srcs = ["single_set_ptr_test.cc"], - external_deps = [ - "absl/log:log", - "gtest", - ], - language = "c++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:single_set_ptr", - ], -) - -grpc_cc_test( - name = "sorted_pack_test", - srcs = ["sorted_pack_test.cc"], - external_deps = ["gtest"], - language = "c++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:sorted_pack", - ], -) - -grpc_cc_test( - name = "unique_type_name_test", - srcs = ["unique_type_name_test.cc"], - external_deps = [ - "gtest", - "absl/strings:str_format", - "absl/container:flat_hash_map", - ], - language = "c++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:unique_type_name", - ], -) - -grpc_cc_test( - name = "work_serializer_test", - srcs = ["work_serializer_test.cc"], - exec_properties = LARGE_MACHINE, - external_deps = [ - "gtest", - ], - flaky = True, - language = "C++", - shard_count = 5, - tags = [ - "no_windows", # LARGE_MACHINE is not configured for windows RBE - ], - deps = [ - "//:gpr", - "//:grpc", - "//test/core/event_engine:event_engine_test_utils", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "validation_errors_test", - srcs = ["validation_errors_test.cc"], - external_deps = [ - "gtest", - ], - language = "C++", - deps = [ - "//src/core:validation_errors", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "notification_test", - srcs = ["notification_test.cc"], - external_deps = [ - "gtest", - ], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = ["//src/core:notification"], -) - -grpc_cc_test( - name = "load_file_test", - srcs = ["load_file_test.cc"], - external_deps = [ - "gtest", - ], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:load_file", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "uuid_v4_test", - srcs = ["uuid_v4_test.cc"], - external_deps = [ - "gtest", - ], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:uuid_v4", - "//test/core/test_util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "glob_test", - srcs = ["glob_test.cc"], - external_deps = ["gtest"], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//:gpr", - "//src/core:useful", - "//test/core/test_util:grpc_test_util", - ], -) diff --git a/test/core/gprpp/time_test.cc b/test/core/gprpp/time_test.cc deleted file mode 100644 index db554ac68cb..00000000000 --- a/test/core/gprpp/time_test.cc +++ /dev/null @@ -1,113 +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 "gtest/gtest.h" - -namespace grpc_core { -namespace testing { - -TEST(TimestampTest, Empty) { - EXPECT_EQ(Timestamp(), Timestamp::ProcessEpoch()); -} - -TEST(TimestampTest, Infinities) { - EXPECT_EQ(Timestamp::InfFuture() - Duration::Milliseconds(1), - Timestamp::InfFuture()); - EXPECT_EQ(Timestamp::InfPast() + Duration::Milliseconds(1), - Timestamp::InfPast()); - EXPECT_EQ(Timestamp::Now() - Timestamp::InfPast(), Duration::Infinity()); - EXPECT_EQ(Timestamp::Now() - Timestamp::InfFuture(), - Duration::NegativeInfinity()); - EXPECT_EQ(Timestamp::InfPast() - Timestamp::InfPast(), - Duration::NegativeInfinity()); - EXPECT_EQ(Timestamp::InfFuture() - Timestamp::InfPast(), - Duration::Infinity()); - EXPECT_EQ(Timestamp::InfFuture() - Timestamp::InfFuture(), - Duration::Infinity()); - EXPECT_EQ(Timestamp::InfPast() - Timestamp::InfFuture(), - Duration::NegativeInfinity()); -} - -TEST(TimestampTest, ToString) { - EXPECT_EQ(Timestamp::FromMillisecondsAfterProcessEpoch(42).ToString(), - "@42ms"); - EXPECT_EQ(Timestamp::InfFuture().ToString(), "@∞"); - EXPECT_EQ(Timestamp::InfPast().ToString(), "@-∞"); -} - -TEST(DurationTest, Empty) { EXPECT_EQ(Duration(), Duration::Zero()); } - -TEST(DurationTest, Scales) { - EXPECT_EQ(Duration::Milliseconds(1000), Duration::Seconds(1)); - EXPECT_EQ(Duration::Seconds(60), Duration::Minutes(1)); - EXPECT_EQ(Duration::Minutes(60), Duration::Hours(1)); - EXPECT_EQ(Duration::FromSecondsAsDouble(1.2), Duration::Milliseconds(1200)); - EXPECT_EQ(Duration::FromSecondsAndNanoseconds(1, 300000000), - Duration::Milliseconds(1300)); -} - -TEST(DurationTest, Epsilon) { - EXPECT_LE(Duration::Epsilon(), Duration::Milliseconds(1)); -} - -TEST(DurationTest, Infinities) { - EXPECT_EQ(Duration::Infinity() - Duration::Milliseconds(1), - Duration::Infinity()); - EXPECT_EQ(Duration::Infinity() + Duration::Milliseconds(1), - Duration::Infinity()); - EXPECT_EQ(Duration::Infinity() * 2, Duration::Infinity()); - EXPECT_EQ(Duration::Infinity() * -1, Duration::NegativeInfinity()); - EXPECT_EQ(Duration::Infinity() / 3, Duration::Infinity()); - EXPECT_EQ(Duration::NegativeInfinity() / -3, Duration::Infinity()); - EXPECT_EQ(Duration::NegativeInfinity() + Duration::Milliseconds(1), - Duration::NegativeInfinity()); - EXPECT_EQ(Duration::NegativeInfinity() - Duration::Milliseconds(1), - Duration::NegativeInfinity()); - EXPECT_EQ(Duration::NegativeInfinity() / 3, Duration::NegativeInfinity()); - EXPECT_EQ(Duration::Hours(std::numeric_limits::max()), - Duration::Infinity()); - EXPECT_EQ(Duration::FromSecondsAsDouble(1e100), Duration::Infinity()); - EXPECT_EQ(Duration::FromSecondsAsDouble(-1e100), - Duration::NegativeInfinity()); -} - -TEST(DurationTest, Multiplication) { - Duration d = Duration::Seconds(5); - EXPECT_EQ(d * 2, Duration::Seconds(10)); - d *= 3; - EXPECT_EQ(d, Duration::Seconds(15)); -} - -TEST(DurationTest, FromTimespan) { - EXPECT_EQ(Duration::FromTimespec(gpr_time_from_millis(1234, GPR_TIMESPAN)), - Duration::Milliseconds(1234)); -} - -TEST(DurationTest, ToString) { - EXPECT_EQ(Duration::Milliseconds(42).ToString(), "42ms"); - EXPECT_EQ(Duration::Infinity().ToString(), "∞"); - EXPECT_EQ(Duration::NegativeInfinity().ToString(), "-∞"); -} - -} // namespace testing -} // namespace grpc_core - -int main(int argc, char** argv) { - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/test/core/handshake/client_ssl.cc b/test/core/handshake/client_ssl.cc index 8eb2db12ea6..3032abf8ced 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 b15edfc32c6..9b4203ec6f2 100644 --- a/test/core/handshake/readahead_handshaker_server_ssl.cc +++ b/test/core/handshake/readahead_handshaker_server_ssl.cc @@ -29,13 +29,13 @@ #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/lib/gprpp/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/tcp_server.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" #include "test/core/handshake/server_ssl_common.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/handshake/server_ssl_common.cc b/test/core/handshake/server_ssl_common.cc index 0bebf83ed2e..7a8910fac34 100644 --- a/test/core/handshake/server_ssl_common.cc +++ b/test/core/handshake/server_ssl_common.cc @@ -46,10 +46,10 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/crash.h" +#include "src/core/util/sync.h" +#include "src/core/util/thd.h" #include "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/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..0f9b26ab912 100644 --- a/test/core/http/httpcli_test.cc +++ b/test/core/http/httpcli_test.cc @@ -43,14 +43,14 @@ #include #include -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/gprpp/time_util.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h" +#include "src/core/util/status_helper.h" #include "src/core/util/subprocess.h" +#include "src/core/util/time.h" +#include "src/core/util/time_util.h" #include "test/core/http/httpcli_test_util.h" #include "test/core/test_util/fake_udp_and_tcp_server.h" #include "test/core/test_util/port.h" diff --git a/test/core/http/httpscli_test.cc b/test/core/http/httpscli_test.cc index 4c15ea82dcf..11596745a6d 100644 --- a/test/core/http/httpscli_test.cc +++ b/test/core/http/httpscli_test.cc @@ -42,11 +42,6 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -54,11 +49,16 @@ #include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/security/credentials/credentials.h" // IWYU pragma: keep -#include "src/core/lib/uri/uri_parser.h" #include "src/core/util/http_client/httpcli.h" #include "src/core/util/http_client/httpcli_ssl_credentials.h" #include "src/core/util/http_client/parser.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/status_helper.h" #include "src/core/util/subprocess.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/time_util.h" +#include "src/core/util/uri.h" #include "test/core/http/httpcli_test_util.h" #include "test/core/test_util/fake_udp_and_tcp_server.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/iomgr/buffer_list_test.cc b/test/core/iomgr/buffer_list_test.cc index 9994961a727..d6620314c29 100644 --- a/test/core/iomgr/buffer_list_test.cc +++ b/test/core/iomgr/buffer_list_test.cc @@ -25,10 +25,10 @@ #include #include -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/internal_errqueue.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" #ifdef GRPC_LINUX_ERRQUEUE diff --git a/test/core/iomgr/combiner_test.cc b/test/core/iomgr/combiner_test.cc index bdd625adad5..1e3daba3978 100644 --- a/test/core/iomgr/combiner_test.cc +++ b/test/core/iomgr/combiner_test.cc @@ -25,9 +25,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..76518fa5cd0 100644 --- a/test/core/iomgr/endpoint_pair_test.cc +++ b/test/core/iomgr/endpoint_pair_test.cc @@ -35,9 +35,9 @@ #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/shim.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" #include "src/core/lib/resource_quota/memory_quota.h" +#include "src/core/util/notification.h" #include "src/core/util/useful.h" #include "test/core/iomgr/endpoint_tests.h" #include "test/core/test_util/port.h" diff --git a/test/core/iomgr/endpoint_tests.cc b/test/core/iomgr/endpoint_tests.cc index 828fc5d40f5..5f0044bb6f0 100644 --- a/test/core/iomgr/endpoint_tests.cc +++ b/test/core/iomgr/endpoint_tests.cc @@ -29,10 +29,10 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/iomgr/error_test.cc b/test/core/iomgr/error_test.cc index 86650ac9d45..93ce01db702 100644 --- a/test/core/iomgr/error_test.cc +++ b/test/core/iomgr/error_test.cc @@ -28,8 +28,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 "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 4a37f512a06..8a75b4f41e2 100644 --- a/test/core/iomgr/fd_conservation_posix_test.cc +++ b/test/core/iomgr/fd_conservation_posix_test.cc @@ -22,9 +22,9 @@ #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/endpoint_pair.h" #include "src/core/lib/iomgr/iomgr.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" int main(int argc, char** argv) { diff --git a/test/core/iomgr/fd_posix_test.cc b/test/core/iomgr/fd_posix_test.cc index 8395b75dec2..4de02c79db3 100644 --- a/test/core/iomgr/fd_posix_test.cc +++ b/test/core/iomgr/fd_posix_test.cc @@ -44,11 +44,11 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/strerror.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/socket_utils_posix.h" +#include "src/core/util/crash.h" +#include "src/core/util/strerror.h" static gpr_mu* g_mu; static grpc_pollset* g_pollset; diff --git a/test/core/iomgr/grpc_ipv6_loopback_available_test.cc b/test/core/iomgr/grpc_ipv6_loopback_available_test.cc index 2b8ae366778..e1d615ea9ca 100644 --- a/test/core/iomgr/grpc_ipv6_loopback_available_test.cc +++ b/test/core/iomgr/grpc_ipv6_loopback_available_test.cc @@ -20,8 +20,8 @@ #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" #ifdef GPR_WINDOWS diff --git a/test/core/iomgr/pollset_windows_starvation_test.cc b/test/core/iomgr/pollset_windows_starvation_test.cc index ef554e4c468..dc75b1f61d6 100644 --- a/test/core/iomgr/pollset_windows_starvation_test.cc +++ b/test/core/iomgr/pollset_windows_starvation_test.cc @@ -20,13 +20,13 @@ #include #include -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/iomgr/pollset_windows.h" #include "src/core/lib/surface/init.h" +#include "src/core/util/thd.h" #include "test/core/test_util/test_config.h" #if defined(GRPC_WINSOCK_SOCKET) diff --git a/test/core/iomgr/resolve_address_posix_test.cc b/test/core/iomgr/resolve_address_posix_test.cc index 9cebdbfa87e..1c0eecfa04c 100644 --- a/test/core/iomgr/resolve_address_posix_test.cc +++ b/test/core/iomgr/resolve_address_posix_test.cc @@ -35,15 +35,15 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/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/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/iomgr/resolve_address.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" #include "src/core/util/string.h" +#include "src/core/util/thd.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" #include "test/core/test_util/cmdline.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/iomgr/resolve_address_test.cc b/test/core/iomgr/resolve_address_test.cc index ec18410a267..97da4df464c 100644 --- a/test/core/iomgr/resolve_address_test.cc +++ b/test/core/iomgr/resolve_address_test.cc @@ -35,14 +35,14 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #include "test/core/test_util/cmdline.h" #include "test/core/test_util/fake_udp_and_tcp_server.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/iomgr/socket_utils_test.cc b/test/core/iomgr/socket_utils_test.cc index 6d56ad9d65c..861ea5eae25 100644 --- a/test/core/iomgr/socket_utils_test.cc +++ b/test/core/iomgr/socket_utils_test.cc @@ -33,9 +33,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/socket_mutator.h" #include "src/core/lib/iomgr/socket_utils_posix.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/iomgr/tcp_client_posix_test.cc b/test/core/iomgr/tcp_client_posix_test.cc index a32e874a9d7..6a567765b38 100644 --- a/test/core/iomgr/tcp_client_posix_test.cc +++ b/test/core/iomgr/tcp_client_posix_test.cc @@ -20,8 +20,8 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/time.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" @@ -43,13 +43,13 @@ #include #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/socket_utils_posix.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/resource_quota/api.h" +#include "src/core/util/crash.h" static grpc_pollset_set* g_pollset_set; static gpr_mu* g_mu; diff --git a/test/core/iomgr/tcp_posix_test.cc b/test/core/iomgr/tcp_posix_test.cc index 6117be2beb1..897df84cf3e 100644 --- a/test/core/iomgr/tcp_posix_test.cc +++ b/test/core/iomgr/tcp_posix_test.cc @@ -19,9 +19,9 @@ #include "absl/time/time.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/notification.h" +#include "src/core/util/time.h" // This test won't work except with posix sockets enabled #ifdef GRPC_POSIX_SOCKET_TCP @@ -47,7 +47,6 @@ #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/posix.h" #include "src/core/lib/event_engine/shim.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/buffer_list.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" @@ -55,6 +54,7 @@ #include "src/core/lib/iomgr/socket_utils_posix.h" #include "src/core/lib/iomgr/tcp_posix.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" #include "test/core/iomgr/endpoint_tests.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/iomgr/tcp_server_posix_test.cc b/test/core/iomgr/tcp_server_posix_test.cc index 6f4cc33cb00..09c4a5c0d83 100644 --- a/test/core/iomgr/tcp_server_posix_test.cc +++ b/test/core/iomgr/tcp_server_posix_test.cc @@ -19,8 +19,8 @@ #include #include "src/core/lib/event_engine/shim.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/time.h" #include "test/core/test_util/test_config.h" // This test won't work except with posix sockets enabled @@ -51,14 +51,14 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/gprpp/strerror.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/tcp_server.h" #include "src/core/lib/resource_quota/api.h" +#include "src/core/util/crash.h" +#include "src/core/util/memory.h" +#include "src/core/util/strerror.h" #include "test/core/test_util/port.h" #define LOG_TEST(x) LOG(INFO) << #x diff --git a/test/core/iomgr/timer_heap_test.cc b/test/core/iomgr/timer_heap_test.cc index af4571a4031..3e2b907e7b5 100644 --- a/test/core/iomgr/timer_heap_test.cc +++ b/test/core/iomgr/timer_heap_test.cc @@ -27,8 +27,8 @@ #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/iomgr/timer_list_test.cc b/test/core/iomgr/timer_list_test.cc index e3c98e83780..cd0a5221d60 100644 --- a/test/core/iomgr/timer_list_test.cc +++ b/test/core/iomgr/timer_list_test.cc @@ -27,11 +27,11 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/timer.h" +#include "src/core/util/crash.h" +#include "src/core/util/time.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tracer_util.h" diff --git a/test/core/json/json_object_loader_test.cc b/test/core/json/json_object_loader_test.cc index 6ea9b7b0598..aad3567f86b 100644 --- a/test/core/json/json_object_loader_test.cc +++ b/test/core/json/json_object_loader_test.cc @@ -22,10 +22,10 @@ #include -#include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/ref_counted.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { namespace { diff --git a/test/core/load_balancing/lb_policy_test_lib.h b/test/core/load_balancing/lb_policy_test_lib.h index 3066fbbc590..00c21dcd9a3 100644 --- a/test/core/load_balancing/lb_policy_test_lib.h +++ b/test/core/load_balancing/lb_policy_test_lib.h @@ -62,19 +62,10 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/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/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/transport/connectivity_state.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/load_balancing/backend_metric_data.h" #include "src/core/load_balancing/health_check_client_internal.h" #include "src/core/load_balancing/lb_policy.h" @@ -84,7 +75,16 @@ #include "src/core/load_balancing/subchannel_interface.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/service_config/service_config_call_data.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" +#include "src/core/util/match.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/unique_type_name.h" +#include "src/core/util/uri.h" +#include "src/core/util/work_serializer.h" #include "test/core/event_engine/event_engine_test_utils.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h" diff --git a/test/core/load_balancing/outlier_detection_lb_config_parser_test.cc b/test/core/load_balancing/outlier_detection_lb_config_parser_test.cc index 40dad8d96d3..b5145f451ff 100644 --- a/test/core/load_balancing/outlier_detection_lb_config_parser_test.cc +++ b/test/core/load_balancing/outlier_detection_lb_config_parser_test.cc @@ -24,9 +24,9 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/load_balancing/outlier_detection_test.cc b/test/core/load_balancing/outlier_detection_test.cc index 2a809d485f7..e92c3bc4e84 100644 --- a/test/core/load_balancing/outlier_detection_test.cc +++ b/test/core/load_balancing/outlier_detection_test.cc @@ -35,13 +35,13 @@ #include #include -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/load_balancing/backend_metric_data.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/util/json/json.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "test/core/load_balancing/lb_policy_test_lib.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/load_balancing/pick_first_test.cc b/test/core/load_balancing/pick_first_test.cc index 413c58be6ff..0f07d6fd39d 100644 --- a/test/core/load_balancing/pick_first_test.cc +++ b/test/core/load_balancing/pick_first_test.cc @@ -38,16 +38,16 @@ #include #include "src/core/lib/experiments/experiments.h" -#include "src/core/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/lib/iomgr/exec_ctx.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/telemetry/metrics.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" +#include "src/core/util/work_serializer.h" #include "test/core/load_balancing/lb_policy_test_lib.h" #include "test/core/test_util/fake_stats_plugin.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/load_balancing/ring_hash_test.cc b/test/core/load_balancing/ring_hash_test.cc index 9420834d51f..0861cdcb5db 100644 --- a/test/core/load_balancing/ring_hash_test.cc +++ b/test/core/load_balancing/ring_hash_test.cc @@ -34,11 +34,11 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/xxhash_inline.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/util/json/json.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/xxhash_inline.h" #include "test/core/load_balancing/lb_policy_test_lib.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/load_balancing/rls_lb_config_parser_test.cc b/test/core/load_balancing/rls_lb_config_parser_test.cc index 1bfef19d2df..edf3e8127bf 100644 --- a/test/core/load_balancing/rls_lb_config_parser_test.cc +++ b/test/core/load_balancing/rls_lb_config_parser_test.cc @@ -24,9 +24,9 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/load_balancing/round_robin_test.cc b/test/core/load_balancing/round_robin_test.cc index 697b0ebc107..78da9b904f3 100644 --- a/test/core/load_balancing/round_robin_test.cc +++ b/test/core/load_balancing/round_robin_test.cc @@ -24,9 +24,9 @@ #include -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.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 7ae3973637b..aba086e7e40 100644 --- a/test/core/load_balancing/static_stride_scheduler_benchmark.cc +++ b/test/core/load_balancing/static_stride_scheduler_benchmark.cc @@ -27,8 +27,8 @@ #include "absl/types/optional.h" #include "absl/types/span.h" -#include "src/core/lib/gprpp/no_destruct.h" #include "src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h" +#include "src/core/util/no_destruct.h" namespace grpc_core { namespace { diff --git a/test/core/load_balancing/weighted_round_robin_config_test.cc b/test/core/load_balancing/weighted_round_robin_config_test.cc index 7d6f3bb81b2..5da2fb5a006 100644 --- a/test/core/load_balancing/weighted_round_robin_config_test.cc +++ b/test/core/load_balancing/weighted_round_robin_config_test.cc @@ -23,9 +23,9 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/load_balancing/weighted_round_robin_test.cc b/test/core/load_balancing/weighted_round_robin_test.cc index d680a1c3e37..8faa6c693e1 100644 --- a/test/core/load_balancing/weighted_round_robin_test.cc +++ b/test/core/load_balancing/weighted_round_robin_test.cc @@ -40,16 +40,16 @@ #include #include -#include "src/core/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/load_balancing/backend_metric_data.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/load_balancing/weighted_target/weighted_target.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/debug_location.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "test/core/load_balancing/lb_policy_test_lib.h" #include "test/core/test_util/fake_stats_plugin.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/load_balancing/xds_override_host_lb_config_parser_test.cc b/test/core/load_balancing/xds_override_host_lb_config_parser_test.cc index 175c41aedbd..3407ababe59 100644 --- a/test/core/load_balancing/xds_override_host_lb_config_parser_test.cc +++ b/test/core/load_balancing/xds_override_host_lb_config_parser_test.cc @@ -24,10 +24,10 @@ #include "src/core/client_channel/client_channel_service_config.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/load_balancing/xds/xds_override_host.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/xds/grpc/xds_health_status.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/load_balancing/xds_override_host_test.cc b/test/core/load_balancing/xds_override_host_test.cc index 11208870e89..4352b6db370 100644 --- a/test/core/load_balancing/xds_override_host_test.cc +++ b/test/core/load_balancing/xds_override_host_test.cc @@ -39,12 +39,11 @@ #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/load_balancing/lb_policy.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/xds/xds_config.h" #include "src/core/util/json/json.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/xds/grpc/xds_health_status.h" #include "test/core/load_balancing/lb_policy_test_lib.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/matchers/BUILD b/test/core/matchers/BUILD deleted file mode 100644 index 8609304bd6c..00000000000 --- a/test/core/matchers/BUILD +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 2017 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. - -load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_package") - -licenses(["notice"]) - -grpc_package(name = "test/core/matchers") - -grpc_cc_test( - name = "matchers_test", - srcs = ["matchers_test.cc"], - external_deps = ["gtest"], - language = "C++", - deps = [ - "//:gpr", - "//:grpc", - "//test/core/test_util:grpc_test_util", - "//test/core/test_util:grpc_test_util_base", - ], -) diff --git a/test/core/memory_usage/callback_client.cc b/test/core/memory_usage/callback_client.cc index f36abd6ca1c..449fcbd34fe 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/cpp/ext/chaotic_good.h" #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" #include "src/proto/grpc/testing/messages.pb.h" diff --git a/test/core/memory_usage/memory_usage_test.cc b/test/core/memory_usage/memory_usage_test.cc index 9433d633cef..798b90093da 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 2a91f74368f..4f41754d06c 100644 --- a/test/core/memory_usage/server.cc +++ b/test/core/memory_usage/server.cc @@ -49,7 +49,7 @@ #include "src/core/ext/transport/chaotic_good/server/chaotic_good_server.h" #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..65fd3a11118 100644 --- a/test/core/message_size/message_size_service_config_test.cc +++ b/test/core/message_size/message_size_service_config_test.cc @@ -28,10 +28,10 @@ #include "src/core/ext/filters/message_size/message_size_filter.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" #include "src/core/service_config/service_config_parser.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/network_benchmarks/low_level_ping_pong.cc b/test/core/network_benchmarks/low_level_ping_pong.cc index 49bd712bb7a..9211b83e7ea 100644 --- a/test/core/network_benchmarks/low_level_ping_pong.cc +++ b/test/core/network_benchmarks/low_level_ping_pong.cc @@ -41,10 +41,10 @@ #include #include -#include "src/core/lib/gprpp/strerror.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/socket_utils_posix.h" +#include "src/core/util/strerror.h" +#include "src/core/util/thd.h" #include "src/core/util/useful.h" #include "test/core/test_util/cmdline.h" #include "test/core/test_util/histogram.h" diff --git a/test/core/promise/arena_promise_test.cc b/test/core/promise/arena_promise_test.cc index d8f43426012..2f4da3b2c5d 100644 --- a/test/core/promise/arena_promise_test.cc +++ b/test/core/promise/arena_promise_test.cc @@ -21,10 +21,10 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/promise/test_context.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/promise/event_engine_wakeup_scheduler_test.cc b/test/core/promise/event_engine_wakeup_scheduler_test.cc index 306105d26ce..739c1a25f4e 100644 --- a/test/core/promise/event_engine_wakeup_scheduler_test.cc +++ b/test/core/promise/event_engine_wakeup_scheduler_test.cc @@ -24,9 +24,9 @@ #include #include -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/notification.h" namespace grpc_core { diff --git a/test/core/promise/for_each_test.cc b/test/core/promise/for_each_test.cc index 4ce3914004f..ea0f63732c1 100644 --- a/test/core/promise/for_each_test.cc +++ b/test/core/promise/for_each_test.cc @@ -21,7 +21,6 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/inter_activity_pipe.h" #include "src/core/lib/promise/join.h" @@ -32,6 +31,7 @@ #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/promise/test_wakeup_schedulers.h" using testing::Mock; diff --git a/test/core/promise/inter_activity_latch_test.cc b/test/core/promise/inter_activity_latch_test.cc index 087489b240e..925062c561b 100644 --- a/test/core/promise/inter_activity_latch_test.cc +++ b/test/core/promise/inter_activity_latch_test.cc @@ -20,9 +20,9 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/promise/event_engine_wakeup_scheduler.h" #include "src/core/lib/promise/seq.h" +#include "src/core/util/notification.h" using grpc_event_engine::experimental::GetDefaultEventEngine; diff --git a/test/core/promise/interceptor_list_test.cc b/test/core/promise/interceptor_list_test.cc index f9ff107d289..d52ba611006 100644 --- a/test/core/promise/interceptor_list_test.cc +++ b/test/core/promise/interceptor_list_test.cc @@ -20,10 +20,10 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/promise/test_context.h" namespace grpc_core { diff --git a/test/core/promise/map_pipe_test.cc b/test/core/promise/map_pipe_test.cc index 0bcc4f7c739..5b702f2f8d0 100644 --- a/test/core/promise/map_pipe_test.cc +++ b/test/core/promise/map_pipe_test.cc @@ -22,7 +22,6 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/for_each.h" #include "src/core/lib/promise/join.h" @@ -33,6 +32,7 @@ #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/promise/test_wakeup_schedulers.h" using testing::Mock; diff --git a/test/core/promise/observable_test.cc b/test/core/promise/observable_test.cc index 12fd66fe36c..45fb438ebd1 100644 --- a/test/core/promise/observable_test.cc +++ b/test/core/promise/observable_test.cc @@ -25,9 +25,9 @@ #include -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/promise/loop.h" #include "src/core/lib/promise/map.h" +#include "src/core/util/notification.h" #include "test/core/promise/poll_matcher.h" using testing::Mock; diff --git a/test/core/promise/party_test.cc b/test/core/promise/party_test.cc index 5695abffe09..09075395bf4 100644 --- a/test/core/promise/party_test.cc +++ b/test/core/promise/party_test.cc @@ -32,10 +32,6 @@ #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/event_engine_context.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/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/inter_activity_latch.h" @@ -45,6 +41,10 @@ #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/notification.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" namespace grpc_core { diff --git a/test/core/promise/pipe_test.cc b/test/core/promise/pipe_test.cc index e1219c55400..b74f29df2e8 100644 --- a/test/core/promise/pipe_test.cc +++ b/test/core/promise/pipe_test.cc @@ -26,14 +26,14 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/join.h" #include "src/core/lib/promise/map.h" #include "src/core/lib/promise/seq.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/crash.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/promise/test_wakeup_schedulers.h" using testing::MockFunction; diff --git a/test/core/promise/sleep_test.cc b/test/core/promise/sleep_test.cc index fc0c2f03c4b..eaa816294da 100644 --- a/test/core/promise/sleep_test.cc +++ b/test/core/promise/sleep_test.cc @@ -28,12 +28,12 @@ #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/event_engine_context.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/exec_ctx_wakeup_scheduler.h" #include "src/core/lib/promise/race.h" #include "src/core/lib/resource_quota/arena.h" +#include "src/core/util/notification.h" +#include "src/core/util/orphanable.h" #include "test/core/event_engine/mock_event_engine.h" #include "test/core/promise/test_wakeup_schedulers.h" diff --git a/test/core/promise/wait_for_callback_test.cc b/test/core/promise/wait_for_callback_test.cc index cb54ccf2e0e..25f5771379c 100644 --- a/test/core/promise/wait_for_callback_test.cc +++ b/test/core/promise/wait_for_callback_test.cc @@ -17,8 +17,8 @@ #include "absl/status/status.h" #include "gtest/gtest.h" -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/promise/map.h" +#include "src/core/util/notification.h" #include "test/core/promise/test_wakeup_schedulers.h" namespace grpc_core { diff --git a/test/core/resolver/binder_resolver_test.cc b/test/core/resolver/binder_resolver_test.cc index 9fad73a6704..7f6d3b9f14c 100644 --- a/test/core/resolver/binder_resolver_test.cc +++ b/test/core/resolver/binder_resolver_test.cc @@ -22,13 +22,13 @@ #include "gtest/gtest.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/uri.h" #include "test/core/test_util/test_config.h" #ifdef GRPC_HAVE_UNIX_SOCKET diff --git a/test/core/resolver/dns_resolver_cooldown_test.cc b/test/core/resolver/dns_resolver_cooldown_test.cc index 0bc27e4b3c0..ad7b6a3a8c3 100644 --- a/test/core/resolver/dns_resolver_cooldown_test.cc +++ b/test/core/resolver/dns_resolver_cooldown_test.cc @@ -42,12 +42,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -56,12 +50,18 @@ #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" #include "src/core/resolver/resolver_registry.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/no_destruct.h" +#include "src/core/util/notification.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" +#include "src/core/util/work_serializer.h" #include "test/core/test_util/test_config.h" using ::grpc_event_engine::experimental::GetDefaultEventEngine; diff --git a/test/core/resolver/dns_resolver_test.cc b/test/core/resolver/dns_resolver_test.cc index 14bb534ed43..4bf8a069c8b 100644 --- a/test/core/resolver/dns_resolver_test.cc +++ b/test/core/resolver/dns_resolver_test.cc @@ -30,13 +30,13 @@ #include "src/core/lib/config/config_vars.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" #include "src/core/resolver/resolver_registry.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/uri.h" +#include "src/core/util/work_serializer.h" #include "test/core/test_util/test_config.h" using ::grpc_event_engine::experimental::GetDefaultEventEngine; diff --git a/test/core/resolver/endpoint_addresses_test.cc b/test/core/resolver/endpoint_addresses_test.cc index d5f14f624da..dafb5a54aac 100644 --- a/test/core/resolver/endpoint_addresses_test.cc +++ b/test/core/resolver/endpoint_addresses_test.cc @@ -29,7 +29,7 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/uri.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/resolver/fake_resolver_test.cc b/test/core/resolver/fake_resolver_test.cc index c9ece82509c..888ecac3399 100644 --- a/test/core/resolver/fake_resolver_test.cc +++ b/test/core/resolver/fake_resolver_test.cc @@ -41,16 +41,16 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/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/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/resolver_factory.h" #include "src/core/resolver/resolver_registry.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/uri.h" +#include "src/core/util/work_serializer.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/resolver/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 a4aa4bc068d..faf90400364 100644 --- a/test/core/resolver/sockaddr_resolver_test.cc +++ b/test/core/resolver/sockaddr_resolver_test.cc @@ -27,14 +27,14 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/port.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_factory.h" #include "src/core/resolver/resolver_registry.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/uri.h" +#include "src/core/util/work_serializer.h" #include "test/core/test_util/test_config.h" static std::shared_ptr* g_work_serializer; diff --git a/test/core/resource_quota/arena_test.cc b/test/core/resource_quota/arena_test.cc index ee22b8d4b6f..997b7760d22 100644 --- a/test/core/resource_quota/arena_test.cc +++ b/test/core/resource_quota/arena_test.cc @@ -35,10 +35,10 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/thd.h" #include "test/core/test_util/test_config.h" using testing::Mock; diff --git a/test/core/resource_quota/memory_quota_fuzzer.cc b/test/core/resource_quota/memory_quota_fuzzer.cc index 2fb432cbe28..654f20e291a 100644 --- a/test/core/resource_quota/memory_quota_fuzzer.cc +++ b/test/core/resource_quota/memory_quota_fuzzer.cc @@ -31,11 +31,11 @@ #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/config.h" -#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/memory_quota.h" +#include "src/core/util/debug_location.h" #include "src/core/util/useful.h" #include "src/libfuzzer/libfuzzer_macro.h" #include "test/core/resource_quota/call_checker.h" diff --git a/test/core/resource_quota/memory_quota_stress_test.cc b/test/core/resource_quota/memory_quota_stress_test.cc index ab1634c3775..a8086810cc7 100644 --- a/test/core/resource_quota/memory_quota_stress_test.cc +++ b/test/core/resource_quota/memory_quota_stress_test.cc @@ -33,9 +33,9 @@ #include #include -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/memory_quota.h" +#include "src/core/util/sync.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/security/alts_credentials_fuzzer.cc b/test/core/security/alts_credentials_fuzzer.cc index 4913a3b29c9..9f76b2bf738 100644 --- a/test/core/security/alts_credentials_fuzzer.cc +++ b/test/core/security/alts_credentials_fuzzer.cc @@ -26,11 +26,11 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.h" #include "src/core/lib/security/credentials/alts/alts_credentials.h" #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" #include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" #include "test/core/test_util/fuzzer_util.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/security/alts_security_connector_test.cc b/test/core/security/alts_security_connector_test.cc index 3fa83df1e65..02a7cf5e1a4 100644 --- a/test/core/security/alts_security_connector_test.cc +++ b/test/core/security/alts_security_connector_test.cc @@ -29,11 +29,11 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/transport/transport.h" #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h" #include "src/core/tsi/transport_security.h" +#include "src/core/util/crash.h" using grpc_core::internal::grpc_alts_auth_context_from_tsi_peer; diff --git a/test/core/security/auth_context_test.cc b/test/core/security/auth_context_test.cc index ea9be077e24..9443712cc91 100644 --- a/test/core/security/auth_context_test.cc +++ b/test/core/security/auth_context_test.cc @@ -22,9 +22,9 @@ #include "absl/log/log.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/context/security_context.h" +#include "src/core/util/crash.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/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 4217c0eb346..b4122a8051e 100644 --- a/test/core/security/check_gcp_environment_linux_test.cc +++ b/test/core/security/check_gcp_environment_linux_test.cc @@ -24,8 +24,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" +#include "src/core/util/crash.h" #include "src/core/util/tmpfile.h" #if GPR_LINUX diff --git a/test/core/security/check_gcp_environment_windows_test.cc b/test/core/security/check_gcp_environment_windows_test.cc index 8a1cbbb3fba..7d1db40d69f 100644 --- a/test/core/security/check_gcp_environment_windows_test.cc +++ b/test/core/security/check_gcp_environment_windows_test.cc @@ -24,8 +24,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" +#include "src/core/util/crash.h" #include "src/core/util/tmpfile.h" #ifdef GPR_WINDOWS diff --git a/test/core/security/create_jwt.cc b/test/core/security/create_jwt.cc index 79be2b68e1c..f4f84a4ff4b 100644 --- a/test/core/security/create_jwt.cc +++ b/test/core/security/create_jwt.cc @@ -23,8 +23,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/security/credentials/jwt/jwt_credentials.h" +#include "src/core/util/crash.h" #include "test/core/test_util/cmdline.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/security/credentials_test.cc b/test/core/security/credentials_test.cc index 4a999142988..da207a6474b 100644 --- a/test/core/security/credentials_test.cc +++ b/test/core/security/credentials_test.cc @@ -42,11 +42,6 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/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/lib/iomgr/error.h" #include "src/core/lib/iomgr/timer_manager.h" #include "src/core/lib/promise/exec_ctx_wakeup_scheduler.h" @@ -69,12 +64,17 @@ #include "src/core/lib/security/credentials/xds/xds_credentials.h" #include "src/core/lib/security/transport/auth_filters.h" #include "src/core/lib/transport/error_utils.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" +#include "src/core/util/host_port.h" #include "src/core/util/http_client/httpcli.h" #include "src/core/util/http_client/httpcli_ssl_credentials.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/string.h" +#include "src/core/util/time.h" #include "src/core/util/tmpfile.h" +#include "src/core/util/unique_type_name.h" +#include "src/core/util/uri.h" #include "test/core/event_engine/event_engine_test_utils.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/security/fetch_oauth2.cc b/test/core/security/fetch_oauth2.cc index 8faad222de3..b99d41f9dce 100644 --- a/test/core/security/fetch_oauth2.cc +++ b/test/core/security/fetch_oauth2.cc @@ -30,10 +30,10 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/util/json_util.h" +#include "src/core/util/crash.h" #include "src/cpp/client/secure_credentials.h" #include "test/core/security/oauth2_utils.h" #include "test/core/test_util/cmdline.h" diff --git a/test/core/security/grpc_alts_credentials_options_test.cc b/test/core/security/grpc_alts_credentials_options_test.cc index 9c53cd25bf3..77f41ef7a8d 100644 --- a/test/core/security/grpc_alts_credentials_options_test.cc +++ b/test/core/security/grpc_alts_credentials_options_test.cc @@ -26,7 +26,7 @@ #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 e0fbd238468..c3459b22370 100644 --- a/test/core/security/grpc_tls_certificate_distributor_test.cc +++ b/test/core/security/grpc_tls_certificate_distributor_test.cc @@ -29,8 +29,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/security/grpc_tls_certificate_provider_test.cc b/test/core/security/grpc_tls_certificate_provider_test.cc index 31e7a06bd63..31abfedee47 100644 --- a/test/core/security/grpc_tls_certificate_provider_test.cc +++ b/test/core/security/grpc_tls_certificate_provider_test.cc @@ -27,8 +27,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" #include "src/core/util/tmpfile.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/security/grpc_tls_certificate_verifier_test.cc b/test/core/security/grpc_tls_certificate_verifier_test.cc index e775fe7a847..162c2e3c367 100644 --- a/test/core/security/grpc_tls_certificate_verifier_test.cc +++ b/test/core/security/grpc_tls_certificate_verifier_test.cc @@ -27,9 +27,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/security/security_connector/tls/tls_security_connector.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" #include "src/core/util/tmpfile.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/security/grpc_tls_credentials_options_test.cc b/test/core/security/grpc_tls_credentials_options_test.cc index 8270f7955dd..8e2784c77d6 100644 --- a/test/core/security/grpc_tls_credentials_options_test.cc +++ b/test/core/security/grpc_tls_credentials_options_test.cc @@ -27,9 +27,9 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/security/credentials/tls/tls_credentials.h" #include "src/core/lib/security/security_connector/tls/tls_security_connector.h" +#include "src/core/util/crash.h" #include "src/core/util/tmpfile.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/security/json_token_test.cc b/test/core/security/json_token_test.cc index 95e01826c57..03569c4d1b5 100644 --- a/test/core/security/json_token_test.cc +++ b/test/core/security/json_token_test.cc @@ -31,9 +31,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/security/credentials/oauth2/oauth2_credentials.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/crash.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/security/jwt_verifier_test.cc b/test/core/security/jwt_verifier_test.cc index e250d352cce..448dd57e7fc 100644 --- a/test/core/security/jwt_verifier_test.cc +++ b/test/core/security/jwt_verifier_test.cc @@ -29,8 +29,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/security/credentials/jwt/json_token.h" +#include "src/core/util/crash.h" #include "src/core/util/http_client/httpcli.h" #include "src/core/util/json/json_reader.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/security/oauth2_utils.cc b/test/core/security/oauth2_utils.cc index b135ac3eef2..6111bb25e61 100644 --- a/test/core/security/oauth2_utils.cc +++ b/test/core/security/oauth2_utils.cc @@ -30,14 +30,14 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/exec_ctx_wakeup_scheduler.h" #include "src/core/lib/promise/map.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/credentials/credentials.h" +#include "src/core/util/crash.h" +#include "src/core/util/notification.h" char* grpc_test_fetch_oauth2_token_with_credentials( grpc_call_credentials* creds) { diff --git a/test/core/security/print_google_default_creds_token.cc b/test/core/security/print_google_default_creds_token.cc index 305ea25eb59..1d715fe18cd 100644 --- a/test/core/security/print_google_default_creds_token.cc +++ b/test/core/security/print_google_default_creds_token.cc @@ -28,10 +28,10 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/security/credentials/composite/composite_credentials.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/slice/slice_string_helpers.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" #include "test/core/test_util/cmdline.h" diff --git a/test/core/security/rbac_translator_test.cc b/test/core/security/rbac_translator_test.cc index 49e9c21a10a..0d7a798da34 100644 --- a/test/core/security/rbac_translator_test.cc +++ b/test/core/security/rbac_translator_test.cc @@ -24,8 +24,8 @@ #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/security/authorization/audit_logging.h" +#include "src/core/util/crash.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/security/secure_endpoint_test.cc b/test/core/security/secure_endpoint_test.cc index b09e04c4b19..6f4cd318820 100644 --- a/test/core/security/secure_endpoint_test.cc +++ b/test/core/security/secure_endpoint_test.cc @@ -28,11 +28,11 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/endpoint_pair.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/tsi/fake_transport_security.h" +#include "src/core/util/crash.h" #include "src/core/util/useful.h" #include "test/core/iomgr/endpoint_tests.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/security/security_connector_test.cc b/test/core/security/security_connector_test.cc index 63d14a065fc..dfccc4b7abe 100644 --- a/test/core/security/security_connector_test.cc +++ b/test/core/security/security_connector_test.cc @@ -31,13 +31,13 @@ #include #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/security_connector/ssl_utils.h" #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/tsi/ssl_transport_security.h" #include "src/core/tsi/transport_security.h" +#include "src/core/util/crash.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/string.h" #include "src/core/util/tmpfile.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/security/ssl_credentials_test.cc b/test/core/security/ssl_credentials_test.cc index 5d1de6b08b0..8e63303c8b8 100644 --- a/test/core/security/ssl_credentials_test.cc +++ b/test/core/security/ssl_credentials_test.cc @@ -26,9 +26,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/security/security_connector/ssl_utils.h" #include "src/core/tsi/ssl_transport_security.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" TEST(SslCredentialsTest, ConvertGrpcToTsiCertPairs) { diff --git a/test/core/security/ssl_server_fuzzer.cc b/test/core/security/ssl_server_fuzzer.cc index 214a40812ec..7ca9762c124 100644 --- a/test/core/security/ssl_server_fuzzer.cc +++ b/test/core/security/ssl_server_fuzzer.cc @@ -25,9 +25,9 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" +#include "src/core/util/notification.h" #include "test/core/test_util/mock_endpoint.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/security/system_roots_test.cc b/test/core/security/system_roots_test.cc index 5bb566d89b1..9d94185edfb 100644 --- a/test/core/security/system_roots_test.cc +++ b/test/core/security/system_roots_test.cc @@ -33,9 +33,6 @@ #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/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" @@ -44,6 +41,9 @@ #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/tsi/ssl_transport_security.h" #include "src/core/tsi/transport_security.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" +#include "src/core/util/load_file.h" #include "src/core/util/tmpfile.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/security/tls_security_connector_test.cc b/test/core/security/tls_security_connector_test.cc index 7c602c37750..b2e933d6d16 100644 --- a/test/core/security/tls_security_connector_test.cc +++ b/test/core/security/tls_security_connector_test.cc @@ -32,13 +32,13 @@ #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/lib/security/context/security_context.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" #include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h" #include "src/core/lib/security/credentials/tls/tls_credentials.h" #include "src/core/tsi/transport_security.h" +#include "src/core/util/crash.h" +#include "src/core/util/unique_type_name.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/security/verify_jwt.cc b/test/core/security/verify_jwt.cc index cf5a2581c92..b330c0dbf33 100644 --- a/test/core/security/verify_jwt.cc +++ b/test/core/security/verify_jwt.cc @@ -27,10 +27,10 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/security/credentials/jwt/jwt_verifier.h" +#include "src/core/util/crash.h" #include "src/core/util/json/json_writer.h" #include "test/core/test_util/cmdline.h" diff --git a/test/core/service_config/service_config_test.cc b/test/core/service_config/service_config_test.cc index d20b92ae55c..24112d7732f 100644 --- a/test/core/service_config/service_config_test.cc +++ b/test/core/service_config/service_config_test.cc @@ -32,13 +32,13 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/validation_errors.h" #include "src/core/service_config/service_config_impl.h" #include "src/core/service_config/service_config_parser.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/validation_errors.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/slice/slice_test.cc b/test/core/slice/slice_test.cc index 3b1977145bb..1503e11abc7 100644 --- a/test/core/slice/slice_test.cc +++ b/test/core/slice/slice_test.cc @@ -35,10 +35,10 @@ #include #include -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/gprpp/no_destruct.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_refcount.h" +#include "src/core/util/memory.h" +#include "src/core/util/no_destruct.h" #include "test/core/test_util/build.h" TEST(GrpcSliceTest, MallocReturnsSomethingSensible) { diff --git a/test/core/surface/completion_queue_threading_test.cc b/test/core/surface/completion_queue_threading_test.cc index ad81f5194f9..3d6dbd1fc97 100644 --- a/test/core/surface/completion_queue_threading_test.cc +++ b/test/core/surface/completion_queue_threading_test.cc @@ -30,10 +30,10 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/completion_queue.h" +#include "src/core/util/crash.h" +#include "src/core/util/thd.h" #include "src/core/util/useful.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/surface/concurrent_connectivity_test.cc b/test/core/surface/concurrent_connectivity_test.cc index a4123639273..329dd0ef286 100644 --- a/test/core/surface/concurrent_connectivity_test.cc +++ b/test/core/surface/concurrent_connectivity_test.cc @@ -37,8 +37,6 @@ #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/lib/gprpp/thd.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -48,6 +46,8 @@ #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/tcp_server.h" +#include "src/core/util/thd.h" +#include "src/core/util/time.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/surface/lame_client_test.cc b/test/core/surface/lame_client_test.cc index 7d5b57af46f..c81f2492c2b 100644 --- a/test/core/surface/lame_client_test.cc +++ b/test/core/surface/lame_client_test.cc @@ -32,13 +32,13 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/orphanable.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/surface/num_external_connectivity_watchers_test.cc b/test/core/surface/num_external_connectivity_watchers_test.cc index 0194592f5e8..8eeb546e35b 100644 --- a/test/core/surface/num_external_connectivity_watchers_test.cc +++ b/test/core/surface/num_external_connectivity_watchers_test.cc @@ -31,9 +31,9 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/host_port.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/surface/sequential_connectivity_test.cc b/test/core/surface/sequential_connectivity_test.cc index 79accd74c3d..ab6dfe4b1a6 100644 --- a/test/core/surface/sequential_connectivity_test.cc +++ b/test/core/surface/sequential_connectivity_test.cc @@ -33,9 +33,9 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/host_port.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/surface/server_chttp2_test.cc b/test/core/surface/server_chttp2_test.cc index 9c11f06037d..359af60ff28 100644 --- a/test/core/surface/server_chttp2_test.cc +++ b/test/core/surface/server_chttp2_test.cc @@ -27,8 +27,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" +#include "src/core/util/host_port.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/surface/server_test.cc b/test/core/surface/server_test.cc index 958d033cef0..ec58b556a7f 100644 --- a/test/core/surface/server_test.cc +++ b/test/core/surface/server_test.cc @@ -34,10 +34,10 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" +#include "src/core/util/host_port.h" #include "src/core/util/useful.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/telemetry/call_tracer_test.cc b/test/core/telemetry/call_tracer_test.cc index c9af4d745b4..688a5114156 100644 --- a/test/core/telemetry/call_tracer_test.cc +++ b/test/core/telemetry/call_tracer_test.cc @@ -25,10 +25,10 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/test_util/fake_stats_plugin.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/test_util/BUILD b/test/core/test_util/BUILD index 653c1639a25..854105b5fe2 100644 --- a/test/core/test_util/BUILD +++ b/test/core/test_util/BUILD @@ -142,7 +142,7 @@ grpc_cc_library( "//:orphanable", "//:ref_counted_ptr", "//:tsi_ssl_credentials", - "//:uri_parser", + "//:uri", "//src/core:channel_args_endpoint_config", "//src/core:channel_args_preconditioning", "//src/core:closure", @@ -188,7 +188,7 @@ grpc_cc_library( "//:httpcli", "//:orphanable", "//:ref_counted_ptr", - "//:uri_parser", + "//:uri", "//src/core:channel_args_endpoint_config", "//src/core:channel_args_preconditioning", "//src/core:closure", @@ -332,7 +332,7 @@ grpc_cc_library( "//:orphanable", "//:parse_address", "//:ref_counted_ptr", - "//:uri_parser", + "//:uri", "//src/core:channel_args", "//src/core:delegating_helper", "//src/core:down_cast", diff --git a/test/core/test_util/cmdline.cc b/test/core/test_util/cmdline.cc index f3bf0abbc69..b22d0767c09 100644 --- a/test/core/test_util/cmdline.cc +++ b/test/core/test_util/cmdline.cc @@ -33,7 +33,7 @@ #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..2d681d3b50f 100644 --- a/test/core/test_util/evaluate_args_test_util.h +++ b/test/core/test_util/evaluate_args_test_util.h @@ -27,7 +27,6 @@ #include "src/core/handshaker/endpoint_info/endpoint_info_handshaker.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" @@ -35,6 +34,7 @@ #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { diff --git a/test/core/test_util/fake_stats_plugin.h b/test/core/test_util/fake_stats_plugin.h index e5e93a6b503..4c60f0735fb 100644 --- a/test/core/test_util/fake_stats_plugin.h +++ b/test/core/test_util/fake_stats_plugin.h @@ -30,10 +30,10 @@ #include "gmock/gmock.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/lib/gprpp/ref_counted.h" #include "src/core/telemetry/call_tracer.h" #include "src/core/telemetry/metrics.h" #include "src/core/telemetry/tcp_tracer.h" +#include "src/core/util/ref_counted.h" namespace grpc_core { diff --git a/test/core/test_util/fuzzer_corpus_test.cc b/test/core/test_util/fuzzer_corpus_test.cc index 0bdbf3a8c8f..3eaef693f10 100644 --- a/test/core/test_util/fuzzer_corpus_test.cc +++ b/test/core/test_util/fuzzer_corpus_test.cc @@ -35,8 +35,8 @@ #include #include -#include "src/core/lib/gprpp/env.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/env.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" #include "test/cpp/util/test_config.h" diff --git a/test/core/test_util/fuzzing_channel_args.h b/test/core/test_util/fuzzing_channel_args.h index 9b4eb78f0a4..83cb5497bd3 100644 --- a/test/core/test_util/fuzzing_channel_args.h +++ b/test/core/test_util/fuzzing_channel_args.h @@ -20,8 +20,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/test_util/fuzzing_channel_args.pb.h" namespace grpc_core { diff --git a/test/core/test_util/mock_endpoint.cc b/test/core/test_util/mock_endpoint.cc index e09fb191cb6..8d16b2293ee 100644 --- a/test/core/test_util/mock_endpoint.cc +++ b/test/core/test_util/mock_endpoint.cc @@ -29,8 +29,8 @@ #include #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/gprpp/down_cast.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" +#include "src/core/util/down_cast.h" namespace grpc_event_engine { namespace experimental { diff --git a/test/core/test_util/one_corpus_entry_fuzzer.cc b/test/core/test_util/one_corpus_entry_fuzzer.cc index ffde40a4f0f..d6cbe2b6827 100644 --- a/test/core/test_util/one_corpus_entry_fuzzer.cc +++ b/test/core/test_util/one_corpus_entry_fuzzer.cc @@ -22,8 +22,8 @@ #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/crash.h" #include "test/core/test_util/tls_utils.h" extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size); diff --git a/test/core/test_util/passthrough_endpoint.h b/test/core/test_util/passthrough_endpoint.h index f7af994b1c8..cf8abe834d1 100644 --- a/test/core/test_util/passthrough_endpoint.h +++ b/test/core/test_util/passthrough_endpoint.h @@ -21,7 +21,7 @@ #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/ref_counted.h" +#include "src/core/util/ref_counted.h" namespace grpc_event_engine { namespace experimental { diff --git a/test/core/test_util/port.cc b/test/core/test_util/port.cc index 123608d61c2..3a5a04bf117 100644 --- a/test/core/test_util/port.cc +++ b/test/core/test_util/port.cc @@ -29,7 +29,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 8e841cf1b4d..57fa3865112 100644 --- a/test/core/test_util/port_isolated_runtime_environment.cc +++ b/test/core/test_util/port_isolated_runtime_environment.cc @@ -29,8 +29,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/crash.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/test_util/port_server_client.cc b/test/core/test_util/port_server_client.cc index 2f59e1c473b..5a8b4d4d2ed 100644 --- a/test/core/test_util/port_server_client.cc +++ b/test/core/test_util/port_server_client.cc @@ -40,10 +40,6 @@ #include #include -#include "src/core/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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -51,9 +47,13 @@ #include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/security/credentials/credentials.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/util/http_client/httpcli.h" #include "src/core/util/http_client/parser.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" typedef struct freereq { gpr_mu* mu = nullptr; diff --git a/test/core/test_util/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 1f428d55776..0395887fe7a 100644 --- a/test/core/test_util/test_config.cc +++ b/test/core/test_util/test_config.cc @@ -36,8 +36,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/surface/init.h" +#include "src/core/util/crash.h" #include "test/core/event_engine/test_init.h" #include "test/core/test_util/build.h" #include "test/core/test_util/stack_tracer.h" diff --git a/test/core/test_util/test_lb_policies.cc b/test/core/test_util/test_lb_policies.cc index 348d430e3d6..afd701417cb 100644 --- a/test/core/test_util/test_lb_policies.cc +++ b/test/core/test_util/test_lb_policies.cc @@ -34,23 +34,23 @@ #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/down_cast.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/lib/iomgr/error.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/load_balancing/delegating_helper.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/load_balancing/lb_policy_factory.h" #include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/load_balancing/oob_backend_metric.h" #include "src/core/load_balancing/subchannel_interface.h" +#include "src/core/util/down_cast.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_util.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" namespace grpc_core { diff --git a/test/core/test_util/test_tcp_server.cc b/test/core/test_util/test_tcp_server.cc index 41cb382dd46..cc3d2957648 100644 --- a/test/core/test_util/test_tcp_server.cc +++ b/test/core/test_util/test_tcp_server.cc @@ -34,7 +34,6 @@ #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset.h" @@ -42,6 +41,7 @@ #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils.h" #include "src/core/lib/iomgr/tcp_server.h" +#include "src/core/util/time.h" #include "test/core/test_util/test_config.h" static void on_server_destroyed(void* data, grpc_error_handle /*error*/) { diff --git a/test/core/test_util/tls_utils.cc b/test/core/test_util/tls_utils.cc index aca44f0fbb8..c2dfd13eea9 100644 --- a/test/core/test_util/tls_utils.cc +++ b/test/core/test_util/tls_utils.cc @@ -25,9 +25,9 @@ #include #include -#include "src/core/lib/gprpp/load_file.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/load_file.h" #include "src/core/util/tmpfile.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/test_util/tls_utils.h b/test/core/test_util/tls_utils.h index 6b1bc1f1fa2..5cd12ac6a10 100644 --- a/test/core/test_util/tls_utils.h +++ b/test/core/test_util/tls_utils.h @@ -28,9 +28,9 @@ #include #include -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/security/security_connector/ssl_utils.h" +#include "src/core/util/sync.h" +#include "src/core/util/thd.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 bc42040826c..5ad7150e8e2 100644 --- a/test/core/transport/binder/binder_transport_test.cc +++ b/test/core/transport/binder/binder_transport_test.cc @@ -32,8 +32,8 @@ #include #include "src/core/ext/transport/binder/transport/binder_stream.h" -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/notification.h" #include "test/core/test_util/test_config.h" #include "test/core/transport/binder/mock_objects.h" diff --git a/test/core/transport/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 2506cb0c242..8b4affab2cc 100644 --- a/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h +++ b/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h @@ -26,7 +26,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/call_arena_allocator_test.cc b/test/core/transport/call_arena_allocator_test.cc index b33335ce6f4..1c5c222cf86 100644 --- a/test/core/transport/call_arena_allocator_test.cc +++ b/test/core/transport/call_arena_allocator_test.cc @@ -35,10 +35,10 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/thd.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/transport/call_spine_benchmarks.h b/test/core/transport/call_spine_benchmarks.h index ebdf7c18884..d89f3678bdb 100644 --- a/test/core/transport/call_spine_benchmarks.h +++ b/test/core/transport/call_spine_benchmarks.h @@ -21,13 +21,13 @@ #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/event_engine_context.h" -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/all_ok.h" #include "src/core/lib/promise/map.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/transport/call_spine.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/notification.h" namespace grpc_core { diff --git a/test/core/transport/chaotic_good/BUILD b/test/core/transport/chaotic_good/BUILD index 2b22ea94c4c..e400aae142b 100644 --- a/test/core/transport/chaotic_good/BUILD +++ b/test/core/transport/chaotic_good/BUILD @@ -241,7 +241,7 @@ grpc_cc_test( "//:grpc++", "//:grpc_public_hdrs", "//:parse_address", - "//:uri_parser", + "//:uri", "//src/core:channel_args", "//src/core:chaotic_good_connector", "//src/core:chaotic_good_server", 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 0b9b49a370b..1f1335f5f6c 100644 --- a/test/core/transport/chaotic_good/chaotic_good_server_test.cc +++ b/test/core/transport/chaotic_good/chaotic_good_server_test.cc @@ -35,10 +35,10 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/time.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/server/server.h" +#include "src/core/util/notification.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" #include "test/core/event_engine/event_engine_test_utils.h" #include "test/core/test_util/build.h" #include "test/core/test_util/port.h" diff --git a/test/core/transport/chaotic_good/client_transport_error_test.cc b/test/core/transport/chaotic_good/client_transport_error_test.cc index 190580f1eb7..8de27018183 100644 --- a/test/core/transport/chaotic_good/client_transport_error_test.cc +++ b/test/core/transport/chaotic_good/client_transport_error_test.cc @@ -39,7 +39,6 @@ #include "src/core/ext/transport/chaotic_good/client_transport.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/event_engine_context.h" -#include "src/core/lib/gprpp/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" @@ -56,6 +55,7 @@ #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/promise_endpoint.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h" diff --git a/test/core/transport/chaotic_good/frame_fuzzer.cc b/test/core/transport/chaotic_good/frame_fuzzer.cc index 23530d10a44..3082b3645f0 100644 --- a/test/core/transport/chaotic_good/frame_fuzzer.cc +++ b/test/core/transport/chaotic_good/frame_fuzzer.cc @@ -29,13 +29,13 @@ #include "src/core/ext/transport/chaotic_good/frame_header.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_buffer.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/libfuzzer/libfuzzer_macro.h" #include "test/core/promise/test_context.h" #include "test/core/transport/chaotic_good/frame_fuzzer.pb.h" diff --git a/test/core/transport/chaotic_good/server_transport_test.cc b/test/core/transport/chaotic_good/server_transport_test.cc index 21977563c60..af5b223c2fb 100644 --- a/test/core/transport/chaotic_good/server_transport_test.cc +++ b/test/core/transport/chaotic_good/server_transport_test.cc @@ -34,7 +34,6 @@ #include #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/timer_manager.h" #include "src/core/lib/promise/seq.h" #include "src/core/lib/resource_quota/arena.h" @@ -43,6 +42,7 @@ #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h" #include "test/core/transport/chaotic_good/mock_promise_endpoint.h" diff --git a/test/core/transport/chttp2/flow_control_fuzzer.cc b/test/core/transport/chttp2/flow_control_fuzzer.cc index 99e82f4853a..b72541d4d38 100644 --- a/test/core/transport/chttp2/flow_control_fuzzer.cc +++ b/test/core/transport/chttp2/flow_control_fuzzer.cc @@ -36,10 +36,10 @@ #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/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/transport/bdp_estimator.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" #include "src/libfuzzer/libfuzzer_macro.h" #include "test/core/test_util/fuzz_config_vars.h" diff --git a/test/core/transport/chttp2/flow_control_test.cc b/test/core/transport/chttp2/flow_control_test.cc index 75652fcfb16..618cdfb0643 100644 --- a/test/core/transport/chttp2/flow_control_test.cc +++ b/test/core/transport/chttp2/flow_control_test.cc @@ -23,11 +23,11 @@ #include #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/transport/bdp_estimator.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" extern gpr_timespec (*gpr_now_impl)(gpr_clock_type clock_type); diff --git a/test/core/transport/chttp2/graceful_shutdown_test.cc b/test/core/transport/chttp2/graceful_shutdown_test.cc index 4f24b8d65af..7402c2ba28c 100644 --- a/test/core/transport/chttp2/graceful_shutdown_test.cc +++ b/test/core/transport/chttp2/graceful_shutdown_test.cc @@ -48,10 +48,6 @@ #include "src/core/ext/transport/chttp2/transport/frame_goaway.h" #include "src/core/ext/transport/chttp2/transport/frame_ping.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/notification.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/endpoint_pair.h" @@ -61,6 +57,10 @@ #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/surface/completion_queue.h" #include "src/core/server/server.h" +#include "src/core/util/crash.h" +#include "src/core/util/notification.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/sync.h" #include "src/core/util/useful.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/transport/chttp2/hpack_encoder_test.cc b/test/core/transport/chttp2/hpack_encoder_test.cc index 91d835c631e..141d38f71c4 100644 --- a/test/core/transport/chttp2/hpack_encoder_test.cc +++ b/test/core/transport/chttp2/hpack_encoder_test.cc @@ -32,11 +32,11 @@ #include #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" #include "test/core/test_util/parse_hexstring.h" #include "test/core/test_util/slice_splitter.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc b/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc index 538988ebf9f..7954ccbaeca 100644 --- a/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc +++ b/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc @@ -31,14 +31,14 @@ #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/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" #include "src/libfuzzer/libfuzzer_macro.h" #include "test/core/test_util/fuzz_config_vars.h" #include "test/core/test_util/proto_bit_gen.h" diff --git a/test/core/transport/chttp2/hpack_parser_input_size_fuzzer.cc b/test/core/transport/chttp2/hpack_parser_input_size_fuzzer.cc index 4094a669b3c..c01dff488a8 100644 --- a/test/core/transport/chttp2/hpack_parser_input_size_fuzzer.cc +++ b/test/core/transport/chttp2/hpack_parser_input_size_fuzzer.cc @@ -35,8 +35,6 @@ #include #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/arena.h" @@ -44,6 +42,8 @@ #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" #include "test/core/test_util/slice_splitter.h" bool squelch = true; diff --git a/test/core/transport/chttp2/hpack_parser_test.cc b/test/core/transport/chttp2/hpack_parser_test.cc index d15d990678c..0439490d7c2 100644 --- a/test/core/transport/chttp2/hpack_parser_test.cc +++ b/test/core/transport/chttp2/hpack_parser_test.cc @@ -36,15 +36,15 @@ #include #include -#include "src/core/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/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" #include "test/core/test_util/parse_hexstring.h" #include "test/core/test_util/slice_splitter.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/transport/chttp2/hpack_sync_fuzzer.cc b/test/core/transport/chttp2/hpack_sync_fuzzer.cc index 2697029928d..dff3b687999 100644 --- a/test/core/transport/chttp2/hpack_sync_fuzzer.cc +++ b/test/core/transport/chttp2/hpack_sync_fuzzer.cc @@ -32,8 +32,6 @@ #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser_table.h" #include "src/core/lib/experiments/config.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/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" @@ -42,6 +40,8 @@ #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/status_helper.h" #include "src/libfuzzer/libfuzzer_macro.h" #include "test/core/test_util/fuzz_config_vars.h" #include "test/core/test_util/proto_bit_gen.h" diff --git a/test/core/transport/chttp2/ping_callbacks_test.cc b/test/core/transport/chttp2/ping_callbacks_test.cc index 32b02fa0241..18731f4f761 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 705276ff38e..30873180124 100644 --- a/test/core/transport/chttp2/ping_configuration_test.cc +++ b/test/core/transport/chttp2/ping_configuration_test.cc @@ -28,9 +28,10 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/config.h" -#include "src/core/lib/gprpp/time.h" +#include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/time.h" #include "test/core/test_util/mock_endpoint.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/transport/chttp2/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 3093bc2afaf..7e5c5204530 100644 --- a/test/core/transport/chttp2/settings_timeout_test.cc +++ b/test/core/transport/chttp2/settings_timeout_test.cc @@ -45,8 +45,6 @@ #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/lib/gprpp/status_helper.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -58,6 +56,8 @@ #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/resource_quota/api.h" +#include "src/core/util/status_helper.h" +#include "src/core/util/time.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/transport/chttp2/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 cc296008f84..49a6075cd42 100644 --- a/test/core/transport/chttp2/streams_not_seen_test.cc +++ b/test/core/transport/chttp2/streams_not_seen_test.cc @@ -55,11 +55,6 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/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/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -71,6 +66,11 @@ #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/host_port.h" +#include "src/core/util/notification.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #include "src/core/util/useful.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/port.h" diff --git a/test/core/transport/chttp2/too_many_pings_test.cc b/test/core/transport/chttp2/too_many_pings_test.cc index 7d84bdb0bdc..942268fc967 100644 --- a/test/core/transport/chttp2/too_many_pings_test.cc +++ b/test/core/transport/chttp2/too_many_pings_test.cc @@ -46,17 +46,17 @@ #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/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/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/surface/channel.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/fake/fake_resolver.h" #include "src/core/resolver/resolver.h" +#include "src/core/util/host_port.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" #include "src/core/util/useful.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/port.h" diff --git a/test/core/transport/error_utils_test.cc b/test/core/transport/error_utils_test.cc index 0817f34ee53..c60b4bf5d79 100644 --- a/test/core/transport/error_utils_test.cc +++ b/test/core/transport/error_utils_test.cc @@ -23,8 +23,8 @@ #include "absl/status/status.h" #include "gtest/gtest.h" -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/status_helper.h" #include "test/core/test_util/test_config.h" namespace { diff --git a/test/core/transport/metadata_map_test.cc b/test/core/transport/metadata_map_test.cc index 91d60baab27..1e985459a74 100644 --- a/test/core/transport/metadata_map_test.cc +++ b/test/core/transport/metadata_map_test.cc @@ -28,13 +28,13 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/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 b36700c9f27..989530d5e27 100644 --- a/test/core/tsi/alts/frame_protector/alts_counter_test.cc +++ b/test/core/tsi/alts/frame_protector/alts_counter_test.cc @@ -22,7 +22,7 @@ #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 e513caf0678..551788819fc 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 @@ -24,9 +24,9 @@ #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/tsi/alts/crypt/gsec.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/crash.h" #include "test/core/tsi/alts/crypt/gsec_test_util.h" #include "test/core/tsi/transport_security_test_lib.h" diff --git a/test/core/tsi/alts/frame_protector/frame_handler_test.cc b/test/core/tsi/alts/frame_protector/frame_handler_test.cc index feb7a5310aa..2784bc0f74b 100644 --- a/test/core/tsi/alts/frame_protector/frame_handler_test.cc +++ b/test/core/tsi/alts/frame_protector/frame_handler_test.cc @@ -28,7 +28,7 @@ #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 a6327cb31bb..0b079ebc88e 100644 --- a/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc +++ b/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc @@ -47,14 +47,14 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/credentials/alts/alts_credentials.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/alts/alts_security_connector.h" #include "src/core/lib/slice/slice_string_helpers.h" +#include "src/core/util/crash.h" +#include "src/core/util/host_port.h" +#include "src/core/util/thd.h" #include "src/core/util/useful.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/build.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..22c42030cb5 100644 --- a/test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc +++ b/test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc @@ -26,13 +26,13 @@ #include #include -#include "src/core/lib/gprpp/env.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/tsi/alts/handshaker/alts_shared_resource.h" #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h" #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h" #include "src/core/tsi/transport_security.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/env.h" #include "test/core/test_util/test_config.h" #include "test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.h" diff --git a/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc b/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc index 59479f0c7fb..3fb9cc715ec 100644 --- a/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc +++ b/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc @@ -28,12 +28,12 @@ #include #include -#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/tsi/alts/handshaker/alts_handshaker_client.h" #include "src/core/tsi/alts/handshaker/alts_shared_resource.h" #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h" #include "src/core/tsi/transport_security_grpc.h" +#include "src/core/util/thd.h" #include "src/proto/grpc/gcp/altscontext.upb.h" #include "test/core/test_util/test_config.h" #include "test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.h" diff --git a/test/core/tsi/crl_ssl_transport_security_test.cc b/test/core/tsi/crl_ssl_transport_security_test.cc index 37f0f905b16..0b8d4cf0811 100644 --- a/test/core/tsi/crl_ssl_transport_security_test.cc +++ b/test/core/tsi/crl_ssl_transport_security_test.cc @@ -31,11 +31,11 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/tsi/ssl_transport_security.h" #include "src/core/tsi/transport_security.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" #include "test/core/tsi/transport_security_test_lib.h" diff --git a/test/core/tsi/fake_transport_security_test.cc b/test/core/tsi/fake_transport_security_test.cc index 69c280717a4..c61b9a487a7 100644 --- a/test/core/tsi/fake_transport_security_test.cc +++ b/test/core/tsi/fake_transport_security_test.cc @@ -27,9 +27,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/tsi/transport_security.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" #include "test/core/tsi/transport_security_test_lib.h" diff --git a/test/core/tsi/ssl_session_cache_test.cc b/test/core/tsi/ssl_session_cache_test.cc index f9711f2eba1..61a5f707e93 100644 --- a/test/core/tsi/ssl_session_cache_test.cc +++ b/test/core/tsi/ssl_session_cache_test.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" 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..228372d86b6 100644 --- a/test/core/tsi/ssl_transport_security_test.cc +++ b/test/core/tsi/ssl_transport_security_test.cc @@ -34,9 +34,9 @@ #include #include -#include "src/core/lib/gprpp/memory.h" #include "src/core/tsi/transport_security.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/memory.h" #include "test/core/test_util/build.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/tsi/ssl_transport_security_utils_test.cc b/test/core/tsi/ssl_transport_security_utils_test.cc index 5b64dc212df..ac105c42fa5 100644 --- a/test/core/tsi/ssl_transport_security_utils_test.cc +++ b/test/core/tsi/ssl_transport_security_utils_test.cc @@ -34,10 +34,10 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" -#include "src/core/lib/gprpp/load_file.h" #include "src/core/lib/slice/slice.h" #include "src/core/tsi/transport_security.h" #include "src/core/tsi/transport_security_interface.h" +#include "src/core/util/load_file.h" #include "test/core/test_util/test_config.h" #include "test/core/tsi/transport_security_test_lib.h" diff --git a/test/core/tsi/transport_security_test.cc b/test/core/tsi/transport_security_test.cc index 8d9e1bed6e6..a0ff0488b93 100644 --- a/test/core/tsi/transport_security_test.cc +++ b/test/core/tsi/transport_security_test.cc @@ -31,9 +31,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/tsi/fake_transport_security.h" #include "src/core/tsi/ssl_transport_security.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" #include "src/core/util/useful.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/tsi/transport_security_test_lib.cc b/test/core/tsi/transport_security_test_lib.cc index 1c744415db2..1239270a0e6 100644 --- a/test/core/tsi/transport_security_test_lib.cc +++ b/test/core/tsi/transport_security_test_lib.cc @@ -37,9 +37,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/memory.h" #include "src/core/lib/iomgr/error.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/uri/BUILD b/test/core/uri/BUILD deleted file mode 100644 index 4bac9d7cba7..00000000000 --- a/test/core/uri/BUILD +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 2017 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. - -load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_package") -load("//test/core/test_util:grpc_fuzzer.bzl", "grpc_fuzzer") - -grpc_package(name = "test/core/uri") - -licenses(["notice"]) - -grpc_fuzzer( - name = "uri_fuzzer_test", - srcs = ["uri_fuzzer_test.cc"], - corpus = "uri_corpus", - language = "C++", - tags = [ - "no_windows", - # Without "nofixdeps", "//:grpc" gets substituted with "//:event_engine_base_hdrs" - "nofixdeps", - ], - deps = [ - "//:exec_ctx", - "//:gpr", - "//:grpc", - "//:uri_parser", - ], -) - -grpc_cc_test( - name = "uri_parser_test", - srcs = ["uri_parser_test.cc"], - external_deps = [ - "absl/status", - "gtest", - ], - language = "C++", - deps = [ - "//:event_engine_base_hdrs", - "//:uri_parser", - "//test/core/test_util:grpc_test_util_unsecure", - ], -) diff --git a/test/core/util/BUILD b/test/core/util/BUILD index 869a9b96672..ca652af6aba 100644 --- a/test/core/util/BUILD +++ b/test/core/util/BUILD @@ -12,12 +12,588 @@ # See the License for the specific language governing permissions and # limitations under the License. +load("//bazel:custom_exec_properties.bzl", "LARGE_MACHINE") load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_package") +load( + "//test/core/test_util:grpc_fuzzer.bzl", + "grpc_fuzzer", + "grpc_proto_fuzzer", +) licenses(["notice"]) grpc_package(name = "test/core/util") +grpc_cc_test( + name = "directory_reader_test", + srcs = ["directory_reader_test.cc"], + data = [ + "//test/core/tsi/test_creds/crl_data/crls:ab06acdd.r0", + "//test/core/tsi/test_creds/crl_data/crls:b9322cac.r0", + "//test/core/tsi/test_creds/crl_data/crls:current.crl", + "//test/core/tsi/test_creds/crl_data/crls:intermediate.crl", + ], + external_deps = [ + "gtest", + ], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:directory_reader", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "examine_stack_test", + srcs = ["examine_stack_test.cc"], + external_deps = [ + "absl/debugging:stacktrace", + "absl/debugging:symbolize", + "absl/log:log", + "gtest", + ], + language = "C++", + # TODO(https://github.com/grpc/grpc/issues/24627): Disable this on Windows + tags = ["no_windows"], + uses_event_engine = False, + uses_polling = False, + deps = [ + "//:gpr", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "dump_args_test", + srcs = ["dump_args_test.cc"], + external_deps = [ + "gtest", + ], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:dump_args", + ], +) + +# TODO(hork): solidify fork support requirements for EventEngines +grpc_cc_test( + name = "fork_test", + srcs = ["fork_test.cc"], + external_deps = ["gtest"], + language = "C++", + tags = ["no_windows"], + uses_event_engine = True, # engines should behave appropriately on Fork + uses_polling = False, + deps = [ + "//:gpr", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "bitset_test", + srcs = ["bitset_test.cc"], + external_deps = ["gtest"], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:bitset", + ], +) + +grpc_cc_test( + name = "if_list_test", + srcs = ["if_list_test.cc"], + external_deps = ["gtest"], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:if_list", + ], +) + +grpc_cc_test( + name = "no_destruct_test", + srcs = ["no_destruct_test.cc"], + external_deps = ["gtest"], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:no_destruct", + ], +) + +grpc_cc_test( + name = "match_test", + srcs = ["match_test.cc"], + external_deps = ["gtest"], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:match", + ], +) + +grpc_cc_test( + name = "overload_test", + srcs = ["overload_test.cc"], + external_deps = ["gtest"], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:overload", + ], +) + +grpc_cc_test( + name = "down_cast_test", + srcs = ["down_cast_test.cc"], + external_deps = ["gtest"], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:down_cast", + ], +) + +grpc_cc_test( + name = "table_test", + srcs = ["table_test.cc"], + external_deps = [ + "gtest", + "absl/types:optional", + ], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:table", + ], +) + +grpc_cc_test( + name = "host_port_test", + srcs = ["host_port_test.cc"], + external_deps = ["gtest"], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//:gpr", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "mpscq_test", + srcs = ["mpscq_test.cc"], + exec_properties = LARGE_MACHINE, + external_deps = [ + "absl/log:log", + "gtest", + ], + language = "C++", + tags = ["no_windows"], # LARGE_MACHINE is not configured for windows RBE + uses_event_engine = False, + uses_polling = False, + deps = [ + "//:gpr", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "orphanable_test", + srcs = ["orphanable_test.cc"], + external_deps = [ + "gtest", + ], + language = "C++", + deps = [ + "//:orphanable", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "ref_counted_test", + srcs = ["ref_counted_test.cc"], + external_deps = [ + "gtest", + ], + language = "C++", + deps = [ + "//src/core:ref_counted", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "dual_ref_counted_test", + srcs = ["dual_ref_counted_test.cc"], + external_deps = [ + "absl/log:check", + "gtest", + ], + language = "C++", + deps = [ + "//src/core:dual_ref_counted", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "ref_counted_ptr_test", + srcs = ["ref_counted_ptr_test.cc"], + external_deps = [ + "absl/container:flat_hash_set", + "absl/log:check", + "gtest", + ], + language = "C++", + deps = [ + "//:ref_counted_ptr", + "//src/core:dual_ref_counted", + "//src/core:ref_counted", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "thd_test", + srcs = ["thd_test.cc"], + external_deps = ["gtest"], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//:gpr", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "stat_test", + srcs = ["stat_test.cc"], + external_deps = [ + "gtest", + ], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//:gpr", + "//:grpc", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "status_helper_test", + srcs = ["status_helper_test.cc"], + external_deps = [ + "gtest", + ], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//:gpr", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "time_util_test", + srcs = ["time_util_test.cc"], + external_deps = [ + "gtest", + ], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//:gpr", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "cpp_impl_of_test", + srcs = ["cpp_impl_of_test.cc"], + external_deps = ["gtest"], + language = "c++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//:cpp_impl_of", + ], +) + +grpc_cc_test( + name = "chunked_vector_test", + srcs = ["chunked_vector_test.cc"], + external_deps = ["gtest"], + language = "c++", + tags = [ + "resource_quota_test", + ], + uses_event_engine = False, + uses_polling = False, + deps = [ + "//:gpr", + "//src/core:chunked_vector", + "//src/core:resource_quota", + ], +) + +grpc_proto_fuzzer( + name = "chunked_vector_fuzzer", + srcs = ["chunked_vector_fuzzer.cc"], + corpus = "chunked_vector_corpora", + external_deps = ["absl/log:check"], + language = "C++", + proto = "chunked_vector_fuzzer.proto", + tags = ["no_windows"], + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:chunked_vector", + "//src/core:resource_quota", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "time_test", + srcs = ["time_test.cc"], + external_deps = ["gtest"], + language = "c++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:time", + ], +) + +grpc_cc_test( + name = "single_set_ptr_test", + srcs = ["single_set_ptr_test.cc"], + external_deps = [ + "absl/log:log", + "gtest", + ], + language = "c++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:single_set_ptr", + ], +) + +grpc_cc_test( + name = "sorted_pack_test", + srcs = ["sorted_pack_test.cc"], + external_deps = ["gtest"], + language = "c++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:sorted_pack", + ], +) + +grpc_cc_test( + name = "unique_type_name_test", + srcs = ["unique_type_name_test.cc"], + external_deps = [ + "gtest", + "absl/container:flat_hash_map", + "absl/strings:str_format", + ], + language = "c++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:unique_type_name", + ], +) + +grpc_cc_test( + name = "work_serializer_test", + srcs = ["work_serializer_test.cc"], + exec_properties = LARGE_MACHINE, + external_deps = [ + "gtest", + ], + flaky = True, + language = "C++", + shard_count = 5, + tags = [ + "no_windows", # LARGE_MACHINE is not configured for windows RBE + ], + deps = [ + "//:gpr", + "//:grpc", + "//test/core/event_engine:event_engine_test_utils", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "validation_errors_test", + srcs = ["validation_errors_test.cc"], + external_deps = [ + "gtest", + ], + language = "C++", + deps = [ + "//src/core:validation_errors", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "notification_test", + srcs = ["notification_test.cc"], + external_deps = [ + "gtest", + ], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = ["//src/core:notification"], +) + +grpc_cc_test( + name = "load_file_test", + srcs = ["load_file_test.cc"], + external_deps = [ + "gtest", + ], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:load_file", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "uuid_v4_test", + srcs = ["uuid_v4_test.cc"], + external_deps = [ + "gtest", + ], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:uuid_v4", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "glob_test", + srcs = ["glob_test.cc"], + external_deps = ["gtest"], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//:gpr", + "//src/core:useful", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_fuzzer( + name = "uri_fuzzer_test", + srcs = ["uri_fuzzer_test.cc"], + corpus = "uri_corpus", + language = "C++", + tags = [ + "no_windows", + # Without "nofixdeps", "//:grpc" gets substituted with "//:event_engine_base_hdrs" + "nofixdeps", + ], + deps = [ + "//:exec_ctx", + "//:gpr", + "//:grpc", + "//:uri", + ], +) + +grpc_cc_test( + name = "uri_test", + srcs = ["uri_test.cc"], + external_deps = [ + "absl/status", + "gtest", + ], + language = "C++", + deps = [ + "//:event_engine_base_hdrs", + "//:uri", + "//test/core/test_util:grpc_test_util_unsecure", + ], +) + +grpc_cc_test( + name = "matchers_test", + srcs = ["matchers_test.cc"], + external_deps = ["gtest"], + language = "C++", + deps = [ + "//:gpr", + "//:grpc", + "//test/core/test_util:grpc_test_util", + "//test/core/test_util:grpc_test_util_base", + ], +) + +grpc_cc_test( + name = "backoff_test", + srcs = ["backoff_test.cc"], + external_deps = ["gtest"], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//:backoff", + "//:exec_ctx", + "//:grpc", + "//src/core:time", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "random_early_detection_test", + srcs = ["random_early_detection_test.cc"], + external_deps = [ + "absl/random", + "gtest", + ], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = ["//src/core:random_early_detection"], +) + grpc_cc_test( name = "alloc_test", srcs = ["alloc_test.cc"], @@ -100,8 +676,8 @@ grpc_cc_test( ) grpc_cc_test( - name = "time_test", - srcs = ["time_test.cc"], + name = "gpr_time_test", + srcs = ["gpr_time_test.cc"], external_deps = ["gtest"], language = "C++", uses_event_engine = False, @@ -151,6 +727,33 @@ grpc_cc_test( ], ) +grpc_cc_test( + name = "avl_test", + srcs = ["avl_test.cc"], + external_deps = ["gtest"], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:avl", + ], +) + +grpc_proto_fuzzer( + name = "avl_fuzzer", + srcs = ["avl_fuzzer.cc"], + corpus = "avl_fuzzer_corpus", + language = "C++", + proto = "avl_fuzzer.proto", + tags = ["no_windows"], + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:avl", + "//test/core/test_util:grpc_test_util", + ], +) + grpc_cc_test( name = "lru_cache_test", srcs = ["lru_cache_test.cc"], diff --git a/test/core/avl/avl_fuzzer.cc b/test/core/util/avl_fuzzer.cc similarity index 97% rename from test/core/avl/avl_fuzzer.cc rename to test/core/util/avl_fuzzer.cc index 914fdb78b3a..a0760e659cd 100644 --- a/test/core/avl/avl_fuzzer.cc +++ b/test/core/util/avl_fuzzer.cc @@ -19,9 +19,9 @@ #include #include -#include "src/core/lib/avl/avl.h" +#include "src/core/util/avl.h" #include "src/libfuzzer/libfuzzer_macro.h" -#include "test/core/avl/avl_fuzzer.pb.h" +#include "test/core/util/avl_fuzzer.pb.h" bool squelch = true; bool leak_check = true; diff --git a/test/core/avl/avl_fuzzer.proto b/test/core/util/avl_fuzzer.proto similarity index 100% rename from test/core/avl/avl_fuzzer.proto rename to test/core/util/avl_fuzzer.proto diff --git a/test/core/avl/avl_fuzzer_corpus/0 b/test/core/util/avl_fuzzer_corpus/0 similarity index 100% rename from test/core/avl/avl_fuzzer_corpus/0 rename to test/core/util/avl_fuzzer_corpus/0 diff --git a/test/core/avl/avl_fuzzer_corpus/crash-060a9a897130ba7bb2f4313daa604c47f7c7c907 b/test/core/util/avl_fuzzer_corpus/crash-060a9a897130ba7bb2f4313daa604c47f7c7c907 similarity index 100% rename from test/core/avl/avl_fuzzer_corpus/crash-060a9a897130ba7bb2f4313daa604c47f7c7c907 rename to test/core/util/avl_fuzzer_corpus/crash-060a9a897130ba7bb2f4313daa604c47f7c7c907 diff --git a/test/core/avl/avl_fuzzer_corpus/crash-1fbe8edb82f9a7aa4c2dffe4a6eaa40c34b1e360 b/test/core/util/avl_fuzzer_corpus/crash-1fbe8edb82f9a7aa4c2dffe4a6eaa40c34b1e360 similarity index 100% rename from test/core/avl/avl_fuzzer_corpus/crash-1fbe8edb82f9a7aa4c2dffe4a6eaa40c34b1e360 rename to test/core/util/avl_fuzzer_corpus/crash-1fbe8edb82f9a7aa4c2dffe4a6eaa40c34b1e360 diff --git a/test/core/avl/avl_test.cc b/test/core/util/avl_test.cc similarity index 97% rename from test/core/avl/avl_test.cc rename to test/core/util/avl_test.cc index 2bd56c81bc6..1c8c33a18bf 100644 --- a/test/core/avl/avl_test.cc +++ b/test/core/util/avl_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/avl/avl.h" +#include "src/core/util/avl.h" #include diff --git a/test/core/backoff/backoff_test.cc b/test/core/util/backoff_test.cc similarity index 98% rename from test/core/backoff/backoff_test.cc rename to test/core/util/backoff_test.cc index 13710acffad..3ee1cf7fe21 100644 --- a/test/core/backoff/backoff_test.cc +++ b/test/core/util/backoff_test.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/backoff/backoff.h" +#include "src/core/util/backoff.h" #include #include @@ -26,7 +26,7 @@ #include -#include "src/core/lib/gprpp/time.h" +#include "src/core/util/time.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/gprpp/bitset_test.cc b/test/core/util/bitset_test.cc similarity index 98% rename from test/core/gprpp/bitset_test.cc rename to test/core/util/bitset_test.cc index 58a23f628c1..99f1f72a7ee 100644 --- a/test/core/gprpp/bitset_test.cc +++ b/test/core/util/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_corpora/crash-a0868ce3a0f76feefcc715148ed9e71fa0738c2a b/test/core/util/chunked_vector_corpora/crash-a0868ce3a0f76feefcc715148ed9e71fa0738c2a similarity index 100% rename from test/core/gprpp/chunked_vector_corpora/crash-a0868ce3a0f76feefcc715148ed9e71fa0738c2a rename to test/core/util/chunked_vector_corpora/crash-a0868ce3a0f76feefcc715148ed9e71fa0738c2a diff --git a/test/core/gprpp/chunked_vector_corpora/testcase-5405829431427072 b/test/core/util/chunked_vector_corpora/testcase-5405829431427072 similarity index 100% rename from test/core/gprpp/chunked_vector_corpora/testcase-5405829431427072 rename to test/core/util/chunked_vector_corpora/testcase-5405829431427072 diff --git a/test/core/gprpp/chunked_vector_fuzzer.cc b/test/core/util/chunked_vector_fuzzer.cc similarity index 97% rename from test/core/gprpp/chunked_vector_fuzzer.cc rename to test/core/util/chunked_vector_fuzzer.cc index d857208c2e5..37bcc3df4e1 100644 --- a/test/core/gprpp/chunked_vector_fuzzer.cc +++ b/test/core/util/chunked_vector_fuzzer.cc @@ -24,13 +24,13 @@ #include -#include "src/core/lib/gprpp/chunked_vector.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/chunked_vector.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/libfuzzer/libfuzzer_macro.h" -#include "test/core/gprpp/chunked_vector_fuzzer.pb.h" +#include "test/core/util/chunked_vector_fuzzer.pb.h" bool squelch = true; bool leak_check = true; diff --git a/test/core/gprpp/chunked_vector_fuzzer.proto b/test/core/util/chunked_vector_fuzzer.proto similarity index 100% rename from test/core/gprpp/chunked_vector_fuzzer.proto rename to test/core/util/chunked_vector_fuzzer.proto diff --git a/test/core/gprpp/chunked_vector_test.cc b/test/core/util/chunked_vector_test.cc similarity index 97% rename from test/core/gprpp/chunked_vector_test.cc rename to test/core/util/chunked_vector_test.cc index 6299b0209d7..82f10436edc 100644 --- a/test/core/gprpp/chunked_vector_test.cc +++ b/test/core/util/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,9 +21,9 @@ #include -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/util/ref_counted_ptr.h" namespace grpc_core { namespace testing { diff --git a/test/core/gprpp/cpp_impl_of_test.cc b/test/core/util/cpp_impl_of_test.cc similarity index 95% rename from test/core/gprpp/cpp_impl_of_test.cc rename to test/core/util/cpp_impl_of_test.cc index 00b164cb3aa..49653bee36b 100644 --- a/test/core/gprpp/cpp_impl_of_test.cc +++ b/test/core/util/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/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/gprpp/directory_reader_test.cc b/test/core/util/directory_reader_test.cc similarity index 97% rename from test/core/gprpp/directory_reader_test.cc rename to test/core/util/directory_reader_test.cc index b20e167b078..e117bc2b058 100644 --- a/test/core/gprpp/directory_reader_test.cc +++ b/test/core/util/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/util/down_cast_test.cc similarity index 96% rename from test/core/gprpp/down_cast_test.cc rename to test/core/util/down_cast_test.cc index e0af7081734..dd84b197f70 100644 --- a/test/core/gprpp/down_cast_test.cc +++ b/test/core/util/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/util/dual_ref_counted_test.cc similarity index 96% rename from test/core/gprpp/dual_ref_counted_test.cc rename to test/core/util/dual_ref_counted_test.cc index 1f7cf80e41d..4c9e2de162f 100644 --- a/test/core/gprpp/dual_ref_counted_test.cc +++ b/test/core/util/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/util/dump_args_test.cc similarity index 96% rename from test/core/gprpp/dump_args_test.cc rename to test/core/util/dump_args_test.cc index 09c6fafc387..06f26a1fce5 100644 --- a/test/core/gprpp/dump_args_test.cc +++ b/test/core/util/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/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/gprpp/examine_stack_test.cc b/test/core/util/examine_stack_test.cc similarity index 98% rename from test/core/gprpp/examine_stack_test.cc rename to test/core/util/examine_stack_test.cc index f9384842c7d..e257f114828 100644 --- a/test/core/gprpp/examine_stack_test.cc +++ b/test/core/util/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/util/fork_test.cc similarity index 98% rename from test/core/gprpp/fork_test.cc rename to test/core/util/fork_test.cc index 24f74c77d6b..543c00da713 100644 --- a/test/core/gprpp/fork_test.cc +++ b/test/core/util/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/glob_test.cc b/test/core/util/glob_test.cc similarity index 98% rename from test/core/gprpp/glob_test.cc rename to test/core/util/glob_test.cc index 5233c666235..84df18db721 100644 --- a/test/core/gprpp/glob_test.cc +++ b/test/core/util/glob_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/glob.h" +#include "src/core/util/glob.h" #include "absl/strings/match.h" #include "gtest/gtest.h" diff --git a/test/core/util/gpr_time_test.cc b/test/core/util/gpr_time_test.cc new file mode 100644 index 00000000000..48ea2ce17a2 --- /dev/null +++ b/test/core/util/gpr_time_test.cc @@ -0,0 +1,268 @@ +// +// +// 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. +// +// + +// Test of gpr time support. + +#include +#include +#include + +#include + +#include "gtest/gtest.h" + +#include + +#include "test/core/test_util/test_config.h" + +static void to_fp(void* arg, const char* buf, size_t len) { + fwrite(buf, 1, len, static_cast(arg)); +} + +// Convert gpr_intmax x to ascii base b (2..16), and write with +// (*writer)(arg, ...), zero padding to "chars" digits). +static void i_to_s(intmax_t x, int base, int chars, + void (*writer)(void* arg, const char* buf, size_t len), + void* arg) { + char buf[64]; + char fmt[32]; + ASSERT_TRUE(base == 16 || base == 10); + sprintf(fmt, "%%0%d%s", chars, base == 16 ? PRIxMAX : PRIdMAX); + sprintf(buf, fmt, x); + (*writer)(arg, buf, strlen(buf)); +} + +// Convert ts to ascii, and write with (*writer)(arg, ...). +static void ts_to_s(gpr_timespec t, + void (*writer)(void* arg, const char* buf, size_t len), + void* arg) { + if (t.tv_sec < 0 && t.tv_nsec != 0) { + t.tv_sec++; + t.tv_nsec = GPR_NS_PER_SEC - t.tv_nsec; + } + i_to_s(t.tv_sec, 10, 0, writer, arg); + (*writer)(arg, ".", 1); + i_to_s(t.tv_nsec, 10, 9, writer, arg); +} + +TEST(TimeTest, Values) { + int i; + + gpr_timespec x = gpr_time_0(GPR_CLOCK_REALTIME); + ASSERT_TRUE(x.tv_sec == 0 && x.tv_nsec == 0); + + x = gpr_inf_future(GPR_CLOCK_REALTIME); + fprintf(stderr, "far future "); + fflush(stderr); + i_to_s(x.tv_sec, 16, 16, &to_fp, stderr); + fprintf(stderr, "\n"); + ASSERT_EQ(x.tv_sec, INT64_MAX); + fprintf(stderr, "far future "); + fflush(stderr); + ts_to_s(x, &to_fp, stderr); + fprintf(stderr, "\n"); + fflush(stderr); + + x = gpr_inf_past(GPR_CLOCK_REALTIME); + fprintf(stderr, "far past "); + fflush(stderr); + i_to_s(x.tv_sec, 16, 16, &to_fp, stderr); + fprintf(stderr, "\n"); + fflush(stderr); + ASSERT_EQ(x.tv_sec, INT64_MIN); + fprintf(stderr, "far past "); + fflush(stderr); + ts_to_s(x, &to_fp, stderr); + fprintf(stderr, "\n"); + fflush(stderr); + + for (i = 1; i != 1000 * 1000 * 1000; i *= 10) { + x = gpr_time_from_micros(i, GPR_TIMESPAN); + ASSERT_TRUE(x.tv_sec == i / GPR_US_PER_SEC && + x.tv_nsec == (i % GPR_US_PER_SEC) * GPR_NS_PER_US); + x = gpr_time_from_nanos(i, GPR_TIMESPAN); + ASSERT_TRUE(x.tv_sec == i / GPR_NS_PER_SEC && + x.tv_nsec == (i % GPR_NS_PER_SEC)); + x = gpr_time_from_millis(i, GPR_TIMESPAN); + ASSERT_TRUE(x.tv_sec == i / GPR_MS_PER_SEC && + x.tv_nsec == (i % GPR_MS_PER_SEC) * GPR_NS_PER_MS); + } + + // Test possible overflow in conversion of -ve values. + x = gpr_time_from_micros(-(INT64_MAX - 999997), GPR_TIMESPAN); + ASSERT_LT(x.tv_sec, 0); + ASSERT_TRUE(x.tv_nsec >= 0 && x.tv_nsec < GPR_NS_PER_SEC); + EXPECT_EQ((x.tv_sec * GPR_US_PER_SEC + + x.tv_nsec / (GPR_NS_PER_SEC / GPR_US_PER_SEC)), + -(INT64_MAX - 999997)); + + x = gpr_time_from_nanos(-(INT64_MAX - 999999997), GPR_TIMESPAN); + ASSERT_LT(x.tv_sec, 0); + ASSERT_TRUE(x.tv_nsec >= 0 && x.tv_nsec < GPR_NS_PER_SEC); + EXPECT_EQ((x.tv_sec * GPR_NS_PER_SEC + x.tv_nsec), -(INT64_MAX - 999999997)); + + x = gpr_time_from_millis(-(INT64_MAX - 997), GPR_TIMESPAN); + ASSERT_LT(x.tv_sec, 0); + ASSERT_TRUE(x.tv_nsec >= 0 && x.tv_nsec < GPR_NS_PER_SEC); + EXPECT_EQ((x.tv_sec * GPR_MS_PER_SEC + + x.tv_nsec / (GPR_NS_PER_SEC / GPR_MS_PER_SEC)), + -(INT64_MAX - 997)); + + // Test general -ve values. + for (i = -1; i > -1000 * 1000 * 1000; i *= 7) { + x = gpr_time_from_micros(i, GPR_TIMESPAN); + ASSERT_EQ(x.tv_sec * GPR_US_PER_SEC + x.tv_nsec / GPR_NS_PER_US, i); + x = gpr_time_from_nanos(i, GPR_TIMESPAN); + ASSERT_EQ(x.tv_sec * GPR_NS_PER_SEC + x.tv_nsec, i); + x = gpr_time_from_millis(i, GPR_TIMESPAN); + ASSERT_EQ(x.tv_sec * GPR_MS_PER_SEC + x.tv_nsec / GPR_NS_PER_MS, i); + } +} + +TEST(TimeTest, AddSub) { + int i; + int j; + int k; + // Basic addition and subtraction. + for (i = -100; i <= 100; i++) { + for (j = -100; j <= 100; j++) { + for (k = 1; k <= 10000000; k *= 10) { + int sum = i + j; + int diff = i - j; + gpr_timespec it = gpr_time_from_micros(i * k, GPR_TIMESPAN); + gpr_timespec jt = gpr_time_from_micros(j * k, GPR_TIMESPAN); + gpr_timespec sumt = gpr_time_add(it, jt); + gpr_timespec difft = gpr_time_sub(it, jt); + if (gpr_time_cmp(gpr_time_from_micros(sum * k, GPR_TIMESPAN), sumt) != + 0) { + fprintf(stderr, "i %d j %d sum %d sumt ", i, j, sum); + fflush(stderr); + ts_to_s(sumt, &to_fp, stderr); + fprintf(stderr, "\n"); + fflush(stderr); + ASSERT_TRUE(0); + } + if (gpr_time_cmp(gpr_time_from_micros(diff * k, GPR_TIMESPAN), difft) != + 0) { + fprintf(stderr, "i %d j %d diff %d diff ", i, j, diff); + fflush(stderr); + ts_to_s(sumt, &to_fp, stderr); + fprintf(stderr, "\n"); + fflush(stderr); + ASSERT_TRUE(0); + } + } + } + } +} + +TEST(TimeTest, Overflow) { + // overflow + gpr_timespec x = gpr_time_from_micros(1, GPR_TIMESPAN); + do { + x = gpr_time_add(x, x); + } while (gpr_time_cmp(x, gpr_inf_future(GPR_TIMESPAN)) < 0); + ASSERT_EQ(gpr_time_cmp(x, gpr_inf_future(GPR_TIMESPAN)), 0); + x = gpr_time_from_micros(-1, GPR_TIMESPAN); + do { + x = gpr_time_add(x, x); + } while (gpr_time_cmp(x, gpr_inf_past(GPR_TIMESPAN)) > 0); + ASSERT_EQ(gpr_time_cmp(x, gpr_inf_past(GPR_TIMESPAN)), 0); +} + +TEST(TimeTest, StickyInfinities) { + int i; + int j; + int k; + gpr_timespec infinity[2]; + gpr_timespec addend[3]; + infinity[0] = gpr_inf_future(GPR_TIMESPAN); + infinity[1] = gpr_inf_past(GPR_TIMESPAN); + addend[0] = gpr_inf_future(GPR_TIMESPAN); + addend[1] = gpr_inf_past(GPR_TIMESPAN); + addend[2] = gpr_time_0(GPR_TIMESPAN); + + // Infinities are sticky + for (i = 0; i != sizeof(infinity) / sizeof(infinity[0]); i++) { + for (j = 0; j != sizeof(addend) / sizeof(addend[0]); j++) { + gpr_timespec x = gpr_time_add(infinity[i], addend[j]); + ASSERT_EQ(gpr_time_cmp(x, infinity[i]), 0); + x = gpr_time_sub(infinity[i], addend[j]); + ASSERT_EQ(gpr_time_cmp(x, infinity[i]), 0); + } + for (k = -200; k <= 200; k++) { + gpr_timespec y = gpr_time_from_micros(k * 100000, GPR_TIMESPAN); + gpr_timespec x = gpr_time_add(infinity[i], y); + ASSERT_EQ(gpr_time_cmp(x, infinity[i]), 0); + x = gpr_time_sub(infinity[i], y); + ASSERT_EQ(gpr_time_cmp(x, infinity[i]), 0); + } + } +} + +TEST(TimeTest, Similar) { + ASSERT_EQ(1, gpr_time_similar(gpr_inf_future(GPR_TIMESPAN), + gpr_inf_future(GPR_TIMESPAN), + gpr_time_0(GPR_TIMESPAN))); + ASSERT_EQ(1, gpr_time_similar(gpr_inf_past(GPR_TIMESPAN), + gpr_inf_past(GPR_TIMESPAN), + gpr_time_0(GPR_TIMESPAN))); + ASSERT_EQ(0, gpr_time_similar(gpr_inf_past(GPR_TIMESPAN), + gpr_inf_future(GPR_TIMESPAN), + gpr_time_0(GPR_TIMESPAN))); + ASSERT_EQ(0, gpr_time_similar(gpr_inf_future(GPR_TIMESPAN), + gpr_inf_past(GPR_TIMESPAN), + gpr_time_0(GPR_TIMESPAN))); + ASSERT_EQ(1, gpr_time_similar(gpr_time_from_micros(10, GPR_TIMESPAN), + gpr_time_from_micros(10, GPR_TIMESPAN), + gpr_time_0(GPR_TIMESPAN))); + ASSERT_EQ(1, gpr_time_similar(gpr_time_from_micros(10, GPR_TIMESPAN), + gpr_time_from_micros(15, GPR_TIMESPAN), + gpr_time_from_micros(10, GPR_TIMESPAN))); + ASSERT_EQ(1, gpr_time_similar(gpr_time_from_micros(15, GPR_TIMESPAN), + gpr_time_from_micros(10, GPR_TIMESPAN), + gpr_time_from_micros(10, GPR_TIMESPAN))); + ASSERT_EQ(0, gpr_time_similar(gpr_time_from_micros(10, GPR_TIMESPAN), + gpr_time_from_micros(25, GPR_TIMESPAN), + gpr_time_from_micros(10, GPR_TIMESPAN))); + ASSERT_EQ(0, gpr_time_similar(gpr_time_from_micros(25, GPR_TIMESPAN), + gpr_time_from_micros(10, GPR_TIMESPAN), + gpr_time_from_micros(10, GPR_TIMESPAN))); +} + +TEST(TimeTest, ConvertExtreme) { + gpr_timespec realtime = {INT64_MAX, 1, GPR_CLOCK_REALTIME}; + gpr_timespec monotime = gpr_convert_clock_type(realtime, GPR_CLOCK_MONOTONIC); + ASSERT_EQ(monotime.tv_sec, realtime.tv_sec); + ASSERT_EQ(monotime.clock_type, GPR_CLOCK_MONOTONIC); +} + +TEST(TimeTest, CmpExtreme) { + gpr_timespec t1 = {INT64_MAX, 1, GPR_CLOCK_REALTIME}; + gpr_timespec t2 = {INT64_MAX, 2, GPR_CLOCK_REALTIME}; + ASSERT_EQ(gpr_time_cmp(t1, t2), 0); + t1.tv_sec = INT64_MIN; + t2.tv_sec = INT64_MIN; + ASSERT_EQ(gpr_time_cmp(t1, t2), 0); +} + +int main(int argc, char** argv) { + grpc::testing::TestEnvironment env(&argc, argv); + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); +} diff --git a/test/core/gprpp/host_port_test.cc b/test/core/util/host_port_test.cc similarity index 98% rename from test/core/gprpp/host_port_test.cc rename to test/core/util/host_port_test.cc index 77432e3155d..3f7607c0a56 100644 --- a/test/core/gprpp/host_port_test.cc +++ b/test/core/util/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/util/if_list_test.cc similarity index 96% rename from test/core/gprpp/if_list_test.cc rename to test/core/util/if_list_test.cc index 38dce561bf4..d99d8ed6ba3 100644 --- a/test/core/gprpp/if_list_test.cc +++ b/test/core/util/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/util/load_file_test.cc similarity index 98% rename from test/core/gprpp/load_file_test.cc rename to test/core/util/load_file_test.cc index 180624c9eb4..4888749fb40 100644 --- a/test/core/gprpp/load_file_test.cc +++ b/test/core/util/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/util/match_test.cc similarity index 98% rename from test/core/gprpp/match_test.cc rename to test/core/util/match_test.cc index 8df0b69a173..481bb2d6c59 100644 --- a/test/core/gprpp/match_test.cc +++ b/test/core/util/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/matchers/matchers_test.cc b/test/core/util/matchers_test.cc similarity index 99% rename from test/core/matchers/matchers_test.cc rename to test/core/util/matchers_test.cc index 75c6b498886..d772dcbcfbe 100644 --- a/test/core/matchers/matchers_test.cc +++ b/test/core/util/matchers_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/matchers/matchers.h" +#include "src/core/util/matchers.h" #include "absl/status/status.h" #include "gtest/gtest.h" diff --git a/test/core/gprpp/mpscq_test.cc b/test/core/util/mpscq_test.cc similarity index 98% rename from test/core/gprpp/mpscq_test.cc rename to test/core/util/mpscq_test.cc index 1bf92acd189..65dce481d43 100644 --- a/test/core/gprpp/mpscq_test.cc +++ b/test/core/util/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/util/no_destruct_test.cc similarity index 97% rename from test/core/gprpp/no_destruct_test.cc rename to test/core/util/no_destruct_test.cc index d0f9d19a4c9..7a440e65a2d 100644 --- a/test/core/gprpp/no_destruct_test.cc +++ b/test/core/util/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/util/notification_test.cc similarity index 97% rename from test/core/gprpp/notification_test.cc rename to test/core/util/notification_test.cc index ed5dcf48021..3a4fb77a53d 100644 --- a/test/core/gprpp/notification_test.cc +++ b/test/core/util/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/util/orphanable_test.cc similarity index 98% rename from test/core/gprpp/orphanable_test.cc rename to test/core/util/orphanable_test.cc index fe53367c9a2..4e38d719d9c 100644 --- a/test/core/gprpp/orphanable_test.cc +++ b/test/core/util/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/util/overload_test.cc similarity index 96% rename from test/core/gprpp/overload_test.cc rename to test/core/util/overload_test.cc index e7443a5be2c..c3b26549fd4 100644 --- a/test/core/gprpp/overload_test.cc +++ b/test/core/util/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/backoff/random_early_detection_test.cc b/test/core/util/random_early_detection_test.cc similarity index 97% rename from test/core/backoff/random_early_detection_test.cc rename to test/core/util/random_early_detection_test.cc index 778fe873bf0..c0531d647d5 100644 --- a/test/core/backoff/random_early_detection_test.cc +++ b/test/core/util/random_early_detection_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/backoff/random_early_detection.h" +#include "src/core/util/random_early_detection.h" #include diff --git a/test/core/gprpp/ref_counted_ptr_test.cc b/test/core/util/ref_counted_ptr_test.cc similarity index 99% rename from test/core/gprpp/ref_counted_ptr_test.cc rename to test/core/util/ref_counted_ptr_test.cc index 5c3e0f0f6c7..e2d7cd0f4db 100644 --- a/test/core/gprpp/ref_counted_ptr_test.cc +++ b/test/core/util/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 @@ -24,8 +24,8 @@ #include "absl/log/check.h" #include "gtest/gtest.h" -#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/util/ref_counted_test.cc similarity index 99% rename from test/core/gprpp/ref_counted_test.cc rename to test/core/util/ref_counted_test.cc index 15ee86e5c52..5b0171d3b4f 100644 --- a/test/core/gprpp/ref_counted_test.cc +++ b/test/core/util/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/util/single_set_ptr_test.cc similarity index 97% rename from test/core/gprpp/single_set_ptr_test.cc rename to test/core/util/single_set_ptr_test.cc index b93aa14c3e8..67f9cc39b96 100644 --- a/test/core/gprpp/single_set_ptr_test.cc +++ b/test/core/util/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/util/sorted_pack_test.cc similarity index 97% rename from test/core/gprpp/sorted_pack_test.cc rename to test/core/util/sorted_pack_test.cc index ad4e911c813..74e0bb6823d 100644 --- a/test/core/gprpp/sorted_pack_test.cc +++ b/test/core/util/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/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/gprpp/stat_test.cc b/test/core/util/stat_test.cc similarity index 98% rename from test/core/gprpp/stat_test.cc rename to test/core/util/stat_test.cc index 29536b4a0e6..4595a6208bd 100644 --- a/test/core/gprpp/stat_test.cc +++ b/test/core/util/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/util/status_helper_test.cc similarity index 99% rename from test/core/gprpp/status_helper_test.cc rename to test/core/util/status_helper_test.cc index 51f9a571cff..a5c7c14e357 100644 --- a/test/core/gprpp/status_helper_test.cc +++ b/test/core/util/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/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/gprpp/table_test.cc b/test/core/util/table_test.cc similarity index 99% rename from test/core/gprpp/table_test.cc rename to test/core/util/table_test.cc index 9c9ba507263..7d959b311e5 100644 --- a/test/core/gprpp/table_test.cc +++ b/test/core/util/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/util/thd_test.cc similarity index 98% rename from test/core/gprpp/thd_test.cc rename to test/core/util/thd_test.cc index c26a417a387..fd93eb278d3 100644 --- a/test/core/gprpp/thd_test.cc +++ b/test/core/util/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/util/time_averaged_stats_test.cc similarity index 99% rename from test/core/gprpp/time_averaged_stats_test.cc rename to test/core/util/time_averaged_stats_test.cc index 1407c2694aa..f42f27e3353 100644 --- a/test/core/gprpp/time_averaged_stats_test.cc +++ b/test/core/util/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/util/time_test.cc b/test/core/util/time_test.cc index 48ea2ce17a2..01ab35e3b47 100644 --- a/test/core/util/time_test.cc +++ b/test/core/util/time_test.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,256 +11,103 @@ // 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. -// -// -// Test of gpr time support. +#include "src/core/util/time.h" -#include -#include -#include - -#include +#include #include "gtest/gtest.h" -#include - -#include "test/core/test_util/test_config.h" +namespace grpc_core { +namespace testing { -static void to_fp(void* arg, const char* buf, size_t len) { - fwrite(buf, 1, len, static_cast(arg)); +TEST(TimestampTest, Empty) { + EXPECT_EQ(Timestamp(), Timestamp::ProcessEpoch()); } -// Convert gpr_intmax x to ascii base b (2..16), and write with -// (*writer)(arg, ...), zero padding to "chars" digits). -static void i_to_s(intmax_t x, int base, int chars, - void (*writer)(void* arg, const char* buf, size_t len), - void* arg) { - char buf[64]; - char fmt[32]; - ASSERT_TRUE(base == 16 || base == 10); - sprintf(fmt, "%%0%d%s", chars, base == 16 ? PRIxMAX : PRIdMAX); - sprintf(buf, fmt, x); - (*writer)(arg, buf, strlen(buf)); +TEST(TimestampTest, Infinities) { + EXPECT_EQ(Timestamp::InfFuture() - Duration::Milliseconds(1), + Timestamp::InfFuture()); + EXPECT_EQ(Timestamp::InfPast() + Duration::Milliseconds(1), + Timestamp::InfPast()); + EXPECT_EQ(Timestamp::Now() - Timestamp::InfPast(), Duration::Infinity()); + EXPECT_EQ(Timestamp::Now() - Timestamp::InfFuture(), + Duration::NegativeInfinity()); + EXPECT_EQ(Timestamp::InfPast() - Timestamp::InfPast(), + Duration::NegativeInfinity()); + EXPECT_EQ(Timestamp::InfFuture() - Timestamp::InfPast(), + Duration::Infinity()); + EXPECT_EQ(Timestamp::InfFuture() - Timestamp::InfFuture(), + Duration::Infinity()); + EXPECT_EQ(Timestamp::InfPast() - Timestamp::InfFuture(), + Duration::NegativeInfinity()); } -// Convert ts to ascii, and write with (*writer)(arg, ...). -static void ts_to_s(gpr_timespec t, - void (*writer)(void* arg, const char* buf, size_t len), - void* arg) { - if (t.tv_sec < 0 && t.tv_nsec != 0) { - t.tv_sec++; - t.tv_nsec = GPR_NS_PER_SEC - t.tv_nsec; - } - i_to_s(t.tv_sec, 10, 0, writer, arg); - (*writer)(arg, ".", 1); - i_to_s(t.tv_nsec, 10, 9, writer, arg); +TEST(TimestampTest, ToString) { + EXPECT_EQ(Timestamp::FromMillisecondsAfterProcessEpoch(42).ToString(), + "@42ms"); + EXPECT_EQ(Timestamp::InfFuture().ToString(), "@∞"); + EXPECT_EQ(Timestamp::InfPast().ToString(), "@-∞"); } -TEST(TimeTest, Values) { - int i; - - gpr_timespec x = gpr_time_0(GPR_CLOCK_REALTIME); - ASSERT_TRUE(x.tv_sec == 0 && x.tv_nsec == 0); - - x = gpr_inf_future(GPR_CLOCK_REALTIME); - fprintf(stderr, "far future "); - fflush(stderr); - i_to_s(x.tv_sec, 16, 16, &to_fp, stderr); - fprintf(stderr, "\n"); - ASSERT_EQ(x.tv_sec, INT64_MAX); - fprintf(stderr, "far future "); - fflush(stderr); - ts_to_s(x, &to_fp, stderr); - fprintf(stderr, "\n"); - fflush(stderr); +TEST(DurationTest, Empty) { EXPECT_EQ(Duration(), Duration::Zero()); } - x = gpr_inf_past(GPR_CLOCK_REALTIME); - fprintf(stderr, "far past "); - fflush(stderr); - i_to_s(x.tv_sec, 16, 16, &to_fp, stderr); - fprintf(stderr, "\n"); - fflush(stderr); - ASSERT_EQ(x.tv_sec, INT64_MIN); - fprintf(stderr, "far past "); - fflush(stderr); - ts_to_s(x, &to_fp, stderr); - fprintf(stderr, "\n"); - fflush(stderr); - - for (i = 1; i != 1000 * 1000 * 1000; i *= 10) { - x = gpr_time_from_micros(i, GPR_TIMESPAN); - ASSERT_TRUE(x.tv_sec == i / GPR_US_PER_SEC && - x.tv_nsec == (i % GPR_US_PER_SEC) * GPR_NS_PER_US); - x = gpr_time_from_nanos(i, GPR_TIMESPAN); - ASSERT_TRUE(x.tv_sec == i / GPR_NS_PER_SEC && - x.tv_nsec == (i % GPR_NS_PER_SEC)); - x = gpr_time_from_millis(i, GPR_TIMESPAN); - ASSERT_TRUE(x.tv_sec == i / GPR_MS_PER_SEC && - x.tv_nsec == (i % GPR_MS_PER_SEC) * GPR_NS_PER_MS); - } - - // Test possible overflow in conversion of -ve values. - x = gpr_time_from_micros(-(INT64_MAX - 999997), GPR_TIMESPAN); - ASSERT_LT(x.tv_sec, 0); - ASSERT_TRUE(x.tv_nsec >= 0 && x.tv_nsec < GPR_NS_PER_SEC); - EXPECT_EQ((x.tv_sec * GPR_US_PER_SEC + - x.tv_nsec / (GPR_NS_PER_SEC / GPR_US_PER_SEC)), - -(INT64_MAX - 999997)); - - x = gpr_time_from_nanos(-(INT64_MAX - 999999997), GPR_TIMESPAN); - ASSERT_LT(x.tv_sec, 0); - ASSERT_TRUE(x.tv_nsec >= 0 && x.tv_nsec < GPR_NS_PER_SEC); - EXPECT_EQ((x.tv_sec * GPR_NS_PER_SEC + x.tv_nsec), -(INT64_MAX - 999999997)); - - x = gpr_time_from_millis(-(INT64_MAX - 997), GPR_TIMESPAN); - ASSERT_LT(x.tv_sec, 0); - ASSERT_TRUE(x.tv_nsec >= 0 && x.tv_nsec < GPR_NS_PER_SEC); - EXPECT_EQ((x.tv_sec * GPR_MS_PER_SEC + - x.tv_nsec / (GPR_NS_PER_SEC / GPR_MS_PER_SEC)), - -(INT64_MAX - 997)); - - // Test general -ve values. - for (i = -1; i > -1000 * 1000 * 1000; i *= 7) { - x = gpr_time_from_micros(i, GPR_TIMESPAN); - ASSERT_EQ(x.tv_sec * GPR_US_PER_SEC + x.tv_nsec / GPR_NS_PER_US, i); - x = gpr_time_from_nanos(i, GPR_TIMESPAN); - ASSERT_EQ(x.tv_sec * GPR_NS_PER_SEC + x.tv_nsec, i); - x = gpr_time_from_millis(i, GPR_TIMESPAN); - ASSERT_EQ(x.tv_sec * GPR_MS_PER_SEC + x.tv_nsec / GPR_NS_PER_MS, i); - } +TEST(DurationTest, Scales) { + EXPECT_EQ(Duration::Milliseconds(1000), Duration::Seconds(1)); + EXPECT_EQ(Duration::Seconds(60), Duration::Minutes(1)); + EXPECT_EQ(Duration::Minutes(60), Duration::Hours(1)); + EXPECT_EQ(Duration::FromSecondsAsDouble(1.2), Duration::Milliseconds(1200)); + EXPECT_EQ(Duration::FromSecondsAndNanoseconds(1, 300000000), + Duration::Milliseconds(1300)); } -TEST(TimeTest, AddSub) { - int i; - int j; - int k; - // Basic addition and subtraction. - for (i = -100; i <= 100; i++) { - for (j = -100; j <= 100; j++) { - for (k = 1; k <= 10000000; k *= 10) { - int sum = i + j; - int diff = i - j; - gpr_timespec it = gpr_time_from_micros(i * k, GPR_TIMESPAN); - gpr_timespec jt = gpr_time_from_micros(j * k, GPR_TIMESPAN); - gpr_timespec sumt = gpr_time_add(it, jt); - gpr_timespec difft = gpr_time_sub(it, jt); - if (gpr_time_cmp(gpr_time_from_micros(sum * k, GPR_TIMESPAN), sumt) != - 0) { - fprintf(stderr, "i %d j %d sum %d sumt ", i, j, sum); - fflush(stderr); - ts_to_s(sumt, &to_fp, stderr); - fprintf(stderr, "\n"); - fflush(stderr); - ASSERT_TRUE(0); - } - if (gpr_time_cmp(gpr_time_from_micros(diff * k, GPR_TIMESPAN), difft) != - 0) { - fprintf(stderr, "i %d j %d diff %d diff ", i, j, diff); - fflush(stderr); - ts_to_s(sumt, &to_fp, stderr); - fprintf(stderr, "\n"); - fflush(stderr); - ASSERT_TRUE(0); - } - } - } - } +TEST(DurationTest, Epsilon) { + EXPECT_LE(Duration::Epsilon(), Duration::Milliseconds(1)); } -TEST(TimeTest, Overflow) { - // overflow - gpr_timespec x = gpr_time_from_micros(1, GPR_TIMESPAN); - do { - x = gpr_time_add(x, x); - } while (gpr_time_cmp(x, gpr_inf_future(GPR_TIMESPAN)) < 0); - ASSERT_EQ(gpr_time_cmp(x, gpr_inf_future(GPR_TIMESPAN)), 0); - x = gpr_time_from_micros(-1, GPR_TIMESPAN); - do { - x = gpr_time_add(x, x); - } while (gpr_time_cmp(x, gpr_inf_past(GPR_TIMESPAN)) > 0); - ASSERT_EQ(gpr_time_cmp(x, gpr_inf_past(GPR_TIMESPAN)), 0); +TEST(DurationTest, Infinities) { + EXPECT_EQ(Duration::Infinity() - Duration::Milliseconds(1), + Duration::Infinity()); + EXPECT_EQ(Duration::Infinity() + Duration::Milliseconds(1), + Duration::Infinity()); + EXPECT_EQ(Duration::Infinity() * 2, Duration::Infinity()); + EXPECT_EQ(Duration::Infinity() * -1, Duration::NegativeInfinity()); + EXPECT_EQ(Duration::Infinity() / 3, Duration::Infinity()); + EXPECT_EQ(Duration::NegativeInfinity() / -3, Duration::Infinity()); + EXPECT_EQ(Duration::NegativeInfinity() + Duration::Milliseconds(1), + Duration::NegativeInfinity()); + EXPECT_EQ(Duration::NegativeInfinity() - Duration::Milliseconds(1), + Duration::NegativeInfinity()); + EXPECT_EQ(Duration::NegativeInfinity() / 3, Duration::NegativeInfinity()); + EXPECT_EQ(Duration::Hours(std::numeric_limits::max()), + Duration::Infinity()); + EXPECT_EQ(Duration::FromSecondsAsDouble(1e100), Duration::Infinity()); + EXPECT_EQ(Duration::FromSecondsAsDouble(-1e100), + Duration::NegativeInfinity()); } -TEST(TimeTest, StickyInfinities) { - int i; - int j; - int k; - gpr_timespec infinity[2]; - gpr_timespec addend[3]; - infinity[0] = gpr_inf_future(GPR_TIMESPAN); - infinity[1] = gpr_inf_past(GPR_TIMESPAN); - addend[0] = gpr_inf_future(GPR_TIMESPAN); - addend[1] = gpr_inf_past(GPR_TIMESPAN); - addend[2] = gpr_time_0(GPR_TIMESPAN); - - // Infinities are sticky - for (i = 0; i != sizeof(infinity) / sizeof(infinity[0]); i++) { - for (j = 0; j != sizeof(addend) / sizeof(addend[0]); j++) { - gpr_timespec x = gpr_time_add(infinity[i], addend[j]); - ASSERT_EQ(gpr_time_cmp(x, infinity[i]), 0); - x = gpr_time_sub(infinity[i], addend[j]); - ASSERT_EQ(gpr_time_cmp(x, infinity[i]), 0); - } - for (k = -200; k <= 200; k++) { - gpr_timespec y = gpr_time_from_micros(k * 100000, GPR_TIMESPAN); - gpr_timespec x = gpr_time_add(infinity[i], y); - ASSERT_EQ(gpr_time_cmp(x, infinity[i]), 0); - x = gpr_time_sub(infinity[i], y); - ASSERT_EQ(gpr_time_cmp(x, infinity[i]), 0); - } - } +TEST(DurationTest, Multiplication) { + Duration d = Duration::Seconds(5); + EXPECT_EQ(d * 2, Duration::Seconds(10)); + d *= 3; + EXPECT_EQ(d, Duration::Seconds(15)); } -TEST(TimeTest, Similar) { - ASSERT_EQ(1, gpr_time_similar(gpr_inf_future(GPR_TIMESPAN), - gpr_inf_future(GPR_TIMESPAN), - gpr_time_0(GPR_TIMESPAN))); - ASSERT_EQ(1, gpr_time_similar(gpr_inf_past(GPR_TIMESPAN), - gpr_inf_past(GPR_TIMESPAN), - gpr_time_0(GPR_TIMESPAN))); - ASSERT_EQ(0, gpr_time_similar(gpr_inf_past(GPR_TIMESPAN), - gpr_inf_future(GPR_TIMESPAN), - gpr_time_0(GPR_TIMESPAN))); - ASSERT_EQ(0, gpr_time_similar(gpr_inf_future(GPR_TIMESPAN), - gpr_inf_past(GPR_TIMESPAN), - gpr_time_0(GPR_TIMESPAN))); - ASSERT_EQ(1, gpr_time_similar(gpr_time_from_micros(10, GPR_TIMESPAN), - gpr_time_from_micros(10, GPR_TIMESPAN), - gpr_time_0(GPR_TIMESPAN))); - ASSERT_EQ(1, gpr_time_similar(gpr_time_from_micros(10, GPR_TIMESPAN), - gpr_time_from_micros(15, GPR_TIMESPAN), - gpr_time_from_micros(10, GPR_TIMESPAN))); - ASSERT_EQ(1, gpr_time_similar(gpr_time_from_micros(15, GPR_TIMESPAN), - gpr_time_from_micros(10, GPR_TIMESPAN), - gpr_time_from_micros(10, GPR_TIMESPAN))); - ASSERT_EQ(0, gpr_time_similar(gpr_time_from_micros(10, GPR_TIMESPAN), - gpr_time_from_micros(25, GPR_TIMESPAN), - gpr_time_from_micros(10, GPR_TIMESPAN))); - ASSERT_EQ(0, gpr_time_similar(gpr_time_from_micros(25, GPR_TIMESPAN), - gpr_time_from_micros(10, GPR_TIMESPAN), - gpr_time_from_micros(10, GPR_TIMESPAN))); +TEST(DurationTest, FromTimespan) { + EXPECT_EQ(Duration::FromTimespec(gpr_time_from_millis(1234, GPR_TIMESPAN)), + Duration::Milliseconds(1234)); } -TEST(TimeTest, ConvertExtreme) { - gpr_timespec realtime = {INT64_MAX, 1, GPR_CLOCK_REALTIME}; - gpr_timespec monotime = gpr_convert_clock_type(realtime, GPR_CLOCK_MONOTONIC); - ASSERT_EQ(monotime.tv_sec, realtime.tv_sec); - ASSERT_EQ(monotime.clock_type, GPR_CLOCK_MONOTONIC); +TEST(DurationTest, ToString) { + EXPECT_EQ(Duration::Milliseconds(42).ToString(), "42ms"); + EXPECT_EQ(Duration::Infinity().ToString(), "∞"); + EXPECT_EQ(Duration::NegativeInfinity().ToString(), "-∞"); } -TEST(TimeTest, CmpExtreme) { - gpr_timespec t1 = {INT64_MAX, 1, GPR_CLOCK_REALTIME}; - gpr_timespec t2 = {INT64_MAX, 2, GPR_CLOCK_REALTIME}; - ASSERT_EQ(gpr_time_cmp(t1, t2), 0); - t1.tv_sec = INT64_MIN; - t2.tv_sec = INT64_MIN; - ASSERT_EQ(gpr_time_cmp(t1, t2), 0); -} +} // namespace testing +} // namespace grpc_core int main(int argc, char** argv) { - grpc::testing::TestEnvironment env(&argc, argv); ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); } diff --git a/test/core/gprpp/time_util_test.cc b/test/core/util/time_util_test.cc similarity index 99% rename from test/core/gprpp/time_util_test.cc rename to test/core/util/time_util_test.cc index 09a6650932e..749a6f26ec0 100644 --- a/test/core/gprpp/time_util_test.cc +++ b/test/core/util/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/util/unique_type_name_test.cc similarity index 98% rename from test/core/gprpp/unique_type_name_test.cc rename to test/core/util/unique_type_name_test.cc index 74f8a7c1d0d..80cffc497aa 100644 --- a/test/core/gprpp/unique_type_name_test.cc +++ b/test/core/util/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/uri/uri_corpus/02d156dc5e6f2c11c90c2e06fcee04adf036a342 b/test/core/util/uri_corpus/02d156dc5e6f2c11c90c2e06fcee04adf036a342 similarity index 100% rename from test/core/uri/uri_corpus/02d156dc5e6f2c11c90c2e06fcee04adf036a342 rename to test/core/util/uri_corpus/02d156dc5e6f2c11c90c2e06fcee04adf036a342 diff --git a/test/core/uri/uri_corpus/042dc4512fa3d391c5170cf3aa61e6a638f84342 b/test/core/util/uri_corpus/042dc4512fa3d391c5170cf3aa61e6a638f84342 similarity index 100% rename from test/core/uri/uri_corpus/042dc4512fa3d391c5170cf3aa61e6a638f84342 rename to test/core/util/uri_corpus/042dc4512fa3d391c5170cf3aa61e6a638f84342 diff --git a/test/core/uri/uri_corpus/0e9bbe975f2027e8c39c89f85f667530368e7d11 b/test/core/util/uri_corpus/0e9bbe975f2027e8c39c89f85f667530368e7d11 similarity index 100% rename from test/core/uri/uri_corpus/0e9bbe975f2027e8c39c89f85f667530368e7d11 rename to test/core/util/uri_corpus/0e9bbe975f2027e8c39c89f85f667530368e7d11 diff --git a/test/core/uri/uri_corpus/1155aa6ea7ef262a81a63692513ea395f84dad6f b/test/core/util/uri_corpus/1155aa6ea7ef262a81a63692513ea395f84dad6f similarity index 100% rename from test/core/uri/uri_corpus/1155aa6ea7ef262a81a63692513ea395f84dad6f rename to test/core/util/uri_corpus/1155aa6ea7ef262a81a63692513ea395f84dad6f diff --git a/test/core/uri/uri_corpus/13856a5569ffd085a4d5c07af5f8e9310835a118 b/test/core/util/uri_corpus/13856a5569ffd085a4d5c07af5f8e9310835a118 similarity index 100% rename from test/core/uri/uri_corpus/13856a5569ffd085a4d5c07af5f8e9310835a118 rename to test/core/util/uri_corpus/13856a5569ffd085a4d5c07af5f8e9310835a118 diff --git a/test/core/uri/uri_corpus/14b57bcbf1e17b1db1de491ef2ba3768f704b7dc b/test/core/util/uri_corpus/14b57bcbf1e17b1db1de491ef2ba3768f704b7dc similarity index 100% rename from test/core/uri/uri_corpus/14b57bcbf1e17b1db1de491ef2ba3768f704b7dc rename to test/core/util/uri_corpus/14b57bcbf1e17b1db1de491ef2ba3768f704b7dc diff --git a/test/core/uri/uri_corpus/1794310671a060eead6e5ee66ac978a18ec7e84f b/test/core/util/uri_corpus/1794310671a060eead6e5ee66ac978a18ec7e84f similarity index 100% rename from test/core/uri/uri_corpus/1794310671a060eead6e5ee66ac978a18ec7e84f rename to test/core/util/uri_corpus/1794310671a060eead6e5ee66ac978a18ec7e84f diff --git a/test/core/uri/uri_corpus/1d30b2a79afbaf2828ff42b9a9647e942ba1ab80 b/test/core/util/uri_corpus/1d30b2a79afbaf2828ff42b9a9647e942ba1ab80 similarity index 100% rename from test/core/uri/uri_corpus/1d30b2a79afbaf2828ff42b9a9647e942ba1ab80 rename to test/core/util/uri_corpus/1d30b2a79afbaf2828ff42b9a9647e942ba1ab80 diff --git a/test/core/uri/uri_corpus/1fcf5d9c333b70596cf5ba04d1f7affdf445b971 b/test/core/util/uri_corpus/1fcf5d9c333b70596cf5ba04d1f7affdf445b971 similarity index 100% rename from test/core/uri/uri_corpus/1fcf5d9c333b70596cf5ba04d1f7affdf445b971 rename to test/core/util/uri_corpus/1fcf5d9c333b70596cf5ba04d1f7affdf445b971 diff --git a/test/core/uri/uri_corpus/23162c8a8936e20b195404c21337ee734d02a6bc b/test/core/util/uri_corpus/23162c8a8936e20b195404c21337ee734d02a6bc similarity index 100% rename from test/core/uri/uri_corpus/23162c8a8936e20b195404c21337ee734d02a6bc rename to test/core/util/uri_corpus/23162c8a8936e20b195404c21337ee734d02a6bc diff --git a/test/core/uri/uri_corpus/23f3198b815ca60bdadcaae682b9f965dda387f1 b/test/core/util/uri_corpus/23f3198b815ca60bdadcaae682b9f965dda387f1 similarity index 100% rename from test/core/uri/uri_corpus/23f3198b815ca60bdadcaae682b9f965dda387f1 rename to test/core/util/uri_corpus/23f3198b815ca60bdadcaae682b9f965dda387f1 diff --git a/test/core/uri/uri_corpus/2ef3893b43f1f60b77b59ce06a6bce9815d78eaf b/test/core/util/uri_corpus/2ef3893b43f1f60b77b59ce06a6bce9815d78eaf similarity index 100% rename from test/core/uri/uri_corpus/2ef3893b43f1f60b77b59ce06a6bce9815d78eaf rename to test/core/util/uri_corpus/2ef3893b43f1f60b77b59ce06a6bce9815d78eaf diff --git a/test/core/uri/uri_corpus/356c3c129e203b5c74550b4209764d74b9caefce b/test/core/util/uri_corpus/356c3c129e203b5c74550b4209764d74b9caefce similarity index 100% rename from test/core/uri/uri_corpus/356c3c129e203b5c74550b4209764d74b9caefce rename to test/core/util/uri_corpus/356c3c129e203b5c74550b4209764d74b9caefce diff --git a/test/core/uri/uri_corpus/396568fc41c8ccb31ec925b4a862e4d29ead1327 b/test/core/util/uri_corpus/396568fc41c8ccb31ec925b4a862e4d29ead1327 similarity index 100% rename from test/core/uri/uri_corpus/396568fc41c8ccb31ec925b4a862e4d29ead1327 rename to test/core/util/uri_corpus/396568fc41c8ccb31ec925b4a862e4d29ead1327 diff --git a/test/core/uri/uri_corpus/3b1e7526a99918006b87e499d2beb6c4ac9c3c0c b/test/core/util/uri_corpus/3b1e7526a99918006b87e499d2beb6c4ac9c3c0c similarity index 100% rename from test/core/uri/uri_corpus/3b1e7526a99918006b87e499d2beb6c4ac9c3c0c rename to test/core/util/uri_corpus/3b1e7526a99918006b87e499d2beb6c4ac9c3c0c diff --git a/test/core/uri/uri_corpus/3b58860f3451d3e7aad99690a8d39782ca5116fc b/test/core/util/uri_corpus/3b58860f3451d3e7aad99690a8d39782ca5116fc similarity index 100% rename from test/core/uri/uri_corpus/3b58860f3451d3e7aad99690a8d39782ca5116fc rename to test/core/util/uri_corpus/3b58860f3451d3e7aad99690a8d39782ca5116fc diff --git a/test/core/uri/uri_corpus/41963cc10752f70c3af7e3d85868efb097a0ea9c b/test/core/util/uri_corpus/41963cc10752f70c3af7e3d85868efb097a0ea9c similarity index 100% rename from test/core/uri/uri_corpus/41963cc10752f70c3af7e3d85868efb097a0ea9c rename to test/core/util/uri_corpus/41963cc10752f70c3af7e3d85868efb097a0ea9c diff --git a/test/core/uri/uri_corpus/47b5228404451fc9d4071fa69192514bb4ce33c1 b/test/core/util/uri_corpus/47b5228404451fc9d4071fa69192514bb4ce33c1 similarity index 100% rename from test/core/uri/uri_corpus/47b5228404451fc9d4071fa69192514bb4ce33c1 rename to test/core/util/uri_corpus/47b5228404451fc9d4071fa69192514bb4ce33c1 diff --git a/test/core/uri/uri_corpus/56a2da4b2e6fb795243901023ed8d0aa083d1aab b/test/core/util/uri_corpus/56a2da4b2e6fb795243901023ed8d0aa083d1aab similarity index 100% rename from test/core/uri/uri_corpus/56a2da4b2e6fb795243901023ed8d0aa083d1aab rename to test/core/util/uri_corpus/56a2da4b2e6fb795243901023ed8d0aa083d1aab diff --git a/test/core/uri/uri_corpus/574c2f13858a9a6d724654bd913ede9ae3abf822 b/test/core/util/uri_corpus/574c2f13858a9a6d724654bd913ede9ae3abf822 similarity index 100% rename from test/core/uri/uri_corpus/574c2f13858a9a6d724654bd913ede9ae3abf822 rename to test/core/util/uri_corpus/574c2f13858a9a6d724654bd913ede9ae3abf822 diff --git a/test/core/uri/uri_corpus/582f789c19033a152094cbf8565f14154a778ddb b/test/core/util/uri_corpus/582f789c19033a152094cbf8565f14154a778ddb similarity index 100% rename from test/core/uri/uri_corpus/582f789c19033a152094cbf8565f14154a778ddb rename to test/core/util/uri_corpus/582f789c19033a152094cbf8565f14154a778ddb diff --git a/test/core/uri/uri_corpus/636c5606fc23713a1bae88c8899c0541cfad4fd8 b/test/core/util/uri_corpus/636c5606fc23713a1bae88c8899c0541cfad4fd8 similarity index 100% rename from test/core/uri/uri_corpus/636c5606fc23713a1bae88c8899c0541cfad4fd8 rename to test/core/util/uri_corpus/636c5606fc23713a1bae88c8899c0541cfad4fd8 diff --git a/test/core/uri/uri_corpus/63fe493b270b17426d77a27cbf3abac5b2c2794a b/test/core/util/uri_corpus/63fe493b270b17426d77a27cbf3abac5b2c2794a similarity index 100% rename from test/core/uri/uri_corpus/63fe493b270b17426d77a27cbf3abac5b2c2794a rename to test/core/util/uri_corpus/63fe493b270b17426d77a27cbf3abac5b2c2794a diff --git a/test/core/uri/uri_corpus/655300a902b62662296a8e46bfb04fbcb07182cb b/test/core/util/uri_corpus/655300a902b62662296a8e46bfb04fbcb07182cb similarity index 100% rename from test/core/uri/uri_corpus/655300a902b62662296a8e46bfb04fbcb07182cb rename to test/core/util/uri_corpus/655300a902b62662296a8e46bfb04fbcb07182cb diff --git a/test/core/uri/uri_corpus/6ae3acd9d8507b61bf235748026080a4138dba58 b/test/core/util/uri_corpus/6ae3acd9d8507b61bf235748026080a4138dba58 similarity index 100% rename from test/core/uri/uri_corpus/6ae3acd9d8507b61bf235748026080a4138dba58 rename to test/core/util/uri_corpus/6ae3acd9d8507b61bf235748026080a4138dba58 diff --git a/test/core/uri/uri_corpus/6b70979a70a038ff6607d6cf85485ee95baf58e6 b/test/core/util/uri_corpus/6b70979a70a038ff6607d6cf85485ee95baf58e6 similarity index 100% rename from test/core/uri/uri_corpus/6b70979a70a038ff6607d6cf85485ee95baf58e6 rename to test/core/util/uri_corpus/6b70979a70a038ff6607d6cf85485ee95baf58e6 diff --git a/test/core/uri/uri_corpus/7314ab3545a7535a26e0e8aad67caea5534d68b1 b/test/core/util/uri_corpus/7314ab3545a7535a26e0e8aad67caea5534d68b1 similarity index 100% rename from test/core/uri/uri_corpus/7314ab3545a7535a26e0e8aad67caea5534d68b1 rename to test/core/util/uri_corpus/7314ab3545a7535a26e0e8aad67caea5534d68b1 diff --git a/test/core/uri/uri_corpus/7ff4d8b8d1ffd0d42c48bbb91e5856a9ec31aecb b/test/core/util/uri_corpus/7ff4d8b8d1ffd0d42c48bbb91e5856a9ec31aecb similarity index 100% rename from test/core/uri/uri_corpus/7ff4d8b8d1ffd0d42c48bbb91e5856a9ec31aecb rename to test/core/util/uri_corpus/7ff4d8b8d1ffd0d42c48bbb91e5856a9ec31aecb diff --git a/test/core/uri/uri_corpus/87daa131e0973b77a232a870ed749ef29cf58e6d b/test/core/util/uri_corpus/87daa131e0973b77a232a870ed749ef29cf58e6d similarity index 100% rename from test/core/uri/uri_corpus/87daa131e0973b77a232a870ed749ef29cf58e6d rename to test/core/util/uri_corpus/87daa131e0973b77a232a870ed749ef29cf58e6d diff --git a/test/core/uri/uri_corpus/884dcaee2908ffe5f12b65b8eba81016099c4266 b/test/core/util/uri_corpus/884dcaee2908ffe5f12b65b8eba81016099c4266 similarity index 100% rename from test/core/uri/uri_corpus/884dcaee2908ffe5f12b65b8eba81016099c4266 rename to test/core/util/uri_corpus/884dcaee2908ffe5f12b65b8eba81016099c4266 diff --git a/test/core/uri/uri_corpus/8d7e944fd5d0ede94097fcc98b47b09a3f9c76cb b/test/core/util/uri_corpus/8d7e944fd5d0ede94097fcc98b47b09a3f9c76cb similarity index 100% rename from test/core/uri/uri_corpus/8d7e944fd5d0ede94097fcc98b47b09a3f9c76cb rename to test/core/util/uri_corpus/8d7e944fd5d0ede94097fcc98b47b09a3f9c76cb diff --git a/test/core/uri/uri_corpus/9671149af0b444f59bbdf71340d3441dadd8a7b4 b/test/core/util/uri_corpus/9671149af0b444f59bbdf71340d3441dadd8a7b4 similarity index 100% rename from test/core/uri/uri_corpus/9671149af0b444f59bbdf71340d3441dadd8a7b4 rename to test/core/util/uri_corpus/9671149af0b444f59bbdf71340d3441dadd8a7b4 diff --git a/test/core/uri/uri_corpus/96c8d266b7dc037288ef305c996608270f72e7fb b/test/core/util/uri_corpus/96c8d266b7dc037288ef305c996608270f72e7fb similarity index 100% rename from test/core/uri/uri_corpus/96c8d266b7dc037288ef305c996608270f72e7fb rename to test/core/util/uri_corpus/96c8d266b7dc037288ef305c996608270f72e7fb diff --git a/test/core/uri/uri_corpus/975536c71ade4800415a7e9c2f1b45c35a6d5ea8 b/test/core/util/uri_corpus/975536c71ade4800415a7e9c2f1b45c35a6d5ea8 similarity index 100% rename from test/core/uri/uri_corpus/975536c71ade4800415a7e9c2f1b45c35a6d5ea8 rename to test/core/util/uri_corpus/975536c71ade4800415a7e9c2f1b45c35a6d5ea8 diff --git a/test/core/uri/uri_corpus/99750aa67d30beaea8af565c829d4999aa8cb91b b/test/core/util/uri_corpus/99750aa67d30beaea8af565c829d4999aa8cb91b similarity index 100% rename from test/core/uri/uri_corpus/99750aa67d30beaea8af565c829d4999aa8cb91b rename to test/core/util/uri_corpus/99750aa67d30beaea8af565c829d4999aa8cb91b diff --git a/test/core/uri/uri_corpus/a1140f3f8b5cffc1010221b9a4084a25fb75c1f6 b/test/core/util/uri_corpus/a1140f3f8b5cffc1010221b9a4084a25fb75c1f6 similarity index 100% rename from test/core/uri/uri_corpus/a1140f3f8b5cffc1010221b9a4084a25fb75c1f6 rename to test/core/util/uri_corpus/a1140f3f8b5cffc1010221b9a4084a25fb75c1f6 diff --git a/test/core/uri/uri_corpus/a1f0f9b75bb354eb063d7cba4fcfa2d0b88d63de b/test/core/util/uri_corpus/a1f0f9b75bb354eb063d7cba4fcfa2d0b88d63de similarity index 100% rename from test/core/uri/uri_corpus/a1f0f9b75bb354eb063d7cba4fcfa2d0b88d63de rename to test/core/util/uri_corpus/a1f0f9b75bb354eb063d7cba4fcfa2d0b88d63de diff --git a/test/core/uri/uri_corpus/a296eb3d1d436ed7df7195b10aa3c4de3896f98d b/test/core/util/uri_corpus/a296eb3d1d436ed7df7195b10aa3c4de3896f98d similarity index 100% rename from test/core/uri/uri_corpus/a296eb3d1d436ed7df7195b10aa3c4de3896f98d rename to test/core/util/uri_corpus/a296eb3d1d436ed7df7195b10aa3c4de3896f98d diff --git a/test/core/uri/uri_corpus/a8b8e66050b424f1b8c07d46f868199fb7f60e38 b/test/core/util/uri_corpus/a8b8e66050b424f1b8c07d46f868199fb7f60e38 similarity index 100% rename from test/core/uri/uri_corpus/a8b8e66050b424f1b8c07d46f868199fb7f60e38 rename to test/core/util/uri_corpus/a8b8e66050b424f1b8c07d46f868199fb7f60e38 diff --git a/test/core/uri/uri_corpus/aba1472880406a318ce207ee79815b7acf087757 b/test/core/util/uri_corpus/aba1472880406a318ce207ee79815b7acf087757 similarity index 100% rename from test/core/uri/uri_corpus/aba1472880406a318ce207ee79815b7acf087757 rename to test/core/util/uri_corpus/aba1472880406a318ce207ee79815b7acf087757 diff --git a/test/core/uri/uri_corpus/af55baf8c8855e563befdf1eefbcbd46c5ddb8d2 b/test/core/util/uri_corpus/af55baf8c8855e563befdf1eefbcbd46c5ddb8d2 similarity index 100% rename from test/core/uri/uri_corpus/af55baf8c8855e563befdf1eefbcbd46c5ddb8d2 rename to test/core/util/uri_corpus/af55baf8c8855e563befdf1eefbcbd46c5ddb8d2 diff --git a/test/core/uri/uri_corpus/b3c0bf66c2bf5d24ef1daf4cc5a9d6d5bd0e8bfd b/test/core/util/uri_corpus/b3c0bf66c2bf5d24ef1daf4cc5a9d6d5bd0e8bfd similarity index 100% rename from test/core/uri/uri_corpus/b3c0bf66c2bf5d24ef1daf4cc5a9d6d5bd0e8bfd rename to test/core/util/uri_corpus/b3c0bf66c2bf5d24ef1daf4cc5a9d6d5bd0e8bfd diff --git a/test/core/uri/uri_corpus/c28a47409cf5d95bb372238d01e73d8b831408e4 b/test/core/util/uri_corpus/c28a47409cf5d95bb372238d01e73d8b831408e4 similarity index 100% rename from test/core/uri/uri_corpus/c28a47409cf5d95bb372238d01e73d8b831408e4 rename to test/core/util/uri_corpus/c28a47409cf5d95bb372238d01e73d8b831408e4 diff --git a/test/core/uri/uri_corpus/c3ef1d41888063a08700c3add1e4465aabcf8807 b/test/core/util/uri_corpus/c3ef1d41888063a08700c3add1e4465aabcf8807 similarity index 100% rename from test/core/uri/uri_corpus/c3ef1d41888063a08700c3add1e4465aabcf8807 rename to test/core/util/uri_corpus/c3ef1d41888063a08700c3add1e4465aabcf8807 diff --git a/test/core/uri/uri_corpus/c550a76af21f9b9cc92a386d5c8998b26f8f2e4d b/test/core/util/uri_corpus/c550a76af21f9b9cc92a386d5c8998b26f8f2e4d similarity index 100% rename from test/core/uri/uri_corpus/c550a76af21f9b9cc92a386d5c8998b26f8f2e4d rename to test/core/util/uri_corpus/c550a76af21f9b9cc92a386d5c8998b26f8f2e4d diff --git a/test/core/uri/uri_corpus/c79721406d0ab80495f186fd88e37fba98637ae9 b/test/core/util/uri_corpus/c79721406d0ab80495f186fd88e37fba98637ae9 similarity index 100% rename from test/core/uri/uri_corpus/c79721406d0ab80495f186fd88e37fba98637ae9 rename to test/core/util/uri_corpus/c79721406d0ab80495f186fd88e37fba98637ae9 diff --git a/test/core/uri/uri_corpus/ceb4e2264ba7a8d5be47d276b37ec09489e00245 b/test/core/util/uri_corpus/ceb4e2264ba7a8d5be47d276b37ec09489e00245 similarity index 100% rename from test/core/uri/uri_corpus/ceb4e2264ba7a8d5be47d276b37ec09489e00245 rename to test/core/util/uri_corpus/ceb4e2264ba7a8d5be47d276b37ec09489e00245 diff --git a/test/core/uri/uri_corpus/cf4395958f5bfb46fd6f535a39657d016c75114c b/test/core/util/uri_corpus/cf4395958f5bfb46fd6f535a39657d016c75114c similarity index 100% rename from test/core/uri/uri_corpus/cf4395958f5bfb46fd6f535a39657d016c75114c rename to test/core/util/uri_corpus/cf4395958f5bfb46fd6f535a39657d016c75114c diff --git a/test/core/uri/uri_corpus/d46668372b7e20154a89409a7430a28e642afdca b/test/core/util/uri_corpus/d46668372b7e20154a89409a7430a28e642afdca similarity index 100% rename from test/core/uri/uri_corpus/d46668372b7e20154a89409a7430a28e642afdca rename to test/core/util/uri_corpus/d46668372b7e20154a89409a7430a28e642afdca diff --git a/test/core/uri/uri_corpus/d6fe7412a0a1d1c733160246f3fa425f4f97682a b/test/core/util/uri_corpus/d6fe7412a0a1d1c733160246f3fa425f4f97682a similarity index 100% rename from test/core/uri/uri_corpus/d6fe7412a0a1d1c733160246f3fa425f4f97682a rename to test/core/util/uri_corpus/d6fe7412a0a1d1c733160246f3fa425f4f97682a diff --git a/test/core/uri/uri_corpus/dns.txt b/test/core/util/uri_corpus/dns.txt similarity index 100% rename from test/core/uri/uri_corpus/dns.txt rename to test/core/util/uri_corpus/dns.txt diff --git a/test/core/uri/uri_corpus/e241f29957b0e30ec11aaaf91b2339f7015fa5fd b/test/core/util/uri_corpus/e241f29957b0e30ec11aaaf91b2339f7015fa5fd similarity index 100% rename from test/core/uri/uri_corpus/e241f29957b0e30ec11aaaf91b2339f7015fa5fd rename to test/core/util/uri_corpus/e241f29957b0e30ec11aaaf91b2339f7015fa5fd diff --git a/test/core/uri/uri_corpus/ea02d9fea9bad5b89cf353a0169238f584177e71 b/test/core/util/uri_corpus/ea02d9fea9bad5b89cf353a0169238f584177e71 similarity index 100% rename from test/core/uri/uri_corpus/ea02d9fea9bad5b89cf353a0169238f584177e71 rename to test/core/util/uri_corpus/ea02d9fea9bad5b89cf353a0169238f584177e71 diff --git a/test/core/uri/uri_corpus/ec4731dddf94ed3ea92ae4d5a71f145ab6e3f6ee b/test/core/util/uri_corpus/ec4731dddf94ed3ea92ae4d5a71f145ab6e3f6ee similarity index 100% rename from test/core/uri/uri_corpus/ec4731dddf94ed3ea92ae4d5a71f145ab6e3f6ee rename to test/core/util/uri_corpus/ec4731dddf94ed3ea92ae4d5a71f145ab6e3f6ee diff --git a/test/core/uri/uri_corpus/ed2f78646f19fc47dd85ff0877c232b71913ece2 b/test/core/util/uri_corpus/ed2f78646f19fc47dd85ff0877c232b71913ece2 similarity index 100% rename from test/core/uri/uri_corpus/ed2f78646f19fc47dd85ff0877c232b71913ece2 rename to test/core/util/uri_corpus/ed2f78646f19fc47dd85ff0877c232b71913ece2 diff --git a/test/core/uri/uri_corpus/f6889f4a6350fea1596a3adea5cdac02bd5d1ff3 b/test/core/util/uri_corpus/f6889f4a6350fea1596a3adea5cdac02bd5d1ff3 similarity index 100% rename from test/core/uri/uri_corpus/f6889f4a6350fea1596a3adea5cdac02bd5d1ff3 rename to test/core/util/uri_corpus/f6889f4a6350fea1596a3adea5cdac02bd5d1ff3 diff --git a/test/core/uri/uri_corpus/f6f3bd030f0d321efe7c51ca3f057de23509af67 b/test/core/util/uri_corpus/f6f3bd030f0d321efe7c51ca3f057de23509af67 similarity index 100% rename from test/core/uri/uri_corpus/f6f3bd030f0d321efe7c51ca3f057de23509af67 rename to test/core/util/uri_corpus/f6f3bd030f0d321efe7c51ca3f057de23509af67 diff --git a/test/core/uri/uri_corpus/f97598cff03306af3c70400608fec47268b5075d b/test/core/util/uri_corpus/f97598cff03306af3c70400608fec47268b5075d similarity index 100% rename from test/core/uri/uri_corpus/f97598cff03306af3c70400608fec47268b5075d rename to test/core/util/uri_corpus/f97598cff03306af3c70400608fec47268b5075d diff --git a/test/core/uri/uri_corpus/f9e1ec1fc642b575bc9955618b7065747f56b101 b/test/core/util/uri_corpus/f9e1ec1fc642b575bc9955618b7065747f56b101 similarity index 100% rename from test/core/uri/uri_corpus/f9e1ec1fc642b575bc9955618b7065747f56b101 rename to test/core/util/uri_corpus/f9e1ec1fc642b575bc9955618b7065747f56b101 diff --git a/test/core/uri/uri_corpus/fe0630a3aeed2ec6f474f362e4c839478290d5c4 b/test/core/util/uri_corpus/fe0630a3aeed2ec6f474f362e4c839478290d5c4 similarity index 100% rename from test/core/uri/uri_corpus/fe0630a3aeed2ec6f474f362e4c839478290d5c4 rename to test/core/util/uri_corpus/fe0630a3aeed2ec6f474f362e4c839478290d5c4 diff --git a/test/core/uri/uri_corpus/ipv4.txt b/test/core/util/uri_corpus/ipv4.txt similarity index 100% rename from test/core/uri/uri_corpus/ipv4.txt rename to test/core/util/uri_corpus/ipv4.txt diff --git a/test/core/uri/uri_corpus/ipv6.txt b/test/core/util/uri_corpus/ipv6.txt similarity index 100% rename from test/core/uri/uri_corpus/ipv6.txt rename to test/core/util/uri_corpus/ipv6.txt diff --git a/test/core/uri/uri_corpus/unix.txt b/test/core/util/uri_corpus/unix.txt similarity index 100% rename from test/core/uri/uri_corpus/unix.txt rename to test/core/util/uri_corpus/unix.txt diff --git a/test/core/uri/uri_fuzzer_test.cc b/test/core/util/uri_fuzzer_test.cc similarity index 96% rename from test/core/uri/uri_fuzzer_test.cc rename to test/core/util/uri_fuzzer_test.cc index 0220c20b700..dd4b1c0f861 100644 --- a/test/core/uri/uri_fuzzer_test.cc +++ b/test/core/util/uri_fuzzer_test.cc @@ -23,7 +23,7 @@ #include #include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/uri.h" bool squelch = true; bool leak_check = true; diff --git a/test/core/uri/uri_parser_test.cc b/test/core/util/uri_test.cc similarity index 99% rename from test/core/uri/uri_parser_test.cc rename to test/core/util/uri_test.cc index adadba6e779..965d208ae7c 100644 --- a/test/core/uri/uri_parser_test.cc +++ b/test/core/util/uri_test.cc @@ -14,7 +14,7 @@ // limitations under the License. // -#include "src/core/lib/uri/uri_parser.h" +#include "src/core/util/uri.h" #include diff --git a/test/core/gprpp/uuid_v4_test.cc b/test/core/util/uuid_v4_test.cc similarity index 96% rename from test/core/gprpp/uuid_v4_test.cc rename to test/core/util/uuid_v4_test.cc index e970d54ebce..a5a73e2f826 100644 --- a/test/core/gprpp/uuid_v4_test.cc +++ b/test/core/util/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/util/validation_errors_test.cc similarity index 98% rename from test/core/gprpp/validation_errors_test.cc rename to test/core/util/validation_errors_test.cc index cbf5add2feb..e3222408d2e 100644 --- a/test/core/gprpp/validation_errors_test.cc +++ b/test/core/util/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/util/work_serializer_test.cc similarity index 99% rename from test/core/gprpp/work_serializer_test.cc rename to test/core/util/work_serializer_test.cc index 0d92acecba8..773255725bb 100644 --- a/test/core/gprpp/work_serializer_test.cc +++ b/test/core/util/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,12 +37,12 @@ #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/lib/iomgr/exec_ctx.h" #include "src/core/telemetry/histogram_view.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/notification.h" +#include "src/core/util/thd.h" #include "test/core/event_engine/event_engine_test_utils.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/xds/certificate_provider_store_test.cc b/test/core/xds/certificate_provider_store_test.cc index 3cbd6146059..a0b76e521fb 100644 --- a/test/core/xds/certificate_provider_store_test.cc +++ b/test/core/xds/certificate_provider_store_test.cc @@ -29,7 +29,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 dc79749f983..1d673ff7302 100644 --- a/test/core/xds/xds_audit_logger_registry_test.cc +++ b/test/core/xds/xds_audit_logger_registry_test.cc @@ -36,8 +36,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/security/authorization/audit_logging.h" +#include "src/core/util/crash.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" diff --git a/test/core/xds/xds_bootstrap_test.cc b/test/core/xds/xds_bootstrap_test.cc index 1a30de17492..cc77846ae13 100644 --- a/test/core/xds/xds_bootstrap_test.cc +++ b/test/core/xds/xds_bootstrap_test.cc @@ -36,16 +36,16 @@ #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/lib/security/certificate_provider/certificate_provider_factory.h" #include "src/core/lib/security/credentials/channel_creds_registry.h" +#include "src/core/util/env.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" #include "src/core/util/json/json_reader.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/tmpfile.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/certificate_provider_store.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_server_grpc.h" diff --git a/test/core/xds/xds_certificate_provider_test.cc b/test/core/xds/xds_certificate_provider_test.cc index a005b1d0f6c..a81e03421e8 100644 --- a/test/core/xds/xds_certificate_provider_test.cc +++ b/test/core/xds/xds_certificate_provider_test.cc @@ -25,9 +25,9 @@ #include -#include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/security_connector/ssl_utils.h" +#include "src/core/util/status_helper.h" #include "src/core/util/useful.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/test/core/xds/xds_client_fuzzer.cc b/test/core/xds/xds_client_fuzzer.cc index 4649329523e..21b94895a1a 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_cluster_parser.h" diff --git a/test/core/xds/xds_client_test.cc b/test/core/xds/xds_client_test.cc index 9ad6dce3d59..520b2118a49 100644 --- a/test/core/xds/xds_client_test.cc +++ b/test/core/xds/xds_client_test.cc @@ -47,14 +47,14 @@ #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/json/json.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/match.h" +#include "src/core/util/sync.h" #include "src/core/xds/xds_client/xds_bootstrap.h" #include "src/core/xds/xds_client/xds_resource_type_impl.h" #include "src/proto/grpc/testing/xds/v3/base.pb.h" diff --git a/test/core/xds/xds_cluster_resource_type_test.cc b/test/core/xds/xds_cluster_resource_type_test.cc index 2ce68f2e0a3..5039ab9b985 100644 --- a/test/core/xds/xds_cluster_resource_type_test.cc +++ b/test/core/xds/xds_cluster_resource_type_test.cc @@ -36,13 +36,13 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/error.h" #include "src/core/load_balancing/outlier_detection/outlier_detection.h" +#include "src/core/util/crash.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_cluster.h" #include "src/core/xds/grpc/xds_cluster_parser.h" diff --git a/test/core/xds/xds_common_types_test.cc b/test/core/xds/xds_common_types_test.cc index d940015cc8f..45ac7574b75 100644 --- a/test/core/xds/xds_common_types_test.cc +++ b/test/core/xds/xds_common_types_test.cc @@ -39,13 +39,13 @@ #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/lib/matchers/matchers.h" +#include "src/core/util/crash.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/matchers.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/core/util/upb_utils.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_common_types_parser.h" #include "src/core/xds/xds_client/xds_bootstrap.h" diff --git a/test/core/xds/xds_endpoint_resource_type_test.cc b/test/core/xds/xds_endpoint_resource_type_test.cc index 353e5727a5f..9b12b5517e9 100644 --- a/test/core/xds/xds_endpoint_resource_type_test.cc +++ b/test/core/xds/xds_endpoint_resource_type_test.cc @@ -38,11 +38,11 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/resolved_address.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/util/crash.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_endpoint.h" #include "src/core/xds/grpc/xds_endpoint_parser.h" diff --git a/test/core/xds/xds_http_filters_test.cc b/test/core/xds/xds_http_filters_test.cc index c720f72fef5..c5a76d01ee2 100644 --- a/test/core/xds/xds_http_filters_test.cc +++ b/test/core/xds/xds_http_filters_test.cc @@ -44,10 +44,10 @@ #include "src/core/ext/filters/rbac/rbac_service_config_parser.h" #include "src/core/ext/filters/stateful_session/stateful_session_filter.h" #include "src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/crash.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_http_filter.h" #include "src/core/xds/grpc/xds_http_filter_registry.h" diff --git a/test/core/xds/xds_lb_policy_registry_test.cc b/test/core/xds/xds_lb_policy_registry_test.cc index c1e0e0fdda3..34f516e84ef 100644 --- a/test/core/xds/xds_lb_policy_registry_test.cc +++ b/test/core/xds/xds_lb_policy_registry_test.cc @@ -35,13 +35,13 @@ #include #include "src/core/lib/config/core_configuration.h" -#include "src/core/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/load_balancing/lb_policy.h" #include "src/core/load_balancing/lb_policy_factory.h" +#include "src/core/util/crash.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/validation_errors.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/proto/grpc/testing/xds/v3/client_side_weighted_round_robin.pb.h" #include "src/proto/grpc/testing/xds/v3/cluster.pb.h" diff --git a/test/core/xds/xds_listener_resource_type_test.cc b/test/core/xds/xds_listener_resource_type_test.cc index 629d069b259..0f3f815faf9 100644 --- a/test/core/xds/xds_listener_resource_type_test.cc +++ b/test/core/xds/xds_listener_resource_type_test.cc @@ -40,12 +40,12 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/crash.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/grpc/xds_listener.h" diff --git a/test/core/xds/xds_metadata_test.cc b/test/core/xds/xds_metadata_test.cc index ad489b45464..76769ea1b70 100644 --- a/test/core/xds/xds_metadata_test.cc +++ b/test/core/xds/xds_metadata_test.cc @@ -29,10 +29,10 @@ #include "gtest/gtest.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/json/json.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_metadata_parser.h" #include "src/core/xds/xds_client/xds_bootstrap.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 4fa3a11bc20..61311226c52 100644 --- a/test/core/xds/xds_route_config_resource_type_test.cc +++ b/test/core/xds/xds_route_config_resource_type_test.cc @@ -45,12 +45,12 @@ #include "src/core/lib/channel/status_util.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/error.h" -#include "src/core/lib/matchers/matchers.h" +#include "src/core/util/crash.h" #include "src/core/util/json/json_writer.h" +#include "src/core/util/matchers.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_route_config.h" #include "src/core/xds/grpc/xds_route_config_parser.h" diff --git a/test/core/xds/xds_transport_fake.cc b/test/core/xds/xds_transport_fake.cc index bd6c21730fc..b8ea78ff794 100644 --- a/test/core/xds/xds_transport_fake.cc +++ b/test/core/xds/xds_transport_fake.cc @@ -30,9 +30,9 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/orphanable.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/orphanable.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/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 9331d2042c6..c2777262475 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 @@ -38,14 +38,14 @@ #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/lib/iomgr/sockaddr.h" #include "src/core/load_balancing/grpclb/grpclb_balancer_addresses.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/fake/fake_resolver.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/crash.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/thd.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/cocoapods/generic/generic.mm b/test/cpp/cocoapods/generic/generic.mm index 138bbe6604c..5f38c2070fd 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..e1593a59daa 100644 --- a/test/cpp/common/time_jump_test.cc +++ b/test/cpp/common/time_jump_test.cc @@ -31,13 +31,13 @@ #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/iomgr/timer_manager.h" +#include "src/core/util/crash.h" +#include "src/core/util/sync.h" #include "test/core/test_util/test_config.h" extern char** environ; diff --git a/test/cpp/common/timer_test.cc b/test/cpp/common/timer_test.cc index 3cc129cefb2..e3f2a31c1dd 100644 --- a/test/cpp/common/timer_test.cc +++ b/test/cpp/common/timer_test.cc @@ -25,12 +25,12 @@ #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/timer_manager.h" +#include "src/core/util/crash.h" +#include "src/core/util/time.h" #include "test/core/test_util/test_config.h" #ifdef GRPC_POSIX_SOCKET_EV diff --git a/test/cpp/end2end/async_end2end_test.cc b/test/cpp/end2end/async_end2end_test.cc index b4f7657ecfc..0f59bcab892 100644 --- a/test/cpp/end2end/async_end2end_test.cc +++ b/test/cpp/end2end/async_end2end_test.cc @@ -39,9 +39,9 @@ #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" #include "src/proto/grpc/health/v1/health.grpc.pb.h" #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/end2end/cfstream_test.cc b/test/cpp/end2end/cfstream_test.cc index 907622e0b62..c0139db761f 100644 --- a/test/cpp/end2end/cfstream_test.cc +++ b/test/cpp/end2end/cfstream_test.cc @@ -39,10 +39,10 @@ #include #include -#include "src/core/lib/backoff/backoff.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/util/backoff.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/end2end/channelz_service_test.cc b/test/cpp/end2end/channelz_service_test.cc index 98a6fff4436..708b4ff53f9 100644 --- a/test/cpp/end2end/channelz_service_test.cc +++ b/test/cpp/end2end/channelz_service_test.cc @@ -36,10 +36,10 @@ #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/env.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" #include "src/core/lib/security/security_connector/ssl_utils.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/util/env.h" #include "src/cpp/client/secure_credentials.h" #include "src/proto/grpc/channelz/channelz.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/end2end/client_callback_end2end_test.cc b/test/cpp/end2end/client_callback_end2end_test.cc index 88ce497a590..fefcc81a976 100644 --- a/test/cpp/end2end/client_callback_end2end_test.cc +++ b/test/cpp/end2end/client_callback_end2end_test.cc @@ -39,8 +39,8 @@ #include #include -#include "src/core/lib/gprpp/env.h" #include "src/core/lib/iomgr/iomgr.h" +#include "src/core/util/env.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/end2end/client_crash_test.cc b/test/cpp/end2end/client_crash_test.cc index fbd98164931..39e857562c8 100644 --- a/test/cpp/end2end/client_crash_test.cc +++ b/test/cpp/end2end/client_crash_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/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 b3d1394480d..0b7349ceb26 100644 --- a/test/cpp/end2end/client_lb_end2end_test.cc +++ b/test/cpp/end2end/client_lb_end2end_test.cc @@ -54,15 +54,8 @@ #include "src/core/client_channel/global_subchannel_pool.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/backoff/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/lib/iomgr/tcp_client.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" #include "src/core/lib/transport/connectivity_state.h" @@ -71,6 +64,13 @@ #include "src/core/server/server.h" #include "src/core/service_config/service_config.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/backoff.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/env.h" +#include "src/core/util/notification.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/time.h" #include "src/cpp/server/secure_server_credentials.h" #include "src/proto/grpc/health/v1/health.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/end2end/connection_attempt_injector.cc b/test/cpp/end2end/connection_attempt_injector.cc index ab285203d8b..a7b64bfcea3 100644 --- a/test/cpp/end2end/connection_attempt_injector.cc +++ b/test/cpp/end2end/connection_attempt_injector.cc @@ -23,8 +23,8 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/sync.h" // defined in tcp_client.cc extern grpc_tcp_client_vtable* grpc_tcp_client_impl; diff --git a/test/cpp/end2end/connection_attempt_injector.h b/test/cpp/end2end/connection_attempt_injector.h index bc56f85284b..4eb35d6850e 100644 --- a/test/cpp/end2end/connection_attempt_injector.h +++ b/test/cpp/end2end/connection_attempt_injector.h @@ -18,8 +18,8 @@ #include #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/tcp_client.h" +#include "src/core/util/time.h" namespace grpc { namespace testing { diff --git a/test/cpp/end2end/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..1bf43444442 100644 --- a/test/cpp/end2end/end2end_test.cc +++ b/test/cpp/end2end/end2end_test.cc @@ -44,10 +44,10 @@ #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/security/credentials/credentials.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/end2end/flaky_network_test.cc b/test/cpp/end2end/flaky_network_test.cc index add00a63cca..3df6f1e080f 100644 --- a/test/cpp/end2end/flaky_network_test.cc +++ b/test/cpp/end2end/flaky_network_test.cc @@ -41,9 +41,9 @@ #include #include -#include "src/core/lib/backoff/backoff.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/env.h" +#include "src/core/util/backoff.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 4734f8cd736..34eeb7b5202 100644 --- a/test/cpp/end2end/grpclb_end2end_test.cc +++ b/test/cpp/end2end/grpclb_end2end_test.cc @@ -48,11 +48,6 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/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/lib/iomgr/sockaddr.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" #include "src/core/load_balancing/grpclb/grpclb.h" @@ -60,6 +55,11 @@ #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/fake/fake_resolver.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/env.h" +#include "src/core/util/ref_counted_ptr.h" +#include "src/core/util/sync.h" #include "src/cpp/server/secure_server_credentials.h" #include "src/proto/grpc/lb/v1/load_balancer.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" diff --git a/test/cpp/end2end/health_service_end2end_test.cc b/test/cpp/end2end/health_service_end2end_test.cc index 48209bb5e49..167396cad45 100644 --- a/test/cpp/end2end/health_service_end2end_test.cc +++ b/test/cpp/end2end/health_service_end2end_test.cc @@ -33,7 +33,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..139dda2eb5d 100644 --- a/test/cpp/end2end/hybrid_end2end_test.cc +++ b/test/cpp/end2end/hybrid_end2end_test.cc @@ -33,8 +33,8 @@ #include #include -#include "src/core/lib/gprpp/env.h" #include "src/core/lib/iomgr/iomgr.h" +#include "src/core/util/env.h" #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/end2end/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 073b67dcbfe..281267a7f9c 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 95f37870957..93461bd9ff4 100644 --- a/test/cpp/end2end/port_sharing_end2end_test.cc +++ b/test/cpp/end2end/port_sharing_end2end_test.cc @@ -36,15 +36,15 @@ #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/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/tcp_server.h" #include "src/core/lib/security/credentials/credentials.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" +#include "src/core/util/host_port.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" #include "test/core/test_util/resolve_localhost_ip46.h" diff --git a/test/cpp/end2end/raw_end2end_test.cc b/test/cpp/end2end/raw_end2end_test.cc index c41bb7a60df..8b28df798f6 100644 --- a/test/cpp/end2end/raw_end2end_test.cc +++ b/test/cpp/end2end/raw_end2end_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/iomgr/port.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/end2end/resource_quota_end2end_stress_test.cc b/test/cpp/end2end/resource_quota_end2end_stress_test.cc index 9960bdff93d..64987700a62 100644 --- a/test/cpp/end2end/resource_quota_end2end_stress_test.cc +++ b/test/cpp/end2end/resource_quota_end2end_stress_test.cc @@ -32,8 +32,8 @@ #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/experiments/config.h" -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" +#include "src/core/util/notification.h" #include "src/cpp/server/secure_server_credentials.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/end2end/rls_end2end_test.cc b/test/cpp/end2end/rls_end2end_test.cc index 348a700cfa7..2ed47362d5e 100644 --- a/test/cpp/end2end/rls_end2end_test.cc +++ b/test/cpp/end2end/rls_end2end_test.cc @@ -46,15 +46,15 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" -#include "src/core/lib/uri/uri_parser.h" #include "src/core/load_balancing/rls/rls.h" #include "src/core/resolver/fake/fake_resolver.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/env.h" +#include "src/core/util/host_port.h" +#include "src/core/util/time.h" +#include "src/core/util/uri.h" #include "src/cpp/server/secure_server_credentials.h" #include "src/proto/grpc/lookup/v1/rls.grpc.pb.h" #include "src/proto/grpc/lookup/v1/rls.pb.h" diff --git a/test/cpp/end2end/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 2489b09341c..ddcc713cb86 100644 --- a/test/cpp/end2end/server_early_return_test.cc +++ b/test/cpp/end2end/server_early_return_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/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 380ebc2e261..6ff1835aa2f 100644 --- a/test/cpp/end2end/service_config_end2end_test.cc +++ b/test/cpp/end2end/service_config_end2end_test.cc @@ -48,18 +48,18 @@ #include "src/core/client_channel/backup_poller.h" #include "src/core/client_channel/global_subchannel_pool.h" #include "src/core/lib/address_utils/parse_address.h" -#include "src/core/lib/backoff/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/lib/iomgr/tcp_client.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" #include "src/core/lib/transport/error_utils.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/fake/fake_resolver.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/util/backoff.h" +#include "src/core/util/crash.h" +#include "src/core/util/debug_location.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/cpp/server/secure_server_credentials.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/end2end/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 079dca44feb..26810842ac3 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 84cb324e46b..c1860573d9e 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 ee2f558a5be..b8171015e6c 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/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" diff --git a/test/cpp/end2end/time_change_test.cc b/test/cpp/end2end/time_change_test.cc index fa7dff06028..dd8a9a94441 100644 --- a/test/cpp/end2end/time_change_test.cc +++ b/test/cpp/end2end/time_change_test.cc @@ -34,8 +34,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/timer.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc b/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc index 19ba50ecd8c..b80b344da03 100644 --- a/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc @@ -28,10 +28,10 @@ #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/env.h" #include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/fake/fake_resolver.h" +#include "src/core/util/env.h" #include "src/proto/grpc/testing/xds/v3/aggregate_cluster.grpc.pb.h" #include "test/core/test_util/resolve_localhost_ip46.h" #include "test/core/test_util/scoped_env_var.h" diff --git a/test/cpp/end2end/xds/xds_end2end_test.cc b/test/cpp/end2end/xds/xds_end2end_test.cc index 451eae32dde..cf003274740 100644 --- a/test/cpp/end2end/xds/xds_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_end2end_test.cc @@ -63,12 +63,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/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/lib/iomgr/sockaddr.h" #include "src/core/lib/security/authorization/audit_logging.h" #include "src/core/lib/security/certificate_provider/certificate_provider_registry.h" @@ -77,8 +71,14 @@ #include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/fake/fake_resolver.h" +#include "src/core/util/crash.h" +#include "src/core/util/env.h" +#include "src/core/util/ref_counted_ptr.h" #include "src/core/util/string.h" +#include "src/core/util/sync.h" +#include "src/core/util/time.h" #include "src/core/util/time_precise.h" +#include "src/core/util/time_util.h" #include "src/core/util/tmpfile.h" #include "src/core/xds/grpc/xds_listener.h" #include "src/core/xds/xds_client/xds_api.h" diff --git a/test/cpp/end2end/xds/xds_end2end_test_lib.cc b/test/cpp/end2end/xds/xds_end2end_test_lib.cc index 51812c21e12..1ba85995c09 100644 --- a/test/cpp/end2end/xds/xds_end2end_test_lib.cc +++ b/test/cpp/end2end/xds/xds_end2end_test_lib.cc @@ -38,8 +38,8 @@ #include #include "src/core/ext/filters/http/server/http_server_filter.h" -#include "src/core/lib/gprpp/env.h" #include "src/core/server/server.h" +#include "src/core/util/env.h" #include "src/core/util/tmpfile.h" #include "src/core/xds/grpc/xds_client_grpc.h" #include "src/core/xds/xds_client/xds_channel_args.h" diff --git a/test/cpp/end2end/xds/xds_override_host_end2end_test.cc b/test/cpp/end2end/xds/xds_override_host_end2end_test.cc index 88f57285c21..69eb72cbddd 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..f0d6796691d 100644 --- a/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc @@ -32,9 +32,9 @@ #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/env.h" #include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/core/resolver/fake/fake_resolver.h" +#include "src/core/util/env.h" #include "src/proto/grpc/testing/xds/v3/cluster.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/pick_first.pb.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc b/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc index cfa4440d21d..86aba3e8121 100644 --- a/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc @@ -29,9 +29,9 @@ #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/env.h" #include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/core/resolver/fake/fake_resolver.h" +#include "src/core/util/env.h" #include "src/proto/grpc/testing/xds/v3/aggregate_cluster.grpc.pb.h" #include "src/proto/grpc/testing/xds/v3/cluster.grpc.pb.h" #include "test/core/test_util/resolve_localhost_ip46.h" diff --git a/test/cpp/end2end/xds/xds_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 4cd3982c955..4131362f7b0 100644 --- a/test/cpp/end2end/xds/xds_server.h +++ b/test/cpp/end2end/xds/xds_server.h @@ -30,8 +30,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 b1b69ddcc54..c52e819172e 100644 --- a/test/cpp/end2end/xds/xds_utils.cc +++ b/test/cpp/end2end/xds/xds_utils.cc @@ -34,8 +34,8 @@ #include #include "src/core/ext/filters/http/server/http_server_filter.h" -#include "src/core/lib/gprpp/env.h" #include "src/core/server/server.h" +#include "src/core/util/env.h" #include "src/core/util/tmpfile.h" #include "src/core/xds/grpc/xds_client_grpc.h" #include "src/core/xds/xds_client/xds_channel_args.h" diff --git a/test/cpp/ext/csm/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..1b85eaf185a 100644 --- a/test/cpp/ext/csm/metadata_exchange_test.cc +++ b/test/cpp/ext/csm/metadata_exchange_test.cc @@ -30,8 +30,8 @@ #include #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/env.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/util/env.h" #include "src/core/util/tmpfile.h" #include "src/cpp/ext/csm/csm_observability.h" #include "src/cpp/ext/otel/otel_plugin.h" diff --git a/test/cpp/ext/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 7bc0daac261..131aeef222f 100644 --- a/test/cpp/ext/otel/otel_test_library.cc +++ b/test/cpp/ext/otel/otel_test_library.cc @@ -33,8 +33,8 @@ #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/telemetry/call_tracer.h" +#include "src/core/util/notification.h" #include "test/core/test_util/fake_stats_plugin.h" #include "test/core/test_util/test_config.h" #include "test/cpp/end2end/test_service_impl.h" diff --git a/test/cpp/interop/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..7d3c637fee2 100644 --- a/test/cpp/interop/grpclb_fallback_test.cc +++ b/test/cpp/interop/grpclb_fallback_test.cc @@ -43,9 +43,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/socket_mutator.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" #include "src/proto/grpc/testing/empty.pb.h" #include "src/proto/grpc/testing/messages.pb.h" diff --git a/test/cpp/interop/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 1cfcb10be65..1190ecd7476 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..25f5f633bfc 100644 --- a/test/cpp/interop/interop_server.cc +++ b/test/cpp/interop/interop_server.cc @@ -35,9 +35,9 @@ #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/string.h" +#include "src/core/util/sync.h" #include "src/proto/grpc/testing/empty.pb.h" #include "src/proto/grpc/testing/messages.pb.h" #include "src/proto/grpc/testing/test.grpc.pb.h" diff --git a/test/cpp/interop/interop_test.cc b/test/cpp/interop/interop_test.cc index d46e2a531cd..1134971371d 100644 --- a/test/cpp/interop/interop_test.cc +++ b/test/cpp/interop/interop_test.cc @@ -34,8 +34,8 @@ #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/socket_utils_posix.h" +#include "src/core/util/crash.h" #include "src/core/util/string.h" #include "test/core/test_util/port.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/interop/istio_echo_server.cc b/test/cpp/interop/istio_echo_server.cc index e81b1b2f170..bb24edcae46 100644 --- a/test/cpp/interop/istio_echo_server.cc +++ b/test/cpp/interop/istio_echo_server.cc @@ -45,9 +45,9 @@ #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/lib/iomgr/gethostname.h" +#include "src/core/util/env.h" +#include "src/core/util/gethostname.h" +#include "src/core/util/host_port.h" #include "src/proto/grpc/testing/istio_echo.pb.h" #include "test/core/test_util/test_config.h" #include "test/cpp/interop/istio_echo_server_lib.h" diff --git a/test/cpp/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 c42208fd46c..9eb4f488b14 100644 --- a/test/cpp/interop/metrics_client.cc +++ b/test/cpp/interop/metrics_client.cc @@ -23,7 +23,7 @@ #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/core/test_util/test_config.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 c1da2a6a624..32aa91b1bc2 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 a87d8b7d2cd..3f27484111c 100644 --- a/test/cpp/interop/stress_test.cc +++ b/test/cpp/interop/stress_test.cc @@ -33,7 +33,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.cc b/test/cpp/interop/xds_interop_server.cc index 09553cb82b6..eb2fa7ad08f 100644 --- a/test/cpp/interop/xds_interop_server.cc +++ b/test/cpp/interop/xds_interop_server.cc @@ -28,7 +28,7 @@ #include #include -#include "src/core/lib/iomgr/gethostname.h" +#include "src/core/util/gethostname.h" #include "test/core/test_util/test_config.h" #include "test/cpp/interop/xds_interop_server_lib.h" #include "test/cpp/util/test_config.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 320c8fc5093..c84cd3d1829 100644 --- a/test/cpp/microbenchmarks/bm_basic_work_queue.cc +++ b/test/cpp/microbenchmarks/bm_basic_work_queue.cc @@ -22,7 +22,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 1a8bda0380b..90d4ccee01f 100644 --- a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc +++ b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc @@ -34,13 +34,13 @@ #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/timeout_encoding.h" +#include "src/core/util/crash.h" +#include "src/core/util/time.h" #include "test/core/test_util/test_config.h" #include "test/cpp/microbenchmarks/helpers.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/microbenchmarks/bm_cq.cc b/test/cpp/microbenchmarks/bm_cq.cc index 6b769f7da7f..6b490df906b 100644 --- a/test/cpp/microbenchmarks/bm_cq.cc +++ b/test/cpp/microbenchmarks/bm_cq.cc @@ -27,9 +27,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/completion_queue.h" +#include "src/core/util/crash.h" #include "test/core/test_util/test_config.h" #include "test/cpp/microbenchmarks/helpers.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc b/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc index e0144995e0d..f504af9f5fe 100644 --- a/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc +++ b/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc @@ -28,11 +28,11 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/port.h" #include "src/core/lib/surface/completion_queue.h" +#include "src/core/util/crash.h" +#include "src/core/util/time.h" #include "test/core/test_util/test_config.h" #include "test/cpp/microbenchmarks/helpers.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/microbenchmarks/bm_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..4a464856764 100644 --- a/test/cpp/microbenchmarks/bm_exec_ctx.cc +++ b/test/cpp/microbenchmarks/bm_exec_ctx.cc @@ -19,8 +19,8 @@ #include -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/util/notification.h" #include "test/core/test_util/test_config.h" #include "test/cpp/microbenchmarks/helpers.h" #include "test/cpp/util/test_config.h" diff --git a/test/cpp/microbenchmarks/bm_huffman_decode.cc b/test/cpp/microbenchmarks/bm_huffman_decode.cc index 1766f028269..59a684f1298 100644 --- a/test/cpp/microbenchmarks/bm_huffman_decode.cc +++ b/test/cpp/microbenchmarks/bm_huffman_decode.cc @@ -21,8 +21,8 @@ #include "src/core/ext/transport/chttp2/transport/bin_encoder.h" #include "src/core/ext/transport/chttp2/transport/decode_huff.h" -#include "src/core/lib/gprpp/no_destruct.h" #include "src/core/lib/slice/slice.h" +#include "src/core/util/no_destruct.h" #include "test/core/test_util/test_config.h" #include "test/cpp/microbenchmarks/huffman_geometries/index.h" diff --git a/test/cpp/microbenchmarks/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 29b668ddf30..f239052e80b 100644 --- a/test/cpp/microbenchmarks/fullstack_context_mutators.h +++ b/test/cpp/microbenchmarks/fullstack_context_mutators.h @@ -27,7 +27,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 dcfd227e53a..79e48ae646b 100644 --- a/test/cpp/microbenchmarks/fullstack_fixtures.h +++ b/test/cpp/microbenchmarks/fullstack_fixtures.h @@ -33,7 +33,6 @@ #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gprpp/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" @@ -42,6 +41,7 @@ #include "src/core/lib/surface/channel_create.h" #include "src/core/lib/surface/completion_queue.h" #include "src/core/server/server.h" +#include "src/core/util/crash.h" #include "src/cpp/client/create_channel_internal.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/naming/address_sorting_test.cc b/test/cpp/naming/address_sorting_test.cc index 563ce7d8a36..e1fa4111ed6 100644 --- a/test/cpp/naming/address_sorting_test.cc +++ b/test/cpp/naming/address_sorting_test.cc @@ -37,8 +37,6 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr.h" @@ -47,6 +45,8 @@ #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_registry.h" +#include "src/core/util/crash.h" +#include "src/core/util/host_port.h" #include "src/core/util/string.h" #include "test/core/test_util/port.h" #include "test/core/test_util/test_config.h" diff --git a/test/cpp/naming/cancel_ares_query_test.cc b/test/cpp/naming/cancel_ares_query_test.cc index 775dc1961ce..b77330ee595 100644 --- a/test/cpp/naming/cancel_ares_query_test.cc +++ b/test/cpp/naming/cancel_ares_query_test.cc @@ -40,11 +40,6 @@ #include "src/core/lib/event_engine/ares_resolver.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/notification.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/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/iomgr/pollset_set.h" @@ -53,7 +48,12 @@ #include "src/core/resolver/resolver_registry.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/crash.h" +#include "src/core/util/notification.h" +#include "src/core/util/orphanable.h" #include "src/core/util/string.h" +#include "src/core/util/thd.h" +#include "src/core/util/work_serializer.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/cmdline.h" #include "test/core/test_util/fake_udp_and_tcp_server.h" diff --git a/test/cpp/naming/resolver_component_test.cc b/test/cpp/naming/resolver_component_test.cc index d42e5f7dda1..f5a4984e98c 100644 --- a/test/cpp/naming/resolver_component_test.cc +++ b/test/cpp/naming/resolver_component_test.cc @@ -48,10 +48,6 @@ #include "src/core/lib/event_engine/ares_resolver.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/experiments.h" -#include "src/core/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/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/resolve_address.h" @@ -61,7 +57,11 @@ #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_registry.h" +#include "src/core/util/crash.h" +#include "src/core/util/host_port.h" +#include "src/core/util/orphanable.h" #include "src/core/util/string.h" +#include "src/core/util/work_serializer.h" #include "test/core/test_util/fake_udp_and_tcp_server.h" #include "test/core/test_util/port.h" #include "test/core/test_util/socket_use_after_close_detector.h" diff --git a/test/cpp/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 54a1d6faadf..d540c21a225 100644 --- a/test/cpp/performance/writes_per_rpc_test.cc +++ b/test/cpp/performance/writes_per_rpc_test.cc @@ -38,7 +38,6 @@ #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/gprpp/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" @@ -46,6 +45,7 @@ #include "src/core/lib/surface/channel_create.h" #include "src/core/server/server.h" #include "src/core/telemetry/stats.h" +#include "src/core/util/notification.h" #include "src/cpp/client/create_channel_internal.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" diff --git a/test/cpp/qps/benchmark_config.cc b/test/cpp/qps/benchmark_config.cc index 39cfbe6b18f..58b4f57be42 100644 --- a/test/cpp/qps/benchmark_config.cc +++ b/test/cpp/qps/benchmark_config.cc @@ -24,7 +24,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..889d935f989 100644 --- a/test/cpp/qps/client_async.cc +++ b/test/cpp/qps/client_async.cc @@ -38,8 +38,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/surface/completion_queue.h" +#include "src/core/util/crash.h" #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" #include "test/cpp/qps/client.h" #include "test/cpp/qps/usage_timer.h" diff --git a/test/cpp/qps/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 d7d6c5baf5c..3f015de1236 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 4d2017dd23e..f091c11d69b 100644 --- a/test/cpp/qps/server_async.cc +++ b/test/cpp/qps/server_async.cc @@ -35,9 +35,9 @@ #include #include -#include "src/core/lib/gprpp/crash.h" -#include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/surface/completion_queue.h" +#include "src/core/util/crash.h" +#include "src/core/util/host_port.h" #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h" #include "test/core/test_util/test_config.h" #include "test/cpp/qps/qps_server_builder.h" diff --git a/test/cpp/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 e92f496e62a..0c11284c81a 100644 --- a/test/cpp/util/channel_trace_proto_helper.cc +++ b/test/cpp/util/channel_trace_proto_helper.cc @@ -25,8 +25,8 @@ #include #include -#include "src/core/lib/gprpp/crash.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/util/crash.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" #include "src/core/util/json/json_writer.h" diff --git a/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 3cae389d898..9f7df96bf8e 100644 --- a/test/cpp/util/cli_call.cc +++ b/test/cpp/util/cli_call.cc @@ -30,7 +30,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 d0c355a09cc..61e90282ae0 100644 --- a/test/cpp/util/cli_credentials.cc +++ b/test/cpp/util/cli_credentials.cc @@ -24,8 +24,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 a355c15ce20..73d92b20ae4 100644 --- a/test/cpp/util/create_test_channel.cc +++ b/test/cpp/util/create_test_channel.cc @@ -24,7 +24,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 57a3abf3ea7..28dc7e670be 100644 --- a/test/cpp/util/metrics_server.cc +++ b/test/cpp/util/metrics_server.cc @@ -23,7 +23,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 0198a3f14ff..b4d3e116cd3 100644 --- a/test/cpp/util/test_credentials_provider.cc +++ b/test/cpp/util/test_credentials_provider.cc @@ -32,7 +32,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 a1f377032fd..85ac3d7eb37 100644 --- a/test/cpp/util/windows/manifest_file.cc +++ b/test/cpp/util/windows/manifest_file.cc @@ -29,7 +29,7 @@ #include "absl/strings/str_replace.h" #include "absl/strings/str_split.h" -#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 9ffc1744aa0..2e760cc9e02 100644 --- a/tools/codegen/core/gen_huffman_decompressor.cc +++ b/tools/codegen/core/gen_huffman_decompressor.cc @@ -38,8 +38,8 @@ #include "absl/types/variant.h" #include "src/core/ext/transport/chttp2/transport/huffsyms.h" -#include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/match.h" +#include "src/core/util/env.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..ecd131d5a6b 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 = [] @@ -44,8 +44,8 @@ with open("src/core/lib/gprpp/if_list.h", "w") as H: put_banner([H], ["", "Automatically generated by %s" % sys.argv[0], ""]) - print("#ifndef GRPC_CORE_LIB_GPRPP_IF_LIST_H", file=H) - print("#define GRPC_CORE_LIB_GPRPP_IF_LIST_H", file=H) + print("#ifndef GRPC_CORE_UTIL_IF_LIST_H", file=H) + print("#define GRPC_CORE_UTIL_IF_LIST_H", file=H) print("", file=H) print("#include ", file=H) print("", file=H) @@ -78,4 +78,4 @@ with open("src/core/lib/gprpp/if_list.h", "w") as H: print("", file=H) print("}", file=H) print("", file=H) - print("#endif // GRPC_CORE_LIB_GPRPP_IF_LIST_H", file=H) + print("#endif // GRPC_CORE_UTIL_IF_LIST_H", file=H) diff --git a/tools/codegen/core/gen_join.py b/tools/codegen/core/gen_join.py index cd90390ae3c..4f53a982d41 100755 --- a/tools/codegen/core/gen_join.py +++ b/tools/codegen/core/gen_join.py @@ -104,10 +104,10 @@ front_matter = """ #include "absl/log/log.h" #include "src/core/lib/debug/trace.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 a33072270f3..1b735c1eba1 100755 --- a/tools/codegen/core/gen_seq.py +++ b/tools/codegen/core/gen_seq.py @@ -191,8 +191,8 @@ front_matter = """ #include "absl/strings/str_cat.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/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 44fdcb00abc..64764473c76 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 f08f73c66fc..be12f113fda 100755 --- a/tools/distrib/check_namespace_qualification.py +++ b/tools/distrib/check_namespace_qualification.py @@ -74,10 +74,9 @@ 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/lib/gprpp/unique_type_name.h", + "src/core/util/crash.h", + "src/core/util/unique_type_name.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/distrib/fix_build_deps.py b/tools/distrib/fix_build_deps.py index 79bd9bbbe86..01d0704c7e4 100755 --- a/tools/distrib/fix_build_deps.py +++ b/tools/distrib/fix_build_deps.py @@ -399,13 +399,13 @@ for dirname in [ "src/cpp/ext/gcp", "src/cpp/ext/csm", "src/cpp/ext/otel", - "test/core/backoff", + "test/core/util", "test/core/call", "test/core/call/yodel", "test/core/client_channel", "test/core/experiments", "test/core/load_balancing", - "test/core/uri", + "test/core/util", "test/core/test_util", "test/core/end2end", "test/core/event_engine", diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index 0332a7ddb15..420e439352b 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -2104,11 +2104,6 @@ src/core/lib/address_utils/parse_address.cc \ src/core/lib/address_utils/parse_address.h \ src/core/lib/address_utils/sockaddr_utils.cc \ src/core/lib/address_utils/sockaddr_utils.h \ -src/core/lib/avl/avl.h \ -src/core/lib/backoff/backoff.cc \ -src/core/lib/backoff/backoff.h \ -src/core/lib/backoff/random_early_detection.cc \ -src/core/lib/backoff/random_early_detection.h \ src/core/lib/channel/call_finalization.h \ src/core/lib/channel/channel_args.cc \ src/core/lib/channel/channel_args.h \ @@ -2139,8 +2134,6 @@ src/core/lib/config/core_configuration.cc \ src/core/lib/config/core_configuration.h \ src/core/lib/config/load_config.cc \ src/core/lib/config/load_config.h \ -src/core/lib/debug/event_log.cc \ -src/core/lib/debug/event_log.h \ src/core/lib/debug/trace.cc \ src/core/lib/debug/trace.h \ src/core/lib/debug/trace_flags.cc \ @@ -2261,83 +2254,6 @@ src/core/lib/experiments/config.cc \ src/core/lib/experiments/config.h \ src/core/lib/experiments/experiments.cc \ src/core/lib/experiments/experiments.h \ -src/core/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/glob.cc \ -src/core/lib/gprpp/glob.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/lib/iomgr/block_annotate.h \ src/core/lib/iomgr/buffer_list.cc \ src/core/lib/iomgr/buffer_list.h \ @@ -2382,13 +2298,6 @@ src/core/lib/iomgr/executor.cc \ src/core/lib/iomgr/executor.h \ src/core/lib/iomgr/fork_posix.cc \ src/core/lib/iomgr/fork_windows.cc \ -src/core/lib/iomgr/gethostname.h \ -src/core/lib/iomgr/gethostname_fallback.cc \ -src/core/lib/iomgr/gethostname_host_name_max.cc \ -src/core/lib/iomgr/gethostname_sysconf.cc \ -src/core/lib/iomgr/grpc_if_nametoindex.h \ -src/core/lib/iomgr/grpc_if_nametoindex_posix.cc \ -src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc \ src/core/lib/iomgr/internal_errqueue.cc \ src/core/lib/iomgr/internal_errqueue.h \ src/core/lib/iomgr/iocp_windows.cc \ @@ -2479,8 +2388,6 @@ src/core/lib/iomgr/wakeup_fd_pipe.cc \ src/core/lib/iomgr/wakeup_fd_pipe.h \ src/core/lib/iomgr/wakeup_fd_posix.cc \ src/core/lib/iomgr/wakeup_fd_posix.h \ -src/core/lib/matchers/matchers.cc \ -src/core/lib/matchers/matchers.h \ src/core/lib/promise/activity.cc \ src/core/lib/promise/activity.h \ src/core/lib/promise/all_ok.h \ @@ -2741,8 +2648,6 @@ src/core/lib/transport/transport.cc \ src/core/lib/transport/transport.h \ src/core/lib/transport/transport_fwd.h \ src/core/lib/transport/transport_op_string.cc \ -src/core/lib/uri/uri_parser.cc \ -src/core/lib/uri/uri_parser.h \ src/core/load_balancing/address_filtering.cc \ src/core/load_balancing/address_filtering.h \ src/core/load_balancing/backend_metric_data.h \ @@ -2927,8 +2832,43 @@ src/core/tsi/transport_security_interface.h \ src/core/util/alloc.cc \ src/core/util/alloc.h \ src/core/util/atm.cc \ +src/core/util/atomic_utils.h \ +src/core/util/avl.h \ +src/core/util/backoff.cc \ +src/core/util/backoff.h \ +src/core/util/bitset.h \ +src/core/util/chunked_vector.h \ +src/core/util/construct_destruct.h \ +src/core/util/cpp_impl_of.h \ +src/core/util/crash.cc \ +src/core/util/crash.h \ +src/core/util/debug_location.h \ +src/core/util/directory_reader.h \ +src/core/util/down_cast.h \ +src/core/util/dual_ref_counted.h \ +src/core/util/dump_args.cc \ +src/core/util/dump_args.h \ +src/core/util/env.h \ +src/core/util/event_log.cc \ +src/core/util/event_log.h \ +src/core/util/examine_stack.cc \ +src/core/util/examine_stack.h \ +src/core/util/fork.cc \ +src/core/util/fork.h \ src/core/util/gcp_metadata_query.cc \ src/core/util/gcp_metadata_query.h \ +src/core/util/gethostname.h \ +src/core/util/gethostname_fallback.cc \ +src/core/util/gethostname_host_name_max.cc \ +src/core/util/gethostname_sysconf.cc \ +src/core/util/glob.cc \ +src/core/util/glob.h \ +src/core/util/gpr_time.cc \ +src/core/util/grpc_if_nametoindex.h \ +src/core/util/grpc_if_nametoindex_posix.cc \ +src/core/util/grpc_if_nametoindex_unsupported.cc \ +src/core/util/host_port.cc \ +src/core/util/host_port.h \ src/core/util/http_client/format_request.cc \ src/core/util/http_client/format_request.h \ src/core/util/http_client/httpcli.cc \ @@ -2937,6 +2877,7 @@ src/core/util/http_client/httpcli_security_connector.cc \ src/core/util/http_client/httpcli_ssl_credentials.h \ src/core/util/http_client/parser.cc \ src/core/util/http_client/parser.h \ +src/core/util/if_list.h \ src/core/util/iphone/cpu.cc \ src/core/util/json/json.h \ src/core/util/json/json_args.h \ @@ -2952,33 +2893,92 @@ src/core/util/json/json_writer.h \ src/core/util/latent_see.cc \ src/core/util/latent_see.h \ src/core/util/linux/cpu.cc \ +src/core/util/linux/env.cc \ +src/core/util/load_file.cc \ +src/core/util/load_file.h \ src/core/util/log.cc \ src/core/util/lru_cache.h \ +src/core/util/manual_constructor.h \ +src/core/util/match.h \ +src/core/util/matchers.cc \ +src/core/util/matchers.h \ +src/core/util/memory.h \ +src/core/util/mpscq.cc \ +src/core/util/mpscq.h \ src/core/util/msys/tmpfile.cc \ +src/core/util/no_destruct.h \ +src/core/util/notification.h \ +src/core/util/orphanable.h \ +src/core/util/overload.h \ +src/core/util/packed_table.h \ +src/core/util/per_cpu.cc \ +src/core/util/per_cpu.h \ src/core/util/posix/cpu.cc \ +src/core/util/posix/directory_reader.cc \ +src/core/util/posix/env.cc \ +src/core/util/posix/stat.cc \ src/core/util/posix/string.cc \ src/core/util/posix/sync.cc \ +src/core/util/posix/thd.cc \ src/core/util/posix/time.cc \ src/core/util/posix/tmpfile.cc \ +src/core/util/random_early_detection.cc \ +src/core/util/random_early_detection.h \ +src/core/util/ref_counted.h \ +src/core/util/ref_counted_ptr.h \ +src/core/util/ref_counted_string.cc \ +src/core/util/ref_counted_string.h \ src/core/util/ring_buffer.h \ +src/core/util/single_set_ptr.h \ +src/core/util/sorted_pack.h \ src/core/util/spinlock.h \ +src/core/util/stat.h \ +src/core/util/status_helper.cc \ +src/core/util/status_helper.h \ +src/core/util/strerror.cc \ +src/core/util/strerror.h \ src/core/util/string.cc \ src/core/util/string.h \ src/core/util/sync.cc \ +src/core/util/sync.h \ src/core/util/sync_abseil.cc \ +src/core/util/table.h \ +src/core/util/tchar.cc \ +src/core/util/tchar.h \ +src/core/util/thd.h \ src/core/util/time.cc \ +src/core/util/time.h \ +src/core/util/time_averaged_stats.cc \ +src/core/util/time_averaged_stats.h \ src/core/util/time_precise.cc \ src/core/util/time_precise.h \ +src/core/util/time_util.cc \ +src/core/util/time_util.h \ src/core/util/tmpfile.h \ +src/core/util/type_list.h \ src/core/util/unique_ptr_with_bitset.h \ +src/core/util/unique_type_name.h \ src/core/util/upb_utils.h \ +src/core/util/uri.cc \ +src/core/util/uri.h \ src/core/util/useful.h \ +src/core/util/uuid_v4.cc \ +src/core/util/uuid_v4.h \ +src/core/util/validation_errors.cc \ +src/core/util/validation_errors.h \ src/core/util/windows/cpu.cc \ +src/core/util/windows/directory_reader.cc \ +src/core/util/windows/env.cc \ +src/core/util/windows/stat.cc \ src/core/util/windows/string.cc \ src/core/util/windows/string_util.cc \ src/core/util/windows/sync.cc \ +src/core/util/windows/thd.cc \ src/core/util/windows/time.cc \ src/core/util/windows/tmpfile.cc \ +src/core/util/work_serializer.cc \ +src/core/util/work_serializer.h \ +src/core/util/xxhash_inline.h \ src/core/xds/grpc/certificate_provider_store.cc \ src/core/xds/grpc/certificate_provider_store.h \ src/core/xds/grpc/file_watcher_certificate_provider_factory.cc \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 380ede52170..095a8988889 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -1872,11 +1872,6 @@ src/core/lib/address_utils/parse_address.cc \ src/core/lib/address_utils/parse_address.h \ src/core/lib/address_utils/sockaddr_utils.cc \ src/core/lib/address_utils/sockaddr_utils.h \ -src/core/lib/avl/avl.h \ -src/core/lib/backoff/backoff.cc \ -src/core/lib/backoff/backoff.h \ -src/core/lib/backoff/random_early_detection.cc \ -src/core/lib/backoff/random_early_detection.h \ src/core/lib/channel/README.md \ src/core/lib/channel/call_finalization.h \ src/core/lib/channel/channel_args.cc \ @@ -1908,8 +1903,6 @@ src/core/lib/config/core_configuration.cc \ src/core/lib/config/core_configuration.h \ src/core/lib/config/load_config.cc \ src/core/lib/config/load_config.h \ -src/core/lib/debug/event_log.cc \ -src/core/lib/debug/event_log.h \ src/core/lib/debug/trace.cc \ src/core/lib/debug/trace.h \ src/core/lib/debug/trace_flags.cc \ @@ -2030,84 +2023,6 @@ src/core/lib/experiments/config.cc \ src/core/lib/experiments/config.h \ src/core/lib/experiments/experiments.cc \ src/core/lib/experiments/experiments.h \ -src/core/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/glob.cc \ -src/core/lib/gprpp/glob.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/lib/iomgr/README.md \ src/core/lib/iomgr/block_annotate.h \ src/core/lib/iomgr/buffer_list.cc \ @@ -2153,13 +2068,6 @@ src/core/lib/iomgr/executor.cc \ src/core/lib/iomgr/executor.h \ src/core/lib/iomgr/fork_posix.cc \ src/core/lib/iomgr/fork_windows.cc \ -src/core/lib/iomgr/gethostname.h \ -src/core/lib/iomgr/gethostname_fallback.cc \ -src/core/lib/iomgr/gethostname_host_name_max.cc \ -src/core/lib/iomgr/gethostname_sysconf.cc \ -src/core/lib/iomgr/grpc_if_nametoindex.h \ -src/core/lib/iomgr/grpc_if_nametoindex_posix.cc \ -src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc \ src/core/lib/iomgr/internal_errqueue.cc \ src/core/lib/iomgr/internal_errqueue.h \ src/core/lib/iomgr/iocp_windows.cc \ @@ -2250,8 +2158,6 @@ src/core/lib/iomgr/wakeup_fd_pipe.cc \ src/core/lib/iomgr/wakeup_fd_pipe.h \ src/core/lib/iomgr/wakeup_fd_posix.cc \ src/core/lib/iomgr/wakeup_fd_posix.h \ -src/core/lib/matchers/matchers.cc \ -src/core/lib/matchers/matchers.h \ src/core/lib/promise/activity.cc \ src/core/lib/promise/activity.h \ src/core/lib/promise/all_ok.h \ @@ -2514,8 +2420,6 @@ src/core/lib/transport/transport.cc \ src/core/lib/transport/transport.h \ src/core/lib/transport/transport_fwd.h \ src/core/lib/transport/transport_op_string.cc \ -src/core/lib/uri/uri_parser.cc \ -src/core/lib/uri/uri_parser.h \ src/core/load_balancing/address_filtering.cc \ src/core/load_balancing/address_filtering.h \ src/core/load_balancing/backend_metric_data.h \ @@ -2706,8 +2610,43 @@ src/core/util/README.md \ src/core/util/alloc.cc \ src/core/util/alloc.h \ src/core/util/atm.cc \ +src/core/util/atomic_utils.h \ +src/core/util/avl.h \ +src/core/util/backoff.cc \ +src/core/util/backoff.h \ +src/core/util/bitset.h \ +src/core/util/chunked_vector.h \ +src/core/util/construct_destruct.h \ +src/core/util/cpp_impl_of.h \ +src/core/util/crash.cc \ +src/core/util/crash.h \ +src/core/util/debug_location.h \ +src/core/util/directory_reader.h \ +src/core/util/down_cast.h \ +src/core/util/dual_ref_counted.h \ +src/core/util/dump_args.cc \ +src/core/util/dump_args.h \ +src/core/util/env.h \ +src/core/util/event_log.cc \ +src/core/util/event_log.h \ +src/core/util/examine_stack.cc \ +src/core/util/examine_stack.h \ +src/core/util/fork.cc \ +src/core/util/fork.h \ src/core/util/gcp_metadata_query.cc \ src/core/util/gcp_metadata_query.h \ +src/core/util/gethostname.h \ +src/core/util/gethostname_fallback.cc \ +src/core/util/gethostname_host_name_max.cc \ +src/core/util/gethostname_sysconf.cc \ +src/core/util/glob.cc \ +src/core/util/glob.h \ +src/core/util/gpr_time.cc \ +src/core/util/grpc_if_nametoindex.h \ +src/core/util/grpc_if_nametoindex_posix.cc \ +src/core/util/grpc_if_nametoindex_unsupported.cc \ +src/core/util/host_port.cc \ +src/core/util/host_port.h \ src/core/util/http_client/format_request.cc \ src/core/util/http_client/format_request.h \ src/core/util/http_client/httpcli.cc \ @@ -2716,6 +2655,7 @@ src/core/util/http_client/httpcli_security_connector.cc \ src/core/util/http_client/httpcli_ssl_credentials.h \ src/core/util/http_client/parser.cc \ src/core/util/http_client/parser.h \ +src/core/util/if_list.h \ src/core/util/iphone/cpu.cc \ src/core/util/json/json.h \ src/core/util/json/json_args.h \ @@ -2731,33 +2671,92 @@ src/core/util/json/json_writer.h \ src/core/util/latent_see.cc \ src/core/util/latent_see.h \ src/core/util/linux/cpu.cc \ +src/core/util/linux/env.cc \ +src/core/util/load_file.cc \ +src/core/util/load_file.h \ src/core/util/log.cc \ src/core/util/lru_cache.h \ +src/core/util/manual_constructor.h \ +src/core/util/match.h \ +src/core/util/matchers.cc \ +src/core/util/matchers.h \ +src/core/util/memory.h \ +src/core/util/mpscq.cc \ +src/core/util/mpscq.h \ src/core/util/msys/tmpfile.cc \ +src/core/util/no_destruct.h \ +src/core/util/notification.h \ +src/core/util/orphanable.h \ +src/core/util/overload.h \ +src/core/util/packed_table.h \ +src/core/util/per_cpu.cc \ +src/core/util/per_cpu.h \ src/core/util/posix/cpu.cc \ +src/core/util/posix/directory_reader.cc \ +src/core/util/posix/env.cc \ +src/core/util/posix/stat.cc \ src/core/util/posix/string.cc \ src/core/util/posix/sync.cc \ +src/core/util/posix/thd.cc \ src/core/util/posix/time.cc \ src/core/util/posix/tmpfile.cc \ +src/core/util/random_early_detection.cc \ +src/core/util/random_early_detection.h \ +src/core/util/ref_counted.h \ +src/core/util/ref_counted_ptr.h \ +src/core/util/ref_counted_string.cc \ +src/core/util/ref_counted_string.h \ src/core/util/ring_buffer.h \ +src/core/util/single_set_ptr.h \ +src/core/util/sorted_pack.h \ src/core/util/spinlock.h \ +src/core/util/stat.h \ +src/core/util/status_helper.cc \ +src/core/util/status_helper.h \ +src/core/util/strerror.cc \ +src/core/util/strerror.h \ src/core/util/string.cc \ src/core/util/string.h \ src/core/util/sync.cc \ +src/core/util/sync.h \ src/core/util/sync_abseil.cc \ +src/core/util/table.h \ +src/core/util/tchar.cc \ +src/core/util/tchar.h \ +src/core/util/thd.h \ src/core/util/time.cc \ +src/core/util/time.h \ +src/core/util/time_averaged_stats.cc \ +src/core/util/time_averaged_stats.h \ src/core/util/time_precise.cc \ src/core/util/time_precise.h \ +src/core/util/time_util.cc \ +src/core/util/time_util.h \ src/core/util/tmpfile.h \ +src/core/util/type_list.h \ src/core/util/unique_ptr_with_bitset.h \ +src/core/util/unique_type_name.h \ src/core/util/upb_utils.h \ +src/core/util/uri.cc \ +src/core/util/uri.h \ src/core/util/useful.h \ +src/core/util/uuid_v4.cc \ +src/core/util/uuid_v4.h \ +src/core/util/validation_errors.cc \ +src/core/util/validation_errors.h \ src/core/util/windows/cpu.cc \ +src/core/util/windows/directory_reader.cc \ +src/core/util/windows/env.cc \ +src/core/util/windows/stat.cc \ src/core/util/windows/string.cc \ src/core/util/windows/string_util.cc \ src/core/util/windows/sync.cc \ +src/core/util/windows/thd.cc \ src/core/util/windows/time.cc \ src/core/util/windows/tmpfile.cc \ +src/core/util/work_serializer.cc \ +src/core/util/work_serializer.h \ +src/core/util/xxhash_inline.h \ src/core/xds/grpc/certificate_provider_store.cc \ src/core/xds/grpc/certificate_provider_store.h \ src/core/xds/grpc/file_watcher_certificate_provider_factory.cc \ diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json index 5152c4f42e5..16c73265ad2 100644 --- a/tools/run_tests/generated/tests.json +++ b/tools/run_tests/generated/tests.json @@ -4095,6 +4095,30 @@ ], "uses_polling": true }, + { + "args": [], + "benchmark": false, + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": true, + "language": "c++", + "name": "gpr_time_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "uses_polling": false + }, { "args": [], "benchmark": false, @@ -10589,30 +10613,6 @@ ], "uses_polling": true }, - { - "args": [], - "benchmark": false, - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "cpu_cost": 1.0, - "exclude_configs": [], - "exclude_iomgrs": [], - "flaky": false, - "gtest": true, - "language": "c++", - "name": "test_core_gprpp_time_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "uses_polling": false - }, { "args": [], "benchmark": false, @@ -11554,7 +11554,7 @@ "flaky": false, "gtest": true, "language": "c++", - "name": "uri_parser_test", + "name": "uri_test", "platforms": [ "linux", "mac", diff --git a/tools/run_tests/sanity/check_absl_mutex.sh b/tools/run_tests/sanity/check_absl_mutex.sh index 7243f9e471a..99bdbc60b73 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" \ -a -not -wholename "./test/core/transport/call_spine_benchmarks.h" \ -print0 |\ diff --git a/tools/run_tests/sanity/cpp_banned_constructs.sh b/tools/run_tests/sanity/cpp_banned_constructs.sh index 2296cfd8ebd..2318fd95b71 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 #