Skip to content

Commit

Permalink
Merge branch 'cg-con' into shush-chaos
Browse files Browse the repository at this point in the history
  • Loading branch information
ctiller committed Jan 21, 2024
2 parents 733b2f3 + e87da34 commit 14d109b
Show file tree
Hide file tree
Showing 15 changed files with 1,497 additions and 9 deletions.
130 changes: 130 additions & 0 deletions src/core/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -6371,6 +6371,25 @@ grpc_cc_library(
],
)

grpc_cc_library(
name = "chaotic_good_settings_metadata",
srcs = [
"ext/transport/chaotic_good/settings_metadata.cc",
],
hdrs = [
"ext/transport/chaotic_good/settings_metadata.h",
],
external_deps = [
"absl/status",
"absl/types:optional",
],
deps = [
"arena",
"metadata_batch",
"//:gpr",
],
)

grpc_cc_library(
name = "chaotic_good_frame_header",
srcs = [
Expand Down Expand Up @@ -6627,6 +6646,7 @@ grpc_cc_library(
"chaotic_good_transport",
"context",
"default_event_engine",
"error_utils",
"event_engine_wakeup_scheduler",
"for_each",
"grpc_promise_endpoint",
Expand Down Expand Up @@ -6825,6 +6845,116 @@ grpc_cc_library(
],
)

grpc_cc_library(
name = "chaotic_good_server",
srcs = [
"ext/transport/chaotic_good/server/chaotic_good_server.cc",
],
hdrs = [
"ext/transport/chaotic_good/server/chaotic_good_server.h",
],
external_deps = [
"absl/container:flat_hash_map",
"absl/random",
"absl/random:bit_gen_ref",
"absl/status",
"absl/status:statusor",
],
language = "c++",
deps = [
"activity",
"arena",
"channel_args",
"channel_args_endpoint_config",
"chaotic_good_frame",
"chaotic_good_frame_header",
"chaotic_good_settings_metadata",
"closure",
"context",
"default_event_engine",
"error",
"event_engine_tcp_socket_utils",
"event_engine_wakeup_scheduler",
"grpc_promise_endpoint",
"if",
"iomgr_fwd",
"latch",
"memory_quota",
"metadata",
"metadata_batch",
"race",
"resource_quota",
"sleep",
"slice",
"slice_buffer",
"status_helper",
"time",
"try_seq",
"//:gpr",
"//:gpr_platform",
"//:grpc_base",
"//:handshaker",
"//:hpack_encoder",
"//:hpack_parser",
"//:orphanable",
"//:ref_counted_ptr",
],
)

grpc_cc_library(
name = "chaotic_good_connector",
srcs = [
"ext/transport/chaotic_good/client/chaotic_good_connector.cc",
],
hdrs = [
"ext/transport/chaotic_good/client/chaotic_good_connector.h",
],
external_deps = [
"absl/random",
"absl/random:bit_gen_ref",
"absl/status",
"absl/status:statusor",
],
language = "c++",
deps = [
"activity",
"arena",
"channel_args",
"channel_args_endpoint_config",
"chaotic_good_frame",
"chaotic_good_frame_header",
"chaotic_good_settings_metadata",
"closure",
"context",
"default_event_engine",
"error",
"event_engine_wakeup_scheduler",
"grpc_promise_endpoint",
"latch",
"memory_quota",
"metadata_batch",
"notification",
"race",
"resource_quota",
"sleep",
"slice",
"slice_buffer",
"time",
"try_seq",
"wait_for_callback",
"//:debug_location",
"//:exec_ctx",
"//:gpr",
"//:gpr_platform",
"//:grpc_base",
"//:grpc_client_channel",
"//:handshaker",
"//:hpack_encoder",
"//:hpack_parser",
"//:ref_counted_ptr",
],
)

### UPB Targets

grpc_upb_proto_library(
Expand Down
3 changes: 3 additions & 0 deletions src/core/ext/filters/client_channel/connector.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ class SubchannelConnector : public InternallyRefCounted<SubchannelConnector> {
}
};

SubchannelConnector()
: InternallyRefCounted<SubchannelConnector>("SubchannelConnector") {}

// Attempts to connect.
// When complete, populates *result and invokes notify.
// Only one connection attempt may be in progress at any one time.
Expand Down
Loading

0 comments on commit 14d109b

Please sign in to comment.