Skip to content

Commit 7e61d4e

Browse files
ctillerctiller
committed
Merge github.com:grpc/grpc into hpack-2
2 parents 515aabe + 8bab3e4 commit 7e61d4e

File tree

431 files changed

+5552
-1772
lines changed

Some content is hidden

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

431 files changed

+5552
-1772
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: Report a bug
33
about: Create a report to help us improve
44
labels: kind/bug, priority/P2
5-
assignees: nicolasnoble
5+
assignees: drfloob
66

77
---
88

‎.github/ISSUE_TEMPLATE/cleanup_request.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: Request a cleanup
33
about: Suggest a cleanup in our repository
44
labels: kind/internal cleanup, priority/P2
5-
assignees: nicolasnoble
5+
assignees: drfloob
66

77
---
88

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: Request a feature
33
about: Suggest an idea for this project
44
labels: kind/enhancement, priority/P2
5-
assignees: nicolasnoble
5+
assignees: drfloob
66

77
---
88

‎.github/ISSUE_TEMPLATE/question.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: Ask a question
33
about: Ask a question
44
labels: kind/question, priority/P3
5-
assignees: nicolasnoble
5+
assignees: drfloob
66

77
---
88

‎.github/pull_request_template.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ If you know who should review your pull request, please remove the mentioning be
88
99
-->
1010

11-
@nicolasnoble
11+
@drfloob

‎.pylintrc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,5 +95,7 @@ disable=
9595
no-else-return,
9696
# NOTE(lidiz): Python 3 make object inheritance default, but not PY2
9797
useless-object-inheritance,
98+
# NOTE(lidiz): the import order will be enforced by isort instead
99+
wrong-import-order,
98100
# NOTE(sergiitk): yapf compatibility, ref #25071
99101
bad-continuation,

‎.pylintrc-examples‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,5 +98,7 @@ disable=
9898
no-else-return,
9999
# NOTE(lidiz): Python 3 make object inheritance default, but not PY2
100100
useless-object-inheritance,
101+
# NOTE(lidiz): the import order will be enforced by isort instead
102+
wrong-import-order,
101103
# NOTE(sergiitk): yapf compatibility, ref #25071
102104
bad-continuation,

‎.pylintrc-tests‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,5 +124,7 @@ disable=
124124
no-else-return,
125125
# NOTE(lidiz): Python 3 make object inheritance default, but not PY2
126126
useless-object-inheritance,
127+
# NOTE(lidiz): the import order will be enforced by isort instead
128+
wrong-import-order,
127129
# NOTE(sergiitk): yapf compatibility, ref #25071
128130
bad-continuation,

‎BUILD‎

Lines changed: 61 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,16 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
licenses(["notice"])
17+
load(
18+
"//bazel:grpc_build_system.bzl",
19+
"grpc_cc_library",
20+
"grpc_generate_one_off_targets",
21+
"grpc_upb_proto_library",
22+
"python_config_settings",
23+
)
24+
load("@bazel_skylib//lib:selects.bzl", "selects")
1825

19-
exports_files([
20-
"LICENSE",
21-
"etc/roots.pem",
22-
])
26+
licenses(["notice"])
2327

2428
package(
2529
default_visibility = ["//visibility:public"],
@@ -29,24 +33,44 @@ package(
2933
],
3034
)
3135

32-
load(
33-
"//bazel:grpc_build_system.bzl",
34-
"grpc_cc_library",
35-
"grpc_generate_one_off_targets",
36-
"grpc_upb_proto_library",
37-
"python_config_settings",
38-
)
36+
exports_files([
37+
"LICENSE",
38+
"etc/roots.pem",
39+
])
3940

4041
config_setting(
4142
name = "grpc_no_ares",
4243
values = {"define": "grpc_no_ares=true"},
4344
)
4445

4546
config_setting(
46-
name = "grpc_no_xds",
47+
name = "grpc_no_xds_define",
4748
values = {"define": "grpc_no_xds=true"},
4849
)
4950

51+
config_setting(
52+
name = "android",
53+
values = {"crosstool_top": "//external:android/crosstool"},
54+
)
55+
56+
config_setting(
57+
name = "ios",
58+
values = {"apple_platform_type": "ios"},
59+
)
60+
61+
selects.config_setting_group(
62+
name = "grpc_no_xds",
63+
match_any = [
64+
":grpc_no_xds_define",
65+
# In addition to disabling XDS support when --define=grpc_no_xds=true is
66+
# specified, we also disable it on mobile platforms where it is not
67+
# likely to be needed and where reducing the binary size is more
68+
# important.
69+
":android",
70+
":ios",
71+
],
72+
)
73+
5074
config_setting(
5175
name = "grpc_allow_exceptions",
5276
values = {"define": "GRPC_ALLOW_EXCEPTIONS=1"},
@@ -776,6 +800,26 @@ grpc_cc_library(
776800
],
777801
)
778802

803+
grpc_cc_library(
804+
name = "table",
805+
external_deps = ["absl/utility"],
806+
language = "c++",
807+
public_hdrs = ["src/core/lib/gprpp/table.h"],
808+
deps = [
809+
"bitset",
810+
"gpr_platform",
811+
],
812+
)
813+
814+
grpc_cc_library(
815+
name = "bitset",
816+
language = "c++",
817+
public_hdrs = ["src/core/lib/gprpp/bitset.h"],
818+
deps = [
819+
"gpr_platform",
820+
],
821+
)
822+
779823
grpc_cc_library(
780824
name = "orphanable",
781825
language = "c++",
@@ -855,7 +899,6 @@ grpc_cc_library(
855899
"src/core/lib/debug/stats_data.cc",
856900
"src/core/lib/event_engine/endpoint_config.cc",
857901
"src/core/lib/event_engine/event_engine.cc",
858-
"src/core/lib/event_engine/slice_allocator.cc",
859902
"src/core/lib/event_engine/sockaddr.cc",
860903
"src/core/lib/http/format_request.cc",
861904
"src/core/lib/http/httpcli.cc",
@@ -2447,6 +2490,7 @@ grpc_cc_library(
24472490
"src/core/ext/transport/chttp2/transport/bin_decoder.cc",
24482491
"src/core/ext/transport/chttp2/transport/bin_encoder.cc",
24492492
"src/core/ext/transport/chttp2/transport/chttp2_plugin.cc",
2493+
"src/core/ext/transport/chttp2/transport/chttp2_slice_allocator.cc",
24502494
"src/core/ext/transport/chttp2/transport/chttp2_transport.cc",
24512495
"src/core/ext/transport/chttp2/transport/context_list.cc",
24522496
"src/core/ext/transport/chttp2/transport/flow_control.cc",
@@ -2471,6 +2515,7 @@ grpc_cc_library(
24712515
hdrs = [
24722516
"src/core/ext/transport/chttp2/transport/bin_decoder.h",
24732517
"src/core/ext/transport/chttp2/transport/bin_encoder.h",
2518+
"src/core/ext/transport/chttp2/transport/chttp2_slice_allocator.h",
24742519
"src/core/ext/transport/chttp2/transport/chttp2_transport.h",
24752520
"src/core/ext/transport/chttp2/transport/context_list.h",
24762521
"src/core/ext/transport/chttp2/transport/flow_control.h",
@@ -2492,6 +2537,8 @@ grpc_cc_library(
24922537
"src/core/ext/transport/chttp2/transport/varint.h",
24932538
],
24942539
external_deps = [
2540+
"absl/memory",
2541+
"absl/status",
24952542
"absl/strings:str_format",
24962543
"absl/strings",
24972544
],

‎BUILD.gn‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,8 @@ config("grpc_config") {
398398
"src/core/ext/transport/chttp2/transport/bin_encoder.cc",
399399
"src/core/ext/transport/chttp2/transport/bin_encoder.h",
400400
"src/core/ext/transport/chttp2/transport/chttp2_plugin.cc",
401+
"src/core/ext/transport/chttp2/transport/chttp2_slice_allocator.cc",
402+
"src/core/ext/transport/chttp2/transport/chttp2_slice_allocator.h",
401403
"src/core/ext/transport/chttp2/transport/chttp2_transport.cc",
402404
"src/core/ext/transport/chttp2/transport/chttp2_transport.h",
403405
"src/core/ext/transport/chttp2/transport/context_list.cc",
@@ -869,7 +871,6 @@ config("grpc_config") {
869871
"src/core/lib/event_engine/endpoint_config.cc",
870872
"src/core/lib/event_engine/endpoint_config_internal.h",
871873
"src/core/lib/event_engine/event_engine.cc",
872-
"src/core/lib/event_engine/slice_allocator.cc",
873874
"src/core/lib/event_engine/sockaddr.cc",
874875
"src/core/lib/event_engine/sockaddr.h",
875876
"src/core/lib/gprpp/atomic.h",

0 commit comments

Comments
 (0)