Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into pick_first_tf_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
markdroth committed Aug 15, 2023
2 parents 1ffedaf + cbe6c80 commit 9baeaf9
Show file tree
Hide file tree
Showing 664 changed files with 30,169 additions and 5,444 deletions.
4 changes: 4 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,8 @@ Language: ObjC
BasedOnStyle: Google
ColumnLimit: 100
ObjCBlockIndentWidth: 2
---
Language: Proto
BasedOnStyle: Google
ColumnLimit: 100
...
6 changes: 6 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
bazel-bin
bazel-grpc
bazel-out
build
.cache
.git
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ coverage

# vim temp files
.*.swp
.*.swo

# Makefile's cache
cache.mk
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@
[submodule "third_party/googletest"]
path = third_party/googletest
url = https://github.com/google/googletest.git
[submodule "third_party/libuv"]
path = third_party/libuv
url = https://github.com/libuv/libuv.git
[submodule "third_party/opencensus-proto"]
path = third_party/opencensus-proto
url = https://github.com/census-instrumentation/opencensus-proto.git
Expand Down
58 changes: 49 additions & 9 deletions BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -211,11 +211,11 @@ config_setting(
python_config_settings()

# This should be updated along with build_handwritten.yaml
g_stands_for = "grounded" # @unused
g_stands_for = "goku" # @unused

core_version = "33.0.0" # @unused
core_version = "34.0.0" # @unused

version = "1.57.0-dev" # @unused
version = "1.58.0-dev" # @unused

GPR_PUBLIC_HDRS = [
"include/grpc/support/alloc.h",
Expand Down Expand Up @@ -552,6 +552,7 @@ grpc_cc_library(
],
visibility = ["@grpc:public"],
deps = [
"channel_arg_names",
"channel_stack_builder",
"config",
"exec_ctx",
Expand Down Expand Up @@ -624,6 +625,7 @@ grpc_cc_library(
"@grpc:public",
],
deps = [
"channel_arg_names",
"channel_stack_builder",
"config",
"exec_ctx",
Expand Down Expand Up @@ -837,7 +839,10 @@ grpc_cc_library(
"avoid_dep",
"nofixdeps",
],
deps = ["gpr_public_hdrs"],
deps = [
"channel_arg_names",
"gpr_public_hdrs",
],
)

grpc_cc_library(
Expand All @@ -860,6 +865,11 @@ grpc_cc_library(
],
)

grpc_cc_library(
name = "channel_arg_names",
hdrs = ["include/grpc/impl/channel_arg_names.h"],
)

grpc_cc_library(
name = "grpc++",
hdrs = [
Expand Down Expand Up @@ -1258,6 +1268,7 @@ grpc_cc_library(
"nofixdeps",
],
deps = [
"channel_arg_names",
"gpr",
],
)
Expand Down Expand Up @@ -1496,6 +1507,7 @@ grpc_cc_library(
public_hdrs = GRPC_PUBLIC_HDRS + GRPC_PUBLIC_EVENT_ENGINE_HDRS,
visibility = ["@grpc:alt_grpc_base_legacy"],
deps = [
"channel_arg_names",
"channel_stack_builder",
"config",
"config_vars",
Expand All @@ -1522,8 +1534,6 @@ grpc_cc_library(
"//src/core:arena",
"//src/core:arena_promise",
"//src/core:atomic_utils",
"//src/core:basic_join",
"//src/core:basic_seq",
"//src/core:bitset",
"//src/core:cancel_callback",
"//src/core:channel_args",
Expand Down Expand Up @@ -1566,7 +1576,6 @@ grpc_cc_library(
"//src/core:memory_quota",
"//src/core:metadata_compression_traits",
"//src/core:no_destruct",
"//src/core:notification",
"//src/core:packed_table",
"//src/core:per_cpu",
"//src/core:pipe",
Expand All @@ -1591,7 +1600,6 @@ grpc_cc_library(
"//src/core:thread_quota",
"//src/core:time",
"//src/core:transport_fwd",
"//src/core:try_join",
"//src/core:try_seq",
"//src/core:type_list",
"//src/core:useful",
Expand Down Expand Up @@ -1659,6 +1667,7 @@ grpc_cc_library(
],
tags = ["nofixdeps"],
deps = [
"channel_arg_names",
"gpr",
"gpr_platform",
"grpc",
Expand Down Expand Up @@ -1772,6 +1781,7 @@ grpc_cc_library(
public_hdrs = GRPC_PUBLIC_HDRS,
visibility = ["@grpc:public"],
deps = [
"channel_arg_names",
"config",
"debug_location",
"exec_ctx",
Expand All @@ -1788,7 +1798,6 @@ grpc_cc_library(
"//src/core:activity",
"//src/core:arena",
"//src/core:arena_promise",
"//src/core:basic_seq",
"//src/core:channel_args",
"//src/core:channel_fwd",
"//src/core:closure",
Expand Down Expand Up @@ -1922,6 +1931,7 @@ grpc_cc_library(
tags = ["nofixdeps"],
visibility = ["@grpc:alt_grpc++_base_legacy"],
deps = [
"channel_arg_names",
"channel_stack_builder",
"config",
"exec_ctx",
Expand Down Expand Up @@ -1997,6 +2007,7 @@ grpc_cc_library(
],
visibility = ["@grpc:alt_grpc++_base_unsecure_legacy"],
deps = [
"channel_arg_names",
"channel_stack_builder",
"config",
"exec_ctx",
Expand Down Expand Up @@ -3008,6 +3019,7 @@ grpc_cc_library(
visibility = ["@grpc:client_channel"],
deps = [
"backoff",
"channel_arg_names",
"channel_stack_builder",
"config",
"config_vars",
Expand Down Expand Up @@ -3110,6 +3122,7 @@ grpc_cc_library(
language = "c++",
deps = [
"backoff",
"channel_arg_names",
"config",
"config_vars",
"debug_location",
Expand Down Expand Up @@ -3217,6 +3230,7 @@ grpc_cc_library(
visibility = ["@grpc:public"],
deps = [
"alts_util",
"channel_arg_names",
"debug_location",
"exec_ctx",
"gpr",
Expand Down Expand Up @@ -3479,6 +3493,7 @@ grpc_cc_library(
language = "c++",
visibility = ["@grpc:public"],
deps = [
"channel_arg_names",
"config_vars",
"gpr",
"grpc_base",
Expand Down Expand Up @@ -3523,6 +3538,7 @@ grpc_cc_library(
language = "c++",
visibility = ["@grpc:http"],
deps = [
"channel_arg_names",
"channel_stack_builder",
"config",
"gpr",
Expand Down Expand Up @@ -3912,6 +3928,7 @@ grpc_cc_library(
language = "c++",
visibility = ["@grpc:grpclb"],
deps = [
"channel_arg_names",
"chttp2_context_list_entry",
"chttp2_frame",
"chttp2_varint",
Expand Down Expand Up @@ -3943,7 +3960,10 @@ grpc_cc_library(
"//src/core:init_internally",
"//src/core:iomgr_fwd",
"//src/core:iomgr_port",
"//src/core:match",
"//src/core:memory_quota",
"//src/core:ping_abuse_policy",
"//src/core:ping_rate_policy",
"//src/core:poll",
"//src/core:ref_counted",
"//src/core:resource_quota",
Expand Down Expand Up @@ -3978,6 +3998,26 @@ grpc_cc_library(
],
)

grpc_cc_library(
name = "subprocess",
srcs = [
"//src/core:lib/gpr/subprocess_posix.cc",
"//src/core:lib/gpr/subprocess_windows.cc",
],
hdrs = [
"//src/core:lib/gpr/subprocess.h",
],
external_deps = [
"absl/strings",
"absl/types:span",
],
deps = [
"gpr",
"//src/core:strerror",
"//src/core:tchar",
],
)

# TODO(yashykt): Remove the UPB definitions from here once they are no longer needed
### UPB Targets

Expand Down
Loading

0 comments on commit 9baeaf9

Please sign in to comment.