Skip to content

Commit 93cdc8b

Browse files
authored
Revert "Revert "[transport] Remove ByteStream (grpc#29637)" (grpc#29890)" (grpc#29894)
* Revert "Revert "[transport] Remove ByteStream (grpc#29637)" (grpc#29890)" This reverts commit d539866. * Automated change: Fix sanity tests Co-authored-by: ctiller <[email protected]>
1 parent fe7e3c1 commit 93cdc8b

File tree

77 files changed

+1704
-3532
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+1704
-3532
lines changed

BUILD

+58-8
Original file line numberDiff line numberDiff line change
@@ -2384,6 +2384,23 @@ grpc_cc_library(
23842384
],
23852385
)
23862386

2387+
grpc_cc_library(
2388+
name = "bdp_estimator",
2389+
srcs = [
2390+
"src/core/lib/transport/bdp_estimator.cc",
2391+
],
2392+
hdrs = ["src/core/lib/transport/bdp_estimator.h"],
2393+
tags = ["grpc-autodeps"],
2394+
deps = [
2395+
"exec_ctx",
2396+
"gpr_base",
2397+
"gpr_codegen",
2398+
"gpr_platform",
2399+
"grpc_trace",
2400+
"time",
2401+
],
2402+
)
2403+
23872404
grpc_cc_library(
23882405
name = "percent_encoding",
23892406
srcs = [
@@ -2506,8 +2523,6 @@ grpc_cc_library(
25062523
"src/core/lib/surface/server.cc",
25072524
"src/core/lib/surface/validate_metadata.cc",
25082525
"src/core/lib/surface/version.cc",
2509-
"src/core/lib/transport/bdp_estimator.cc",
2510-
"src/core/lib/transport/byte_stream.cc",
25112526
"src/core/lib/transport/connectivity_state.cc",
25122527
"src/core/lib/transport/error_utils.cc",
25132528
"src/core/lib/transport/metadata_batch.cc",
@@ -2603,8 +2618,6 @@ grpc_cc_library(
26032618
"src/core/lib/surface/lame_client.h",
26042619
"src/core/lib/surface/server.h",
26052620
"src/core/lib/surface/validate_metadata.h",
2606-
"src/core/lib/transport/bdp_estimator.h",
2607-
"src/core/lib/transport/byte_stream.h",
26082621
"src/core/lib/transport/connectivity_state.h",
26092622
"src/core/lib/transport/metadata_batch.h",
26102623
"src/core/lib/transport/parsed_metadata.h",
@@ -3058,6 +3071,7 @@ grpc_cc_library(
30583071
"absl/types:variant",
30593072
"absl/status",
30603073
"absl/status:statusor",
3074+
"absl/utility",
30613075
"upb_lib",
30623076
],
30633077
language = "c++",
@@ -3069,6 +3083,7 @@ grpc_cc_library(
30693083
"channel_stack_type",
30703084
"chunked_vector",
30713085
"config",
3086+
"construct_destruct",
30723087
"debug_location",
30733088
"dual_ref_counted",
30743089
"error",
@@ -3100,6 +3115,7 @@ grpc_cc_library(
31003115
"server_address",
31013116
"service_config_parser",
31023117
"slice",
3118+
"slice_buffer",
31033119
"slice_refcount",
31043120
"sockaddr_utils",
31053121
"time",
@@ -3332,8 +3348,8 @@ grpc_cc_library(
33323348
"grpc_public_hdrs",
33333349
"grpc_service_config",
33343350
"json",
3335-
"orphanable",
33363351
"service_config_parser",
3352+
"slice_buffer",
33373353
],
33383354
)
33393355

@@ -3461,6 +3477,7 @@ grpc_cc_library(
34613477
"promise",
34623478
"seq",
34633479
"slice",
3480+
"slice_buffer",
34643481
"transport_fwd",
34653482
],
34663483
)
@@ -5704,14 +5721,40 @@ grpc_cc_library(
57045721
],
57055722
)
57065723

5724+
grpc_cc_library(
5725+
name = "chttp2_flow_control",
5726+
srcs = [
5727+
"src/core/ext/transport/chttp2/transport/flow_control.cc",
5728+
],
5729+
hdrs = [
5730+
"src/core/ext/transport/chttp2/transport/flow_control.h",
5731+
],
5732+
external_deps = [
5733+
"absl/status",
5734+
"absl/strings",
5735+
"absl/strings:str_format",
5736+
],
5737+
tags = ["grpc-autodeps"],
5738+
deps = [
5739+
"bdp_estimator",
5740+
"exec_ctx",
5741+
"gpr_base",
5742+
"gpr_platform",
5743+
"grpc_trace",
5744+
"memory_quota",
5745+
"pid_controller",
5746+
"time",
5747+
"useful",
5748+
],
5749+
)
5750+
57075751
grpc_cc_library(
57085752
name = "grpc_transport_chttp2",
57095753
srcs = [
57105754
"src/core/ext/transport/chttp2/transport/bin_decoder.cc",
57115755
"src/core/ext/transport/chttp2/transport/bin_encoder.cc",
57125756
"src/core/ext/transport/chttp2/transport/chttp2_transport.cc",
57135757
"src/core/ext/transport/chttp2/transport/context_list.cc",
5714-
"src/core/ext/transport/chttp2/transport/flow_control.cc",
57155758
"src/core/ext/transport/chttp2/transport/frame_data.cc",
57165759
"src/core/ext/transport/chttp2/transport/frame_goaway.cc",
57175760
"src/core/ext/transport/chttp2/transport/frame_ping.cc",
@@ -5734,7 +5777,6 @@ grpc_cc_library(
57345777
"src/core/ext/transport/chttp2/transport/bin_encoder.h",
57355778
"src/core/ext/transport/chttp2/transport/chttp2_transport.h",
57365779
"src/core/ext/transport/chttp2/transport/context_list.h",
5737-
"src/core/ext/transport/chttp2/transport/flow_control.h",
57385780
"src/core/ext/transport/chttp2/transport/frame.h",
57395781
"src/core/ext/transport/chttp2/transport/frame_data.h",
57405782
"src/core/ext/transport/chttp2/transport/frame_goaway.h",
@@ -5767,7 +5809,9 @@ grpc_cc_library(
57675809
visibility = ["@grpc:grpclb"],
57685810
deps = [
57695811
"arena",
5812+
"bdp_estimator",
57705813
"bitset",
5814+
"chttp2_flow_control",
57715815
"chunked_vector",
57725816
"debug_location",
57735817
"gpr_base",
@@ -5785,11 +5829,13 @@ grpc_cc_library(
57855829
"memory_quota",
57865830
"orphanable",
57875831
"pid_controller",
5832+
"poll",
57885833
"ref_counted",
57895834
"ref_counted_ptr",
57905835
"resource_quota",
57915836
"resource_quota_trace",
57925837
"slice",
5838+
"slice_buffer",
57935839
"slice_refcount",
57945840
"time",
57955841
"uri_parser",
@@ -5916,8 +5962,10 @@ grpc_cc_library(
59165962
"absl/status:statusor",
59175963
"absl/strings",
59185964
"absl/types:optional",
5965+
"absl/utility",
59195966
],
59205967
language = "c++",
5968+
tags = ["grpc-autodeps"],
59215969
deps = [
59225970
"arena",
59235971
"channel_args_preconditioning",
@@ -5927,11 +5975,12 @@ grpc_cc_library(
59275975
"gpr_base",
59285976
"grpc_base",
59295977
"grpc_codegen",
5978+
"grpc_public_hdrs",
59305979
"grpc_trace",
59315980
"iomgr_fwd",
5932-
"orphanable",
59335981
"ref_counted_ptr",
59345982
"slice",
5983+
"slice_buffer",
59355984
"time",
59365985
"transport_fwd",
59375986
"useful",
@@ -6516,6 +6565,7 @@ grpc_cc_library(
65166565
"grpc++_base",
65176566
"grpc_base",
65186567
"slice",
6568+
"slice_buffer",
65196569
"slice_refcount",
65206570
],
65216571
)

CMakeLists.txt

+66-68
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)