From 4e2b936e88aca8afc261b0f50b3488302c47a721 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Sat, 12 Nov 2022 17:00:04 -0800 Subject: [PATCH] Revert "[chaotic-good] Reland basic frame serialization (#31631)" (#31635) This reverts commit 571e98f6d5dfd5db9c17267d8548e947256e9ff5. --- BUILD | 164 +--- CMakeLists.txt | 786 +----------------- Makefile | 2 - build_autogenerated.yaml | 507 +---------- config.m4 | 1 - config.w32 | 1 - gRPC-C++.podspec | 2 - gRPC-Core.podspec | 3 - grpc.gemspec | 2 - grpc.gyp | 2 - package.xml | 2 - src/core/BUILD | 49 -- src/core/ext/transport/chaotic_good/frame.cc | 307 ------- src/core/ext/transport/chaotic_good/frame.h | 122 --- .../transport/chaotic_good/frame_header.cc | 87 -- .../ext/transport/chaotic_good/frame_header.h | 73 -- .../chttp2/transport/chttp2_transport.cc | 2 +- .../chttp2/transport/chttp2_transport.h | 1 + .../chttp2/transport/frame_rst_stream.cc | 2 +- .../chttp2/transport/frame_settings.cc | 2 +- .../chttp2/transport/hpack_encoder.cc | 234 +++--- .../chttp2/transport/hpack_encoder.h | 59 +- .../chttp2/transport/hpack_parser.cc | 72 ++ .../chttp2/transport/hpack_parser_table.cc | 3 +- .../transport/chttp2/transport/http_trace.cc | 19 - .../transport/chttp2/transport/http_trace.h | 24 - .../ext/transport/chttp2/transport/internal.h | 1 + .../ext/transport/chttp2/transport/parsing.cc | 67 +- .../ext/transport/chttp2/transport/writing.cc | 2 - src/core/lib/gprpp/bitset.h | 12 - src/core/lib/iomgr/fork_posix.cc | 3 +- src/core/lib/slice/slice.h | 4 - src/core/lib/slice/slice_buffer.cc | 7 +- src/core/lib/slice/slice_buffer.h | 20 - src/core/lib/surface/init.cc | 3 - src/core/lib/surface/init_internally.cc | 1 - src/core/lib/surface/init_internally.h | 1 - src/python/grpcio/grpc_core_dependencies.py | 1 - templates/CMakeLists.txt.template | 2 +- test/core/promise/BUILD | 151 ++-- test/core/transport/chaotic_good/BUILD | 78 -- .../transport/chaotic_good/frame_fuzzer.cc | 112 --- ...h-05c704327d21af2cc914de40e9d90d06f16ca0eb | Bin 74 -> 0 bytes ...h-5015de8c7cafb0b0ebbbfd28c29aedd5dbfdc03a | Bin 66 -> 0 bytes ...h-5a34978de8de6889ce913947a77f43f7cdea854c | Bin 180 -> 0 bytes ...h-608f798a51077a8cdc45b11f335c079a81339fbe | Bin 166 -> 0 bytes ...h-6a002cb46eac21af4ab6fd74b61ff3ce26d96dff | Bin 161 -> 0 bytes ...h-7732ddd35a4deb8b7c9e462aaf8680986755e540 | Bin 79 -> 0 bytes ...h-c171e98ebfe8b6485f9a4bea0b9cdfe683776675 | Bin 70 -> 0 bytes .../chaotic_good/frame_header_fuzzer.cc | 34 - .../chaotic_good/frame_header_fuzzer_corpus/0 | 1 - .../chaotic_good/frame_header_test.cc | 120 --- .../core/transport/chaotic_good/frame_test.cc | 57 -- tools/distrib/fix_build_deps.py | 2 - tools/doxygen/Doxyfile.c++.internal | 2 - tools/doxygen/Doxyfile.core.internal | 2 - tools/run_tests/generated/tests.json | 48 -- 57 files changed, 380 insertions(+), 2879 deletions(-) delete mode 100644 src/core/ext/transport/chaotic_good/frame.cc delete mode 100644 src/core/ext/transport/chaotic_good/frame.h delete mode 100644 src/core/ext/transport/chaotic_good/frame_header.cc delete mode 100644 src/core/ext/transport/chaotic_good/frame_header.h delete mode 100644 src/core/ext/transport/chttp2/transport/http_trace.cc delete mode 100644 src/core/ext/transport/chttp2/transport/http_trace.h delete mode 100644 test/core/transport/chaotic_good/BUILD delete mode 100644 test/core/transport/chaotic_good/frame_fuzzer.cc delete mode 100644 test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-05c704327d21af2cc914de40e9d90d06f16ca0eb delete mode 100644 test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-5015de8c7cafb0b0ebbbfd28c29aedd5dbfdc03a delete mode 100644 test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-5a34978de8de6889ce913947a77f43f7cdea854c delete mode 100644 test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-608f798a51077a8cdc45b11f335c079a81339fbe delete mode 100644 test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-6a002cb46eac21af4ab6fd74b61ff3ce26d96dff delete mode 100644 test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-7732ddd35a4deb8b7c9e462aaf8680986755e540 delete mode 100644 test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-c171e98ebfe8b6485f9a4bea0b9cdfe683776675 delete mode 100644 test/core/transport/chaotic_good/frame_header_fuzzer.cc delete mode 100644 test/core/transport/chaotic_good/frame_header_fuzzer_corpus/0 delete mode 100644 test/core/transport/chaotic_good/frame_header_test.cc delete mode 100644 test/core/transport/chaotic_good/frame_test.cc diff --git a/BUILD b/BUILD index 2adfc1f1631..2abf618301a 100644 --- a/BUILD +++ b/BUILD @@ -479,6 +479,7 @@ grpc_cc_library( language = "c++", public_hdrs = GRPC_PUBLIC_HDRS, tags = [ + "avoid_dep", "nofixdeps", ], visibility = ["@grpc:public"], @@ -543,6 +544,7 @@ grpc_cc_library( }, ], tags = [ + "grpc_avoid_dep", "nofixdeps", ], visibility = [ @@ -3295,148 +3297,11 @@ grpc_cc_library( ], ) -grpc_cc_library( - name = "chttp2_frame", - hdrs = [ - "//src/core:ext/transport/chttp2/transport/frame.h", - ], - deps = ["gpr"], -) - -grpc_cc_library( - name = "http_trace", - srcs = [ - "//src/core:ext/transport/chttp2/transport/http_trace.cc", - ], - hdrs = [ - "//src/core:ext/transport/chttp2/transport/http_trace.h", - ], - deps = [ - "gpr_platform", - "grpc_trace", - ], -) - -grpc_cc_library( - name = "hpack_parser_table", - srcs = [ - "//src/core:ext/transport/chttp2/transport/hpack_parser_table.cc", - ], - hdrs = [ - "//src/core:ext/transport/chttp2/transport/hpack_parser_table.h", - ], - external_deps = [ - "absl/status", - "absl/strings", - "absl/strings:str_format", - ], - deps = [ - "gpr", - "gpr_platform", - "grpc_base", - "grpc_trace", - "http_trace", - "//src/core:error", - "//src/core:hpack_constants", - "//src/core:no_destruct", - "//src/core:slice", - ], -) - -grpc_cc_library( - name = "hpack_parser", - srcs = [ - "//src/core:ext/transport/chttp2/transport/hpack_parser.cc", - ], - hdrs = [ - "//src/core:ext/transport/chttp2/transport/hpack_parser.h", - ], - external_deps = [ - "absl/base:core_headers", - "absl/status", - "absl/strings", - "absl/strings:str_format", - "absl/types:optional", - "absl/types:span", - "absl/types:variant", - ], - deps = [ - "chttp2_frame", - "gpr", - "gpr_platform", - "grpc_base", - "grpc_public_hdrs", - "grpc_trace", - "hpack_parser_table", - "//src/core:decode_huff", - "//src/core:error", - "//src/core:experiments", - "//src/core:hpack_constants", - "//src/core:slice", - "//src/core:slice_refcount", - "//src/core:status_helper", - ], -) - -grpc_cc_library( - name = "hpack_encoder", - srcs = [ - "//src/core:ext/transport/chttp2/transport/hpack_encoder.cc", - ], - hdrs = [ - "//src/core:ext/transport/chttp2/transport/hpack_encoder.h", - ], - external_deps = ["absl/strings"], - deps = [ - "chttp2_bin_encoder", - "chttp2_frame", - "chttp2_varint", - "gpr", - "gpr_platform", - "grpc_base", - "grpc_public_hdrs", - "grpc_trace", - "http_trace", - "//src/core:hpack_constants", - "//src/core:hpack_encoder_table", - "//src/core:slice", - "//src/core:slice_buffer", - "//src/core:time", - ], -) - -grpc_cc_library( - name = "chttp2_bin_encoder", - srcs = [ - "//src/core:ext/transport/chttp2/transport/bin_encoder.cc", - ], - hdrs = [ - "//src/core:ext/transport/chttp2/transport/bin_encoder.h", - ], - deps = [ - "gpr", - "gpr_platform", - "//src/core:huffsyms", - "//src/core:slice", - ], -) - -grpc_cc_library( - name = "chttp2_varint", - srcs = [ - "//src/core:ext/transport/chttp2/transport/varint.cc", - ], - hdrs = [ - "//src/core:ext/transport/chttp2/transport/varint.h", - ], - external_deps = ["absl/base:core_headers"], - deps = ["gpr"], -) - grpc_cc_library( name = "grpc_transport_chttp2", srcs = [ "//src/core:ext/transport/chttp2/transport/bin_decoder.cc", + "//src/core:ext/transport/chttp2/transport/bin_encoder.cc", "//src/core:ext/transport/chttp2/transport/chttp2_transport.cc", "//src/core:ext/transport/chttp2/transport/context_list.cc", "//src/core:ext/transport/chttp2/transport/frame_data.cc", @@ -3445,23 +3310,33 @@ grpc_cc_library( "//src/core:ext/transport/chttp2/transport/frame_rst_stream.cc", "//src/core:ext/transport/chttp2/transport/frame_settings.cc", "//src/core:ext/transport/chttp2/transport/frame_window_update.cc", + "//src/core:ext/transport/chttp2/transport/hpack_encoder.cc", + "//src/core:ext/transport/chttp2/transport/hpack_parser.cc", + "//src/core:ext/transport/chttp2/transport/hpack_parser_table.cc", "//src/core:ext/transport/chttp2/transport/parsing.cc", "//src/core:ext/transport/chttp2/transport/stream_lists.cc", "//src/core:ext/transport/chttp2/transport/stream_map.cc", + "//src/core:ext/transport/chttp2/transport/varint.cc", "//src/core:ext/transport/chttp2/transport/writing.cc", ], hdrs = [ "//src/core:ext/transport/chttp2/transport/bin_decoder.h", + "//src/core:ext/transport/chttp2/transport/bin_encoder.h", "//src/core:ext/transport/chttp2/transport/chttp2_transport.h", "//src/core:ext/transport/chttp2/transport/context_list.h", + "//src/core:ext/transport/chttp2/transport/frame.h", "//src/core:ext/transport/chttp2/transport/frame_data.h", "//src/core:ext/transport/chttp2/transport/frame_goaway.h", "//src/core:ext/transport/chttp2/transport/frame_ping.h", "//src/core:ext/transport/chttp2/transport/frame_rst_stream.h", "//src/core:ext/transport/chttp2/transport/frame_settings.h", "//src/core:ext/transport/chttp2/transport/frame_window_update.h", + "//src/core:ext/transport/chttp2/transport/hpack_encoder.h", + "//src/core:ext/transport/chttp2/transport/hpack_parser.h", + "//src/core:ext/transport/chttp2/transport/hpack_parser_table.h", "//src/core:ext/transport/chttp2/transport/internal.h", "//src/core:ext/transport/chttp2/transport/stream_map.h", + "//src/core:ext/transport/chttp2/transport/varint.h", ], external_deps = [ "absl/base:core_headers", @@ -3470,22 +3345,17 @@ grpc_cc_library( "absl/strings:cord", "absl/strings:str_format", "absl/types:optional", + "absl/types:span", "absl/types:variant", ], language = "c++", visibility = ["@grpc:grpclb"], deps = [ - "chttp2_frame", - "chttp2_varint", "debug_location", "gpr", "grpc_base", "grpc_public_hdrs", "grpc_trace", - "hpack_encoder", - "hpack_parser", - "hpack_parser_table", - "http_trace", "httpcli", "iomgr_timer", "ref_counted_ptr", @@ -3494,13 +3364,19 @@ grpc_cc_library( "//src/core:bdp_estimator", "//src/core:bitset", "//src/core:chttp2_flow_control", + "//src/core:decode_huff", "//src/core:error", + "//src/core:experiments", "//src/core:gpr_atm", + "//src/core:hpack_constants", + "//src/core:hpack_encoder_table", "//src/core:http2_errors", "//src/core:http2_settings", + "//src/core:huffsyms", "//src/core:init_internally", "//src/core:iomgr_fwd", "//src/core:memory_quota", + "//src/core:no_destruct", "//src/core:poll", "//src/core:ref_counted", "//src/core:resource_quota", diff --git a/CMakeLists.txt b/CMakeLists.txt index f93e06950f5..5b9d17ba00d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -942,8 +942,6 @@ if(gRPC_BUILD_TESTS) add_dependencies(buildtests_cxx forkable_test) add_dependencies(buildtests_cxx format_request_test) add_dependencies(buildtests_cxx frame_handler_test) - add_dependencies(buildtests_cxx frame_header_test) - add_dependencies(buildtests_cxx frame_test) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) add_dependencies(buildtests_cxx fuzzing_event_engine_test) endif() @@ -1335,7 +1333,6 @@ target_include_directories(address_sorting ) target_link_libraries(address_sorting ${_gRPC_BASELIB_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} ) @@ -1496,7 +1493,6 @@ target_include_directories(end2end_tests third_party/googletest/googlemock ) target_link_libraries(end2end_tests - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -1579,7 +1575,6 @@ target_include_directories(gpr ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(gpr - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::base absl::core_headers @@ -1748,7 +1743,6 @@ add_library(grpc src/core/ext/transport/chttp2/transport/hpack_parser.cc src/core/ext/transport/chttp2/transport/hpack_parser_table.cc src/core/ext/transport/chttp2/transport/http2_settings.cc - src/core/ext/transport/chttp2/transport/http_trace.cc src/core/ext/transport/chttp2/transport/huffsyms.cc src/core/ext/transport/chttp2/transport/parsing.cc src/core/ext/transport/chttp2/transport/stream_lists.cc @@ -2543,7 +2537,6 @@ target_include_directories(grpc_test_util ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(grpc_test_util - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::failure_signal_handler absl::stacktrace @@ -2600,7 +2593,6 @@ target_include_directories(grpc_test_util_unsecure ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(grpc_test_util_unsecure - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::failure_signal_handler absl::stacktrace @@ -2695,7 +2687,6 @@ add_library(grpc_unsecure src/core/ext/transport/chttp2/transport/hpack_parser.cc src/core/ext/transport/chttp2/transport/hpack_parser_table.cc src/core/ext/transport/chttp2/transport/http2_settings.cc - src/core/ext/transport/chttp2/transport/http_trace.cc src/core/ext/transport/chttp2/transport/huffsyms.cc src/core/ext/transport/chttp2/transport/parsing.cc src/core/ext/transport/chttp2/transport/stream_lists.cc @@ -3171,7 +3162,6 @@ target_include_directories(benchmark_helpers ) target_link_libraries(benchmark_helpers ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} ${_gRPC_BENCHMARK_LIBRARIES} grpc++_unsecure @@ -3287,7 +3277,6 @@ target_include_directories(grpc++ target_link_libraries(grpc++ ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc ) @@ -3547,7 +3536,6 @@ target_include_directories(grpc++_alts target_link_libraries(grpc++_alts ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++ ) @@ -3610,7 +3598,6 @@ target_include_directories(grpc++_error_details ) target_link_libraries(grpc++_error_details ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++ ) @@ -3679,7 +3666,6 @@ target_include_directories(grpc++_reflection ) target_link_libraries(grpc++_reflection ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++ ) @@ -3750,7 +3736,6 @@ target_include_directories(grpc++_test ) target_link_libraries(grpc++_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++ ) @@ -3814,7 +3799,6 @@ target_include_directories(grpc++_test_config ) target_link_libraries(grpc++_test_config ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::flags_parse gpr @@ -3884,7 +3868,6 @@ target_include_directories(grpc++_test_util ) target_link_libraries(grpc++_test_util ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::flags grpc++ @@ -3970,7 +3953,6 @@ target_include_directories(grpc++_unsecure target_link_libraries(grpc++_unsecure ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_unsecure ) @@ -4231,7 +4213,6 @@ target_include_directories(grpc_plugin_support target_link_libraries(grpc_plugin_support ${_gRPC_PROTOBUF_PROTOC_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} ) @@ -4301,7 +4282,6 @@ target_include_directories(grpcpp_channelz ) target_link_libraries(grpcpp_channelz ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++ ) @@ -4387,7 +4367,6 @@ target_include_directories(upb ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(upb - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} ) @@ -4425,7 +4404,6 @@ target_include_directories(bad_server_response_test ) target_link_libraries(bad_server_response_test - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -4467,7 +4445,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ) target_link_libraries(bad_ssl_alpn_test - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -4510,7 +4487,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ) target_link_libraries(bad_ssl_cert_test - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -4540,7 +4516,6 @@ target_include_directories(connection_refused_test ) target_link_libraries(connection_refused_test - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -4570,7 +4545,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ) target_link_libraries(dualstack_socket_test - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -4612,7 +4586,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ) target_link_libraries(fd_conservation_posix_test - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -4642,7 +4615,6 @@ target_include_directories(goaway_server_test ) target_link_libraries(goaway_server_test - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -4671,7 +4643,6 @@ target_include_directories(inproc_callback_test ) target_link_libraries(inproc_callback_test - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -4700,7 +4671,6 @@ target_include_directories(invalid_call_argument_test ) target_link_libraries(invalid_call_argument_test - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -4728,7 +4698,6 @@ target_include_directories(minimal_stack_is_minimal_test ) target_link_libraries(minimal_stack_is_minimal_test - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -4756,7 +4725,6 @@ target_include_directories(multiple_server_queues_test ) target_link_libraries(multiple_server_queues_test - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -4785,7 +4753,6 @@ target_include_directories(no_server_test ) target_link_libraries(no_server_test - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -4814,7 +4781,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX OR _gRPC_PLATFORM_WINDOWS) ) target_link_libraries(pollset_windows_starvation_test - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -4845,7 +4811,6 @@ target_include_directories(public_headers_must_be_c89 ) target_link_libraries(public_headers_must_be_c89 - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -4887,7 +4852,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) ) target_link_libraries(tcp_posix_test - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -4928,7 +4892,6 @@ target_include_directories(test_core_iomgr_timer_list_test ) target_link_libraries(test_core_iomgr_timer_list_test - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -4965,7 +4928,6 @@ target_include_directories(activity_test target_link_libraries(activity_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::flat_hash_set absl::hash @@ -5007,7 +4969,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(address_sorting_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_config grpc++_test_util @@ -5061,7 +5022,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(address_sorting_test_unsecure ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_unsecure grpc_test_util_unsecure @@ -5118,7 +5078,6 @@ target_include_directories(admin_services_end2end_test target_link_libraries(admin_services_end2end_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_reflection grpcpp_channelz @@ -5169,7 +5128,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(alarm_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_unsecure grpc_test_util_unsecure @@ -5207,7 +5165,6 @@ target_include_directories(alloc_test target_link_libraries(alloc_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -5243,7 +5200,6 @@ target_include_directories(alpn_test target_link_libraries(alpn_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -5291,7 +5247,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) target_link_libraries(alts_concurrent_connectivity_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++ grpc_test_util @@ -5330,7 +5285,6 @@ target_include_directories(alts_counter_test target_link_libraries(alts_counter_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -5367,7 +5321,6 @@ target_include_directories(alts_crypt_test target_link_libraries(alts_crypt_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -5404,7 +5357,6 @@ target_include_directories(alts_crypter_test target_link_libraries(alts_crypter_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -5442,7 +5394,6 @@ target_include_directories(alts_frame_protector_test target_link_libraries(alts_frame_protector_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -5479,7 +5430,6 @@ target_include_directories(alts_grpc_record_protocol_test target_link_libraries(alts_grpc_record_protocol_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -5516,7 +5466,6 @@ target_include_directories(alts_handshaker_client_test target_link_libraries(alts_handshaker_client_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -5553,7 +5502,6 @@ target_include_directories(alts_iovec_record_protocol_test target_link_libraries(alts_iovec_record_protocol_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -5601,7 +5549,6 @@ target_include_directories(alts_security_connector_test target_link_libraries(alts_security_connector_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -5638,7 +5585,6 @@ target_include_directories(alts_tsi_handshaker_test target_link_libraries(alts_tsi_handshaker_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -5675,7 +5621,6 @@ target_include_directories(alts_tsi_utils_test target_link_libraries(alts_tsi_utils_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -5711,7 +5656,6 @@ target_include_directories(alts_util_test target_link_libraries(alts_util_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_alts grpc++_test_util @@ -5749,7 +5693,6 @@ target_include_directories(alts_zero_copy_grpc_protector_test target_link_libraries(alts_zero_copy_grpc_protector_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -5785,7 +5728,6 @@ target_include_directories(arena_promise_test target_link_libraries(arena_promise_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util_unsecure ) @@ -5821,7 +5763,6 @@ target_include_directories(arena_test target_link_libraries(arena_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util_unsecure ) @@ -5881,7 +5822,6 @@ target_include_directories(async_end2end_test target_link_libraries(async_end2end_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -5929,7 +5869,6 @@ target_include_directories(auth_context_test target_link_libraries(auth_context_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -5965,7 +5904,6 @@ target_include_directories(auth_property_iterator_test target_link_libraries(auth_property_iterator_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -6013,7 +5951,6 @@ target_include_directories(authorization_matchers_test target_link_libraries(authorization_matchers_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -6052,7 +5989,6 @@ target_include_directories(authorization_policy_provider_test target_link_libraries(authorization_policy_provider_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++ grpc_test_util @@ -6089,7 +6025,6 @@ target_include_directories(avl_test target_link_libraries(avl_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::strings absl::variant @@ -6138,7 +6073,6 @@ target_include_directories(aws_request_signer_test target_link_libraries(aws_request_signer_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -6174,7 +6108,6 @@ target_include_directories(b64_test target_link_libraries(b64_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -6210,7 +6143,6 @@ target_include_directories(backoff_test target_link_libraries(backoff_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -6248,7 +6180,6 @@ target_include_directories(bad_streaming_id_bad_client_test target_link_libraries(bad_streaming_id_bad_client_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -6286,7 +6217,6 @@ target_include_directories(badreq_bad_client_test target_link_libraries(badreq_bad_client_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -6323,7 +6253,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(bdp_estimator_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -6360,7 +6289,6 @@ target_include_directories(bin_decoder_test target_link_libraries(bin_decoder_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -6396,7 +6324,6 @@ target_include_directories(bin_encoder_test target_link_libraries(bin_encoder_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -6432,7 +6359,6 @@ target_include_directories(binder_resolver_test target_link_libraries(binder_resolver_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -6486,7 +6412,6 @@ target_include_directories(binder_server_test target_link_libraries(binder_server_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -6589,7 +6514,6 @@ target_include_directories(binder_transport_test target_link_libraries(binder_transport_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -6625,7 +6549,6 @@ target_include_directories(bitset_test target_link_libraries(bitset_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::strings absl::variant @@ -6674,7 +6597,6 @@ target_include_directories(buffer_list_test target_link_libraries(buffer_list_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -6710,7 +6632,6 @@ target_include_directories(byte_buffer_test target_link_libraries(byte_buffer_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -6746,7 +6667,6 @@ target_include_directories(c_slice_buffer_test target_link_libraries(c_slice_buffer_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -6782,7 +6702,6 @@ target_include_directories(call_finalization_test target_link_libraries(call_finalization_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -6820,7 +6739,6 @@ target_include_directories(cancel_ares_query_test target_link_libraries(cancel_ares_query_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_config grpc++_test_util @@ -6947,7 +6865,6 @@ target_include_directories(cel_authorization_engine_test target_link_libraries(cel_authorization_engine_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -6983,7 +6900,6 @@ target_include_directories(certificate_provider_registry_test target_link_libraries(certificate_provider_registry_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -7019,7 +6935,6 @@ target_include_directories(certificate_provider_store_test target_link_libraries(certificate_provider_store_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -7072,7 +6987,6 @@ target_include_directories(cfstream_test target_link_libraries(cfstream_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -7108,7 +7022,6 @@ target_include_directories(channel_args_test target_link_libraries(channel_args_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -7144,7 +7057,6 @@ target_include_directories(channel_arguments_test target_link_libraries(channel_arguments_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++ grpc_test_util @@ -7193,7 +7105,6 @@ target_include_directories(channel_creds_registry_test target_link_libraries(channel_creds_registry_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -7229,7 +7140,6 @@ target_include_directories(channel_filter_test target_link_libraries(channel_filter_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++ grpc_test_util @@ -7266,7 +7176,6 @@ target_include_directories(channel_stack_builder_test target_link_libraries(channel_stack_builder_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -7302,7 +7211,6 @@ target_include_directories(channel_stack_test target_link_libraries(channel_stack_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -7343,7 +7251,6 @@ target_include_directories(channel_trace_test target_link_libraries(channel_trace_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++ grpc_test_util @@ -7380,7 +7287,6 @@ target_include_directories(channelz_registry_test target_link_libraries(channelz_registry_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++ grpc_test_util @@ -7434,7 +7340,6 @@ target_include_directories(channelz_service_test target_link_libraries(channelz_service_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpcpp_channelz grpc++_test_util @@ -7476,7 +7381,6 @@ target_include_directories(channelz_test target_link_libraries(channelz_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++ grpc_test_util @@ -7525,7 +7429,6 @@ target_include_directories(check_gcp_environment_linux_test target_link_libraries(check_gcp_environment_linux_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -7573,7 +7476,6 @@ target_include_directories(check_gcp_environment_windows_test target_link_libraries(check_gcp_environment_windows_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -7632,7 +7534,6 @@ target_include_directories(chunked_vector_test target_link_libraries(chunked_vector_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::any_invocable absl::function_ref @@ -7701,7 +7602,6 @@ target_include_directories(cli_call_test target_link_libraries(cli_call_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -7737,7 +7637,6 @@ target_include_directories(client_auth_filter_test target_link_libraries(client_auth_filter_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc ) @@ -7773,7 +7672,6 @@ target_include_directories(client_authority_filter_test target_link_libraries(client_authority_filter_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc ) @@ -7827,7 +7725,6 @@ target_include_directories(client_callback_end2end_test target_link_libraries(client_callback_end2end_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -7863,7 +7760,6 @@ target_include_directories(client_channel_service_config_test target_link_libraries(client_channel_service_config_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -7925,7 +7821,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(client_channel_stress_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -7962,7 +7857,6 @@ target_include_directories(client_channel_test target_link_libraries(client_channel_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -7998,7 +7892,6 @@ target_include_directories(client_context_test_peer_test target_link_libraries(client_context_test_peer_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test grpc++_test_util @@ -8053,7 +7946,6 @@ target_include_directories(client_interceptors_end2end_test target_link_libraries(client_interceptors_end2end_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -8115,7 +8007,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(client_lb_end2end_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -8153,7 +8044,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(client_ssl_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -8202,7 +8092,6 @@ target_include_directories(cmdline_test target_link_libraries(cmdline_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -8238,7 +8127,6 @@ target_include_directories(codegen_test_full target_link_libraries(codegen_test_full ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++ grpc_test_util @@ -8275,7 +8163,6 @@ target_include_directories(codegen_test_minimal target_link_libraries(codegen_test_minimal ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++ grpc_test_util @@ -8325,7 +8212,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(combiner_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -8362,7 +8248,6 @@ target_include_directories(common_closures_test target_link_libraries(common_closures_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::any_invocable absl::statusor @@ -8400,7 +8285,6 @@ target_include_directories(completion_queue_threading_test target_link_libraries(completion_queue_threading_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -8437,7 +8321,6 @@ target_include_directories(compression_test target_link_libraries(compression_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -8473,7 +8356,6 @@ target_include_directories(concurrent_connectivity_test target_link_libraries(concurrent_connectivity_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -8511,7 +8393,6 @@ target_include_directories(connection_prefix_bad_client_test target_link_libraries(connection_prefix_bad_client_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -8559,7 +8440,6 @@ target_include_directories(connectivity_state_test target_link_libraries(connectivity_state_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -8612,7 +8492,6 @@ target_include_directories(context_allocator_end2end_test target_link_libraries(context_allocator_end2end_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -8660,7 +8539,6 @@ target_include_directories(context_list_test target_link_libraries(context_list_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -8696,7 +8574,6 @@ target_include_directories(context_test target_link_libraries(context_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} gpr ) @@ -8732,7 +8609,6 @@ target_include_directories(core_configuration_test target_link_libraries(core_configuration_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc ) @@ -8768,7 +8644,6 @@ target_include_directories(cpp_impl_of_test target_link_libraries(cpp_impl_of_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} ) @@ -8803,7 +8678,6 @@ target_include_directories(cpu_test target_link_libraries(cpu_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -8841,7 +8715,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(crl_ssl_transport_security_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -8878,7 +8751,6 @@ target_include_directories(default_engine_methods_test target_link_libraries(default_engine_methods_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -8931,7 +8803,6 @@ target_include_directories(delegating_channel_test target_link_libraries(delegating_channel_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -8967,7 +8838,6 @@ target_include_directories(destroy_grpclb_channel_with_active_connect_stress_tes target_link_libraries(destroy_grpclb_channel_with_active_connect_stress_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -9003,7 +8873,6 @@ target_include_directories(dns_resolver_cooldown_test target_link_libraries(dns_resolver_cooldown_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -9039,7 +8908,6 @@ target_include_directories(dns_resolver_test target_link_libraries(dns_resolver_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -9075,7 +8943,6 @@ target_include_directories(dual_ref_counted_test target_link_libraries(dual_ref_counted_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -9113,7 +8980,6 @@ target_include_directories(duplicate_header_bad_client_test target_link_libraries(duplicate_header_bad_client_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -9169,7 +9035,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) target_link_libraries(end2end_binder_transport_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -9228,7 +9093,6 @@ target_include_directories(end2end_test target_link_libraries(end2end_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test grpc++_test_util @@ -9332,7 +9196,6 @@ target_include_directories(endpoint_binder_pool_test target_link_libraries(endpoint_binder_pool_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -9368,7 +9231,6 @@ target_include_directories(endpoint_config_test target_link_libraries(endpoint_config_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc ) @@ -9417,7 +9279,6 @@ target_include_directories(endpoint_pair_test target_link_libraries(endpoint_pair_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -9453,7 +9314,6 @@ target_include_directories(env_test target_link_libraries(env_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -9501,7 +9361,6 @@ target_include_directories(error_details_test target_link_libraries(error_details_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_error_details grpc_test_util @@ -9551,7 +9410,6 @@ target_include_directories(error_test target_link_libraries(error_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -9599,7 +9457,6 @@ target_include_directories(error_utils_test target_link_libraries(error_utils_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -9647,7 +9504,6 @@ target_include_directories(evaluate_args_test target_link_libraries(evaluate_args_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -9685,7 +9541,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(event_poller_posix_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -9723,7 +9578,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(examine_stack_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -9776,7 +9630,6 @@ target_include_directories(exception_test target_link_libraries(exception_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -9826,7 +9679,6 @@ target_include_directories(exec_ctx_wakeup_scheduler_test target_link_libraries(exec_ctx_wakeup_scheduler_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::any_invocable absl::hash @@ -9868,7 +9720,6 @@ target_include_directories(factory_test target_link_libraries(factory_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util_unsecure ) @@ -9971,7 +9822,6 @@ target_include_directories(fake_binder_test target_link_libraries(fake_binder_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -10007,7 +9857,6 @@ target_include_directories(fake_resolver_test target_link_libraries(fake_resolver_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -10044,7 +9893,6 @@ target_include_directories(fake_transport_security_test target_link_libraries(fake_transport_security_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -10093,7 +9941,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(fd_posix_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -10130,7 +9977,6 @@ target_include_directories(file_watcher_certificate_provider_factory_test target_link_libraries(file_watcher_certificate_provider_factory_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -10186,7 +10032,6 @@ target_include_directories(filter_end2end_test target_link_libraries(filter_end2end_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -10239,7 +10084,6 @@ target_include_directories(flaky_network_test target_link_libraries(flaky_network_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -10301,7 +10145,6 @@ target_include_directories(flow_control_test target_link_libraries(flow_control_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::any_invocable absl::function_ref @@ -10368,8 +10211,8 @@ target_include_directories(for_each_test target_link_libraries(for_each_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + absl::flat_hash_set absl::any_invocable absl::function_ref absl::hash @@ -10412,7 +10255,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(fork_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -10450,7 +10292,6 @@ target_include_directories(forkable_test target_link_libraries(forkable_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::flat_hash_set absl::any_invocable @@ -10486,329 +10327,41 @@ add_executable(format_request_test target_include_directories(format_request_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(format_request_test - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util -) - - -endif() -if(gRPC_BUILD_TESTS) - -add_executable(frame_handler_test - test/core/tsi/alts/crypt/gsec_test_util.cc - test/core/tsi/alts/frame_protector/frame_handler_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) - -target_include_directories(frame_handler_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(frame_handler_test - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util -) - - -endif() -if(gRPC_BUILD_TESTS) - -add_executable(frame_header_test - src/core/ext/transport/chaotic_good/frame_header.cc - test/core/transport/chaotic_good/frame_header_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) - -target_include_directories(frame_header_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(frame_header_test - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - absl::status - absl::statusor - absl::strings - absl::variant -) - - -endif() -if(gRPC_BUILD_TESTS) - -add_executable(frame_test - src/core/ext/transport/chaotic_good/frame.cc - src/core/ext/transport/chaotic_good/frame_header.cc - src/core/ext/transport/chttp2/transport/bin_encoder.cc - src/core/ext/transport/chttp2/transport/decode_huff.cc - src/core/ext/transport/chttp2/transport/hpack_encoder.cc - src/core/ext/transport/chttp2/transport/hpack_encoder_table.cc - src/core/ext/transport/chttp2/transport/hpack_parser.cc - src/core/ext/transport/chttp2/transport/hpack_parser_table.cc - src/core/ext/transport/chttp2/transport/http_trace.cc - src/core/ext/transport/chttp2/transport/huffsyms.cc - src/core/ext/transport/chttp2/transport/varint.cc - src/core/ext/upb-generated/google/protobuf/any.upb.c - src/core/ext/upb-generated/google/rpc/status.upb.c - src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c - src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c - src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c - src/core/lib/address_utils/parse_address.cc - src/core/lib/address_utils/sockaddr_utils.cc - src/core/lib/channel/channel_args.cc - src/core/lib/channel/channel_args_preconditioning.cc - src/core/lib/channel/channel_stack.cc - src/core/lib/channel/channel_stack_builder.cc - src/core/lib/channel/channel_stack_builder_impl.cc - src/core/lib/channel/channel_trace.cc - src/core/lib/channel/channelz.cc - src/core/lib/channel/channelz_registry.cc - src/core/lib/channel/connected_channel.cc - src/core/lib/channel/promise_based_filter.cc - src/core/lib/channel/status_util.cc - src/core/lib/compression/compression.cc - 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/histogram_view.cc - src/core/lib/debug/stats.cc - src/core/lib/debug/stats_data.cc - src/core/lib/debug/trace.cc - src/core/lib/event_engine/channel_args_endpoint_config.cc - src/core/lib/event_engine/default_event_engine.cc - src/core/lib/event_engine/default_event_engine_factory.cc - src/core/lib/event_engine/forkable.cc - src/core/lib/event_engine/memory_allocator.cc - src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc - src/core/lib/event_engine/posix_engine/ev_poll_posix.cc - src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc - src/core/lib/event_engine/posix_engine/internal_errqueue.cc - src/core/lib/event_engine/posix_engine/lockfree_event.cc - src/core/lib/event_engine/posix_engine/posix_endpoint.cc - src/core/lib/event_engine/posix_engine/posix_engine.cc - src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc - src/core/lib/event_engine/posix_engine/timer.cc - src/core/lib/event_engine/posix_engine/timer_heap.cc - src/core/lib/event_engine/posix_engine/timer_manager.cc - src/core/lib/event_engine/posix_engine/traced_buffer_list.cc - src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.cc - src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.cc - src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.cc - 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/event_engine/thread_pool.cc - src/core/lib/event_engine/time_util.cc - src/core/lib/event_engine/trace.cc - src/core/lib/event_engine/utils.cc - src/core/lib/event_engine/windows/iocp.cc - src/core/lib/event_engine/windows/win_socket.cc - src/core/lib/event_engine/windows/windows_engine.cc - src/core/lib/experiments/config.cc - src/core/lib/experiments/experiments.cc - src/core/lib/gprpp/load_file.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/handshaker/proxy_mapper_registry.cc - src/core/lib/iomgr/buffer_list.cc - src/core/lib/iomgr/call_combiner.cc - src/core/lib/iomgr/cfstream_handle.cc - src/core/lib/iomgr/combiner.cc - src/core/lib/iomgr/dualstack_socket_posix.cc - src/core/lib/iomgr/endpoint.cc - src/core/lib/iomgr/endpoint_cfstream.cc - src/core/lib/iomgr/endpoint_pair_posix.cc - src/core/lib/iomgr/endpoint_pair_windows.cc - src/core/lib/iomgr/error.cc - src/core/lib/iomgr/error_cfstream.cc - src/core/lib/iomgr/ev_apple.cc - src/core/lib/iomgr/ev_epoll1_linux.cc - src/core/lib/iomgr/ev_poll_posix.cc - src/core/lib/iomgr/ev_posix.cc - src/core/lib/iomgr/ev_windows.cc - src/core/lib/iomgr/exec_ctx.cc - 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 - src/core/lib/iomgr/iomgr_internal.cc - src/core/lib/iomgr/iomgr_posix.cc - src/core/lib/iomgr/iomgr_posix_cfstream.cc - src/core/lib/iomgr/iomgr_windows.cc - src/core/lib/iomgr/load_file.cc - src/core/lib/iomgr/lockfree_event.cc - src/core/lib/iomgr/polling_entity.cc - src/core/lib/iomgr/pollset.cc - src/core/lib/iomgr/pollset_set.cc - src/core/lib/iomgr/pollset_set_windows.cc - src/core/lib/iomgr/pollset_windows.cc - src/core/lib/iomgr/resolve_address.cc - src/core/lib/iomgr/resolve_address_posix.cc - src/core/lib/iomgr/resolve_address_windows.cc - src/core/lib/iomgr/sockaddr_utils_posix.cc - src/core/lib/iomgr/socket_factory_posix.cc - src/core/lib/iomgr/socket_mutator.cc - src/core/lib/iomgr/socket_utils_common_posix.cc - src/core/lib/iomgr/socket_utils_linux.cc - src/core/lib/iomgr/socket_utils_posix.cc - src/core/lib/iomgr/socket_utils_windows.cc - src/core/lib/iomgr/socket_windows.cc - src/core/lib/iomgr/tcp_client.cc - src/core/lib/iomgr/tcp_client_cfstream.cc - src/core/lib/iomgr/tcp_client_posix.cc - src/core/lib/iomgr/tcp_client_windows.cc - src/core/lib/iomgr/tcp_posix.cc - src/core/lib/iomgr/tcp_server.cc - src/core/lib/iomgr/tcp_server_posix.cc - src/core/lib/iomgr/tcp_server_utils_posix_common.cc - src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc - src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc - src/core/lib/iomgr/tcp_server_windows.cc - src/core/lib/iomgr/tcp_windows.cc - src/core/lib/iomgr/timer.cc - src/core/lib/iomgr/timer_generic.cc - src/core/lib/iomgr/timer_heap.cc - src/core/lib/iomgr/timer_manager.cc - src/core/lib/iomgr/unix_sockets_posix.cc - src/core/lib/iomgr/unix_sockets_posix_noop.cc - src/core/lib/iomgr/wakeup_fd_eventfd.cc - 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/json/json_reader.cc - src/core/lib/json/json_writer.cc - src/core/lib/load_balancing/lb_policy.cc - src/core/lib/load_balancing/lb_policy_registry.cc - src/core/lib/promise/activity.cc - src/core/lib/promise/pipe.cc - src/core/lib/resolver/resolver.cc - src/core/lib/resolver/resolver_registry.cc - src/core/lib/resolver/server_address.cc - src/core/lib/resource_quota/api.cc - src/core/lib/resource_quota/arena.cc - src/core/lib/resource_quota/memory_quota.cc - src/core/lib/resource_quota/periodic_update.cc - src/core/lib/resource_quota/resource_quota.cc - src/core/lib/resource_quota/thread_quota.cc - src/core/lib/resource_quota/trace.cc - src/core/lib/security/certificate_provider/certificate_provider_registry.cc - src/core/lib/security/credentials/alts/check_gcp_environment.cc - src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc - src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc - src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc - src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc - src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc - src/core/lib/security/credentials/alts/grpc_alts_credentials_server_options.cc - src/core/lib/service_config/service_config_parser.cc - src/core/lib/slice/b64.cc - src/core/lib/slice/percent_encoding.cc - src/core/lib/slice/slice.cc - src/core/lib/slice/slice_buffer.cc - src/core/lib/slice/slice_string_helpers.cc - src/core/lib/surface/api_trace.cc - src/core/lib/surface/builtins.cc - src/core/lib/surface/byte_buffer.cc - src/core/lib/surface/byte_buffer_reader.cc - src/core/lib/surface/call.cc - src/core/lib/surface/call_details.cc - src/core/lib/surface/call_log_batch.cc - src/core/lib/surface/call_trace.cc - src/core/lib/surface/channel.cc - src/core/lib/surface/channel_init.cc - src/core/lib/surface/channel_ping.cc - src/core/lib/surface/channel_stack_type.cc - src/core/lib/surface/completion_queue.cc - src/core/lib/surface/completion_queue_factory.cc - src/core/lib/surface/event_string.cc - src/core/lib/surface/init_internally.cc - src/core/lib/surface/lame_client.cc - src/core/lib/surface/metadata_array.cc - src/core/lib/surface/server.cc - src/core/lib/surface/validate_metadata.cc - src/core/lib/surface/version.cc - src/core/lib/transport/connectivity_state.cc - src/core/lib/transport/error_utils.cc - src/core/lib/transport/handshaker_registry.cc - src/core/lib/transport/metadata_batch.cc - src/core/lib/transport/parsed_metadata.cc - src/core/lib/transport/status_conversion.cc - 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/tsi/alts/handshaker/transport_security_common_api.cc - test/core/transport/chaotic_good/frame_test.cc + ${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(format_request_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util +) + + +endif() +if(gRPC_BUILD_TESTS) + +add_executable(frame_handler_test + test/core/tsi/alts/crypt/gsec_test_util.cc + test/core/tsi/alts/frame_protector/frame_handler_test.cc third_party/googletest/googletest/src/gtest-all.cc third_party/googletest/googlemock/src/gmock-all.cc ) -target_include_directories(frame_test +target_include_directories(frame_handler_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include @@ -10827,23 +10380,10 @@ target_include_directories(frame_test ${_gRPC_PROTO_GENS_DIR} ) -target_link_libraries(frame_test +target_link_libraries(frame_handler_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} - absl::cleanup - absl::flat_hash_map - absl::flat_hash_set - absl::inlined_vector - absl::any_invocable - absl::function_ref - absl::hash - absl::type_traits - absl::statusor - absl::span - absl::utility - gpr - upb + grpc_test_util ) @@ -10886,7 +10426,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) target_link_libraries(fuzzing_event_engine_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -10943,7 +10482,6 @@ target_include_directories(generic_end2end_test target_link_libraries(generic_end2end_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -10980,7 +10518,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(global_config_env_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -11017,7 +10554,6 @@ target_include_directories(global_config_test target_link_libraries(global_config_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -11054,7 +10590,6 @@ target_include_directories(google_c2p_resolver_test target_link_libraries(google_c2p_resolver_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -11091,7 +10626,6 @@ target_include_directories(google_mesh_ca_certificate_provider_factory_test target_link_libraries(google_mesh_ca_certificate_provider_factory_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -11128,7 +10662,6 @@ target_include_directories(graceful_shutdown_test target_link_libraries(graceful_shutdown_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -11176,7 +10709,6 @@ target_include_directories(grpc_alts_credentials_options_test target_link_libraries(grpc_alts_credentials_options_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -11224,7 +10756,6 @@ target_include_directories(grpc_authorization_engine_test target_link_libraries(grpc_authorization_engine_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -11274,7 +10805,6 @@ target_include_directories(grpc_authorization_policy_provider_test target_link_libraries(grpc_authorization_policy_provider_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -11330,7 +10860,6 @@ target_include_directories(grpc_authz_end2end_test target_link_libraries(grpc_authz_end2end_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -11366,7 +10895,6 @@ target_include_directories(grpc_byte_buffer_reader_test target_link_libraries(grpc_byte_buffer_reader_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -11412,7 +10940,6 @@ target_include_directories(grpc_cli target_link_libraries(grpc_cli ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::flags grpc++ @@ -11450,7 +10977,6 @@ target_include_directories(grpc_completion_queue_test target_link_libraries(grpc_completion_queue_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -11481,7 +11007,6 @@ target_include_directories(grpc_cpp_plugin target_link_libraries(grpc_cpp_plugin ${_gRPC_PROTOBUF_PROTOC_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_plugin_support ) @@ -11522,7 +11047,6 @@ target_include_directories(grpc_csharp_plugin target_link_libraries(grpc_csharp_plugin ${_gRPC_PROTOBUF_PROTOC_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_plugin_support ) @@ -11580,7 +11104,6 @@ target_include_directories(grpc_ipv6_loopback_available_test target_link_libraries(grpc_ipv6_loopback_available_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -11611,7 +11134,6 @@ target_include_directories(grpc_node_plugin target_link_libraries(grpc_node_plugin ${_gRPC_PROTOBUF_PROTOC_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_plugin_support ) @@ -11652,7 +11174,6 @@ target_include_directories(grpc_objective_c_plugin target_link_libraries(grpc_objective_c_plugin ${_gRPC_PROTOBUF_PROTOC_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_plugin_support ) @@ -11693,7 +11214,6 @@ target_include_directories(grpc_php_plugin target_link_libraries(grpc_php_plugin ${_gRPC_PROTOBUF_PROTOC_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_plugin_support ) @@ -11734,7 +11254,6 @@ target_include_directories(grpc_python_plugin target_link_libraries(grpc_python_plugin ${_gRPC_PROTOBUF_PROTOC_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_plugin_support ) @@ -11775,7 +11294,6 @@ target_include_directories(grpc_ruby_plugin target_link_libraries(grpc_ruby_plugin ${_gRPC_PROTOBUF_PROTOC_LIBRARIES} ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_plugin_support ) @@ -11833,7 +11351,6 @@ target_include_directories(grpc_tls_certificate_distributor_test target_link_libraries(grpc_tls_certificate_distributor_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -11881,7 +11398,6 @@ target_include_directories(grpc_tls_certificate_provider_test target_link_libraries(grpc_tls_certificate_provider_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -11929,7 +11445,6 @@ target_include_directories(grpc_tls_certificate_verifier_test target_link_libraries(grpc_tls_certificate_verifier_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -11977,7 +11492,6 @@ target_include_directories(grpc_tls_credentials_options_comparator_test target_link_libraries(grpc_tls_credentials_options_comparator_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -12025,7 +11539,6 @@ target_include_directories(grpc_tls_credentials_options_test target_link_libraries(grpc_tls_credentials_options_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -12084,7 +11597,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) target_link_libraries(grpc_tool_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_reflection grpc++_test_config @@ -12127,7 +11639,6 @@ target_include_directories(grpclb_api_test target_link_libraries(grpclb_api_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -12189,7 +11700,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(grpclb_end2end_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_config grpc++_test_util @@ -12228,7 +11738,6 @@ target_include_directories(h2_ssl_session_reuse_test target_link_libraries(h2_ssl_session_reuse_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -12266,7 +11775,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(handshake_server_with_readahead_handshaker_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -12305,7 +11813,6 @@ target_include_directories(head_of_line_blocking_bad_client_test target_link_libraries(head_of_line_blocking_bad_client_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -12343,7 +11850,6 @@ target_include_directories(headers_bad_client_test target_link_libraries(headers_bad_client_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -12405,7 +11911,6 @@ target_include_directories(health_service_end2end_test target_link_libraries(health_service_end2end_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -12453,7 +11958,6 @@ target_include_directories(histogram_test target_link_libraries(histogram_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -12489,7 +11993,6 @@ target_include_directories(host_port_test target_link_libraries(host_port_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -12537,7 +12040,6 @@ target_include_directories(hpack_encoder_test target_link_libraries(hpack_encoder_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -12585,7 +12087,6 @@ target_include_directories(hpack_parser_table_test target_link_libraries(hpack_parser_table_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -12633,7 +12134,6 @@ target_include_directories(hpack_parser_test target_link_libraries(hpack_parser_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -12681,7 +12181,6 @@ target_include_directories(http2_client target_link_libraries(http2_client ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_config grpc++_test_util @@ -12718,7 +12217,6 @@ target_include_directories(http_proxy_mapper_test target_link_libraries(http_proxy_mapper_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -12757,7 +12255,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(httpcli_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -12797,7 +12294,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(httpscli_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -12855,7 +12351,6 @@ target_include_directories(hybrid_end2end_test target_link_libraries(hybrid_end2end_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -12892,7 +12387,6 @@ target_include_directories(idle_filter_state_test target_link_libraries(idle_filter_state_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} ) @@ -12927,7 +12421,6 @@ target_include_directories(if_test target_link_libraries(if_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::type_traits absl::statusor @@ -12965,7 +12458,6 @@ target_include_directories(init_test target_link_libraries(init_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -13003,7 +12495,6 @@ target_include_directories(initial_settings_frame_bad_client_test target_link_libraries(initial_settings_frame_bad_client_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -13051,7 +12542,6 @@ target_include_directories(insecure_security_connector_test target_link_libraries(insecure_security_connector_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -13102,7 +12592,6 @@ target_include_directories(interop_client target_link_libraries(interop_client ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_config grpc++_test_util @@ -13153,7 +12642,6 @@ target_include_directories(interop_server target_link_libraries(interop_server ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_config grpc++_test_util @@ -13192,7 +12680,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX OR _gRPC_PLATFORM_WINDOWS) target_link_libraries(iocp_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -13234,7 +12721,6 @@ target_include_directories(istio_echo_server_test target_link_libraries(istio_echo_server_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++ grpc_test_util @@ -13272,7 +12758,6 @@ target_include_directories(join_test target_link_libraries(join_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::type_traits absl::strings @@ -13311,7 +12796,6 @@ target_include_directories(json_object_loader_test target_link_libraries(json_object_loader_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -13347,7 +12831,6 @@ target_include_directories(json_test target_link_libraries(json_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -13395,7 +12878,6 @@ target_include_directories(json_token_test target_link_libraries(json_token_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -13443,7 +12925,6 @@ target_include_directories(jwt_verifier_test target_link_libraries(jwt_verifier_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -13480,7 +12961,6 @@ target_include_directories(lame_client_test target_link_libraries(lame_client_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -13518,7 +12998,6 @@ target_include_directories(large_metadata_bad_client_test target_link_libraries(large_metadata_bad_client_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -13555,7 +13034,6 @@ target_include_directories(latch_test target_link_libraries(latch_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::type_traits absl::statusor @@ -13598,7 +13076,6 @@ target_include_directories(lb_get_cpu_stats_test target_link_libraries(lb_get_cpu_stats_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -13635,7 +13112,6 @@ target_include_directories(lb_load_data_store_test target_link_libraries(lb_load_data_store_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++ grpc_test_util @@ -13673,7 +13149,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(lock_free_event_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -13710,7 +13185,6 @@ target_include_directories(log_test target_link_libraries(log_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -13746,7 +13220,6 @@ target_include_directories(loop_test target_link_libraries(loop_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::type_traits absl::status @@ -13810,8 +13283,8 @@ target_include_directories(map_pipe_test target_link_libraries(map_pipe_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} + absl::flat_hash_set absl::any_invocable absl::function_ref absl::hash @@ -13853,7 +13326,6 @@ target_include_directories(match_test target_link_libraries(match_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::variant ) @@ -13901,7 +13373,6 @@ target_include_directories(matchers_test target_link_libraries(matchers_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -13938,7 +13409,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) target_link_libraries(memory_quota_stress_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util_unsecure ) @@ -13975,7 +13445,6 @@ target_include_directories(memory_quota_test target_link_libraries(memory_quota_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util_unsecure ) @@ -14028,7 +13497,6 @@ target_include_directories(message_allocator_end2end_test target_link_libraries(message_allocator_end2end_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -14076,7 +13544,6 @@ target_include_directories(message_compress_test target_link_libraries(message_compress_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -14112,7 +13579,6 @@ target_include_directories(message_size_service_config_test target_link_libraries(message_size_service_config_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -14160,7 +13626,6 @@ target_include_directories(metadata_map_test target_link_libraries(metadata_map_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -14196,7 +13661,6 @@ target_include_directories(miscompile_with_no_unique_address_test target_link_libraries(miscompile_with_no_unique_address_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} ) @@ -14247,7 +13711,6 @@ target_include_directories(mock_stream_test target_link_libraries(mock_stream_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test grpc++_test_util @@ -14304,7 +13767,6 @@ target_include_directories(mock_test target_link_libraries(mock_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test grpc++_test_util @@ -14342,7 +13804,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(mpscq_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -14379,7 +13840,6 @@ target_include_directories(no_destruct_test target_link_libraries(no_destruct_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} ) @@ -14430,7 +13890,6 @@ target_include_directories(nonblocking_test target_link_libraries(nonblocking_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -14466,7 +13925,6 @@ target_include_directories(notification_test target_link_libraries(notification_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} gpr ) @@ -14502,7 +13960,6 @@ target_include_directories(num_external_connectivity_watchers_test target_link_libraries(num_external_connectivity_watchers_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -14539,7 +13996,6 @@ target_include_directories(observable_test target_link_libraries(observable_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::flat_hash_set absl::hash @@ -14586,7 +14042,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(oracle_event_engine_posix_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -14632,7 +14087,6 @@ target_include_directories(orca_service_end2end_test target_link_libraries(orca_service_end2end_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -14668,7 +14122,6 @@ target_include_directories(orphanable_test target_link_libraries(orphanable_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -14706,7 +14159,6 @@ target_include_directories(out_of_bounds_bad_client_test target_link_libraries(out_of_bounds_bad_client_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -14742,7 +14194,6 @@ target_include_directories(outlier_detection_lb_config_parser_test target_link_libraries(outlier_detection_lb_config_parser_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -14778,7 +14229,6 @@ target_include_directories(outlier_detection_test target_link_libraries(outlier_detection_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -14814,7 +14264,6 @@ target_include_directories(overload_test target_link_libraries(overload_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} ) @@ -14849,7 +14298,6 @@ target_include_directories(parse_address_test target_link_libraries(parse_address_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -14886,7 +14334,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(parse_address_with_named_scope_id_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -14923,7 +14370,6 @@ target_include_directories(parsed_metadata_test target_link_libraries(parsed_metadata_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -14975,7 +14421,6 @@ target_include_directories(parser_test target_link_libraries(parser_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -15011,7 +14456,6 @@ target_include_directories(percent_encoding_test target_link_libraries(percent_encoding_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -15061,7 +14505,6 @@ target_include_directories(periodic_update_test target_link_libraries(periodic_update_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::any_invocable absl::function_ref @@ -15102,7 +14545,6 @@ target_include_directories(pick_first_test target_link_libraries(pick_first_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -15150,7 +14592,6 @@ target_include_directories(pid_controller_test target_link_libraries(pid_controller_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -15210,7 +14651,6 @@ target_include_directories(pipe_test target_link_libraries(pipe_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::any_invocable absl::function_ref @@ -15253,7 +14693,6 @@ target_include_directories(poll_test target_link_libraries(poll_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::variant ) @@ -15306,7 +14745,6 @@ target_include_directories(port_sharing_end2end_test target_link_libraries(port_sharing_end2end_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -15347,7 +14785,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(posix_endpoint_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -15386,7 +14823,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(posix_engine_listener_utils_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -15427,7 +14863,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(posix_event_engine_connect_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -15470,7 +14905,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(posix_event_engine_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -15507,7 +14941,6 @@ target_include_directories(promise_factory_test target_link_libraries(promise_factory_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::bind_front absl::type_traits @@ -15547,7 +14980,6 @@ target_include_directories(promise_map_test target_link_libraries(promise_map_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::type_traits absl::status @@ -15586,7 +15018,6 @@ target_include_directories(promise_test target_link_libraries(promise_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::type_traits absl::status @@ -15647,7 +15078,6 @@ target_include_directories(proto_server_reflection_test target_link_libraries(proto_server_reflection_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_reflection grpc++_test_util @@ -15684,7 +15114,6 @@ target_include_directories(proto_utils_test target_link_libraries(proto_utils_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++ grpc_test_util @@ -15762,7 +15191,6 @@ target_include_directories(qps_json_driver target_link_libraries(qps_json_driver ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_config grpc++_test_util @@ -15832,7 +15260,6 @@ target_include_directories(qps_worker target_link_libraries(qps_worker ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_config grpc++_test_util @@ -15869,7 +15296,6 @@ target_include_directories(race_test target_link_libraries(race_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::variant ) @@ -15926,7 +15352,6 @@ target_include_directories(raw_end2end_test target_link_libraries(raw_end2end_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -15962,7 +15387,6 @@ target_include_directories(rbac_service_config_parser_test target_link_libraries(rbac_service_config_parser_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -16012,7 +15436,6 @@ target_include_directories(rbac_translator_test target_link_libraries(rbac_translator_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -16048,7 +15471,6 @@ target_include_directories(ref_counted_ptr_test target_link_libraries(ref_counted_ptr_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -16084,7 +15506,6 @@ target_include_directories(ref_counted_test target_link_libraries(ref_counted_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -16121,7 +15542,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(remove_stream_from_stalled_lists_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -16171,7 +15591,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(resolve_address_using_ares_resolver_posix_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::flags absl::flags_parse @@ -16223,7 +15642,6 @@ target_include_directories(resolve_address_using_ares_resolver_test target_link_libraries(resolve_address_using_ares_resolver_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util grpc++_test_config @@ -16273,7 +15691,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(resolve_address_using_native_resolver_posix_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::flags absl::flags_parse @@ -16325,7 +15742,6 @@ target_include_directories(resolve_address_using_native_resolver_test target_link_libraries(resolve_address_using_native_resolver_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util grpc++_test_config @@ -16362,7 +15778,6 @@ target_include_directories(resource_quota_test target_link_libraries(resource_quota_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util_unsecure ) @@ -16398,7 +15813,6 @@ target_include_directories(retry_service_config_test target_link_libraries(retry_service_config_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -16434,7 +15848,6 @@ target_include_directories(retry_throttle_test target_link_libraries(retry_throttle_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -16497,7 +15910,6 @@ target_include_directories(rls_end2end_test target_link_libraries(rls_end2end_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_config grpc++_test_util @@ -16534,7 +15946,6 @@ target_include_directories(rls_lb_config_parser_test target_link_libraries(rls_lb_config_parser_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -16570,7 +15981,6 @@ target_include_directories(secure_auth_context_test target_link_libraries(secure_auth_context_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -16606,7 +16016,6 @@ target_include_directories(secure_channel_create_test target_link_libraries(secure_channel_create_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -16655,7 +16064,6 @@ target_include_directories(secure_endpoint_test target_link_libraries(secure_endpoint_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -16703,7 +16111,6 @@ target_include_directories(security_connector_test target_link_libraries(security_connector_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -16739,7 +16146,6 @@ target_include_directories(seq_test target_link_libraries(seq_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::type_traits absl::variant @@ -16777,7 +16183,6 @@ target_include_directories(sequential_connectivity_test target_link_libraries(sequential_connectivity_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -16834,7 +16239,6 @@ target_include_directories(server_builder_plugin_test target_link_libraries(server_builder_plugin_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -16899,7 +16303,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(server_builder_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_unsecure grpc_test_util_unsecure @@ -16966,7 +16369,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(server_builder_with_socket_mutator_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_unsecure grpc_test_util_unsecure @@ -17004,7 +16406,6 @@ target_include_directories(server_chttp2_test target_link_libraries(server_chttp2_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -17040,7 +16441,6 @@ target_include_directories(server_config_selector_test target_link_libraries(server_config_selector_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -17076,7 +16476,6 @@ target_include_directories(server_context_test_spouse_test target_link_libraries(server_context_test_spouse_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test grpc++_test_util @@ -17129,7 +16528,6 @@ target_include_directories(server_early_return_test target_link_libraries(server_early_return_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -17183,7 +16581,6 @@ target_include_directories(server_interceptors_end2end_test target_link_libraries(server_interceptors_end2end_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -17221,7 +16618,6 @@ target_include_directories(server_registered_method_bad_client_test target_link_libraries(server_registered_method_bad_client_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -17286,7 +16682,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(server_request_call_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_unsecure grpc_test_util_unsecure @@ -17326,7 +16721,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(server_ssl_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -17363,7 +16757,6 @@ target_include_directories(server_test target_link_libraries(server_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -17420,7 +16813,6 @@ target_include_directories(service_config_end2end_test target_link_libraries(service_config_end2end_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -17456,7 +16848,6 @@ target_include_directories(service_config_test target_link_libraries(service_config_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -17504,7 +16895,6 @@ target_include_directories(settings_timeout_test target_link_libraries(settings_timeout_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -17560,7 +16950,6 @@ target_include_directories(shutdown_test target_link_libraries(shutdown_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -17598,7 +16987,6 @@ target_include_directories(simple_request_bad_client_test target_link_libraries(simple_request_bad_client_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -17634,7 +17022,6 @@ target_include_directories(single_set_ptr_test target_link_libraries(single_set_ptr_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} gpr ) @@ -17670,7 +17057,6 @@ target_include_directories(sleep_test target_link_libraries(sleep_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc ) @@ -17708,7 +17094,6 @@ target_include_directories(slice_string_helpers_test target_link_libraries(slice_string_helpers_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::any_invocable absl::hash @@ -17747,7 +17132,6 @@ target_include_directories(smoke_test target_link_libraries(smoke_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util_unsecure ) @@ -17783,7 +17167,6 @@ target_include_directories(sockaddr_resolver_test target_link_libraries(sockaddr_resolver_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -17819,7 +17202,6 @@ target_include_directories(sockaddr_utils_test target_link_libraries(sockaddr_utils_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -17868,7 +17250,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(socket_utils_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -17905,7 +17286,6 @@ target_include_directories(sorted_pack_test target_link_libraries(sorted_pack_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} ) @@ -17940,7 +17320,6 @@ target_include_directories(spinlock_test target_link_libraries(spinlock_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -17988,7 +17367,6 @@ target_include_directories(ssl_credentials_test target_link_libraries(ssl_credentials_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -18026,7 +17404,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(ssl_transport_security_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -18064,7 +17441,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(stack_tracer_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -18101,7 +17477,6 @@ target_include_directories(stat_test target_link_libraries(stat_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -18137,7 +17512,6 @@ target_include_directories(stats_test target_link_libraries(stats_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -18185,7 +17559,6 @@ target_include_directories(status_conversion_test target_link_libraries(status_conversion_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -18221,7 +17594,6 @@ target_include_directories(status_helper_test target_link_libraries(status_helper_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -18257,7 +17629,6 @@ target_include_directories(status_util_test target_link_libraries(status_util_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -18307,7 +17678,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(stranded_event_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -18344,7 +17714,6 @@ target_include_directories(stream_leak_with_queued_flow_control_update_test target_link_libraries(stream_leak_with_queued_flow_control_update_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -18392,7 +17761,6 @@ target_include_directories(stream_map_test target_link_libraries(stream_map_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -18449,7 +17817,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(streaming_throughput_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -18499,7 +17866,6 @@ target_include_directories(streams_not_seen_test target_link_libraries(streams_not_seen_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -18535,7 +17901,6 @@ target_include_directories(string_ref_test target_link_libraries(string_ref_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++ grpc_test_util @@ -18572,7 +17937,6 @@ target_include_directories(string_test target_link_libraries(string_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -18608,7 +17972,6 @@ target_include_directories(sync_test target_link_libraries(sync_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -18656,7 +18019,6 @@ target_include_directories(system_roots_test target_link_libraries(system_roots_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -18692,7 +18054,6 @@ target_include_directories(table_test target_link_libraries(table_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::type_traits absl::strings @@ -18745,7 +18106,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(tcp_client_posix_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -18783,7 +18143,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(tcp_posix_socket_utils_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -18833,7 +18192,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(tcp_server_posix_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -18874,7 +18232,6 @@ target_include_directories(test_core_event_engine_posix_timer_heap_test target_link_libraries(test_core_event_engine_posix_timer_heap_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::any_invocable absl::statusor @@ -18916,7 +18273,6 @@ target_include_directories(test_core_event_engine_posix_timer_list_test target_link_libraries(test_core_event_engine_posix_timer_list_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::any_invocable absl::statusor @@ -18960,7 +18316,6 @@ target_include_directories(test_core_event_engine_slice_buffer_test target_link_libraries(test_core_event_engine_slice_buffer_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::flat_hash_set absl::any_invocable @@ -19001,7 +18356,6 @@ target_include_directories(test_core_gpr_time_test target_link_libraries(test_core_gpr_time_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -19037,7 +18391,6 @@ target_include_directories(test_core_gprpp_load_file_test target_link_libraries(test_core_gprpp_load_file_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -19074,7 +18427,6 @@ target_include_directories(test_core_gprpp_time_test target_link_libraries(test_core_gprpp_time_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::any_invocable absl::statusor @@ -19124,7 +18476,6 @@ target_include_directories(test_core_iomgr_load_file_test target_link_libraries(test_core_iomgr_load_file_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -19172,7 +18523,6 @@ target_include_directories(test_core_iomgr_timer_heap_test target_link_libraries(test_core_iomgr_timer_heap_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -19220,7 +18570,6 @@ target_include_directories(test_core_security_credentials_test target_link_libraries(test_core_security_credentials_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -19256,7 +18605,6 @@ target_include_directories(test_core_slice_slice_buffer_test target_link_libraries(test_core_slice_slice_buffer_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -19293,7 +18641,6 @@ target_include_directories(test_core_slice_slice_test target_link_libraries(test_core_slice_slice_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc ) @@ -19330,7 +18677,6 @@ target_include_directories(test_cpp_client_credentials_test target_link_libraries(test_cpp_client_credentials_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++ grpc_test_util @@ -19368,7 +18714,6 @@ target_include_directories(test_cpp_server_credentials_test target_link_libraries(test_cpp_server_credentials_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++ grpc_test_util @@ -19405,7 +18750,6 @@ target_include_directories(test_cpp_util_slice_test target_link_libraries(test_cpp_util_slice_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -19441,7 +18785,6 @@ target_include_directories(test_cpp_util_time_test target_link_libraries(test_cpp_util_time_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -19477,7 +18820,6 @@ target_include_directories(thd_test target_link_libraries(thd_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -19513,7 +18855,6 @@ target_include_directories(thread_manager_test target_link_libraries(thread_manager_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_config grpc++_test_util @@ -19553,7 +18894,6 @@ target_include_directories(thread_pool_test target_link_libraries(thread_pool_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::flat_hash_set absl::any_invocable @@ -19593,7 +18933,6 @@ target_include_directories(thread_quota_test target_link_libraries(thread_quota_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} gpr ) @@ -19650,7 +18989,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(thread_stress_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -19688,7 +19026,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(time_jump_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++ grpc_test_util @@ -19726,7 +19063,6 @@ target_include_directories(time_util_test target_link_libraries(time_util_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -19774,7 +19110,6 @@ target_include_directories(timeout_encoding_test target_link_libraries(timeout_encoding_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -19810,7 +19145,6 @@ target_include_directories(timer_manager_test target_link_libraries(timer_manager_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -19846,7 +19180,6 @@ target_include_directories(timer_test target_link_libraries(timer_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++ grpc_test_util @@ -19884,7 +19217,6 @@ target_include_directories(tls_certificate_verifier_test target_link_libraries(tls_certificate_verifier_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++ grpc_test_util @@ -19937,7 +19269,6 @@ target_include_directories(tls_key_export_test target_link_libraries(tls_key_export_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -19985,7 +19316,6 @@ target_include_directories(tls_security_connector_test target_link_libraries(tls_security_connector_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -20022,7 +19352,6 @@ target_include_directories(too_many_pings_test target_link_libraries(too_many_pings_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_config grpc++_test_util @@ -20060,7 +19389,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(traced_buffer_list_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -20097,7 +19425,6 @@ target_include_directories(transport_security_common_api_test target_link_libraries(transport_security_common_api_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -20133,7 +19460,6 @@ target_include_directories(transport_security_test target_link_libraries(transport_security_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -20235,7 +19561,6 @@ target_include_directories(transport_stream_receiver_test target_link_libraries(transport_stream_receiver_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -20293,7 +19618,6 @@ target_include_directories(try_concurrently_test target_link_libraries(try_concurrently_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::any_invocable absl::function_ref @@ -20336,7 +19660,6 @@ target_include_directories(try_join_test target_link_libraries(try_join_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::type_traits absl::status @@ -20377,7 +19700,6 @@ target_include_directories(try_seq_metadata_test target_link_libraries(try_seq_metadata_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc ) @@ -20413,7 +19735,6 @@ target_include_directories(try_seq_test target_link_libraries(try_seq_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::type_traits absl::status @@ -20453,7 +19774,6 @@ target_include_directories(unique_type_name_test target_link_libraries(unique_type_name_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::str_format absl::strings @@ -20493,7 +19813,6 @@ target_include_directories(unknown_frame_bad_client_test target_link_libraries(unknown_frame_bad_client_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -20529,7 +19848,6 @@ target_include_directories(uri_parser_test target_link_libraries(uri_parser_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util_unsecure ) @@ -20565,7 +19883,6 @@ target_include_directories(useful_test target_link_libraries(useful_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::strings absl::variant @@ -20602,7 +19919,6 @@ target_include_directories(validation_errors_test target_link_libraries(validation_errors_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -20638,7 +19954,6 @@ target_include_directories(varint_test target_link_libraries(varint_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -20675,7 +19990,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(wakeup_fd_posix_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -20714,7 +20028,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX OR _gRPC_PLATFORM_WINDOWS) target_link_libraries(win_socket_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -20753,7 +20066,6 @@ target_include_directories(window_overflow_bad_client_test target_link_libraries(window_overflow_bad_client_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -20856,7 +20168,6 @@ target_include_directories(wire_reader_test target_link_libraries(wire_reader_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -20959,7 +20270,6 @@ target_include_directories(wire_writer_test target_link_libraries(wire_writer_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -20996,7 +20306,6 @@ target_include_directories(work_queue_test target_link_libraries(work_queue_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util_unsecure ) @@ -21033,7 +20342,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(work_serializer_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -21099,7 +20407,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(writes_per_rpc_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++ grpc_test_util @@ -21137,7 +20444,6 @@ target_include_directories(xds_bootstrap_test target_link_libraries(xds_bootstrap_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -21173,7 +20479,6 @@ target_include_directories(xds_certificate_provider_test target_link_libraries(xds_certificate_provider_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -21222,7 +20527,6 @@ target_include_directories(xds_client_test target_link_libraries(xds_client_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -21384,7 +20688,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(xds_cluster_end2end_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -21481,7 +20784,6 @@ target_include_directories(xds_cluster_resource_type_test target_link_libraries(xds_cluster_resource_type_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -21647,7 +20949,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(xds_cluster_type_end2end_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -21725,7 +21026,6 @@ target_include_directories(xds_common_types_test target_link_libraries(xds_common_types_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::flags grpc++ @@ -21888,7 +21188,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(xds_core_end2end_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -21942,7 +21241,6 @@ target_include_directories(xds_credentials_end2end_test target_link_libraries(xds_credentials_end2end_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -21990,7 +21288,6 @@ target_include_directories(xds_credentials_test target_link_libraries(xds_credentials_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -22160,7 +21457,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(xds_csds_end2end_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -22338,7 +21634,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(xds_end2end_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_config grpc++_test_util @@ -22392,7 +21687,6 @@ target_include_directories(xds_endpoint_resource_type_test target_link_libraries(xds_endpoint_resource_type_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc_test_util ) @@ -22561,7 +21855,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(xds_fault_injection_end2end_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -22671,7 +21964,6 @@ target_include_directories(xds_http_filters_test target_link_libraries(xds_http_filters_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::flags grpc++ @@ -22739,7 +22031,6 @@ target_include_directories(xds_interop_client target_link_libraries(xds_interop_client ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::flags grpc++_reflection @@ -22814,7 +22105,6 @@ target_include_directories(xds_interop_server target_link_libraries(xds_interop_server ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::flags grpc++_reflection @@ -22915,7 +22205,6 @@ target_include_directories(xds_lb_policy_registry_test target_link_libraries(xds_lb_policy_registry_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::flags grpc++ @@ -23050,7 +22339,6 @@ target_include_directories(xds_listener_resource_type_test target_link_libraries(xds_listener_resource_type_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::flags grpc++ @@ -23221,7 +22509,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(xds_outlier_detection_end2end_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -23388,7 +22675,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(xds_ring_hash_end2end_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -23559,7 +22845,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(xds_rls_end2end_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) @@ -23721,7 +23006,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(xds_routing_end2end_test ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc++_test_util ) diff --git a/Makefile b/Makefile index adf47644f40..708a41ea273 100644 --- a/Makefile +++ b/Makefile @@ -1051,7 +1051,6 @@ LIBGRPC_SRC = \ src/core/ext/transport/chttp2/transport/hpack_parser.cc \ src/core/ext/transport/chttp2/transport/hpack_parser_table.cc \ src/core/ext/transport/chttp2/transport/http2_settings.cc \ - src/core/ext/transport/chttp2/transport/http_trace.cc \ src/core/ext/transport/chttp2/transport/huffsyms.cc \ src/core/ext/transport/chttp2/transport/parsing.cc \ src/core/ext/transport/chttp2/transport/stream_lists.cc \ @@ -1859,7 +1858,6 @@ LIBGRPC_UNSECURE_SRC = \ src/core/ext/transport/chttp2/transport/hpack_parser.cc \ src/core/ext/transport/chttp2/transport/hpack_parser_table.cc \ src/core/ext/transport/chttp2/transport/http2_settings.cc \ - src/core/ext/transport/chttp2/transport/http_trace.cc \ src/core/ext/transport/chttp2/transport/huffsyms.cc \ src/core/ext/transport/chttp2/transport/parsing.cc \ src/core/ext/transport/chttp2/transport/stream_lists.cc \ diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index b0f745f3fc6..d08ad91399c 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -399,7 +399,6 @@ libs: - src/core/ext/transport/chttp2/transport/hpack_parser.h - src/core/ext/transport/chttp2/transport/hpack_parser_table.h - src/core/ext/transport/chttp2/transport/http2_settings.h - - src/core/ext/transport/chttp2/transport/http_trace.h - src/core/ext/transport/chttp2/transport/huffsyms.h - src/core/ext/transport/chttp2/transport/internal.h - src/core/ext/transport/chttp2/transport/stream_map.h @@ -1140,7 +1139,6 @@ libs: - src/core/ext/transport/chttp2/transport/hpack_parser.cc - src/core/ext/transport/chttp2/transport/hpack_parser_table.cc - src/core/ext/transport/chttp2/transport/http2_settings.cc - - src/core/ext/transport/chttp2/transport/http_trace.cc - src/core/ext/transport/chttp2/transport/huffsyms.cc - src/core/ext/transport/chttp2/transport/parsing.cc - src/core/ext/transport/chttp2/transport/stream_lists.cc @@ -1962,7 +1960,6 @@ libs: - src/core/ext/transport/chttp2/transport/hpack_parser.h - src/core/ext/transport/chttp2/transport/hpack_parser_table.h - src/core/ext/transport/chttp2/transport/http2_settings.h - - src/core/ext/transport/chttp2/transport/http_trace.h - src/core/ext/transport/chttp2/transport/huffsyms.h - src/core/ext/transport/chttp2/transport/internal.h - src/core/ext/transport/chttp2/transport/stream_map.h @@ -2344,7 +2341,6 @@ libs: - src/core/ext/transport/chttp2/transport/hpack_parser.cc - src/core/ext/transport/chttp2/transport/hpack_parser_table.cc - src/core/ext/transport/chttp2/transport/http2_settings.cc - - src/core/ext/transport/chttp2/transport/http_trace.cc - src/core/ext/transport/chttp2/transport/huffsyms.cc - src/core/ext/transport/chttp2/transport/parsing.cc - src/core/ext/transport/chttp2/transport/stream_lists.cc @@ -6368,11 +6364,13 @@ targets: - src/core/lib/promise/join.h - src/core/lib/promise/loop.h - src/core/lib/promise/map.h + - src/core/lib/promise/observable.h - src/core/lib/promise/pipe.h - src/core/lib/promise/poll.h - src/core/lib/promise/race.h - src/core/lib/promise/seq.h - src/core/lib/promise/try_seq.h + - src/core/lib/promise/wait_set.h - src/core/lib/resource_quota/arena.h - src/core/lib/resource_quota/memory_quota.h - src/core/lib/resource_quota/periodic_update.h @@ -6412,6 +6410,7 @@ targets: - src/core/lib/slice/slice_string_helpers.cc - test/core/promise/for_each_test.cc deps: + - absl/container:flat_hash_set - absl/functional:any_invocable - absl/functional:function_ref - absl/hash:hash @@ -6499,502 +6498,6 @@ targets: - test/core/tsi/alts/frame_protector/frame_handler_test.cc deps: - grpc_test_util -- name: frame_header_test - gtest: true - build: test - language: c++ - headers: - - src/core/ext/transport/chaotic_good/frame_header.h - - src/core/lib/gpr/useful.h - - src/core/lib/gprpp/bitset.h - src: - - src/core/ext/transport/chaotic_good/frame_header.cc - - test/core/transport/chaotic_good/frame_header_test.cc - deps: - - absl/status:status - - absl/status:statusor - - absl/strings:strings - - absl/types:variant -- name: frame_test - gtest: true - build: test - language: c++ - headers: - - src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h - - src/core/ext/transport/chaotic_good/frame.h - - src/core/ext/transport/chaotic_good/frame_header.h - - src/core/ext/transport/chttp2/transport/bin_encoder.h - - src/core/ext/transport/chttp2/transport/decode_huff.h - - src/core/ext/transport/chttp2/transport/frame.h - - src/core/ext/transport/chttp2/transport/hpack_constants.h - - src/core/ext/transport/chttp2/transport/hpack_encoder.h - - src/core/ext/transport/chttp2/transport/hpack_encoder_table.h - - src/core/ext/transport/chttp2/transport/hpack_parser.h - - src/core/ext/transport/chttp2/transport/hpack_parser_table.h - - src/core/ext/transport/chttp2/transport/http_trace.h - - src/core/ext/transport/chttp2/transport/huffsyms.h - - src/core/ext/transport/chttp2/transport/varint.h - - src/core/ext/upb-generated/google/protobuf/any.upb.h - - src/core/ext/upb-generated/google/rpc/status.upb.h - - src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.h - - src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.h - - src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.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/channel/call_finalization.h - - src/core/lib/channel/call_tracer.h - - src/core/lib/channel/channel_args.h - - src/core/lib/channel/channel_args_preconditioning.h - - src/core/lib/channel/channel_fwd.h - - src/core/lib/channel/channel_stack.h - - src/core/lib/channel/channel_stack_builder.h - - src/core/lib/channel/channel_stack_builder_impl.h - - src/core/lib/channel/channel_trace.h - - src/core/lib/channel/channelz.h - - src/core/lib/channel/channelz_registry.h - - src/core/lib/channel/connected_channel.h - - src/core/lib/channel/context.h - - src/core/lib/channel/promise_based_filter.h - - src/core/lib/channel/status_util.h - - 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/histogram_view.h - - src/core/lib/debug/stats.h - - src/core/lib/debug/stats_data.h - - src/core/lib/debug/trace.h - - src/core/lib/event_engine/channel_args_endpoint_config.h - - src/core/lib/event_engine/common_closures.h - - src/core/lib/event_engine/default_event_engine.h - - src/core/lib/event_engine/default_event_engine_factory.h - - src/core/lib/event_engine/executor/executor.h - - src/core/lib/event_engine/forkable.h - - src/core/lib/event_engine/handle_containers.h - - src/core/lib/event_engine/poller.h - - src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h - - src/core/lib/event_engine/posix_engine/ev_poll_posix.h - - src/core/lib/event_engine/posix_engine/event_poller.h - - src/core/lib/event_engine/posix_engine/event_poller_posix_default.h - - src/core/lib/event_engine/posix_engine/internal_errqueue.h - - src/core/lib/event_engine/posix_engine/lockfree_event.h - - src/core/lib/event_engine/posix_engine/posix_endpoint.h - - src/core/lib/event_engine/posix_engine/posix_engine.h - - src/core/lib/event_engine/posix_engine/posix_engine_closure.h - - src/core/lib/event_engine/posix_engine/tcp_socket_utils.h - - src/core/lib/event_engine/posix_engine/timer.h - - src/core/lib/event_engine/posix_engine/timer_heap.h - - src/core/lib/event_engine/posix_engine/timer_manager.h - - src/core/lib/event_engine/posix_engine/traced_buffer_list.h - - src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.h - - src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h - - src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h - - src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h - - src/core/lib/event_engine/socket_notifier.h - - src/core/lib/event_engine/thread_pool.h - - src/core/lib/event_engine/time_util.h - - src/core/lib/event_engine/trace.h - - src/core/lib/event_engine/utils.h - - src/core/lib/event_engine/windows/iocp.h - - src/core/lib/event_engine/windows/win_socket.h - - src/core/lib/event_engine/windows/windows_engine.h - - src/core/lib/experiments/config.h - - src/core/lib/experiments/experiments.h - - src/core/lib/gpr/spinlock.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/debug_location.h - - src/core/lib/gprpp/dual_ref_counted.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/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/unique_type_name.h - - src/core/lib/gprpp/validation_errors.h - - src/core/lib/gprpp/work_serializer.h - - src/core/lib/handshaker/proxy_mapper.h - - src/core/lib/handshaker/proxy_mapper_registry.h - - src/core/lib/iomgr/block_annotate.h - - src/core/lib/iomgr/buffer_list.h - - src/core/lib/iomgr/call_combiner.h - - src/core/lib/iomgr/cfstream_handle.h - - src/core/lib/iomgr/closure.h - - src/core/lib/iomgr/combiner.h - - src/core/lib/iomgr/dynamic_annotations.h - - src/core/lib/iomgr/endpoint.h - - src/core/lib/iomgr/endpoint_cfstream.h - - src/core/lib/iomgr/endpoint_pair.h - - src/core/lib/iomgr/error.h - - src/core/lib/iomgr/error_cfstream.h - - src/core/lib/iomgr/ev_apple.h - - 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/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 - - src/core/lib/iomgr/iomgr_fwd.h - - src/core/lib/iomgr/iomgr_internal.h - - src/core/lib/iomgr/load_file.h - - src/core/lib/iomgr/lockfree_event.h - - src/core/lib/iomgr/nameser.h - - src/core/lib/iomgr/polling_entity.h - - src/core/lib/iomgr/pollset.h - - src/core/lib/iomgr/pollset_set.h - - src/core/lib/iomgr/pollset_set_windows.h - - src/core/lib/iomgr/pollset_windows.h - - src/core/lib/iomgr/port.h - - src/core/lib/iomgr/python_util.h - - src/core/lib/iomgr/resolve_address.h - - src/core/lib/iomgr/resolve_address_impl.h - - src/core/lib/iomgr/resolve_address_posix.h - - src/core/lib/iomgr/resolve_address_windows.h - - src/core/lib/iomgr/resolved_address.h - - src/core/lib/iomgr/sockaddr.h - - src/core/lib/iomgr/sockaddr_posix.h - - src/core/lib/iomgr/sockaddr_windows.h - - src/core/lib/iomgr/socket_factory_posix.h - - src/core/lib/iomgr/socket_mutator.h - - src/core/lib/iomgr/socket_utils.h - - src/core/lib/iomgr/socket_utils_posix.h - - src/core/lib/iomgr/socket_windows.h - - src/core/lib/iomgr/tcp_client.h - - src/core/lib/iomgr/tcp_client_posix.h - - src/core/lib/iomgr/tcp_posix.h - - src/core/lib/iomgr/tcp_server.h - - src/core/lib/iomgr/tcp_server_utils_posix.h - - src/core/lib/iomgr/tcp_windows.h - - src/core/lib/iomgr/timer.h - - src/core/lib/iomgr/timer_generic.h - - src/core/lib/iomgr/timer_heap.h - - src/core/lib/iomgr/timer_manager.h - - src/core/lib/iomgr/unix_sockets_posix.h - - src/core/lib/iomgr/wakeup_fd_pipe.h - - src/core/lib/iomgr/wakeup_fd_posix.h - - src/core/lib/json/json.h - - src/core/lib/load_balancing/lb_policy.h - - src/core/lib/load_balancing/lb_policy_factory.h - - src/core/lib/load_balancing/lb_policy_registry.h - - src/core/lib/load_balancing/subchannel_interface.h - - src/core/lib/promise/activity.h - - src/core/lib/promise/arena_promise.h - - src/core/lib/promise/context.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/status.h - - src/core/lib/promise/detail/switch.h - - src/core/lib/promise/exec_ctx_wakeup_scheduler.h - - src/core/lib/promise/intra_activity_waiter.h - - src/core/lib/promise/latch.h - - src/core/lib/promise/loop.h - - src/core/lib/promise/map.h - - src/core/lib/promise/pipe.h - - src/core/lib/promise/poll.h - - src/core/lib/promise/promise.h - - src/core/lib/promise/race.h - - src/core/lib/promise/seq.h - - src/core/lib/resolver/resolver.h - - src/core/lib/resolver/resolver_factory.h - - src/core/lib/resolver/resolver_registry.h - - src/core/lib/resolver/server_address.h - - src/core/lib/resource_quota/api.h - - src/core/lib/resource_quota/arena.h - - src/core/lib/resource_quota/memory_quota.h - - src/core/lib/resource_quota/periodic_update.h - - src/core/lib/resource_quota/resource_quota.h - - src/core/lib/resource_quota/thread_quota.h - - src/core/lib/resource_quota/trace.h - - src/core/lib/security/certificate_provider/certificate_provider_factory.h - - src/core/lib/security/certificate_provider/certificate_provider_registry.h - - src/core/lib/security/credentials/alts/check_gcp_environment.h - - src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h - - src/core/lib/security/credentials/channel_creds_registry.h - - src/core/lib/service_config/service_config.h - - src/core/lib/service_config/service_config_call_data.h - - src/core/lib/service_config/service_config_parser.h - - src/core/lib/slice/b64.h - - src/core/lib/slice/percent_encoding.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/surface/api_trace.h - - src/core/lib/surface/builtins.h - - src/core/lib/surface/call.h - - src/core/lib/surface/call_test_only.h - - src/core/lib/surface/call_trace.h - - src/core/lib/surface/channel.h - - src/core/lib/surface/channel_init.h - - src/core/lib/surface/channel_stack_type.h - - src/core/lib/surface/completion_queue.h - - src/core/lib/surface/completion_queue_factory.h - - src/core/lib/surface/event_string.h - - src/core/lib/surface/init.h - - src/core/lib/surface/init_internally.h - - src/core/lib/surface/lame_client.h - - src/core/lib/surface/server.h - - src/core/lib/surface/validate_metadata.h - - src/core/lib/transport/connectivity_state.h - - src/core/lib/transport/error_utils.h - - src/core/lib/transport/handshaker_factory.h - - src/core/lib/transport/handshaker_registry.h - - src/core/lib/transport/http2_errors.h - - src/core/lib/transport/metadata_batch.h - - src/core/lib/transport/parsed_metadata.h - - src/core/lib/transport/status_conversion.h - - src/core/lib/transport/timeout_encoding.h - - src/core/lib/transport/transport.h - - src/core/lib/transport/transport_fwd.h - - src/core/lib/transport/transport_impl.h - - src/core/lib/uri/uri_parser.h - - src/core/tsi/alts/handshaker/transport_security_common_api.h - src: - - src/core/ext/transport/chaotic_good/frame.cc - - src/core/ext/transport/chaotic_good/frame_header.cc - - src/core/ext/transport/chttp2/transport/bin_encoder.cc - - src/core/ext/transport/chttp2/transport/decode_huff.cc - - src/core/ext/transport/chttp2/transport/hpack_encoder.cc - - src/core/ext/transport/chttp2/transport/hpack_encoder_table.cc - - src/core/ext/transport/chttp2/transport/hpack_parser.cc - - src/core/ext/transport/chttp2/transport/hpack_parser_table.cc - - src/core/ext/transport/chttp2/transport/http_trace.cc - - src/core/ext/transport/chttp2/transport/huffsyms.cc - - src/core/ext/transport/chttp2/transport/varint.cc - - src/core/ext/upb-generated/google/protobuf/any.upb.c - - src/core/ext/upb-generated/google/rpc/status.upb.c - - src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c - - src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c - - src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c - - src/core/lib/address_utils/parse_address.cc - - src/core/lib/address_utils/sockaddr_utils.cc - - src/core/lib/channel/channel_args.cc - - src/core/lib/channel/channel_args_preconditioning.cc - - src/core/lib/channel/channel_stack.cc - - src/core/lib/channel/channel_stack_builder.cc - - src/core/lib/channel/channel_stack_builder_impl.cc - - src/core/lib/channel/channel_trace.cc - - src/core/lib/channel/channelz.cc - - src/core/lib/channel/channelz_registry.cc - - src/core/lib/channel/connected_channel.cc - - src/core/lib/channel/promise_based_filter.cc - - src/core/lib/channel/status_util.cc - - src/core/lib/compression/compression.cc - - 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/histogram_view.cc - - src/core/lib/debug/stats.cc - - src/core/lib/debug/stats_data.cc - - src/core/lib/debug/trace.cc - - src/core/lib/event_engine/channel_args_endpoint_config.cc - - src/core/lib/event_engine/default_event_engine.cc - - src/core/lib/event_engine/default_event_engine_factory.cc - - src/core/lib/event_engine/forkable.cc - - src/core/lib/event_engine/memory_allocator.cc - - src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc - - src/core/lib/event_engine/posix_engine/ev_poll_posix.cc - - src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc - - src/core/lib/event_engine/posix_engine/internal_errqueue.cc - - src/core/lib/event_engine/posix_engine/lockfree_event.cc - - src/core/lib/event_engine/posix_engine/posix_endpoint.cc - - src/core/lib/event_engine/posix_engine/posix_engine.cc - - src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc - - src/core/lib/event_engine/posix_engine/timer.cc - - src/core/lib/event_engine/posix_engine/timer_heap.cc - - src/core/lib/event_engine/posix_engine/timer_manager.cc - - src/core/lib/event_engine/posix_engine/traced_buffer_list.cc - - src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.cc - - src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.cc - - src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.cc - - 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/event_engine/thread_pool.cc - - src/core/lib/event_engine/time_util.cc - - src/core/lib/event_engine/trace.cc - - src/core/lib/event_engine/utils.cc - - src/core/lib/event_engine/windows/iocp.cc - - src/core/lib/event_engine/windows/win_socket.cc - - src/core/lib/event_engine/windows/windows_engine.cc - - src/core/lib/experiments/config.cc - - src/core/lib/experiments/experiments.cc - - src/core/lib/gprpp/load_file.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/handshaker/proxy_mapper_registry.cc - - src/core/lib/iomgr/buffer_list.cc - - src/core/lib/iomgr/call_combiner.cc - - src/core/lib/iomgr/cfstream_handle.cc - - src/core/lib/iomgr/combiner.cc - - src/core/lib/iomgr/dualstack_socket_posix.cc - - src/core/lib/iomgr/endpoint.cc - - src/core/lib/iomgr/endpoint_cfstream.cc - - src/core/lib/iomgr/endpoint_pair_posix.cc - - src/core/lib/iomgr/endpoint_pair_windows.cc - - src/core/lib/iomgr/error.cc - - src/core/lib/iomgr/error_cfstream.cc - - src/core/lib/iomgr/ev_apple.cc - - src/core/lib/iomgr/ev_epoll1_linux.cc - - src/core/lib/iomgr/ev_poll_posix.cc - - src/core/lib/iomgr/ev_posix.cc - - src/core/lib/iomgr/ev_windows.cc - - src/core/lib/iomgr/exec_ctx.cc - - 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 - - src/core/lib/iomgr/iomgr_internal.cc - - src/core/lib/iomgr/iomgr_posix.cc - - src/core/lib/iomgr/iomgr_posix_cfstream.cc - - src/core/lib/iomgr/iomgr_windows.cc - - src/core/lib/iomgr/load_file.cc - - src/core/lib/iomgr/lockfree_event.cc - - src/core/lib/iomgr/polling_entity.cc - - src/core/lib/iomgr/pollset.cc - - src/core/lib/iomgr/pollset_set.cc - - src/core/lib/iomgr/pollset_set_windows.cc - - src/core/lib/iomgr/pollset_windows.cc - - src/core/lib/iomgr/resolve_address.cc - - src/core/lib/iomgr/resolve_address_posix.cc - - src/core/lib/iomgr/resolve_address_windows.cc - - src/core/lib/iomgr/sockaddr_utils_posix.cc - - src/core/lib/iomgr/socket_factory_posix.cc - - src/core/lib/iomgr/socket_mutator.cc - - src/core/lib/iomgr/socket_utils_common_posix.cc - - src/core/lib/iomgr/socket_utils_linux.cc - - src/core/lib/iomgr/socket_utils_posix.cc - - src/core/lib/iomgr/socket_utils_windows.cc - - src/core/lib/iomgr/socket_windows.cc - - src/core/lib/iomgr/tcp_client.cc - - src/core/lib/iomgr/tcp_client_cfstream.cc - - src/core/lib/iomgr/tcp_client_posix.cc - - src/core/lib/iomgr/tcp_client_windows.cc - - src/core/lib/iomgr/tcp_posix.cc - - src/core/lib/iomgr/tcp_server.cc - - src/core/lib/iomgr/tcp_server_posix.cc - - src/core/lib/iomgr/tcp_server_utils_posix_common.cc - - src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc - - src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc - - src/core/lib/iomgr/tcp_server_windows.cc - - src/core/lib/iomgr/tcp_windows.cc - - src/core/lib/iomgr/timer.cc - - src/core/lib/iomgr/timer_generic.cc - - src/core/lib/iomgr/timer_heap.cc - - src/core/lib/iomgr/timer_manager.cc - - src/core/lib/iomgr/unix_sockets_posix.cc - - src/core/lib/iomgr/unix_sockets_posix_noop.cc - - src/core/lib/iomgr/wakeup_fd_eventfd.cc - - 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/json/json_reader.cc - - src/core/lib/json/json_writer.cc - - src/core/lib/load_balancing/lb_policy.cc - - src/core/lib/load_balancing/lb_policy_registry.cc - - src/core/lib/promise/activity.cc - - src/core/lib/promise/pipe.cc - - src/core/lib/resolver/resolver.cc - - src/core/lib/resolver/resolver_registry.cc - - src/core/lib/resolver/server_address.cc - - src/core/lib/resource_quota/api.cc - - src/core/lib/resource_quota/arena.cc - - src/core/lib/resource_quota/memory_quota.cc - - src/core/lib/resource_quota/periodic_update.cc - - src/core/lib/resource_quota/resource_quota.cc - - src/core/lib/resource_quota/thread_quota.cc - - src/core/lib/resource_quota/trace.cc - - src/core/lib/security/certificate_provider/certificate_provider_registry.cc - - src/core/lib/security/credentials/alts/check_gcp_environment.cc - - src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc - - src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc - - src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc - - src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc - - src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc - - src/core/lib/security/credentials/alts/grpc_alts_credentials_server_options.cc - - src/core/lib/service_config/service_config_parser.cc - - src/core/lib/slice/b64.cc - - src/core/lib/slice/percent_encoding.cc - - src/core/lib/slice/slice.cc - - src/core/lib/slice/slice_buffer.cc - - src/core/lib/slice/slice_string_helpers.cc - - src/core/lib/surface/api_trace.cc - - src/core/lib/surface/builtins.cc - - src/core/lib/surface/byte_buffer.cc - - src/core/lib/surface/byte_buffer_reader.cc - - src/core/lib/surface/call.cc - - src/core/lib/surface/call_details.cc - - src/core/lib/surface/call_log_batch.cc - - src/core/lib/surface/call_trace.cc - - src/core/lib/surface/channel.cc - - src/core/lib/surface/channel_init.cc - - src/core/lib/surface/channel_ping.cc - - src/core/lib/surface/channel_stack_type.cc - - src/core/lib/surface/completion_queue.cc - - src/core/lib/surface/completion_queue_factory.cc - - src/core/lib/surface/event_string.cc - - src/core/lib/surface/init_internally.cc - - src/core/lib/surface/lame_client.cc - - src/core/lib/surface/metadata_array.cc - - src/core/lib/surface/server.cc - - src/core/lib/surface/validate_metadata.cc - - src/core/lib/surface/version.cc - - src/core/lib/transport/connectivity_state.cc - - src/core/lib/transport/error_utils.cc - - src/core/lib/transport/handshaker_registry.cc - - src/core/lib/transport/metadata_batch.cc - - src/core/lib/transport/parsed_metadata.cc - - src/core/lib/transport/status_conversion.cc - - 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/tsi/alts/handshaker/transport_security_common_api.cc - - test/core/transport/chaotic_good/frame_test.cc - deps: - - absl/cleanup:cleanup - - absl/container:flat_hash_map - - absl/container:flat_hash_set - - absl/container:inlined_vector - - absl/functional:any_invocable - - absl/functional:function_ref - - absl/hash:hash - - absl/meta:type_traits - - absl/status:statusor - - absl/types:span - - absl/utility:utility - - gpr - - upb - name: fuzzing_event_engine_test gtest: true build: test @@ -8308,11 +7811,13 @@ targets: - src/core/lib/promise/loop.h - src/core/lib/promise/map.h - src/core/lib/promise/map_pipe.h + - src/core/lib/promise/observable.h - src/core/lib/promise/pipe.h - src/core/lib/promise/poll.h - src/core/lib/promise/race.h - src/core/lib/promise/seq.h - src/core/lib/promise/try_seq.h + - src/core/lib/promise/wait_set.h - src/core/lib/resource_quota/arena.h - src/core/lib/resource_quota/memory_quota.h - src/core/lib/resource_quota/periodic_update.h @@ -8352,6 +7857,7 @@ targets: - src/core/lib/slice/slice_string_helpers.cc - test/core/promise/map_pipe_test.cc deps: + - absl/container:flat_hash_set - absl/functional:any_invocable - absl/functional:function_ref - absl/hash:hash @@ -8958,6 +8464,7 @@ targets: - src/core/lib/promise/map.h - src/core/lib/promise/pipe.h - src/core/lib/promise/poll.h + - src/core/lib/promise/promise.h - src/core/lib/promise/race.h - src/core/lib/promise/seq.h - src/core/lib/resource_quota/arena.h diff --git a/config.m4 b/config.m4 index 8b4079d2397..c29b736935e 100644 --- a/config.m4 +++ b/config.m4 @@ -133,7 +133,6 @@ if test "$PHP_GRPC" != "no"; then src/core/ext/transport/chttp2/transport/hpack_parser.cc \ src/core/ext/transport/chttp2/transport/hpack_parser_table.cc \ src/core/ext/transport/chttp2/transport/http2_settings.cc \ - src/core/ext/transport/chttp2/transport/http_trace.cc \ src/core/ext/transport/chttp2/transport/huffsyms.cc \ src/core/ext/transport/chttp2/transport/parsing.cc \ src/core/ext/transport/chttp2/transport/stream_lists.cc \ diff --git a/config.w32 b/config.w32 index 2997f08ee57..583161bc457 100644 --- a/config.w32 +++ b/config.w32 @@ -99,7 +99,6 @@ if (PHP_GRPC != "no") { "src\\core\\ext\\transport\\chttp2\\transport\\hpack_parser.cc " + "src\\core\\ext\\transport\\chttp2\\transport\\hpack_parser_table.cc " + "src\\core\\ext\\transport\\chttp2\\transport\\http2_settings.cc " + - "src\\core\\ext\\transport\\chttp2\\transport\\http_trace.cc " + "src\\core\\ext\\transport\\chttp2\\transport\\huffsyms.cc " + "src\\core\\ext\\transport\\chttp2\\transport\\parsing.cc " + "src\\core\\ext\\transport\\chttp2\\transport\\stream_lists.cc " + diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index c4c400a636c..8b67b06d49c 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -343,7 +343,6 @@ Pod::Spec.new do |s| 'src/core/ext/transport/chttp2/transport/hpack_parser.h', 'src/core/ext/transport/chttp2/transport/hpack_parser_table.h', 'src/core/ext/transport/chttp2/transport/http2_settings.h', - 'src/core/ext/transport/chttp2/transport/http_trace.h', 'src/core/ext/transport/chttp2/transport/huffsyms.h', 'src/core/ext/transport/chttp2/transport/internal.h', 'src/core/ext/transport/chttp2/transport/stream_map.h', @@ -1228,7 +1227,6 @@ Pod::Spec.new do |s| 'src/core/ext/transport/chttp2/transport/hpack_parser.h', 'src/core/ext/transport/chttp2/transport/hpack_parser_table.h', 'src/core/ext/transport/chttp2/transport/http2_settings.h', - 'src/core/ext/transport/chttp2/transport/http_trace.h', 'src/core/ext/transport/chttp2/transport/huffsyms.h', 'src/core/ext/transport/chttp2/transport/internal.h', 'src/core/ext/transport/chttp2/transport/stream_map.h', diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index b3626bbad11..b805be9485a 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -369,8 +369,6 @@ Pod::Spec.new do |s| 'src/core/ext/transport/chttp2/transport/hpack_parser_table.h', 'src/core/ext/transport/chttp2/transport/http2_settings.cc', 'src/core/ext/transport/chttp2/transport/http2_settings.h', - 'src/core/ext/transport/chttp2/transport/http_trace.cc', - 'src/core/ext/transport/chttp2/transport/http_trace.h', 'src/core/ext/transport/chttp2/transport/huffsyms.cc', 'src/core/ext/transport/chttp2/transport/huffsyms.h', 'src/core/ext/transport/chttp2/transport/internal.h', @@ -1867,7 +1865,6 @@ Pod::Spec.new do |s| 'src/core/ext/transport/chttp2/transport/hpack_parser.h', 'src/core/ext/transport/chttp2/transport/hpack_parser_table.h', 'src/core/ext/transport/chttp2/transport/http2_settings.h', - 'src/core/ext/transport/chttp2/transport/http_trace.h', 'src/core/ext/transport/chttp2/transport/huffsyms.h', 'src/core/ext/transport/chttp2/transport/internal.h', 'src/core/ext/transport/chttp2/transport/stream_map.h', diff --git a/grpc.gemspec b/grpc.gemspec index aae37ed49f9..78b73fce800 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -280,8 +280,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/ext/transport/chttp2/transport/hpack_parser_table.h ) s.files += %w( src/core/ext/transport/chttp2/transport/http2_settings.cc ) s.files += %w( src/core/ext/transport/chttp2/transport/http2_settings.h ) - s.files += %w( src/core/ext/transport/chttp2/transport/http_trace.cc ) - s.files += %w( src/core/ext/transport/chttp2/transport/http_trace.h ) s.files += %w( src/core/ext/transport/chttp2/transport/huffsyms.cc ) s.files += %w( src/core/ext/transport/chttp2/transport/huffsyms.h ) s.files += %w( src/core/ext/transport/chttp2/transport/internal.h ) diff --git a/grpc.gyp b/grpc.gyp index 6c0ff88f1a3..682b776a3dc 100644 --- a/grpc.gyp +++ b/grpc.gyp @@ -465,7 +465,6 @@ 'src/core/ext/transport/chttp2/transport/hpack_parser.cc', 'src/core/ext/transport/chttp2/transport/hpack_parser_table.cc', 'src/core/ext/transport/chttp2/transport/http2_settings.cc', - 'src/core/ext/transport/chttp2/transport/http_trace.cc', 'src/core/ext/transport/chttp2/transport/huffsyms.cc', 'src/core/ext/transport/chttp2/transport/parsing.cc', 'src/core/ext/transport/chttp2/transport/stream_lists.cc', @@ -1220,7 +1219,6 @@ 'src/core/ext/transport/chttp2/transport/hpack_parser.cc', 'src/core/ext/transport/chttp2/transport/hpack_parser_table.cc', 'src/core/ext/transport/chttp2/transport/http2_settings.cc', - 'src/core/ext/transport/chttp2/transport/http_trace.cc', 'src/core/ext/transport/chttp2/transport/huffsyms.cc', 'src/core/ext/transport/chttp2/transport/parsing.cc', 'src/core/ext/transport/chttp2/transport/stream_lists.cc', diff --git a/package.xml b/package.xml index 8fc86b42133..375a67208df 100644 --- a/package.xml +++ b/package.xml @@ -262,8 +262,6 @@ - - diff --git a/src/core/BUILD b/src/core/BUILD index b96f2698334..88ea93587b6 100644 --- a/src/core/BUILD +++ b/src/core/BUILD @@ -4625,7 +4625,6 @@ grpc_cc_library( "time", "transport_fwd", "unique_type_name", - "//:chttp2_frame", "//:config", "//:debug_location", "//:gpr", @@ -4679,54 +4678,6 @@ grpc_cc_library( ], ) -grpc_cc_library( - name = "chaotic_good_frame", - srcs = [ - "ext/transport/chaotic_good/frame.cc", - ], - hdrs = [ - "ext/transport/chaotic_good/frame.h", - ], - external_deps = [ - "absl/status", - "absl/status:statusor", - "absl/types:variant", - ], - deps = [ - "arena", - "bitset", - "chaotic_good_frame_header", - "context", - "no_destruct", - "slice", - "slice_buffer", - "status_helper", - "//:gpr", - "//:gpr_platform", - "//:grpc_base", - "//:hpack_encoder", - "//:hpack_parser", - ], -) - -grpc_cc_library( - name = "chaotic_good_frame_header", - srcs = [ - "ext/transport/chaotic_good/frame_header.cc", - ], - hdrs = [ - "ext/transport/chaotic_good/frame_header.h", - ], - external_deps = [ - "absl/status", - "absl/status:statusor", - ], - deps = [ - "bitset", - "//:gpr_platform", - ], -) - ### UPB Targets grpc_upb_proto_library( diff --git a/src/core/ext/transport/chaotic_good/frame.cc b/src/core/ext/transport/chaotic_good/frame.cc deleted file mode 100644 index ad260793d72..00000000000 --- a/src/core/ext/transport/chaotic_good/frame.cc +++ /dev/null @@ -1,307 +0,0 @@ -// Copyright 2022 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 - -#include "src/core/ext/transport/chaotic_good/frame.h" - -#include - -#include -#include - -#include "absl/status/status.h" -#include "absl/status/statusor.h" - -#include -#include - -#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/slice/slice.h" -#include "src/core/lib/slice/slice_buffer.h" - -namespace grpc_core { -namespace chaotic_good { - -namespace { -const NoDestruct kZeroSlice{[] { - auto slice = GRPC_SLICE_MALLOC(64); - memset(GRPC_SLICE_START_PTR(slice), 0, 64); - return slice; -}()}; - -class FrameSerializer { - public: - explicit FrameSerializer(FrameType type, uint32_t stream_id) - : header_{type, {}, stream_id, 0, 0, 0} { - output_.AppendIndexed(kZeroSlice->Copy()); - } - // If called, must be called before AddMessage, AddTrailers, Finish - SliceBuffer& AddHeaders() { - GPR_ASSERT(last_added_ == nullptr); - header_.flags.set(0); - return Start(&header_.header_length); - } - // If called, must be called before AddTrailers, Finish - SliceBuffer& AddMessage() { - MaybeCommitLast(); - header_.flags.set(1); - return Start(&header_.message_length); - } - // If called, must be called before Finish - SliceBuffer& AddTrailers() { - MaybeCommitLast(); - header_.flags.set(2); - return Start(&header_.trailer_length); - } - - SliceBuffer Finish() { - MaybeCommitLast(); - header_.Serialize( - GRPC_SLICE_START_PTR(output_.c_slice_buffer()->slices[0])); - return std::move(output_); - } - - private: - SliceBuffer& Start(uint32_t* length_field) { - last_added_ = length_field; - length_at_last_added_ = output_.Length(); - return output_; - } - - void MaybeCommitLast() { - if (last_added_ == nullptr) return; - *last_added_ = output_.Length() - length_at_last_added_; - if (output_.Length() % 64 != 0) { - output_.Append(kZeroSlice->RefSubSlice(0, 64 - output_.Length() % 64)); - } - } - - FrameHeader header_; - - uint32_t* last_added_ = nullptr; - size_t length_at_last_added_; - SliceBuffer output_; -}; - -class FrameDeserializer { - public: - FrameDeserializer(const FrameHeader& header, SliceBuffer& input) - : header_(header), input_(input) {} - const FrameHeader& header() const { return header_; } - // If called, must be called before ReceiveMessage, ReceiveTrailers - absl::StatusOr ReceiveHeaders() { - return Take(header_.header_length); - } - // If called, must be called before ReceiveTrailers - absl::StatusOr ReceiveMessage() { - return Take(header_.message_length); - } - // If called, must be called before Finish - absl::StatusOr ReceiveTrailers() { - return Take(header_.trailer_length); - } - - absl::Status Finish() { return absl::OkStatus(); } - - private: - absl::StatusOr Take(uint32_t length) { - if (length == 0) return SliceBuffer{}; - if (input_.Length() < length) { - return absl::InvalidArgumentError( - "Frame too short (insufficient payload)"); - } - SliceBuffer out; - input_.MoveFirstNBytesIntoSliceBuffer(length, out); - if (length % 64 != 0) { - const uint32_t padding_length = 64 - length % 64; - if (input_.Length() < padding_length) { - return absl::InvalidArgumentError( - "Frame too short (insufficient padding)"); - } - uint8_t padding[64]; - input_.MoveFirstNBytesIntoBuffer(padding_length, padding); - for (uint32_t i = 0; i < padding_length; i++) { - if (padding[i] != 0) { - return absl::InvalidArgumentError("Frame padding not zero"); - } - } - } - return std::move(out); - } - FrameHeader header_; - SliceBuffer& input_; -}; - -template -absl::StatusOr> ReadMetadata( - HPackParser* parser, absl::StatusOr maybe_slices, - uint32_t stream_id, bool is_header, bool is_client) { - if (!maybe_slices.ok()) return maybe_slices.status(); - auto& slices = *maybe_slices; - Arena::PoolPtr metadata; - parser->BeginFrame( - metadata.get(), std::numeric_limits::max(), - is_header ? HPackParser::Boundary::EndOfHeaders - : HPackParser::Boundary::EndOfStream, - HPackParser::Priority::None, - HPackParser::LogInfo{stream_id, - is_header ? HPackParser::LogInfo::Type::kHeaders - : HPackParser::LogInfo::Type::kTrailers, - is_client}); - for (size_t i = 0; i < slices.Count(); i++) { - GRPC_RETURN_IF_ERROR( - parser->Parse(slices.c_slice_at(i), i == slices.Count() - 1)); - } - parser->FinishFrame(); - return std::move(metadata); -} -} // namespace - -absl::Status SettingsFrame::Deserialize(HPackParser*, const FrameHeader& header, - SliceBuffer& slice_buffer) { - if (header.type != FrameType::kSettings) { - return absl::InvalidArgumentError("Expected settings frame"); - } - if (header.flags.any()) { - return absl::InvalidArgumentError("Unexpected flags"); - } - FrameDeserializer deserializer(header, slice_buffer); - return deserializer.Finish(); -} - -SliceBuffer SettingsFrame::Serialize(HPackCompressor*) const { - FrameSerializer serializer(FrameType::kSettings, 0); - return serializer.Finish(); -} - -absl::Status ClientFragmentFrame::Deserialize(HPackParser* parser, - const FrameHeader& header, - SliceBuffer& slice_buffer) { - if (header.stream_id == 0) { - return absl::InvalidArgumentError("Expected non-zero stream id"); - } - stream_id = header.stream_id; - if (header.type != FrameType::kFragment) { - return absl::InvalidArgumentError("Expected fragment frame"); - } - FrameDeserializer deserializer(header, slice_buffer); - if (header.flags.is_set(0)) { - auto r = ReadMetadata(parser, deserializer.ReceiveHeaders(), - header.stream_id, true, true); - if (!r.ok()) return r.status(); - } - if (header.flags.is_set(1)) { - message = GetContext()->MakePooled(); - auto r = deserializer.ReceiveMessage(); - if (!r.ok()) return r.status(); - r->Swap(message->payload()); - } - if (header.flags.is_set(2)) { - if (header.trailer_length != 0) { - return absl::InvalidArgumentError("Unexpected trailer length"); - } - end_of_stream = true; - } else { - end_of_stream = false; - } - return deserializer.Finish(); -} - -SliceBuffer ClientFragmentFrame::Serialize(HPackCompressor* encoder) const { - GPR_ASSERT(stream_id != 0); - FrameSerializer serializer(FrameType::kFragment, stream_id); - if (headers.get() != nullptr) { - encoder->EncodeRawHeaders(*headers.get(), serializer.AddHeaders()); - } - if (message.get() != nullptr) { - serializer.AddMessage().Append(*message->payload()); - } - if (end_of_stream) { - serializer.AddTrailers(); - } - return serializer.Finish(); -} - -absl::Status ServerFragmentFrame::Deserialize(HPackParser* parser, - const FrameHeader& header, - SliceBuffer& slice_buffer) { - if (header.stream_id == 0) { - return absl::InvalidArgumentError("Expected non-zero stream id"); - } - stream_id = header.stream_id; - if (header.type != FrameType::kFragment) { - return absl::InvalidArgumentError("Expected fragment frame"); - } - FrameDeserializer deserializer(header, slice_buffer); - if (header.flags.is_set(0)) { - auto r = ReadMetadata(parser, deserializer.ReceiveHeaders(), - header.stream_id, true, false); - if (!r.ok()) return r.status(); - } - if (header.flags.is_set(1)) { - message = GetContext()->MakePooled(); - auto r = deserializer.ReceiveMessage(); - if (!r.ok()) return r.status(); - r->Swap(message->payload()); - } - if (header.flags.is_set(2)) { - auto r = ReadMetadata( - parser, deserializer.ReceiveTrailers(), header.stream_id, false, false); - } - return deserializer.Finish(); -} - -SliceBuffer ServerFragmentFrame::Serialize(HPackCompressor* encoder) const { - GPR_ASSERT(stream_id != 0); - FrameSerializer serializer(FrameType::kFragment, stream_id); - if (headers.get() != nullptr) { - encoder->EncodeRawHeaders(*headers.get(), serializer.AddHeaders()); - } - if (message.get() != nullptr) { - serializer.AddMessage().Append(*message->payload()); - } - if (trailers.get() != nullptr) { - encoder->EncodeRawHeaders(*trailers.get(), serializer.AddTrailers()); - } - return serializer.Finish(); -} - -absl::Status CancelFrame::Deserialize(HPackParser*, const FrameHeader& header, - SliceBuffer& slice_buffer) { - if (header.type != FrameType::kCancel) { - return absl::InvalidArgumentError("Expected cancel frame"); - } - if (header.flags.any()) { - return absl::InvalidArgumentError("Unexpected flags"); - } - if (header.stream_id == 0) { - return absl::InvalidArgumentError("Expected non-zero stream id"); - } - FrameDeserializer deserializer(header, slice_buffer); - stream_id = header.stream_id; - return deserializer.Finish(); -} - -SliceBuffer CancelFrame::Serialize(HPackCompressor*) const { - GPR_ASSERT(stream_id != 0); - FrameSerializer serializer(FrameType::kCancel, stream_id); - return serializer.Finish(); -} - -} // namespace chaotic_good -} // namespace grpc_core diff --git a/src/core/ext/transport/chaotic_good/frame.h b/src/core/ext/transport/chaotic_good/frame.h deleted file mode 100644 index f7c5ca84fd3..00000000000 --- a/src/core/ext/transport/chaotic_good/frame.h +++ /dev/null @@ -1,122 +0,0 @@ -// Copyright 2022 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. - -#ifndef GRPC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_FRAME_H -#define GRPC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_FRAME_H - -#include - -#include -#include -#include - -#include "absl/status/status.h" -#include "absl/types/variant.h" - -#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/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" - -namespace grpc_core { -namespace chaotic_good { - -class FrameInterface { - public: - virtual absl::Status Deserialize(HPackParser* parser, - const FrameHeader& header, - SliceBuffer& slice_buffer) = 0; - virtual SliceBuffer Serialize(HPackCompressor* encoder) const = 0; - - protected: - static bool EqVal(const Message& a, const Message& b) { - return a.payload()->JoinIntoString() == b.payload()->JoinIntoString() && - a.flags() == b.flags(); - } - static bool EqVal(const grpc_metadata_batch& a, - const grpc_metadata_batch& b) { - return a.DebugString() == b.DebugString(); - } - template - static bool EqHdl(const Arena::PoolPtr& a, const Arena::PoolPtr& b) { - if (a == nullptr && b == nullptr) return true; - if (a == nullptr || b == nullptr) return false; - return EqVal(*a, *b); - } - ~FrameInterface() = default; -}; - -struct SettingsFrame final : public FrameInterface { - absl::Status Deserialize(HPackParser* parser, const FrameHeader& header, - SliceBuffer& slice_buffer) override; - SliceBuffer Serialize(HPackCompressor* encoder) const override; - - bool operator==(const SettingsFrame&) const { return true; } -}; - -struct ClientFragmentFrame final : public FrameInterface { - absl::Status Deserialize(HPackParser* parser, const FrameHeader& header, - SliceBuffer& slice_buffer) override; - SliceBuffer Serialize(HPackCompressor* encoder) const override; - - uint32_t stream_id; - ClientMetadataHandle headers; - MessageHandle message; - bool end_of_stream = false; - - bool operator==(const ClientFragmentFrame& other) const { - return stream_id == other.stream_id && EqHdl(headers, other.headers) && - EqHdl(message, other.message) && - end_of_stream == other.end_of_stream; - } -}; - -struct ServerFragmentFrame final : public FrameInterface { - absl::Status Deserialize(HPackParser* parser, const FrameHeader& header, - SliceBuffer& slice_buffer) override; - SliceBuffer Serialize(HPackCompressor* encoder) const override; - - uint32_t stream_id; - ServerMetadataHandle headers; - MessageHandle message; - ServerMetadataHandle trailers; - - bool operator==(const ServerFragmentFrame& other) const { - return stream_id == other.stream_id && EqHdl(headers, other.headers) && - EqHdl(message, other.message) && EqHdl(trailers, other.trailers); - } -}; - -struct CancelFrame final : public FrameInterface { - absl::Status Deserialize(HPackParser* parser, const FrameHeader& header, - SliceBuffer& slice_buffer) override; - SliceBuffer Serialize(HPackCompressor* encoder) const override; - - uint32_t stream_id; - - bool operator==(const CancelFrame& other) const { - return stream_id == other.stream_id; - } -}; - -using ClientFrame = absl::variant; -using ServerFrame = absl::variant; - -} // namespace chaotic_good -} // namespace grpc_core - -#endif // GRPC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_FRAME_H diff --git a/src/core/ext/transport/chaotic_good/frame_header.cc b/src/core/ext/transport/chaotic_good/frame_header.cc deleted file mode 100644 index d33578a2079..00000000000 --- a/src/core/ext/transport/chaotic_good/frame_header.cc +++ /dev/null @@ -1,87 +0,0 @@ -// Copyright 2022 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 - -#include "src/core/ext/transport/chaotic_good/frame_header.h" - -#include - -#include - -#include "absl/status/status.h" - -namespace grpc_core { -namespace chaotic_good { - -namespace { -void WriteLittleEndianUint32(uint32_t value, uint8_t* data) { - data[0] = static_cast(value); - data[1] = static_cast(value >> 8); - data[2] = static_cast(value >> 16); - data[3] = static_cast(value >> 24); -} - -uint32_t ReadLittleEndianUint32(const uint8_t* data) { - return static_cast(data[0]) | - (static_cast(data[1]) << 8) | - (static_cast(data[2]) << 16) | - (static_cast(data[3]) << 24); -} -} // namespace - -void FrameHeader::Serialize(uint8_t* data) const { - WriteLittleEndianUint32( - static_cast(type) | (flags.ToInt() << 8), data); - WriteLittleEndianUint32(stream_id, data + 4); - WriteLittleEndianUint32(header_length, data + 8); - WriteLittleEndianUint32(message_length, data + 12); - WriteLittleEndianUint32(trailer_length, data + 16); - memset(data + 20, 0, 44); -} - -absl::StatusOr FrameHeader::Parse(const uint8_t* data) { - FrameHeader header; - const uint32_t type_and_flags = ReadLittleEndianUint32(data); - header.type = static_cast(type_and_flags & 0xff); - const uint32_t flags = type_and_flags >> 8; - if (flags > 7) return absl::InvalidArgumentError("Invalid flags"); - header.flags = BitSet<3>::FromInt(flags); - header.stream_id = ReadLittleEndianUint32(data + 4); - header.header_length = ReadLittleEndianUint32(data + 8); - header.message_length = ReadLittleEndianUint32(data + 12); - header.trailer_length = ReadLittleEndianUint32(data + 16); - for (int i = 0; i < 44; i++) { - if (data[20 + i] != 0) return absl::InvalidArgumentError("Invalid padding"); - } - return header; -} - -namespace { -uint64_t RoundUp(uint64_t x) { - if (x % 64 == 0) return x; - return x + 64 - (x % 64); -} -} // namespace - -FrameSizes FrameHeader::ComputeFrameSizes() const { - FrameSizes sizes; - sizes.message_offset = RoundUp(header_length); - sizes.trailer_offset = sizes.message_offset + RoundUp(message_length); - sizes.frame_length = sizes.trailer_offset + RoundUp(trailer_length); - return sizes; -} - -} // namespace chaotic_good -} // namespace grpc_core diff --git a/src/core/ext/transport/chaotic_good/frame_header.h b/src/core/ext/transport/chaotic_good/frame_header.h deleted file mode 100644 index db65f072ed3..00000000000 --- a/src/core/ext/transport/chaotic_good/frame_header.h +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright 2022 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. - -#ifndef GRPC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_FRAME_HEADER_H -#define GRPC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_FRAME_HEADER_H - -#include - -#include - -#include "absl/status/statusor.h" - -#include "src/core/lib/gprpp/bitset.h" - -namespace grpc_core { -namespace chaotic_good { - -enum class FrameType : uint8_t { - kSettings = 0x00, - kFragment = 0x80, - kCancel = 0x81, -}; - -struct FrameSizes { - uint64_t message_offset; - uint64_t trailer_offset; - uint64_t frame_length; - - bool operator==(const FrameSizes& other) const { - return message_offset == other.message_offset && - trailer_offset == other.trailer_offset && - frame_length == other.frame_length; - } -}; - -struct FrameHeader { - FrameType type; - BitSet<3> flags; - uint32_t stream_id; - uint32_t header_length; - uint32_t message_length; - uint32_t trailer_length; - - // Parses a frame header from a buffer of 64 bytes. All 64 bytes are consumed. - static absl::StatusOr Parse(const uint8_t* data); - // Serializes a frame header into a buffer of 64 bytes. - void Serialize(uint8_t* data) const; - // Compute frame sizes from the header. - FrameSizes ComputeFrameSizes() const; - - bool operator==(const FrameHeader& h) const { - return type == h.type && flags == h.flags && stream_id == h.stream_id && - header_length == h.header_length && - message_length == h.message_length && - trailer_length == h.trailer_length; - } -}; - -} // namespace chaotic_good -} // namespace grpc_core - -#endif // GRPC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_FRAME_HEADER_H diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc index d2c009df073..93d47da7399 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc @@ -55,7 +55,6 @@ #include "src/core/ext/transport/chttp2/transport/frame_rst_stream.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/http2_settings.h" -#include "src/core/ext/transport/chttp2/transport/http_trace.h" #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/ext/transport/chttp2/transport/stream_map.h" #include "src/core/ext/transport/chttp2/transport/varint.h" @@ -128,6 +127,7 @@ static int g_default_max_pings_without_data = DEFAULT_MAX_PINGS_BETWEEN_DATA; static int g_default_max_ping_strikes = DEFAULT_MAX_PING_STRIKES; #define MAX_CLIENT_STREAM_ID 0x7fffffffu +grpc_core::TraceFlag grpc_http_trace(false, "http"); grpc_core::TraceFlag grpc_keepalive_trace(false, "http_keepalive"); grpc_core::DebugOnlyTraceFlag grpc_trace_chttp2_refcount(false, "chttp2_refcount"); diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.h b/src/core/ext/transport/chttp2/transport/chttp2_transport.h index fac9410364c..62161b0e43c 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.h +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.h @@ -31,6 +31,7 @@ #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/transport/transport_fwd.h" +extern grpc_core::TraceFlag grpc_http_trace; extern grpc_core::TraceFlag grpc_keepalive_trace; extern grpc_core::TraceFlag grpc_trace_http2_stream_state; extern grpc_core::DebugOnlyTraceFlag grpc_trace_chttp2_refcount; 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 3568f8880b2..cf54498285b 100644 --- a/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc +++ b/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc @@ -30,7 +30,7 @@ #include #include "src/core/ext/transport/chttp2/transport/frame.h" -#include "src/core/ext/transport/chttp2/transport/http_trace.h" +#include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/status_helper.h" diff --git a/src/core/ext/transport/chttp2/transport/frame_settings.cc b/src/core/ext/transport/chttp2/transport/frame_settings.cc index 96e0011f4fa..9139c8d147e 100644 --- a/src/core/ext/transport/chttp2/transport/frame_settings.cc +++ b/src/core/ext/transport/chttp2/transport/frame_settings.cc @@ -34,7 +34,7 @@ #include "src/core/ext/transport/chttp2/transport/flow_control.h" #include "src/core/ext/transport/chttp2/transport/frame.h" #include "src/core/ext/transport/chttp2/transport/frame_goaway.h" -#include "src/core/ext/transport/chttp2/transport/http_trace.h" +#include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/gpr/useful.h" diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc index d45fa2a5e9a..e38dfa913f2 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc @@ -31,9 +31,7 @@ #include "src/core/ext/transport/chttp2/transport/frame.h" #include "src/core/ext/transport/chttp2/transport/hpack_constants.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder_table.h" -#include "src/core/ext/transport/chttp2/transport/http_trace.h" #include "src/core/ext/transport/chttp2/transport/varint.h" -#include "src/core/lib/debug/trace.h" #include "src/core/lib/surface/validate_metadata.h" #include "src/core/lib/transport/timeout_encoding.h" @@ -61,7 +59,7 @@ static void FillHeader(uint8_t* p, uint8_t type, uint32_t id, size_t len, max_frame_size is derived from GRPC_CHTTP2_SETTINGS_MAX_FRAME_SIZE, which has a max allowable value of 16777215 (see chttp_transport.cc). Thus, the following assert can be a debug assert. */ - GPR_DEBUG_ASSERT(len <= 16777216); + GPR_DEBUG_ASSERT(len < 16777316); *p++ = static_cast(len >> 16); *p++ = static_cast(len >> 8); *p++ = static_cast(len); @@ -73,9 +71,17 @@ static void FillHeader(uint8_t* p, uint8_t type, uint32_t id, size_t len, *p++ = static_cast(id); } -void HPackCompressor::Frame(const EncodeHeaderOptions& options, - SliceBuffer& raw, grpc_slice_buffer* output) { - uint8_t frame_type = GRPC_CHTTP2_FRAME_HEADER; +size_t HPackCompressor::Framer::CurrentFrameSize() const { + const size_t frame_size = + output_->length - prefix_.output_length_at_start_of_frame; + GPR_DEBUG_ASSERT(frame_size <= max_frame_size_); + return frame_size; +} + +// finish a frame - fill in the previously reserved header +void HPackCompressor::Framer::FinishFrame(bool is_header_boundary) { + const uint8_t type = is_first_frame_ ? GRPC_CHTTP2_FRAME_HEADER + : GRPC_CHTTP2_FRAME_CONTINUATION; uint8_t flags = 0; // per the HTTP/2 spec: // A HEADERS frame carries the END_STREAM flag that signals the end of a @@ -83,34 +89,72 @@ void HPackCompressor::Frame(const EncodeHeaderOptions& options, // followed by CONTINUATION frames on the same stream. Logically, the // CONTINUATION frames are part of the HEADERS frame. // Thus, we add the END_STREAM flag to the HEADER frame (the first frame). - if (options.is_end_of_stream) { + if (is_first_frame_ && is_end_of_stream_) { flags |= GRPC_CHTTP2_DATA_FLAG_END_STREAM; } - options.stats->header_bytes += raw.Length(); - while (frame_type == GRPC_CHTTP2_FRAME_HEADER || raw.Length() > 0) { - // per the HTTP/2 spec: - // A HEADERS frame without the END_HEADERS flag set MUST be followed by - // a CONTINUATION frame for the same stream. - // Thus, we add the END_HEADER flag to the last frame. - size_t len = raw.Length(); - if (len <= options.max_frame_size) { - flags |= GRPC_CHTTP2_DATA_FLAG_END_HEADERS; + // per the HTTP/2 spec: + // A HEADERS frame without the END_HEADERS flag set MUST be followed by + // a CONTINUATION frame for the same stream. + // Thus, we add the END_HEADER flag to the last frame. + if (is_header_boundary) { + flags |= GRPC_CHTTP2_DATA_FLAG_END_HEADERS; + } + FillHeader(GRPC_SLICE_START_PTR(output_->slices[prefix_.header_idx]), type, + stream_id_, CurrentFrameSize(), flags); + stats_->framing_bytes += kDataFrameHeaderSize; + is_first_frame_ = false; +} + +// begin a new frame: reserve off header space, remember how many bytes we'd +// output before beginning +HPackCompressor::Framer::FramePrefix HPackCompressor::Framer::BeginFrame() { + grpc_slice reserved; + reserved.refcount = nullptr; + reserved.data.inlined.length = kDataFrameHeaderSize; + return FramePrefix{grpc_slice_buffer_add_indexed(output_, reserved), + output_->length}; +} + +// make sure that the current frame is of the type desired, and has sufficient +// space to add at least about_to_add bytes -- finishes the current frame if +// needed +void HPackCompressor::Framer::EnsureSpace(size_t need_bytes) { + if (GPR_LIKELY(CurrentFrameSize() + need_bytes <= max_frame_size_)) { + return; + } + FinishFrame(false); + prefix_ = BeginFrame(); +} + +void HPackCompressor::Framer::Add(Slice slice) { + while (true) { + const size_t len = slice.length(); + if (len == 0) return; + const size_t remaining = max_frame_size_ - CurrentFrameSize(); + if (len <= remaining) { + stats_->header_bytes += len; + grpc_slice_buffer_add(output_, slice.TakeCSlice()); + return; } else { - len = options.max_frame_size; + stats_->header_bytes += remaining; + Slice tail = slice.Split(remaining); + grpc_slice_buffer_add(output_, slice.TakeCSlice()); + slice = std::move(tail); + FinishFrame(false); + prefix_ = BeginFrame(); } - FillHeader(grpc_slice_buffer_tiny_add(output, kDataFrameHeaderSize), - frame_type, options.stream_id, len, flags); - options.stats->framing_bytes += kDataFrameHeaderSize; - grpc_slice_buffer_move_first(raw.c_slice_buffer(), len, output); - - frame_type = GRPC_CHTTP2_FRAME_CONTINUATION; - flags = 0; } } -void HPackCompressor::Encoder::EmitIndexed(uint32_t elem_index) { +uint8_t* HPackCompressor::Framer::AddTiny(size_t len) { + EnsureSpace(len); + stats_->header_bytes += len; + return grpc_slice_buffer_tiny_add(output_, len); +} + +void HPackCompressor::Framer::EmitIndexed(uint32_t elem_index) { VarintWriter<1> w(elem_index); - w.Write(0x80, output_.AddTiny(w.length())); + w.Write(0x80, AddTiny(w.length())); } struct WireValue { @@ -214,71 +258,71 @@ class StringKey { VarintWriter<1> len_key_; }; -void HPackCompressor::Encoder::EmitLitHdrWithNonBinaryStringKeyIncIdx( +void HPackCompressor::Framer::EmitLitHdrWithNonBinaryStringKeyIncIdx( Slice key_slice, Slice value_slice) { StringKey key(std::move(key_slice)); - key.WritePrefix(0x40, output_.AddTiny(key.prefix_length())); - output_.Append(key.key()); + key.WritePrefix(0x40, AddTiny(key.prefix_length())); + Add(key.key()); NonBinaryStringValue emit(std::move(value_slice)); - emit.WritePrefix(output_.AddTiny(emit.prefix_length())); - output_.Append(emit.data()); + emit.WritePrefix(AddTiny(emit.prefix_length())); + Add(emit.data()); } -void HPackCompressor::Encoder::EmitLitHdrWithBinaryStringKeyNotIdx( +void HPackCompressor::Framer::EmitLitHdrWithBinaryStringKeyNotIdx( Slice key_slice, Slice value_slice) { StringKey key(std::move(key_slice)); - key.WritePrefix(0x00, output_.AddTiny(key.prefix_length())); - output_.Append(key.key()); + key.WritePrefix(0x00, AddTiny(key.prefix_length())); + Add(key.key()); BinaryStringValue emit(std::move(value_slice), use_true_binary_metadata_); - emit.WritePrefix(output_.AddTiny(emit.prefix_length())); - output_.Append(emit.data()); + emit.WritePrefix(AddTiny(emit.prefix_length())); + Add(emit.data()); } -void HPackCompressor::Encoder::EmitLitHdrWithBinaryStringKeyIncIdx( +void HPackCompressor::Framer::EmitLitHdrWithBinaryStringKeyIncIdx( Slice key_slice, Slice value_slice) { StringKey key(std::move(key_slice)); - key.WritePrefix(0x40, output_.AddTiny(key.prefix_length())); - output_.Append(key.key()); + key.WritePrefix(0x40, AddTiny(key.prefix_length())); + Add(key.key()); BinaryStringValue emit(std::move(value_slice), use_true_binary_metadata_); - emit.WritePrefix(output_.AddTiny(emit.prefix_length())); - output_.Append(emit.data()); + emit.WritePrefix(AddTiny(emit.prefix_length())); + Add(emit.data()); } -void HPackCompressor::Encoder::EmitLitHdrWithBinaryStringKeyNotIdx( +void HPackCompressor::Framer::EmitLitHdrWithBinaryStringKeyNotIdx( uint32_t key_index, Slice value_slice) { BinaryStringValue emit(std::move(value_slice), use_true_binary_metadata_); VarintWriter<4> key(key_index); - uint8_t* data = output_.AddTiny(key.length() + emit.prefix_length()); + uint8_t* data = AddTiny(key.length() + emit.prefix_length()); key.Write(0x00, data); emit.WritePrefix(data + key.length()); - output_.Append(emit.data()); + Add(emit.data()); } -void HPackCompressor::Encoder::EmitLitHdrWithNonBinaryStringKeyNotIdx( +void HPackCompressor::Framer::EmitLitHdrWithNonBinaryStringKeyNotIdx( Slice key_slice, Slice value_slice) { StringKey key(std::move(key_slice)); - key.WritePrefix(0x00, output_.AddTiny(key.prefix_length())); - output_.Append(key.key()); + key.WritePrefix(0x00, AddTiny(key.prefix_length())); + Add(key.key()); NonBinaryStringValue emit(std::move(value_slice)); - emit.WritePrefix(output_.AddTiny(emit.prefix_length())); - output_.Append(emit.data()); + emit.WritePrefix(AddTiny(emit.prefix_length())); + Add(emit.data()); } -void HPackCompressor::Encoder::AdvertiseTableSizeChange() { +void HPackCompressor::Framer::AdvertiseTableSizeChange() { VarintWriter<3> w(compressor_->table_.max_size()); - w.Write(0x20, output_.AddTiny(w.length())); + w.Write(0x20, AddTiny(w.length())); } void HPackCompressor::SliceIndex::EmitTo(absl::string_view key, - const Slice& value, Encoder* encoder) { - auto& table = encoder->compressor_->table_; + const Slice& value, Framer* framer) { + auto& table = framer->compressor_->table_; using It = std::vector::iterator; It prev = values_.end(); size_t transport_length = key.length() + value.length() + hpack_constants::kEntryOverhead; if (transport_length > HPackEncoderTable::MaxEntrySize()) { - encoder->EmitLitHdrWithNonBinaryStringKeyNotIdx( - Slice::FromStaticString(key), value.Ref()); + framer->EmitLitHdrWithNonBinaryStringKeyNotIdx(Slice::FromStaticString(key), + value.Ref()); return; } // Linear scan through previous values to see if we find the value. @@ -287,11 +331,11 @@ void HPackCompressor::SliceIndex::EmitTo(absl::string_view key, // Got a hit... is it still in the decode table? if (table.ConvertableToDynamicIndex(it->index)) { // Yes, emit the index and proceed to cleanup. - encoder->EmitIndexed(table.DynamicIndex(it->index)); + framer->EmitIndexed(table.DynamicIndex(it->index)); } else { // Not current, emit a new literal and update the index. it->index = table.AllocateIndex(transport_length); - encoder->EmitLitHdrWithNonBinaryStringKeyIncIdx( + framer->EmitLitHdrWithNonBinaryStringKeyIncIdx( Slice::FromStaticString(key), value.Ref()); } // Bubble this entry up if we can - ensures that the most used values end @@ -310,12 +354,12 @@ void HPackCompressor::SliceIndex::EmitTo(absl::string_view key, } // No hit, emit a new literal and add it to the index. uint32_t index = table.AllocateIndex(transport_length); - encoder->EmitLitHdrWithNonBinaryStringKeyIncIdx(Slice::FromStaticString(key), - value.Ref()); + framer->EmitLitHdrWithNonBinaryStringKeyIncIdx(Slice::FromStaticString(key), + value.Ref()); values_.emplace_back(value.Ref(), index); } -void HPackCompressor::Encoder::Encode(const Slice& key, const Slice& value) { +void HPackCompressor::Framer::Encode(const Slice& key, const Slice& value) { if (absl::EndsWith(key.as_string_view(), "-bin")) { EmitLitHdrWithBinaryStringKeyNotIdx(key.Ref(), value.Ref()); } else { @@ -323,25 +367,25 @@ void HPackCompressor::Encoder::Encode(const Slice& key, const Slice& value) { } } -void HPackCompressor::Encoder::Encode(HttpPathMetadata, const Slice& value) { +void HPackCompressor::Framer::Encode(HttpPathMetadata, const Slice& value) { compressor_->path_index_.EmitTo(HttpPathMetadata::key(), value, this); } -void HPackCompressor::Encoder::Encode(HttpAuthorityMetadata, - const Slice& value) { +void HPackCompressor::Framer::Encode(HttpAuthorityMetadata, + const Slice& value) { compressor_->authority_index_.EmitTo(HttpAuthorityMetadata::key(), value, this); } -void HPackCompressor::Encoder::Encode(TeMetadata, TeMetadata::ValueType value) { +void HPackCompressor::Framer::Encode(TeMetadata, TeMetadata::ValueType value) { GPR_ASSERT(value == TeMetadata::ValueType::kTrailers); EncodeAlwaysIndexed( &compressor_->te_index_, "te", Slice::FromStaticString("trailers"), 2 /* te */ + 8 /* trailers */ + hpack_constants::kEntryOverhead); } -void HPackCompressor::Encoder::Encode(ContentTypeMetadata, - ContentTypeMetadata::ValueType value) { +void HPackCompressor::Framer::Encode(ContentTypeMetadata, + ContentTypeMetadata::ValueType value) { if (value != ContentTypeMetadata::ValueType::kApplicationGrpc) { gpr_log(GPR_ERROR, "Not encoding bad content-type header"); return; @@ -352,8 +396,8 @@ void HPackCompressor::Encoder::Encode(ContentTypeMetadata, hpack_constants::kEntryOverhead); } -void HPackCompressor::Encoder::Encode(HttpSchemeMetadata, - HttpSchemeMetadata::ValueType value) { +void HPackCompressor::Framer::Encode(HttpSchemeMetadata, + HttpSchemeMetadata::ValueType value) { switch (value) { case HttpSchemeMetadata::ValueType::kHttp: EmitIndexed(6); // :scheme: http @@ -367,20 +411,19 @@ void HPackCompressor::Encoder::Encode(HttpSchemeMetadata, } } -void HPackCompressor::Encoder::Encode(GrpcTraceBinMetadata, - const Slice& slice) { +void HPackCompressor::Framer::Encode(GrpcTraceBinMetadata, const Slice& slice) { EncodeRepeatingSliceValue(GrpcTraceBinMetadata::key(), slice, &compressor_->grpc_trace_bin_index_, HPackEncoderTable::MaxEntrySize()); } -void HPackCompressor::Encoder::Encode(GrpcTagsBinMetadata, const Slice& slice) { +void HPackCompressor::Framer::Encode(GrpcTagsBinMetadata, const Slice& slice) { EncodeRepeatingSliceValue(GrpcTagsBinMetadata::key(), slice, &compressor_->grpc_tags_bin_index_, HPackEncoderTable::MaxEntrySize()); } -void HPackCompressor::Encoder::Encode(HttpStatusMetadata, uint32_t status) { +void HPackCompressor::Framer::Encode(HttpStatusMetadata, uint32_t status) { if (status == 200) { EmitIndexed(8); // :status: 200 return; @@ -414,8 +457,8 @@ void HPackCompressor::Encoder::Encode(HttpStatusMetadata, uint32_t status) { } } -void HPackCompressor::Encoder::Encode(HttpMethodMetadata, - HttpMethodMetadata::ValueType method) { +void HPackCompressor::Framer::Encode(HttpMethodMetadata, + HttpMethodMetadata::ValueType method) { switch (method) { case HttpMethodMetadata::ValueType::kPost: EmitIndexed(3); // :method: POST @@ -435,10 +478,10 @@ void HPackCompressor::Encoder::Encode(HttpMethodMetadata, } } -void HPackCompressor::Encoder::EncodeAlwaysIndexed(uint32_t* index, - absl::string_view key, - Slice value, - size_t transport_length) { +void HPackCompressor::Framer::EncodeAlwaysIndexed(uint32_t* index, + absl::string_view key, + Slice value, + size_t transport_length) { if (compressor_->table_.ConvertableToDynamicIndex(*index)) { EmitIndexed(compressor_->table_.DynamicIndex(*index)); } else { @@ -448,7 +491,7 @@ void HPackCompressor::Encoder::EncodeAlwaysIndexed(uint32_t* index, } } -void HPackCompressor::Encoder::EncodeIndexedKeyWithBinaryValue( +void HPackCompressor::Framer::EncodeIndexedKeyWithBinaryValue( uint32_t* index, absl::string_view key, Slice value) { if (compressor_->table_.ConvertableToDynamicIndex(*index)) { EmitLitHdrWithBinaryStringKeyNotIdx( @@ -461,7 +504,7 @@ void HPackCompressor::Encoder::EncodeIndexedKeyWithBinaryValue( } } -void HPackCompressor::Encoder::EncodeRepeatingSliceValue( +void HPackCompressor::Framer::EncodeRepeatingSliceValue( const absl::string_view& key, const Slice& slice, uint32_t* index, size_t max_compression_size) { if (hpack_constants::SizeForEntry(key.size(), slice.size()) > @@ -473,7 +516,7 @@ void HPackCompressor::Encoder::EncodeRepeatingSliceValue( } } -void HPackCompressor::Encoder::Encode(GrpcTimeoutMetadata, Timestamp deadline) { +void HPackCompressor::Framer::Encode(GrpcTimeoutMetadata, Timestamp deadline) { Timeout timeout = Timeout::FromDuration(deadline - Timestamp::Now()); for (auto it = compressor_->previous_timeouts_.begin(); it != compressor_->previous_timeouts_.end(); ++it) { @@ -504,7 +547,7 @@ void HPackCompressor::Encoder::Encode(GrpcTimeoutMetadata, Timestamp deadline) { Slice::FromStaticString(GrpcTimeoutMetadata::key()), std::move(encoded)); } -void HPackCompressor::Encoder::Encode(UserAgentMetadata, const Slice& slice) { +void HPackCompressor::Framer::Encode(UserAgentMetadata, const Slice& slice) { if (hpack_constants::SizeForEntry(UserAgentMetadata::key().size(), slice.size()) > HPackEncoderTable::MaxEntrySize()) { @@ -522,8 +565,8 @@ void HPackCompressor::Encoder::Encode(UserAgentMetadata, const Slice& slice) { UserAgentMetadata::key().size(), slice.size())); } -void HPackCompressor::Encoder::Encode(GrpcStatusMetadata, - grpc_status_code status) { +void HPackCompressor::Framer::Encode(GrpcStatusMetadata, + grpc_status_code status) { const uint32_t code = static_cast(status); uint32_t* index = nullptr; if (code < kNumCachedGrpcStatusValues) { @@ -545,8 +588,8 @@ void HPackCompressor::Encoder::Encode(GrpcStatusMetadata, } } -void HPackCompressor::Encoder::Encode(GrpcEncodingMetadata, - grpc_compression_algorithm value) { +void HPackCompressor::Framer::Encode(GrpcEncodingMetadata, + grpc_compression_algorithm value) { uint32_t* index = nullptr; if (value < GRPC_COMPRESS_ALGORITHMS_COUNT) { index = &compressor_->cached_grpc_encoding_[static_cast(value)]; @@ -569,8 +612,8 @@ void HPackCompressor::Encoder::Encode(GrpcEncodingMetadata, } } -void HPackCompressor::Encoder::Encode(GrpcAcceptEncodingMetadata, - CompressionAlgorithmSet value) { +void HPackCompressor::Framer::Encode(GrpcAcceptEncodingMetadata, + CompressionAlgorithmSet value) { if (compressor_->grpc_accept_encoding_index_ != 0 && value == compressor_->grpc_accept_encoding_ && compressor_->table_.ConvertableToDynamicIndex( @@ -605,12 +648,17 @@ void HPackCompressor::SetMaxTableSize(uint32_t max_table_size) { } } -HPackCompressor::Encoder::Encoder(HPackCompressor* compressor, - bool use_true_binary_metadata, - SliceBuffer& output) - : use_true_binary_metadata_(use_true_binary_metadata), +HPackCompressor::Framer::Framer(const EncodeHeaderOptions& options, + HPackCompressor* compressor, + grpc_slice_buffer* output) + : max_frame_size_(options.max_frame_size), + use_true_binary_metadata_(options.use_true_binary_metadata), + is_end_of_stream_(options.is_end_of_stream), + stream_id_(options.stream_id), + output_(output), + stats_(options.stats), compressor_(compressor), - output_(output) { + prefix_(BeginFrame()) { if (std::exchange(compressor_->advertise_table_size_change_, false)) { AdvertiseTableSizeChange(); } diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder.h b/src/core/ext/transport/chttp2/transport/hpack_encoder.h index 99e4527508e..50e27ef4644 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_encoder.h +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.h @@ -37,13 +37,15 @@ #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/compression/compression_internal.h" +#include "src/core/lib/debug/trace.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" #include "src/core/lib/transport/timeout_encoding.h" #include "src/core/lib/transport/transport.h" +extern grpc_core::TraceFlag grpc_http_trace; + namespace grpc_core { class HPackCompressor { @@ -74,23 +76,18 @@ class HPackCompressor { template void EncodeHeaders(const EncodeHeaderOptions& options, const HeaderSet& headers, grpc_slice_buffer* output) { - SliceBuffer raw; - Encoder encoder(this, options.use_true_binary_metadata, raw); - headers.Encode(&encoder); - Frame(options, raw, output); - } - - template - void EncodeRawHeaders(const HeaderSet& headers, SliceBuffer& output) { - Encoder encoder(this, true, output); - headers.Encode(&encoder); + Framer framer(options, this, output); + headers.Encode(&framer); } - private: - class Encoder { + class Framer { public: - Encoder(HPackCompressor* compressor, bool use_true_binary_metadata, - SliceBuffer& output); + Framer(const EncodeHeaderOptions& options, HPackCompressor* compressor, + grpc_slice_buffer* output); + ~Framer() { FinishFrame(true); } + + Framer(const Framer&) = delete; + Framer& operator=(const Framer&) = delete; void Encode(const Slice& key, const Slice& value); void Encode(HttpPathMetadata, const Slice& value); @@ -127,6 +124,18 @@ class HPackCompressor { private: friend class SliceIndex; + struct FramePrefix { + // index (in output_) of the header for the frame + size_t header_idx; + // number of bytes in 'output' when we started the frame - used to + // calculate frame length + size_t output_length_at_start_of_frame; + }; + + FramePrefix BeginFrame(); + void FinishFrame(bool is_header_boundary); + void EnsureSpace(size_t need_bytes); + void AdvertiseTableSizeChange(); void EmitIndexed(uint32_t index); void EmitLitHdrWithNonBinaryStringKeyIncIdx(Slice key_slice, @@ -149,17 +158,27 @@ class HPackCompressor { const Slice& slice, uint32_t* index, size_t max_compression_size); + size_t CurrentFrameSize() const; + void Add(Slice slice); + uint8_t* AddTiny(size_t len); + + // maximum size of a frame + const size_t max_frame_size_; + bool is_first_frame_ = true; const bool use_true_binary_metadata_; + const bool is_end_of_stream_; + // output stream id + const uint32_t stream_id_; + grpc_slice_buffer* const output_; + grpc_transport_one_way_stats* const stats_; HPackCompressor* const compressor_; - SliceBuffer& output_; + FramePrefix prefix_; }; + private: static constexpr size_t kNumFilterValues = 64; static constexpr uint32_t kNumCachedGrpcStatusValues = 16; - void Frame(const EncodeHeaderOptions& options, SliceBuffer& raw, - grpc_slice_buffer* output); - // maximum number of bytes we'll use for the decode table (to guard against // peers ooming us by setting decode table size high) uint32_t max_usable_size_ = hpack_constants::kInitialTableSize; @@ -170,7 +189,7 @@ class HPackCompressor { class SliceIndex { public: - void EmitTo(absl::string_view key, const Slice& value, Encoder* encoder); + void EmitTo(absl::string_view key, const Slice& value, Framer* framer); private: struct ValueIndex { diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.cc b/src/core/ext/transport/chttp2/transport/hpack_parser.cc index 8d7c0996acc..b0d3a6465bb 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parser.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_parser.cc @@ -43,13 +43,19 @@ #include #include "src/core/ext/transport/chttp2/transport/decode_huff.h" +#include "src/core/ext/transport/chttp2/transport/frame_rst_stream.h" #include "src/core/ext/transport/chttp2/transport/hpack_constants.h" +#include "src/core/ext/transport/chttp2/transport/internal.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/iomgr/closure.h" +#include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_refcount.h" +#include "src/core/lib/transport/http2_errors.h" #include "src/core/lib/transport/parsed_metadata.h" +#include "src/core/lib/transport/transport.h" // IWYU pragma: no_include @@ -1308,3 +1314,69 @@ bool HPackParser::ParseInputInner(Input* input) { void HPackParser::FinishFrame() { metadata_buffer_ = nullptr; } } // namespace grpc_core + +// TODO(ctiller): this serves as an eviction notice for the remainder of this +// file... it belongs elsewhere! + +typedef void (*maybe_complete_func_type)(grpc_chttp2_transport* t, + grpc_chttp2_stream* s); +static const maybe_complete_func_type maybe_complete_funcs[] = { + grpc_chttp2_maybe_complete_recv_initial_metadata, + grpc_chttp2_maybe_complete_recv_trailing_metadata}; + +static void force_client_rst_stream(void* sp, grpc_error_handle /*error*/) { + grpc_chttp2_stream* s = static_cast(sp); + grpc_chttp2_transport* t = s->t; + if (!s->write_closed) { + grpc_chttp2_add_rst_stream_to_next_write(t, s->id, GRPC_HTTP2_NO_ERROR, + &s->stats.outgoing); + grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_FORCE_RST_STREAM); + grpc_chttp2_mark_stream_closed(t, s, true, true, absl::OkStatus()); + } + GRPC_CHTTP2_STREAM_UNREF(s, "final_rst"); +} + +grpc_error_handle grpc_chttp2_header_parser_parse(void* hpack_parser, + grpc_chttp2_transport* t, + grpc_chttp2_stream* s, + const grpc_slice& slice, + int is_last) { + auto* parser = static_cast(hpack_parser); + if (s != nullptr) { + s->stats.incoming.header_bytes += GRPC_SLICE_LENGTH(slice); + } + grpc_error_handle error = parser->Parse(slice, is_last != 0); + if (!error.ok()) { + return error; + } + if (is_last) { + /* need to check for null stream: this can occur if we receive an invalid + stream id on a header */ + if (s != nullptr) { + if (parser->is_boundary()) { + if (s->header_frames_received == 2) { + return GRPC_ERROR_CREATE("Too many trailer frames"); + } + s->published_metadata[s->header_frames_received] = + GRPC_METADATA_PUBLISHED_FROM_WIRE; + maybe_complete_funcs[s->header_frames_received](t, s); + s->header_frames_received++; + } + if (parser->is_eof()) { + if (t->is_client && !s->write_closed) { + /* server eof ==> complete closure; we may need to forcefully close + the stream. Wait until the combiner lock is ready to be released + however -- it might be that we receive a RST_STREAM following this + and can avoid the extra write */ + GRPC_CHTTP2_STREAM_REF(s, "final_rst"); + t->combiner->FinallyRun( + GRPC_CLOSURE_CREATE(force_client_rst_stream, s, nullptr), + absl::OkStatus()); + } + grpc_chttp2_mark_stream_closed(t, s, true, false, absl::OkStatus()); + } + } + parser->FinishFrame(); + } + return absl::OkStatus(); +} diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser_table.cc b/src/core/ext/transport/chttp2/transport/hpack_parser_table.cc index 6ddcb455000..ec7162d75ea 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parser_table.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_parser_table.cc @@ -34,10 +34,11 @@ #include #include "src/core/ext/transport/chttp2/transport/hpack_constants.h" -#include "src/core/ext/transport/chttp2/transport/http_trace.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/slice/slice.h" +extern grpc_core::TraceFlag grpc_http_trace; + namespace grpc_core { void HPackTable::MementoRingBuffer::Put(Memento m) { diff --git a/src/core/ext/transport/chttp2/transport/http_trace.cc b/src/core/ext/transport/chttp2/transport/http_trace.cc deleted file mode 100644 index 1033102373f..00000000000 --- a/src/core/ext/transport/chttp2/transport/http_trace.cc +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2022 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 - -#include "src/core/ext/transport/chttp2/transport/http_trace.h" - -grpc_core::TraceFlag grpc_http_trace(false, "http"); diff --git a/src/core/ext/transport/chttp2/transport/http_trace.h b/src/core/ext/transport/chttp2/transport/http_trace.h deleted file mode 100644 index aa7ef581a4e..00000000000 --- a/src/core/ext/transport/chttp2/transport/http_trace.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2022 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. - -#ifndef GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HTTP_TRACE_H -#define GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HTTP_TRACE_H - -#include - -#include "src/core/lib/debug/trace.h" - -extern grpc_core::TraceFlag grpc_http_trace; - -#endif // GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HTTP_TRACE_H diff --git a/src/core/ext/transport/chttp2/transport/internal.h b/src/core/ext/transport/chttp2/transport/internal.h index 887fbb5965d..69aa4f23fa9 100644 --- a/src/core/ext/transport/chttp2/transport/internal.h +++ b/src/core/ext/transport/chttp2/transport/internal.h @@ -697,6 +697,7 @@ void grpc_chttp2_complete_closure_step(grpc_chttp2_transport* t, #define GRPC_CHTTP2_CLIENT_CONNECT_STRLEN \ (sizeof(GRPC_CHTTP2_CLIENT_CONNECT_STRING) - 1) +// extern grpc_core::TraceFlag grpc_http_trace; // extern grpc_core::TraceFlag grpc_flowctl_trace; #define GRPC_CHTTP2_IF_TRACING(stmt) \ diff --git a/src/core/ext/transport/chttp2/transport/parsing.cc b/src/core/ext/transport/chttp2/transport/parsing.cc index 4488e6dc6b7..11df0a95146 100644 --- a/src/core/ext/transport/chttp2/transport/parsing.cc +++ b/src/core/ext/transport/chttp2/transport/parsing.cc @@ -39,10 +39,10 @@ #include "src/core/ext/transport/chttp2/transport/frame_rst_stream.h" #include "src/core/ext/transport/chttp2/transport/frame_settings.h" #include "src/core/ext/transport/chttp2/transport/frame_window_update.h" +#include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser_table.h" #include "src/core/ext/transport/chttp2/transport/http2_settings.h" -#include "src/core/ext/transport/chttp2/transport/http_trace.h" #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/ext/transport/chttp2/transport/stream_map.h" #include "src/core/lib/channel/channelz.h" @@ -50,8 +50,6 @@ #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/combiner.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/transport/bdp_estimator.h" #include "src/core/lib/transport/error_utils.h" @@ -730,66 +728,3 @@ static grpc_error_handle parse_frame_slice(grpc_chttp2_transport* t, } return err; } - -typedef void (*maybe_complete_func_type)(grpc_chttp2_transport* t, - grpc_chttp2_stream* s); -static const maybe_complete_func_type maybe_complete_funcs[] = { - grpc_chttp2_maybe_complete_recv_initial_metadata, - grpc_chttp2_maybe_complete_recv_trailing_metadata}; - -static void force_client_rst_stream(void* sp, grpc_error_handle /*error*/) { - grpc_chttp2_stream* s = static_cast(sp); - grpc_chttp2_transport* t = s->t; - if (!s->write_closed) { - grpc_chttp2_add_rst_stream_to_next_write(t, s->id, GRPC_HTTP2_NO_ERROR, - &s->stats.outgoing); - grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_FORCE_RST_STREAM); - grpc_chttp2_mark_stream_closed(t, s, true, true, absl::OkStatus()); - } - GRPC_CHTTP2_STREAM_UNREF(s, "final_rst"); -} - -grpc_error_handle grpc_chttp2_header_parser_parse(void* hpack_parser, - grpc_chttp2_transport* t, - grpc_chttp2_stream* s, - const grpc_slice& slice, - int is_last) { - auto* parser = static_cast(hpack_parser); - if (s != nullptr) { - s->stats.incoming.header_bytes += GRPC_SLICE_LENGTH(slice); - } - grpc_error_handle error = parser->Parse(slice, is_last != 0); - if (!error.ok()) { - return error; - } - if (is_last) { - /* need to check for null stream: this can occur if we receive an invalid - stream id on a header */ - if (s != nullptr) { - if (parser->is_boundary()) { - if (s->header_frames_received == 2) { - return GRPC_ERROR_CREATE("Too many trailer frames"); - } - s->published_metadata[s->header_frames_received] = - GRPC_METADATA_PUBLISHED_FROM_WIRE; - maybe_complete_funcs[s->header_frames_received](t, s); - s->header_frames_received++; - } - if (parser->is_eof()) { - if (t->is_client && !s->write_closed) { - /* server eof ==> complete closure; we may need to forcefully close - the stream. Wait until the combiner lock is ready to be released - however -- it might be that we receive a RST_STREAM following this - and can avoid the extra write */ - GRPC_CHTTP2_STREAM_REF(s, "final_rst"); - t->combiner->FinallyRun( - GRPC_CLOSURE_CREATE(force_client_rst_stream, s, nullptr), - absl::OkStatus()); - } - grpc_chttp2_mark_stream_closed(t, s, true, false, absl::OkStatus()); - } - } - parser->FinishFrame(); - } - return absl::OkStatus(); -} diff --git a/src/core/ext/transport/chttp2/transport/writing.cc b/src/core/ext/transport/chttp2/transport/writing.cc index 89e58de82a2..a9da501c60a 100644 --- a/src/core/ext/transport/chttp2/transport/writing.cc +++ b/src/core/ext/transport/chttp2/transport/writing.cc @@ -32,8 +32,6 @@ #include #include -#include "src/core/ext/transport/chttp2/transport/http_trace.h" - // IWYU pragma: no_include "src/core/lib/gprpp/orphanable.h" #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" diff --git a/src/core/lib/gprpp/bitset.h b/src/core/lib/gprpp/bitset.h index 371668c93b4..cb25a44635e 100644 --- a/src/core/lib/gprpp/bitset.h +++ b/src/core/lib/gprpp/bitset.h @@ -131,9 +131,6 @@ class BitSet { return true; } - // Returns true if any bites are set. - bool any() const { return !none(); } - // Return a count of how many bits are set. uint32_t count() const { uint32_t count = 0; @@ -162,15 +159,6 @@ class BitSet { return result; } - template - static BitSet FromInt(Int value) { - BitSet result; - for (size_t i = 0; i < kTotalBits; i++) { - result.set(i, (value & (Int(1) << i)) != 0); - } - return result; - } - private: // Given a bit index, return which unit it's stored in. static constexpr size_t unit_for(size_t bit) { return bit / kUnitBits; } diff --git a/src/core/lib/iomgr/fork_posix.cc b/src/core/lib/iomgr/fork_posix.cc index 533852395bf..db5c34490f3 100644 --- a/src/core/lib/iomgr/fork_posix.cc +++ b/src/core/lib/iomgr/fork_posix.cc @@ -38,7 +38,6 @@ #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" /* * NOTE: FORKING IS NOT GENERALLY SUPPORTED, THIS IS ONLY INTENDED TO WORK @@ -54,7 +53,7 @@ void grpc_prefork() { skipped_handler = true; // This may be called after core shuts down, so verify initialized before // instantiating an ExecCtx. - if (!grpc_core::IsInitializedInternally()) { + if (!grpc_is_initialized()) { return; } grpc_core::ExecCtx exec_ctx; diff --git a/src/core/lib/slice/slice.h b/src/core/lib/slice/slice.h index f95d0d87f1d..fc4f89d6493 100644 --- a/src/core/lib/slice/slice.h +++ b/src/core/lib/slice/slice.h @@ -194,10 +194,6 @@ struct CopyConstructors { static Out FromCopiedBuffer(const char* p, size_t len) { return Out(grpc_slice_from_copied_buffer(p, len)); } - static Out FromCopiedBuffer(const uint8_t* p, size_t len) { - return Out( - grpc_slice_from_copied_buffer(reinterpret_cast(p), len)); - } template static Out FromCopiedBuffer(const Buffer& buffer) { diff --git a/src/core/lib/slice/slice_buffer.cc b/src/core/lib/slice/slice_buffer.cc index 64be083548b..88d552112a3 100644 --- a/src/core/lib/slice/slice_buffer.cc +++ b/src/core/lib/slice/slice_buffer.cc @@ -22,6 +22,7 @@ #include +#include #include #include @@ -37,12 +38,6 @@ void SliceBuffer::Append(Slice slice) { grpc_slice_buffer_add(&slice_buffer_, slice.TakeCSlice()); } -void SliceBuffer::Append(const SliceBuffer& other) { - for (size_t i = 0; i < other.Count(); i++) { - Append(other.RefSlice(i)); - } -} - size_t SliceBuffer::AppendIndexed(Slice slice) { return grpc_slice_buffer_add_indexed(&slice_buffer_, slice.TakeCSlice()); } diff --git a/src/core/lib/slice/slice_buffer.h b/src/core/lib/slice/slice_buffer.h index e40246a8455..bb9f8e4cbc5 100644 --- a/src/core/lib/slice/slice_buffer.h +++ b/src/core/lib/slice/slice_buffer.h @@ -17,7 +17,6 @@ #include -#include #include #include @@ -63,9 +62,6 @@ class SliceBuffer { /// Appends a new slice into the SliceBuffer and makes an attempt to merge /// this slice with the last slice in the SliceBuffer. void Append(Slice slice); - /// Appends a SliceBuffer into the SliceBuffer and makes an attempt to merge - /// this slice with the last slice in the SliceBuffer. - void Append(const SliceBuffer& other); /// Adds a new slice into the SliceBuffer at the next available index. /// Returns the index at which the new slice is added. @@ -84,17 +80,6 @@ class SliceBuffer { grpc_slice_buffer_move_first_into_buffer(&slice_buffer_, n, dst); } - /// Removes/deletes the last n bytes in the SliceBuffer and add it to the - /// other SliceBuffer - void MoveLastNBytesIntoSliceBuffer(size_t n, SliceBuffer& other) { - grpc_slice_buffer_trim_end(&slice_buffer_, n, &other.slice_buffer_); - } - - /// Move the first n bytes of the SliceBuffer into the other SliceBuffer - void MoveFirstNBytesIntoSliceBuffer(size_t n, SliceBuffer& other) { - grpc_slice_buffer_move_first(&slice_buffer_, n, &other.slice_buffer_); - } - /// Removes and unrefs all slices in the SliceBuffer. void Clear() { grpc_slice_buffer_reset_and_unref(&slice_buffer_); } @@ -128,11 +113,6 @@ class SliceBuffer { return copy; } - /// Add a small amount to the end of the slice buffer. - uint8_t* AddTiny(size_t n) { - return grpc_slice_buffer_tiny_add(&slice_buffer_, n); - } - /// Return a pointer to the back raw grpc_slice_buffer grpc_slice_buffer* c_slice_buffer() { return &slice_buffer_; } diff --git a/src/core/lib/surface/init.cc b/src/core/lib/surface/init.cc index cfea46cff78..2c5d76aadd8 100644 --- a/src/core/lib/surface/init.cc +++ b/src/core/lib/surface/init.cc @@ -118,9 +118,6 @@ void RegisterSecurityFilters(CoreConfiguration::Builder* builder) { static void do_basic_init(void) { grpc_core::InitInternally = grpc_init; grpc_core::ShutdownInternally = grpc_shutdown; - grpc_core::IsInitializedInternally = []() { - return grpc_is_initialized() != 0; - }; gpr_log_verbosity_init(); g_init_mu = new grpc_core::Mutex(); g_shutting_down_cv = new grpc_core::CondVar(); diff --git a/src/core/lib/surface/init_internally.cc b/src/core/lib/surface/init_internally.cc index 6e44d4329d8..2dc63c7784f 100644 --- a/src/core/lib/surface/init_internally.cc +++ b/src/core/lib/surface/init_internally.cc @@ -20,6 +20,5 @@ namespace grpc_core { void (*InitInternally)(); void (*ShutdownInternally)(); -bool (*IsInitializedInternally)(); } // namespace grpc_core diff --git a/src/core/lib/surface/init_internally.h b/src/core/lib/surface/init_internally.h index 9230ddf0f0a..12e118930e2 100644 --- a/src/core/lib/surface/init_internally.h +++ b/src/core/lib/surface/init_internally.h @@ -22,7 +22,6 @@ namespace grpc_core { // Avoids a build dependency cycle between grpc and grpc_base (and friends). extern void (*InitInternally)(); extern void (*ShutdownInternally)(); -extern bool (*IsInitializedInternally)(); class KeepsGrpcInitialized { public: diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index f49650879ea..f3d05fc9a1d 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -108,7 +108,6 @@ CORE_SOURCE_FILES = [ 'src/core/ext/transport/chttp2/transport/hpack_parser.cc', 'src/core/ext/transport/chttp2/transport/hpack_parser_table.cc', 'src/core/ext/transport/chttp2/transport/http2_settings.cc', - 'src/core/ext/transport/chttp2/transport/http_trace.cc', 'src/core/ext/transport/chttp2/transport/huffsyms.cc', 'src/core/ext/transport/chttp2/transport/parsing.cc', 'src/core/ext/transport/chttp2/transport/stream_lists.cc', diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template index 4574a2b8fdf..82fe4217913 100644 --- a/templates/CMakeLists.txt.template +++ b/templates/CMakeLists.txt.template @@ -77,8 +77,8 @@ deps.append("${_gRPC_PROTOBUF_PROTOC_LIBRARIES}") if target_dict.language == 'c++': deps.append("${_gRPC_PROTOBUF_LIBRARIES}") - deps.append("${_gRPC_ZLIB_LIBRARIES}") if target_dict['name'] in ['grpc', 'grpc_cronet', 'grpc_unsecure']: + deps.append("${_gRPC_ZLIB_LIBRARIES}") deps.append("${_gRPC_CARES_LIBRARIES}") deps.append("${_gRPC_ADDRESS_SORTING_LIBRARIES}") deps.append("${_gRPC_RE2_LIBRARIES}") diff --git a/test/core/promise/BUILD b/test/core/promise/BUILD index 9719aadb4dd..15f9b286ab3 100644 --- a/test/core/promise/BUILD +++ b/test/core/promise/BUILD @@ -25,14 +25,20 @@ grpc_cc_library( hdrs = ["test_wakeup_schedulers.h"], external_deps = ["gtest"], visibility = ["//test/core:__subpackages__"], + deps = [ + "//:gpr", + ], ) grpc_cc_library( name = "test_context", testonly = True, hdrs = ["test_context.h"], + external_deps = ["gtest"], visibility = ["//test/core:__subpackages__"], - deps = ["//src/core:context"], + deps = [ + "//:gpr", + ], ) grpc_cc_test( @@ -42,7 +48,9 @@ grpc_cc_test( language = "c++", uses_event_engine = False, uses_polling = False, - deps = ["//src/core:poll"], + deps = [ + "//src/core:poll", + ], ) grpc_cc_test( @@ -52,7 +60,9 @@ grpc_cc_test( language = "c++", uses_event_engine = False, uses_polling = False, - deps = ["//src/core:context"], + deps = [ + "//src/core:context", + ], ) grpc_cc_test( @@ -62,16 +72,15 @@ grpc_cc_test( language = "c++", uses_event_engine = False, uses_polling = False, - deps = ["//:promise"], + deps = [ + "//:promise", + ], ) grpc_cc_test( name = "arena_promise_test", srcs = ["arena_promise_test.cc"], - external_deps = [ - "absl/types:variant", - "gtest", - ], + external_deps = ["gtest"], language = "c++", tags = [ "promise_test", @@ -80,12 +89,8 @@ grpc_cc_test( uses_event_engine = False, uses_polling = False, deps = [ - "test_context", - "//:exec_ctx", - "//:ref_counted_ptr", + ":test_context", "//src/core:arena_promise", - "//src/core:event_engine_memory_allocator", - "//src/core:memory_quota", "//src/core:resource_quota", "//test/core/util:grpc_test_util_unsecure", ], @@ -118,15 +123,17 @@ grpc_cc_test( tags = ["promise_test"], uses_event_engine = False, uses_polling = False, - deps = ["//src/core:race"], + deps = [ + "//src/core:race", + ], ) grpc_cc_test( name = "promise_factory_test", srcs = ["promise_factory_test.cc"], external_deps = [ - "absl/functional:bind_front", "gtest", + "absl/functional:bind_front", ], language = "c++", tags = ["promise_test"], @@ -134,7 +141,6 @@ grpc_cc_test( uses_polling = False, deps = [ "//:promise", - "//src/core:poll", "//src/core:promise_factory", ], ) @@ -147,7 +153,9 @@ grpc_cc_test( tags = ["promise_test"], uses_event_engine = False, uses_polling = False, - deps = ["//src/core:if"], + deps = [ + "//src/core:if", + ], ) grpc_cc_test( @@ -159,7 +167,6 @@ grpc_cc_test( uses_event_engine = False, uses_polling = False, deps = [ - "//src/core:basic_seq", "//src/core:loop", "//src/core:seq", ], @@ -175,36 +182,33 @@ grpc_cc_test( uses_polling = False, deps = [ "//src/core:join", - "//src/core:poll", ], ) grpc_cc_test( name = "try_join_test", srcs = ["try_join_test.cc"], - external_deps = [ - "absl/utility", - "gtest", - ], + external_deps = ["gtest"], language = "c++", tags = ["promise_test"], uses_event_engine = False, uses_polling = False, - deps = ["//src/core:try_join"], + deps = [ + "//src/core:try_join", + ], ) grpc_cc_test( name = "seq_test", srcs = ["seq_test.cc"], - external_deps = [ - "absl/types:variant", - "gtest", - ], + external_deps = ["gtest"], language = "c++", tags = ["promise_test"], uses_event_engine = False, uses_polling = False, - deps = ["//src/core:seq"], + deps = [ + "//src/core:seq", + ], ) grpc_cc_test( @@ -215,28 +219,22 @@ grpc_cc_test( tags = ["promise_test"], uses_event_engine = False, uses_polling = False, - deps = ["//src/core:try_seq"], + deps = [ + "//src/core:try_seq", + ], ) grpc_cc_test( name = "try_seq_metadata_test", srcs = ["try_seq_metadata_test.cc"], - external_deps = [ - "absl/types:variant", - "gtest", - ], + external_deps = ["gtest"], language = "c++", tags = ["promise_test"], uses_event_engine = False, uses_polling = False, deps = [ "//:grpc", - "//:grpc_public_hdrs", - "//:ref_counted_ptr", - "//src/core:arena", - "//src/core:memory_quota", - "//src/core:poll", - "//src/core:resource_quota", + "//:grpc_base", "//src/core:try_seq", ], ) @@ -263,18 +261,13 @@ grpc_cc_test( grpc_cc_test( name = "latch_test", srcs = ["latch_test.cc"], - external_deps = [ - "absl/status", - "gtest", - ], + external_deps = ["gtest"], language = "c++", tags = ["promise_test"], uses_event_engine = False, uses_polling = False, deps = [ "test_wakeup_schedulers", - "//src/core:activity", - "//src/core:basic_join", "//src/core:join", "//src/core:latch", "//src/core:seq", @@ -284,10 +277,7 @@ grpc_cc_test( grpc_cc_test( name = "observable_test", srcs = ["observable_test.cc"], - external_deps = [ - "absl/status", - "gtest", - ], + external_deps = ["gtest"], language = "c++", tags = ["promise_test"], uses_event_engine = False, @@ -310,16 +300,10 @@ grpc_cc_test( uses_polling = False, deps = [ "test_wakeup_schedulers", - "//:ref_counted_ptr", - "//src/core:activity", - "//src/core:arena", - "//src/core:basic_join", - "//src/core:basic_seq", - "//src/core:event_engine_memory_allocator", "//src/core:for_each", "//src/core:join", "//src/core:map", - "//src/core:memory_quota", + "//src/core:observable", "//src/core:pipe", "//src/core:resource_quota", "//src/core:seq", @@ -337,19 +321,12 @@ grpc_cc_test( uses_polling = False, deps = [ "test_wakeup_schedulers", - "//:ref_counted_ptr", - "//src/core:activity", - "//src/core:arena", - "//src/core:basic_join", - "//src/core:basic_seq", - "//src/core:event_engine_memory_allocator", "//src/core:for_each", "//src/core:join", "//src/core:map", "//src/core:map_pipe", - "//src/core:memory_quota", + "//src/core:observable", "//src/core:pipe", - "//src/core:poll", "//src/core:resource_quota", "//src/core:seq", "//src/core:try_seq", @@ -359,24 +336,15 @@ grpc_cc_test( grpc_cc_test( name = "pipe_test", srcs = ["pipe_test.cc"], - external_deps = [ - "absl/status", - "gtest", - ], + external_deps = ["gtest"], language = "c++", tags = ["promise_test"], uses_event_engine = False, uses_polling = False, deps = [ "test_wakeup_schedulers", - "//:gpr", - "//:ref_counted_ptr", - "//src/core:activity", - "//src/core:basic_join", - "//src/core:event_engine_memory_allocator", + "//:promise", "//src/core:join", - "//src/core:map", - "//src/core:memory_quota", "//src/core:pipe", "//src/core:resource_quota", "//src/core:seq", @@ -387,34 +355,25 @@ grpc_proto_fuzzer( name = "promise_fuzzer", srcs = ["promise_fuzzer.cc"], corpus = "promise_fuzzer_corpus", - external_deps = [ - "absl/status", - "absl/types:optional", - ], language = "C++", proto = "promise_fuzzer.proto", tags = ["no_windows"], uses_polling = False, deps = [ - "//:gpr", "//:promise", "//src/core:activity", - "//src/core:basic_join", "//src/core:join", "//src/core:map", - "//src/core:poll", "//src/core:race", "//src/core:seq", + "//test/core/util:grpc_test_util", ], ) grpc_cc_test( name = "exec_ctx_wakeup_scheduler_test", srcs = ["exec_ctx_wakeup_scheduler_test.cc"], - external_deps = [ - "absl/status", - "gtest", - ], + external_deps = ["gtest"], language = "c++", tags = ["promise_test"], uses_event_engine = False, @@ -422,14 +381,16 @@ grpc_cc_test( deps = [ "//src/core:activity", "//src/core:exec_ctx_wakeup_scheduler", - "//src/core:poll", ], ) grpc_cc_test( name = "sleep_test", srcs = ["sleep_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "gtest", + "absl/synchronization", + ], language = "c++", tags = ["promise_test"], uses_event_engine = False, @@ -438,10 +399,7 @@ grpc_cc_test( "test_wakeup_schedulers", "//:exec_ctx", "//:grpc", - "//src/core:default_event_engine", - "//src/core:exec_ctx_wakeup_scheduler", - "//src/core:notification", - "//src/core:race", + "//src/core:activity", "//src/core:sleep", "//test/core/event_engine:mock_event_engine", ], @@ -451,13 +409,14 @@ grpc_cc_test( name = "try_concurrently_test", srcs = ["try_concurrently_test.cc"], external_deps = [ - "absl/status", - "absl/strings", "gtest", + "absl/status", ], language = "c++", tags = ["promise_test"], uses_event_engine = False, uses_polling = False, - deps = ["//src/core:try_concurrently"], + deps = [ + "//src/core:try_concurrently", + ], ) diff --git a/test/core/transport/chaotic_good/BUILD b/test/core/transport/chaotic_good/BUILD deleted file mode 100644 index 0f50cd10fd1..00000000000 --- a/test/core/transport/chaotic_good/BUILD +++ /dev/null @@ -1,78 +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. - -load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_package") -load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer") - -licenses(["notice"]) - -grpc_package( - name = "test/core/transport/chaotic_good", - visibility = "tests", -) - -grpc_cc_test( - name = "frame_header_test", - srcs = ["frame_header_test.cc"], - external_deps = [ - "absl/status", - "gtest", - ], - deps = ["//src/core:chaotic_good_frame_header"], -) - -grpc_fuzzer( - name = "frame_header_fuzzer", - srcs = ["frame_header_fuzzer.cc"], - corpus = "frame_header_fuzzer_corpus", - external_deps = ["absl/status:statusor"], - language = "C++", - tags = ["no_windows"], - deps = ["//src/core:chaotic_good_frame_header"], -) - -grpc_cc_test( - name = "frame_test", - srcs = ["frame_test.cc"], - external_deps = [ - "absl/status", - "absl/status:statusor", - "gtest", - ], - deps = ["//src/core:chaotic_good_frame"], -) - -grpc_fuzzer( - name = "frame_fuzzer", - srcs = ["frame_fuzzer.cc"], - corpus = "frame_fuzzer_corpus", - external_deps = ["absl/status:statusor"], - language = "C++", - tags = ["no_windows"], - deps = [ - "//:gpr", - "//:hpack_encoder", - "//:hpack_parser", - "//:ref_counted_ptr", - "//src/core:arena", - "//src/core:chaotic_good_frame", - "//src/core:chaotic_good_frame_header", - "//src/core:event_engine_memory_allocator", - "//src/core:memory_quota", - "//src/core:resource_quota", - "//src/core:slice", - "//src/core:slice_buffer", - "//test/core/promise:test_context", - ], -) diff --git a/test/core/transport/chaotic_good/frame_fuzzer.cc b/test/core/transport/chaotic_good/frame_fuzzer.cc deleted file mode 100644 index 579fa917fc5..00000000000 --- a/test/core/transport/chaotic_good/frame_fuzzer.cc +++ /dev/null @@ -1,112 +0,0 @@ -// Copyright 2022 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 -#include - -#include - -#include "absl/status/statusor.h" - -#include -#include - -#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/ext/transport/chttp2/transport/hpack_parser.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.h" -#include "src/core/lib/slice/slice_buffer.h" -#include "test/core/promise/test_context.h" - -bool squelch = false; - -namespace grpc_core { -namespace chaotic_good { - -static auto* g_memory_allocator = new MemoryAllocator( - ResourceQuota::Default()->memory_quota()->CreateMemoryAllocator("test")); - -template -void AssertRoundTrips(const T& input, FrameType expected_frame_type) { - HPackCompressor hpack_compressor; - auto serialized = input.Serialize(&hpack_compressor); - GPR_ASSERT(serialized.Length() >= 64); - GPR_ASSERT(serialized.Length() % 64 == 0); - uint8_t header_bytes[64]; - serialized.MoveFirstNBytesIntoBuffer(64, header_bytes); - auto header = FrameHeader::Parse(header_bytes); - GPR_ASSERT(header.ok()); - GPR_ASSERT(header->type == expected_frame_type); - T output; - HPackParser hpack_parser; - auto deser = output.Deserialize(&hpack_parser, header.value(), serialized); - GPR_ASSERT(deser.ok()); - GPR_ASSERT(output == input); -} - -template -void FinishParseAndChecks(const FrameHeader& header, const uint8_t* data, - size_t size) { - T parsed; - HPackParser hpack_parser; - SliceBuffer serialized; - serialized.Append(Slice::FromCopiedBuffer(data, size)); - auto deser = parsed.Deserialize(&hpack_parser, header, serialized); - if (!deser.ok()) return; - AssertRoundTrips(parsed, header.type); -} - -int Run(const uint8_t* data, size_t size) { - if (size < 1) return 0; - const bool is_server = (data[0] & 1) != 0; - size--; - data++; - if (size < 64) return 0; - auto r = FrameHeader::Parse(data); - if (!r.ok()) return 0; - size -= 64; - data += 64; - auto arena = MakeScopedArena(1024, g_memory_allocator); - TestContext ctx(arena.get()); - switch (r->type) { - default: - return 0; // We don't know how to parse this frame type. - case FrameType::kSettings: - FinishParseAndChecks(*r, data, size); - break; - case FrameType::kFragment: - if (is_server) { - FinishParseAndChecks(*r, data, size); - } else { - FinishParseAndChecks(*r, data, size); - } - break; - case FrameType::kCancel: - FinishParseAndChecks(*r, data, size); - break; - } - return 0; -} - -} // namespace chaotic_good -} // namespace grpc_core - -extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { - return grpc_core::chaotic_good::Run(data, size); -} diff --git a/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-05c704327d21af2cc914de40e9d90d06f16ca0eb b/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-05c704327d21af2cc914de40e9d90d06f16ca0eb deleted file mode 100644 index 0340f7dee017d1c99db70bcda61ea432dab08e71..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 74 ccmZQ*U}a!nbYQp!q{svR|J&OB|F82O0Ex&4LjV8( diff --git a/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-5015de8c7cafb0b0ebbbfd28c29aedd5dbfdc03a b/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-5015de8c7cafb0b0ebbbfd28c29aedd5dbfdc03a deleted file mode 100644 index 366c53025968158085863d58678bcd130f39ab81..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 66 ScmZQ*U}IolZ~$U5!G8cUK>@}9 diff --git a/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-5a34978de8de6889ce913947a77f43f7cdea854c b/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-5a34978de8de6889ce913947a77f43f7cdea854c deleted file mode 100644 index 74cb18c8e938ead8bc408336ba7cf8f0700045e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 180 kcmZQ*U}9ikaA3H`0i<+*_$&j10+1R^K#f7?KazX20O4l@H2?qr diff --git a/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-608f798a51077a8cdc45b11f335c079a81339fbe b/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-608f798a51077a8cdc45b11f335c079a81339fbe deleted file mode 100644 index 2190f6bc1859843a84a8a46d0f0d1392e9995dbd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 mcmZQ*U}9ikbYQq9!2kgYP?~h=8v_Fi>ALXgc>EnA`yT*|4h5wE diff --git a/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-6a002cb46eac21af4ab6fd74b61ff3ce26d96dff b/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-6a002cb46eac21af4ab6fd74b61ff3ce26d96dff deleted file mode 100644 index 90739c7258095c3bd8026055b6e80dd9912dac00..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 161 scmZQ*U}9ikaA3H`0i<+*_$&j10+1pBI6&0?iJnY?CZd$8G3fjU09rQ&H2?qr diff --git a/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-7732ddd35a4deb8b7c9e462aaf8680986755e540 b/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-7732ddd35a4deb8b7c9e462aaf8680986755e540 deleted file mode 100644 index 4d14b159ba6b64ea200a8dd65c0f9bfabb1a1972..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 79 ccmZQ*U}a!nbYQr~$Uq7B|KHa3|9_qT0Fc@TKL7v# diff --git a/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-c171e98ebfe8b6485f9a4bea0b9cdfe683776675 b/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-c171e98ebfe8b6485f9a4bea0b9cdfe683776675 deleted file mode 100644 index 8fa12bd3aeaf54fed89e4f4e2f08bf1bc370ae21..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 70 VcmZQ -#include -#include - -#include "absl/status/statusor.h" - -#include "src/core/ext/transport/chaotic_good/frame_header.h" - -bool squelch = false; - -extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { - if (size != 64) return 0; - auto r = grpc_core::chaotic_good::FrameHeader::Parse(data); - if (!r.ok()) return 0; - uint8_t reserialized[64]; - r->Serialize(reserialized); - // If it parses, we insist that the bytes reserialize to the same thing. - if (memcmp(data, reserialized, 64) != 0) abort(); - return 0; -} diff --git a/test/core/transport/chaotic_good/frame_header_fuzzer_corpus/0 b/test/core/transport/chaotic_good/frame_header_fuzzer_corpus/0 deleted file mode 100644 index 8b137891791..00000000000 --- a/test/core/transport/chaotic_good/frame_header_fuzzer_corpus/0 +++ /dev/null @@ -1 +0,0 @@ - diff --git a/test/core/transport/chaotic_good/frame_header_test.cc b/test/core/transport/chaotic_good/frame_header_test.cc deleted file mode 100644 index 9e941822e90..00000000000 --- a/test/core/transport/chaotic_good/frame_header_test.cc +++ /dev/null @@ -1,120 +0,0 @@ -// Copyright 2022 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/ext/transport/chaotic_good/frame_header.h" - -#include -#include -#include - -#include "absl/status/status.h" -#include "gtest/gtest.h" - -namespace grpc_core { -namespace chaotic_good { -namespace { - -std::vector Serialize(FrameHeader h) { - uint8_t buffer[64]; - h.Serialize(buffer); - return std::vector(buffer, buffer + 64); -} - -absl::StatusOr Deserialize(std::vector data) { - if (data.size() != 64) return absl::InvalidArgumentError("bad length"); - return FrameHeader::Parse(data.data()); -} - -TEST(FrameHeaderTest, SimpleSerialize) { - EXPECT_EQ( - Serialize(FrameHeader{FrameType::kCancel, BitSet<3>::FromInt(0), - 0x01020304, 0x05060708, 0x090a0b0c, 0x0d0e0f10}), - std::vector({0x81, 0, 0, 0, // type, flags - 0x04, 0x03, 0x02, 0x01, // stream_id - 0x08, 0x07, 0x06, 0x05, // header_length - 0x0c, 0x0b, 0x0a, 0x09, // message_length - 0x10, 0x0f, 0x0e, 0x0d, // trailer_length - // padding - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0})); -} - -TEST(FrameHeaderTest, SimpleDeserialize) { - EXPECT_EQ( - Deserialize(std::vector( - {0x81, 0, 0, 0, // type, flags - 0x04, 0x03, 0x02, 0x01, // stream_id - 0x08, 0x07, 0x06, 0x05, // header_length - 0x0c, 0x0b, 0x0a, 0x09, // message_length - 0x10, 0x0f, 0x0e, 0x0d, // trailer_length - // padding - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0})), - absl::StatusOr( - FrameHeader{FrameType::kCancel, BitSet<3>::FromInt(0), 0x01020304, - 0x05060708, 0x090a0b0c, 0x0d0e0f10})); - EXPECT_EQ(Deserialize(std::vector( - {0x81, 88, 88, 88, // type, flags - 0x04, 0x03, 0x02, 0x01, // stream_id - 0x08, 0x07, 0x06, 0x05, // header_length - 0x0c, 0x0b, 0x0a, 0x09, // message_length - 0x10, 0x0f, 0x0e, 0x0d, // trailer_length - // garbage padding - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0})) - .status(), - absl::InvalidArgumentError("Invalid flags")); - EXPECT_EQ(Deserialize(std::vector( - {0x81, 0, 0, 0, // type, flags - 0x04, 0x03, 0x02, 0x01, // stream_id - 0x08, 0x07, 0x06, 0x05, // header_length - 0x0c, 0x0b, 0x0a, 0x09, // message_length - 0x10, 0x0f, 0x0e, 0x0d, // trailer_length - // garbage padding - 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0})) - .status(), - absl::InvalidArgumentError("Invalid padding")); -} - -TEST(FrameHeaderTest, ComputeFrameSizes) { - EXPECT_EQ( - (FrameHeader{FrameType::kFragment, BitSet<3>::FromInt(7), 1, 0, 0, 0}) - .ComputeFrameSizes(), - (FrameSizes{0, 0, 0})); - EXPECT_EQ( - (FrameHeader{FrameType::kFragment, BitSet<3>::FromInt(7), 1, 14, 0, 0}) - .ComputeFrameSizes(), - (FrameSizes{64, 64, 64})); - EXPECT_EQ( - (FrameHeader{FrameType::kFragment, BitSet<3>::FromInt(7), 1, 0, 14, 0}) - .ComputeFrameSizes(), - (FrameSizes{0, 64, 64})); - EXPECT_EQ( - (FrameHeader{FrameType::kFragment, BitSet<3>::FromInt(7), 1, 0, 0, 14}) - .ComputeFrameSizes(), - (FrameSizes{0, 0, 64})); -} - -} // namespace -} // namespace chaotic_good -} // namespace grpc_core - -int main(int argc, char** argv) { - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/test/core/transport/chaotic_good/frame_test.cc b/test/core/transport/chaotic_good/frame_test.cc deleted file mode 100644 index bb0a89ddb2a..00000000000 --- a/test/core/transport/chaotic_good/frame_test.cc +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright 2022 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/ext/transport/chaotic_good/frame.h" - -#include - -#include "absl/status/status.h" -#include "absl/status/statusor.h" -#include "gtest/gtest.h" - -namespace grpc_core { -namespace chaotic_good { -namespace { - -template -void AssertRoundTrips(const T input, FrameType expected_frame_type) { - HPackCompressor hpack_compressor; - auto serialized = input.Serialize(&hpack_compressor); - EXPECT_GE(serialized.Length(), 64); - EXPECT_EQ(serialized.Length() % 64, 0); - uint8_t header_bytes[64]; - serialized.MoveFirstNBytesIntoBuffer(64, header_bytes); - auto header = FrameHeader::Parse(header_bytes); - EXPECT_TRUE(header.ok()) << header.status(); - EXPECT_EQ(header->type, expected_frame_type); - T output; - HPackParser hpack_parser; - auto deser = output.Deserialize(&hpack_parser, header.value(), serialized); - EXPECT_TRUE(deser.ok()) << deser; - EXPECT_EQ(output, input); -} - -TEST(FrameTest, SettingsFrameRoundTrips) { - AssertRoundTrips(SettingsFrame{}, FrameType::kSettings); -} - -} // namespace -} // namespace chaotic_good -} // namespace grpc_core - -int main(int argc, char** argv) { - ::testing::InitGoogleTest(&argc, argv); - int r = RUN_ALL_TESTS(); - return r; -} diff --git a/tools/distrib/fix_build_deps.py b/tools/distrib/fix_build_deps.py index 7267bd996d7..8398ae18b8b 100755 --- a/tools/distrib/fix_build_deps.py +++ b/tools/distrib/fix_build_deps.py @@ -409,9 +409,7 @@ for dirname in [ "test/core/util", "test/core/end2end", "test/core/event_engine", - "test/core/promise", "test/core/resource_quota", - "test/core/transport/chaotic_good", ]: parsing_path = dirname exec( diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index bd769d1ca48..eb94d87410f 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -1269,8 +1269,6 @@ src/core/ext/transport/chttp2/transport/hpack_parser_table.cc \ src/core/ext/transport/chttp2/transport/hpack_parser_table.h \ src/core/ext/transport/chttp2/transport/http2_settings.cc \ src/core/ext/transport/chttp2/transport/http2_settings.h \ -src/core/ext/transport/chttp2/transport/http_trace.cc \ -src/core/ext/transport/chttp2/transport/http_trace.h \ src/core/ext/transport/chttp2/transport/huffsyms.cc \ src/core/ext/transport/chttp2/transport/huffsyms.h \ src/core/ext/transport/chttp2/transport/internal.h \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 4efae5d7af0..35422307b1e 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -1051,8 +1051,6 @@ src/core/ext/transport/chttp2/transport/hpack_parser_table.cc \ src/core/ext/transport/chttp2/transport/hpack_parser_table.h \ src/core/ext/transport/chttp2/transport/http2_settings.cc \ src/core/ext/transport/chttp2/transport/http2_settings.h \ -src/core/ext/transport/chttp2/transport/http_trace.cc \ -src/core/ext/transport/chttp2/transport/http_trace.h \ src/core/ext/transport/chttp2/transport/huffsyms.cc \ src/core/ext/transport/chttp2/transport/huffsyms.h \ src/core/ext/transport/chttp2/transport/internal.h \ diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json index 08d750fbc5f..a87c3783b3d 100644 --- a/tools/run_tests/generated/tests.json +++ b/tools/run_tests/generated/tests.json @@ -3135,54 +3135,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": "frame_header_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "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": "frame_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "uses_polling": true - }, { "args": [], "benchmark": false,