Skip to content

Commit bfea470

Browse files
ctillerctiller
authored
Revert "[chttp2] Improve huffman decode efficiency (#30479)" (#30961)
This reverts commit 6c7f921.
1 parent c9506a4 commit bfea470

46 files changed

Lines changed: 313 additions & 3453 deletions

Some content is hidden

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

‎BUILD‎

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6809,28 +6809,6 @@ grpc_cc_library(
68096809
],
68106810
)
68116811

6812-
grpc_cc_library(
6813-
name = "huffsyms",
6814-
srcs = [
6815-
"src/core/ext/transport/chttp2/transport/huffsyms.cc",
6816-
],
6817-
hdrs = [
6818-
"src/core/ext/transport/chttp2/transport/huffsyms.h",
6819-
],
6820-
deps = ["gpr_platform"],
6821-
)
6822-
6823-
grpc_cc_library(
6824-
name = "decode_huff",
6825-
srcs = [
6826-
"src/core/ext/transport/chttp2/transport/decode_huff.cc",
6827-
],
6828-
hdrs = [
6829-
"src/core/ext/transport/chttp2/transport/decode_huff.h",
6830-
],
6831-
deps = ["gpr_platform"],
6832-
)
6833-
68346812
grpc_cc_library(
68356813
name = "http2_settings",
68366814
srcs = [
@@ -6862,6 +6840,7 @@ grpc_cc_library(
68626840
"src/core/ext/transport/chttp2/transport/hpack_encoder.cc",
68636841
"src/core/ext/transport/chttp2/transport/hpack_parser.cc",
68646842
"src/core/ext/transport/chttp2/transport/hpack_parser_table.cc",
6843+
"src/core/ext/transport/chttp2/transport/huffsyms.cc",
68656844
"src/core/ext/transport/chttp2/transport/parsing.cc",
68666845
"src/core/ext/transport/chttp2/transport/stream_lists.cc",
68676846
"src/core/ext/transport/chttp2/transport/stream_map.cc",
@@ -6883,6 +6862,7 @@ grpc_cc_library(
68836862
"src/core/ext/transport/chttp2/transport/hpack_encoder.h",
68846863
"src/core/ext/transport/chttp2/transport/hpack_parser.h",
68856864
"src/core/ext/transport/chttp2/transport/hpack_parser_table.h",
6865+
"src/core/ext/transport/chttp2/transport/huffsyms.h",
68866866
"src/core/ext/transport/chttp2/transport/internal.h",
68876867
"src/core/ext/transport/chttp2/transport/stream_map.h",
68886868
"src/core/ext/transport/chttp2/transport/varint.h",
@@ -6905,7 +6885,6 @@ grpc_cc_library(
69056885
"bitset",
69066886
"chttp2_flow_control",
69076887
"debug_location",
6908-
"decode_huff",
69096888
"experiments",
69106889
"gpr",
69116890
"gpr_atm",
@@ -6918,7 +6897,6 @@ grpc_cc_library(
69186897
"http2_errors",
69196898
"http2_settings",
69206899
"httpcli",
6921-
"huffsyms",
69226900
"iomgr_fwd",
69236901
"iomgr_timer",
69246902
"memory_quota",

‎CMakeLists.txt‎

Lines changed: 29 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Makefile‎

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bazel/experiments.bzl‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ EXPERIMENTS = {
2020
"dbg": {
2121
},
2222
"off": {
23-
"core_end2end_tests": [
24-
"new_hpack_huffman_decoder",
25-
],
2623
"endpoint_test": [
2724
"tcp_frame_size_tuning",
2825
"tcp_rcv_lowat",
@@ -35,9 +32,6 @@ EXPERIMENTS = {
3532
"tcp_rcv_lowat",
3633
"tcp_read_chunks",
3734
],
38-
"hpack_test": [
39-
"new_hpack_huffman_decoder",
40-
],
4135
"resource_quota_test": [
4236
"memory_pressure_controller",
4337
"periodic_resource_quota_reclamation",

‎build_autogenerated.yaml‎

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build_handwritten.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,16 @@ settings:
1717
g_stands_for: galley
1818
protobuf_version: 3.21.5
1919
version: 1.50.0-dev
20+
targets:
21+
- name: gen_hpack_tables
22+
build: tool
23+
language: c++
24+
src:
25+
- tools/codegen/core/gen_hpack_tables.cc
26+
deps:
27+
- grpc
28+
- gpr
29+
uses_polling: false
2030
configs:
2131
asan:
2232
CC: clang

‎config.m4‎

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config.w32‎

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gRPC-C++.podspec‎

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gRPC-Core.podspec‎

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)