Client-side Load reporting via [LRS](https://github.com/envoyproxy/data-plane-api/blob/master/envoy/service/load_stats/v2/lrs.proto)
| [A27](https://github.com/grpc/proposal/blob/master/A27-xds-global-load-balancing.md) | v1.30.0 | v1.30.0 | v1.30.0 | v1.2.0 |
-Request matching based on:
[Path](https://www.envoyproxy.io/docs/envoy/latest/api-v2/api/v2/route/route_components.proto#route-routematch) (prefix, full path and safe regex)
[case_sensitive](https://www.envoyproxy.io/docs/envoy/latest/api-v2/api/v2/route/route_components.proto#route-routematch) must be true else config is NACKed
Request routing to multiple clusters based on [weights](https://www.envoyproxy.io/docs/envoy/latest/api-v2/api/v2/route/route_components.proto#route-weightedcluster) | [A28](https://github.com/grpc/proposal/blob/master/A28-xds-traffic-splitting-and-routing.md) | v1.31.0 | v1.31.0 | v1.31.0 | |
-Case insensitive prefix/full path matching:
[case_sensitive](https://www.envoyproxy.io/docs/envoy/latest/api-v2/api/v2/route/route_components.proto#route-routematch) can be true or false
| | v1.34.0 | v1.34.0 | v1.34.0 | |
+Request matching based on:
[Path](https://www.envoyproxy.io/docs/envoy/latest/api-v2/api/v2/route/route_components.proto#route-routematch) (prefix, full path and safe regex)
[case_sensitive](https://www.envoyproxy.io/docs/envoy/latest/api-v2/api/v2/route/route_components.proto#route-routematch) must be true else config is NACKed
| [A32](https://github.com/grpc/proposal/blob/master/A32-xds-circuit-breaking.md) | v1.37.1 (N/A for PHP) | v1.37.0 | v1.37.0 | |
+[Fault Injection](https://www.envoyproxy.io/docs/envoy/latest/api-v3/extensions/filters/http/fault/v3/fault.proto): Only the following fields are supported:
delay
abort
max_active_faults
headers
| [A33](https://github.com/grpc/proposal/blob/master/A33-Fault-Injection.md) | v1.37.1 | v1.37.0 | v1.37.0 | |
+[Client Status Discovery Service](https://github.com/envoyproxy/envoy/blob/main/api/envoy/service/status/v3/csds.proto) | [A40](https://github.com/grpc/proposal/blob/master/A40-csds-support.md) | v1.37.1 (Only C++) | v1.37.0 | v1.37.0 | |
diff --git a/doc/interop-test-descriptions.md b/doc/interop-test-descriptions.md
index f7fbb48148a..524ccf52c67 100755
--- a/doc/interop-test-descriptions.md
+++ b/doc/interop-test-descriptions.md
@@ -35,7 +35,10 @@ Clients should accept these arguments:
* OAuth scope. For example, "https://www.googleapis.com/auth/xapi.zoo"
* --service_account_key_file=PATH
* The path to the service account JSON key file generated from GCE developer
- console.
+ console.
+* --service_config_json=SERVICE_CONFIG_JSON
+ * Disables service config lookups and sets the provided string as the
+ default service config.
Clients must support TLS with ALPN. Clients must not disable certificate
checking.
diff --git a/doc/keepalive.md b/doc/keepalive.md
index b598a2822df..f773bd87b94 100644
--- a/doc/keepalive.md
+++ b/doc/keepalive.md
@@ -4,25 +4,27 @@ The keepalive ping is a way to check if a channel is currently working by sendin
This guide documents the knobs within gRPC core to control the current behavior of the keepalive ping.
-The keepalive ping is controlled by two important channel arguments -
+The keepalive ping in core is controlled by the following channel arguments -
* **GRPC_ARG_KEEPALIVE_TIME_MS**
* This channel argument controls the period (in milliseconds) after which a keepalive ping is sent on the transport.
* **GRPC_ARG_KEEPALIVE_TIMEOUT_MS**
* This channel argument controls the amount of time (in milliseconds) the sender of the keepalive ping waits for an acknowledgement. If it does not receive an acknowledgment within this time, it will close the connection.
-
-The above two channel arguments should be sufficient for most users, but the following arguments can also be useful in certain use cases.
-
+* **GRPC_ARG_HTTP2_MAX_PINGS_WITHOUT_DATA**
+ * This channel argument controls the maximum number of pings that can be sent when there is no data/header frame to be sent. gRPC Core will not continue sending pings if we run over the limit. Setting it to 0 allows sending pings without such a restriction. (Note that this is an unfortunate setting that does not agree with [A8-client-side-keepalive.md](https://github.com/grpc/proposal/blob/master/A8-client-side-keepalive.md). There should ideally be no such restriction on the keepalive ping and we plan to deprecate it in the future.)
* **GRPC_ARG_KEEPALIVE_PERMIT_WITHOUT_CALLS**
* This channel argument if set to 1 (0 : false; 1 : true), allows keepalive pings to be sent even if there are no calls in flight.
-* **GRPC_ARG_HTTP2_MAX_PINGS_WITHOUT_DATA**
- * This channel argument controls the maximum number of pings that can be sent when there is no data/header frame to be sent. GRPC Core will not continue sending pings if we run over the limit. Setting it to 0 allows sending pings without such a restriction.
+
+On the server-side, the following additional channel arguments need to be configured -
+
* **GRPC_ARG_HTTP2_MIN_RECV_PING_INTERVAL_WITHOUT_DATA_MS**
* If there are no data/header frames being sent on the transport, this channel argument on the server side controls the minimum time (in milliseconds) that gRPC Core would expect between receiving successive pings. If the time between successive pings is less that than this time, then the ping will be considered a bad ping from the peer. Such a ping counts as a ‘ping strike’.
On the client side, this does not have any effect.
* **GRPC_ARG_HTTP2_MAX_PING_STRIKES**
* This arg controls the maximum number of bad pings that the server will tolerate before sending an HTTP2 GOAWAY frame and closing the transport. Setting it to 0 allows the server to accept any number of bad pings.
+**IMPORTANT NOTE** - For keepalive to work properly and as intended, all of the above channel arguments should be configured appropriately. The client-side keepalive settings should also be in agreement with the server-side settings. If a client sends pings more often than the server is willing to accept, the connection will be terminated with a GOAWAY frame with "too_many_pings" as the debug data.
+
### Defaults Values
Channel Argument| Client|Server
@@ -46,3 +48,7 @@ GRPC_ARG_HTTP2_MAX_PING_STRIKES|N/A|2
* A server sends a GOAWAY with `ENHANCE_YOUR_CALM` if the client sends too many misbehaving pings as described in [A8-client-side-keepalive.md](https://github.com/grpc/proposal/blob/master/A8-client-side-keepalive.md). Some scenarios where this can happen are -
* if a server has `GRPC_ARG_KEEPALIVE_PERMIT_WITHOUT_CALLS` set to false while the client has set this to true resulting in keepalive pings being sent even when there is no call in flight.
* if the client's `GRPC_ARG_KEEPALIVE_TIME_MS` setting is lower than the server's `GRPC_ARG_HTTP2_MIN_RECV_PING_INTERVAL_WITHOUT_DATA_MS`.
+* Why is my client not sending keepalive pings even after configuring `GRPC_ARG_KEEPALIVE_TIME_MS` and `GRPC_ARG_KEEPALIVE_TIMEOUT_MS`?
+ * This can happen in the following cases -
+ * There are no RPCs in flight and `GRPC_ARG_KEEPALIVE_PERMIT_WITHOUT_CALLS` has not been set to 1(defaults to 0). If we require the endpoint to be able to send pings even when there are no ongoing RPCs, `GRPC_ARG_KEEPALIVE_PERMIT_WITHOUT_CALLS` should be set to 1 as documented above.
+ * When there isn't any data/header being sent on the transport, gRPC clients restrict the number of pings to 2 by default. Setting `GRPC_ARG_HTTP2_MAX_PINGS_WITHOUT_DATA` to 0 will remove this limit.
diff --git a/doc/python/sphinx/grpc_admin.rst b/doc/python/sphinx/grpc_admin.rst
new file mode 100644
index 00000000000..40ae9f0ba0e
--- /dev/null
+++ b/doc/python/sphinx/grpc_admin.rst
@@ -0,0 +1,14 @@
+gRPC Admin
+==========
+
+What is gRPC Admin?
+---------------------------------------------
+
+It's a convenient API to improve the usability of creating a gRPC server with admin services to expose states in the gRPC library.
+
+Design Document `gRPC Admin Interface `_
+
+Module Contents
+---------------
+
+.. automodule:: grpc_admin
diff --git a/doc/python/sphinx/grpc_asyncio.rst b/doc/python/sphinx/grpc_asyncio.rst
index b0ba347cd9b..39584c3a045 100644
--- a/doc/python/sphinx/grpc_asyncio.rst
+++ b/doc/python/sphinx/grpc_asyncio.rst
@@ -76,6 +76,11 @@ gRPC Exceptions
.. autoexception:: InternalError
.. autoexception:: AioRpcError
+gRPC Metadata
+^^^^^^^^^^^^^
+
+.. autoclass:: Metadata
+
Shared Context
^^^^^^^^^^^^^^^^^^^^
diff --git a/doc/python/sphinx/grpc_csds.rst b/doc/python/sphinx/grpc_csds.rst
new file mode 100644
index 00000000000..e1550c7ff01
--- /dev/null
+++ b/doc/python/sphinx/grpc_csds.rst
@@ -0,0 +1,14 @@
+gRPC CSDS
+=========
+
+What is gRPC CSDS?
+---------------------------------------------
+
+In short, it's a xDS configuration dump protocol.
+
+Design Document `gRPC CSDS `_
+
+Module Contents
+---------------
+
+.. automodule:: grpc_csds
diff --git a/doc/python/sphinx/index.rst b/doc/python/sphinx/index.rst
index c033542cf27..2bdd60b826d 100644
--- a/doc/python/sphinx/index.rst
+++ b/doc/python/sphinx/index.rst
@@ -11,7 +11,9 @@ API Reference
grpc
grpc_asyncio
+ grpc_admin
grpc_channelz
+ grpc_csds
grpc_health_checking
grpc_reflection
grpc_status
diff --git a/doc/service_config.md b/doc/service_config.md
index 928f27bcd80..57f5e1989e8 100644
--- a/doc/service_config.md
+++ b/doc/service_config.md
@@ -8,12 +8,38 @@ parameters to be automatically used by all clients of their service.
# Format
-The format of the service config is defined by the
+The fields of the service config are defined by the
[`grpc.service_config.ServiceConfig` protocol buffer
message](https://github.com/grpc/grpc-proto/blob/master/grpc/service_config/service_config.proto).
Note that new fields may be added in the future as new functionality is
introduced.
+Internally, gRPC uses the service config in JSON form. The JSON
+representation is the result of converting the protobuf form into JSON
+using the normal [protobuf to JSON translation
+rules](https://developers.google.com/protocol-buffers/docs/proto3#json).
+In particular, this means:
+- Field names are converted from `snake_case` to `camelCase`.
+- Field values are converted as per the documented translation rules:
+ - Strings, 32-bit integers, and bools are converted into the
+ corresponding JSON types.
+ - 64-bit integers are converted into strings (e.g., `"251"`).
+ - The value of a repeated field will be represented as a JSON array.
+ - The value of a `google.protobuf.Duration` will be represented as a
+ string containing a decimal number of seconds (e.g., `"1.000340012s"`).
+
+For more details, see the protobuf docs linked above.
+
+Note that the JSON representation has one advantage over the protobuf
+representation, which is that it is possible to encode configurations
+for [LB policies](load-balancing.md) that are not known to gRPC. In
+protobuf form, the `loadBalancingConfig` field contains a `oneof`
+supporting only the built-in LB policies. However, in JSON form, the
+field inside the `oneof` is encoded as a string that indicates the LB
+policy name. In JSON form, that string can be any arbitrary value, not
+just one of the supported policies inside of the `oneof`, so third-party
+policies can be selected.
+
# Architecture
A service config is associated with a server name. The [name
@@ -23,11 +49,10 @@ name, will return both the resolved addresses and the service config.
The name resolver returns the service config to the gRPC client in JSON form.
Individual resolver implementations determine where and in what format the
service config is stored. If the resolver implemention obtains the
-service config in protobuf form, it must convert it to JSON using the
-normal [protobuf to JSON translation
-rules](https://developers.google.com/protocol-buffers/docs/proto3#json).
+service config in protobuf form, it must convert it to JSON.
Alternatively, a resolver implementation may obtain the service config
-already in JSON form, in which case it may return it directly.
+already in JSON form, in which case it may return it directly. Or it
+may construct the JSON dynamically from some other source data.
For details of how the DNS resolver plugin supports service configs, see
[gRFC A2: Service Config via
@@ -71,7 +96,7 @@ Here is the same example service config in JSON form:
{ "service": "foo", "method": "bar" },
{ "service": "baz" }
],
- "timeout": "1.0000000001s"
+ "timeout": "1.000000001s"
}
]
}
diff --git a/doc/xds-test-descriptions.md b/doc/xds-test-descriptions.md
index 83771d29ea8..6a82a7bf387 100644
--- a/doc/xds-test-descriptions.md
+++ b/doc/xds-test-descriptions.md
@@ -69,6 +69,9 @@ message ClientConfigureRequest {
repeated RpcType types = 1;
// The collection of custom metadata to be attached to RPCs sent by the client.
repeated Metadata metadata = 2;
+ // The deadline to use, in seconds, for all RPCs. If unset or zero, the
+ // client will use the default from the command-line.
+ int32 timeout_sec = 3;
}
message ClientConfigureResponse {}
@@ -81,7 +84,7 @@ service XdsUpdateClientConfigureService {
The test client changes its behavior right after receiving the
`ClientConfigureRequest`. Currently it only supports configuring the type(s)
-of RPCs sent by the test client and metadata attached to each type of RPCs.
+of RPCs sent by the test client, metadata attached to each type of RPCs, and the timeout.
## Test Driver
@@ -105,21 +108,42 @@ message LoadBalancerStatsRequest {
}
message LoadBalancerStatsResponse {
+ message RpcsByPeer {
+ // The number of completed RPCs for each peer.
+ map rpcs_by_peer = 1;
+ }
// The number of completed RPCs for each peer.
map rpcs_by_peer = 1;
// The number of RPCs that failed to record a remote peer.
int32 num_failures = 2;
+ map rpcs_by_method = 3;
}
message LoadBalancerAccumulatedStatsRequest {}
message LoadBalancerAccumulatedStatsResponse {
// The total number of RPCs have ever issued for each type.
- map num_rpcs_started_by_method = 1;
+ // Deprecated: use stats_per_method.rpcs_started instead.
+ map num_rpcs_started_by_method = 1 [deprecated = true];
// The total number of RPCs have ever completed successfully for each type.
- map num_rpcs_succeeded_by_method = 2;
+ // Deprecated: use stats_per_method.result instead.
+ map num_rpcs_succeeded_by_method = 2 [deprecated = true];
// The total number of RPCs have ever failed for each type.
- map num_rpcs_failed_by_method = 3;
+ // Deprecated: use stats_per_method.result instead.
+ map num_rpcs_failed_by_method = 3 [deprecated = true];
+
+ message MethodStats {
+ // The number of RPCs that were started for this method.
+ int32 rpcs_started = 1;
+
+ // The number of RPCs that completed with each status for this method. The
+ // key is the integral value of a google.rpc.Code; the value is the count.
+ map result = 2;
+ }
+
+ // Per-method RPC statistics. The key is the RpcType in string form; e.g.
+ // 'EMPTY_CALL' or 'UNARY_CALL'
+ map stats_per_method = 4;
}
service LoadBalancerStatsService {
diff --git a/examples/cpp/compression/CMakeLists.txt b/examples/cpp/compression/CMakeLists.txt
new file mode 100644
index 00000000000..bac7903396f
--- /dev/null
+++ b/examples/cpp/compression/CMakeLists.txt
@@ -0,0 +1,68 @@
+# Copyright 2021 the gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# cmake build file for C++ helloworld example.
+# Assumes protobuf and gRPC have been installed using cmake.
+# See cmake_externalproject/CMakeLists.txt for all-in-one cmake build
+# that automatically builds all the dependencies before building helloworld.
+
+cmake_minimum_required(VERSION 3.5.1)
+
+project(Compression C CXX)
+
+include(../cmake/common.cmake)
+
+# Proto file
+get_filename_component(hw_proto "../../protos/helloworld.proto" ABSOLUTE)
+get_filename_component(hw_proto_path "${hw_proto}" PATH)
+
+# Generated sources
+set(hw_proto_srcs "${CMAKE_CURRENT_BINARY_DIR}/helloworld.pb.cc")
+set(hw_proto_hdrs "${CMAKE_CURRENT_BINARY_DIR}/helloworld.pb.h")
+set(hw_grpc_srcs "${CMAKE_CURRENT_BINARY_DIR}/helloworld.grpc.pb.cc")
+set(hw_grpc_hdrs "${CMAKE_CURRENT_BINARY_DIR}/helloworld.grpc.pb.h")
+add_custom_command(
+ OUTPUT "${hw_proto_srcs}" "${hw_proto_hdrs}" "${hw_grpc_srcs}" "${hw_grpc_hdrs}"
+ COMMAND ${_PROTOBUF_PROTOC}
+ ARGS --grpc_out "${CMAKE_CURRENT_BINARY_DIR}"
+ --cpp_out "${CMAKE_CURRENT_BINARY_DIR}"
+ -I "${hw_proto_path}"
+ --plugin=protoc-gen-grpc="${_GRPC_CPP_PLUGIN_EXECUTABLE}"
+ "${hw_proto}"
+ DEPENDS "${hw_proto}")
+
+# Include generated *.pb.h files
+include_directories("${CMAKE_CURRENT_BINARY_DIR}")
+
+# hw_grpc_proto
+add_library(hw_grpc_proto
+ ${hw_grpc_srcs}
+ ${hw_grpc_hdrs}
+ ${hw_proto_srcs}
+ ${hw_proto_hdrs})
+target_link_libraries(hw_grpc_proto
+ ${_REFLECTION}
+ ${_GRPC_GRPCPP}
+ ${_PROTOBUF_LIBPROTOBUF})
+
+# Targets greeter_(client|server)
+foreach(_target
+ greeter_client greeter_server)
+ add_executable(${_target} "${_target}.cc")
+ target_link_libraries(${_target}
+ hw_grpc_proto
+ ${_REFLECTION}
+ ${_GRPC_GRPCPP}
+ ${_PROTOBUF_LIBPROTOBUF})
+endforeach()
diff --git a/examples/cpp/compression/greeter_client.cc b/examples/cpp/compression/greeter_client.cc
index 99e2a5973fc..b1ef4546d8a 100644
--- a/examples/cpp/compression/greeter_client.cc
+++ b/examples/cpp/compression/greeter_client.cc
@@ -32,9 +32,9 @@ using grpc::Channel;
using grpc::ChannelArguments;
using grpc::ClientContext;
using grpc::Status;
-using helloworld::HelloRequest;
-using helloworld::HelloReply;
using helloworld::Greeter;
+using helloworld::HelloReply;
+using helloworld::HelloRequest;
class GreeterClient {
public:
diff --git a/examples/cpp/compression/greeter_server.cc b/examples/cpp/compression/greeter_server.cc
index 7399017afb7..dc1b1f6530f 100644
--- a/examples/cpp/compression/greeter_server.cc
+++ b/examples/cpp/compression/greeter_server.cc
@@ -32,9 +32,9 @@ using grpc::Server;
using grpc::ServerBuilder;
using grpc::ServerContext;
using grpc::Status;
-using helloworld::HelloRequest;
-using helloworld::HelloReply;
using helloworld::Greeter;
+using helloworld::HelloReply;
+using helloworld::HelloRequest;
// Logic and data behind the server's behavior.
class GreeterServiceImpl final : public Greeter::Service {
diff --git a/examples/cpp/helloworld/BUILD b/examples/cpp/helloworld/BUILD
index ac13e5282ff..747f0b22997 100644
--- a/examples/cpp/helloworld/BUILD
+++ b/examples/cpp/helloworld/BUILD
@@ -44,6 +44,18 @@ cc_binary(
],
)
+cc_binary(
+ name = "xds_greeter_client",
+ srcs = ["xds_greeter_client.cc"],
+ defines = ["BAZEL_BUILD"],
+ deps = [
+ "//:grpc++",
+ "//examples/protos:helloworld_cc_grpc",
+ "@com_google_absl//absl/flags:flag",
+ "@com_google_absl//absl/flags:parse",
+ ],
+)
+
cc_binary(
name = "greeter_server",
srcs = ["greeter_server.cc"],
@@ -64,3 +76,17 @@ cc_binary(
"//examples/protos:helloworld_cc_grpc",
],
)
+
+cc_binary(
+ name = "xds_greeter_server",
+ srcs = ["xds_greeter_server.cc"],
+ defines = ["BAZEL_BUILD"],
+ deps = [
+ "//:grpc++",
+ "//:grpc++_reflection",
+ "//:grpcpp_admin",
+ "//examples/protos:helloworld_cc_grpc",
+ "@com_google_absl//absl/flags:flag",
+ "@com_google_absl//absl/flags:parse",
+ ],
+)
diff --git a/examples/cpp/helloworld/cocoapods/HelloWorldCpp/AppDelegate.h b/examples/cpp/helloworld/cocoapods/HelloWorldCpp/AppDelegate.h
index 91ba988c4ae..3ec86f1b31f 100644
--- a/examples/cpp/helloworld/cocoapods/HelloWorldCpp/AppDelegate.h
+++ b/examples/cpp/helloworld/cocoapods/HelloWorldCpp/AppDelegate.h
@@ -19,5 +19,5 @@
#import
@interface AppDelegate : UIResponder
-@property (strong, nonatomic) UIWindow *window;
+@property(strong, nonatomic) UIWindow *window;
@end
diff --git a/examples/cpp/helloworld/cocoapods/HelloWorldCpp/ViewController.h b/examples/cpp/helloworld/cocoapods/HelloWorldCpp/ViewController.h
index 28d4ca09614..673d49bf77f 100644
--- a/examples/cpp/helloworld/cocoapods/HelloWorldCpp/ViewController.h
+++ b/examples/cpp/helloworld/cocoapods/HelloWorldCpp/ViewController.h
@@ -20,4 +20,3 @@
@interface ViewController : UIViewController
@end
-
diff --git a/examples/cpp/helloworld/cocoapods/HelloWorldCpp/ViewController.mm b/examples/cpp/helloworld/cocoapods/HelloWorldCpp/ViewController.mm
index 36294848663..abdf9178b5d 100644
--- a/examples/cpp/helloworld/cocoapods/HelloWorldCpp/ViewController.mm
+++ b/examples/cpp/helloworld/cocoapods/HelloWorldCpp/ViewController.mm
@@ -18,14 +18,15 @@
#import "ViewController.h"
#import
-#include
+
#include
+#include
static void* tag(int i) { return (void*)(intptr_t)i; }
// Serialized Proto bytes of Hello World example
-const uint8_t kMessage[] =
- {0x0A, 0x0B, 0x4F, 0x62, 0x6A, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x2D, 0x43};
+const uint8_t kMessage[] = {0x0A, 0x0B, 0x4F, 0x62, 0x6A, 0x65, 0x63,
+ 0x74, 0x69, 0x76, 0x65, 0x2D, 0x43};
@interface ViewController ()
@@ -57,7 +58,7 @@ const uint8_t kMessage[] =
abort();
}
grpc::Slice send_slice = grpc::Slice(kMessage, sizeof(kMessage) / sizeof(kMessage[0]));
- std::unique_ptr send_buffer(new grpc::ByteBuffer(&send_slice, 1));
+ std::unique_ptr send_buffer(new grpc::ByteBuffer(&send_slice, 1));
call->Write(*send_buffer, tag(2));
cq_.Next(&got_tag, &ok);
if (!ok || got_tag != tag(2)) {
@@ -85,17 +86,17 @@ const uint8_t kMessage[] =
}
std::vector slices;
recv_buffer.Dump(&slices);
- NSString *recvBytes = [[NSString alloc] init];
+ NSString* recvBytes = [[NSString alloc] init];
for (auto slice : slices) {
auto p = slice.begin();
while (p != slice.end()) {
- recvBytes =
- [recvBytes stringByAppendingString:[NSString stringWithFormat:@"%02x ", *p]];
+ recvBytes = [recvBytes stringByAppendingString:[NSString stringWithFormat:@"%02x ", *p]];
p++;
}
}
NSLog(@"Hello World succeeded.\nReceived bytes: %@\n"
- "Expected bytes: 0a 11 48 65 6c 6c 6f 20 4f 62 6a 65 63 74 69 76 65 2d 43", recvBytes);
+ "Expected bytes: 0a 11 48 65 6c 6c 6f 20 4f 62 6a 65 63 74 69 76 65 2d 43",
+ recvBytes);
}
@end
diff --git a/examples/cpp/helloworld/cocoapods/HelloWorldCpp/main.m b/examples/cpp/helloworld/cocoapods/HelloWorldCpp/main.m
index a3a22258067..8ee64b0ecb1 100644
--- a/examples/cpp/helloworld/cocoapods/HelloWorldCpp/main.m
+++ b/examples/cpp/helloworld/cocoapods/HelloWorldCpp/main.m
@@ -19,8 +19,8 @@
#import
#import "AppDelegate.h"
-int main(int argc, char * argv[]) {
+int main(int argc, char* argv[]) {
@autoreleasepool {
- return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
+ return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
}
}
diff --git a/examples/cpp/helloworld/greeter_async_client.cc b/examples/cpp/helloworld/greeter_async_client.cc
index 9b1def6d1da..ab02bbc478a 100644
--- a/examples/cpp/helloworld/greeter_async_client.cc
+++ b/examples/cpp/helloworld/greeter_async_client.cc
@@ -20,8 +20,8 @@
#include
#include
-#include
#include
+#include
#ifdef BAZEL_BUILD
#include "examples/protos/helloworld.grpc.pb.h"
@@ -34,9 +34,9 @@ using grpc::ClientAsyncResponseReader;
using grpc::ClientContext;
using grpc::CompletionQueue;
using grpc::Status;
-using helloworld::HelloRequest;
-using helloworld::HelloReply;
using helloworld::Greeter;
+using helloworld::HelloReply;
+using helloworld::HelloRequest;
class GreeterClient {
public:
diff --git a/examples/cpp/helloworld/greeter_async_client2.cc b/examples/cpp/helloworld/greeter_async_client2.cc
index 97631f38889..407a4414f42 100644
--- a/examples/cpp/helloworld/greeter_async_client2.cc
+++ b/examples/cpp/helloworld/greeter_async_client2.cc
@@ -20,8 +20,8 @@
#include
#include
-#include
#include
+#include
#include
#ifdef BAZEL_BUILD
@@ -35,113 +35,109 @@ using grpc::ClientAsyncResponseReader;
using grpc::ClientContext;
using grpc::CompletionQueue;
using grpc::Status;
-using helloworld::HelloRequest;
-using helloworld::HelloReply;
using helloworld::Greeter;
+using helloworld::HelloReply;
+using helloworld::HelloRequest;
class GreeterClient {
- public:
- explicit GreeterClient(std::shared_ptr channel)
- : stub_(Greeter::NewStub(channel)) {}
-
- // Assembles the client's payload and sends it to the server.
- void SayHello(const std::string& user) {
- // Data we are sending to the server.
- HelloRequest request;
- request.set_name(user);
-
- // Call object to store rpc data
- AsyncClientCall* call = new AsyncClientCall;
-
- // stub_->PrepareAsyncSayHello() creates an RPC object, returning
- // an instance to store in "call" but does not actually start the RPC
- // Because we are using the asynchronous API, we need to hold on to
- // the "call" instance in order to get updates on the ongoing RPC.
- call->response_reader =
- stub_->PrepareAsyncSayHello(&call->context, request, &cq_);
-
- // StartCall initiates the RPC call
- call->response_reader->StartCall();
-
- // Request that, upon completion of the RPC, "reply" be updated with the
- // server's response; "status" with the indication of whether the operation
- // was successful. Tag the request with the memory address of the call object.
- call->response_reader->Finish(&call->reply, &call->status, (void*)call);
-
+ public:
+ explicit GreeterClient(std::shared_ptr channel)
+ : stub_(Greeter::NewStub(channel)) {}
+
+ // Assembles the client's payload and sends it to the server.
+ void SayHello(const std::string& user) {
+ // Data we are sending to the server.
+ HelloRequest request;
+ request.set_name(user);
+
+ // Call object to store rpc data
+ AsyncClientCall* call = new AsyncClientCall;
+
+ // stub_->PrepareAsyncSayHello() creates an RPC object, returning
+ // an instance to store in "call" but does not actually start the RPC
+ // Because we are using the asynchronous API, we need to hold on to
+ // the "call" instance in order to get updates on the ongoing RPC.
+ call->response_reader =
+ stub_->PrepareAsyncSayHello(&call->context, request, &cq_);
+
+ // StartCall initiates the RPC call
+ call->response_reader->StartCall();
+
+ // Request that, upon completion of the RPC, "reply" be updated with the
+ // server's response; "status" with the indication of whether the operation
+ // was successful. Tag the request with the memory address of the call
+ // object.
+ call->response_reader->Finish(&call->reply, &call->status, (void*)call);
+ }
+
+ // Loop while listening for completed responses.
+ // Prints out the response from the server.
+ void AsyncCompleteRpc() {
+ void* got_tag;
+ bool ok = false;
+
+ // Block until the next result is available in the completion queue "cq".
+ while (cq_.Next(&got_tag, &ok)) {
+ // The tag in this example is the memory location of the call object
+ AsyncClientCall* call = static_cast(got_tag);
+
+ // Verify that the request was completed successfully. Note that "ok"
+ // corresponds solely to the request for updates introduced by Finish().
+ GPR_ASSERT(ok);
+
+ if (call->status.ok())
+ std::cout << "Greeter received: " << call->reply.message() << std::endl;
+ else
+ std::cout << "RPC failed" << std::endl;
+
+ // Once we're complete, deallocate the call object.
+ delete call;
}
+ }
- // Loop while listening for completed responses.
- // Prints out the response from the server.
- void AsyncCompleteRpc() {
- void* got_tag;
- bool ok = false;
-
- // Block until the next result is available in the completion queue "cq".
- while (cq_.Next(&got_tag, &ok)) {
- // The tag in this example is the memory location of the call object
- AsyncClientCall* call = static_cast(got_tag);
-
- // Verify that the request was completed successfully. Note that "ok"
- // corresponds solely to the request for updates introduced by Finish().
- GPR_ASSERT(ok);
-
- if (call->status.ok())
- std::cout << "Greeter received: " << call->reply.message() << std::endl;
- else
- std::cout << "RPC failed" << std::endl;
-
- // Once we're complete, deallocate the call object.
- delete call;
- }
- }
-
- private:
-
- // struct for keeping state and data information
- struct AsyncClientCall {
- // Container for the data we expect from the server.
- HelloReply reply;
-
- // Context for the client. It could be used to convey extra information to
- // the server and/or tweak certain RPC behaviors.
- ClientContext context;
+ private:
+ // struct for keeping state and data information
+ struct AsyncClientCall {
+ // Container for the data we expect from the server.
+ HelloReply reply;
- // Storage for the status of the RPC upon completion.
- Status status;
+ // Context for the client. It could be used to convey extra information to
+ // the server and/or tweak certain RPC behaviors.
+ ClientContext context;
+ // Storage for the status of the RPC upon completion.
+ Status status;
- std::unique_ptr> response_reader;
- };
+ std::unique_ptr> response_reader;
+ };
- // Out of the passed in Channel comes the stub, stored here, our view of the
- // server's exposed services.
- std::unique_ptr stub_;
+ // Out of the passed in Channel comes the stub, stored here, our view of the
+ // server's exposed services.
+ std::unique_ptr stub_;
- // The producer-consumer queue we use to communicate asynchronously with the
- // gRPC runtime.
- CompletionQueue cq_;
+ // The producer-consumer queue we use to communicate asynchronously with the
+ // gRPC runtime.
+ CompletionQueue cq_;
};
int main(int argc, char** argv) {
+ // Instantiate the client. It requires a channel, out of which the actual RPCs
+ // are created. This channel models a connection to an endpoint (in this case,
+ // localhost at port 50051). We indicate that the channel isn't authenticated
+ // (use of InsecureChannelCredentials()).
+ GreeterClient greeter(grpc::CreateChannel(
+ "localhost:50051", grpc::InsecureChannelCredentials()));
+ // Spawn reader thread that loops indefinitely
+ std::thread thread_ = std::thread(&GreeterClient::AsyncCompleteRpc, &greeter);
- // Instantiate the client. It requires a channel, out of which the actual RPCs
- // are created. This channel models a connection to an endpoint (in this case,
- // localhost at port 50051). We indicate that the channel isn't authenticated
- // (use of InsecureChannelCredentials()).
- GreeterClient greeter(grpc::CreateChannel(
- "localhost:50051", grpc::InsecureChannelCredentials()));
-
- // Spawn reader thread that loops indefinitely
- std::thread thread_ = std::thread(&GreeterClient::AsyncCompleteRpc, &greeter);
-
- for (int i = 0; i < 100; i++) {
- std::string user("world " + std::to_string(i));
- greeter.SayHello(user); // The actual RPC call!
- }
+ for (int i = 0; i < 100; i++) {
+ std::string user("world " + std::to_string(i));
+ greeter.SayHello(user); // The actual RPC call!
+ }
- std::cout << "Press control-c to quit" << std::endl << std::endl;
- thread_.join(); //blocks forever
+ std::cout << "Press control-c to quit" << std::endl << std::endl;
+ thread_.join(); // blocks forever
- return 0;
+ return 0;
}
diff --git a/examples/cpp/helloworld/greeter_async_server.cc b/examples/cpp/helloworld/greeter_async_server.cc
index d4d1594c72b..d35d3e97ab0 100644
--- a/examples/cpp/helloworld/greeter_async_server.cc
+++ b/examples/cpp/helloworld/greeter_async_server.cc
@@ -16,13 +16,13 @@
*
*/
-#include
#include
+#include
#include
#include
-#include
#include
+#include
#ifdef BAZEL_BUILD
#include "examples/protos/helloworld.grpc.pb.h"
@@ -33,12 +33,12 @@
using grpc::Server;
using grpc::ServerAsyncResponseWriter;
using grpc::ServerBuilder;
-using grpc::ServerContext;
using grpc::ServerCompletionQueue;
+using grpc::ServerContext;
using grpc::Status;
-using helloworld::HelloRequest;
-using helloworld::HelloReply;
using helloworld::Greeter;
+using helloworld::HelloReply;
+using helloworld::HelloRequest;
class ServerImpl final {
public:
diff --git a/examples/cpp/helloworld/greeter_client.cc b/examples/cpp/helloworld/greeter_client.cc
index 7ece0330c51..6b9c12d509f 100644
--- a/examples/cpp/helloworld/greeter_client.cc
+++ b/examples/cpp/helloworld/greeter_client.cc
@@ -31,9 +31,9 @@
using grpc::Channel;
using grpc::ClientContext;
using grpc::Status;
-using helloworld::HelloRequest;
-using helloworld::HelloReply;
using helloworld::Greeter;
+using helloworld::HelloReply;
+using helloworld::HelloRequest;
class GreeterClient {
public:
@@ -87,7 +87,8 @@ int main(int argc, char** argv) {
if (arg_val[start_pos] == '=') {
target_str = arg_val.substr(start_pos + 1);
} else {
- std::cout << "The only correct argument syntax is --target=" << std::endl;
+ std::cout << "The only correct argument syntax is --target="
+ << std::endl;
return 0;
}
} else {
@@ -97,8 +98,8 @@ int main(int argc, char** argv) {
} else {
target_str = "localhost:50051";
}
- GreeterClient greeter(grpc::CreateChannel(
- target_str, grpc::InsecureChannelCredentials()));
+ GreeterClient greeter(
+ grpc::CreateChannel(target_str, grpc::InsecureChannelCredentials()));
std::string user("world");
std::string reply = greeter.SayHello(user);
std::cout << "Greeter received: " << reply << std::endl;
diff --git a/examples/cpp/helloworld/greeter_server.cc b/examples/cpp/helloworld/greeter_server.cc
index cb8f92cf20b..560b8b42828 100644
--- a/examples/cpp/helloworld/greeter_server.cc
+++ b/examples/cpp/helloworld/greeter_server.cc
@@ -20,9 +20,9 @@
#include
#include
+#include
#include
#include
-#include
#ifdef BAZEL_BUILD
#include "examples/protos/helloworld.grpc.pb.h"
@@ -34,9 +34,9 @@ using grpc::Server;
using grpc::ServerBuilder;
using grpc::ServerContext;
using grpc::Status;
-using helloworld::HelloRequest;
-using helloworld::HelloReply;
using helloworld::Greeter;
+using helloworld::HelloReply;
+using helloworld::HelloRequest;
// Logic and data behind the server's behavior.
class GreeterServiceImpl final : public Greeter::Service {
diff --git a/examples/cpp/helloworld/xds_greeter_client.cc b/examples/cpp/helloworld/xds_greeter_client.cc
new file mode 100644
index 00000000000..839625eca1f
--- /dev/null
+++ b/examples/cpp/helloworld/xds_greeter_client.cc
@@ -0,0 +1,92 @@
+/*
+ *
+ * Copyright 2021 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include
+#include
+#include
+
+#include "absl/flags/flag.h"
+#include "absl/flags/parse.h"
+
+#include
+
+#ifdef BAZEL_BUILD
+#include "examples/protos/helloworld.grpc.pb.h"
+#else
+#include "helloworld.grpc.pb.h"
+#endif
+
+ABSL_FLAG(std::string, target, "xds:///helloworld:50051", "Target string");
+ABSL_FLAG(bool, secure, true, "Secure mode");
+
+using grpc::Channel;
+using grpc::ClientContext;
+using grpc::Status;
+using helloworld::Greeter;
+using helloworld::HelloReply;
+using helloworld::HelloRequest;
+
+class GreeterClient {
+ public:
+ GreeterClient(std::shared_ptr channel)
+ : stub_(Greeter::NewStub(channel)) {}
+
+ // Assembles the client's payload, sends it and presents the response back
+ // from the server.
+ std::string SayHello(const std::string& user) {
+ // Data we are sending to the server.
+ HelloRequest request;
+ request.set_name(user);
+
+ // Container for the data we expect from the server.
+ HelloReply reply;
+
+ // Context for the client. It could be used to convey extra information to
+ // the server and/or tweak certain RPC behaviors.
+ ClientContext context;
+
+ // The actual RPC.
+ Status status = stub_->SayHello(&context, request, &reply);
+
+ // Act upon its status.
+ if (status.ok()) {
+ return reply.message();
+ } else {
+ std::cout << status.error_code() << ": " << status.error_message()
+ << std::endl;
+ return "RPC failed";
+ }
+ }
+
+ private:
+ std::unique_ptr stub_;
+};
+
+int main(int argc, char** argv) {
+ absl::ParseCommandLine(argc, argv);
+ GreeterClient greeter(grpc::CreateChannel(
+ absl::GetFlag(FLAGS_target), absl::GetFlag(FLAGS_secure)
+ ? grpc::experimental::XdsCredentials(
+ grpc::InsecureChannelCredentials())
+ : grpc::InsecureChannelCredentials()));
+ std::string user("world");
+ std::string reply = greeter.SayHello(user);
+ std::cout << "Greeter received: " << reply << std::endl;
+
+ return 0;
+}
diff --git a/examples/cpp/helloworld/xds_greeter_server.cc b/examples/cpp/helloworld/xds_greeter_server.cc
new file mode 100644
index 00000000000..21a964dedd6
--- /dev/null
+++ b/examples/cpp/helloworld/xds_greeter_server.cc
@@ -0,0 +1,108 @@
+/*
+ *
+ * Copyright 2021 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include
+#include
+#include
+
+#include "absl/flags/flag.h"
+#include "absl/flags/parse.h"
+#include "absl/strings/str_cat.h"
+
+#include
+#include
+#include
+#include
+#include
+
+#ifdef BAZEL_BUILD
+#include "examples/protos/helloworld.grpc.pb.h"
+#else
+#include "helloworld.grpc.pb.h"
+#endif
+
+ABSL_FLAG(int32_t, port, 50051, "Server port for service.");
+ABSL_FLAG(int32_t, maintenance_port, 50052,
+ "Server port for maintenance if --secure is used.");
+ABSL_FLAG(bool, secure, true, "Secure mode");
+
+using grpc::Server;
+using grpc::ServerBuilder;
+using grpc::ServerContext;
+using grpc::Status;
+using helloworld::Greeter;
+using helloworld::HelloReply;
+using helloworld::HelloRequest;
+
+// Logic and data behind the server's behavior.
+class GreeterServiceImpl final : public Greeter::Service {
+ Status SayHello(ServerContext* context, const HelloRequest* request,
+ HelloReply* reply) override {
+ std::string prefix("Hello ");
+ reply->set_message(prefix + request->name());
+ return Status::OK;
+ }
+};
+
+void RunServer() {
+ grpc::EnableDefaultHealthCheckService(true);
+ grpc::reflection::InitProtoReflectionServerBuilderPlugin();
+ int port = absl::GetFlag(FLAGS_port);
+ int maintenance_port = absl::GetFlag(FLAGS_maintenance_port);
+ grpc::experimental::XdsServerBuilder xds_builder;
+ ServerBuilder builder;
+ std::unique_ptr xds_enabled_server;
+ std::unique_ptr server;
+ GreeterServiceImpl service;
+ // Register "service" as the instance through which we'll communicate with
+ // clients. In this case it corresponds to an *synchronous* service.
+ xds_builder.RegisterService(&service);
+ if (absl::GetFlag(FLAGS_secure)) {
+ // Listen on the given address with XdsServerCredentials and a fallback of
+ // InsecureServerCredentials
+ xds_builder.AddListeningPort(absl::StrCat("0.0.0.0:", port),
+ grpc::experimental::XdsServerCredentials(
+ grpc::InsecureServerCredentials()));
+ xds_enabled_server = xds_builder.BuildAndStart();
+ gpr_log(GPR_INFO, "Server starting on 0.0.0.0:%d", port);
+ grpc::AddAdminServices(&builder);
+ // For the maintenance server, do not use any authentication mechanism.
+ builder.AddListeningPort(absl::StrCat("0.0.0.0:", maintenance_port),
+ grpc::InsecureServerCredentials());
+ server = builder.BuildAndStart();
+ gpr_log(GPR_INFO, "Maintenance server listening on 0.0.0.0:%d",
+ maintenance_port);
+ } else {
+ grpc::AddAdminServices(&xds_builder);
+ // Listen on the given address without any authentication mechanism.
+ builder.AddListeningPort(absl::StrCat("0.0.0.0:", port),
+ grpc::InsecureServerCredentials());
+ server = xds_builder.BuildAndStart();
+ gpr_log(GPR_INFO, "Server listening on 0.0.0.0:%d", port);
+ }
+
+ // Wait for the server to shutdown. Note that some other thread must be
+ // responsible for shutting down the server for this call to ever return.
+ server->Wait();
+}
+
+int main(int argc, char** argv) {
+ absl::ParseCommandLine(argc, argv);
+ RunServer();
+ return 0;
+}
diff --git a/examples/cpp/keyvaluestore/CMakeLists.txt b/examples/cpp/keyvaluestore/CMakeLists.txt
new file mode 100644
index 00000000000..f0de502fbd0
--- /dev/null
+++ b/examples/cpp/keyvaluestore/CMakeLists.txt
@@ -0,0 +1,73 @@
+# Copyright 2021 the gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# cmake build file for C++ keyvaluestore example.
+# Assumes protobuf and gRPC have been installed using cmake.
+# See cmake_externalproject/CMakeLists.txt for all-in-one cmake build
+# that automatically builds all the dependencies before building keyvaluestore.
+
+cmake_minimum_required(VERSION 3.5.1)
+
+project(KeyValueStore C CXX)
+
+include(../cmake/common.cmake)
+
+# Proto file
+get_filename_component(kvs_proto "../../protos/keyvaluestore.proto" ABSOLUTE)
+get_filename_component(kvs_proto_path "${kvs_proto}" PATH)
+
+# Generated sources
+set(kvs_proto_srcs "${CMAKE_CURRENT_BINARY_DIR}/keyvaluestore.pb.cc")
+set(kvs_proto_hdrs "${CMAKE_CURRENT_BINARY_DIR}/keyvaluestore.pb.h")
+set(kvs_grpc_srcs "${CMAKE_CURRENT_BINARY_DIR}/keyvaluestore.grpc.pb.cc")
+set(kvs_grpc_hdrs "${CMAKE_CURRENT_BINARY_DIR}/keyvaluestore.grpc.pb.h")
+add_custom_command(
+ OUTPUT "${kvs_proto_srcs}" "${kvs_proto_hdrs}" "${kvs_grpc_srcs}" "${kvs_grpc_hdrs}"
+ COMMAND ${_PROTOBUF_PROTOC}
+ ARGS --grpc_out "${CMAKE_CURRENT_BINARY_DIR}"
+ --cpp_out "${CMAKE_CURRENT_BINARY_DIR}"
+ -I "${kvs_proto_path}"
+ --plugin=protoc-gen-grpc="${_GRPC_CPP_PLUGIN_EXECUTABLE}"
+ "${kvs_proto}"
+ DEPENDS "${kvs_proto}")
+
+# Include generated *.pb.h files
+include_directories("${CMAKE_CURRENT_BINARY_DIR}")
+
+# kvs_grpc_proto
+add_library(kvs_grpc_proto
+ ${kvs_grpc_srcs}
+ ${kvs_grpc_hdrs}
+ ${kvs_proto_srcs}
+ ${kvs_proto_hdrs})
+target_link_libraries(kvs_grpc_proto
+ ${_REFLECTION}
+ ${_GRPC_GRPCPP}
+ ${_PROTOBUF_LIBPROTOBUF})
+
+# client
+add_executable(client "client.cc" "caching_interceptor.h")
+target_link_libraries(client
+ kvs_grpc_proto
+ ${_REFLECTION}
+ ${_GRPC_GRPCPP}
+ ${_PROTOBUF_LIBPROTOBUF})
+
+# server
+add_executable(server "server.cc")
+target_link_libraries(server
+ kvs_grpc_proto
+ ${_REFLECTION}
+ ${_GRPC_GRPCPP}
+ ${_PROTOBUF_LIBPROTOBUF})
diff --git a/examples/cpp/load_balancing/CMakeLists.txt b/examples/cpp/load_balancing/CMakeLists.txt
new file mode 100644
index 00000000000..126b713172c
--- /dev/null
+++ b/examples/cpp/load_balancing/CMakeLists.txt
@@ -0,0 +1,68 @@
+# Copyright 2021 the gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# cmake build file for C++ helloworld example.
+# Assumes protobuf and gRPC have been installed using cmake.
+# See cmake_externalproject/CMakeLists.txt for all-in-one cmake build
+# that automatically builds all the dependencies before building helloworld.
+
+cmake_minimum_required(VERSION 3.5.1)
+
+project(LoadBalancing C CXX)
+
+include(../cmake/common.cmake)
+
+# Proto file
+get_filename_component(hw_proto "../../protos/helloworld.proto" ABSOLUTE)
+get_filename_component(hw_proto_path "${hw_proto}" PATH)
+
+# Generated sources
+set(hw_proto_srcs "${CMAKE_CURRENT_BINARY_DIR}/helloworld.pb.cc")
+set(hw_proto_hdrs "${CMAKE_CURRENT_BINARY_DIR}/helloworld.pb.h")
+set(hw_grpc_srcs "${CMAKE_CURRENT_BINARY_DIR}/helloworld.grpc.pb.cc")
+set(hw_grpc_hdrs "${CMAKE_CURRENT_BINARY_DIR}/helloworld.grpc.pb.h")
+add_custom_command(
+ OUTPUT "${hw_proto_srcs}" "${hw_proto_hdrs}" "${hw_grpc_srcs}" "${hw_grpc_hdrs}"
+ COMMAND ${_PROTOBUF_PROTOC}
+ ARGS --grpc_out "${CMAKE_CURRENT_BINARY_DIR}"
+ --cpp_out "${CMAKE_CURRENT_BINARY_DIR}"
+ -I "${hw_proto_path}"
+ --plugin=protoc-gen-grpc="${_GRPC_CPP_PLUGIN_EXECUTABLE}"
+ "${hw_proto}"
+ DEPENDS "${hw_proto}")
+
+# Include generated *.pb.h files
+include_directories("${CMAKE_CURRENT_BINARY_DIR}")
+
+# hw_grpc_proto
+add_library(hw_grpc_proto
+ ${hw_grpc_srcs}
+ ${hw_grpc_hdrs}
+ ${hw_proto_srcs}
+ ${hw_proto_hdrs})
+target_link_libraries(hw_grpc_proto
+ ${_REFLECTION}
+ ${_GRPC_GRPCPP}
+ ${_PROTOBUF_LIBPROTOBUF})
+
+# Targets greeter_(client|server)
+foreach(_target
+ greeter_client greeter_server)
+ add_executable(${_target} "${_target}.cc")
+ target_link_libraries(${_target}
+ hw_grpc_proto
+ ${_REFLECTION}
+ ${_GRPC_GRPCPP}
+ ${_PROTOBUF_LIBPROTOBUF})
+endforeach()
diff --git a/examples/cpp/load_balancing/greeter_client.cc b/examples/cpp/load_balancing/greeter_client.cc
index 5b08204a96b..25322dbfc95 100644
--- a/examples/cpp/load_balancing/greeter_client.cc
+++ b/examples/cpp/load_balancing/greeter_client.cc
@@ -32,9 +32,9 @@ using grpc::Channel;
using grpc::ChannelArguments;
using grpc::ClientContext;
using grpc::Status;
-using helloworld::HelloRequest;
-using helloworld::HelloReply;
using helloworld::Greeter;
+using helloworld::HelloReply;
+using helloworld::HelloRequest;
class GreeterClient {
public:
diff --git a/examples/cpp/load_balancing/greeter_server.cc b/examples/cpp/load_balancing/greeter_server.cc
index f36ad906a29..d021b54c4d1 100644
--- a/examples/cpp/load_balancing/greeter_server.cc
+++ b/examples/cpp/load_balancing/greeter_server.cc
@@ -32,9 +32,9 @@ using grpc::Server;
using grpc::ServerBuilder;
using grpc::ServerContext;
using grpc::Status;
-using helloworld::HelloRequest;
-using helloworld::HelloReply;
using helloworld::Greeter;
+using helloworld::HelloReply;
+using helloworld::HelloRequest;
// Logic and data behind the server's behavior.
class GreeterServiceImpl final : public Greeter::Service {
diff --git a/examples/cpp/metadata/CMakeLists.txt b/examples/cpp/metadata/CMakeLists.txt
new file mode 100644
index 00000000000..48d6f178e55
--- /dev/null
+++ b/examples/cpp/metadata/CMakeLists.txt
@@ -0,0 +1,68 @@
+# Copyright 2021 the gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# cmake build file for C++ helloworld example.
+# Assumes protobuf and gRPC have been installed using cmake.
+# See cmake_externalproject/CMakeLists.txt for all-in-one cmake build
+# that automatically builds all the dependencies before building helloworld.
+
+cmake_minimum_required(VERSION 3.5.1)
+
+project(Metadata C CXX)
+
+include(../cmake/common.cmake)
+
+# Proto file
+get_filename_component(hw_proto "../../protos/helloworld.proto" ABSOLUTE)
+get_filename_component(hw_proto_path "${hw_proto}" PATH)
+
+# Generated sources
+set(hw_proto_srcs "${CMAKE_CURRENT_BINARY_DIR}/helloworld.pb.cc")
+set(hw_proto_hdrs "${CMAKE_CURRENT_BINARY_DIR}/helloworld.pb.h")
+set(hw_grpc_srcs "${CMAKE_CURRENT_BINARY_DIR}/helloworld.grpc.pb.cc")
+set(hw_grpc_hdrs "${CMAKE_CURRENT_BINARY_DIR}/helloworld.grpc.pb.h")
+add_custom_command(
+ OUTPUT "${hw_proto_srcs}" "${hw_proto_hdrs}" "${hw_grpc_srcs}" "${hw_grpc_hdrs}"
+ COMMAND ${_PROTOBUF_PROTOC}
+ ARGS --grpc_out "${CMAKE_CURRENT_BINARY_DIR}"
+ --cpp_out "${CMAKE_CURRENT_BINARY_DIR}"
+ -I "${hw_proto_path}"
+ --plugin=protoc-gen-grpc="${_GRPC_CPP_PLUGIN_EXECUTABLE}"
+ "${hw_proto}"
+ DEPENDS "${hw_proto}")
+
+# Include generated *.pb.h files
+include_directories("${CMAKE_CURRENT_BINARY_DIR}")
+
+# hw_grpc_proto
+add_library(hw_grpc_proto
+ ${hw_grpc_srcs}
+ ${hw_grpc_hdrs}
+ ${hw_proto_srcs}
+ ${hw_proto_hdrs})
+target_link_libraries(hw_grpc_proto
+ ${_REFLECTION}
+ ${_GRPC_GRPCPP}
+ ${_PROTOBUF_LIBPROTOBUF})
+
+# Targets greeter_(client|server)
+foreach(_target
+ greeter_client greeter_server)
+ add_executable(${_target} "${_target}.cc")
+ target_link_libraries(${_target}
+ hw_grpc_proto
+ ${_REFLECTION}
+ ${_GRPC_GRPCPP}
+ ${_PROTOBUF_LIBPROTOBUF})
+endforeach()
diff --git a/examples/cpp/metadata/greeter_client.cc b/examples/cpp/metadata/greeter_client.cc
index 246c4af2739..3784d2fa26a 100644
--- a/examples/cpp/metadata/greeter_client.cc
+++ b/examples/cpp/metadata/greeter_client.cc
@@ -31,9 +31,9 @@
using grpc::Channel;
using grpc::ClientContext;
using grpc::Status;
-using helloworld::HelloRequest;
-using helloworld::HelloReply;
using helloworld::Greeter;
+using helloworld::HelloReply;
+using helloworld::HelloRequest;
class CustomHeaderClient {
public:
@@ -57,9 +57,8 @@ class CustomHeaderClient {
// Setting custom metadata to be sent to the server
context.AddMetadata("custom-header", "Custom Value");
- // Setting custom binary metadata
- char bytes[8] = {'\0', '\1', '\2', '\3',
- '\4', '\5', '\6', '\7'};
+ // Setting custom binary metadata
+ char bytes[8] = {'\0', '\1', '\2', '\3', '\4', '\5', '\6', '\7'};
context.AddMetadata("custom-bin", std::string(bytes, 8));
// The actual RPC.
@@ -67,8 +66,16 @@ class CustomHeaderClient {
// Act upon its status.
if (status.ok()) {
- std::cout << "Client received initial metadata from server: " << context.GetServerInitialMetadata().find("custom-server-metadata")->second << std::endl;
- std::cout << "Client received trailing metadata from server: " << context.GetServerTrailingMetadata().find("custom-trailing-metadata")->second << std::endl;
+ std::cout << "Client received initial metadata from server: "
+ << context.GetServerInitialMetadata()
+ .find("custom-server-metadata")
+ ->second
+ << std::endl;
+ std::cout << "Client received trailing metadata from server: "
+ << context.GetServerTrailingMetadata()
+ .find("custom-trailing-metadata")
+ ->second
+ << std::endl;
return reply.message();
} else {
std::cout << status.error_code() << ": " << status.error_message()
diff --git a/examples/cpp/metadata/greeter_server.cc b/examples/cpp/metadata/greeter_server.cc
index a9a4f33cb0b..19d8bb0d01d 100644
--- a/examples/cpp/metadata/greeter_server.cc
+++ b/examples/cpp/metadata/greeter_server.cc
@@ -32,9 +32,9 @@ using grpc::Server;
using grpc::ServerBuilder;
using grpc::ServerContext;
using grpc::Status;
-using helloworld::HelloRequest;
-using helloworld::HelloReply;
using helloworld::Greeter;
+using helloworld::HelloReply;
+using helloworld::HelloRequest;
// Logic and data behind the server's behavior.
class GreeterServiceImpl final : public Greeter::Service {
@@ -44,25 +44,28 @@ class GreeterServiceImpl final : public Greeter::Service {
// Get the client's initial metadata
std::cout << "Client metadata: " << std::endl;
- const std::multimap metadata = context->client_metadata();
+ const std::multimap metadata =
+ context->client_metadata();
for (auto iter = metadata.begin(); iter != metadata.end(); ++iter) {
std::cout << "Header key: " << iter->first << ", value: ";
// Check for binary value
size_t isbin = iter->first.find("-bin");
if ((isbin != std::string::npos) && (isbin + 4 == iter->first.size())) {
- std::cout << std::hex;
+ std::cout << std::hex;
for (auto c : iter->second) {
std::cout << static_cast(c);
}
- std::cout << std::dec;
+ std::cout << std::dec;
} else {
std::cout << iter->second;
}
std::cout << std::endl;
}
- context->AddInitialMetadata("custom-server-metadata", "initial metadata value");
- context->AddTrailingMetadata("custom-trailing-metadata", "trailing metadata value");
+ context->AddInitialMetadata("custom-server-metadata",
+ "initial metadata value");
+ context->AddTrailingMetadata("custom-trailing-metadata",
+ "trailing metadata value");
reply->set_message(prefix + request->name());
return Status::OK;
}
diff --git a/examples/cpp/route_guide/helper.h b/examples/cpp/route_guide/helper.h
index 2d38209dde3..9ca7d271d52 100644
--- a/examples/cpp/route_guide/helper.h
+++ b/examples/cpp/route_guide/helper.h
@@ -32,4 +32,3 @@ void ParseDb(const std::string& db, std::vector* feature_list);
} // namespace routeguide
#endif // GRPC_COMMON_CPP_ROUTE_GUIDE_HELPER_H_
-
diff --git a/examples/cpp/route_guide/route_guide_client.cc b/examples/cpp/route_guide/route_guide_client.cc
index 439edb0dbdf..e30636c28ff 100644
--- a/examples/cpp/route_guide/route_guide_client.cc
+++ b/examples/cpp/route_guide/route_guide_client.cc
@@ -41,12 +41,12 @@ using grpc::ClientReader;
using grpc::ClientReaderWriter;
using grpc::ClientWriter;
using grpc::Status;
-using routeguide::Point;
using routeguide::Feature;
+using routeguide::Point;
using routeguide::Rectangle;
-using routeguide::RouteSummary;
-using routeguide::RouteNote;
using routeguide::RouteGuide;
+using routeguide::RouteNote;
+using routeguide::RouteSummary;
Point MakePoint(long latitude, long longitude) {
Point p;
@@ -55,16 +55,15 @@ Point MakePoint(long latitude, long longitude) {
return p;
}
-Feature MakeFeature(const std::string& name,
- long latitude, long longitude) {
+Feature MakeFeature(const std::string& name, long latitude, long longitude) {
Feature f;
f.set_name(name);
f.mutable_location()->CopyFrom(MakePoint(latitude, longitude));
return f;
}
-RouteNote MakeRouteNote(const std::string& message,
- long latitude, long longitude) {
+RouteNote MakeRouteNote(const std::string& message, long latitude,
+ long longitude) {
RouteNote n;
n.set_message(message);
n.mutable_location()->CopyFrom(MakePoint(latitude, longitude));
@@ -102,10 +101,9 @@ class RouteGuideClient {
std::unique_ptr > reader(
stub_->ListFeatures(&context, rect));
while (reader->Read(&feature)) {
- std::cout << "Found feature called "
- << feature.name() << " at "
- << feature.location().latitude()/kCoordFactor_ << ", "
- << feature.location().longitude()/kCoordFactor_ << std::endl;
+ std::cout << "Found feature called " << feature.name() << " at "
+ << feature.location().latitude() / kCoordFactor_ << ", "
+ << feature.location().longitude() / kCoordFactor_ << std::endl;
}
Status status = reader->Finish();
if (status.ok()) {
@@ -125,22 +123,21 @@ class RouteGuideClient {
std::default_random_engine generator(seed);
std::uniform_int_distribution feature_distribution(
0, feature_list_.size() - 1);
- std::uniform_int_distribution delay_distribution(
- 500, 1500);
+ std::uniform_int_distribution delay_distribution(500, 1500);
std::unique_ptr > writer(
stub_->RecordRoute(&context, &stats));
for (int i = 0; i < kPoints; i++) {
const Feature& f = feature_list_[feature_distribution(generator)];
- std::cout << "Visiting point "
- << f.location().latitude()/kCoordFactor_ << ", "
- << f.location().longitude()/kCoordFactor_ << std::endl;
+ std::cout << "Visiting point " << f.location().latitude() / kCoordFactor_
+ << ", " << f.location().longitude() / kCoordFactor_
+ << std::endl;
if (!writer->Write(f.location())) {
// Broken stream.
break;
}
- std::this_thread::sleep_for(std::chrono::milliseconds(
- delay_distribution(generator)));
+ std::this_thread::sleep_for(
+ std::chrono::milliseconds(delay_distribution(generator)));
}
writer->WritesDone();
Status status = writer->Finish();
@@ -162,14 +159,13 @@ class RouteGuideClient {
stub_->RouteChat(&context));
std::thread writer([stream]() {
- std::vector notes{
- MakeRouteNote("First message", 0, 0),
- MakeRouteNote("Second message", 0, 1),
- MakeRouteNote("Third message", 1, 0),
- MakeRouteNote("Fourth message", 0, 0)};
+ std::vector notes{MakeRouteNote("First message", 0, 0),
+ MakeRouteNote("Second message", 0, 1),
+ MakeRouteNote("Third message", 1, 0),
+ MakeRouteNote("Fourth message", 0, 0)};
for (const RouteNote& note : notes) {
- std::cout << "Sending message " << note.message()
- << " at " << note.location().latitude() << ", "
+ std::cout << "Sending message " << note.message() << " at "
+ << note.location().latitude() << ", "
<< note.location().longitude() << std::endl;
stream->Write(note);
}
@@ -178,8 +174,8 @@ class RouteGuideClient {
RouteNote server_note;
while (stream->Read(&server_note)) {
- std::cout << "Got message " << server_note.message()
- << " at " << server_note.location().latitude() << ", "
+ std::cout << "Got message " << server_note.message() << " at "
+ << server_note.location().latitude() << ", "
<< server_note.location().longitude() << std::endl;
}
writer.join();
@@ -190,7 +186,6 @@ class RouteGuideClient {
}
private:
-
bool GetOneFeature(const Point& point, Feature* feature) {
ClientContext context;
Status status = stub_->GetFeature(&context, point, feature);
@@ -204,12 +199,12 @@ class RouteGuideClient {
}
if (feature->name().empty()) {
std::cout << "Found no feature at "
- << feature->location().latitude()/kCoordFactor_ << ", "
- << feature->location().longitude()/kCoordFactor_ << std::endl;
+ << feature->location().latitude() / kCoordFactor_ << ", "
+ << feature->location().longitude() / kCoordFactor_ << std::endl;
} else {
- std::cout << "Found feature called " << feature->name() << " at "
- << feature->location().latitude()/kCoordFactor_ << ", "
- << feature->location().longitude()/kCoordFactor_ << std::endl;
+ std::cout << "Found feature called " << feature->name() << " at "
+ << feature->location().latitude() / kCoordFactor_ << ", "
+ << feature->location().longitude() / kCoordFactor_ << std::endl;
}
return true;
}
diff --git a/examples/cpp/route_guide/route_guide_server.cc b/examples/cpp/route_guide/route_guide_server.cc
index 49239665179..58ec2089590 100644
--- a/examples/cpp/route_guide/route_guide_server.cc
+++ b/examples/cpp/route_guide/route_guide_server.cc
@@ -24,10 +24,10 @@
#include
#include
+#include
#include
#include
#include
-#include
#include "helper.h"
#ifdef BAZEL_BUILD
#include "examples/protos/route_guide.grpc.pb.h"
@@ -42,18 +42,15 @@ using grpc::ServerReader;
using grpc::ServerReaderWriter;
using grpc::ServerWriter;
using grpc::Status;
-using routeguide::Point;
using routeguide::Feature;
+using routeguide::Point;
using routeguide::Rectangle;
-using routeguide::RouteSummary;
-using routeguide::RouteNote;
using routeguide::RouteGuide;
+using routeguide::RouteNote;
+using routeguide::RouteSummary;
using std::chrono::system_clock;
-
-float ConvertToRadians(float num) {
- return num * 3.1415926 /180;
-}
+float ConvertToRadians(float num) { return num * 3.1415926 / 180; }
// The formula is based on http://mathforum.org/library/drmath/view/51879.html
float GetDistance(const Point& start, const Point& end) {
@@ -64,13 +61,13 @@ float GetDistance(const Point& start, const Point& end) {
float lon_2 = end.longitude() / kCoordFactor;
float lat_rad_1 = ConvertToRadians(lat_1);
float lat_rad_2 = ConvertToRadians(lat_2);
- float delta_lat_rad = ConvertToRadians(lat_2-lat_1);
- float delta_lon_rad = ConvertToRadians(lon_2-lon_1);
+ float delta_lat_rad = ConvertToRadians(lat_2 - lat_1);
+ float delta_lon_rad = ConvertToRadians(lon_2 - lon_1);
- float a = pow(sin(delta_lat_rad/2), 2) + cos(lat_rad_1) * cos(lat_rad_2) *
- pow(sin(delta_lon_rad/2), 2);
- float c = 2 * atan2(sqrt(a), sqrt(1-a));
- int R = 6371000; // metres
+ float a = pow(sin(delta_lat_rad / 2), 2) +
+ cos(lat_rad_1) * cos(lat_rad_2) * pow(sin(delta_lon_rad / 2), 2);
+ float c = 2 * atan2(sqrt(a), sqrt(1 - a));
+ int R = 6371000; // metres
return R * c;
}
@@ -111,8 +108,7 @@ class RouteGuideImpl final : public RouteGuide::Service {
for (const Feature& f : feature_list_) {
if (f.location().longitude() >= left &&
f.location().longitude() <= right &&
- f.location().latitude() >= bottom &&
- f.location().latitude() <= top) {
+ f.location().latitude() >= bottom && f.location().latitude() <= top) {
writer->Write(f);
}
}
@@ -142,8 +138,8 @@ class RouteGuideImpl final : public RouteGuide::Service {
summary->set_point_count(point_count);
summary->set_feature_count(feature_count);
summary->set_distance(static_cast(distance));
- auto secs = std::chrono::duration_cast(
- end_time - start_time);
+ auto secs =
+ std::chrono::duration_cast(end_time - start_time);
summary->set_elapsed_time(secs.count());
return Status::OK;
diff --git a/examples/objective-c/auth_sample/Podfile b/examples/objective-c/auth_sample/Podfile
index a25d20f477d..3195a323e0f 100644
--- a/examples/objective-c/auth_sample/Podfile
+++ b/examples/objective-c/auth_sample/Podfile
@@ -1,5 +1,5 @@
source 'https://github.com/CocoaPods/Specs.git'
-platform :ios, '8.0'
+platform :ios, '9.0'
install! 'cocoapods', :deterministic_uuids => false
diff --git a/examples/php/GPBMetadata/Helloworld.php b/examples/php/GPBMetadata/Helloworld.php
new file mode 100644
index 00000000000..0927516af00
Binary files /dev/null and b/examples/php/GPBMetadata/Helloworld.php differ
diff --git a/examples/php/Helloworld/GreeterClient.php b/examples/php/Helloworld/GreeterClient.php
new file mode 100644
index 00000000000..f90303aab6b
--- /dev/null
+++ b/examples/php/Helloworld/GreeterClient.php
@@ -0,0 +1,50 @@
+_simpleRequest('/helloworld.Greeter/SayHello',
+ $argument,
+ ['\Helloworld\HelloReply', 'decode'],
+ $metadata, $options);
+ }
+
+}
diff --git a/examples/php/Helloworld/GreeterStub.php b/examples/php/Helloworld/GreeterStub.php
new file mode 100644
index 00000000000..6667f18854d
--- /dev/null
+++ b/examples/php/Helloworld/GreeterStub.php
@@ -0,0 +1,58 @@
+setStatus(\Grpc\Status::unimplemented());
+ return null;
+ }
+
+ /**
+ * Get the method descriptors of the service for server registration
+ *
+ * @return array of \Grpc\MethodDescriptor for the service methods
+ */
+ public final function getMethodDescriptors(): array
+ {
+ return [
+ '/helloworld.Greeter/SayHello' => new \Grpc\MethodDescriptor(
+ $this,
+ 'SayHello',
+ '\Helloworld\HelloRequest',
+ \Grpc\MethodDescriptor::UNARY_CALL
+ ),
+ ];
+ }
+
+}
diff --git a/examples/php/Helloworld/HelloReply.php b/examples/php/Helloworld/HelloReply.php
new file mode 100644
index 00000000000..74c7f877003
--- /dev/null
+++ b/examples/php/Helloworld/HelloReply.php
@@ -0,0 +1,60 @@
+helloworld.HelloReply
+ */
+class HelloReply extends \Google\Protobuf\Internal\Message
+{
+ /**
+ * Generated from protobuf field string message = 1;
+ */
+ protected $message = '';
+
+ /**
+ * Constructor.
+ *
+ * @param array $data {
+ * Optional. Data for populating the Message object.
+ *
+ * @type string $message
+ * }
+ */
+ public function __construct($data = NULL) {
+ \GPBMetadata\Helloworld::initOnce();
+ parent::__construct($data);
+ }
+
+ /**
+ * Generated from protobuf field string message = 1;
+ * @return string
+ */
+ public function getMessage()
+ {
+ return $this->message;
+ }
+
+ /**
+ * Generated from protobuf field string message = 1;
+ * @param string $var
+ * @return $this
+ */
+ public function setMessage($var)
+ {
+ GPBUtil::checkString($var, True);
+ $this->message = $var;
+
+ return $this;
+ }
+
+}
+
diff --git a/examples/php/Helloworld/HelloRequest.php b/examples/php/Helloworld/HelloRequest.php
new file mode 100644
index 00000000000..d0b52784a25
--- /dev/null
+++ b/examples/php/Helloworld/HelloRequest.php
@@ -0,0 +1,60 @@
+helloworld.HelloRequest
+ */
+class HelloRequest extends \Google\Protobuf\Internal\Message
+{
+ /**
+ * Generated from protobuf field string name = 1;
+ */
+ protected $name = '';
+
+ /**
+ * Constructor.
+ *
+ * @param array $data {
+ * Optional. Data for populating the Message object.
+ *
+ * @type string $name
+ * }
+ */
+ public function __construct($data = NULL) {
+ \GPBMetadata\Helloworld::initOnce();
+ parent::__construct($data);
+ }
+
+ /**
+ * Generated from protobuf field string name = 1;
+ * @return string
+ */
+ public function getName()
+ {
+ return $this->name;
+ }
+
+ /**
+ * Generated from protobuf field string name = 1;
+ * @param string $var
+ * @return $this
+ */
+ public function setName($var)
+ {
+ GPBUtil::checkString($var, True);
+ $this->name = $var;
+
+ return $this;
+ }
+
+}
+
diff --git a/examples/php/README.md b/examples/php/README.md
index 2182e39628a..e027d3270c9 100644
--- a/examples/php/README.md
+++ b/examples/php/README.md
@@ -1,56 +1,9 @@
-# gRPC PHP Quick Start Example
+# gRPC PHP examples
+This directory contains the sources for the following PHP examples:
-## Prerequisites
+- [Quick start][]
+- [Basics tutorial][]
-This requires `php` >= 5.5, `pecl`, `composer`
-
-## Install
-
- - Install the `grpc` extension
-
- ```sh
- $ [sudo] pecl install grpc
- ```
-
- - Install the `protoc` compiler plugin `grpc_php_plugin`
-
- ```sh
- $ git clone -b RELEASE_TAG_HERE https://github.com/grpc/grpc
- $ cd grpc
- $ make grpc_php_plugin
- ```
-
- - Install the `grpc/grpc` composer package
-
- ```
- $ cd examples/php
- $ composer install
- ```
-
-## Try it!
-
- - Run the server
-
- Please follow the instruction in [Node][] to run the server
- ```
- $ cd examples/node
- $ npm install
- $ cd dynamic_codegen or cd static_codegen
- $ node greeter_server.js
- ```
-
- - Generate proto files and run the client
-
- ```
- $ cd examples/php
- $ ./greeter_proto_gen.sh
- $ ./run_greeter_client.sh
- ```
-
-## In-depth Tutorial
-
-You can find a more detailed tutorial in [gRPC Basics: PHP][]
-
-[Node]:https://github.com/grpc/grpc/tree/master/examples/node
-[gRPC Basics: PHP]:https://grpc.io/docs/languages/php/basics
+[Quick start]: https://grpc.io/docs/languages/php/quickstart/
+[Basics tutorial]: https://grpc.io/docs/languages/php/basics/
diff --git a/examples/php/composer.json b/examples/php/composer.json
index 927f7df2ad3..1d44bba0a6a 100644
--- a/examples/php/composer.json
+++ b/examples/php/composer.json
@@ -2,8 +2,8 @@
"name": "grpc/grpc-demo",
"description": "gRPC example for PHP",
"require": {
- "grpc/grpc": "^v1.3.0",
- "google/protobuf": "^v3.3.0"
+ "grpc/grpc": "^v1.30.0",
+ "google/protobuf": "^v3.12.2"
},
"autoload": {
"psr-4": {
diff --git a/examples/php/echo/composer.json b/examples/php/echo/composer.json
index c74e5527389..541d91a50e4 100644
--- a/examples/php/echo/composer.json
+++ b/examples/php/echo/composer.json
@@ -1,8 +1,8 @@
{
"name": "grpc-php/echo-example",
"require": {
- "grpc/grpc": "^v1.22.0",
- "google/protobuf": "^3.7.0"
+ "grpc/grpc": "^v1.30.0",
+ "google/protobuf": "^3.12.2"
},
"autoload": {
"psr-4": {
diff --git a/examples/php/greeter_and_routeguide_multi_server.php b/examples/php/greeter_and_routeguide_multi_server.php
new file mode 100644
index 00000000000..1bdc1d7e2f8
--- /dev/null
+++ b/examples/php/greeter_and_routeguide_multi_server.php
@@ -0,0 +1,47 @@
+getName();
+ $response = new \Helloworld\HelloReply();
+ $response->setMessage("Hello " . $name);
+ return $response;
+ }
+}
+
+
+$server = new \Grpc\RpcServer();
+$server->addHttp2Port('0.0.0.0:50051');
+$server->handle(new RouteGuideService(null));
+$server->handle(new Greeter());
+$server->run();
diff --git a/examples/php/greeter_proto_gen.sh b/examples/php/greeter_proto_gen.sh
index 4322bbda2e3..07c7e61b68b 100755
--- a/examples/php/greeter_proto_gen.sh
+++ b/examples/php/greeter_proto_gen.sh
@@ -13,4 +13,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-protoc --proto_path=../protos --php_out=. --grpc_out=. --plugin=protoc-gen-grpc=../../bins/opt/grpc_php_plugin ../protos/helloworld.proto
+set -e
+
+cd $(dirname $0)/../..
+
+# protoc and grpc_*_plugin binaries can be obtained by running
+# $ bazel build @com_google_protobuf//:protoc //src/compiler:all
+PROTOC=bazel-bin/external/com_google_protobuf/protoc
+PLUGIN=protoc-gen-grpc=bazel-bin/src/compiler/grpc_php_plugin
+
+$PROTOC --proto_path=examples/protos \
+ --php_out=examples/php \
+ --grpc_out=generate_server:examples/php \
+ --plugin=$PLUGIN examples/protos/helloworld.proto
diff --git a/examples/php/greeter_server.php b/examples/php/greeter_server.php
new file mode 100644
index 00000000000..a5d749bee96
--- /dev/null
+++ b/examples/php/greeter_server.php
@@ -0,0 +1,44 @@
+getName();
+ $response = new \Helloworld\HelloReply();
+ $response->setMessage("Hello " . $name);
+ return $response;
+ }
+}
+
+$server = new \Grpc\RpcServer();
+$server->addHttp2Port('0.0.0.0:50051');
+$server->handle(new Greeter());
+$server->run();
diff --git a/examples/php/route_guide/GPBMetadata/RouteGuide.php b/examples/php/route_guide/GPBMetadata/RouteGuide.php
new file mode 100644
index 00000000000..ffd390b3157
Binary files /dev/null and b/examples/php/route_guide/GPBMetadata/RouteGuide.php differ
diff --git a/examples/php/route_guide/RouteGuideService.php b/examples/php/route_guide/RouteGuideService.php
new file mode 100644
index 00000000000..ac1894c7433
--- /dev/null
+++ b/examples/php/route_guide/RouteGuideService.php
@@ -0,0 +1,182 @@
+featureList, new Routeguide\Feature([
+ 'name' => $feature->name,
+ 'location' => new Routeguide\Point([
+ 'latitude' => $feature->location->latitude,
+ 'longitude' => $feature->location->longitude,
+ ]),
+ ]));
+ }
+ }
+
+ private function findFeature(\Routeguide\Point $point)
+ {
+ foreach ($this->featureList as $feature) {
+ $location = $feature->getLocation();
+ if (
+ $location->getLatitude() === $point->getLatitude()
+ && $location->getLongitude() === $point->getLongitude()
+ ) {
+ return $feature;
+ }
+ }
+ return null;
+ }
+
+ // The formula is based on http://mathforum.org/library/drmath/view/51879.html
+ private function calculateDistance(
+ \Routeguide\Point $start,
+ \Routeguide\Point $end
+ ) {
+ $toRadians = function (float $num) {
+ return $num * 3.1415926 / 180;
+ };
+ $coordFactor = 10000000.0;
+ $R = 6371000; // metres
+
+ $lat_1 = $start->getLatitude() / $coordFactor;
+ $lat_2 = $end->getLatitude() / $coordFactor;
+ $lon_1 = $start->getLongitude() / $coordFactor;
+ $lon_2 = $end->getLongitude() / $coordFactor;
+ $lat_rad_1 = $toRadians($lat_1);
+ $lat_rad_2 = $toRadians($lat_2);
+ $delta_lat_rad = $toRadians($lat_2 - $lat_1);
+ $delta_lon_rad = $toRadians($lon_2 - $lon_1);
+
+ $a = pow(sin($delta_lat_rad / 2), 2) +
+ cos($lat_rad_1) * cos($lat_rad_2) * pow(sin($delta_lon_rad / 2), 2);
+ $c = 2 * atan2(sqrt($a), sqrt(1 - $a));
+
+ return $R * $c;
+ }
+
+ public function GetFeature(
+ \Routeguide\Point $request,
+ \Grpc\ServerContext $serverContext
+ ): ?\Routeguide\Feature {
+ $feature = $this->findFeature($request);
+ $notFoundFeature = new Routeguide\Feature([
+ 'name' => '',
+ 'location' => $request,
+ ]);
+ return $feature ?? $notFoundFeature;
+ }
+
+ public function ListFeatures(
+ \Routeguide\Rectangle $request,
+ \Grpc\ServerCallWriter $writer,
+ \Grpc\ServerContext $serverContext
+ ): void {
+ $lo = $request->getLo();
+ $hi = $request->getHi();
+ $left = min($lo->getLongitude(), $hi->getLongitude());
+ $right = max($lo->getLongitude(), $hi->getLongitude());
+ $top = max($lo->getLatitude(), $hi->getLatitude());
+ $bottom = min($lo->getLatitude(), $hi->getLatitude());
+
+ foreach ($this->featureList as $feature) {
+ $longitude = $feature->getLocation()->getLongitude();
+ $latitude = $feature->getLocation()->getLatitude();
+ if (
+ $longitude >= $left && $longitude <= $right
+ && $latitude >= $bottom && $latitude <= $top
+ ) {
+ $writer->write($feature);
+ }
+ }
+
+ $writer->finish();
+ }
+
+ public function RecordRoute(
+ \Grpc\ServerCallReader $reader,
+ \Grpc\ServerContext $serverContext
+ ): ?\Routeguide\RouteSummary {
+ $point_count = 0;
+ $feature_count = 0;
+ $distance = 0;
+ $previous = null;
+
+ $start_time = time();
+ while ($point = $reader->read()) {
+ $point_count++;
+ $feature = $this->findFeature($point);
+ if ($feature) {
+ $feature_count++;
+ if ($previous) {
+ $distance += $this->calculateDistance($previous, $point);
+ }
+ $previous = $point;
+ }
+ }
+
+ $summary = new \Routeguide\RouteSummary();
+ $summary->setPointCount($point_count);
+ $summary->setFeatureCount($feature_count);
+ $summary->setDistance($distance);
+ $summary->setElapsedTime(time() - $start_time);
+
+ return $summary;
+ }
+
+ public function RouteChat(
+ \Grpc\ServerCallReader $reader,
+ \Grpc\ServerCallWriter $writer,
+ \Grpc\ServerContext $serverContext
+ ): void {
+ while ($note = $reader->read()) {
+ foreach ($this->received_notes as $n) {
+ if (
+ $n->getLocation()->getLatitude() ===
+ $note->getLocation()->getLatitude()
+ && $n->getLocation()->getLongitude() ===
+ $note->getLocation()->getLongitude()
+ ) {
+ $writer->write($n);
+ }
+ }
+ array_push($this->received_notes, $note);
+ }
+ $writer->finish();
+ }
+
+ private $received_notes = [];
+ private $featureList = [];
+}
diff --git a/examples/php/route_guide/Routeguide/Feature.php b/examples/php/route_guide/Routeguide/Feature.php
new file mode 100644
index 00000000000..43362f19229
--- /dev/null
+++ b/examples/php/route_guide/Routeguide/Feature.php
@@ -0,0 +1,112 @@
+routeguide.Feature
+ */
+class Feature extends \Google\Protobuf\Internal\Message
+{
+ /**
+ * The name of the feature.
+ *
+ * Generated from protobuf field string name = 1;
+ */
+ protected $name = '';
+ /**
+ * The point where the feature is detected.
+ *
+ * Generated from protobuf field .routeguide.Point location = 2;
+ */
+ protected $location = null;
+
+ /**
+ * Constructor.
+ *
+ * @param array $data {
+ * Optional. Data for populating the Message object.
+ *
+ * @type string $name
+ * The name of the feature.
+ * @type \Routeguide\Point $location
+ * The point where the feature is detected.
+ * }
+ */
+ public function __construct($data = NULL) {
+ \GPBMetadata\RouteGuide::initOnce();
+ parent::__construct($data);
+ }
+
+ /**
+ * The name of the feature.
+ *
+ * Generated from protobuf field string name = 1;
+ * @return string
+ */
+ public function getName()
+ {
+ return $this->name;
+ }
+
+ /**
+ * The name of the feature.
+ *
+ * Generated from protobuf field string name = 1;
+ * @param string $var
+ * @return $this
+ */
+ public function setName($var)
+ {
+ GPBUtil::checkString($var, True);
+ $this->name = $var;
+
+ return $this;
+ }
+
+ /**
+ * The point where the feature is detected.
+ *
+ * Generated from protobuf field .routeguide.Point location = 2;
+ * @return \Routeguide\Point|null
+ */
+ public function getLocation()
+ {
+ return isset($this->location) ? $this->location : null;
+ }
+
+ public function hasLocation()
+ {
+ return isset($this->location);
+ }
+
+ public function clearLocation()
+ {
+ unset($this->location);
+ }
+
+ /**
+ * The point where the feature is detected.
+ *
+ * Generated from protobuf field .routeguide.Point location = 2;
+ * @param \Routeguide\Point $var
+ * @return $this
+ */
+ public function setLocation($var)
+ {
+ GPBUtil::checkMessage($var, \Routeguide\Point::class);
+ $this->location = $var;
+
+ return $this;
+ }
+
+}
+
diff --git a/examples/php/route_guide/Routeguide/Point.php b/examples/php/route_guide/Routeguide/Point.php
new file mode 100644
index 00000000000..094939fff7d
--- /dev/null
+++ b/examples/php/route_guide/Routeguide/Point.php
@@ -0,0 +1,90 @@
+routeguide.Point
+ */
+class Point extends \Google\Protobuf\Internal\Message
+{
+ /**
+ * Generated from protobuf field int32 latitude = 1;
+ */
+ protected $latitude = 0;
+ /**
+ * Generated from protobuf field int32 longitude = 2;
+ */
+ protected $longitude = 0;
+
+ /**
+ * Constructor.
+ *
+ * @param array $data {
+ * Optional. Data for populating the Message object.
+ *
+ * @type int $latitude
+ * @type int $longitude
+ * }
+ */
+ public function __construct($data = NULL) {
+ \GPBMetadata\RouteGuide::initOnce();
+ parent::__construct($data);
+ }
+
+ /**
+ * Generated from protobuf field int32 latitude = 1;
+ * @return int
+ */
+ public function getLatitude()
+ {
+ return $this->latitude;
+ }
+
+ /**
+ * Generated from protobuf field int32 latitude = 1;
+ * @param int $var
+ * @return $this
+ */
+ public function setLatitude($var)
+ {
+ GPBUtil::checkInt32($var);
+ $this->latitude = $var;
+
+ return $this;
+ }
+
+ /**
+ * Generated from protobuf field int32 longitude = 2;
+ * @return int
+ */
+ public function getLongitude()
+ {
+ return $this->longitude;
+ }
+
+ /**
+ * Generated from protobuf field int32 longitude = 2;
+ * @param int $var
+ * @return $this
+ */
+ public function setLongitude($var)
+ {
+ GPBUtil::checkInt32($var);
+ $this->longitude = $var;
+
+ return $this;
+ }
+
+}
+
diff --git a/examples/php/route_guide/Routeguide/Rectangle.php b/examples/php/route_guide/Routeguide/Rectangle.php
new file mode 100644
index 00000000000..29292cc450e
--- /dev/null
+++ b/examples/php/route_guide/Routeguide/Rectangle.php
@@ -0,0 +1,122 @@
+routeguide.Rectangle
+ */
+class Rectangle extends \Google\Protobuf\Internal\Message
+{
+ /**
+ * One corner of the rectangle.
+ *
+ * Generated from protobuf field .routeguide.Point lo = 1;
+ */
+ protected $lo = null;
+ /**
+ * The other corner of the rectangle.
+ *
+ * Generated from protobuf field .routeguide.Point hi = 2;
+ */
+ protected $hi = null;
+
+ /**
+ * Constructor.
+ *
+ * @param array $data {
+ * Optional. Data for populating the Message object.
+ *
+ * @type \Routeguide\Point $lo
+ * One corner of the rectangle.
+ * @type \Routeguide\Point $hi
+ * The other corner of the rectangle.
+ * }
+ */
+ public function __construct($data = NULL) {
+ \GPBMetadata\RouteGuide::initOnce();
+ parent::__construct($data);
+ }
+
+ /**
+ * One corner of the rectangle.
+ *
+ * Generated from protobuf field .routeguide.Point lo = 1;
+ * @return \Routeguide\Point|null
+ */
+ public function getLo()
+ {
+ return isset($this->lo) ? $this->lo : null;
+ }
+
+ public function hasLo()
+ {
+ return isset($this->lo);
+ }
+
+ public function clearLo()
+ {
+ unset($this->lo);
+ }
+
+ /**
+ * One corner of the rectangle.
+ *
+ * Generated from protobuf field .routeguide.Point lo = 1;
+ * @param \Routeguide\Point $var
+ * @return $this
+ */
+ public function setLo($var)
+ {
+ GPBUtil::checkMessage($var, \Routeguide\Point::class);
+ $this->lo = $var;
+
+ return $this;
+ }
+
+ /**
+ * The other corner of the rectangle.
+ *
+ * Generated from protobuf field .routeguide.Point hi = 2;
+ * @return \Routeguide\Point|null
+ */
+ public function getHi()
+ {
+ return isset($this->hi) ? $this->hi : null;
+ }
+
+ public function hasHi()
+ {
+ return isset($this->hi);
+ }
+
+ public function clearHi()
+ {
+ unset($this->hi);
+ }
+
+ /**
+ * The other corner of the rectangle.
+ *
+ * Generated from protobuf field .routeguide.Point hi = 2;
+ * @param \Routeguide\Point $var
+ * @return $this
+ */
+ public function setHi($var)
+ {
+ GPBUtil::checkMessage($var, \Routeguide\Point::class);
+ $this->hi = $var;
+
+ return $this;
+ }
+
+}
+
diff --git a/examples/php/route_guide/Routeguide/RouteGuideClient.php b/examples/php/route_guide/Routeguide/RouteGuideClient.php
new file mode 100644
index 00000000000..c0d466ddc85
--- /dev/null
+++ b/examples/php/route_guide/Routeguide/RouteGuideClient.php
@@ -0,0 +1,105 @@
+_simpleRequest('/routeguide.RouteGuide/GetFeature',
+ $argument,
+ ['\Routeguide\Feature', 'decode'],
+ $metadata, $options);
+ }
+
+ /**
+ * A server-to-client streaming RPC.
+ *
+ * Obtains the Features available within the given Rectangle. Results are
+ * streamed rather than returned at once (e.g. in a response message with a
+ * repeated field), as the rectangle may cover a large area and contain a
+ * huge number of features.
+ * @param \Routeguide\Rectangle $argument input argument
+ * @param array $metadata metadata
+ * @param array $options call options
+ * @return \Grpc\ServerStreamingCall
+ */
+ public function ListFeatures(\Routeguide\Rectangle $argument,
+ $metadata = [], $options = []) {
+ return $this->_serverStreamRequest('/routeguide.RouteGuide/ListFeatures',
+ $argument,
+ ['\Routeguide\Feature', 'decode'],
+ $metadata, $options);
+ }
+
+ /**
+ * A client-to-server streaming RPC.
+ *
+ * Accepts a stream of Points on a route being traversed, returning a
+ * RouteSummary when traversal is completed.
+ * @param array $metadata metadata
+ * @param array $options call options
+ * @return \Grpc\ClientStreamingCall
+ */
+ public function RecordRoute($metadata = [], $options = []) {
+ return $this->_clientStreamRequest('/routeguide.RouteGuide/RecordRoute',
+ ['\Routeguide\RouteSummary','decode'],
+ $metadata, $options);
+ }
+
+ /**
+ * A Bidirectional streaming RPC.
+ *
+ * Accepts a stream of RouteNotes sent while a route is being traversed,
+ * while receiving other RouteNotes (e.g. from other users).
+ * @param array $metadata metadata
+ * @param array $options call options
+ * @return \Grpc\BidiStreamingCall
+ */
+ public function RouteChat($metadata = [], $options = []) {
+ return $this->_bidiRequest('/routeguide.RouteGuide/RouteChat',
+ ['\Routeguide\RouteNote','decode'],
+ $metadata, $options);
+ }
+
+}
diff --git a/examples/php/route_guide/Routeguide/RouteGuideStub.php b/examples/php/route_guide/Routeguide/RouteGuideStub.php
new file mode 100644
index 00000000000..6beb57c2ebf
--- /dev/null
+++ b/examples/php/route_guide/Routeguide/RouteGuideStub.php
@@ -0,0 +1,139 @@
+setStatus(\Grpc\Status::unimplemented());
+ return null;
+ }
+
+ /**
+ * A server-to-client streaming RPC.
+ *
+ * Obtains the Features available within the given Rectangle. Results are
+ * streamed rather than returned at once (e.g. in a response message with a
+ * repeated field), as the rectangle may cover a large area and contain a
+ * huge number of features.
+ * @param \Routeguide\Rectangle $request client request
+ * @param \Grpc\ServerCallWriter $writer write response data of \Routeguide\Feature
+ * @param \Grpc\ServerContext $context server request context
+ * @return void
+ */
+ public function ListFeatures(
+ \Routeguide\Rectangle $request,
+ \Grpc\ServerCallWriter $writer,
+ \Grpc\ServerContext $context
+ ): void {
+ $context->setStatus(\Grpc\Status::unimplemented());
+ $writer->finish();
+ }
+
+ /**
+ * A client-to-server streaming RPC.
+ *
+ * Accepts a stream of Points on a route being traversed, returning a
+ * RouteSummary when traversal is completed.
+ * @param \Grpc\ServerCallReader $reader read client request data of \Routeguide\Point
+ * @param \Grpc\ServerContext $context server request context
+ * @return \Routeguide\RouteSummary for response data, null if if error occured
+ * initial metadata (if any) and status (if not ok) should be set to $context
+ */
+ public function RecordRoute(
+ \Grpc\ServerCallReader $reader,
+ \Grpc\ServerContext $context
+ ): ?\Routeguide\RouteSummary {
+ $context->setStatus(\Grpc\Status::unimplemented());
+ return null;
+ }
+
+ /**
+ * A Bidirectional streaming RPC.
+ *
+ * Accepts a stream of RouteNotes sent while a route is being traversed,
+ * while receiving other RouteNotes (e.g. from other users).
+ * @param \Grpc\ServerCallReader $reader read client request data of \Routeguide\RouteNote
+ * @param \Grpc\ServerCallWriter $writer write response data of \Routeguide\RouteNote
+ * @param \Grpc\ServerContext $context server request context
+ * @return void
+ */
+ public function RouteChat(
+ \Grpc\ServerCallReader $reader,
+ \Grpc\ServerCallWriter $writer,
+ \Grpc\ServerContext $context
+ ): void {
+ $context->setStatus(\Grpc\Status::unimplemented());
+ $writer->finish();
+ }
+
+ /**
+ * Get the method descriptors of the service for server registration
+ *
+ * @return array of \Grpc\MethodDescriptor for the service methods
+ */
+ public final function getMethodDescriptors(): array
+ {
+ return [
+ '/routeguide.RouteGuide/GetFeature' => new \Grpc\MethodDescriptor(
+ $this,
+ 'GetFeature',
+ '\Routeguide\Point',
+ \Grpc\MethodDescriptor::UNARY_CALL
+ ),
+ '/routeguide.RouteGuide/ListFeatures' => new \Grpc\MethodDescriptor(
+ $this,
+ 'ListFeatures',
+ '\Routeguide\Rectangle',
+ \Grpc\MethodDescriptor::SERVER_STREAMING_CALL
+ ),
+ '/routeguide.RouteGuide/RecordRoute' => new \Grpc\MethodDescriptor(
+ $this,
+ 'RecordRoute',
+ '\Routeguide\Point',
+ \Grpc\MethodDescriptor::CLIENT_STREAMING_CALL
+ ),
+ '/routeguide.RouteGuide/RouteChat' => new \Grpc\MethodDescriptor(
+ $this,
+ 'RouteChat',
+ '\Routeguide\RouteNote',
+ \Grpc\MethodDescriptor::BIDI_STREAMING_CALL
+ ),
+ ];
+ }
+
+}
diff --git a/examples/php/route_guide/Routeguide/RouteNote.php b/examples/php/route_guide/Routeguide/RouteNote.php
new file mode 100644
index 00000000000..153c0a29e19
--- /dev/null
+++ b/examples/php/route_guide/Routeguide/RouteNote.php
@@ -0,0 +1,111 @@
+routeguide.RouteNote
+ */
+class RouteNote extends \Google\Protobuf\Internal\Message
+{
+ /**
+ * The location from which the message is sent.
+ *
+ * Generated from protobuf field .routeguide.Point location = 1;
+ */
+ protected $location = null;
+ /**
+ * The message to be sent.
+ *
+ * Generated from protobuf field string message = 2;
+ */
+ protected $message = '';
+
+ /**
+ * Constructor.
+ *
+ * @param array $data {
+ * Optional. Data for populating the Message object.
+ *
+ * @type \Routeguide\Point $location
+ * The location from which the message is sent.
+ * @type string $message
+ * The message to be sent.
+ * }
+ */
+ public function __construct($data = NULL) {
+ \GPBMetadata\RouteGuide::initOnce();
+ parent::__construct($data);
+ }
+
+ /**
+ * The location from which the message is sent.
+ *
+ * Generated from protobuf field .routeguide.Point location = 1;
+ * @return \Routeguide\Point|null
+ */
+ public function getLocation()
+ {
+ return isset($this->location) ? $this->location : null;
+ }
+
+ public function hasLocation()
+ {
+ return isset($this->location);
+ }
+
+ public function clearLocation()
+ {
+ unset($this->location);
+ }
+
+ /**
+ * The location from which the message is sent.
+ *
+ * Generated from protobuf field .routeguide.Point location = 1;
+ * @param \Routeguide\Point $var
+ * @return $this
+ */
+ public function setLocation($var)
+ {
+ GPBUtil::checkMessage($var, \Routeguide\Point::class);
+ $this->location = $var;
+
+ return $this;
+ }
+
+ /**
+ * The message to be sent.
+ *
+ * Generated from protobuf field string message = 2;
+ * @return string
+ */
+ public function getMessage()
+ {
+ return $this->message;
+ }
+
+ /**
+ * The message to be sent.
+ *
+ * Generated from protobuf field string message = 2;
+ * @param string $var
+ * @return $this
+ */
+ public function setMessage($var)
+ {
+ GPBUtil::checkString($var, True);
+ $this->message = $var;
+
+ return $this;
+ }
+
+}
+
diff --git a/examples/php/route_guide/Routeguide/RouteSummary.php b/examples/php/route_guide/Routeguide/RouteSummary.php
new file mode 100644
index 00000000000..23c264aa8fa
--- /dev/null
+++ b/examples/php/route_guide/Routeguide/RouteSummary.php
@@ -0,0 +1,172 @@
+routeguide.RouteSummary
+ */
+class RouteSummary extends \Google\Protobuf\Internal\Message
+{
+ /**
+ * The number of points received.
+ *
+ * Generated from protobuf field int32 point_count = 1;
+ */
+ protected $point_count = 0;
+ /**
+ * The number of known features passed while traversing the route.
+ *
+ * Generated from protobuf field int32 feature_count = 2;
+ */
+ protected $feature_count = 0;
+ /**
+ * The distance covered in metres.
+ *
+ * Generated from protobuf field int32 distance = 3;
+ */
+ protected $distance = 0;
+ /**
+ * The duration of the traversal in seconds.
+ *
+ * Generated from protobuf field int32 elapsed_time = 4;
+ */
+ protected $elapsed_time = 0;
+
+ /**
+ * Constructor.
+ *
+ * @param array $data {
+ * Optional. Data for populating the Message object.
+ *
+ * @type int $point_count
+ * The number of points received.
+ * @type int $feature_count
+ * The number of known features passed while traversing the route.
+ * @type int $distance
+ * The distance covered in metres.
+ * @type int $elapsed_time
+ * The duration of the traversal in seconds.
+ * }
+ */
+ public function __construct($data = NULL) {
+ \GPBMetadata\RouteGuide::initOnce();
+ parent::__construct($data);
+ }
+
+ /**
+ * The number of points received.
+ *
+ * Generated from protobuf field int32 point_count = 1;
+ * @return int
+ */
+ public function getPointCount()
+ {
+ return $this->point_count;
+ }
+
+ /**
+ * The number of points received.
+ *
+ * Generated from protobuf field int32 point_count = 1;
+ * @param int $var
+ * @return $this
+ */
+ public function setPointCount($var)
+ {
+ GPBUtil::checkInt32($var);
+ $this->point_count = $var;
+
+ return $this;
+ }
+
+ /**
+ * The number of known features passed while traversing the route.
+ *
+ * Generated from protobuf field int32 feature_count = 2;
+ * @return int
+ */
+ public function getFeatureCount()
+ {
+ return $this->feature_count;
+ }
+
+ /**
+ * The number of known features passed while traversing the route.
+ *
+ * Generated from protobuf field int32 feature_count = 2;
+ * @param int $var
+ * @return $this
+ */
+ public function setFeatureCount($var)
+ {
+ GPBUtil::checkInt32($var);
+ $this->feature_count = $var;
+
+ return $this;
+ }
+
+ /**
+ * The distance covered in metres.
+ *
+ * Generated from protobuf field int32 distance = 3;
+ * @return int
+ */
+ public function getDistance()
+ {
+ return $this->distance;
+ }
+
+ /**
+ * The distance covered in metres.
+ *
+ * Generated from protobuf field int32 distance = 3;
+ * @param int $var
+ * @return $this
+ */
+ public function setDistance($var)
+ {
+ GPBUtil::checkInt32($var);
+ $this->distance = $var;
+
+ return $this;
+ }
+
+ /**
+ * The duration of the traversal in seconds.
+ *
+ * Generated from protobuf field int32 elapsed_time = 4;
+ * @return int
+ */
+ public function getElapsedTime()
+ {
+ return $this->elapsed_time;
+ }
+
+ /**
+ * The duration of the traversal in seconds.
+ *
+ * Generated from protobuf field int32 elapsed_time = 4;
+ * @param int $var
+ * @return $this
+ */
+ public function setElapsedTime($var)
+ {
+ GPBUtil::checkInt32($var);
+ $this->elapsed_time = $var;
+
+ return $this;
+ }
+
+}
+
diff --git a/examples/php/route_guide/route_guide_db.json b/examples/php/route_guide/route_guide_db.json
new file mode 100644
index 00000000000..9d6a980ab7d
--- /dev/null
+++ b/examples/php/route_guide/route_guide_db.json
@@ -0,0 +1,601 @@
+[{
+ "location": {
+ "latitude": 407838351,
+ "longitude": -746143763
+ },
+ "name": "Patriots Path, Mendham, NJ 07945, USA"
+}, {
+ "location": {
+ "latitude": 408122808,
+ "longitude": -743999179
+ },
+ "name": "101 New Jersey 10, Whippany, NJ 07981, USA"
+}, {
+ "location": {
+ "latitude": 413628156,
+ "longitude": -749015468
+ },
+ "name": "U.S. 6, Shohola, PA 18458, USA"
+}, {
+ "location": {
+ "latitude": 419999544,
+ "longitude": -740371136
+ },
+ "name": "5 Conners Road, Kingston, NY 12401, USA"
+}, {
+ "location": {
+ "latitude": 414008389,
+ "longitude": -743951297
+ },
+ "name": "Mid Hudson Psychiatric Center, New Hampton, NY 10958, USA"
+}, {
+ "location": {
+ "latitude": 419611318,
+ "longitude": -746524769
+ },
+ "name": "287 Flugertown Road, Livingston Manor, NY 12758, USA"
+}, {
+ "location": {
+ "latitude": 406109563,
+ "longitude": -742186778
+ },
+ "name": "4001 Tremley Point Road, Linden, NJ 07036, USA"
+}, {
+ "location": {
+ "latitude": 416802456,
+ "longitude": -742370183
+ },
+ "name": "352 South Mountain Road, Wallkill, NY 12589, USA"
+}, {
+ "location": {
+ "latitude": 412950425,
+ "longitude": -741077389
+ },
+ "name": "Bailey Turn Road, Harriman, NY 10926, USA"
+}, {
+ "location": {
+ "latitude": 412144655,
+ "longitude": -743949739
+ },
+ "name": "193-199 Wawayanda Road, Hewitt, NJ 07421, USA"
+}, {
+ "location": {
+ "latitude": 415736605,
+ "longitude": -742847522
+ },
+ "name": "406-496 Ward Avenue, Pine Bush, NY 12566, USA"
+}, {
+ "location": {
+ "latitude": 413843930,
+ "longitude": -740501726
+ },
+ "name": "162 Merrill Road, Highland Mills, NY 10930, USA"
+}, {
+ "location": {
+ "latitude": 410873075,
+ "longitude": -744459023
+ },
+ "name": "Clinton Road, West Milford, NJ 07480, USA"
+}, {
+ "location": {
+ "latitude": 412346009,
+ "longitude": -744026814
+ },
+ "name": "16 Old Brook Lane, Warwick, NY 10990, USA"
+}, {
+ "location": {
+ "latitude": 402948455,
+ "longitude": -747903913
+ },
+ "name": "3 Drake Lane, Pennington, NJ 08534, USA"
+}, {
+ "location": {
+ "latitude": 406337092,
+ "longitude": -740122226
+ },
+ "name": "6324 8th Avenue, Brooklyn, NY 11220, USA"
+}, {
+ "location": {
+ "latitude": 406421967,
+ "longitude": -747727624
+ },
+ "name": "1 Merck Access Road, Whitehouse Station, NJ 08889, USA"
+}, {
+ "location": {
+ "latitude": 416318082,
+ "longitude": -749677716
+ },
+ "name": "78-98 Schalck Road, Narrowsburg, NY 12764, USA"
+}, {
+ "location": {
+ "latitude": 415301720,
+ "longitude": -748416257
+ },
+ "name": "282 Lakeview Drive Road, Highland Lake, NY 12743, USA"
+}, {
+ "location": {
+ "latitude": 402647019,
+ "longitude": -747071791
+ },
+ "name": "330 Evelyn Avenue, Hamilton Township, NJ 08619, USA"
+}, {
+ "location": {
+ "latitude": 412567807,
+ "longitude": -741058078
+ },
+ "name": "New York State Reference Route 987E, Southfields, NY 10975, USA"
+}, {
+ "location": {
+ "latitude": 416855156,
+ "longitude": -744420597
+ },
+ "name": "103-271 Tempaloni Road, Ellenville, NY 12428, USA"
+}, {
+ "location": {
+ "latitude": 404663628,
+ "longitude": -744820157
+ },
+ "name": "1300 Airport Road, North Brunswick Township, NJ 08902, USA"
+}, {
+ "location": {
+ "latitude": 407113723,
+ "longitude": -749746483
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 402133926,
+ "longitude": -743613249
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 400273442,
+ "longitude": -741220915
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 411236786,
+ "longitude": -744070769
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 411633782,
+ "longitude": -746784970
+ },
+ "name": "211-225 Plains Road, Augusta, NJ 07822, USA"
+}, {
+ "location": {
+ "latitude": 415830701,
+ "longitude": -742952812
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 413447164,
+ "longitude": -748712898
+ },
+ "name": "165 Pedersen Ridge Road, Milford, PA 18337, USA"
+}, {
+ "location": {
+ "latitude": 405047245,
+ "longitude": -749800722
+ },
+ "name": "100-122 Locktown Road, Frenchtown, NJ 08825, USA"
+}, {
+ "location": {
+ "latitude": 418858923,
+ "longitude": -746156790
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 417951888,
+ "longitude": -748484944
+ },
+ "name": "650-652 Willi Hill Road, Swan Lake, NY 12783, USA"
+}, {
+ "location": {
+ "latitude": 407033786,
+ "longitude": -743977337
+ },
+ "name": "26 East 3rd Street, New Providence, NJ 07974, USA"
+}, {
+ "location": {
+ "latitude": 417548014,
+ "longitude": -740075041
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 410395868,
+ "longitude": -744972325
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 404615353,
+ "longitude": -745129803
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 406589790,
+ "longitude": -743560121
+ },
+ "name": "611 Lawrence Avenue, Westfield, NJ 07090, USA"
+}, {
+ "location": {
+ "latitude": 414653148,
+ "longitude": -740477477
+ },
+ "name": "18 Lannis Avenue, New Windsor, NY 12553, USA"
+}, {
+ "location": {
+ "latitude": 405957808,
+ "longitude": -743255336
+ },
+ "name": "82-104 Amherst Avenue, Colonia, NJ 07067, USA"
+}, {
+ "location": {
+ "latitude": 411733589,
+ "longitude": -741648093
+ },
+ "name": "170 Seven Lakes Drive, Sloatsburg, NY 10974, USA"
+}, {
+ "location": {
+ "latitude": 412676291,
+ "longitude": -742606606
+ },
+ "name": "1270 Lakes Road, Monroe, NY 10950, USA"
+}, {
+ "location": {
+ "latitude": 409224445,
+ "longitude": -748286738
+ },
+ "name": "509-535 Alphano Road, Great Meadows, NJ 07838, USA"
+}, {
+ "location": {
+ "latitude": 406523420,
+ "longitude": -742135517
+ },
+ "name": "652 Garden Street, Elizabeth, NJ 07202, USA"
+}, {
+ "location": {
+ "latitude": 401827388,
+ "longitude": -740294537
+ },
+ "name": "349 Sea Spray Court, Neptune City, NJ 07753, USA"
+}, {
+ "location": {
+ "latitude": 410564152,
+ "longitude": -743685054
+ },
+ "name": "13-17 Stanley Street, West Milford, NJ 07480, USA"
+}, {
+ "location": {
+ "latitude": 408472324,
+ "longitude": -740726046
+ },
+ "name": "47 Industrial Avenue, Teterboro, NJ 07608, USA"
+}, {
+ "location": {
+ "latitude": 412452168,
+ "longitude": -740214052
+ },
+ "name": "5 White Oak Lane, Stony Point, NY 10980, USA"
+}, {
+ "location": {
+ "latitude": 409146138,
+ "longitude": -746188906
+ },
+ "name": "Berkshire Valley Management Area Trail, Jefferson, NJ, USA"
+}, {
+ "location": {
+ "latitude": 404701380,
+ "longitude": -744781745
+ },
+ "name": "1007 Jersey Avenue, New Brunswick, NJ 08901, USA"
+}, {
+ "location": {
+ "latitude": 409642566,
+ "longitude": -746017679
+ },
+ "name": "6 East Emerald Isle Drive, Lake Hopatcong, NJ 07849, USA"
+}, {
+ "location": {
+ "latitude": 408031728,
+ "longitude": -748645385
+ },
+ "name": "1358-1474 New Jersey 57, Port Murray, NJ 07865, USA"
+}, {
+ "location": {
+ "latitude": 413700272,
+ "longitude": -742135189
+ },
+ "name": "367 Prospect Road, Chester, NY 10918, USA"
+}, {
+ "location": {
+ "latitude": 404310607,
+ "longitude": -740282632
+ },
+ "name": "10 Simon Lake Drive, Atlantic Highlands, NJ 07716, USA"
+}, {
+ "location": {
+ "latitude": 409319800,
+ "longitude": -746201391
+ },
+ "name": "11 Ward Street, Mount Arlington, NJ 07856, USA"
+}, {
+ "location": {
+ "latitude": 406685311,
+ "longitude": -742108603
+ },
+ "name": "300-398 Jefferson Avenue, Elizabeth, NJ 07201, USA"
+}, {
+ "location": {
+ "latitude": 419018117,
+ "longitude": -749142781
+ },
+ "name": "43 Dreher Road, Roscoe, NY 12776, USA"
+}, {
+ "location": {
+ "latitude": 412856162,
+ "longitude": -745148837
+ },
+ "name": "Swan Street, Pine Island, NY 10969, USA"
+}, {
+ "location": {
+ "latitude": 416560744,
+ "longitude": -746721964
+ },
+ "name": "66 Pleasantview Avenue, Monticello, NY 12701, USA"
+}, {
+ "location": {
+ "latitude": 405314270,
+ "longitude": -749836354
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 414219548,
+ "longitude": -743327440
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 415534177,
+ "longitude": -742900616
+ },
+ "name": "565 Winding Hills Road, Montgomery, NY 12549, USA"
+}, {
+ "location": {
+ "latitude": 406898530,
+ "longitude": -749127080
+ },
+ "name": "231 Rocky Run Road, Glen Gardner, NJ 08826, USA"
+}, {
+ "location": {
+ "latitude": 407586880,
+ "longitude": -741670168
+ },
+ "name": "100 Mount Pleasant Avenue, Newark, NJ 07104, USA"
+}, {
+ "location": {
+ "latitude": 400106455,
+ "longitude": -742870190
+ },
+ "name": "517-521 Huntington Drive, Manchester Township, NJ 08759, USA"
+}, {
+ "location": {
+ "latitude": 400066188,
+ "longitude": -746793294
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 418803880,
+ "longitude": -744102673
+ },
+ "name": "40 Mountain Road, Napanoch, NY 12458, USA"
+}, {
+ "location": {
+ "latitude": 414204288,
+ "longitude": -747895140
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 414777405,
+ "longitude": -740615601
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 415464475,
+ "longitude": -747175374
+ },
+ "name": "48 North Road, Forestburgh, NY 12777, USA"
+}, {
+ "location": {
+ "latitude": 404062378,
+ "longitude": -746376177
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 405688272,
+ "longitude": -749285130
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 400342070,
+ "longitude": -748788996
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 401809022,
+ "longitude": -744157964
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 404226644,
+ "longitude": -740517141
+ },
+ "name": "9 Thompson Avenue, Leonardo, NJ 07737, USA"
+}, {
+ "location": {
+ "latitude": 410322033,
+ "longitude": -747871659
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 407100674,
+ "longitude": -747742727
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 418811433,
+ "longitude": -741718005
+ },
+ "name": "213 Bush Road, Stone Ridge, NY 12484, USA"
+}, {
+ "location": {
+ "latitude": 415034302,
+ "longitude": -743850945
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 411349992,
+ "longitude": -743694161
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 404839914,
+ "longitude": -744759616
+ },
+ "name": "1-17 Bergen Court, New Brunswick, NJ 08901, USA"
+}, {
+ "location": {
+ "latitude": 414638017,
+ "longitude": -745957854
+ },
+ "name": "35 Oakland Valley Road, Cuddebackville, NY 12729, USA"
+}, {
+ "location": {
+ "latitude": 412127800,
+ "longitude": -740173578
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 401263460,
+ "longitude": -747964303
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 412843391,
+ "longitude": -749086026
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 418512773,
+ "longitude": -743067823
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 404318328,
+ "longitude": -740835638
+ },
+ "name": "42-102 Main Street, Belford, NJ 07718, USA"
+}, {
+ "location": {
+ "latitude": 419020746,
+ "longitude": -741172328
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 404080723,
+ "longitude": -746119569
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 401012643,
+ "longitude": -744035134
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 404306372,
+ "longitude": -741079661
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 403966326,
+ "longitude": -748519297
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 405002031,
+ "longitude": -748407866
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 409532885,
+ "longitude": -742200683
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 416851321,
+ "longitude": -742674555
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 406411633,
+ "longitude": -741722051
+ },
+ "name": "3387 Richmond Terrace, Staten Island, NY 10303, USA"
+}, {
+ "location": {
+ "latitude": 413069058,
+ "longitude": -744597778
+ },
+ "name": "261 Van Sickle Road, Goshen, NY 10924, USA"
+}, {
+ "location": {
+ "latitude": 418465462,
+ "longitude": -746859398
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 411733222,
+ "longitude": -744228360
+ },
+ "name": ""
+}, {
+ "location": {
+ "latitude": 410248224,
+ "longitude": -747127767
+ },
+ "name": "3 Hasta Way, Newton, NJ 07860, USA"
+}]
diff --git a/examples/php/route_guide/route_guide_proto_gen.sh b/examples/php/route_guide/route_guide_proto_gen.sh
index bfd7cdb725c..8b7e61c42f2 100755
--- a/examples/php/route_guide/route_guide_proto_gen.sh
+++ b/examples/php/route_guide/route_guide_proto_gen.sh
@@ -13,4 +13,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-protoc --proto_path=./../../protos --php_out=./ --grpc_out=./ --plugin=protoc-gen-grpc=./../../../bins/opt/grpc_php_plugin ./../../protos/route_guide.proto
+set -e
+
+cd $(dirname $0)/../../..
+
+# protoc and grpc_*_plugin binaries can be obtained by running
+# $ bazel build @com_google_protobuf//:protoc //src/compiler:all
+PROTOC=bazel-bin/external/com_google_protobuf/protoc
+PLUGIN=protoc-gen-grpc=bazel-bin/src/compiler/grpc_php_plugin
+
+$PROTOC --proto_path=examples/protos \
+ --php_out=examples/php/route_guide \
+ --grpc_out=generate_server:examples/php/route_guide \
+ --plugin=$PLUGIN examples/protos/route_guide.proto
diff --git a/examples/php/route_guide/route_guide_server.php b/examples/php/route_guide/route_guide_server.php
new file mode 100644
index 00000000000..29b086f182d
--- /dev/null
+++ b/examples/php/route_guide/route_guide_server.php
@@ -0,0 +1,34 @@
+addHttp2Port('0.0.0.0:50051');
+$server->handle(new RouteGuideService($routeDbFile));
+$server->run();
diff --git a/examples/python/xds/README.md b/examples/python/xds/README.md
index cd9587a421c..cba8c0691b9 100644
--- a/examples/python/xds/README.md
+++ b/examples/python/xds/README.md
@@ -56,7 +56,7 @@ export GRPC_XDS_BOOTSTRAP=/etc/xds-bootstrap.json
3. Run the client:
```
-python client.py xds-experimental:///my-backend
+python client.py xds:///my-backend
```
### Verifying Configuration with a CLI Tool
@@ -101,3 +101,23 @@ grpc.health.v1.Health/Check
"status": "SERVING"
}
```
+
+### Running with Proxyless Security
+
+#### Run the Server with Secure Credentials
+
+Add the `--secure true` flag to the invocation outlined above.
+
+```sh
+python server.py --secure true
+```
+
+#### Run the Client with Secure Credentials
+
+Add the `--secure true` flag to the invocation outlined above.
+
+3. Run the client:
+
+```
+python client.py xds:///my-backend --secure true
+```
diff --git a/examples/python/xds/client.py b/examples/python/xds/client.py
index ee300265a92..a969b603fad 100644
--- a/examples/python/xds/client.py
+++ b/examples/python/xds/client.py
@@ -18,6 +18,7 @@ import logging
import argparse
import grpc
+import grpc.experimental
import helloworld_pb2
import helloworld_pb2_grpc
@@ -25,11 +26,17 @@ import helloworld_pb2_grpc
_DESCRIPTION = "Get a greeting from a server."
-def run(server_address):
- with grpc.insecure_channel(server_address) as channel:
+def run(server_address, secure):
+ if secure:
+ fallback_creds = grpc.experimental.insecure_channel_credentials()
+ channel_creds = grpc.xds_channel_credentials(fallback_creds)
+ channel = grpc.secure_channel(server_address, channel_creds)
+ else:
+ channel = grpc.insecure_channel(server_address)
+ with channel:
stub = helloworld_pb2_grpc.GreeterStub(channel)
response = stub.SayHello(helloworld_pb2.HelloRequest(name='you'))
- print("Greeter client received: " + response.message)
+ print("Greeter client received: " + response.message)
if __name__ == '__main__':
@@ -37,6 +44,10 @@ if __name__ == '__main__':
parser.add_argument("server",
default=None,
help="The address of the server.")
+ parser.add_argument(
+ "--xds-creds",
+ action="store_true",
+ help="If specified, uses xDS credentials to connect to the server.")
args = parser.parse_args()
logging.basicConfig()
- run(args.server)
+ run(args.server, args.xds_creds)
diff --git a/examples/python/xds/requirements.txt b/examples/python/xds/requirements.txt
index 7ba651e351a..6be56983639 100644
--- a/examples/python/xds/requirements.txt
+++ b/examples/python/xds/requirements.txt
@@ -1,4 +1,4 @@
-grpcio>=1.28.1
+grpcio>=1.37.1
protobuf
grpcio-reflection
grpcio-health-checking
diff --git a/examples/python/xds/server.py b/examples/python/xds/server.py
index 196e2c11f3a..82fabf26641 100644
--- a/examples/python/xds/server.py
+++ b/examples/python/xds/server.py
@@ -16,7 +16,6 @@
from concurrent import futures
import argparse
import logging
-import multiprocessing
import socket
import grpc
@@ -31,6 +30,16 @@ from grpc_health.v1 import health_pb2_grpc
_DESCRIPTION = "A general purpose phony server."
+_LISTEN_HOST = "[::]"
+
+_THREAD_POOL_SIZE = 256
+
+logger = logging.getLogger()
+console_handler = logging.StreamHandler()
+formatter = logging.Formatter(fmt='%(asctime)s: %(levelname)-8s %(message)s')
+console_handler.setFormatter(formatter)
+logger.addHandler(console_handler)
+
class Greeter(helloworld_pb2_grpc.GreeterServicer):
@@ -43,19 +52,17 @@ class Greeter(helloworld_pb2_grpc.GreeterServicer):
message=f"Hello {request.name} from {self._hostname}!")
-def serve(port: int, hostname: str):
- server = grpc.server(
- futures.ThreadPoolExecutor(max_workers=multiprocessing.cpu_count()))
-
- # Add the application servicer to the server.
- helloworld_pb2_grpc.add_GreeterServicer_to_server(Greeter(hostname), server)
+def _configure_maintenance_server(server: grpc.Server,
+ maintenance_port: int) -> None:
+ listen_address = f"{_LISTEN_HOST}:{maintenance_port}"
+ server.add_insecure_port(listen_address)
# Create a health check servicer. We use the non-blocking implementation
# to avoid thread starvation.
health_servicer = health.HealthServicer(
experimental_non_blocking=True,
- experimental_thread_pool=futures.ThreadPoolExecutor(max_workers=1))
- health_pb2_grpc.add_HealthServicer_to_server(health_servicer, server)
+ experimental_thread_pool=futures.ThreadPoolExecutor(
+ max_workers=_THREAD_POOL_SIZE))
# Create a tuple of all of the services we want to export via reflection.
services = tuple(
@@ -63,18 +70,57 @@ def serve(port: int, hostname: str):
for service in helloworld_pb2.DESCRIPTOR.services_by_name.values()) + (
reflection.SERVICE_NAME, health.SERVICE_NAME)
- # Add the reflection service to the server.
- reflection.enable_server_reflection(services, server)
- server.add_insecure_port(f"[::]:{port}")
- server.start()
-
# Mark all services as healthy.
- overall_server_health = ""
- for service in services + (overall_server_health,):
+ health_pb2_grpc.add_HealthServicer_to_server(health_servicer, server)
+ for service in services:
health_servicer.set(service, health_pb2.HealthCheckResponse.SERVING)
+ reflection.enable_server_reflection(services, server)
- # Park the main application thread.
- server.wait_for_termination()
+
+def _configure_greeter_server(server: grpc.Server, port: int, secure_mode: bool,
+ hostname) -> None:
+ # Add the application servicer to the server.
+ helloworld_pb2_grpc.add_GreeterServicer_to_server(Greeter(hostname), server)
+ listen_address = f"{_LISTEN_HOST}:{port}"
+ if not secure_mode:
+ server.add_insecure_port(listen_address)
+ else:
+ # Use xDS credentials.
+ logger.info("Running with xDS Server credentials")
+
+ # Fall back to insecure credentials.
+ server_fallback_creds = grpc.insecure_server_credentials()
+ server_creds = grpc.xds_server_credentials(server_fallback_creds)
+ server.add_secure_port(listen_address, server_creds)
+
+
+def serve(port: int, hostname: str, maintenance_port: int,
+ secure_mode: bool) -> None:
+ if port == maintenance_port:
+ # If maintenance port and port are the same, start a single server.
+ server = grpc.server(
+ futures.ThreadPoolExecutor(max_workers=_THREAD_POOL_SIZE))
+ _configure_greeter_server(server, port, secure_mode, hostname)
+ _configure_maintenance_server(server, maintenance_port)
+ server.start()
+ logger.info("Greeter server listening on port %d", port)
+ logger.info("Maintenance server listening on port %d", maintenance_port)
+ server.wait_for_termination()
+ else:
+ # Otherwise, start two different servers.
+ greeter_server = grpc.server(
+ futures.ThreadPoolExecutor(max_workers=_THREAD_POOL_SIZE),
+ xds=secure_mode)
+ _configure_greeter_server(greeter_server, port, secure_mode, hostname)
+ greeter_server.start()
+ logger.info("Greeter server listening on port %d", port)
+ maintenance_server = grpc.server(
+ futures.ThreadPoolExecutor(max_workers=_THREAD_POOL_SIZE))
+ _configure_maintenance_server(maintenance_server, maintenance_port)
+ maintenance_server.start()
+ logger.info("Maintenance server listening on port %d", maintenance_port)
+ greeter_server.wait_for_termination()
+ maintenance_server.wait_for_termination()
if __name__ == '__main__':
@@ -89,6 +135,11 @@ if __name__ == '__main__':
default=None,
nargs="?",
help="The name clients will see in responses.")
+ parser.add_argument(
+ "--xds-creds",
+ action="store_true",
+ help="If specified, uses xDS credentials to connect to the server.")
args = parser.parse_args()
logging.basicConfig()
- serve(args.port, args.hostname)
+ logger.setLevel(logging.INFO)
+ serve(args.port, args.hostname, args.port + 1, args.xds_creds)
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
index 69f5b8290e0..e7cb9bc1b2d 100644
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@@ -22,7 +22,7 @@
Pod::Spec.new do |s|
s.name = 'gRPC-C++'
# TODO (mxyan): use version that match gRPC version when pod is stabilized
- version = '1.37.0-dev'
+ version = '1.38.0-dev'
s.version = version
s.summary = 'gRPC C++ library'
s.homepage = 'https://grpc.io'
@@ -118,6 +118,7 @@ Pod::Spec.new do |s|
'include/grpcpp/impl/codegen/message_allocator.h',
'include/grpcpp/impl/codegen/metadata_map.h',
'include/grpcpp/impl/codegen/method_handler.h',
+ 'include/grpcpp/impl/codegen/method_handler_impl.h',
'include/grpcpp/impl/codegen/rpc_method.h',
'include/grpcpp/impl/codegen/rpc_service_method.h',
'include/grpcpp/impl/codegen/security/auth_context.h',
@@ -185,10 +186,9 @@ Pod::Spec.new do |s|
ss.header_mappings_dir = '.'
ss.dependency "#{s.name}/Interface", version
ss.dependency 'gRPC-Core', version
- abseil_version = '1.20200923.3'
+ abseil_version = '1.20210324.0'
ss.dependency 'abseil/base/base', abseil_version
ss.dependency 'abseil/container/flat_hash_map', abseil_version
- ss.dependency 'abseil/container/flat_hash_set', abseil_version
ss.dependency 'abseil/container/inlined_vector', abseil_version
ss.dependency 'abseil/functional/bind_front', abseil_version
ss.dependency 'abseil/memory/memory', abseil_version
@@ -221,6 +221,7 @@ Pod::Spec.new do |s|
'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h',
'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h',
'src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h',
+ 'src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.h',
'src/core/ext/filters/client_channel/lb_policy/subchannel_list.h',
'src/core/ext/filters/client_channel/lb_policy/xds/xds.h',
'src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h',
@@ -238,6 +239,8 @@ Pod::Spec.new do |s|
'src/core/ext/filters/client_channel/resolver_factory.h',
'src/core/ext/filters/client_channel/resolver_registry.h',
'src/core/ext/filters/client_channel/resolver_result_parsing.h',
+ 'src/core/ext/filters/client_channel/retry_filter.h',
+ 'src/core/ext/filters/client_channel/retry_service_config.h',
'src/core/ext/filters/client_channel/retry_throttle.h',
'src/core/ext/filters/client_channel/server_address.h',
'src/core/ext/filters/client_channel/service_config.h',
@@ -247,6 +250,8 @@ Pod::Spec.new do |s|
'src/core/ext/filters/client_channel/subchannel_interface.h',
'src/core/ext/filters/client_channel/subchannel_pool_interface.h',
'src/core/ext/filters/deadline/deadline_filter.h',
+ 'src/core/ext/filters/fault_injection/fault_injection_filter.h',
+ 'src/core/ext/filters/fault_injection/service_config_parser.h',
'src/core/ext/filters/http/client/http_client_filter.h',
'src/core/ext/filters/http/client_authority_filter.h',
'src/core/ext/filters/http/message_compress/message_compress_filter.h',
@@ -282,9 +287,11 @@ Pod::Spec.new do |s|
'src/core/ext/transport/chttp2/transport/stream_map.h',
'src/core/ext/transport/chttp2/transport/varint.h',
'src/core/ext/transport/inproc/inproc_transport.h',
+ 'src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.h',
'src/core/ext/upb-generated/envoy/annotations/deprecation.upb.h',
'src/core/ext/upb-generated/envoy/annotations/resource.upb.h',
'src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.h',
+ 'src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.h',
'src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.h',
'src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.h',
'src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.h',
@@ -309,12 +316,16 @@ Pod::Spec.new do |s|
'src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.h',
'src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.h',
'src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.h',
+ 'src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.h',
+ 'src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.h',
'src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.h',
'src/core/ext/upb-generated/envoy/config/route/v3/route.upb.h',
'src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.h',
'src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.h',
'src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.h',
'src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.h',
+ 'src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.h',
+ 'src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.h',
'src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.h',
'src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h',
'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.h',
@@ -329,11 +340,14 @@ Pod::Spec.new do |s|
'src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.h',
'src/core/ext/upb-generated/envoy/service/route/v3/rds.upb.h',
'src/core/ext/upb-generated/envoy/service/route/v3/srds.upb.h',
+ 'src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.h',
'src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.h',
+ 'src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.h',
'src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.h',
'src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.h',
'src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.h',
'src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.h',
+ 'src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.h',
'src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.h',
'src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.h',
'src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.h',
@@ -372,9 +386,11 @@ Pod::Spec.new do |s|
'src/core/ext/upb-generated/xds/core/v3/resource.upb.h',
'src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h',
'src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h',
+ 'src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.h',
@@ -399,11 +415,15 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h',
@@ -418,11 +438,14 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.h',
@@ -463,7 +486,10 @@ Pod::Spec.new do |s|
'src/core/ext/xds/xds_channel_args.h',
'src/core/ext/xds/xds_client.h',
'src/core/ext/xds/xds_client_stats.h',
+ 'src/core/ext/xds/xds_http_fault_filter.h',
'src/core/ext/xds/xds_http_filters.h',
+ 'src/core/lib/address_utils/parse_address.h',
+ 'src/core/lib/address_utils/sockaddr_utils.h',
'src/core/lib/avl/avl.h',
'src/core/lib/backoff/backoff.h',
'src/core/lib/channel/channel_args.h',
@@ -521,6 +547,7 @@ Pod::Spec.new do |s|
'src/core/lib/gprpp/ref_counted.h',
'src/core/lib/gprpp/ref_counted_ptr.h',
'src/core/lib/gprpp/stat.h',
+ 'src/core/lib/gprpp/status_helper.h',
'src/core/lib/gprpp/sync.h',
'src/core/lib/gprpp/thd.h',
'src/core/lib/gprpp/time_util.h',
@@ -560,8 +587,6 @@ Pod::Spec.new do |s|
'src/core/lib/iomgr/load_file.h',
'src/core/lib/iomgr/lockfree_event.h',
'src/core/lib/iomgr/nameser.h',
- 'src/core/lib/iomgr/parse_address.h',
- 'src/core/lib/iomgr/poller/eventmanager_libuv.h',
'src/core/lib/iomgr/polling_entity.h',
'src/core/lib/iomgr/pollset.h',
'src/core/lib/iomgr/pollset_custom.h',
@@ -578,7 +603,6 @@ Pod::Spec.new do |s|
'src/core/lib/iomgr/sockaddr.h',
'src/core/lib/iomgr/sockaddr_custom.h',
'src/core/lib/iomgr/sockaddr_posix.h',
- 'src/core/lib/iomgr/sockaddr_utils.h',
'src/core/lib/iomgr/sockaddr_windows.h',
'src/core/lib/iomgr/socket_factory_posix.h',
'src/core/lib/iomgr/socket_mutator.h',
@@ -606,16 +630,8 @@ Pod::Spec.new do |s|
'src/core/lib/iomgr/work_serializer.h',
'src/core/lib/json/json.h',
'src/core/lib/json/json_util.h',
+ 'src/core/lib/matchers/matchers.h',
'src/core/lib/profiling/timers.h',
- 'src/core/lib/security/authorization/authorization_engine.h',
- 'src/core/lib/security/authorization/evaluate_args.h',
- 'src/core/lib/security/authorization/matchers.h',
- 'src/core/lib/security/authorization/mock_cel/activation.h',
- 'src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h',
- 'src/core/lib/security/authorization/mock_cel/cel_expression.h',
- 'src/core/lib/security/authorization/mock_cel/cel_value.h',
- 'src/core/lib/security/authorization/mock_cel/evaluator_core.h',
- 'src/core/lib/security/authorization/mock_cel/flat_expr_builder.h',
'src/core/lib/security/context/security_context.h',
'src/core/lib/security/credentials/alts/alts_credentials.h',
'src/core/lib/security/credentials/alts/check_gcp_environment.h',
@@ -814,8 +830,6 @@ Pod::Spec.new do |s|
'third_party/upb/upb/def.h',
'third_party/upb/upb/def.hpp',
'third_party/upb/upb/encode.h',
- 'third_party/upb/upb/json_decode.h',
- 'third_party/upb/upb/json_encode.h',
'third_party/upb/upb/msg.h',
'third_party/upb/upb/port_def.inc',
'third_party/upb/upb/port_undef.inc',
@@ -824,7 +838,8 @@ Pod::Spec.new do |s|
'third_party/upb/upb/text_encode.h',
'third_party/upb/upb/upb.h',
'third_party/upb/upb/upb.hpp',
- 'third_party/upb/upb/upb.int.h'
+ 'third_party/upb/upb/upb.int.h',
+ 'third_party/xxhash/xxhash.h'
ss.private_header_files = 'src/core/ext/filters/client_channel/backend_metric.h',
'src/core/ext/filters/client_channel/backup_poller.h',
@@ -847,6 +862,7 @@ Pod::Spec.new do |s|
'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h',
'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h',
'src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h',
+ 'src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.h',
'src/core/ext/filters/client_channel/lb_policy/subchannel_list.h',
'src/core/ext/filters/client_channel/lb_policy/xds/xds.h',
'src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h',
@@ -864,6 +880,8 @@ Pod::Spec.new do |s|
'src/core/ext/filters/client_channel/resolver_factory.h',
'src/core/ext/filters/client_channel/resolver_registry.h',
'src/core/ext/filters/client_channel/resolver_result_parsing.h',
+ 'src/core/ext/filters/client_channel/retry_filter.h',
+ 'src/core/ext/filters/client_channel/retry_service_config.h',
'src/core/ext/filters/client_channel/retry_throttle.h',
'src/core/ext/filters/client_channel/server_address.h',
'src/core/ext/filters/client_channel/service_config.h',
@@ -873,6 +891,8 @@ Pod::Spec.new do |s|
'src/core/ext/filters/client_channel/subchannel_interface.h',
'src/core/ext/filters/client_channel/subchannel_pool_interface.h',
'src/core/ext/filters/deadline/deadline_filter.h',
+ 'src/core/ext/filters/fault_injection/fault_injection_filter.h',
+ 'src/core/ext/filters/fault_injection/service_config_parser.h',
'src/core/ext/filters/http/client/http_client_filter.h',
'src/core/ext/filters/http/client_authority_filter.h',
'src/core/ext/filters/http/message_compress/message_compress_filter.h',
@@ -908,9 +928,11 @@ Pod::Spec.new do |s|
'src/core/ext/transport/chttp2/transport/stream_map.h',
'src/core/ext/transport/chttp2/transport/varint.h',
'src/core/ext/transport/inproc/inproc_transport.h',
+ 'src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.h',
'src/core/ext/upb-generated/envoy/annotations/deprecation.upb.h',
'src/core/ext/upb-generated/envoy/annotations/resource.upb.h',
'src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.h',
+ 'src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.h',
'src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.h',
'src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.h',
'src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.h',
@@ -935,12 +957,16 @@ Pod::Spec.new do |s|
'src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.h',
'src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.h',
'src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.h',
+ 'src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.h',
+ 'src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.h',
'src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.h',
'src/core/ext/upb-generated/envoy/config/route/v3/route.upb.h',
'src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.h',
'src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.h',
'src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.h',
'src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.h',
+ 'src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.h',
+ 'src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.h',
'src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.h',
'src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h',
'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.h',
@@ -955,11 +981,14 @@ Pod::Spec.new do |s|
'src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.h',
'src/core/ext/upb-generated/envoy/service/route/v3/rds.upb.h',
'src/core/ext/upb-generated/envoy/service/route/v3/srds.upb.h',
+ 'src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.h',
'src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.h',
+ 'src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.h',
'src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.h',
'src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.h',
'src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.h',
'src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.h',
+ 'src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.h',
'src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.h',
'src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.h',
'src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.h',
@@ -998,9 +1027,11 @@ Pod::Spec.new do |s|
'src/core/ext/upb-generated/xds/core/v3/resource.upb.h',
'src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h',
'src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h',
+ 'src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.h',
@@ -1025,11 +1056,15 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h',
@@ -1044,11 +1079,14 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.h',
@@ -1089,7 +1127,10 @@ Pod::Spec.new do |s|
'src/core/ext/xds/xds_channel_args.h',
'src/core/ext/xds/xds_client.h',
'src/core/ext/xds/xds_client_stats.h',
+ 'src/core/ext/xds/xds_http_fault_filter.h',
'src/core/ext/xds/xds_http_filters.h',
+ 'src/core/lib/address_utils/parse_address.h',
+ 'src/core/lib/address_utils/sockaddr_utils.h',
'src/core/lib/avl/avl.h',
'src/core/lib/backoff/backoff.h',
'src/core/lib/channel/channel_args.h',
@@ -1147,6 +1188,7 @@ Pod::Spec.new do |s|
'src/core/lib/gprpp/ref_counted.h',
'src/core/lib/gprpp/ref_counted_ptr.h',
'src/core/lib/gprpp/stat.h',
+ 'src/core/lib/gprpp/status_helper.h',
'src/core/lib/gprpp/sync.h',
'src/core/lib/gprpp/thd.h',
'src/core/lib/gprpp/time_util.h',
@@ -1186,8 +1228,6 @@ Pod::Spec.new do |s|
'src/core/lib/iomgr/load_file.h',
'src/core/lib/iomgr/lockfree_event.h',
'src/core/lib/iomgr/nameser.h',
- 'src/core/lib/iomgr/parse_address.h',
- 'src/core/lib/iomgr/poller/eventmanager_libuv.h',
'src/core/lib/iomgr/polling_entity.h',
'src/core/lib/iomgr/pollset.h',
'src/core/lib/iomgr/pollset_custom.h',
@@ -1204,7 +1244,6 @@ Pod::Spec.new do |s|
'src/core/lib/iomgr/sockaddr.h',
'src/core/lib/iomgr/sockaddr_custom.h',
'src/core/lib/iomgr/sockaddr_posix.h',
- 'src/core/lib/iomgr/sockaddr_utils.h',
'src/core/lib/iomgr/sockaddr_windows.h',
'src/core/lib/iomgr/socket_factory_posix.h',
'src/core/lib/iomgr/socket_mutator.h',
@@ -1232,16 +1271,8 @@ Pod::Spec.new do |s|
'src/core/lib/iomgr/work_serializer.h',
'src/core/lib/json/json.h',
'src/core/lib/json/json_util.h',
+ 'src/core/lib/matchers/matchers.h',
'src/core/lib/profiling/timers.h',
- 'src/core/lib/security/authorization/authorization_engine.h',
- 'src/core/lib/security/authorization/evaluate_args.h',
- 'src/core/lib/security/authorization/matchers.h',
- 'src/core/lib/security/authorization/mock_cel/activation.h',
- 'src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h',
- 'src/core/lib/security/authorization/mock_cel/cel_expression.h',
- 'src/core/lib/security/authorization/mock_cel/cel_value.h',
- 'src/core/lib/security/authorization/mock_cel/evaluator_core.h',
- 'src/core/lib/security/authorization/mock_cel/flat_expr_builder.h',
'src/core/lib/security/context/security_context.h',
'src/core/lib/security/credentials/alts/alts_credentials.h',
'src/core/lib/security/credentials/alts/check_gcp_environment.h',
@@ -1390,8 +1421,6 @@ Pod::Spec.new do |s|
'third_party/upb/upb/def.h',
'third_party/upb/upb/def.hpp',
'third_party/upb/upb/encode.h',
- 'third_party/upb/upb/json_decode.h',
- 'third_party/upb/upb/json_encode.h',
'third_party/upb/upb/msg.h',
'third_party/upb/upb/port_def.inc',
'third_party/upb/upb/port_undef.inc',
@@ -1400,7 +1429,8 @@ Pod::Spec.new do |s|
'third_party/upb/upb/text_encode.h',
'third_party/upb/upb/upb.h',
'third_party/upb/upb/upb.hpp',
- 'third_party/upb/upb/upb.int.h'
+ 'third_party/upb/upb/upb.int.h',
+ 'third_party/xxhash/xxhash.h'
end
s.subspec 'Protobuf' do |ss|
@@ -1442,5 +1472,8 @@ Pod::Spec.new do |s|
find third_party/re2/re2/ third_party/re2/util/ -type f \\( -name '*.h' -or -name '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "re2/(.*)";#if COCOAPODS==1\\\n #include "third_party/re2/re2/\\1"\\\n#else\\\n #include "re2/\\1"\\\n#endif;g;s;#include "util/(.*)";#if COCOAPODS==1\\\n #include "third_party/re2/util/\\1"\\\n#else\\\n #include "util/\\1"\\\n#endif;g'
find src/core/ -type f \\( -name '*.h' -or -name '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "re2/(.*)";#if COCOAPODS==1\\\n #include "third_party/re2/re2/\\1"\\\n#else\\\n #include "re2/\\1"\\\n#endif;g'
find src/core/ third_party/re2/ -type f -name '*.grpc_back' -print0 | xargs -0 rm
+ find src/core/ -type f \\( -name '*.h' -or -name '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "xxhash.h";#if COCOAPODS==1\\\n #include "third_party/xxhash/xxhash.h"\\\n#else\\\n #include "xxhash.h"\\\n#endif;g'
+ find third_party/xxhash -type f -name xxhash.h -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;@param([^,]*),;@param\\1 ,;g'
+ find src/core/ third_party/xxhash/ -type f -name '*.grpc_back' -print0 | xargs -0 rm
END_OF_COMMAND
end
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index afc596f7290..2c9f8288802 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -21,7 +21,7 @@
Pod::Spec.new do |s|
s.name = 'gRPC-Core'
- version = '1.37.0-dev'
+ version = '1.38.0-dev'
s.version = version
s.summary = 'Core cross-platform gRPC library, written in C'
s.homepage = 'https://grpc.io'
@@ -46,7 +46,7 @@ Pod::Spec.new do |s|
s.requires_arc = false
name = 'grpc'
- abseil_version = '1.20200923.3'
+ abseil_version = '1.20210324.0'
# When creating a dynamic framework, name it grpc.framework instead of gRPC-Core.framework.
# This lets users write their includes like `#include ` as opposed to `#include
@@ -173,10 +173,9 @@ Pod::Spec.new do |s|
ss.header_mappings_dir = '.'
ss.libraries = 'z'
ss.dependency "#{s.name}/Interface", version
- ss.dependency 'BoringSSL-GRPC', '0.0.17'
+ ss.dependency 'BoringSSL-GRPC', '0.0.18'
ss.dependency 'abseil/base/base', abseil_version
ss.dependency 'abseil/container/flat_hash_map', abseil_version
- ss.dependency 'abseil/container/flat_hash_set', abseil_version
ss.dependency 'abseil/container/inlined_vector', abseil_version
ss.dependency 'abseil/functional/bind_front', abseil_version
ss.dependency 'abseil/memory/memory', abseil_version
@@ -235,6 +234,8 @@ Pod::Spec.new do |s|
'src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h',
'src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc',
'src/core/ext/filters/client_channel/lb_policy/priority/priority.cc',
+ 'src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc',
+ 'src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.h',
'src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc',
'src/core/ext/filters/client_channel/lb_policy/subchannel_list.h',
'src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc',
@@ -278,6 +279,10 @@ Pod::Spec.new do |s|
'src/core/ext/filters/client_channel/resolver_registry.h',
'src/core/ext/filters/client_channel/resolver_result_parsing.cc',
'src/core/ext/filters/client_channel/resolver_result_parsing.h',
+ 'src/core/ext/filters/client_channel/retry_filter.cc',
+ 'src/core/ext/filters/client_channel/retry_filter.h',
+ 'src/core/ext/filters/client_channel/retry_service_config.cc',
+ 'src/core/ext/filters/client_channel/retry_service_config.h',
'src/core/ext/filters/client_channel/retry_throttle.cc',
'src/core/ext/filters/client_channel/retry_throttle.h',
'src/core/ext/filters/client_channel/server_address.cc',
@@ -296,6 +301,10 @@ Pod::Spec.new do |s|
'src/core/ext/filters/client_idle/client_idle_filter.cc',
'src/core/ext/filters/deadline/deadline_filter.cc',
'src/core/ext/filters/deadline/deadline_filter.h',
+ 'src/core/ext/filters/fault_injection/fault_injection_filter.cc',
+ 'src/core/ext/filters/fault_injection/fault_injection_filter.h',
+ 'src/core/ext/filters/fault_injection/service_config_parser.cc',
+ 'src/core/ext/filters/fault_injection/service_config_parser.h',
'src/core/ext/filters/http/client/http_client_filter.cc',
'src/core/ext/filters/http/client/http_client_filter.h',
'src/core/ext/filters/http/client_authority_filter.cc',
@@ -376,12 +385,16 @@ Pod::Spec.new do |s|
'src/core/ext/transport/inproc/inproc_plugin.cc',
'src/core/ext/transport/inproc/inproc_transport.cc',
'src/core/ext/transport/inproc/inproc_transport.h',
+ 'src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.c',
+ 'src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.h',
'src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c',
'src/core/ext/upb-generated/envoy/annotations/deprecation.upb.h',
'src/core/ext/upb-generated/envoy/annotations/resource.upb.c',
'src/core/ext/upb-generated/envoy/annotations/resource.upb.h',
'src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c',
'src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.h',
+ 'src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.c',
+ 'src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.h',
'src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c',
'src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.h',
'src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c',
@@ -430,6 +443,10 @@ Pod::Spec.new do |s|
'src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.h',
'src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c',
'src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.h',
+ 'src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.c',
+ 'src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.h',
+ 'src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.c',
+ 'src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.h',
'src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c',
'src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.h',
'src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c',
@@ -442,6 +459,10 @@ Pod::Spec.new do |s|
'src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.h',
'src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.c',
'src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.h',
+ 'src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.c',
+ 'src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.h',
+ 'src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.c',
+ 'src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.h',
'src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.c',
'src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.h',
'src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c',
@@ -470,8 +491,12 @@ Pod::Spec.new do |s|
'src/core/ext/upb-generated/envoy/service/route/v3/rds.upb.h',
'src/core/ext/upb-generated/envoy/service/route/v3/srds.upb.c',
'src/core/ext/upb-generated/envoy/service/route/v3/srds.upb.h',
+ 'src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.c',
+ 'src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.h',
'src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c',
'src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.h',
+ 'src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.c',
+ 'src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.h',
'src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c',
'src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.h',
'src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c',
@@ -480,6 +505,8 @@ Pod::Spec.new do |s|
'src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.h',
'src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c',
'src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.h',
+ 'src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.c',
+ 'src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.h',
'src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c',
'src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.h',
'src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c',
@@ -556,12 +583,16 @@ Pod::Spec.new do |s|
'src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h',
'src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c',
'src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h',
+ 'src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c',
@@ -610,6 +641,10 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c',
@@ -620,6 +655,10 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c',
@@ -648,8 +687,12 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c',
@@ -658,6 +701,8 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c',
@@ -736,9 +781,15 @@ Pod::Spec.new do |s|
'src/core/ext/xds/xds_client.h',
'src/core/ext/xds/xds_client_stats.cc',
'src/core/ext/xds/xds_client_stats.h',
+ 'src/core/ext/xds/xds_http_fault_filter.cc',
+ 'src/core/ext/xds/xds_http_fault_filter.h',
'src/core/ext/xds/xds_http_filters.cc',
'src/core/ext/xds/xds_http_filters.h',
'src/core/ext/xds/xds_server_config_fetcher.cc',
+ 'src/core/lib/address_utils/parse_address.cc',
+ 'src/core/lib/address_utils/parse_address.h',
+ 'src/core/lib/address_utils/sockaddr_utils.cc',
+ 'src/core/lib/address_utils/sockaddr_utils.h',
'src/core/lib/avl/avl.cc',
'src/core/lib/avl/avl.h',
'src/core/lib/backoff/backoff.cc',
@@ -858,6 +909,8 @@ Pod::Spec.new do |s|
'src/core/lib/gprpp/stat.h',
'src/core/lib/gprpp/stat_posix.cc',
'src/core/lib/gprpp/stat_windows.cc',
+ 'src/core/lib/gprpp/status_helper.cc',
+ 'src/core/lib/gprpp/status_helper.h',
'src/core/lib/gprpp/sync.h',
'src/core/lib/gprpp/thd.h',
'src/core/lib/gprpp/thd_posix.cc',
@@ -945,10 +998,6 @@ Pod::Spec.new do |s|
'src/core/lib/iomgr/lockfree_event.cc',
'src/core/lib/iomgr/lockfree_event.h',
'src/core/lib/iomgr/nameser.h',
- 'src/core/lib/iomgr/parse_address.cc',
- 'src/core/lib/iomgr/parse_address.h',
- 'src/core/lib/iomgr/poller/eventmanager_libuv.cc',
- 'src/core/lib/iomgr/poller/eventmanager_libuv.h',
'src/core/lib/iomgr/polling_entity.cc',
'src/core/lib/iomgr/polling_entity.h',
'src/core/lib/iomgr/pollset.cc',
@@ -978,8 +1027,6 @@ Pod::Spec.new do |s|
'src/core/lib/iomgr/sockaddr.h',
'src/core/lib/iomgr/sockaddr_custom.h',
'src/core/lib/iomgr/sockaddr_posix.h',
- 'src/core/lib/iomgr/sockaddr_utils.cc',
- 'src/core/lib/iomgr/sockaddr_utils.h',
'src/core/lib/iomgr/sockaddr_windows.h',
'src/core/lib/iomgr/socket_factory_posix.cc',
'src/core/lib/iomgr/socket_factory_posix.h',
@@ -1049,21 +1096,11 @@ Pod::Spec.new do |s|
'src/core/lib/json/json_util.cc',
'src/core/lib/json/json_util.h',
'src/core/lib/json/json_writer.cc',
+ 'src/core/lib/matchers/matchers.cc',
+ 'src/core/lib/matchers/matchers.h',
'src/core/lib/profiling/basic_timers.cc',
'src/core/lib/profiling/stap_timers.cc',
'src/core/lib/profiling/timers.h',
- 'src/core/lib/security/authorization/authorization_engine.cc',
- 'src/core/lib/security/authorization/authorization_engine.h',
- 'src/core/lib/security/authorization/evaluate_args.cc',
- 'src/core/lib/security/authorization/evaluate_args.h',
- 'src/core/lib/security/authorization/matchers.cc',
- 'src/core/lib/security/authorization/matchers.h',
- 'src/core/lib/security/authorization/mock_cel/activation.h',
- 'src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h',
- 'src/core/lib/security/authorization/mock_cel/cel_expression.h',
- 'src/core/lib/security/authorization/mock_cel/cel_value.h',
- 'src/core/lib/security/authorization/mock_cel/evaluator_core.h',
- 'src/core/lib/security/authorization/mock_cel/flat_expr_builder.h',
'src/core/lib/security/context/security_context.cc',
'src/core/lib/security/context/security_context.h',
'src/core/lib/security/credentials/alts/alts_credentials.cc',
@@ -1349,10 +1386,6 @@ Pod::Spec.new do |s|
'third_party/upb/upb/def.hpp',
'third_party/upb/upb/encode.c',
'third_party/upb/upb/encode.h',
- 'third_party/upb/upb/json_decode.c',
- 'third_party/upb/upb/json_decode.h',
- 'third_party/upb/upb/json_encode.c',
- 'third_party/upb/upb/json_encode.h',
'third_party/upb/upb/msg.c',
'third_party/upb/upb/msg.h',
'third_party/upb/upb/port_def.inc',
@@ -1366,7 +1399,8 @@ Pod::Spec.new do |s|
'third_party/upb/upb/upb.c',
'third_party/upb/upb/upb.h',
'third_party/upb/upb/upb.hpp',
- 'third_party/upb/upb/upb.int.h'
+ 'third_party/upb/upb/upb.int.h',
+ 'third_party/xxhash/xxhash.h'
ss.private_header_files = 'src/core/ext/filters/client_channel/backend_metric.h',
'src/core/ext/filters/client_channel/backup_poller.h',
'src/core/ext/filters/client_channel/client_channel.h',
@@ -1388,6 +1422,7 @@ Pod::Spec.new do |s|
'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h',
'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h',
'src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h',
+ 'src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.h',
'src/core/ext/filters/client_channel/lb_policy/subchannel_list.h',
'src/core/ext/filters/client_channel/lb_policy/xds/xds.h',
'src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h',
@@ -1405,6 +1440,8 @@ Pod::Spec.new do |s|
'src/core/ext/filters/client_channel/resolver_factory.h',
'src/core/ext/filters/client_channel/resolver_registry.h',
'src/core/ext/filters/client_channel/resolver_result_parsing.h',
+ 'src/core/ext/filters/client_channel/retry_filter.h',
+ 'src/core/ext/filters/client_channel/retry_service_config.h',
'src/core/ext/filters/client_channel/retry_throttle.h',
'src/core/ext/filters/client_channel/server_address.h',
'src/core/ext/filters/client_channel/service_config.h',
@@ -1414,6 +1451,8 @@ Pod::Spec.new do |s|
'src/core/ext/filters/client_channel/subchannel_interface.h',
'src/core/ext/filters/client_channel/subchannel_pool_interface.h',
'src/core/ext/filters/deadline/deadline_filter.h',
+ 'src/core/ext/filters/fault_injection/fault_injection_filter.h',
+ 'src/core/ext/filters/fault_injection/service_config_parser.h',
'src/core/ext/filters/http/client/http_client_filter.h',
'src/core/ext/filters/http/client_authority_filter.h',
'src/core/ext/filters/http/message_compress/message_compress_filter.h',
@@ -1449,9 +1488,11 @@ Pod::Spec.new do |s|
'src/core/ext/transport/chttp2/transport/stream_map.h',
'src/core/ext/transport/chttp2/transport/varint.h',
'src/core/ext/transport/inproc/inproc_transport.h',
+ 'src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.h',
'src/core/ext/upb-generated/envoy/annotations/deprecation.upb.h',
'src/core/ext/upb-generated/envoy/annotations/resource.upb.h',
'src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.h',
+ 'src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.h',
'src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.h',
'src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.h',
'src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.h',
@@ -1476,12 +1517,16 @@ Pod::Spec.new do |s|
'src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.h',
'src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.h',
'src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.h',
+ 'src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.h',
+ 'src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.h',
'src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.h',
'src/core/ext/upb-generated/envoy/config/route/v3/route.upb.h',
'src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.h',
'src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.h',
'src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.h',
'src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.h',
+ 'src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.h',
+ 'src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.h',
'src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.h',
'src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h',
'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.h',
@@ -1496,11 +1541,14 @@ Pod::Spec.new do |s|
'src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.h',
'src/core/ext/upb-generated/envoy/service/route/v3/rds.upb.h',
'src/core/ext/upb-generated/envoy/service/route/v3/srds.upb.h',
+ 'src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.h',
'src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.h',
+ 'src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.h',
'src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.h',
'src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.h',
'src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.h',
'src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.h',
+ 'src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.h',
'src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.h',
'src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.h',
'src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.h',
@@ -1539,9 +1587,11 @@ Pod::Spec.new do |s|
'src/core/ext/upb-generated/xds/core/v3/resource.upb.h',
'src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h',
'src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h',
+ 'src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.h',
@@ -1566,11 +1616,15 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h',
@@ -1585,11 +1639,14 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h',
+ 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.h',
'src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.h',
@@ -1630,7 +1687,10 @@ Pod::Spec.new do |s|
'src/core/ext/xds/xds_channel_args.h',
'src/core/ext/xds/xds_client.h',
'src/core/ext/xds/xds_client_stats.h',
+ 'src/core/ext/xds/xds_http_fault_filter.h',
'src/core/ext/xds/xds_http_filters.h',
+ 'src/core/lib/address_utils/parse_address.h',
+ 'src/core/lib/address_utils/sockaddr_utils.h',
'src/core/lib/avl/avl.h',
'src/core/lib/backoff/backoff.h',
'src/core/lib/channel/channel_args.h',
@@ -1688,6 +1748,7 @@ Pod::Spec.new do |s|
'src/core/lib/gprpp/ref_counted.h',
'src/core/lib/gprpp/ref_counted_ptr.h',
'src/core/lib/gprpp/stat.h',
+ 'src/core/lib/gprpp/status_helper.h',
'src/core/lib/gprpp/sync.h',
'src/core/lib/gprpp/thd.h',
'src/core/lib/gprpp/time_util.h',
@@ -1727,8 +1788,6 @@ Pod::Spec.new do |s|
'src/core/lib/iomgr/load_file.h',
'src/core/lib/iomgr/lockfree_event.h',
'src/core/lib/iomgr/nameser.h',
- 'src/core/lib/iomgr/parse_address.h',
- 'src/core/lib/iomgr/poller/eventmanager_libuv.h',
'src/core/lib/iomgr/polling_entity.h',
'src/core/lib/iomgr/pollset.h',
'src/core/lib/iomgr/pollset_custom.h',
@@ -1745,7 +1804,6 @@ Pod::Spec.new do |s|
'src/core/lib/iomgr/sockaddr.h',
'src/core/lib/iomgr/sockaddr_custom.h',
'src/core/lib/iomgr/sockaddr_posix.h',
- 'src/core/lib/iomgr/sockaddr_utils.h',
'src/core/lib/iomgr/sockaddr_windows.h',
'src/core/lib/iomgr/socket_factory_posix.h',
'src/core/lib/iomgr/socket_mutator.h',
@@ -1773,16 +1831,8 @@ Pod::Spec.new do |s|
'src/core/lib/iomgr/work_serializer.h',
'src/core/lib/json/json.h',
'src/core/lib/json/json_util.h',
+ 'src/core/lib/matchers/matchers.h',
'src/core/lib/profiling/timers.h',
- 'src/core/lib/security/authorization/authorization_engine.h',
- 'src/core/lib/security/authorization/evaluate_args.h',
- 'src/core/lib/security/authorization/matchers.h',
- 'src/core/lib/security/authorization/mock_cel/activation.h',
- 'src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h',
- 'src/core/lib/security/authorization/mock_cel/cel_expression.h',
- 'src/core/lib/security/authorization/mock_cel/cel_value.h',
- 'src/core/lib/security/authorization/mock_cel/evaluator_core.h',
- 'src/core/lib/security/authorization/mock_cel/flat_expr_builder.h',
'src/core/lib/security/context/security_context.h',
'src/core/lib/security/credentials/alts/alts_credentials.h',
'src/core/lib/security/credentials/alts/check_gcp_environment.h',
@@ -1920,8 +1970,6 @@ Pod::Spec.new do |s|
'third_party/upb/upb/def.h',
'third_party/upb/upb/def.hpp',
'third_party/upb/upb/encode.h',
- 'third_party/upb/upb/json_decode.h',
- 'third_party/upb/upb/json_encode.h',
'third_party/upb/upb/msg.h',
'third_party/upb/upb/port_def.inc',
'third_party/upb/upb/port_undef.inc',
@@ -1930,7 +1978,8 @@ Pod::Spec.new do |s|
'third_party/upb/upb/text_encode.h',
'third_party/upb/upb/upb.h',
'third_party/upb/upb/upb.hpp',
- 'third_party/upb/upb/upb.int.h'
+ 'third_party/upb/upb/upb.int.h',
+ 'third_party/xxhash/xxhash.h'
end
# CFStream is now default. Leaving this subspec only for compatibility purpose.
@@ -2034,10 +2083,12 @@ Pod::Spec.new do |s|
'test/core/end2end/tests/request_with_payload.cc',
'test/core/end2end/tests/resource_quota_server.cc',
'test/core/end2end/tests/retry.cc',
+ 'test/core/end2end/tests/retry_cancel_during_delay.cc',
'test/core/end2end/tests/retry_cancellation.cc',
'test/core/end2end/tests/retry_disabled.cc',
'test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc',
'test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc',
+ 'test/core/end2end/tests/retry_lb_drop.cc',
'test/core/end2end/tests/retry_non_retriable_status.cc',
'test/core/end2end/tests/retry_non_retriable_status_before_recv_trailing_metadata_started.cc',
'test/core/end2end/tests/retry_recv_initial_metadata.cc',
@@ -2067,8 +2118,7 @@ Pod::Spec.new do |s|
'test/core/end2end/tests/write_buffering_at_end.cc',
'test/core/util/cmdline.cc',
'test/core/util/cmdline.h',
- 'test/core/util/eval_args_mock_endpoint.cc',
- 'test/core/util/eval_args_mock_endpoint.h',
+ 'test/core/util/evaluate_args_test_util.h',
'test/core/util/fuzzer_util.cc',
'test/core/util/fuzzer_util.h',
'test/core/util/grpc_profiler.cc',
@@ -2077,6 +2127,7 @@ Pod::Spec.new do |s|
'test/core/util/histogram.h',
'test/core/util/memory_counters.cc',
'test/core/util/memory_counters.h',
+ 'test/core/util/mock_authorization_endpoint.h',
'test/core/util/mock_endpoint.cc',
'test/core/util/mock_endpoint.h',
'test/core/util/parse_hexstring.cc',
@@ -2100,6 +2151,8 @@ Pod::Spec.new do |s|
'test/core/util/subprocess_windows.cc',
'test/core/util/test_config.cc',
'test/core/util/test_config.h',
+ 'test/core/util/test_lb_policies.cc',
+ 'test/core/util/test_lb_policies.h',
'test/core/util/test_tcp_server.cc',
'test/core/util/test_tcp_server.h',
'test/core/util/tls_utils.cc',
@@ -2122,5 +2175,8 @@ Pod::Spec.new do |s|
find third_party/re2/re2/ third_party/re2/util/ -type f \\( -name '*.h' -or -name '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "re2/(.*)";#if COCOAPODS==1\\\n #include "third_party/re2/re2/\\1"\\\n#else\\\n #include "re2/\\1"\\\n#endif;g;s;#include "util/(.*)";#if COCOAPODS==1\\\n #include "third_party/re2/util/\\1"\\\n#else\\\n #include "util/\\1"\\\n#endif;g'
find src/core/ -type f \\( -name '*.h' -or -name '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "re2/(.*)";#if COCOAPODS==1\\\n #include "third_party/re2/re2/\\1"\\\n#else\\\n #include "re2/\\1"\\\n#endif;g'
find src/core/ third_party/re2/ -type f -name '*.grpc_back' -print0 | xargs -0 rm
+ find src/core/ -type f \\( -name '*.h' -or -name '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "xxhash.h";#if COCOAPODS==1\\\n #include "third_party/xxhash/xxhash.h"\\\n#else\\\n #include "xxhash.h"\\\n#endif;g'
+ find third_party/xxhash -type f -name xxhash.h -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;@param([^,]*),;@param\\1 ,;g'
+ find src/core/ third_party/xxhash/ -type f -name '*.grpc_back' -print0 | xargs -0 rm
END_OF_COMMAND
end
diff --git a/gRPC-ProtoRPC.podspec b/gRPC-ProtoRPC.podspec
index 036de37cfe8..0f3d5a5acb8 100644
--- a/gRPC-ProtoRPC.podspec
+++ b/gRPC-ProtoRPC.podspec
@@ -21,7 +21,7 @@
Pod::Spec.new do |s|
s.name = 'gRPC-ProtoRPC'
- version = '1.37.0-dev'
+ version = '1.38.0-dev'
s.version = version
s.summary = 'RPC library for Protocol Buffers, based on gRPC'
s.homepage = 'https://grpc.io'
diff --git a/gRPC-RxLibrary.podspec b/gRPC-RxLibrary.podspec
index 9a71e30e2b8..0fe38c90ca8 100644
--- a/gRPC-RxLibrary.podspec
+++ b/gRPC-RxLibrary.podspec
@@ -21,7 +21,7 @@
Pod::Spec.new do |s|
s.name = 'gRPC-RxLibrary'
- version = '1.37.0-dev'
+ version = '1.38.0-dev'
s.version = version
s.summary = 'Reactive Extensions library for iOS/OSX.'
s.homepage = 'https://grpc.io'
diff --git a/gRPC.podspec b/gRPC.podspec
index 842a4188b26..0465f81c1ce 100644
--- a/gRPC.podspec
+++ b/gRPC.podspec
@@ -20,7 +20,7 @@
Pod::Spec.new do |s|
s.name = 'gRPC'
- version = '1.37.0-dev'
+ version = '1.38.0-dev'
s.version = version
s.summary = 'gRPC client library for iOS/OSX'
s.homepage = 'https://grpc.io'
diff --git a/grpc.def b/grpc.def
index 4dcb9edffb8..7be77a61868 100644
--- a/grpc.def
+++ b/grpc.def
@@ -75,6 +75,7 @@ EXPORTS
grpc_resource_quota_unref
grpc_resource_quota_resize
grpc_resource_quota_set_max_threads
+ grpc_dump_xds_configs
grpc_resource_quota_arg_vtable
grpc_channelz_get_top_channels
grpc_channelz_get_servers
diff --git a/grpc.gemspec b/grpc.gemspec
index 2017718df9c..2185cbf0894 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -53,6 +53,10 @@ Gem::Specification.new do |s|
s.files += %w( include/grpc/byte_buffer_reader.h )
s.files += %w( include/grpc/census.h )
s.files += %w( include/grpc/compression.h )
+ s.files += %w( include/grpc/event_engine/channel_args.h )
+ s.files += %w( include/grpc/event_engine/event_engine.h )
+ s.files += %w( include/grpc/event_engine/port.h )
+ s.files += %w( include/grpc/event_engine/slice_allocator.h )
s.files += %w( include/grpc/fork.h )
s.files += %w( include/grpc/grpc.h )
s.files += %w( include/grpc/grpc_posix.h )
@@ -150,6 +154,8 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h )
s.files += %w( src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc )
s.files += %w( src/core/ext/filters/client_channel/lb_policy/priority/priority.cc )
+ s.files += %w( src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc )
+ s.files += %w( src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.h )
s.files += %w( src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc )
s.files += %w( src/core/ext/filters/client_channel/lb_policy/subchannel_list.h )
s.files += %w( src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc )
@@ -193,6 +199,10 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/filters/client_channel/resolver_registry.h )
s.files += %w( src/core/ext/filters/client_channel/resolver_result_parsing.cc )
s.files += %w( src/core/ext/filters/client_channel/resolver_result_parsing.h )
+ s.files += %w( src/core/ext/filters/client_channel/retry_filter.cc )
+ s.files += %w( src/core/ext/filters/client_channel/retry_filter.h )
+ s.files += %w( src/core/ext/filters/client_channel/retry_service_config.cc )
+ s.files += %w( src/core/ext/filters/client_channel/retry_service_config.h )
s.files += %w( src/core/ext/filters/client_channel/retry_throttle.cc )
s.files += %w( src/core/ext/filters/client_channel/retry_throttle.h )
s.files += %w( src/core/ext/filters/client_channel/server_address.cc )
@@ -211,6 +221,10 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/filters/client_idle/client_idle_filter.cc )
s.files += %w( src/core/ext/filters/deadline/deadline_filter.cc )
s.files += %w( src/core/ext/filters/deadline/deadline_filter.h )
+ s.files += %w( src/core/ext/filters/fault_injection/fault_injection_filter.cc )
+ s.files += %w( src/core/ext/filters/fault_injection/fault_injection_filter.h )
+ s.files += %w( src/core/ext/filters/fault_injection/service_config_parser.cc )
+ s.files += %w( src/core/ext/filters/fault_injection/service_config_parser.h )
s.files += %w( src/core/ext/filters/http/client/http_client_filter.cc )
s.files += %w( src/core/ext/filters/http/client/http_client_filter.h )
s.files += %w( src/core/ext/filters/http/client_authority_filter.cc )
@@ -291,12 +305,16 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/transport/inproc/inproc_plugin.cc )
s.files += %w( src/core/ext/transport/inproc/inproc_transport.cc )
s.files += %w( src/core/ext/transport/inproc/inproc_transport.h )
+ s.files += %w( src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.c )
+ s.files += %w( src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.h )
s.files += %w( src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c )
s.files += %w( src/core/ext/upb-generated/envoy/annotations/deprecation.upb.h )
s.files += %w( src/core/ext/upb-generated/envoy/annotations/resource.upb.c )
s.files += %w( src/core/ext/upb-generated/envoy/annotations/resource.upb.h )
s.files += %w( src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c )
s.files += %w( src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.h )
+ s.files += %w( src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.c )
+ s.files += %w( src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.h )
s.files += %w( src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c )
s.files += %w( src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.h )
s.files += %w( src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c )
@@ -345,6 +363,10 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.h )
s.files += %w( src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c )
s.files += %w( src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.h )
+ s.files += %w( src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.c )
+ s.files += %w( src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.h )
+ s.files += %w( src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.c )
+ s.files += %w( src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.h )
s.files += %w( src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c )
s.files += %w( src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.h )
s.files += %w( src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c )
@@ -357,6 +379,10 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.h )
s.files += %w( src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.c )
s.files += %w( src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.h )
+ s.files += %w( src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.c )
+ s.files += %w( src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.h )
+ s.files += %w( src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.c )
+ s.files += %w( src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.h )
s.files += %w( src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.c )
s.files += %w( src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.h )
s.files += %w( src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c )
@@ -385,8 +411,12 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/upb-generated/envoy/service/route/v3/rds.upb.h )
s.files += %w( src/core/ext/upb-generated/envoy/service/route/v3/srds.upb.c )
s.files += %w( src/core/ext/upb-generated/envoy/service/route/v3/srds.upb.h )
+ s.files += %w( src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.c )
+ s.files += %w( src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.h )
s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c )
s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.h )
+ s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.c )
+ s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.h )
s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c )
s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.h )
s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c )
@@ -395,6 +425,8 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.h )
s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c )
s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.h )
+ s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.c )
+ s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.h )
s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c )
s.files += %w( src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.h )
s.files += %w( src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c )
@@ -471,12 +503,16 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h )
s.files += %w( src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c )
s.files += %w( src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h )
+ s.files += %w( src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.c )
+ s.files += %w( src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.h )
s.files += %w( src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c )
s.files += %w( src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.h )
s.files += %w( src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c )
s.files += %w( src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.h )
s.files += %w( src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c )
s.files += %w( src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h )
+ s.files += %w( src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.c )
+ s.files += %w( src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.h )
s.files += %w( src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c )
s.files += %w( src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.h )
s.files += %w( src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c )
@@ -525,6 +561,10 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.h )
s.files += %w( src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c )
s.files += %w( src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.h )
+ s.files += %w( src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.c )
+ s.files += %w( src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.h )
+ s.files += %w( src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.c )
+ s.files += %w( src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.h )
s.files += %w( src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c )
s.files += %w( src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.h )
s.files += %w( src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c )
@@ -535,6 +575,10 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.h )
s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c )
s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h )
+ s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c )
+ s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h )
+ s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c )
+ s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h )
s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.c )
s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.h )
s.files += %w( src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c )
@@ -563,8 +607,12 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.h )
s.files += %w( src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.c )
s.files += %w( src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.h )
+ s.files += %w( src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.c )
+ s.files += %w( src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.h )
s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c )
s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.h )
+ s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.c )
+ s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.h )
s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c )
s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.h )
s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c )
@@ -573,6 +621,8 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.h )
s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c )
s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.h )
+ s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.c )
+ s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.h )
s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c )
s.files += %w( src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.h )
s.files += %w( src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c )
@@ -651,9 +701,15 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/xds/xds_client.h )
s.files += %w( src/core/ext/xds/xds_client_stats.cc )
s.files += %w( src/core/ext/xds/xds_client_stats.h )
+ s.files += %w( src/core/ext/xds/xds_http_fault_filter.cc )
+ s.files += %w( src/core/ext/xds/xds_http_fault_filter.h )
s.files += %w( src/core/ext/xds/xds_http_filters.cc )
s.files += %w( src/core/ext/xds/xds_http_filters.h )
s.files += %w( src/core/ext/xds/xds_server_config_fetcher.cc )
+ s.files += %w( src/core/lib/address_utils/parse_address.cc )
+ s.files += %w( src/core/lib/address_utils/parse_address.h )
+ s.files += %w( src/core/lib/address_utils/sockaddr_utils.cc )
+ s.files += %w( src/core/lib/address_utils/sockaddr_utils.h )
s.files += %w( src/core/lib/avl/avl.cc )
s.files += %w( src/core/lib/avl/avl.h )
s.files += %w( src/core/lib/backoff/backoff.cc )
@@ -700,6 +756,8 @@ Gem::Specification.new do |s|
s.files += %w( src/core/lib/debug/stats_data.h )
s.files += %w( src/core/lib/debug/trace.cc )
s.files += %w( src/core/lib/debug/trace.h )
+ s.files += %w( src/core/lib/event_engine/slice_allocator.cc )
+ s.files += %w( src/core/lib/event_engine/sockaddr.cc )
s.files += %w( src/core/lib/gpr/alloc.cc )
s.files += %w( src/core/lib/gpr/alloc.h )
s.files += %w( src/core/lib/gpr/arena.h )
@@ -773,6 +831,8 @@ Gem::Specification.new do |s|
s.files += %w( src/core/lib/gprpp/stat.h )
s.files += %w( src/core/lib/gprpp/stat_posix.cc )
s.files += %w( src/core/lib/gprpp/stat_windows.cc )
+ s.files += %w( src/core/lib/gprpp/status_helper.cc )
+ s.files += %w( src/core/lib/gprpp/status_helper.h )
s.files += %w( src/core/lib/gprpp/sync.h )
s.files += %w( src/core/lib/gprpp/thd.h )
s.files += %w( src/core/lib/gprpp/thd_posix.cc )
@@ -860,10 +920,6 @@ Gem::Specification.new do |s|
s.files += %w( src/core/lib/iomgr/lockfree_event.cc )
s.files += %w( src/core/lib/iomgr/lockfree_event.h )
s.files += %w( src/core/lib/iomgr/nameser.h )
- s.files += %w( src/core/lib/iomgr/parse_address.cc )
- s.files += %w( src/core/lib/iomgr/parse_address.h )
- s.files += %w( src/core/lib/iomgr/poller/eventmanager_libuv.cc )
- s.files += %w( src/core/lib/iomgr/poller/eventmanager_libuv.h )
s.files += %w( src/core/lib/iomgr/polling_entity.cc )
s.files += %w( src/core/lib/iomgr/polling_entity.h )
s.files += %w( src/core/lib/iomgr/pollset.cc )
@@ -893,8 +949,6 @@ Gem::Specification.new do |s|
s.files += %w( src/core/lib/iomgr/sockaddr.h )
s.files += %w( src/core/lib/iomgr/sockaddr_custom.h )
s.files += %w( src/core/lib/iomgr/sockaddr_posix.h )
- s.files += %w( src/core/lib/iomgr/sockaddr_utils.cc )
- s.files += %w( src/core/lib/iomgr/sockaddr_utils.h )
s.files += %w( src/core/lib/iomgr/sockaddr_windows.h )
s.files += %w( src/core/lib/iomgr/socket_factory_posix.cc )
s.files += %w( src/core/lib/iomgr/socket_factory_posix.h )
@@ -964,21 +1018,11 @@ Gem::Specification.new do |s|
s.files += %w( src/core/lib/json/json_util.cc )
s.files += %w( src/core/lib/json/json_util.h )
s.files += %w( src/core/lib/json/json_writer.cc )
+ s.files += %w( src/core/lib/matchers/matchers.cc )
+ s.files += %w( src/core/lib/matchers/matchers.h )
s.files += %w( src/core/lib/profiling/basic_timers.cc )
s.files += %w( src/core/lib/profiling/stap_timers.cc )
s.files += %w( src/core/lib/profiling/timers.h )
- s.files += %w( src/core/lib/security/authorization/authorization_engine.cc )
- s.files += %w( src/core/lib/security/authorization/authorization_engine.h )
- s.files += %w( src/core/lib/security/authorization/evaluate_args.cc )
- s.files += %w( src/core/lib/security/authorization/evaluate_args.h )
- s.files += %w( src/core/lib/security/authorization/matchers.cc )
- s.files += %w( src/core/lib/security/authorization/matchers.h )
- s.files += %w( src/core/lib/security/authorization/mock_cel/activation.h )
- s.files += %w( src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h )
- s.files += %w( src/core/lib/security/authorization/mock_cel/cel_expression.h )
- s.files += %w( src/core/lib/security/authorization/mock_cel/cel_value.h )
- s.files += %w( src/core/lib/security/authorization/mock_cel/evaluator_core.h )
- s.files += %w( src/core/lib/security/authorization/mock_cel/flat_expr_builder.h )
s.files += %w( src/core/lib/security/context/security_context.cc )
s.files += %w( src/core/lib/security/context/security_context.h )
s.files += %w( src/core/lib/security/credentials/alts/alts_credentials.cc )
@@ -1213,7 +1257,6 @@ Gem::Specification.new do |s|
s.files += %w( third_party/abseil-cpp/absl/base/const_init.h )
s.files += %w( third_party/abseil-cpp/absl/base/dynamic_annotations.h )
s.files += %w( third_party/abseil-cpp/absl/base/internal/atomic_hook.h )
- s.files += %w( third_party/abseil-cpp/absl/base/internal/bits.h )
s.files += %w( third_party/abseil-cpp/absl/base/internal/cycleclock.cc )
s.files += %w( third_party/abseil-cpp/absl/base/internal/cycleclock.h )
s.files += %w( third_party/abseil-cpp/absl/base/internal/direct_mmap.h )
@@ -1262,7 +1305,6 @@ Gem::Specification.new do |s|
s.files += %w( third_party/abseil-cpp/absl/base/thread_annotations.h )
s.files += %w( third_party/abseil-cpp/absl/container/fixed_array.h )
s.files += %w( third_party/abseil-cpp/absl/container/flat_hash_map.h )
- s.files += %w( third_party/abseil-cpp/absl/container/flat_hash_set.h )
s.files += %w( third_party/abseil-cpp/absl/container/inlined_vector.h )
s.files += %w( third_party/abseil-cpp/absl/container/internal/common.h )
s.files += %w( third_party/abseil-cpp/absl/container/internal/compressed_tuple.h )
@@ -1313,12 +1355,17 @@ Gem::Specification.new do |s|
s.files += %w( third_party/abseil-cpp/absl/hash/internal/city.h )
s.files += %w( third_party/abseil-cpp/absl/hash/internal/hash.cc )
s.files += %w( third_party/abseil-cpp/absl/hash/internal/hash.h )
+ s.files += %w( third_party/abseil-cpp/absl/hash/internal/wyhash.cc )
+ s.files += %w( third_party/abseil-cpp/absl/hash/internal/wyhash.h )
s.files += %w( third_party/abseil-cpp/absl/memory/memory.h )
s.files += %w( third_party/abseil-cpp/absl/meta/type_traits.h )
+ s.files += %w( third_party/abseil-cpp/absl/numeric/bits.h )
s.files += %w( third_party/abseil-cpp/absl/numeric/int128.cc )
s.files += %w( third_party/abseil-cpp/absl/numeric/int128.h )
s.files += %w( third_party/abseil-cpp/absl/numeric/int128_have_intrinsic.inc )
s.files += %w( third_party/abseil-cpp/absl/numeric/int128_no_intrinsic.inc )
+ s.files += %w( third_party/abseil-cpp/absl/numeric/internal/bits.h )
+ s.files += %w( third_party/abseil-cpp/absl/numeric/internal/representation.h )
s.files += %w( third_party/abseil-cpp/absl/status/internal/status_internal.h )
s.files += %w( third_party/abseil-cpp/absl/status/internal/statusor_internal.h )
s.files += %w( third_party/abseil-cpp/absl/status/status.cc )
@@ -1340,7 +1387,12 @@ Gem::Specification.new do |s|
s.files += %w( third_party/abseil-cpp/absl/strings/internal/charconv_bigint.h )
s.files += %w( third_party/abseil-cpp/absl/strings/internal/charconv_parse.cc )
s.files += %w( third_party/abseil-cpp/absl/strings/internal/charconv_parse.h )
+ s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_internal.cc )
s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_internal.h )
+ s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_flat.h )
+ s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc )
+ s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.h )
+ s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_ring_reader.h )
s.files += %w( third_party/abseil-cpp/absl/strings/internal/escaping.cc )
s.files += %w( third_party/abseil-cpp/absl/strings/internal/escaping.h )
s.files += %w( third_party/abseil-cpp/absl/strings/internal/memutil.cc )
@@ -1364,6 +1416,7 @@ Gem::Specification.new do |s|
s.files += %w( third_party/abseil-cpp/absl/strings/internal/str_format/parser.h )
s.files += %w( third_party/abseil-cpp/absl/strings/internal/str_join_internal.h )
s.files += %w( third_party/abseil-cpp/absl/strings/internal/str_split_internal.h )
+ s.files += %w( third_party/abseil-cpp/absl/strings/internal/string_constant.h )
s.files += %w( third_party/abseil-cpp/absl/strings/internal/utf8.cc )
s.files += %w( third_party/abseil-cpp/absl/strings/internal/utf8.h )
s.files += %w( third_party/abseil-cpp/absl/strings/match.cc )
@@ -1389,10 +1442,10 @@ Gem::Specification.new do |s|
s.files += %w( third_party/abseil-cpp/absl/synchronization/blocking_counter.h )
s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/create_thread_identity.cc )
s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/create_thread_identity.h )
+ s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/futex.h )
s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc )
s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/graphcycles.h )
s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/kernel_timeout.h )
- s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/mutex_nonprod.inc )
s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/per_thread_sem.cc )
s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/per_thread_sem.h )
s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/waiter.cc )
@@ -1629,9 +1682,9 @@ Gem::Specification.new do |s|
s.files += %w( third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/wnaf.c )
s.files += %w( third_party/boringssl-with-bazel/src/crypto/fipsmodule/ecdh/ecdh.c )
s.files += %w( third_party/boringssl-with-bazel/src/crypto/fipsmodule/ecdsa/ecdsa.c )
+ s.files += %w( third_party/boringssl-with-bazel/src/crypto/fipsmodule/ecdsa/internal.h )
s.files += %w( third_party/boringssl-with-bazel/src/crypto/fipsmodule/fips_shared_support.c )
s.files += %w( third_party/boringssl-with-bazel/src/crypto/fipsmodule/hmac/hmac.c )
- s.files += %w( third_party/boringssl-with-bazel/src/crypto/fipsmodule/is_fips.c )
s.files += %w( third_party/boringssl-with-bazel/src/crypto/fipsmodule/md4/md4.c )
s.files += %w( third_party/boringssl-with-bazel/src/crypto/fipsmodule/md5/internal.h )
s.files += %w( third_party/boringssl-with-bazel/src/crypto/fipsmodule/md5/md5.c )
@@ -1655,6 +1708,7 @@ Gem::Specification.new do |s|
s.files += %w( third_party/boringssl-with-bazel/src/crypto/fipsmodule/rsa/padding.c )
s.files += %w( third_party/boringssl-with-bazel/src/crypto/fipsmodule/rsa/rsa.c )
s.files += %w( third_party/boringssl-with-bazel/src/crypto/fipsmodule/rsa/rsa_impl.c )
+ s.files += %w( third_party/boringssl-with-bazel/src/crypto/fipsmodule/self_check/fips.c )
s.files += %w( third_party/boringssl-with-bazel/src/crypto/fipsmodule/self_check/self_check.c )
s.files += %w( third_party/boringssl-with-bazel/src/crypto/fipsmodule/sha/internal.h )
s.files += %w( third_party/boringssl-with-bazel/src/crypto/fipsmodule/sha/sha1-altivec.c )
@@ -1741,7 +1795,6 @@ Gem::Specification.new do |s|
s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/x509_ext.c )
s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/x509_lu.c )
s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/x509_obj.c )
- s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/x509_r2x.c )
s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/x509_req.c )
s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/x509_set.c )
s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/x509_trs.c )
@@ -1838,6 +1891,7 @@ Gem::Specification.new do |s|
s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/engine.h )
s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/err.h )
s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/evp.h )
+ s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/evp_errors.h )
s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/ex_data.h )
s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/hkdf.h )
s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/hmac.h )
@@ -1886,6 +1940,7 @@ Gem::Specification.new do |s|
s.files += %w( third_party/boringssl-with-bazel/src/ssl/d1_srtp.cc )
s.files += %w( third_party/boringssl-with-bazel/src/ssl/dtls_method.cc )
s.files += %w( third_party/boringssl-with-bazel/src/ssl/dtls_record.cc )
+ s.files += %w( third_party/boringssl-with-bazel/src/ssl/encrypted_client_hello.cc )
s.files += %w( third_party/boringssl-with-bazel/src/ssl/handoff.cc )
s.files += %w( third_party/boringssl-with-bazel/src/ssl/handshake.cc )
s.files += %w( third_party/boringssl-with-bazel/src/ssl/handshake_client.cc )
@@ -2057,10 +2112,6 @@ Gem::Specification.new do |s|
s.files += %w( third_party/upb/upb/def.hpp )
s.files += %w( third_party/upb/upb/encode.c )
s.files += %w( third_party/upb/upb/encode.h )
- s.files += %w( third_party/upb/upb/json_decode.c )
- s.files += %w( third_party/upb/upb/json_decode.h )
- s.files += %w( third_party/upb/upb/json_encode.c )
- s.files += %w( third_party/upb/upb/json_encode.h )
s.files += %w( third_party/upb/upb/msg.c )
s.files += %w( third_party/upb/upb/msg.h )
s.files += %w( third_party/upb/upb/port_def.inc )
@@ -2075,6 +2126,7 @@ Gem::Specification.new do |s|
s.files += %w( third_party/upb/upb/upb.h )
s.files += %w( third_party/upb/upb/upb.hpp )
s.files += %w( third_party/upb/upb/upb.int.h )
+ s.files += %w( third_party/xxhash/xxhash.h )
s.files += %w( third_party/zlib/adler32.c )
s.files += %w( third_party/zlib/compress.c )
s.files += %w( third_party/zlib/crc32.c )
diff --git a/grpc.gyp b/grpc.gyp
index 70a6e72ff21..2418290d261 100644
--- a/grpc.gyp
+++ b/grpc.gyp
@@ -60,6 +60,7 @@
'-Ithird_party/upb',
'-Isrc/core/ext/upb-generated',
'-Isrc/core/ext/upbdefs-generated',
+ '-Ithird_party/xxhash',
],
'ldflags': [
'-g',
@@ -139,6 +140,7 @@
'-Ithird_party/upb',
'-Isrc/core/ext/upb-generated',
'-Isrc/core/ext/upbdefs-generated',
+ '-Ithird_party/xxhash',
],
'OTHER_CPLUSPLUSFLAGS': [
'-g',
@@ -150,6 +152,7 @@
'-Ithird_party/upb',
'-Isrc/core/ext/upb-generated',
'-Isrc/core/ext/upbdefs-generated',
+ '-Ithird_party/xxhash',
'-stdlib=libc++',
'-std=c++11',
'-Wno-error=deprecated-declarations',
@@ -175,10 +178,6 @@
'type': 'static_library',
'dependencies': [
'grpc_test_util',
- 'grpc',
- 'gpr',
- 'address_sorting',
- 'upb',
],
'sources': [
'test/core/end2end/cq_verifier.cc',
@@ -239,10 +238,12 @@
'test/core/end2end/tests/request_with_payload.cc',
'test/core/end2end/tests/resource_quota_server.cc',
'test/core/end2end/tests/retry.cc',
+ 'test/core/end2end/tests/retry_cancel_during_delay.cc',
'test/core/end2end/tests/retry_cancellation.cc',
'test/core/end2end/tests/retry_disabled.cc',
'test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc',
'test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc',
+ 'test/core/end2end/tests/retry_lb_drop.cc',
'test/core/end2end/tests/retry_non_retriable_status.cc',
'test/core/end2end/tests/retry_non_retriable_status_before_recv_trailing_metadata_started.cc',
'test/core/end2end/tests/retry_recv_initial_metadata.cc',
@@ -270,6 +271,7 @@
'test/core/end2end/tests/workaround_cronet_compression.cc',
'test/core/end2end/tests/write_buffering.cc',
'test/core/end2end/tests/write_buffering_at_end.cc',
+ 'test/core/util/test_lb_policies.cc',
],
},
{
@@ -277,10 +279,6 @@
'type': 'static_library',
'dependencies': [
'grpc_test_util',
- 'grpc',
- 'gpr',
- 'address_sorting',
- 'upb',
],
'sources': [
'test/core/end2end/cq_verifier.cc',
@@ -342,10 +340,12 @@
'test/core/end2end/tests/request_with_payload.cc',
'test/core/end2end/tests/resource_quota_server.cc',
'test/core/end2end/tests/retry.cc',
+ 'test/core/end2end/tests/retry_cancel_during_delay.cc',
'test/core/end2end/tests/retry_cancellation.cc',
'test/core/end2end/tests/retry_disabled.cc',
'test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc',
'test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc',
+ 'test/core/end2end/tests/retry_lb_drop.cc',
'test/core/end2end/tests/retry_non_retriable_status.cc',
'test/core/end2end/tests/retry_non_retriable_status_before_recv_trailing_metadata_started.cc',
'test/core/end2end/tests/retry_recv_initial_metadata.cc',
@@ -373,22 +373,35 @@
'test/core/end2end/tests/workaround_cronet_compression.cc',
'test/core/end2end/tests/write_buffering.cc',
'test/core/end2end/tests/write_buffering_at_end.cc',
+ 'test/core/util/test_lb_policies.cc',
],
},
{
'target_name': 'gpr',
'type': 'static_library',
'dependencies': [
- 'absl/types:optional',
- 'absl/time:time',
- 'absl/synchronization:synchronization',
- 'absl/strings:strings',
- 'absl/strings:str_format',
- 'absl/status:status',
- 'absl/memory:memory',
'absl/base:base',
+ 'absl/memory:memory',
+ 'absl/status:status',
+ 'absl/strings:str_format',
+ 'absl/strings:strings',
+ 'absl/synchronization:synchronization',
+ 'absl/time:time',
+ 'absl/types:optional',
+ 'upb',
],
'sources': [
+ 'src/core/ext/upb-generated/google/api/annotations.upb.c',
+ 'src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.c',
+ 'src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c',
+ 'src/core/ext/upb-generated/google/api/http.upb.c',
+ 'src/core/ext/upb-generated/google/protobuf/any.upb.c',
+ 'src/core/ext/upb-generated/google/protobuf/duration.upb.c',
+ 'src/core/ext/upb-generated/google/protobuf/empty.upb.c',
+ 'src/core/ext/upb-generated/google/protobuf/struct.upb.c',
+ 'src/core/ext/upb-generated/google/protobuf/timestamp.upb.c',
+ 'src/core/ext/upb-generated/google/protobuf/wrappers.upb.c',
+ 'src/core/ext/upb-generated/google/rpc/status.upb.c',
'src/core/lib/gpr/alloc.cc',
'src/core/lib/gpr/atm.cc',
'src/core/lib/gpr/cpu_iphone.cc',
@@ -429,6 +442,7 @@
'src/core/lib/gprpp/mpscq.cc',
'src/core/lib/gprpp/stat_posix.cc',
'src/core/lib/gprpp/stat_windows.cc',
+ 'src/core/lib/gprpp/status_helper.cc',
'src/core/lib/gprpp/thd_posix.cc',
'src/core/lib/gprpp/thd_windows.cc',
'src/core/lib/gprpp/time_util.cc',
@@ -440,17 +454,12 @@
'target_name': 'grpc',
'type': 'static_library',
'dependencies': [
+ 'absl/container:flat_hash_map',
+ 'absl/container:inlined_vector',
+ 'absl/functional:bind_front',
+ 'absl/status:statusor',
'gpr',
'address_sorting',
- 'upb',
- 'absl/types:optional',
- 'absl/strings:strings',
- 'absl/status:statusor',
- 'absl/status:status',
- 'absl/functional:bind_front',
- 'absl/container:inlined_vector',
- 'absl/container:flat_hash_set',
- 'absl/container:flat_hash_map',
],
'sources': [
'src/core/ext/filters/census/grpc_context.cc',
@@ -478,6 +487,7 @@
'src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc',
'src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc',
'src/core/ext/filters/client_channel/lb_policy/priority/priority.cc',
+ 'src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc',
'src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc',
'src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc',
'src/core/ext/filters/client_channel/lb_policy/xds/cds.cc',
@@ -504,6 +514,8 @@
'src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc',
'src/core/ext/filters/client_channel/resolver_registry.cc',
'src/core/ext/filters/client_channel/resolver_result_parsing.cc',
+ 'src/core/ext/filters/client_channel/retry_filter.cc',
+ 'src/core/ext/filters/client_channel/retry_service_config.cc',
'src/core/ext/filters/client_channel/retry_throttle.cc',
'src/core/ext/filters/client_channel/server_address.cc',
'src/core/ext/filters/client_channel/service_config.cc',
@@ -513,6 +525,8 @@
'src/core/ext/filters/client_channel/subchannel_pool_interface.cc',
'src/core/ext/filters/client_idle/client_idle_filter.cc',
'src/core/ext/filters/deadline/deadline_filter.cc',
+ 'src/core/ext/filters/fault_injection/fault_injection_filter.cc',
+ 'src/core/ext/filters/fault_injection/service_config_parser.cc',
'src/core/ext/filters/http/client/http_client_filter.cc',
'src/core/ext/filters/http/client_authority_filter.cc',
'src/core/ext/filters/http/http_filters_plugin.cc',
@@ -558,9 +572,11 @@
'src/core/ext/transport/chttp2/transport/writing.cc',
'src/core/ext/transport/inproc/inproc_plugin.cc',
'src/core/ext/transport/inproc/inproc_transport.cc',
+ 'src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.c',
'src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c',
'src/core/ext/upb-generated/envoy/annotations/resource.upb.c',
'src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c',
+ 'src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.c',
'src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c',
'src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c',
'src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.c',
@@ -585,12 +601,16 @@
'src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c',
'src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c',
'src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c',
+ 'src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.c',
+ 'src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.c',
'src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c',
'src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c',
'src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c',
'src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.c',
'src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c',
'src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.c',
+ 'src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.c',
+ 'src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.c',
'src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.c',
'src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c',
'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c',
@@ -605,11 +625,14 @@
'src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c',
'src/core/ext/upb-generated/envoy/service/route/v3/rds.upb.c',
'src/core/ext/upb-generated/envoy/service/route/v3/srds.upb.c',
+ 'src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.c',
'src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c',
+ 'src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.c',
'src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c',
'src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c',
'src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.c',
'src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c',
+ 'src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.c',
'src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c',
'src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c',
'src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.c',
@@ -617,17 +640,6 @@
'src/core/ext/upb-generated/envoy/type/v3/percent.upb.c',
'src/core/ext/upb-generated/envoy/type/v3/range.upb.c',
'src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.c',
- 'src/core/ext/upb-generated/google/api/annotations.upb.c',
- 'src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.c',
- 'src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c',
- 'src/core/ext/upb-generated/google/api/http.upb.c',
- 'src/core/ext/upb-generated/google/protobuf/any.upb.c',
- 'src/core/ext/upb-generated/google/protobuf/duration.upb.c',
- 'src/core/ext/upb-generated/google/protobuf/empty.upb.c',
- 'src/core/ext/upb-generated/google/protobuf/struct.upb.c',
- 'src/core/ext/upb-generated/google/protobuf/timestamp.upb.c',
- 'src/core/ext/upb-generated/google/protobuf/wrappers.upb.c',
- 'src/core/ext/upb-generated/google/rpc/status.upb.c',
'src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c',
'src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c',
'src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c',
@@ -647,9 +659,11 @@
'src/core/ext/upb-generated/xds/core/v3/resource.upb.c',
'src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c',
'src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c',
+ 'src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c',
@@ -674,11 +688,15 @@
'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c',
@@ -693,11 +711,14 @@
'src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/service/route/v3/srds.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c',
+ 'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c',
'src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c',
@@ -735,8 +756,11 @@
'src/core/ext/xds/xds_certificate_provider.cc',
'src/core/ext/xds/xds_client.cc',
'src/core/ext/xds/xds_client_stats.cc',
+ 'src/core/ext/xds/xds_http_fault_filter.cc',
'src/core/ext/xds/xds_http_filters.cc',
'src/core/ext/xds/xds_server_config_fetcher.cc',
+ 'src/core/lib/address_utils/parse_address.cc',
+ 'src/core/lib/address_utils/sockaddr_utils.cc',
'src/core/lib/avl/avl.cc',
'src/core/lib/backoff/backoff.cc',
'src/core/lib/channel/channel_args.cc',
@@ -759,6 +783,8 @@
'src/core/lib/debug/stats.cc',
'src/core/lib/debug/stats_data.cc',
'src/core/lib/debug/trace.cc',
+ 'src/core/lib/event_engine/slice_allocator.cc',
+ 'src/core/lib/event_engine/sockaddr.cc',
'src/core/lib/http/format_request.cc',
'src/core/lib/http/httpcli.cc',
'src/core/lib/http/httpcli_security_connector.cc',
@@ -804,8 +830,6 @@
'src/core/lib/iomgr/is_epollexclusive_available.cc',
'src/core/lib/iomgr/load_file.cc',
'src/core/lib/iomgr/lockfree_event.cc',
- 'src/core/lib/iomgr/parse_address.cc',
- 'src/core/lib/iomgr/poller/eventmanager_libuv.cc',
'src/core/lib/iomgr/polling_entity.cc',
'src/core/lib/iomgr/pollset.cc',
'src/core/lib/iomgr/pollset_custom.cc',
@@ -819,7 +843,6 @@
'src/core/lib/iomgr/resolve_address_posix.cc',
'src/core/lib/iomgr/resolve_address_windows.cc',
'src/core/lib/iomgr/resource_quota.cc',
- 'src/core/lib/iomgr/sockaddr_utils.cc',
'src/core/lib/iomgr/socket_factory_posix.cc',
'src/core/lib/iomgr/socket_mutator.cc',
'src/core/lib/iomgr/socket_utils_common_posix.cc',
@@ -862,9 +885,7 @@
'src/core/lib/json/json_reader.cc',
'src/core/lib/json/json_util.cc',
'src/core/lib/json/json_writer.cc',
- 'src/core/lib/security/authorization/authorization_engine.cc',
- 'src/core/lib/security/authorization/evaluate_args.cc',
- 'src/core/lib/security/authorization/matchers.cc',
+ 'src/core/lib/matchers/matchers.cc',
'src/core/lib/security/context/security_context.cc',
'src/core/lib/security/credentials/alts/alts_credentials.cc',
'src/core/lib/security/credentials/alts/check_gcp_environment.cc',
@@ -993,9 +1014,6 @@
'type': 'static_library',
'dependencies': [
'grpc',
- 'gpr',
- 'address_sorting',
- 'upb',
],
'sources': [
'src/csharp/ext/grpc_csharp_ext.c',
@@ -1005,17 +1023,13 @@
'target_name': 'grpc_test_util',
'type': 'static_library',
'dependencies': [
- 'grpc',
- 'gpr',
- 'address_sorting',
- 'upb',
- 'absl/debugging:symbolize',
- 'absl/debugging:stacktrace',
'absl/debugging:failure_signal_handler',
+ 'absl/debugging:stacktrace',
+ 'absl/debugging:symbolize',
+ 'grpc',
],
'sources': [
'test/core/util/cmdline.cc',
- 'test/core/util/eval_args_mock_endpoint.cc',
'test/core/util/fuzzer_util.cc',
'test/core/util/grpc_profiler.cc',
'test/core/util/histogram.cc',
@@ -1043,17 +1057,13 @@
'target_name': 'grpc_test_util_unsecure',
'type': 'static_library',
'dependencies': [
- 'grpc_unsecure',
- 'gpr',
- 'address_sorting',
- 'upb',
- 'absl/debugging:symbolize',
- 'absl/debugging:stacktrace',
'absl/debugging:failure_signal_handler',
+ 'absl/debugging:stacktrace',
+ 'absl/debugging:symbolize',
+ 'grpc_unsecure',
],
'sources': [
'test/core/util/cmdline.cc',
- 'test/core/util/eval_args_mock_endpoint.cc',
'test/core/util/fuzzer_util.cc',
'test/core/util/grpc_profiler.cc',
'test/core/util/histogram.cc',
@@ -1080,15 +1090,11 @@
'target_name': 'grpc_unsecure',
'type': 'static_library',
'dependencies': [
+ 'absl/container:flat_hash_map',
+ 'absl/container:inlined_vector',
+ 'absl/status:statusor',
'gpr',
'address_sorting',
- 'upb',
- 'absl/types:optional',
- 'absl/strings:strings',
- 'absl/status:statusor',
- 'absl/status:status',
- 'absl/container:inlined_vector',
- 'absl/container:flat_hash_map',
],
'sources': [
'src/core/ext/filters/census/grpc_context.cc',
@@ -1136,6 +1142,8 @@
'src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc',
'src/core/ext/filters/client_channel/resolver_registry.cc',
'src/core/ext/filters/client_channel/resolver_result_parsing.cc',
+ 'src/core/ext/filters/client_channel/retry_filter.cc',
+ 'src/core/ext/filters/client_channel/retry_service_config.cc',
'src/core/ext/filters/client_channel/retry_throttle.cc',
'src/core/ext/filters/client_channel/server_address.cc',
'src/core/ext/filters/client_channel/service_config.cc',
@@ -1145,6 +1153,8 @@
'src/core/ext/filters/client_channel/subchannel_pool_interface.cc',
'src/core/ext/filters/client_idle/client_idle_filter.cc',
'src/core/ext/filters/deadline/deadline_filter.cc',
+ 'src/core/ext/filters/fault_injection/fault_injection_filter.cc',
+ 'src/core/ext/filters/fault_injection/service_config_parser.cc',
'src/core/ext/filters/http/client/http_client_filter.cc',
'src/core/ext/filters/http/client_authority_filter.cc',
'src/core/ext/filters/http/http_filters_plugin.cc',
@@ -1188,21 +1198,12 @@
'src/core/ext/transport/chttp2/transport/writing.cc',
'src/core/ext/transport/inproc/inproc_plugin.cc',
'src/core/ext/transport/inproc/inproc_transport.cc',
- 'src/core/ext/upb-generated/google/api/annotations.upb.c',
- 'src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.c',
- 'src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c',
- 'src/core/ext/upb-generated/google/api/http.upb.c',
- 'src/core/ext/upb-generated/google/protobuf/any.upb.c',
- 'src/core/ext/upb-generated/google/protobuf/duration.upb.c',
- 'src/core/ext/upb-generated/google/protobuf/empty.upb.c',
- 'src/core/ext/upb-generated/google/protobuf/struct.upb.c',
- 'src/core/ext/upb-generated/google/protobuf/timestamp.upb.c',
- 'src/core/ext/upb-generated/google/protobuf/wrappers.upb.c',
- 'src/core/ext/upb-generated/google/rpc/status.upb.c',
'src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c',
'src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c',
'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c',
'src/core/ext/upb-generated/validate/validate.upb.c',
+ 'src/core/lib/address_utils/parse_address.cc',
+ 'src/core/lib/address_utils/sockaddr_utils.cc',
'src/core/lib/avl/avl.cc',
'src/core/lib/backoff/backoff.cc',
'src/core/lib/channel/channel_args.cc',
@@ -1225,6 +1226,8 @@
'src/core/lib/debug/stats.cc',
'src/core/lib/debug/stats_data.cc',
'src/core/lib/debug/trace.cc',
+ 'src/core/lib/event_engine/slice_allocator.cc',
+ 'src/core/lib/event_engine/sockaddr.cc',
'src/core/lib/http/format_request.cc',
'src/core/lib/http/httpcli.cc',
'src/core/lib/http/parser.cc',
@@ -1269,8 +1272,6 @@
'src/core/lib/iomgr/is_epollexclusive_available.cc',
'src/core/lib/iomgr/load_file.cc',
'src/core/lib/iomgr/lockfree_event.cc',
- 'src/core/lib/iomgr/parse_address.cc',
- 'src/core/lib/iomgr/poller/eventmanager_libuv.cc',
'src/core/lib/iomgr/polling_entity.cc',
'src/core/lib/iomgr/pollset.cc',
'src/core/lib/iomgr/pollset_custom.cc',
@@ -1284,7 +1285,6 @@
'src/core/lib/iomgr/resolve_address_posix.cc',
'src/core/lib/iomgr/resolve_address_windows.cc',
'src/core/lib/iomgr/resource_quota.cc',
- 'src/core/lib/iomgr/sockaddr_utils.cc',
'src/core/lib/iomgr/socket_factory_posix.cc',
'src/core/lib/iomgr/socket_mutator.cc',
'src/core/lib/iomgr/socket_utils_common_posix.cc',
@@ -1375,14 +1375,10 @@
'target_name': 'benchmark_helpers',
'type': 'static_library',
'dependencies': [
- 'grpc_test_util_unsecure',
+ 'benchmark',
'grpc++_unsecure',
- 'grpc_unsecure',
+ 'grpc_test_util_unsecure',
'grpc++_test_config',
- 'gpr',
- 'address_sorting',
- 'upb',
- 'benchmark',
],
'sources': [
'src/proto/grpc/testing/echo.proto',
@@ -1396,10 +1392,6 @@
'type': 'static_library',
'dependencies': [
'grpc',
- 'gpr',
- 'address_sorting',
- 'upb',
- 'absl/synchronization:synchronization',
],
'sources': [
'src/cpp/client/channel_cc.cc',
@@ -1459,10 +1451,6 @@
'type': 'static_library',
'dependencies': [
'grpc++',
- 'grpc',
- 'gpr',
- 'address_sorting',
- 'upb',
],
'sources': [
'src/cpp/common/alts_context.cc',
@@ -1474,10 +1462,6 @@
'type': 'static_library',
'dependencies': [
'grpc++',
- 'grpc',
- 'gpr',
- 'address_sorting',
- 'upb',
],
'sources': [
'src/cpp/util/error_details.cc',
@@ -1488,10 +1472,6 @@
'type': 'static_library',
'dependencies': [
'grpc++',
- 'grpc',
- 'gpr',
- 'address_sorting',
- 'upb',
],
'sources': [
'src/proto/grpc/reflection/v1alpha/reflection.proto',
@@ -1504,10 +1484,6 @@
'type': 'static_library',
'dependencies': [
'grpc++',
- 'grpc',
- 'gpr',
- 'address_sorting',
- 'upb',
],
'sources': [
'src/cpp/client/channel_test_peer.cc',
@@ -1517,8 +1493,8 @@
'target_name': 'grpc++_test_config',
'type': 'static_library',
'dependencies': [
- 'gpr',
'absl/flags:parse',
+ 'gpr',
],
'sources': [
'test/cpp/util/test_config_cc.cc',
@@ -1528,13 +1504,9 @@
'target_name': 'grpc++_test_util',
'type': 'static_library',
'dependencies': [
- 'grpc_test_util',
- 'grpc++',
- 'grpc',
- 'gpr',
- 'address_sorting',
- 'upb',
'absl/flags:flag',
+ 'grpc++',
+ 'grpc_test_util',
],
'sources': [
'test/core/end2end/data/client_certs.cc',
@@ -1553,10 +1525,6 @@
'type': 'static_library',
'dependencies': [
'grpc_unsecure',
- 'gpr',
- 'address_sorting',
- 'upb',
- 'absl/synchronization:synchronization',
],
'sources': [
'src/cpp/client/channel_cc.cc',
@@ -1621,10 +1589,6 @@
'type': 'static_library',
'dependencies': [
'grpc++',
- 'grpc',
- 'gpr',
- 'address_sorting',
- 'upb',
],
'sources': [
'src/proto/grpc/channelz/channelz.proto',
@@ -1745,7 +1709,6 @@
'third_party/boringssl-with-bazel/src/crypto/ex_data.c',
'third_party/boringssl-with-bazel/src/crypto/fipsmodule/bcm.c',
'third_party/boringssl-with-bazel/src/crypto/fipsmodule/fips_shared_support.c',
- 'third_party/boringssl-with-bazel/src/crypto/fipsmodule/is_fips.c',
'third_party/boringssl-with-bazel/src/crypto/hkdf/hkdf.c',
'third_party/boringssl-with-bazel/src/crypto/hpke/hpke.c',
'third_party/boringssl-with-bazel/src/crypto/hrss/hrss.c',
@@ -1812,7 +1775,6 @@
'third_party/boringssl-with-bazel/src/crypto/x509/x509_ext.c',
'third_party/boringssl-with-bazel/src/crypto/x509/x509_lu.c',
'third_party/boringssl-with-bazel/src/crypto/x509/x509_obj.c',
- 'third_party/boringssl-with-bazel/src/crypto/x509/x509_r2x.c',
'third_party/boringssl-with-bazel/src/crypto/x509/x509_req.c',
'third_party/boringssl-with-bazel/src/crypto/x509/x509_set.c',
'third_party/boringssl-with-bazel/src/crypto/x509/x509_trs.c',
@@ -1877,6 +1839,7 @@
'third_party/boringssl-with-bazel/src/ssl/d1_srtp.cc',
'third_party/boringssl-with-bazel/src/ssl/dtls_method.cc',
'third_party/boringssl-with-bazel/src/ssl/dtls_record.cc',
+ 'third_party/boringssl-with-bazel/src/ssl/encrypted_client_hello.cc',
'third_party/boringssl-with-bazel/src/ssl/handoff.cc',
'third_party/boringssl-with-bazel/src/ssl/handshake.cc',
'third_party/boringssl-with-bazel/src/ssl/handshake_client.cc',
@@ -1988,8 +1951,6 @@
'third_party/upb/upb/decode.c',
'third_party/upb/upb/def.c',
'third_party/upb/upb/encode.c',
- 'third_party/upb/upb/json_decode.c',
- 'third_party/upb/upb/json_encode.c',
'third_party/upb/upb/msg.c',
'third_party/upb/upb/reflection.c',
'third_party/upb/upb/table.c',
diff --git a/include/grpc/event_engine/README.md b/include/grpc/event_engine/README.md
new file mode 100644
index 00000000000..b2d4fef83b3
--- /dev/null
+++ b/include/grpc/event_engine/README.md
@@ -0,0 +1,38 @@
+# gRPC EventEngine
+
+An EventEngine handles all cross-platform I/O, task execution, and DNS
+resolution for gRPC. A default, cross-platform implementation is provided with
+gRPC, but part of the intent here is to provide an interface for external
+integrators to bring their own functionality. This allows for integration with
+external event loops, siloing I/O and task execution between channels or
+servers, and other custom integrations that were previously unsupported.
+
+*WARNING*: This is experimental code and is subject to change.
+
+## High level expectations of an EventEngine implementation
+
+### Provide their own I/O threads
+EventEngines are expected to internally create whatever threads are required to
+perform I/O and execute callbacks. For example, an EventEngine implementation
+may want to spawn separate thread pools for polling and callback execution.
+
+### Provisioning data buffers via Slice allocation
+At a high level, gRPC provides a `ResourceQuota` system that allows gRPC to
+reclaim memory and degrade gracefully when memory reaches application-defined
+thresholds. To enable this feature, the memory allocation of read/write buffers
+within an EventEngine must be acquired in the form of Slices from
+SliceAllocators. This is covered more fully in the gRFC and code.
+
+### Documentating expectations around callback execution
+Some callbacks may be expensive to run. EventEngines should decide on and
+document whether callback execution might block polling operations. This way,
+application developers can plan accordingly (e.g., run their expensive callbacks
+on a separate thread if necessary).
+
+### Handling concurrent usage
+Assume that gRPC may use an EventEngine concurrently across multiple threads.
+
+## TODO: documentation
+
+* Example usage
+* Link to gRFC
diff --git a/include/grpc/event_engine/channel_args.h b/include/grpc/event_engine/channel_args.h
new file mode 100644
index 00000000000..d809b1fb9f5
--- /dev/null
+++ b/include/grpc/event_engine/channel_args.h
@@ -0,0 +1,28 @@
+// Copyright 2021 The gRPC Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+#ifndef GRPC_EVENT_ENGINE_CHANNEL_ARGS_H
+#define GRPC_EVENT_ENGINE_CHANNEL_ARGS_H
+
+#include
+
+namespace grpc_event_engine {
+namespace experimental {
+
+// TODO(hork): define
+class ChannelArgs;
+
+} // namespace experimental
+} // namespace grpc_event_engine
+
+#endif // GRPC_EVENT_ENGINE_CHANNEL_ARGS_H
diff --git a/include/grpc/event_engine/event_engine.h b/include/grpc/event_engine/event_engine.h
new file mode 100644
index 00000000000..c2d0c404903
--- /dev/null
+++ b/include/grpc/event_engine/event_engine.h
@@ -0,0 +1,280 @@
+// Copyright 2021 The gRPC Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+#ifndef GRPC_EVENT_ENGINE_EVENT_ENGINE_H
+#define GRPC_EVENT_ENGINE_EVENT_ENGINE_H
+
+#include
+
+#include
+#include
+
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/time/time.h"
+
+#include "grpc/event_engine/channel_args.h"
+#include "grpc/event_engine/port.h"
+#include "grpc/event_engine/slice_allocator.h"
+
+// TODO(hork): explicitly define lifetimes and ownership of all objects.
+// TODO(hork): Define the Endpoint::Write metrics collection system
+
+namespace grpc_event_engine {
+namespace experimental {
+
+////////////////////////////////////////////////////////////////////////////////
+/// The EventEngine encapsulates all platform-specific behaviors related to low
+/// level network I/O, timers, asynchronous execution, and DNS resolution.
+///
+/// This interface allows developers to provide their own event management and
+/// network stacks. Motivating uses cases for supporting custom EventEngines
+/// include the ability to hook into external event loops, and using different
+/// EventEngine instances for each channel to better insulate network I/O and
+/// callback processing from other channels.
+///
+/// A default cross-platform EventEngine instance is provided by gRPC.
+///
+/// LIFESPAN AND OWNERSHIP
+///
+/// gRPC takes shared ownership of EventEngines via std::shared_ptrs to ensure
+/// that the engines remain available until they are no longer needed. Depending
+/// on the use case, engines may live until gRPC is shut down.
+///
+/// EXAMPLE USAGE (Not yet implemented)
+///
+/// Custom EventEngines can be specified per channel, and allow configuration
+/// for both clients and servers. To set a custom EventEngine for a client
+/// channel, you can do something like the following:
+///
+/// ChannelArguments args;
+/// std::shared_ptr engine = std::make_shared(...);
+/// args.SetEventEngine(engine);
+/// MyAppClient client(grpc::CreateCustomChannel(
+/// "localhost:50051", grpc::InsecureChannelCredentials(), args));
+///
+/// A gRPC server can use a custom EventEngine by calling the
+/// ServerBuilder::SetEventEngine method:
+///
+/// ServerBuilder builder;
+/// std::shared_ptr engine = std::make_shared(...);
+/// builder.SetEventEngine(engine);
+/// std::unique_ptr server(builder.BuildAndStart());
+/// server->Wait();
+///
+////////////////////////////////////////////////////////////////////////////////
+class EventEngine {
+ public:
+ /// A basic callable function. The first argument to all callbacks is an
+ /// absl::Status indicating the status of the operation associated with this
+ /// callback. Each EventEngine method that takes a callback parameter, defines
+ /// the expected sets and meanings of statuses for that use case.
+ using Callback = std::function;
+ struct TaskHandle {
+ intptr_t key;
+ };
+ /// A thin wrapper around a platform-specific sockaddr type. A sockaddr struct
+ /// exists on all platforms that gRPC supports.
+ ///
+ /// Platforms are expected to provide definitions for:
+ /// * sockaddr
+ /// * sockaddr_in
+ /// * sockaddr_in6
+ class ResolvedAddress {
+ public:
+ static constexpr socklen_t MAX_SIZE_BYTES = 128;
+
+ ResolvedAddress(const sockaddr* address, socklen_t size);
+ const struct sockaddr* address() const;
+ socklen_t size() const;
+
+ private:
+ char address_[MAX_SIZE_BYTES];
+ socklen_t size_;
+ };
+
+ /// An Endpoint represents one end of a connection between a gRPC client and
+ /// server. Endpoints are created when connections are established, and
+ /// Endpoint operations are gRPC's primary means of communication.
+ ///
+ /// Endpoints must use the provided SliceAllocator for all data buffer memory
+ /// allocations. gRPC allows applications to set memory constraints per
+ /// Channel or Server, and the implementation depends on all dynamic memory
+ /// allocation being handled by the quota system.
+ class Endpoint {
+ public:
+ virtual ~Endpoint() = 0;
+
+ // TODO(hork): define status codes for the callback
+ /// Read data from the Endpoint.
+ ///
+ /// When data is available on the connection, that data is moved into the
+ /// \a buffer, and the \a on_read callback is called. The caller must ensure
+ /// that the callback has access to the buffer when executed later.
+ /// Ownership of the buffer is not transferred. Valid slices *may* be placed
+ /// into the buffer even if the callback is invoked with Status != OK.
+ virtual void Read(Callback on_read, SliceBuffer* buffer,
+ absl::Time deadline) = 0;
+ // TODO(hork): define status codes for the callback
+ /// Write data out on the connection.
+ ///
+ /// \a on_writable is called when the connection is ready for more data. The
+ /// Slices within the \a data buffer may be mutated at will by the Endpoint
+ /// until \a on_writable is called. The \a data SliceBuffer will remain
+ /// valid after calling \a Write, but its state is otherwise undefined.
+ virtual void Write(Callback on_writable, SliceBuffer* data,
+ absl::Time deadline) = 0;
+ // TODO(hork): define status codes for the callback
+ // TODO(hork): define cleanup operations, lifetimes, responsibilities.
+ virtual void Close(Callback on_close) = 0;
+ /// These methods return an address in the format described in DNSResolver.
+ /// The returned values are owned by the Endpoint and are expected to remain
+ /// valid for the life of the Endpoint.
+ virtual const ResolvedAddress* GetPeerAddress() const = 0;
+ virtual const ResolvedAddress* GetLocalAddress() const = 0;
+ };
+
+ /// Called when a new connection is established. This callback takes ownership
+ /// of the Endpoint and is responsible for its destruction.
+ using OnConnectCallback = std::function;
+
+ /// An EventEngine Listener listens for incoming connection requests from gRPC
+ /// clients and initiates request processing once connections are established.
+ class Listener {
+ public:
+ /// A callback handle, used to cancel a callback. Called when the listener
+ /// has accepted a new client connection. This callback takes ownership of
+ /// the Endpoint and is responsible its destruction.
+ using AcceptCallback = std::function;
+
+ virtual ~Listener() = 0;
+
+ // TODO(hork): define return status codes
+ /// Bind an address/port to this Listener. It is expected that multiple
+ /// addresses/ports can be bound to this Listener before Listener::Start has
+ /// been called. Returns the bound port or an error status.
+ virtual absl::StatusOr Bind(const ResolvedAddress& addr) = 0;
+ virtual absl::Status Start() = 0;
+ };
+
+ // TODO(hork): define status codes for the callback
+ // TODO(hork): define return status codes
+ // TODO(hork): document status arg meanings for on_accept and on_shutdown
+ /// Factory method to create a network listener.
+ virtual absl::StatusOr> CreateListener(
+ Listener::AcceptCallback on_accept, Callback on_shutdown,
+ const ChannelArgs& args,
+ SliceAllocatorFactory slice_allocator_factory) = 0;
+ // TODO(hork): define status codes for the callback
+ // TODO(hork): define return status codes
+ /// Creates a network connection to a remote network listener.
+ virtual absl::Status Connect(OnConnectCallback on_connect,
+ const ResolvedAddress& addr,
+ const ChannelArgs& args,
+ SliceAllocator slice_allocator,
+ absl::Time deadline) = 0;
+
+ /// The DNSResolver that provides asynchronous resolution.
+ class DNSResolver {
+ public:
+ /// A task handle for DNS Resolution requests.
+ struct LookupTaskHandle {
+ intptr_t key;
+ };
+ /// A DNS SRV record type.
+ struct SRVRecord {
+ std::string host;
+ int port = 0;
+ int priority = 0;
+ int weight = 0;
+ };
+ /// Called with the collection of sockaddrs that were resolved from a given
+ /// target address.
+ using LookupHostnameCallback =
+ std::function)>;
+ /// Called with a collection of SRV records.
+ using LookupSRVCallback =
+ std::function)>;
+ /// Called with the result of a TXT record lookup
+ using LookupTXTCallback = std::function;
+
+ virtual ~DNSResolver() = 0;
+
+ // TODO(hork): define status codes for the callback
+ /// Asynchronously resolve an address. \a default_port may be a non-numeric
+ /// named service port, and will only be used if \a address does not already
+ /// contain a port component.
+ virtual LookupTaskHandle LookupHostname(LookupHostnameCallback on_resolve,
+ absl::string_view address,
+ absl::string_view default_port,
+ absl::Time deadline) = 0;
+ // TODO(hork): define status codes for the callback
+ virtual LookupTaskHandle LookupSRV(LookupSRVCallback on_resolve,
+ absl::string_view name,
+ absl::Time deadline) = 0;
+ // TODO(hork): define status codes for the callback
+ virtual LookupTaskHandle LookupTXT(LookupTXTCallback on_resolve,
+ absl::string_view name,
+ absl::Time deadline) = 0;
+ /// Cancel an asynchronous lookup operation.
+ virtual void TryCancelLookup(LookupTaskHandle handle) = 0;
+ };
+
+ virtual ~EventEngine() = 0;
+
+ // TODO(hork): define return status codes
+ /// Retrieves an instance of a DNSResolver.
+ virtual absl::StatusOr> GetDNSResolver() = 0;
+
+ /// Intended for future expansion of Task run functionality.
+ struct RunOptions {};
+ // TODO(hork): define status codes for the callback
+ // TODO(hork): consider recommendation to make TaskHandle an output arg
+ /// Run a callback as soon as possible.
+ virtual TaskHandle Run(Callback fn, RunOptions opts) = 0;
+ // TODO(hork): define status codes for the callback
+ /// Synonymous with scheduling an alarm to run at time \a when.
+ virtual TaskHandle RunAt(absl::Time when, Callback fn, RunOptions opts) = 0;
+ /// Immediately tries to cancel a callback.
+ /// Note that this is a "best effort" cancellation. No guarantee is made that
+ /// the callback will be cancelled, the call could be in any stage.
+ ///
+ /// There are three scenarios in which we may cancel a scheduled function:
+ /// 1. We cancel the execution before it has run.
+ /// 2. The callback has already run.
+ /// 3. We can't cancel it because it is "in flight".
+ ///
+ /// In all cases, the cancellation is still considered successful, the
+ /// callback will be run exactly once from either cancellation or from its
+ /// activation.
+ virtual void TryCancel(TaskHandle handle) = 0;
+ // TODO(hork): define return status codes
+ // TODO(hork): Carefully evaluate shutdown requirements, determine if we need
+ // a callback parameter to be added to this method.
+ /// Immediately run all callbacks with status indicating the shutdown. Every
+ /// EventEngine is expected to shut down exactly once. No new callbacks/tasks
+ /// should be scheduled after shutdown has begun. Any registered callbacks
+ /// must be executed.
+ virtual absl::Status Shutdown() = 0;
+};
+
+// Lazily instantiate and return a default global EventEngine instance if no
+// custom instance is provided. If a custom EventEngine is provided for every
+// channel/server via ChannelArgs, this method should never be called, and the
+// default instance will never be instantiated.
+std::shared_ptr GetDefaultEventEngine();
+
+} // namespace experimental
+} // namespace grpc_event_engine
+
+#endif // GRPC_EVENT_ENGINE_EVENT_ENGINE_H
diff --git a/include/grpc/event_engine/port.h b/include/grpc/event_engine/port.h
new file mode 100644
index 00000000000..c24b8f90245
--- /dev/null
+++ b/include/grpc/event_engine/port.h
@@ -0,0 +1,39 @@
+// Copyright 2021 The gRPC Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+#ifndef GRPC_EVENT_ENGINE_PORT_H
+#define GRPC_EVENT_ENGINE_PORT_H
+
+#include
+
+// Platform-specific sockaddr includes
+#ifdef GRPC_UV
+#include
+#elif defined(GPR_ANDROID) || defined(GPR_LINUX) || defined(GPR_APPLE) || \
+ defined(GPR_FREEBSD) || defined(GPR_OPENBSD) || defined(GPR_SOLARIS) || \
+ defined(GPR_AIX) || defined(GPR_NACL) || defined(GPR_FUCHSIA) || \
+ defined(GRPC_POSIX_SOCKET)
+#define GRPC_EVENT_ENGINE_POSIX
+#include
+#include
+#include
+#elif defined(GPR_WINDOWS)
+#include
+#include
+// must be included after the above
+#include
+#else
+#error UNKNOWN PLATFORM
+#endif
+
+#endif // GRPC_EVENT_ENGINE_PORT_H
diff --git a/include/grpc/event_engine/slice_allocator.h b/include/grpc/event_engine/slice_allocator.h
new file mode 100644
index 00000000000..4370cd519ad
--- /dev/null
+++ b/include/grpc/event_engine/slice_allocator.h
@@ -0,0 +1,81 @@
+// Copyright 2021 The gRPC Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+#ifndef GRPC_EVENT_ENGINE_SLICE_ALLOCATOR_H
+#define GRPC_EVENT_ENGINE_SLICE_ALLOCATOR_H
+
+#include
+
+#include
+
+#include "absl/status/status.h"
+
+// forward-declaring an internal struct, not used publicly.
+struct grpc_resource_quota;
+struct grpc_resource_user;
+
+namespace grpc_event_engine {
+namespace experimental {
+
+// TODO(nnoble): forward declared here, needs definition.
+class SliceBuffer;
+
+class SliceAllocator {
+ public:
+ // gRPC-internal constructor
+ explicit SliceAllocator(grpc_resource_user* user);
+ // Not copyable
+ SliceAllocator(SliceAllocator& other) = delete;
+ SliceAllocator& operator=(const SliceAllocator& other) = delete;
+ // Moveable
+ SliceAllocator(SliceAllocator&& other) = default;
+ SliceAllocator& operator=(SliceAllocator&& other) = default;
+ ~SliceAllocator();
+
+ using AllocateCallback =
+ std::function;
+ // TODO(hork): explain what happens under resource exhaustion.
+ /// Requests \a size bytes from gRPC, and populates \a dest with the allocated
+ /// slices. Ownership of the \a SliceBuffer is not transferred.
+ absl::Status Allocate(size_t size, SliceBuffer* dest,
+ SliceAllocator::AllocateCallback cb);
+
+ private:
+ grpc_resource_user* resource_user_;
+};
+
+class SliceAllocatorFactory {
+ public:
+ // gRPC-internal constructor
+ explicit SliceAllocatorFactory(grpc_resource_quota* quota);
+ // Not copyable
+ SliceAllocatorFactory(SliceAllocatorFactory& other) = delete;
+ SliceAllocatorFactory& operator=(const SliceAllocatorFactory& other) = delete;
+ // Moveable
+ SliceAllocatorFactory(SliceAllocatorFactory&& other) = default;
+ SliceAllocatorFactory& operator=(SliceAllocatorFactory&& other) = default;
+ ~SliceAllocatorFactory();
+
+ /// On Endpoint creation, call \a CreateSliceAllocator with the name of the
+ /// endpoint peer (a URI string, most likely). Note: \a peer_name must outlive
+ /// the Endpoint.
+ SliceAllocator CreateSliceAllocator(absl::string_view peer_name);
+
+ private:
+ grpc_resource_quota* resource_quota_;
+};
+
+} // namespace experimental
+} // namespace grpc_event_engine
+
+#endif // GRPC_EVENT_ENGINE_SLICE_ALLOCATOR_H
diff --git a/include/grpc/grpc.h b/include/grpc/grpc.h
index 09bb1061922..f4408e111f5 100644
--- a/include/grpc/grpc.h
+++ b/include/grpc/grpc.h
@@ -411,10 +411,20 @@ GRPCAPI void grpc_server_register_completion_queue(grpc_server* server,
grpc_completion_queue* cq,
void* reserved);
+// There might be more methods added later, so users should take care to memset
+// this to 0 before using it.
+typedef struct {
+ void (*on_serving_status_update)(void* user_data, const char* uri,
+ grpc_status_code code,
+ const char* error_message);
+ void* user_data;
+} grpc_server_xds_status_notifier;
+
typedef struct grpc_server_config_fetcher grpc_server_config_fetcher;
/** EXPERIMENTAL. Creates an xDS config fetcher. */
-GRPCAPI grpc_server_config_fetcher* grpc_server_config_fetcher_xds_create();
+GRPCAPI grpc_server_config_fetcher* grpc_server_config_fetcher_xds_create(
+ grpc_server_xds_status_notifier notifier, const grpc_channel_args* args);
/** EXPERIMENTAL. Destroys a config fetcher. */
GRPCAPI void grpc_server_config_fetcher_destroy(
@@ -495,6 +505,10 @@ GRPCAPI void grpc_resource_quota_resize(grpc_resource_quota* resource_quota,
GRPCAPI void grpc_resource_quota_set_max_threads(
grpc_resource_quota* resource_quota, int new_max_threads);
+/** EXPERIMENTAL. Dumps xDS configs as a serialized ClientConfig proto.
+ The full name of the proto is envoy.service.status.v3.ClientConfig. */
+GRPCAPI grpc_slice grpc_dump_xds_configs();
+
/** Fetch a vtable for a grpc_channel_arg that points to a grpc_resource_quota
*/
GRPCAPI const grpc_arg_pointer_vtable* grpc_resource_quota_arg_vtable(void);
diff --git a/include/grpc/grpc_security_constants.h b/include/grpc/grpc_security_constants.h
index a62f76753b9..4d7f0788e7a 100644
--- a/include/grpc/grpc_security_constants.h
+++ b/include/grpc/grpc_security_constants.h
@@ -29,10 +29,24 @@ extern "C" {
#define GRPC_X509_CN_PROPERTY_NAME "x509_common_name"
#define GRPC_X509_SAN_PROPERTY_NAME "x509_subject_alternative_name"
#define GRPC_X509_PEM_CERT_PROPERTY_NAME "x509_pem_cert"
+// Please note that internally, we just faithfully pass whatever value we got by
+// calling SSL_get_peer_cert_chain() in OpenSSL/BoringSSL. This will mean in
+// OpenSSL, the following conditions might apply:
+// 1. On the client side, this property returns the full certificate chain. On
+// the server side, this property will return the certificate chain without the
+// leaf certificate. Application can use GRPC_X509_PEM_CERT_PROPERTY_NAME to
+// get the peer leaf certificate.
+// 2. If the session is resumed, this property could be empty for OpenSSL (but
+// not for BoringSSL).
+// For more, please refer to the official OpenSSL manual:
+// https://www.openssl.org/docs/man1.1.0/man3/SSL_get_peer_cert_chain.html.
#define GRPC_X509_PEM_CERT_CHAIN_PROPERTY_NAME "x509_pem_cert_chain"
#define GRPC_SSL_SESSION_REUSED_PROPERTY "ssl_session_reused"
#define GRPC_TRANSPORT_SECURITY_LEVEL_PROPERTY_NAME "security_level"
+#define GRPC_PEER_DNS_PROPERTY_NAME "peer_dns"
#define GRPC_PEER_SPIFFE_ID_PROPERTY_NAME "peer_spiffe_id"
+#define GRPC_PEER_EMAIL_PROPERTY_NAME "peer_email"
+#define GRPC_PEER_IP_PROPERTY_NAME "peer_ip"
/** Environment variable that points to the default SSL roots file. This file
must be a PEM encoded file with all the roots such as the one that can be
diff --git a/include/grpc/impl/codegen/grpc_types.h b/include/grpc/impl/codegen/grpc_types.h
index d67a9e97458..9cf6d8372e5 100644
--- a/include/grpc/impl/codegen/grpc_types.h
+++ b/include/grpc/impl/codegen/grpc_types.h
@@ -353,6 +353,17 @@ typedef struct {
/* Timeout in milliseconds to use for calls to the grpclb load balancer.
If 0 or unset, the balancer calls will have no deadline. */
#define GRPC_ARG_GRPCLB_CALL_TIMEOUT_MS "grpc.grpclb_call_timeout_ms"
+/* Specifies the xDS bootstrap config as a JSON string.
+ FOR TESTING PURPOSES ONLY -- DO NOT USE IN PRODUCTION.
+ This option allows controlling the bootstrap configuration on a
+ per-channel basis, which is useful in tests. However, this results
+ in having a separate xDS client instance per channel rather than
+ using the global instance, which is not the intended way to use xDS.
+ Currently, this will (a) add unnecessary load on the xDS server and
+ (b) break use of CSDS, and there may be additional side effects in
+ the future. */
+#define GRPC_ARG_TEST_ONLY_DO_NOT_USE_IN_PROD_XDS_BOOTSTRAP_CONFIG \
+ "grpc.TEST_ONLY_DO_NOT_USE_IN_PROD.xds_bootstrap_config"
/* Timeout in milliseconds to wait for the serverlist from the grpclb load
balancer before using fallback backend addresses from the resolver.
If 0, enter fallback mode immediately. Default value is 10000. */
diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h
index cd0310d88ca..387639bf833 100644
--- a/include/grpc/impl/codegen/port_platform.h
+++ b/include/grpc/impl/codegen/port_platform.h
@@ -39,6 +39,11 @@
#endif
#endif // GPR_ABSEIL_SYNC
+/*
+ * Defines GRPC_ERROR_IS_ABSEIL_STATUS to use absl::Status for grpc_error_handle
+ */
+// #define GRPC_ERROR_IS_ABSEIL_STATUS 1
+
/* Get windows.h included everywhere (we need it) */
#if defined(_WIN64) || defined(WIN64) || defined(_WIN32) || defined(WIN32)
#ifndef WIN32_LEAN_AND_MEAN
diff --git a/include/grpc/module.modulemap b/include/grpc/module.modulemap
index 06c1e977361..40606e5601d 100644
--- a/include/grpc/module.modulemap
+++ b/include/grpc/module.modulemap
@@ -2,6 +2,15 @@
framework module grpc {
umbrella header "grpc.h"
+header "byte_buffer.h"
+ header "byte_buffer_reader.h"
+ header "census.h"
+ header "compression.h"
+ header "fork.h"
+ header "grpc.h"
+ header "grpc_posix.h"
+ header "grpc_security.h"
+ header "grpc_security_constants.h"
header "impl/codegen/atm.h"
header "impl/codegen/byte_buffer.h"
header "impl/codegen/byte_buffer_reader.h"
@@ -19,6 +28,10 @@ framework module grpc {
header "impl/codegen/sync.h"
header "impl/codegen/sync_abseil.h"
header "impl/codegen/sync_generic.h"
+ header "load_reporting.h"
+ header "slice.h"
+ header "slice_buffer.h"
+ header "status.h"
header "support/alloc.h"
header "support/atm.h"
header "support/cpu.h"
@@ -31,22 +44,9 @@ framework module grpc {
header "support/sync_generic.h"
header "support/thd_id.h"
header "support/time.h"
- header "byte_buffer.h"
- header "byte_buffer_reader.h"
- header "census.h"
- header "compression.h"
- header "fork.h"
- header "grpc.h"
- header "grpc_posix.h"
- header "grpc_security.h"
- header "grpc_security_constants.h"
- header "load_reporting.h"
- header "slice.h"
- header "slice_buffer.h"
- header "status.h"
header "support/workaround_list.h"
- textual header "impl/codegen/atm_gcc_atomic.h"
+textual header "impl/codegen/atm_gcc_atomic.h"
textual header "impl/codegen/atm_gcc_sync.h"
textual header "impl/codegen/atm_windows.h"
textual header "impl/codegen/sync_custom.h"
diff --git a/include/grpcpp/alarm.h b/include/grpcpp/alarm.h
index 1405590c985..6723e136c4f 100644
--- a/include/grpcpp/alarm.h
+++ b/include/grpcpp/alarm.h
@@ -56,6 +56,10 @@ class Alarm : private ::grpc::GrpcLibraryCodegen {
/// Once the alarm expires (at \a deadline) or it's cancelled (see \a Cancel),
/// an event with tag \a tag will be added to \a cq. If the alarm expired, the
/// event's success bit will be true, false otherwise (ie, upon cancellation).
+ //
+ // USAGE NOTE: This is frequently used to inject arbitrary tags into \a cq by
+ // setting an immediate deadline. Such usage allows synchronizing an external
+ // event with an application's \a grpc::CompletionQueue::Next loop.
template
void Set(::grpc::CompletionQueue* cq, const T& deadline, void* tag) {
SetInternal(cq, ::grpc::TimePoint(deadline).raw_time(), tag);
diff --git a/include/grpcpp/channel.h b/include/grpcpp/channel.h
index 5e67c642a47..65cc46d151f 100644
--- a/include/grpcpp/channel.h
+++ b/include/grpcpp/channel.h
@@ -114,7 +114,7 @@ class Channel final : public ::grpc::ChannelInterface,
// with this channel (if any). It is set on the first call to CallbackCQ().
// It is _not owned_ by the channel; ownership belongs with its internal
// shutdown callback tag (invoked when the CQ is fully shutdown).
- ::grpc::CompletionQueue* callback_cq_ = nullptr;
+ std::atomic callback_cq_{nullptr};
std::vector<
std::unique_ptr<::grpc::experimental::ClientInterceptorFactoryInterface>>
diff --git a/include/grpcpp/ext/admin_services.h b/include/grpcpp/ext/admin_services.h
new file mode 100644
index 00000000000..898a87e5f0a
--- /dev/null
+++ b/include/grpcpp/ext/admin_services.h
@@ -0,0 +1,33 @@
+//
+//
+// Copyright 2021 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
+
+#ifndef GRPCPP_EXT_ADMIN_SERVICES_H
+#define GRPCPP_EXT_ADMIN_SERVICES_H
+
+#include
+
+namespace grpc {
+
+// Registers admin services to the given ServerBuilder. This function will add
+// admin services based on build time dependencies, for example, it only adds
+// CSDS service if xDS is enabled in this binary.
+void AddAdminServices(grpc::ServerBuilder* builder);
+
+} // namespace grpc
+
+#endif // GRPCPP_EXT_ADMIN_SERVICES_H
diff --git a/include/grpcpp/generic/generic_stub.h b/include/grpcpp/generic/generic_stub.h
index e4576af1a4d..e9564c33e7e 100644
--- a/include/grpcpp/generic/generic_stub.h
+++ b/include/grpcpp/generic/generic_stub.h
@@ -22,6 +22,7 @@
#include
#include
+#include
#include
#include
#include
@@ -53,7 +54,8 @@ class TemplatedGenericStub final {
std::unique_ptr>
PrepareCall(ClientContext* context, const std::string& method,
::grpc::CompletionQueue* cq) {
- return CallInternal(channel_.get(), context, method, cq, false, nullptr);
+ return CallInternal(channel_.get(), context, method, /*options=*/{}, cq,
+ false, nullptr);
}
/// Setup a unary call to a named method \a method using \a context, and don't
@@ -67,6 +69,7 @@ class TemplatedGenericStub final {
internal::ClientAsyncResponseReaderHelper::Create(
channel_.get(), cq,
grpc::internal::RpcMethod(method.c_str(),
+ /*suffix_for_stats=*/nullptr,
grpc::internal::RpcMethod::NORMAL_RPC),
context, request));
}
@@ -80,7 +83,8 @@ class TemplatedGenericStub final {
std::unique_ptr> Call(
ClientContext* context, const std::string& method,
::grpc::CompletionQueue* cq, void* tag) {
- return CallInternal(channel_.get(), context, method, cq, true, tag);
+ return CallInternal(channel_.get(), context, method, /*options=*/{}, cq,
+ true, tag);
}
#ifdef GRPC_CALLBACK_API_NONEXPERIMENTAL
@@ -89,7 +93,7 @@ class TemplatedGenericStub final {
void UnaryCall(ClientContext* context, const std::string& method,
const RequestType* request, ResponseType* response,
std::function on_completion) {
- UnaryCallInternal(context, method, request, response,
+ UnaryCallInternal(context, method, /*options=*/{}, request, response,
std::move(on_completion));
}
@@ -100,7 +104,8 @@ class TemplatedGenericStub final {
void PrepareUnaryCall(ClientContext* context, const std::string& method,
const RequestType* request, ResponseType* response,
ClientUnaryReactor* reactor) {
- PrepareUnaryCallInternal(context, method, request, response, reactor);
+ PrepareUnaryCallInternal(context, method, /*options=*/{}, request, response,
+ reactor);
}
/// Setup a call to a named method \a method using \a context and tied to
@@ -109,7 +114,7 @@ class TemplatedGenericStub final {
void PrepareBidiStreamingCall(
ClientContext* context, const std::string& method,
ClientBidiReactor* reactor) {
- PrepareBidiStreamingCallInternal(context, method, reactor);
+ PrepareBidiStreamingCallInternal(context, method, /*options=*/{}, reactor);
}
#endif
@@ -123,9 +128,10 @@ class TemplatedGenericStub final {
/// Setup and start a unary call to a named method \a method using
/// \a context and specifying the \a request and \a response buffers.
void UnaryCall(ClientContext* context, const std::string& method,
- const RequestType* request, ResponseType* response,
+ StubOptions options, const RequestType* request,
+ ResponseType* response,
std::function on_completion) {
- stub_->UnaryCallInternal(context, method, request, response,
+ stub_->UnaryCallInternal(context, method, options, request, response,
std::move(on_completion));
}
@@ -134,19 +140,20 @@ class TemplatedGenericStub final {
/// Like any other reactor-based RPC, it will not be activated until
/// StartCall is invoked on its reactor.
void PrepareUnaryCall(ClientContext* context, const std::string& method,
- const RequestType* request, ResponseType* response,
- ClientUnaryReactor* reactor) {
- stub_->PrepareUnaryCallInternal(context, method, request, response,
- reactor);
+ StubOptions options, const RequestType* request,
+ ResponseType* response, ClientUnaryReactor* reactor) {
+ stub_->PrepareUnaryCallInternal(context, method, options, request,
+ response, reactor);
}
/// Setup a call to a named method \a method using \a context and tied to
/// \a reactor . Like any other bidi streaming RPC, it will not be activated
/// until StartCall is invoked on its reactor.
void PrepareBidiStreamingCall(
- ClientContext* context, const std::string& method,
+ ClientContext* context, const std::string& method, StubOptions options,
ClientBidiReactor* reactor) {
- stub_->PrepareBidiStreamingCallInternal(context, method, reactor);
+ stub_->PrepareBidiStreamingCallInternal(context, method, options,
+ reactor);
}
private:
@@ -162,48 +169,50 @@ class TemplatedGenericStub final {
std::shared_ptr channel_;
void UnaryCallInternal(ClientContext* context, const std::string& method,
- const RequestType* request, ResponseType* response,
+ StubOptions options, const RequestType* request,
+ ResponseType* response,
std::function on_completion) {
internal::CallbackUnaryCall(
channel_.get(),
- grpc::internal::RpcMethod(method.c_str(),
+ grpc::internal::RpcMethod(method.c_str(), options.suffix_for_stats(),
grpc::internal::RpcMethod::NORMAL_RPC),
context, request, response, std::move(on_completion));
}
void PrepareUnaryCallInternal(ClientContext* context,
- const std::string& method,
+ const std::string& method, StubOptions options,
const RequestType* request,
ResponseType* response,
ClientUnaryReactor* reactor) {
internal::ClientCallbackUnaryFactory::Create(
channel_.get(),
- grpc::internal::RpcMethod(method.c_str(),
+ grpc::internal::RpcMethod(method.c_str(), options.suffix_for_stats(),
grpc::internal::RpcMethod::NORMAL_RPC),
context, request, response, reactor);
}
void PrepareBidiStreamingCallInternal(
- ClientContext* context, const std::string& method,
+ ClientContext* context, const std::string& method, StubOptions options,
ClientBidiReactor* reactor) {
internal::ClientCallbackReaderWriterFactory::
Create(channel_.get(),
grpc::internal::RpcMethod(
- method.c_str(), grpc::internal::RpcMethod::BIDI_STREAMING),
+ method.c_str(), options.suffix_for_stats(),
+ grpc::internal::RpcMethod::BIDI_STREAMING),
context, reactor);
}
std::unique_ptr>
CallInternal(grpc::ChannelInterface* channel, ClientContext* context,
- const std::string& method, ::grpc::CompletionQueue* cq,
- bool start, void* tag) {
+ const std::string& method, StubOptions options,
+ ::grpc::CompletionQueue* cq, bool start, void* tag) {
return std::unique_ptr>(
internal::ClientAsyncReaderWriterFactory::
- Create(
- channel, cq,
- grpc::internal::RpcMethod(
- method.c_str(), grpc::internal::RpcMethod::BIDI_STREAMING),
- context, start, tag));
+ Create(channel, cq,
+ grpc::internal::RpcMethod(
+ method.c_str(), options.suffix_for_stats(),
+ grpc::internal::RpcMethod::BIDI_STREAMING),
+ context, start, tag));
}
};
diff --git a/include/grpcpp/impl/codegen/call_op_set.h b/include/grpcpp/impl/codegen/call_op_set.h
index 370d51967d0..7fde1edbb92 100644
--- a/include/grpcpp/impl/codegen/call_op_set.h
+++ b/include/grpcpp/impl/codegen/call_op_set.h
@@ -878,6 +878,9 @@ class CallOpSet : public CallOpSetInterface,
interceptor_methods_(InterceptorBatchMethodsImpl()) {}
CallOpSet& operator=(const CallOpSet& other) {
+ if (&other == this) {
+ return *this;
+ }
core_cq_tag_ = this;
return_tag_ = this;
call_ = other.call_;
diff --git a/include/grpcpp/impl/codegen/client_callback.h b/include/grpcpp/impl/codegen/client_callback.h
index f6bd6108af4..ba802909e04 100644
--- a/include/grpcpp/impl/codegen/client_callback.h
+++ b/include/grpcpp/impl/codegen/client_callback.h
@@ -27,6 +27,7 @@
#include
#include
#include
+#include
namespace grpc {
class Channel;
@@ -472,7 +473,7 @@ class ClientCallbackReaderWriterImpl
// there are no tests catching the compiler warning.
static void operator delete(void*, void*) { GPR_CODEGEN_ASSERT(false); }
- void StartCall() override {
+ void StartCall() ABSL_LOCKS_EXCLUDED(start_mu_) override {
// This call initiates two batches, plus any backlog, each with a callback
// 1. Send initial metadata (unless corked) + recv initial metadata
// 2. Any read backlog
@@ -521,7 +522,8 @@ class ClientCallbackReaderWriterImpl
call_.PerformOps(&read_ops_);
}
- void Write(const Request* msg, ::grpc::WriteOptions options) override {
+ void Write(const Request* msg, ::grpc::WriteOptions options)
+ ABSL_LOCKS_EXCLUDED(start_mu_) override {
if (options.is_last_message()) {
options.set_buffer_hint();
write_ops_.ClientSendClose();
@@ -544,7 +546,7 @@ class ClientCallbackReaderWriterImpl
}
call_.PerformOps(&write_ops_);
}
- void WritesDone() override {
+ void WritesDone() ABSL_LOCKS_EXCLUDED(start_mu_) override {
writes_done_ops_.ClientSendClose();
writes_done_tag_.Set(
call_.call(),
@@ -685,7 +687,7 @@ class ClientCallbackReaderWriterImpl
bool writes_done_ops = false;
bool read_ops = false;
};
- StartCallBacklog backlog_ /* GUARDED_BY(start_mu_) */;
+ StartCallBacklog backlog_ ABSL_GUARDED_BY(start_mu_);
// Minimum of 3 callbacks to pre-register for start ops, StartCall, and finish
std::atomic callbacks_outstanding_{3};
@@ -843,7 +845,7 @@ class ClientCallbackReaderImpl : public ClientCallbackReader {
struct StartCallBacklog {
bool read_ops = false;
};
- StartCallBacklog backlog_ /* GUARDED_BY(start_mu_) */;
+ StartCallBacklog backlog_ ABSL_GUARDED_BY(start_mu_);
// Minimum of 2 callbacks to pre-register for start and finish
std::atomic callbacks_outstanding_{2};
@@ -884,7 +886,7 @@ class ClientCallbackWriterImpl : public ClientCallbackWriter {
// there are no tests catching the compiler warning.
static void operator delete(void*, void*) { GPR_CODEGEN_ASSERT(false); }
- void StartCall() override {
+ void StartCall() ABSL_LOCKS_EXCLUDED(start_mu_) override {
// This call initiates two batches, plus any backlog, each with a callback
// 1. Send initial metadata (unless corked) + recv initial metadata
// 2. Any backlog
@@ -916,7 +918,8 @@ class ClientCallbackWriterImpl : public ClientCallbackWriter {
this->MaybeFinish(/*from_reaction=*/false);
}
- void Write(const Request* msg, ::grpc::WriteOptions options) override {
+ void Write(const Request* msg, ::grpc::WriteOptions options)
+ ABSL_LOCKS_EXCLUDED(start_mu_) override {
if (GPR_UNLIKELY(options.is_last_message())) {
options.set_buffer_hint();
write_ops_.ClientSendClose();
@@ -941,7 +944,7 @@ class ClientCallbackWriterImpl : public ClientCallbackWriter {
call_.PerformOps(&write_ops_);
}
- void WritesDone() override {
+ void WritesDone() ABSL_LOCKS_EXCLUDED(start_mu_) override {
writes_done_ops_.ClientSendClose();
writes_done_tag_.Set(
call_.call(),
@@ -1070,7 +1073,7 @@ class ClientCallbackWriterImpl : public ClientCallbackWriter {
bool write_ops = false;
bool writes_done_ops = false;
};
- StartCallBacklog backlog_ /* GUARDED_BY(start_mu_) */;
+ StartCallBacklog backlog_ ABSL_GUARDED_BY(start_mu_);
// Minimum of 3 callbacks to pre-register for start ops, StartCall, and finish
std::atomic callbacks_outstanding_{3};
diff --git a/include/grpcpp/impl/codegen/client_context.h b/include/grpcpp/impl/codegen/client_context.h
index 708b7a47493..763a836e424 100644
--- a/include/grpcpp/impl/codegen/client_context.h
+++ b/include/grpcpp/impl/codegen/client_context.h
@@ -466,12 +466,13 @@ class ClientContext {
const std::shared_ptr<::grpc::Channel>& channel);
grpc::experimental::ClientRpcInfo* set_client_rpc_info(
- const char* method, grpc::internal::RpcMethod::RpcType type,
- grpc::ChannelInterface* channel,
+ const char* method, const char* suffix_for_stats,
+ grpc::internal::RpcMethod::RpcType type, grpc::ChannelInterface* channel,
const std::vector>& creators,
size_t interceptor_pos) {
- rpc_info_ = grpc::experimental::ClientRpcInfo(this, type, method, channel);
+ rpc_info_ = grpc::experimental::ClientRpcInfo(this, type, method,
+ suffix_for_stats, channel);
rpc_info_.RegisterInterceptors(creators, interceptor_pos);
return &rpc_info_;
}
diff --git a/include/grpcpp/impl/codegen/client_interceptor.h b/include/grpcpp/impl/codegen/client_interceptor.h
index 78be1f7597e..ec78074ab2a 100644
--- a/include/grpcpp/impl/codegen/client_interceptor.h
+++ b/include/grpcpp/impl/codegen/client_interceptor.h
@@ -87,6 +87,10 @@ class ClientRpcInfo {
/// Return the fully-specified method name
const char* method() const { return method_; }
+ /// Return an identifying suffix for the client stub, or nullptr if one wasn't
+ /// specified.
+ const char* suffix_for_stats() const { return suffix_for_stats_; }
+
/// Return a pointer to the channel on which the RPC is being sent
ChannelInterface* channel() { return channel_; }
@@ -116,10 +120,12 @@ class ClientRpcInfo {
// Constructor will only be called from ClientContext
ClientRpcInfo(grpc::ClientContext* ctx, internal::RpcMethod::RpcType type,
- const char* method, grpc::ChannelInterface* channel)
+ const char* method, const char* suffix_for_stats,
+ grpc::ChannelInterface* channel)
: ctx_(ctx),
type_(static_cast(type)),
method_(method),
+ suffix_for_stats_(suffix_for_stats),
channel_(channel) {}
// Move assignment should only be used by ClientContext
@@ -162,6 +168,7 @@ class ClientRpcInfo {
// TODO(yashykt): make type_ const once move-assignment is deleted
Type type_{Type::UNKNOWN};
const char* method_ = nullptr;
+ const char* suffix_for_stats_ = nullptr;
grpc::ChannelInterface* channel_ = nullptr;
std::vector> interceptors_;
bool hijacked_ = false;
diff --git a/include/grpcpp/impl/codegen/interceptor_common.h b/include/grpcpp/impl/codegen/interceptor_common.h
index 520d981459f..b9a6eded093 100644
--- a/include/grpcpp/impl/codegen/interceptor_common.h
+++ b/include/grpcpp/impl/codegen/interceptor_common.h
@@ -223,18 +223,11 @@ class InterceptorBatchMethodsImpl
bool InterceptorsListEmpty() {
auto* client_rpc_info = call_->client_rpc_info();
if (client_rpc_info != nullptr) {
- if (client_rpc_info->interceptors_.empty()) {
- return true;
- } else {
- return false;
- }
+ return client_rpc_info->interceptors_.empty();
}
auto* server_rpc_info = call_->server_rpc_info();
- if (server_rpc_info == nullptr || server_rpc_info->interceptors_.empty()) {
- return true;
- }
- return false;
+ return server_rpc_info == nullptr || server_rpc_info->interceptors_.empty();
}
// This should be used only by subclasses of CallOpSetInterface. SetCall and
@@ -419,11 +412,7 @@ class CancelInterceptorBatchMethods
public:
bool QueryInterceptionHookPoint(
experimental::InterceptionHookPoints type) override {
- if (type == experimental::InterceptionHookPoints::PRE_SEND_CANCEL) {
- return true;
- } else {
- return false;
- }
+ return type == experimental::InterceptionHookPoints::PRE_SEND_CANCEL;
}
void Proceed() override {
diff --git a/include/grpcpp/impl/codegen/method_handler.h b/include/grpcpp/impl/codegen/method_handler.h
index 756f4aae751..fb093f54b82 100644
--- a/include/grpcpp/impl/codegen/method_handler.h
+++ b/include/grpcpp/impl/codegen/method_handler.h
@@ -357,9 +357,12 @@ class SplitServerStreamingHandler
template <::grpc::StatusCode code>
class ErrorMethodHandler : public ::grpc::internal::MethodHandler {
public:
+ explicit ErrorMethodHandler(const std::string& message) : message_(message) {}
+
template
- static void FillOps(::grpc::ServerContextBase* context, T* ops) {
- ::grpc::Status status(code, "");
+ static void FillOps(::grpc::ServerContextBase* context,
+ const std::string& message, T* ops) {
+ ::grpc::Status status(code, message);
if (!context->sent_initial_metadata_) {
ops->SendInitialMetadata(&context->initial_metadata_,
context->initial_metadata_flags());
@@ -375,7 +378,7 @@ class ErrorMethodHandler : public ::grpc::internal::MethodHandler {
::grpc::internal::CallOpSet<::grpc::internal::CallOpSendInitialMetadata,
::grpc::internal::CallOpServerSendStatus>
ops;
- FillOps(param.server_context, &ops);
+ FillOps(param.server_context, message_, &ops);
param.call->PerformOps(&ops);
param.call->cq()->Pluck(&ops);
}
@@ -388,6 +391,9 @@ class ErrorMethodHandler : public ::grpc::internal::MethodHandler {
}
return nullptr;
}
+
+ private:
+ const std::string message_;
};
typedef ErrorMethodHandler<::grpc::StatusCode::UNIMPLEMENTED>
diff --git a/include/grpcpp/impl/codegen/rpc_method.h b/include/grpcpp/impl/codegen/rpc_method.h
index 394a29b8374..388784e6ff1 100644
--- a/include/grpcpp/impl/codegen/rpc_method.h
+++ b/include/grpcpp/impl/codegen/rpc_method.h
@@ -36,21 +36,40 @@ class RpcMethod {
};
RpcMethod(const char* name, RpcType type)
- : name_(name), method_type_(type), channel_tag_(nullptr) {}
+ : name_(name),
+ suffix_for_stats_(nullptr),
+ method_type_(type),
+ channel_tag_(nullptr) {}
+
+ RpcMethod(const char* name, const char* suffix_for_stats, RpcType type)
+ : name_(name),
+ suffix_for_stats_(suffix_for_stats),
+ method_type_(type),
+ channel_tag_(nullptr) {}
RpcMethod(const char* name, RpcType type,
const std::shared_ptr& channel)
: name_(name),
+ suffix_for_stats_(nullptr),
+ method_type_(type),
+ channel_tag_(channel->RegisterMethod(name)) {}
+
+ RpcMethod(const char* name, const char* suffix_for_stats, RpcType type,
+ const std::shared_ptr& channel)
+ : name_(name),
+ suffix_for_stats_(suffix_for_stats),
method_type_(type),
channel_tag_(channel->RegisterMethod(name)) {}
const char* name() const { return name_; }
+ const char* suffix_for_stats() const { return suffix_for_stats_; }
RpcType method_type() const { return method_type_; }
void SetMethodType(RpcType type) { method_type_ = type; }
void* channel_tag() const { return channel_tag_; }
private:
const char* const name_;
+ const char* const suffix_for_stats_;
RpcType method_type_;
void* const channel_tag_;
};
diff --git a/include/grpcpp/impl/codegen/security/auth_context.h b/include/grpcpp/impl/codegen/security/auth_context.h
index 4e261cad3fc..cea6dbea36f 100644
--- a/include/grpcpp/impl/codegen/security/auth_context.h
+++ b/include/grpcpp/impl/codegen/security/auth_context.h
@@ -42,7 +42,7 @@ class AuthPropertyIterator
AuthPropertyIterator operator++(int);
bool operator==(const AuthPropertyIterator& rhs) const;
bool operator!=(const AuthPropertyIterator& rhs) const;
- const AuthProperty operator*();
+ AuthProperty operator*();
protected:
AuthPropertyIterator();
diff --git a/include/grpcpp/impl/codegen/server_callback.h b/include/grpcpp/impl/codegen/server_callback.h
index 532dfdd06d0..3ccabdbbfec 100644
--- a/include/grpcpp/impl/codegen/server_callback.h
+++ b/include/grpcpp/impl/codegen/server_callback.h
@@ -29,6 +29,7 @@
#include
#include
#include
+#include
namespace grpc {
@@ -278,7 +279,7 @@ class ServerBidiReactor : public internal::ServerReactor {
/// Send any initial metadata stored in the RPC context. If not invoked,
/// any initial metadata will be passed along with the first Write or the
/// Finish (if there are no writes).
- void StartSendInitialMetadata() {
+ void StartSendInitialMetadata() ABSL_LOCKS_EXCLUDED(stream_mu_) {
ServerCallbackReaderWriter* stream =
stream_.load(std::memory_order_acquire);
if (stream == nullptr) {
@@ -296,7 +297,7 @@ class ServerBidiReactor : public internal::ServerReactor {
///
/// \param[out] req Where to eventually store the read message. Valid when
/// the library calls OnReadDone
- void StartRead(Request* req) {
+ void StartRead(Request* req) ABSL_LOCKS_EXCLUDED(stream_mu_) {
ServerCallbackReaderWriter* stream =
stream_.load(std::memory_order_acquire);
if (stream == nullptr) {
@@ -325,7 +326,8 @@ class ServerBidiReactor : public internal::ServerReactor {
/// ownership but the caller must ensure that the message is
/// not deleted or modified until OnWriteDone is called.
/// \param[in] options The WriteOptions to use for writing this message
- void StartWrite(const Response* resp, ::grpc::WriteOptions options) {
+ void StartWrite(const Response* resp, ::grpc::WriteOptions options)
+ ABSL_LOCKS_EXCLUDED(stream_mu_) {
ServerCallbackReaderWriter* stream =
stream_.load(std::memory_order_acquire);
if (stream == nullptr) {
@@ -354,7 +356,7 @@ class ServerBidiReactor : public internal::ServerReactor {
/// \param[in] options The WriteOptions to use for writing this message
/// \param[in] s The status outcome of this RPC
void StartWriteAndFinish(const Response* resp, ::grpc::WriteOptions options,
- ::grpc::Status s) {
+ ::grpc::Status s) ABSL_LOCKS_EXCLUDED(stream_mu_) {
ServerCallbackReaderWriter* stream =
stream_.load(std::memory_order_acquire);
if (stream == nullptr) {
@@ -389,7 +391,7 @@ class ServerBidiReactor : public internal::ServerReactor {
/// cancelled.
///
/// \param[in] s The status outcome of this RPC
- void Finish(::grpc::Status s) {
+ void Finish(::grpc::Status s) ABSL_LOCKS_EXCLUDED(stream_mu_) {
ServerCallbackReaderWriter* stream =
stream_.load(std::memory_order_acquire);
if (stream == nullptr) {
@@ -481,7 +483,7 @@ class ServerBidiReactor : public internal::ServerReactor {
::grpc::WriteOptions write_options_wanted;
::grpc::Status status_wanted;
};
- PreBindBacklog backlog_ /* GUARDED_BY(stream_mu_) */;
+ PreBindBacklog backlog_ ABSL_GUARDED_BY(stream_mu_);
};
/// \a ServerReadReactor is the interface for a client-streaming RPC.
@@ -492,7 +494,7 @@ class ServerReadReactor : public internal::ServerReactor {
~ServerReadReactor() override = default;
/// The following operation initiations are exactly like ServerBidiReactor.
- void StartSendInitialMetadata() {
+ void StartSendInitialMetadata() ABSL_LOCKS_EXCLUDED(reader_mu_) {
ServerCallbackReader* reader =
reader_.load(std::memory_order_acquire);
if (reader == nullptr) {
@@ -505,7 +507,7 @@ class ServerReadReactor : public internal::ServerReactor {
}
reader->SendInitialMetadata();
}
- void StartRead(Request* req) {
+ void StartRead(Request* req) ABSL_LOCKS_EXCLUDED(reader_mu_) {
ServerCallbackReader* reader =
reader_.load(std::memory_order_acquire);
if (reader == nullptr) {
@@ -518,7 +520,7 @@ class ServerReadReactor : public internal::ServerReactor {
}
reader->Read(req);
}
- void Finish(::grpc::Status s) {
+ void Finish(::grpc::Status s) ABSL_LOCKS_EXCLUDED(reader_mu_) {
ServerCallbackReader* reader =
reader_.load(std::memory_order_acquire);
if (reader == nullptr) {
@@ -544,7 +546,8 @@ class ServerReadReactor : public internal::ServerReactor {
// May be overridden by internal implementation details. This is not a public
// customization point.
- virtual void InternalBindReader(ServerCallbackReader* reader) {
+ virtual void InternalBindReader(ServerCallbackReader* reader)
+ ABSL_LOCKS_EXCLUDED(reader_mu_) {
grpc::internal::MutexLock l(&reader_mu_);
if (GPR_UNLIKELY(backlog_.send_initial_metadata_wanted)) {
@@ -568,7 +571,7 @@ class ServerReadReactor : public internal::ServerReactor {
Request* read_wanted = nullptr;
::grpc::Status status_wanted;
};
- PreBindBacklog backlog_ /* GUARDED_BY(reader_mu_) */;
+ PreBindBacklog backlog_ ABSL_GUARDED_BY(reader_mu_);
};
/// \a ServerWriteReactor is the interface for a server-streaming RPC.
@@ -579,7 +582,7 @@ class ServerWriteReactor : public internal::ServerReactor {
~ServerWriteReactor() override = default;
/// The following operation initiations are exactly like ServerBidiReactor.
- void StartSendInitialMetadata() {
+ void StartSendInitialMetadata() ABSL_LOCKS_EXCLUDED(writer_mu_) {
ServerCallbackWriter* writer =
writer_.load(std::memory_order_acquire);
if (writer == nullptr) {
@@ -595,7 +598,8 @@ class ServerWriteReactor : public internal::ServerReactor {
void StartWrite(const Response* resp) {
StartWrite(resp, ::grpc::WriteOptions());
}
- void StartWrite(const Response* resp, ::grpc::WriteOptions options) {
+ void StartWrite(const Response* resp, ::grpc::WriteOptions options)
+ ABSL_LOCKS_EXCLUDED(writer_mu_) {
ServerCallbackWriter* writer =
writer_.load(std::memory_order_acquire);
if (writer == nullptr) {
@@ -610,7 +614,7 @@ class ServerWriteReactor : public internal::ServerReactor {
writer->Write(resp, options);
}
void StartWriteAndFinish(const Response* resp, ::grpc::WriteOptions options,
- ::grpc::Status s) {
+ ::grpc::Status s) ABSL_LOCKS_EXCLUDED(writer_mu_) {
ServerCallbackWriter* writer =
writer_.load(std::memory_order_acquire);
if (writer == nullptr) {
@@ -629,7 +633,7 @@ class ServerWriteReactor : public internal::ServerReactor {
void StartWriteLast(const Response* resp, ::grpc::WriteOptions options) {
StartWrite(resp, options.set_last_message());
}
- void Finish(::grpc::Status s) {
+ void Finish(::grpc::Status s) ABSL_LOCKS_EXCLUDED(writer_mu_) {
ServerCallbackWriter* writer =
writer_.load(std::memory_order_acquire);
if (writer == nullptr) {
@@ -654,7 +658,8 @@ class ServerWriteReactor : public internal::ServerReactor {
friend class ServerCallbackWriter;
// May be overridden by internal implementation details. This is not a public
// customization point.
- virtual void InternalBindWriter(ServerCallbackWriter* writer) {
+ virtual void InternalBindWriter(ServerCallbackWriter* writer)
+ ABSL_LOCKS_EXCLUDED(writer_mu_) {
grpc::internal::MutexLock l(&writer_mu_);
if (GPR_UNLIKELY(backlog_.send_initial_metadata_wanted)) {
@@ -687,7 +692,7 @@ class ServerWriteReactor : public internal::ServerReactor {
::grpc::WriteOptions write_options_wanted;
::grpc::Status status_wanted;
};
- PreBindBacklog backlog_ /* GUARDED_BY(writer_mu_) */;
+ PreBindBacklog backlog_ ABSL_GUARDED_BY(writer_mu_);
};
class ServerUnaryReactor : public internal::ServerReactor {
@@ -696,7 +701,7 @@ class ServerUnaryReactor : public internal::ServerReactor {
~ServerUnaryReactor() override = default;
/// StartSendInitialMetadata is exactly like ServerBidiReactor.
- void StartSendInitialMetadata() {
+ void StartSendInitialMetadata() ABSL_LOCKS_EXCLUDED(call_mu_) {
ServerCallbackUnary* call = call_.load(std::memory_order_acquire);
if (call == nullptr) {
grpc::internal::MutexLock l(&call_mu_);
@@ -711,7 +716,7 @@ class ServerUnaryReactor : public internal::ServerReactor {
/// Finish is similar to ServerBidiReactor except for one detail.
/// If the status is non-OK, any message will not be sent. Instead,
/// the client will only receive the status and any trailing metadata.
- void Finish(::grpc::Status s) {
+ void Finish(::grpc::Status s) ABSL_LOCKS_EXCLUDED(call_mu_) {
ServerCallbackUnary* call = call_.load(std::memory_order_acquire);
if (call == nullptr) {
grpc::internal::MutexLock l(&call_mu_);
@@ -734,7 +739,8 @@ class ServerUnaryReactor : public internal::ServerReactor {
friend class ServerCallbackUnary;
// May be overridden by internal implementation details. This is not a public
// customization point.
- virtual void InternalBindCall(ServerCallbackUnary* call) {
+ virtual void InternalBindCall(ServerCallbackUnary* call)
+ ABSL_LOCKS_EXCLUDED(call_mu_) {
grpc::internal::MutexLock l(&call_mu_);
if (GPR_UNLIKELY(backlog_.send_initial_metadata_wanted)) {
@@ -754,7 +760,7 @@ class ServerUnaryReactor : public internal::ServerReactor {
bool finish_wanted = false;
::grpc::Status status_wanted;
};
- PreBindBacklog backlog_ /* GUARDED_BY(call_mu_) */;
+ PreBindBacklog backlog_ ABSL_GUARDED_BY(call_mu_);
};
namespace internal {
diff --git a/include/grpcpp/impl/codegen/string_ref.h b/include/grpcpp/impl/codegen/string_ref.h
index 153f37102d8..4543e426042 100644
--- a/include/grpcpp/impl/codegen/string_ref.h
+++ b/include/grpcpp/impl/codegen/string_ref.h
@@ -51,6 +51,7 @@ class string_ref {
string_ref() : data_(nullptr), length_(0) {}
string_ref(const string_ref& other)
: data_(other.data_), length_(other.length_) {}
+ // NOLINTNEXTLINE(bugprone-unhandled-self-assignment)
string_ref& operator=(const string_ref& rhs) {
data_ = rhs.data_;
length_ = rhs.length_;
diff --git a/include/grpcpp/impl/codegen/stub_options.h b/include/grpcpp/impl/codegen/stub_options.h
index a56695a8f82..30509c250a7 100644
--- a/include/grpcpp/impl/codegen/stub_options.h
+++ b/include/grpcpp/impl/codegen/stub_options.h
@@ -22,7 +22,20 @@
namespace grpc {
/// Useful interface for generated stubs
-class StubOptions {};
+class StubOptions {
+ public:
+ StubOptions() = default;
+ explicit StubOptions(const char* suffix_for_stats)
+ : suffix_for_stats_(suffix_for_stats) {}
+
+ void set_suffix_for_stats(const char* suffix_for_stats) {
+ suffix_for_stats_ = suffix_for_stats;
+ }
+ const char* suffix_for_stats() const { return suffix_for_stats_; }
+
+ private:
+ const char* suffix_for_stats_ = nullptr;
+};
} // namespace grpc
diff --git a/include/grpcpp/server.h b/include/grpcpp/server.h
index d90f28dc1ce..a69e64b462f 100644
--- a/include/grpcpp/server.h
+++ b/include/grpcpp/server.h
@@ -58,13 +58,13 @@ class ExternalConnectionAcceptorImpl;
/// \a Server instances.
class Server : public ServerInterface, private GrpcLibraryCodegen {
public:
- ~Server() override;
+ ~Server() ABSL_LOCKS_EXCLUDED(mu_) override;
/// Block until the server shuts down.
///
/// \warning The server must be either shutting down or some other thread must
/// call \a Shutdown for this function to ever return.
- void Wait() override;
+ void Wait() ABSL_LOCKS_EXCLUDED(mu_) override;
/// Global callbacks are a set of hooks that are called when server
/// events occur. \a SetGlobalCallbacks method is used to register
@@ -286,13 +286,14 @@ class Server : public ServerInterface, private GrpcLibraryCodegen {
void PerformOpsOnCall(internal::CallOpSetInterface* ops,
internal::Call* call) override;
- void ShutdownInternal(gpr_timespec deadline) override;
+ void ShutdownInternal(gpr_timespec deadline)
+ ABSL_LOCKS_EXCLUDED(mu_) override;
int max_receive_message_size() const override {
return max_receive_message_size_;
}
- CompletionQueue* CallbackCQ() override;
+ CompletionQueue* CallbackCQ() ABSL_LOCKS_EXCLUDED(mu_) override;
ServerInitializer* initializer();
@@ -300,8 +301,8 @@ class Server : public ServerInterface, private GrpcLibraryCodegen {
// the ref count are the running state of the server (take a ref at start and
// drop it at shutdown) and each running callback RPC.
void Ref();
- void UnrefWithPossibleNotify() /* LOCKS_EXCLUDED(mu_) */;
- void UnrefAndWaitLocked() /* EXCLUSIVE_LOCKS_REQUIRED(mu_) */;
+ void UnrefWithPossibleNotify() ABSL_LOCKS_EXCLUDED(mu_);
+ void UnrefAndWaitLocked() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_);
std::vector>
acceptors_;
@@ -335,10 +336,11 @@ class Server : public ServerInterface, private GrpcLibraryCodegen {
// Server status
internal::Mutex mu_;
bool started_;
- bool shutdown_;
- bool shutdown_notified_; // Was notify called on the shutdown_cv_
+ bool shutdown_ ABSL_GUARDED_BY(mu_);
+ bool shutdown_notified_
+ ABSL_GUARDED_BY(mu_); // Was notify called on the shutdown_cv_
internal::CondVar shutdown_done_cv_;
- bool shutdown_done_ = false;
+ bool shutdown_done_ ABSL_GUARDED_BY(mu_) = false;
std::atomic_int shutdown_refs_outstanding_{1};
internal::CondVar shutdown_cv_;
@@ -378,7 +380,7 @@ class Server : public ServerInterface, private GrpcLibraryCodegen {
// with this server (if any). It is set on the first call to CallbackCQ().
// It is _not owned_ by the server; ownership belongs with its internal
// shutdown callback tag (invoked when the CQ is fully shutdown).
- CompletionQueue* callback_cq_ /* GUARDED_BY(mu_) */ = nullptr;
+ std::atomic callback_cq_{nullptr};
// List of CQs passed in by user that must be Shutdown only after Server is
// Shutdown. Even though this is only used with NDEBUG, instantiate it in all
diff --git a/include/grpcpp/server_builder.h b/include/grpcpp/server_builder.h
index 28e8cfde789..00e82a10f87 100644
--- a/include/grpcpp/server_builder.h
+++ b/include/grpcpp/server_builder.h
@@ -357,6 +357,9 @@ class ServerBuilder {
server_config_fetcher_ = server_config_fetcher;
}
+ /// Experimental API, subject to change.
+ virtual ChannelArguments BuildChannelArgs();
+
private:
friend class ::grpc::testing::ServerBuilderPluginTest;
diff --git a/include/grpcpp/test/mock_stream.h b/include/grpcpp/test/mock_stream.h
index e33595d7096..deffad3d909 100644
--- a/include/grpcpp/test/mock_stream.h
+++ b/include/grpcpp/test/mock_stream.h
@@ -90,6 +90,8 @@ class MockClientAsyncResponseReader
public:
MockClientAsyncResponseReader() = default;
+ /// ClientAsyncResponseReaderInterface
+ MOCK_METHOD0_T(StartCall, void());
MOCK_METHOD1_T(ReadInitialMetadata, void(void*));
MOCK_METHOD3_T(Finish, void(R*, Status*, void*));
};
@@ -100,6 +102,7 @@ class MockClientAsyncReader : public ClientAsyncReaderInterface {
MockClientAsyncReader() = default;
/// ClientAsyncStreamingInterface
+ MOCK_METHOD1_T(StartCall, void(void*));
MOCK_METHOD1_T(ReadInitialMetadata, void(void*));
MOCK_METHOD2_T(Finish, void(Status*, void*));
@@ -113,11 +116,13 @@ class MockClientAsyncWriter : public ::grpc::ClientAsyncWriterInterface {
MockClientAsyncWriter() = default;
/// ClientAsyncStreamingInterface
+ MOCK_METHOD1_T(StartCall, void(void*));
MOCK_METHOD1_T(ReadInitialMetadata, void(void*));
MOCK_METHOD2_T(Finish, void(Status*, void*));
/// AsyncWriterInterface
MOCK_METHOD2_T(Write, void(const W&, void*));
+ MOCK_METHOD3_T(Write, void(const W&, ::grpc::WriteOptions, void*));
/// ClientAsyncWriterInterface
MOCK_METHOD1_T(WritesDone, void(void*));
@@ -130,11 +135,13 @@ class MockClientAsyncReaderWriter
MockClientAsyncReaderWriter() = default;
/// ClientAsyncStreamingInterface
+ MOCK_METHOD1_T(StartCall, void(void*));
MOCK_METHOD1_T(ReadInitialMetadata, void(void*));
MOCK_METHOD2_T(Finish, void(Status*, void*));
/// AsyncWriterInterface
MOCK_METHOD2_T(Write, void(const W&, void*));
+ MOCK_METHOD3_T(Write, void(const W&, ::grpc::WriteOptions, void*));
/// AsyncReaderInterface
MOCK_METHOD2_T(Read, void(R*, void*));
diff --git a/include/grpcpp/xds_server_builder.h b/include/grpcpp/xds_server_builder.h
index 1ed9e83ac3f..076c377f781 100644
--- a/include/grpcpp/xds_server_builder.h
+++ b/include/grpcpp/xds_server_builder.h
@@ -26,15 +26,52 @@
namespace grpc {
namespace experimental {
+class XdsServerServingStatusNotifierInterface {
+ public:
+ virtual ~XdsServerServingStatusNotifierInterface() = default;
+
+ // \a uri contains the listening target associated with the notification. Note
+ // that a single target provided to XdsServerBuilder can get resolved to
+ // multiple listening addresses.
+ // The callback is invoked each time there is an update to the serving status.
+ // The API does not provide any guarantees around duplicate updates.
+ // Status::OK signifies that the server is serving, while a non-OK status
+ // signifies that the server is not serving.
+ virtual void OnServingStatusUpdate(std::string uri, grpc::Status status) = 0;
+};
+
class XdsServerBuilder : public ::grpc::ServerBuilder {
public:
- std::unique_ptr BuildAndStart() override {
- grpc_server_config_fetcher* fetcher =
- grpc_server_config_fetcher_xds_create();
- if (fetcher == nullptr) return nullptr;
- set_fetcher(fetcher);
- return ServerBuilder::BuildAndStart();
+ // It is the responsibility of the application to make sure that \a notifier
+ // outlasts the life of the server. Notifications will start being made
+ // asynchronously once `BuildAndStart()` has been called. Note that it is
+ // possible for notifications to be made before `BuildAndStart()` returns.
+ void set_status_notifier(XdsServerServingStatusNotifierInterface* notifier) {
+ notifier_ = notifier;
}
+
+ private:
+ // Called at the beginning of BuildAndStart().
+ ChannelArguments BuildChannelArgs() override {
+ ChannelArguments args = ServerBuilder::BuildChannelArgs();
+ grpc_channel_args c_channel_args = args.c_channel_args();
+ grpc_server_config_fetcher* fetcher = grpc_server_config_fetcher_xds_create(
+ {OnServingStatusUpdate, notifier_}, &c_channel_args);
+ if (fetcher != nullptr) set_fetcher(fetcher);
+ return args;
+ }
+
+ static void OnServingStatusUpdate(void* user_data, const char* uri,
+ grpc_status_code code,
+ const char* error_message) {
+ if (user_data == nullptr) return;
+ XdsServerServingStatusNotifierInterface* notifier =
+ static_cast(user_data);
+ notifier->OnServingStatusUpdate(
+ uri, grpc::Status(static_cast(code), error_message));
+ }
+
+ XdsServerServingStatusNotifierInterface* notifier_ = nullptr;
};
} // namespace experimental
diff --git a/package.xml b/package.xml
index 56873582e2f..c8c6f911a79 100644
--- a/package.xml
+++ b/package.xml
@@ -13,8 +13,8 @@
2019-09-24
- 1.37.0dev
- 1.37.0dev
+ 1.38.0dev
+ 1.38.0devbeta
@@ -22,7 +22,7 @@
Apache 2.0
-- gRPC Core 1.37.0 update
+- gRPC Core 1.38.0 update
@@ -33,6 +33,10 @@
+
+
+
+
@@ -130,6 +134,8 @@
+
+
@@ -173,6 +179,10 @@
+
+
+
+
@@ -191,6 +201,10 @@
+
+
+
+
@@ -271,12 +285,16 @@
+
+
+
+
@@ -325,6 +343,10 @@
+
+
+
+
@@ -337,6 +359,10 @@
+
+
+
+
@@ -365,8 +391,12 @@
+
+
+
+
@@ -375,6 +405,8 @@
+
+
@@ -451,12 +483,16 @@
+
+
+
+
@@ -505,6 +541,10 @@
+
+
+
+
@@ -515,6 +555,10 @@
+
+
+
+
@@ -543,8 +587,12 @@
+
+
+
+
@@ -553,6 +601,8 @@
+
+
@@ -631,9 +681,15 @@
+
+
+
+
+
+
@@ -680,6 +736,8 @@
+
+
@@ -753,6 +811,8 @@
+
+
@@ -840,10 +900,6 @@
-
-
-
-
@@ -873,8 +929,6 @@
-
-
@@ -944,21 +998,11 @@
+
+
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1215,7 +1259,6 @@
-
@@ -1264,7 +1307,6 @@
-
@@ -1315,12 +1357,17 @@
+
+
+
+
+
@@ -1342,7 +1389,12 @@
+
+
+
+
+
@@ -1366,6 +1418,7 @@
+
@@ -1391,10 +1444,10 @@
+
-
@@ -1631,9 +1684,9 @@
+
-
@@ -1657,6 +1710,7 @@
+
@@ -1743,7 +1797,6 @@
-
@@ -1840,6 +1893,7 @@
+
@@ -1888,6 +1942,7 @@
+
@@ -1982,10 +2037,6 @@
-
-
-
-
@@ -2000,6 +2051,7 @@
+
diff --git a/setup.py b/setup.py
index dfdfedacdab..c93d419f320 100644
--- a/setup.py
+++ b/setup.py
@@ -73,6 +73,7 @@ UPB_GRPC_GENERATED_INCLUDE = (os.path.join('src', 'core', 'ext',
'upb-generated'),)
UPBDEFS_GRPC_GENERATED_INCLUDE = (os.path.join('src', 'core', 'ext',
'upbdefs-generated'),)
+XXHASH_INCLUDE = (os.path.join('third_party', 'xxhash'),)
ZLIB_INCLUDE = (os.path.join('third_party', 'zlib'),)
README = os.path.join(PYTHON_STEM, 'README.rst')
@@ -106,37 +107,52 @@ CLASSIFIERS = [
'License :: OSI Approved :: Apache Software License',
]
-BUILD_WITH_BORING_SSL_ASM = os.environ.get('GRPC_BUILD_WITH_BORING_SSL_ASM',
- True)
+
+def _env_bool_value(env_name, default):
+ """Parses a bool option from an environment variable"""
+ return os.environ.get(env_name, default).upper() not in ['FALSE', '0', '']
+
+
+BUILD_WITH_BORING_SSL_ASM = _env_bool_value('GRPC_BUILD_WITH_BORING_SSL_ASM',
+ 'True')
+
+# Export this environment variable to override the platform variant that will
+# be chosen for boringssl assembly optimizations. This option is useful when
+# crosscompiling and the host platform as obtained by distutils.utils.get_platform()
+# doesn't match the platform we are targetting.
+# Example value: "linux-aarch64"
+BUILD_OVERRIDE_BORING_SSL_ASM_PLATFORM = os.environ.get(
+ 'GRPC_BUILD_OVERRIDE_BORING_SSL_ASM_PLATFORM', '')
# Environment variable to determine whether or not the Cython extension should
# *use* Cython or use the generated C files. Note that this requires the C files
# to have been generated by building first *with* Cython support. Even if this
# is set to false, if the script detects that the generated `.c` file isn't
# present, then it will still attempt to use Cython.
-BUILD_WITH_CYTHON = os.environ.get('GRPC_PYTHON_BUILD_WITH_CYTHON', False)
+BUILD_WITH_CYTHON = _env_bool_value('GRPC_PYTHON_BUILD_WITH_CYTHON', 'False')
# Export this variable to use the system installation of openssl. You need to
# have the header files installed (in /usr/include/openssl) and during
# runtime, the shared library must be installed
-BUILD_WITH_SYSTEM_OPENSSL = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_OPENSSL',
- False)
+BUILD_WITH_SYSTEM_OPENSSL = _env_bool_value('GRPC_PYTHON_BUILD_SYSTEM_OPENSSL',
+ 'False')
# Export this variable to use the system installation of zlib. You need to
# have the header files installed (in /usr/include/) and during
# runtime, the shared library must be installed
-BUILD_WITH_SYSTEM_ZLIB = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_ZLIB', False)
+BUILD_WITH_SYSTEM_ZLIB = _env_bool_value('GRPC_PYTHON_BUILD_SYSTEM_ZLIB',
+ 'False')
# Export this variable to use the system installation of cares. You need to
# have the header files installed (in /usr/include/) and during
# runtime, the shared library must be installed
-BUILD_WITH_SYSTEM_CARES = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_CARES',
- False)
+BUILD_WITH_SYSTEM_CARES = _env_bool_value('GRPC_PYTHON_BUILD_SYSTEM_CARES',
+ 'False')
# Export this variable to use the system installation of re2. You need to
# have the header files installed (in /usr/include/re2) and during
# runtime, the shared library must be installed
-BUILD_WITH_SYSTEM_RE2 = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_RE2', False)
+BUILD_WITH_SYSTEM_RE2 = _env_bool_value('GRPC_PYTHON_BUILD_SYSTEM_RE2', 'False')
# Export this variable to force building the python extension with a statically linked libstdc++.
# At least on linux, this is normally not needed as we can build manylinux-compatible wheels on linux just fine
@@ -145,8 +161,8 @@ BUILD_WITH_SYSTEM_RE2 = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_RE2', False)
# it's difficult to ensure that the crosscompilation toolchain has a high-enough version
# of GCC (we require >4.9) but still uses old-enough libstdc++ symbols.
# TODO(jtattermusch): remove this workaround once issues with crosscompiler version are resolved.
-BUILD_WITH_STATIC_LIBSTDCXX = os.environ.get(
- 'GRPC_PYTHON_BUILD_WITH_STATIC_LIBSTDCXX', False)
+BUILD_WITH_STATIC_LIBSTDCXX = _env_bool_value(
+ 'GRPC_PYTHON_BUILD_WITH_STATIC_LIBSTDCXX', 'False')
# For local development use only: This skips building gRPC Core and its
# dependencies, including protobuf and boringssl. This allows "incremental"
@@ -159,23 +175,23 @@ BUILD_WITH_STATIC_LIBSTDCXX = os.environ.get(
# make HAS_SYSTEM_OPENSSL_ALPN=0
#
# TODO(ericgribkoff) Respect the BUILD_WITH_SYSTEM_* flags alongside this option
-USE_PREBUILT_GRPC_CORE = os.environ.get('GRPC_PYTHON_USE_PREBUILT_GRPC_CORE',
- False)
+USE_PREBUILT_GRPC_CORE = _env_bool_value('GRPC_PYTHON_USE_PREBUILT_GRPC_CORE',
+ 'False')
# If this environmental variable is set, GRPC will not try to be compatible with
# libc versions old than the one it was compiled against.
-DISABLE_LIBC_COMPATIBILITY = os.environ.get(
- 'GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY', False)
+DISABLE_LIBC_COMPATIBILITY = _env_bool_value(
+ 'GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY', 'False')
# Environment variable to determine whether or not to enable coverage analysis
# in Cython modules.
-ENABLE_CYTHON_TRACING = os.environ.get('GRPC_PYTHON_ENABLE_CYTHON_TRACING',
- False)
+ENABLE_CYTHON_TRACING = _env_bool_value('GRPC_PYTHON_ENABLE_CYTHON_TRACING',
+ 'False')
# Environment variable specifying whether or not there's interest in setting up
# documentation building.
-ENABLE_DOCUMENTATION_BUILD = os.environ.get(
- 'GRPC_PYTHON_ENABLE_DOCUMENTATION_BUILD', False)
+ENABLE_DOCUMENTATION_BUILD = _env_bool_value(
+ 'GRPC_PYTHON_ENABLE_DOCUMENTATION_BUILD', 'False')
def check_linker_need_libatomic():
@@ -284,7 +300,8 @@ EXTENSION_INCLUDE_DIRECTORIES = ((PYTHON_STEM,) + CORE_INCLUDE + ABSL_INCLUDE +
ADDRESS_SORTING_INCLUDE + CARES_INCLUDE +
RE2_INCLUDE + SSL_INCLUDE + UPB_INCLUDE +
UPB_GRPC_GENERATED_INCLUDE +
- UPBDEFS_GRPC_GENERATED_INCLUDE + ZLIB_INCLUDE)
+ UPBDEFS_GRPC_GENERATED_INCLUDE +
+ XXHASH_INCLUDE + ZLIB_INCLUDE)
EXTENSION_LIBRARIES = ()
if "linux" in sys.platform:
@@ -314,20 +331,22 @@ asm_files = []
asm_key = ''
if BUILD_WITH_BORING_SSL_ASM and not BUILD_WITH_SYSTEM_OPENSSL:
+ boringssl_asm_platform = BUILD_OVERRIDE_BORING_SSL_ASM_PLATFORM if BUILD_OVERRIDE_BORING_SSL_ASM_PLATFORM else util.get_platform(
+ )
LINUX_X86_64 = 'linux-x86_64'
LINUX_ARM = 'linux-arm'
LINUX_AARCH64 = 'linux-aarch64'
- if LINUX_X86_64 == util.get_platform():
+ if LINUX_X86_64 == boringssl_asm_platform:
asm_key = 'crypto_linux_x86_64'
- elif LINUX_ARM == util.get_platform():
+ elif LINUX_ARM == boringssl_asm_platform:
asm_key = 'crypto_linux_arm'
- elif LINUX_AARCH64 == util.get_platform():
+ elif LINUX_AARCH64 == boringssl_asm_platform:
asm_key = 'crypto_linux_aarch64'
- elif "mac" in util.get_platform() and "x86_64" in util.get_platform():
+ elif "mac" in boringssl_asm_platform and "x86_64" in boringssl_asm_platform:
asm_key = 'crypto_mac_x86_64'
else:
print("ASM Builds for BoringSSL currently not supported on:",
- util.get_platform())
+ boringssl_asm_platform)
if asm_key:
asm_files = grpc_core_dependencies.ASM_SOURCE_FILES[asm_key]
else:
diff --git a/src/abseil-cpp/preprocessed_builds.yaml b/src/abseil-cpp/preprocessed_builds.yaml
index 257efad9b27..6c73dd3d5ad 100644
--- a/src/abseil-cpp/preprocessed_builds.yaml
+++ b/src/abseil-cpp/preprocessed_builds.yaml
@@ -63,14 +63,6 @@
- third_party/abseil-cpp/absl/base/internal/scheduling_mode.h
name: absl/base:base_internal
src: []
-- cmake_target: absl::bits
- deps:
- - absl/base:config
- - absl/base:core_headers
- headers:
- - third_party/abseil-cpp/absl/base/internal/bits.h
- name: absl/base:bits
- src: []
- cmake_target: absl::config
deps: []
headers:
@@ -103,6 +95,7 @@
src: []
- cmake_target: absl::endian
deps:
+ - absl/base:base
- absl/base:config
- absl/base:core_headers
headers:
@@ -215,6 +208,24 @@
name: absl/base:throw_delegate
src:
- third_party/abseil-cpp/absl/base/internal/throw_delegate.cc
+- cmake_target: absl::cleanup
+ deps:
+ - absl/base:config
+ - absl/base:core_headers
+ - absl/cleanup:cleanup_internal
+ headers:
+ - third_party/abseil-cpp/absl/cleanup/cleanup.h
+ name: absl/cleanup:cleanup
+ src: []
+- cmake_target: absl::cleanup_internal
+ deps:
+ - absl/base:base_internal
+ - absl/base:core_headers
+ - absl/utility:utility
+ headers:
+ - third_party/abseil-cpp/absl/cleanup/internal/cleanup.h
+ name: absl/cleanup:cleanup_internal
+ src: []
- cmake_target: absl::btree
deps:
- absl/base:core_headers
@@ -425,7 +436,6 @@
src: []
- cmake_target: absl::raw_hash_set
deps:
- - absl/base:bits
- absl/base:config
- absl/base:core_headers
- absl/base:endian
@@ -439,6 +449,7 @@
- absl/container:layout
- absl/memory:memory
- absl/meta:type_traits
+ - absl/numeric:bits
- absl/utility:utility
headers:
- third_party/abseil-cpp/absl/container/internal/raw_hash_set.h
@@ -619,6 +630,7 @@
- absl/utility:utility
headers:
- third_party/abseil-cpp/absl/flags/internal/flag.h
+ - third_party/abseil-cpp/absl/flags/internal/sequence_lock.h
name: absl/flags:flag_internal
src:
- third_party/abseil-cpp/absl/flags/internal/flag.cc
@@ -766,10 +778,12 @@
- third_party/abseil-cpp/absl/hash/internal/city.cc
- cmake_target: absl::hash
deps:
+ - absl/base:config
- absl/base:core_headers
- absl/base:endian
- absl/container:fixed_array
- absl/hash:city
+ - absl/hash:wyhash
- absl/meta:type_traits
- absl/numeric:int128
- absl/strings:strings
@@ -782,6 +796,16 @@
name: absl/hash:hash
src:
- third_party/abseil-cpp/absl/hash/internal/hash.cc
+- cmake_target: absl::wyhash
+ deps:
+ - absl/base:config
+ - absl/base:endian
+ - absl/numeric:int128
+ headers:
+ - third_party/abseil-cpp/absl/hash/internal/wyhash.h
+ name: absl/hash:wyhash
+ src:
+ - third_party/abseil-cpp/absl/hash/internal/wyhash.cc
- cmake_target: absl::memory
deps:
- absl/base:core_headers
@@ -797,11 +821,20 @@
- third_party/abseil-cpp/absl/meta/type_traits.h
name: absl/meta:type_traits
src: []
+- cmake_target: absl::bits
+ deps:
+ - absl/base:config
+ - absl/base:core_headers
+ headers:
+ - third_party/abseil-cpp/absl/numeric/bits.h
+ - third_party/abseil-cpp/absl/numeric/internal/bits.h
+ name: absl/numeric:bits
+ src: []
- cmake_target: absl::int128
deps:
- - absl/base:bits
- absl/base:config
- absl/base:core_headers
+ - absl/numeric:bits
headers:
- third_party/abseil-cpp/absl/numeric/int128.h
- third_party/abseil-cpp/absl/numeric/int128_have_intrinsic.inc
@@ -809,6 +842,13 @@
name: absl/numeric:int128
src:
- third_party/abseil-cpp/absl/numeric/int128.cc
+- cmake_target: absl::numeric_representation
+ deps:
+ - absl/base:config
+ headers:
+ - third_party/abseil-cpp/absl/numeric/internal/representation.h
+ name: absl/numeric:representation
+ src: []
- cmake_target: absl::random_internal_distribution_caller
deps:
- absl/base:config
@@ -828,15 +868,15 @@
src: []
- cmake_target: absl::random_internal_fastmath
deps:
- - absl/base:bits
+ - absl/numeric:bits
headers:
- third_party/abseil-cpp/absl/random/internal/fastmath.h
name: absl/random/internal:fastmath
src: []
- cmake_target: absl::random_internal_generate_real
deps:
- - absl/base:bits
- absl/meta:type_traits
+ - absl/numeric:bits
- absl/random/internal:fastmath
- absl/random/internal:traits
headers:
@@ -888,6 +928,7 @@
deps:
- absl/base:config
- absl/meta:type_traits
+ - absl/numeric:bits
- absl/numeric:int128
- absl/random/internal:fastmath
- absl/random/internal:iostream_state_saver
@@ -934,6 +975,7 @@
- third_party/abseil-cpp/absl/random/internal/randen.cc
- cmake_target: absl::random_internal_randen_engine
deps:
+ - absl/base:endian
- absl/meta:type_traits
- absl/random/internal:iostream_state_saver
- absl/random/internal:randen
@@ -1014,8 +1056,8 @@
src: []
- cmake_target: absl::random_internal_wide_multiply
deps:
- - absl/base:bits
- absl/base:config
+ - absl/numeric:bits
- absl/numeric:int128
- absl/random/internal:traits
headers:
@@ -1040,6 +1082,7 @@
- absl/base:config
- absl/base:core_headers
- absl/meta:type_traits
+ - absl/numeric:bits
- absl/random/internal:distribution_caller
- absl/random/internal:fast_uniform_bits
- absl/random/internal:fastmath
@@ -1158,13 +1201,25 @@
- cmake_target: absl::cord
deps:
- absl/base:base_internal
+ - absl/base:config
+ - absl/base:core_headers
+ - absl/base:endian
+ - absl/base:raw_logging_internal
+ - absl/base:throw_delegate
- absl/container:compressed_tuple
+ - absl/container:inlined_vector
+ - absl/container:layout
- absl/meta:type_traits
- absl/strings:strings
headers:
- third_party/abseil-cpp/absl/strings/internal/cord_internal.h
+ - third_party/abseil-cpp/absl/strings/internal/cord_rep_flat.h
+ - third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.h
+ - third_party/abseil-cpp/absl/strings/internal/cord_rep_ring_reader.h
name: absl/strings:cord_internal
- src: []
+ src:
+ - third_party/abseil-cpp/absl/strings/internal/cord_internal.cc
+ - third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc
- cmake_target: absl::strings_internal
deps:
- absl/base:config
@@ -1192,12 +1247,13 @@
src: []
- cmake_target: absl::str_format_internal
deps:
- - absl/base:bits
- absl/base:config
- absl/base:core_headers
- absl/functional:function_ref
- absl/meta:type_traits
+ - absl/numeric:bits
- absl/numeric:int128
+ - absl/numeric:representation
- absl/strings:strings
- absl/types:optional
- absl/types:span
@@ -1220,7 +1276,6 @@
- cmake_target: absl::strings
deps:
- absl/base:base
- - absl/base:bits
- absl/base:config
- absl/base:core_headers
- absl/base:endian
@@ -1228,6 +1283,7 @@
- absl/base:throw_delegate
- absl/memory:memory
- absl/meta:type_traits
+ - absl/numeric:bits
- absl/numeric:int128
- absl/strings:internal
headers:
@@ -1240,6 +1296,7 @@
- third_party/abseil-cpp/absl/strings/internal/stl_type_traits.h
- third_party/abseil-cpp/absl/strings/internal/str_join_internal.h
- third_party/abseil-cpp/absl/strings/internal/str_split_internal.h
+ - third_party/abseil-cpp/absl/strings/internal/string_constant.h
- third_party/abseil-cpp/absl/strings/match.h
- third_party/abseil-cpp/absl/strings/numbers.h
- third_party/abseil-cpp/absl/strings/str_cat.h
@@ -1305,7 +1362,7 @@
- third_party/abseil-cpp/absl/synchronization/barrier.h
- third_party/abseil-cpp/absl/synchronization/blocking_counter.h
- third_party/abseil-cpp/absl/synchronization/internal/create_thread_identity.h
- - third_party/abseil-cpp/absl/synchronization/internal/mutex_nonprod.inc
+ - third_party/abseil-cpp/absl/synchronization/internal/futex.h
- third_party/abseil-cpp/absl/synchronization/internal/per_thread_sem.h
- third_party/abseil-cpp/absl/synchronization/internal/waiter.h
- third_party/abseil-cpp/absl/synchronization/mutex.h
diff --git a/src/boringssl/boringssl_prefix_symbols.h b/src/boringssl/boringssl_prefix_symbols.h
index 40d458c470e..1991903fc4c 100644
--- a/src/boringssl/boringssl_prefix_symbols.h
+++ b/src/boringssl/boringssl_prefix_symbols.h
@@ -1,4 +1,4 @@
-// generated by generate_boringssl_prefix_header.sh on BoringSSL commit: 1a7359455220f7010def8c63f7c7e041ce6707c6
+// generated by generate_boringssl_prefix_header.sh on BoringSSL commit: 688fc5cf5428868679d2ae1072cad81055752068
// Copyright (c) 2018, Google Inc.
//
@@ -142,6 +142,7 @@
#define SSL_CTX_set1_chain BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_CTX_set1_chain)
#define SSL_CTX_set1_curves BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_CTX_set1_curves)
#define SSL_CTX_set1_curves_list BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_CTX_set1_curves_list)
+#define SSL_CTX_set1_ech_server_config_list BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_CTX_set1_ech_server_config_list)
#define SSL_CTX_set1_param BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_CTX_set1_param)
#define SSL_CTX_set1_sigalgs BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_CTX_set1_sigalgs)
#define SSL_CTX_set1_sigalgs_list BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_CTX_set1_sigalgs_list)
@@ -168,7 +169,6 @@
#define SSL_CTX_set_ex_data BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_CTX_set_ex_data)
#define SSL_CTX_set_false_start_allowed_without_alpn BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_CTX_set_false_start_allowed_without_alpn)
#define SSL_CTX_set_grease_enabled BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_CTX_set_grease_enabled)
-#define SSL_CTX_set_ignore_tls13_downgrade BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_CTX_set_ignore_tls13_downgrade)
#define SSL_CTX_set_info_callback BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_CTX_set_info_callback)
#define SSL_CTX_set_keylog_callback BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_CTX_set_keylog_callback)
#define SSL_CTX_set_max_cert_list BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_CTX_set_max_cert_list)
@@ -230,6 +230,10 @@
#define SSL_CTX_use_certificate_chain_file BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_CTX_use_certificate_chain_file)
#define SSL_CTX_use_certificate_file BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_CTX_use_certificate_file)
#define SSL_CTX_use_psk_identity_hint BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_CTX_use_psk_identity_hint)
+#define SSL_ECH_SERVER_CONFIG_LIST_add BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_ECH_SERVER_CONFIG_LIST_add)
+#define SSL_ECH_SERVER_CONFIG_LIST_free BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_ECH_SERVER_CONFIG_LIST_free)
+#define SSL_ECH_SERVER_CONFIG_LIST_new BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_ECH_SERVER_CONFIG_LIST_new)
+#define SSL_ECH_SERVER_CONFIG_LIST_up_ref BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_ECH_SERVER_CONFIG_LIST_up_ref)
#define SSL_SESSION_copy_without_early_data BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_SESSION_copy_without_early_data)
#define SSL_SESSION_early_data_capable BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_SESSION_early_data_capable)
#define SSL_SESSION_free BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_SESSION_free)
@@ -393,7 +397,6 @@
#define SSL_is_init_finished BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_is_init_finished)
#define SSL_is_server BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_is_server)
#define SSL_is_signature_algorithm_rsa_pss BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_is_signature_algorithm_rsa_pss)
-#define SSL_is_tls13_downgrade BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_is_tls13_downgrade)
#define SSL_is_token_binding_negotiated BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_is_token_binding_negotiated)
#define SSL_key_update BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_key_update)
#define SSL_library_init BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_library_init)
@@ -415,9 +418,12 @@
#define SSL_read BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_read)
#define SSL_renegotiate BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_renegotiate)
#define SSL_renegotiate_pending BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_renegotiate_pending)
+#define SSL_request_handshake_hints BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_request_handshake_hints)
#define SSL_reset_early_data_reject BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_reset_early_data_reject)
#define SSL_select_next_proto BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_select_next_proto)
#define SSL_send_fatal_alert BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_send_fatal_alert)
+#define SSL_serialize_capabilities BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_serialize_capabilities)
+#define SSL_serialize_handshake_hints BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_serialize_handshake_hints)
#define SSL_session_reused BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_session_reused)
#define SSL_set0_chain BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_set0_chain)
#define SSL_set0_client_CAs BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_set0_client_CAs)
@@ -448,7 +454,7 @@
#define SSL_set_enforce_rsa_key_usage BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_set_enforce_rsa_key_usage)
#define SSL_set_ex_data BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_set_ex_data)
#define SSL_set_fd BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_set_fd)
-#define SSL_set_ignore_tls13_downgrade BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_set_ignore_tls13_downgrade)
+#define SSL_set_handshake_hints BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_set_handshake_hints)
#define SSL_set_info_callback BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_set_info_callback)
#define SSL_set_jdk11_workaround BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_set_jdk11_workaround)
#define SSL_set_max_cert_list BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_set_max_cert_list)
@@ -1289,6 +1295,7 @@
#define ECDSA_do_sign BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, ECDSA_do_sign)
#define ECDSA_do_verify BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, ECDSA_do_verify)
#define ECDSA_sign BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, ECDSA_sign)
+#define ECDSA_sign_with_nonce_and_leak_private_key_for_testing BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, ECDSA_sign_with_nonce_and_leak_private_key_for_testing)
#define ECDSA_size BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, ECDSA_size)
#define ECDSA_verify BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, ECDSA_verify)
#define EC_GFp_mont_method BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EC_GFp_mont_method)
@@ -1300,6 +1307,7 @@
#define EC_GROUP_free BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EC_GROUP_free)
#define EC_GROUP_get0_generator BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EC_GROUP_get0_generator)
#define EC_GROUP_get0_order BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EC_GROUP_get0_order)
+#define EC_GROUP_get_asn1_flag BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EC_GROUP_get_asn1_flag)
#define EC_GROUP_get_cofactor BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EC_GROUP_get_cofactor)
#define EC_GROUP_get_curve_GFp BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EC_GROUP_get_curve_GFp)
#define EC_GROUP_get_curve_name BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EC_GROUP_get_curve_name)
@@ -1505,6 +1513,8 @@
#define EVP_EncryptUpdate BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_EncryptUpdate)
#define EVP_HPKE_CTX_cleanup BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_HPKE_CTX_cleanup)
#define EVP_HPKE_CTX_export BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_HPKE_CTX_export)
+#define EVP_HPKE_CTX_get_aead_id BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_HPKE_CTX_get_aead_id)
+#define EVP_HPKE_CTX_get_kdf_id BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_HPKE_CTX_get_kdf_id)
#define EVP_HPKE_CTX_init BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_HPKE_CTX_init)
#define EVP_HPKE_CTX_max_overhead BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_HPKE_CTX_max_overhead)
#define EVP_HPKE_CTX_open BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_HPKE_CTX_open)
@@ -1631,7 +1641,6 @@
#define EVP_add_digest BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_add_digest)
#define EVP_aead_aes_128_cbc_sha1_tls BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_aead_aes_128_cbc_sha1_tls)
#define EVP_aead_aes_128_cbc_sha1_tls_implicit_iv BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_aead_aes_128_cbc_sha1_tls_implicit_iv)
-#define EVP_aead_aes_128_cbc_sha256_tls BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_aead_aes_128_cbc_sha256_tls)
#define EVP_aead_aes_128_ccm_bluetooth BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_aead_aes_128_ccm_bluetooth)
#define EVP_aead_aes_128_ccm_bluetooth_8 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_aead_aes_128_ccm_bluetooth_8)
#define EVP_aead_aes_128_ctr_hmac_sha256 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_aead_aes_128_ctr_hmac_sha256)
@@ -1643,8 +1652,6 @@
#define EVP_aead_aes_192_gcm BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_aead_aes_192_gcm)
#define EVP_aead_aes_256_cbc_sha1_tls BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_aead_aes_256_cbc_sha1_tls)
#define EVP_aead_aes_256_cbc_sha1_tls_implicit_iv BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_aead_aes_256_cbc_sha1_tls_implicit_iv)
-#define EVP_aead_aes_256_cbc_sha256_tls BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_aead_aes_256_cbc_sha256_tls)
-#define EVP_aead_aes_256_cbc_sha384_tls BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_aead_aes_256_cbc_sha384_tls)
#define EVP_aead_aes_256_ctr_hmac_sha256 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_aead_aes_256_ctr_hmac_sha256)
#define EVP_aead_aes_256_gcm BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_aead_aes_256_gcm)
#define EVP_aead_aes_256_gcm_randnonce BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_aead_aes_256_gcm_randnonce)
@@ -1700,6 +1707,7 @@
#define EVP_rc2_cbc BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_rc2_cbc)
#define EVP_rc4 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_rc4)
#define EVP_sha1 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_sha1)
+#define EVP_sha1_final_with_secret_suffix BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_sha1_final_with_secret_suffix)
#define EVP_sha224 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_sha224)
#define EVP_sha256 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_sha256)
#define EVP_sha384 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_sha384)
@@ -1714,6 +1722,7 @@
#define EXTENDED_KEY_USAGE_new BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EXTENDED_KEY_USAGE_new)
#define FIPS_mode BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, FIPS_mode)
#define FIPS_mode_set BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, FIPS_mode_set)
+#define FIPS_read_counter BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, FIPS_read_counter)
#define GENERAL_NAMES_free BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, GENERAL_NAMES_free)
#define GENERAL_NAMES_it BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, GENERAL_NAMES_it)
#define GENERAL_NAMES_new BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, GENERAL_NAMES_new)
@@ -2198,7 +2207,6 @@
#define X509_ALGOR_new BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_ALGOR_new)
#define X509_ALGOR_set0 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_ALGOR_set0)
#define X509_ALGOR_set_md BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_ALGOR_set_md)
-#define X509_ATTRIBUTE_SET_it BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_ATTRIBUTE_SET_it)
#define X509_ATTRIBUTE_count BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_ATTRIBUTE_count)
#define X509_ATTRIBUTE_create BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_ATTRIBUTE_create)
#define X509_ATTRIBUTE_create_by_NID BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_ATTRIBUTE_create_by_NID)
@@ -2218,10 +2226,8 @@
#define X509_CERT_AUX_new BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_CERT_AUX_new)
#define X509_CERT_AUX_print BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_CERT_AUX_print)
#define X509_CINF_free BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_CINF_free)
-#define X509_CINF_get_signature BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_CINF_get_signature)
#define X509_CINF_it BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_CINF_it)
#define X509_CINF_new BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_CINF_new)
-#define X509_CINF_set_modified BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_CINF_set_modified)
#define X509_CRL_INFO_free BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_CRL_INFO_free)
#define X509_CRL_INFO_it BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_CRL_INFO_it)
#define X509_CRL_INFO_new BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_CRL_INFO_new)
@@ -2350,6 +2356,7 @@
#define X509_PUBKEY_free BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_PUBKEY_free)
#define X509_PUBKEY_get BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_PUBKEY_get)
#define X509_PUBKEY_get0_param BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_PUBKEY_get0_param)
+#define X509_PUBKEY_get0_public_key BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_PUBKEY_get0_public_key)
#define X509_PUBKEY_it BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_PUBKEY_it)
#define X509_PUBKEY_new BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_PUBKEY_new)
#define X509_PUBKEY_set BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_PUBKEY_set)
@@ -2386,7 +2393,6 @@
#define X509_REQ_get_attr_by_NID BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_REQ_get_attr_by_NID)
#define X509_REQ_get_attr_by_OBJ BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_REQ_get_attr_by_OBJ)
#define X509_REQ_get_attr_count BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_REQ_get_attr_count)
-#define X509_REQ_get_extension_nids BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_REQ_get_extension_nids)
#define X509_REQ_get_extensions BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_REQ_get_extensions)
#define X509_REQ_get_pubkey BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_REQ_get_pubkey)
#define X509_REQ_get_signature_nid BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_REQ_get_signature_nid)
@@ -2397,13 +2403,11 @@
#define X509_REQ_print BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_REQ_print)
#define X509_REQ_print_ex BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_REQ_print_ex)
#define X509_REQ_print_fp BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_REQ_print_fp)
-#define X509_REQ_set_extension_nids BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_REQ_set_extension_nids)
#define X509_REQ_set_pubkey BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_REQ_set_pubkey)
#define X509_REQ_set_subject_name BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_REQ_set_subject_name)
#define X509_REQ_set_version BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_REQ_set_version)
#define X509_REQ_sign BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_REQ_sign)
#define X509_REQ_sign_ctx BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_REQ_sign_ctx)
-#define X509_REQ_to_X509 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_REQ_to_X509)
#define X509_REQ_verify BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_REQ_verify)
#define X509_REVOKED_add1_ext_i2d BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_REVOKED_add1_ext_i2d)
#define X509_REVOKED_add_ext BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_REVOKED_add_ext)
@@ -2591,7 +2595,6 @@
#define X509_get1_email BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_get1_email)
#define X509_get1_ocsp BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_get1_ocsp)
#define X509_get_X509_PUBKEY BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_get_X509_PUBKEY)
-#define X509_get_cert_info BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_get_cert_info)
#define X509_get_default_cert_area BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_get_default_cert_area)
#define X509_get_default_cert_dir BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_get_default_cert_dir)
#define X509_get_default_cert_dir_env BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, X509_get_default_cert_dir_env)
@@ -2785,6 +2788,7 @@
#define asn1_refcount_dec_and_test_zero BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, asn1_refcount_dec_and_test_zero)
#define asn1_refcount_set_one BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, asn1_refcount_set_one)
#define asn1_set_choice_selector BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, asn1_set_choice_selector)
+#define asn1_type_value_as_pointer BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, asn1_type_value_as_pointer)
#define asn1_utctime_to_tm BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, asn1_utctime_to_tm)
#define beeu_mod_inverse_vartime BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, beeu_mod_inverse_vartime)
#define bio_clear_socket_error BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bio_clear_socket_error)
@@ -3085,6 +3089,7 @@
#define ec_set_to_safe_point BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, ec_set_to_safe_point)
#define ec_simple_scalar_inv0_montgomery BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, ec_simple_scalar_inv0_montgomery)
#define ec_simple_scalar_to_montgomery_inv_vartime BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, ec_simple_scalar_to_montgomery_inv_vartime)
+#define ecdsa_sign_with_nonce_for_known_answer_test BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, ecdsa_sign_with_nonce_for_known_answer_test)
#define ecp_nistz256_avx2_select_w7 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, ecp_nistz256_avx2_select_w7)
#define ecp_nistz256_mul_mont BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, ecp_nistz256_mul_mont)
#define ecp_nistz256_neg BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, ecp_nistz256_neg)
diff --git a/src/compiler/cpp_generator.cc b/src/compiler/cpp_generator.cc
index c78a3e08e22..c8dff735fc2 100644
--- a/src/compiler/cpp_generator.cc
+++ b/src/compiler/cpp_generator.cc
@@ -633,12 +633,12 @@ void PrintHeaderClientMethodCallbackInterfaces(
printer->Print(*vars,
"#ifdef GRPC_CALLBACK_API_NONEXPERIMENTAL\n"
"virtual void $Method$(::grpc::ClientContext* context, "
- "$Request$* request, "
+ "const $Request$* request, "
"::grpc::ClientReadReactor< $Response$>* "
"reactor) = 0;\n"
"#else\n"
"virtual void $Method$(::grpc::ClientContext* context, "
- "$Request$* request, "
+ "const $Request$* request, "
"::grpc::experimental::ClientReadReactor< $Response$>* "
"reactor) = 0;\n"
"#endif\n");
@@ -730,12 +730,12 @@ void PrintHeaderClientMethodCallback(grpc_generator::Printer* printer,
printer->Print(*vars,
"#ifdef GRPC_CALLBACK_API_NONEXPERIMENTAL\n"
"void $Method$(::grpc::ClientContext* context, "
- "$Request$* request, "
+ "const $Request$* request, "
"::grpc::ClientReadReactor< $Response$>* "
"reactor) override;\n"
"#else\n"
"void $Method$(::grpc::ClientContext* context, "
- "$Request$* request, "
+ "const $Request$* request, "
"::grpc::experimental::ClientReadReactor< $Response$>* "
"reactor) override;\n"
"#endif\n");
@@ -1557,7 +1557,8 @@ void PrintHeaderService(grpc_generator::Printer* printer,
printer->Indent();
printer->Print(
"Stub(const std::shared_ptr< ::grpc::ChannelInterface>& "
- "channel);\n");
+ "channel, const ::grpc::StubOptions& options = "
+ "::grpc::StubOptions());\n");
for (int i = 0; i < service->method_count(); ++i) {
PrintHeaderClientMethod(printer, service->method(i).get(), vars, true);
}
@@ -2005,7 +2006,7 @@ void PrintSourceClientMethod(grpc_generator::Printer* printer,
*vars,
"void $ns$$Service$::Stub::experimental_async::$Method$(::grpc::"
"ClientContext* context, "
- "$Request$* request, "
+ "const $Request$* request, "
"::grpc::experimental::ClientReadReactor< $Response$>* reactor) {\n");
printer->Print(*vars,
" ::grpc::internal::ClientCallbackReaderFactory< "
@@ -2163,12 +2164,13 @@ void PrintSourceService(grpc_generator::Printer* printer,
"const ::grpc::StubOptions& options) {\n"
" (void)options;\n"
" std::unique_ptr< $ns$$Service$::Stub> stub(new "
- "$ns$$Service$::Stub(channel));\n"
+ "$ns$$Service$::Stub(channel, options));\n"
" return stub;\n"
"}\n\n");
printer->Print(*vars,
"$ns$$Service$::Stub::Stub(const std::shared_ptr< "
- "::grpc::ChannelInterface>& channel)\n");
+ "::grpc::ChannelInterface>& channel, const "
+ "::grpc::StubOptions& options)\n");
printer->Indent();
printer->Print(": channel_(channel)");
for (int i = 0; i < service->method_count(); ++i) {
@@ -2187,12 +2189,13 @@ void PrintSourceService(grpc_generator::Printer* printer,
} else {
(*vars)["StreamingType"] = "BIDI_STREAMING";
}
- printer->Print(*vars,
- ", rpcmethod_$Method$_("
- "$prefix$$Service$_method_names[$Idx$], "
- "::grpc::internal::RpcMethod::$StreamingType$, "
- "channel"
- ")\n");
+ printer->Print(
+ *vars,
+ ", rpcmethod_$Method$_("
+ "$prefix$$Service$_method_names[$Idx$], options.suffix_for_stats(),"
+ "::grpc::internal::RpcMethod::$StreamingType$, "
+ "channel"
+ ")\n");
}
printer->Print("{}\n\n");
printer->Outdent();
diff --git a/src/compiler/php_generator.cc b/src/compiler/php_generator.cc
index b2a26e5c0fa..28bbebd1041 100644
--- a/src/compiler/php_generator.cc
+++ b/src/compiler/php_generator.cc
@@ -131,34 +131,177 @@ void PrintMethod(const MethodDescriptor* method, Printer* out) {
out->Print("}\n\n");
}
-// Prints out the service descriptor object
-void PrintService(const ServiceDescriptor* service,
- const std::string& class_suffix, Printer* out) {
+void PrintServerMethod(const MethodDescriptor* method, Printer* out) {
map vars;
+ const Descriptor* input_type = method->input_type();
+ const Descriptor* output_type = method->output_type();
+ vars["service_name"] = method->service()->full_name();
+ vars["method_name"] = method->name();
+ vars["input_type_id"] =
+ MessageIdentifierName(GeneratedClassName(input_type), input_type->file());
+ vars["output_type_id"] = MessageIdentifierName(
+ GeneratedClassName(output_type), output_type->file());
+
out->Print("/**\n");
- out->Print(GetPHPComments(service, " *").c_str());
- out->Print(" */\n");
- vars["name"] = GetPHPServiceClassname(service, class_suffix);
- out->Print(vars, "class $name$ extends \\Grpc\\BaseStub {\n\n");
+ out->Print(GetPHPComments(method, " *").c_str());
+
+ const char* method_template;
+ if (method->client_streaming() && method->server_streaming()) {
+ method_template =
+ " * @param \\Grpc\\ServerCallReader $$reader read client request data "
+ "of \\$input_type_id$\n"
+ " * @param \\Grpc\\ServerCallWriter $$writer write response data of "
+ "\\$output_type_id$\n"
+ " * @param \\Grpc\\ServerContext $$context server request context\n"
+ " * @return void\n"
+ " */\n"
+ "public function $method_name$(\n"
+ " \\Grpc\\ServerCallReader $$reader,\n"
+ " \\Grpc\\ServerCallWriter $$writer,\n"
+ " \\Grpc\\ServerContext $$context\n"
+ "): void {\n"
+ " $$context->setStatus(\\Grpc\\Status::unimplemented());\n"
+ " $$writer->finish();\n"
+ "}\n\n";
+ } else if (method->client_streaming()) {
+ method_template =
+ " * @param \\Grpc\\ServerCallReader $$reader read client request data "
+ "of \\$input_type_id$\n"
+ " * @param \\Grpc\\ServerContext $$context server request context\n"
+ " * @return \\$output_type_id$ for response data, null if if error "
+ "occured\n"
+ " * initial metadata (if any) and status (if not ok) should be set "
+ "to $$context\n"
+ " */\n"
+ "public function $method_name$(\n"
+ " \\Grpc\\ServerCallReader $$reader,\n"
+ " \\Grpc\\ServerContext $$context\n"
+ "): ?\\$output_type_id$ {\n"
+ " $$context->setStatus(\\Grpc\\Status::unimplemented());\n"
+ " return null;\n"
+ "}\n\n";
+ } else if (method->server_streaming()) {
+ method_template =
+ " * @param \\$input_type_id$ $$request client request\n"
+ " * @param \\Grpc\\ServerCallWriter $$writer write response data of "
+ "\\$output_type_id$\n"
+ " * @param \\Grpc\\ServerContext $$context server request context\n"
+ " * @return void\n"
+ " */\n"
+ "public function $method_name$(\n"
+ " \\$input_type_id$ $$request,\n"
+ " \\Grpc\\ServerCallWriter $$writer,\n"
+ " \\Grpc\\ServerContext $$context\n"
+ "): void {\n"
+ " $$context->setStatus(\\Grpc\\Status::unimplemented());\n"
+ " $$writer->finish();\n"
+ "}\n\n";
+ } else {
+ method_template =
+ " * @param \\$input_type_id$ $$request client request\n"
+ " * @param \\Grpc\\ServerContext $$context server request context\n"
+ " * @return \\$output_type_id$ for response data, null if if error "
+ "occured\n"
+ " * initial metadata (if any) and status (if not ok) should be set "
+ "to $$context\n"
+ " */\n"
+ "public function $method_name$(\n"
+ " \\$input_type_id$ $$request,\n"
+ " \\Grpc\\ServerContext $$context\n"
+ "): ?\\$output_type_id$ {\n"
+ " $$context->setStatus(\\Grpc\\Status::unimplemented());\n"
+ " return null;\n"
+ "}\n\n";
+ }
+ out->Print(vars, method_template);
+}
+
+void PrintServerMethodDescriptors(const ServiceDescriptor* service,
+ Printer* out) {
+ map vars;
+ vars["service_name"] = service->full_name();
+
+ out->Print(
+ "/**\n"
+ " * Get the method descriptors of the service for server registration\n"
+ " *\n"
+ " * @return array of \\Grpc\\MethodDescriptor for the service methods\n"
+ " */\n"
+ "public final function getMethodDescriptors(): array\n{\n");
out->Indent();
out->Indent();
- out->Print(
- "/**\n * @param string $$hostname hostname\n"
- " * @param array $$opts channel options\n"
- " * @param \\Grpc\\Channel $$channel (optional) re-use channel "
- "object\n */\n"
- "public function __construct($$hostname, $$opts, "
- "$$channel = null) {\n");
+ out->Print("return [\n");
out->Indent();
out->Indent();
- out->Print("parent::__construct($$hostname, $$opts, $$channel);\n");
+ for (int i = 0; i < service->method_count(); i++) {
+ auto method = service->method(i);
+ auto input_type = method->input_type();
+ vars["method_name"] = method->name();
+ vars["input_type_id"] = MessageIdentifierName(
+ GeneratedClassName(input_type), input_type->file());
+ if (method->client_streaming() && method->server_streaming()) {
+ vars["call_type"] = "BIDI_STREAMING_CALL";
+ } else if (method->client_streaming()) {
+ vars["call_type"] = "CLIENT_STREAMING_CALL";
+ } else if (method->server_streaming()) {
+ vars["call_type"] = "SERVER_STREAMING_CALL";
+ } else {
+ vars["call_type"] = "UNARY_CALL";
+ }
+ out->Print(
+ vars,
+ "'/$service_name$/$method_name$' => new \\Grpc\\MethodDescriptor(\n"
+ " $$this,\n"
+ " '$method_name$',\n"
+ " '\\$input_type_id$',\n"
+ " \\Grpc\\MethodDescriptor::$call_type$\n"
+ "),\n");
+ }
+ out->Outdent();
+ out->Outdent();
+ out->Print("];\n");
out->Outdent();
out->Outdent();
out->Print("}\n\n");
+}
+
+// Prints out the service descriptor object
+void PrintService(const ServiceDescriptor* service,
+ const std::string& class_suffix, bool is_server,
+ Printer* out) {
+ map vars;
+ out->Print("/**\n");
+ out->Print(GetPHPComments(service, " *").c_str());
+ out->Print(" */\n");
+ vars["name"] = GetPHPServiceClassname(service, class_suffix, is_server);
+ vars["extends"] = is_server ? "" : "extends \\Grpc\\BaseStub ";
+ out->Print(vars, "class $name$ $extends${\n\n");
+ out->Indent();
+ out->Indent();
+ if (!is_server) {
+ out->Print(
+ "/**\n * @param string $$hostname hostname\n"
+ " * @param array $$opts channel options\n"
+ " * @param \\Grpc\\Channel $$channel (optional) re-use channel object\n"
+ " */\n"
+ "public function __construct($$hostname, $$opts, "
+ "$$channel = null) {\n");
+ out->Indent();
+ out->Indent();
+ out->Print("parent::__construct($$hostname, $$opts, $$channel);\n");
+ out->Outdent();
+ out->Outdent();
+ out->Print("}\n\n");
+ }
for (int i = 0; i < service->method_count(); i++) {
- std::string method_name =
- grpc_generator::LowercaseFirstLetter(service->method(i)->name());
- PrintMethod(service->method(i), out);
+ if (is_server) {
+ PrintServerMethod(service->method(i), out);
+ } else {
+ PrintMethod(service->method(i), out);
+ }
+ }
+ if (is_server) {
+ PrintServerMethodDescriptors(service, out);
}
out->Outdent();
out->Outdent();
@@ -168,7 +311,7 @@ void PrintService(const ServiceDescriptor* service,
std::string GenerateFile(const FileDescriptor* file,
const ServiceDescriptor* service,
- const std::string& class_suffix) {
+ const std::string& class_suffix, bool is_server) {
std::string output;
{
StringOutputStream output_stream(&output);
@@ -188,7 +331,7 @@ std::string GenerateFile(const FileDescriptor* file,
vars["package"] = php_namespace;
out.Print(vars, "namespace $package$;\n\n");
- PrintService(service, class_suffix, &out);
+ PrintService(service, class_suffix, is_server, &out);
}
return output;
}
diff --git a/src/compiler/php_generator.h b/src/compiler/php_generator.h
index aa6d20c7fd7..f775c8f2ca6 100644
--- a/src/compiler/php_generator.h
+++ b/src/compiler/php_generator.h
@@ -25,7 +25,8 @@ namespace grpc_php_generator {
std::string GenerateFile(const grpc::protobuf::FileDescriptor* file,
const grpc::protobuf::ServiceDescriptor* service,
- const std::string& class_suffix);
+ const std::string& class_suffix,
+ bool is_server = false);
} // namespace grpc_php_generator
diff --git a/src/compiler/php_generator_helpers.h b/src/compiler/php_generator_helpers.h
index 24560e4d984..a4617df1bc9 100644
--- a/src/compiler/php_generator_helpers.h
+++ b/src/compiler/php_generator_helpers.h
@@ -28,8 +28,10 @@ namespace grpc_php_generator {
inline std::string GetPHPServiceClassname(
const grpc::protobuf::ServiceDescriptor* service,
- const std::string& class_suffix) {
- return service->name() + (class_suffix == "" ? "Client" : class_suffix);
+ const std::string& class_suffix, bool is_server) {
+ return service->name() +
+ (class_suffix == "" ? (is_server ? "" : "Client") : class_suffix) +
+ (is_server ? "Stub" : "");
}
// ReplaceAll replaces all instances of search with replace in s.
@@ -46,7 +48,7 @@ inline std::string ReplaceAll(std::string s, const std::string& search,
inline std::string GetPHPServiceFilename(
const grpc::protobuf::FileDescriptor* file,
const grpc::protobuf::ServiceDescriptor* service,
- const std::string& class_suffix) {
+ const std::string& class_suffix, bool is_server) {
std::ostringstream oss;
if (file->options().has_php_namespace()) {
oss << ReplaceAll(file->options().php_namespace(), "\\", "/");
@@ -58,8 +60,8 @@ inline std::string GetPHPServiceFilename(
<< grpc_generator::CapitalizeFirstLetter(tokens[i]);
}
}
- return oss.str() + "/" + GetPHPServiceClassname(service, class_suffix) +
- ".php";
+ return oss.str() + "/" +
+ GetPHPServiceClassname(service, class_suffix, is_server) + ".php";
}
// Get leading or trailing comments in a string. Comment lines start with "// ".
diff --git a/src/compiler/php_plugin.cc b/src/compiler/php_plugin.cc
index c1be38765f5..7d4e4ce32c5 100644
--- a/src/compiler/php_plugin.cc
+++ b/src/compiler/php_plugin.cc
@@ -48,10 +48,13 @@ class PHPGrpcGenerator : public grpc::protobuf::compiler::CodeGenerator {
std::vector > options;
ParseGeneratorParameter(parameter, &options);
+ bool generate_server = false;
std::string class_suffix;
for (size_t i = 0; i < options.size(); ++i) {
if (options[i].first == "class_suffix") {
class_suffix = options[i].second;
+ } else if (options[i].first == "generate_server") {
+ generate_server = true;
} else {
*error = "unsupported options: " + options[i].first;
return false;
@@ -59,20 +62,32 @@ class PHPGrpcGenerator : public grpc::protobuf::compiler::CodeGenerator {
}
for (int i = 0; i < file->service_count(); i++) {
- std::string code = GenerateFile(file, file->service(i), class_suffix);
-
- // Get output file name
- std::string file_name =
- GetPHPServiceFilename(file, file->service(i), class_suffix);
-
- std::unique_ptr output(
- context->Open(file_name));
- grpc::protobuf::io::CodedOutputStream coded_out(output.get());
- coded_out.WriteRaw(code.data(), code.size());
+ GenerateService(file, file->service(i), class_suffix, false, context);
+ if (generate_server) {
+ GenerateService(file, file->service(i), class_suffix, true, context);
+ }
}
return true;
}
+
+ private:
+ void GenerateService(
+ const grpc::protobuf::FileDescriptor* file,
+ const grpc::protobuf::ServiceDescriptor* service,
+ const std::string& class_suffix, bool is_server,
+ grpc::protobuf::compiler::GeneratorContext* context) const {
+ std::string code = GenerateFile(file, service, class_suffix, is_server);
+
+ // Get output file name
+ std::string file_name =
+ GetPHPServiceFilename(file, service, class_suffix, is_server);
+
+ std::unique_ptr output(
+ context->Open(file_name));
+ grpc::protobuf::io::CodedOutputStream coded_out(output.get());
+ coded_out.WriteRaw(code.data(), code.size());
+ }
};
int main(int argc, char* argv[]) {
diff --git a/src/compiler/ruby_generator.cc b/src/compiler/ruby_generator.cc
index 2b86b7029fc..2fae61082f0 100644
--- a/src/compiler/ruby_generator.cc
+++ b/src/compiler/ruby_generator.cc
@@ -80,7 +80,7 @@ void PrintService(const ServiceDescriptor* service, Printer* out) {
// Write the indented class body.
out->Indent();
out->Print("\n");
- out->Print("include GRPC::GenericService\n");
+ out->Print("include ::GRPC::GenericService\n");
out->Print("\n");
out->Print("self.marshal_class_method = :encode\n");
out->Print("self.unmarshal_class_method = :decode\n");
diff --git a/src/core/ext/filters/client_channel/backup_poller.cc b/src/core/ext/filters/client_channel/backup_poller.cc
index 1b7708953ab..ad7f89210d8 100644
--- a/src/core/ext/filters/client_channel/backup_poller.cc
+++ b/src/core/ext/filters/client_channel/backup_poller.cc
@@ -89,7 +89,7 @@ static void backup_poller_shutdown_unref(backup_poller* p) {
}
}
-static void done_poller(void* arg, grpc_error* /*error*/) {
+static void done_poller(void* arg, grpc_error_handle /*error*/) {
backup_poller_shutdown_unref(static_cast(arg));
}
@@ -112,7 +112,7 @@ static void g_poller_unref() {
}
}
-static void run_poller(void* arg, grpc_error* error) {
+static void run_poller(void* arg, grpc_error_handle error) {
backup_poller* p = static_cast(arg);
if (error != GRPC_ERROR_NONE) {
if (error != GRPC_ERROR_CANCELLED) {
@@ -127,7 +127,7 @@ static void run_poller(void* arg, grpc_error* error) {
backup_poller_shutdown_unref(p);
return;
}
- grpc_error* err =
+ grpc_error_handle err =
grpc_pollset_work(p->pollset, nullptr, grpc_core::ExecCtx::Get()->Now());
gpr_mu_unlock(p->pollset_mu);
GRPC_LOG_IF_ERROR("Run client channel backup poller", err);
diff --git a/src/core/ext/filters/client_channel/channel_connectivity.cc b/src/core/ext/filters/client_channel/channel_connectivity.cc
index 4ebb976efe5..e5ec5c5fe09 100644
--- a/src/core/ext/filters/client_channel/channel_connectivity.cc
+++ b/src/core/ext/filters/client_channel/channel_connectivity.cc
@@ -1,28 +1,23 @@
-/*
- *
- * Copyright 2015 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+// Copyright 2015 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
#include
#include "src/core/lib/surface/channel.h"
-#include
-
-#include
#include
#include "src/core/ext/filters/client_channel/client_channel.h"
@@ -32,195 +27,205 @@
grpc_connectivity_state grpc_channel_check_connectivity_state(
grpc_channel* channel, int try_to_connect) {
- /* forward through to the underlying client channel */
- grpc_channel_element* client_channel_elem =
- grpc_channel_stack_last_element(grpc_channel_get_channel_stack(channel));
grpc_core::ApplicationCallbackExecCtx callback_exec_ctx;
grpc_core::ExecCtx exec_ctx;
- grpc_connectivity_state state;
GRPC_API_TRACE(
"grpc_channel_check_connectivity_state(channel=%p, try_to_connect=%d)", 2,
(channel, try_to_connect));
- if (GPR_LIKELY(client_channel_elem->filter == &grpc_client_channel_filter)) {
- state = grpc_client_channel_check_connectivity_state(client_channel_elem,
- try_to_connect);
-
- return state;
+ // Forward through to the underlying client channel.
+ grpc_core::ClientChannel* client_channel =
+ grpc_core::ClientChannel::GetFromChannel(channel);
+ if (GPR_UNLIKELY(client_channel == nullptr)) {
+ gpr_log(GPR_ERROR,
+ "grpc_channel_check_connectivity_state called on something that is "
+ "not a client channel");
+ return GRPC_CHANNEL_SHUTDOWN;
}
- gpr_log(GPR_ERROR,
- "grpc_channel_check_connectivity_state called on something that is "
- "not a client channel, but '%s'",
- client_channel_elem->filter->name);
+ return client_channel->CheckConnectivityState(try_to_connect);
+}
- return GRPC_CHANNEL_SHUTDOWN;
+int grpc_channel_num_external_connectivity_watchers(grpc_channel* channel) {
+ grpc_core::ClientChannel* client_channel =
+ grpc_core::ClientChannel::GetFromChannel(channel);
+ if (client_channel == nullptr) {
+ gpr_log(GPR_ERROR,
+ "grpc_channel_num_external_connectivity_watchers called on "
+ "something that is not a client channel");
+ return 0;
+ }
+ return client_channel->NumExternalConnectivityWatchers();
}
-typedef enum {
- WAITING,
- READY_TO_CALL_BACK,
- CALLING_BACK_AND_FINISHED,
-} callback_phase;
+int grpc_channel_support_connectivity_watcher(grpc_channel* channel) {
+ return grpc_core::ClientChannel::GetFromChannel(channel) != nullptr;
+}
+namespace grpc_core {
namespace {
-struct state_watcher {
- gpr_mu mu;
- callback_phase phase;
- grpc_closure on_complete;
- grpc_closure on_timeout;
- grpc_closure watcher_timer_init;
- grpc_timer alarm;
- grpc_connectivity_state state;
- grpc_completion_queue* cq;
- grpc_cq_completion completion_storage;
- grpc_channel* channel;
- grpc_error* error;
- void* tag;
-};
-} // namespace
-
-static void delete_state_watcher(state_watcher* w) {
- grpc_channel_element* client_channel_elem = grpc_channel_stack_last_element(
- grpc_channel_get_channel_stack(w->channel));
- if (client_channel_elem->filter == &grpc_client_channel_filter) {
- GRPC_CHANNEL_INTERNAL_UNREF(w->channel, "watch_channel_connectivity");
- } else {
- abort();
- }
- gpr_mu_destroy(&w->mu);
- gpr_free(w);
-}
-static void finished_completion(void* pw, grpc_cq_completion* /*ignored*/) {
- bool should_delete = false;
- state_watcher* w = static_cast(pw);
- gpr_mu_lock(&w->mu);
- switch (w->phase) {
- case WAITING:
- case READY_TO_CALL_BACK:
- GPR_UNREACHABLE_CODE(return );
- case CALLING_BACK_AND_FINISHED:
- should_delete = true;
- break;
+class StateWatcher {
+ public:
+ StateWatcher(grpc_channel* channel, grpc_completion_queue* cq, void* tag,
+ grpc_connectivity_state last_observed_state,
+ gpr_timespec deadline)
+ : channel_(channel), cq_(cq), tag_(tag), state_(last_observed_state) {
+ GPR_ASSERT(grpc_cq_begin_op(cq, tag));
+ GRPC_CHANNEL_INTERNAL_REF(channel, "watch_channel_connectivity");
+ GRPC_CLOSURE_INIT(&on_complete_, WatchComplete, this, nullptr);
+ GRPC_CLOSURE_INIT(&on_timeout_, TimeoutComplete, this, nullptr);
+ auto* watcher_timer_init_state = new WatcherTimerInitState(
+ this, grpc_timespec_to_millis_round_up(deadline));
+ ClientChannel* client_channel = ClientChannel::GetFromChannel(channel);
+ GPR_ASSERT(client_channel != nullptr);
+ client_channel->AddExternalConnectivityWatcher(
+ grpc_polling_entity_create_from_pollset(grpc_cq_pollset(cq)), &state_,
+ &on_complete_, watcher_timer_init_state->closure());
}
- gpr_mu_unlock(&w->mu);
- if (should_delete) {
- delete_state_watcher(w);
+ ~StateWatcher() {
+ GRPC_CHANNEL_INTERNAL_UNREF(channel_, "watch_channel_connectivity");
}
-}
-
-static void partly_done(state_watcher* w, bool due_to_completion,
- grpc_error* error) {
- bool end_op = false;
- void* end_op_tag = nullptr;
- grpc_error* end_op_error = nullptr;
- grpc_completion_queue* end_op_cq = nullptr;
- grpc_cq_completion* end_op_completion_storage = nullptr;
- if (due_to_completion) {
- grpc_timer_cancel(&w->alarm);
- } else {
- grpc_channel_element* client_channel_elem = grpc_channel_stack_last_element(
- grpc_channel_get_channel_stack(w->channel));
- grpc_client_channel_watch_connectivity_state(
- client_channel_elem,
- grpc_polling_entity_create_from_pollset(grpc_cq_pollset(w->cq)),
- nullptr, &w->on_complete, nullptr);
- }
+ private:
+ // A fire-and-forget object used to delay starting the timer until the
+ // ClientChannel actually starts the watch.
+ class WatcherTimerInitState {
+ public:
+ WatcherTimerInitState(StateWatcher* state_watcher, grpc_millis deadline)
+ : state_watcher_(state_watcher), deadline_(deadline) {
+ GRPC_CLOSURE_INIT(&closure_, WatcherTimerInit, this, nullptr);
+ }
- gpr_mu_lock(&w->mu);
+ grpc_closure* closure() { return &closure_; }
- if (due_to_completion) {
- if (GRPC_TRACE_FLAG_ENABLED(grpc_trace_operation_failures)) {
- GRPC_LOG_IF_ERROR("watch_completion_error", GRPC_ERROR_REF(error));
+ private:
+ static void WatcherTimerInit(void* arg, grpc_error_handle /*error*/) {
+ auto* self = static_cast(arg);
+ grpc_timer_init(&self->state_watcher_->timer_, self->deadline_,
+ &self->state_watcher_->on_timeout_);
+ delete self;
}
- GRPC_ERROR_UNREF(error);
- error = GRPC_ERROR_NONE;
- } else {
- if (error == GRPC_ERROR_NONE) {
- error = GRPC_ERROR_CREATE_FROM_STATIC_STRING(
- "Timed out waiting for connection state change");
- } else if (error == GRPC_ERROR_CANCELLED) {
- error = GRPC_ERROR_NONE;
+
+ StateWatcher* state_watcher_;
+ grpc_millis deadline_;
+ grpc_closure closure_;
+ };
+
+ enum CallbackPhase { kWaiting, kReadyToCallBack, kCallingBackAndFinished };
+
+ // Called when the completion is returned to the CQ.
+ static void FinishedCompletion(void* arg, grpc_cq_completion* /*ignored*/) {
+ auto* self = static_cast(arg);
+ bool should_delete = false;
+ {
+ MutexLock lock(&self->mu_);
+ switch (self->phase_) {
+ case kWaiting:
+ case kReadyToCallBack:
+ GPR_UNREACHABLE_CODE(return );
+ case kCallingBackAndFinished:
+ should_delete = true;
+ }
}
+ if (should_delete) delete self;
}
- switch (w->phase) {
- case WAITING:
- GRPC_ERROR_REF(error);
- w->error = error;
- w->phase = READY_TO_CALL_BACK;
- break;
- case READY_TO_CALL_BACK:
- if (error != GRPC_ERROR_NONE) {
- GPR_ASSERT(!due_to_completion);
- GRPC_ERROR_UNREF(w->error);
- GRPC_ERROR_REF(error);
- w->error = error;
+
+ void PartlyDone(bool due_to_completion, grpc_error_handle error) {
+ bool end_op = false;
+ void* end_op_tag = nullptr;
+ grpc_error_handle end_op_error = GRPC_ERROR_NONE;
+ grpc_completion_queue* end_op_cq = nullptr;
+ grpc_cq_completion* end_op_completion_storage = nullptr;
+ if (due_to_completion) {
+ grpc_timer_cancel(&timer_);
+ } else {
+ grpc_core::ClientChannel* client_channel =
+ grpc_core::ClientChannel::GetFromChannel(channel_);
+ GPR_ASSERT(client_channel != nullptr);
+ client_channel->CancelExternalConnectivityWatcher(&on_complete_);
+ }
+ {
+ MutexLock lock(&mu_);
+ if (due_to_completion) {
+ if (GRPC_TRACE_FLAG_ENABLED(grpc_trace_operation_failures)) {
+ GRPC_LOG_IF_ERROR("watch_completion_error", GRPC_ERROR_REF(error));
+ }
+ GRPC_ERROR_UNREF(error);
+ error = GRPC_ERROR_NONE;
+ } else {
+ if (error == GRPC_ERROR_NONE) {
+ error = GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+ "Timed out waiting for connection state change");
+ } else if (error == GRPC_ERROR_CANCELLED) {
+ error = GRPC_ERROR_NONE;
+ }
+ }
+ switch (phase_) {
+ case kWaiting:
+ GRPC_ERROR_REF(error);
+ error_ = error;
+ phase_ = kReadyToCallBack;
+ break;
+ case kReadyToCallBack:
+ if (error != GRPC_ERROR_NONE) {
+ GPR_ASSERT(!due_to_completion);
+ GRPC_ERROR_UNREF(error_);
+ GRPC_ERROR_REF(error);
+ error_ = error;
+ }
+ phase_ = kCallingBackAndFinished;
+ end_op = true;
+ end_op_cq = cq_;
+ end_op_tag = tag_;
+ end_op_error = error_;
+ end_op_completion_storage = &completion_storage_;
+ break;
+ case kCallingBackAndFinished:
+ GPR_UNREACHABLE_CODE(return );
}
- w->phase = CALLING_BACK_AND_FINISHED;
- end_op = true;
- end_op_cq = w->cq;
- end_op_tag = w->tag;
- end_op_error = w->error;
- end_op_completion_storage = &w->completion_storage;
- break;
- case CALLING_BACK_AND_FINISHED:
- GPR_UNREACHABLE_CODE(return );
- break;
+ }
+ if (end_op) {
+ grpc_cq_end_op(end_op_cq, end_op_tag, end_op_error, FinishedCompletion,
+ this, end_op_completion_storage);
+ }
+ GRPC_ERROR_UNREF(error);
}
- gpr_mu_unlock(&w->mu);
- if (end_op) {
- grpc_cq_end_op(end_op_cq, end_op_tag, end_op_error, finished_completion, w,
- end_op_completion_storage);
+ static void WatchComplete(void* arg, grpc_error_handle error) {
+ auto* self = static_cast(arg);
+ self->PartlyDone(/*due_to_completion=*/true, GRPC_ERROR_REF(error));
}
- GRPC_ERROR_UNREF(error);
-}
-
-static void watch_complete(void* pw, grpc_error* error) {
- partly_done(static_cast(pw), true, GRPC_ERROR_REF(error));
-}
+ static void TimeoutComplete(void* arg, grpc_error_handle error) {
+ auto* self = static_cast(arg);
+ self->PartlyDone(/*due_to_completion=*/false, GRPC_ERROR_REF(error));
+ }
-static void timeout_complete(void* pw, grpc_error* error) {
- partly_done(static_cast(pw), false, GRPC_ERROR_REF(error));
-}
+ grpc_channel* channel_;
+ grpc_completion_queue* cq_;
+ void* tag_;
-int grpc_channel_num_external_connectivity_watchers(grpc_channel* channel) {
- grpc_channel_element* client_channel_elem =
- grpc_channel_stack_last_element(grpc_channel_get_channel_stack(channel));
- return grpc_client_channel_num_external_connectivity_watchers(
- client_channel_elem);
-}
+ grpc_connectivity_state state_;
-typedef struct watcher_timer_init_arg {
- state_watcher* w;
- gpr_timespec deadline;
-} watcher_timer_init_arg;
+ grpc_cq_completion completion_storage_;
-static void watcher_timer_init(void* arg, grpc_error* /*error_ignored*/) {
- watcher_timer_init_arg* wa = static_cast(arg);
+ grpc_closure on_complete_;
+ grpc_timer timer_;
+ grpc_closure on_timeout_;
- grpc_timer_init(&wa->w->alarm, grpc_timespec_to_millis_round_up(wa->deadline),
- &wa->w->on_timeout);
- gpr_free(wa);
-}
+ Mutex mu_;
+ CallbackPhase phase_ ABSL_GUARDED_BY(mu_) = kWaiting;
+ grpc_error_handle error_ ABSL_GUARDED_BY(mu_) = GRPC_ERROR_NONE;
+};
-int grpc_channel_support_connectivity_watcher(grpc_channel* channel) {
- grpc_channel_element* client_channel_elem =
- grpc_channel_stack_last_element(grpc_channel_get_channel_stack(channel));
- return client_channel_elem->filter != &grpc_client_channel_filter ? 0 : 1;
-}
+} // namespace
+} // namespace grpc_core
void grpc_channel_watch_connectivity_state(
grpc_channel* channel, grpc_connectivity_state last_observed_state,
gpr_timespec deadline, grpc_completion_queue* cq, void* tag) {
- grpc_channel_element* client_channel_elem =
- grpc_channel_stack_last_element(grpc_channel_get_channel_stack(channel));
grpc_core::ApplicationCallbackExecCtx callback_exec_ctx;
grpc_core::ExecCtx exec_ctx;
- state_watcher* w = static_cast(gpr_malloc(sizeof(*w)));
-
GRPC_API_TRACE(
"grpc_channel_watch_connectivity_state("
"channel=%p, last_observed_state=%d, "
@@ -230,35 +235,5 @@ void grpc_channel_watch_connectivity_state(
7,
(channel, (int)last_observed_state, deadline.tv_sec, deadline.tv_nsec,
(int)deadline.clock_type, cq, tag));
-
- GPR_ASSERT(grpc_cq_begin_op(cq, tag));
-
- gpr_mu_init(&w->mu);
- GRPC_CLOSURE_INIT(&w->on_complete, watch_complete, w,
- grpc_schedule_on_exec_ctx);
- GRPC_CLOSURE_INIT(&w->on_timeout, timeout_complete, w,
- grpc_schedule_on_exec_ctx);
- w->phase = WAITING;
- w->state = last_observed_state;
- w->cq = cq;
- w->tag = tag;
- w->channel = channel;
- w->error = nullptr;
-
- watcher_timer_init_arg* wa = static_cast(
- gpr_malloc(sizeof(watcher_timer_init_arg)));
- wa->w = w;
- wa->deadline = deadline;
- GRPC_CLOSURE_INIT(&w->watcher_timer_init, watcher_timer_init, wa,
- grpc_schedule_on_exec_ctx);
-
- if (client_channel_elem->filter == &grpc_client_channel_filter) {
- GRPC_CHANNEL_INTERNAL_REF(channel, "watch_channel_connectivity");
- grpc_client_channel_watch_connectivity_state(
- client_channel_elem,
- grpc_polling_entity_create_from_pollset(grpc_cq_pollset(cq)), &w->state,
- &w->on_complete, &w->watcher_timer_init);
- } else {
- abort();
- }
+ new grpc_core::StateWatcher(channel, cq, tag, last_observed_state, deadline);
}
diff --git a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc
index 455e1460c4f..3bbec5eaadc 100644
--- a/src/core/ext/filters/client_channel/client_channel.cc
+++ b/src/core/ext/filters/client_channel/client_channel.cc
@@ -51,7 +51,7 @@
#include "src/core/ext/filters/client_channel/proxy_mapper_registry.h"
#include "src/core/ext/filters/client_channel/resolver_registry.h"
#include "src/core/ext/filters/client_channel/resolver_result_parsing.h"
-#include "src/core/ext/filters/client_channel/retry_throttle.h"
+#include "src/core/ext/filters/client_channel/retry_filter.h"
#include "src/core/ext/filters/client_channel/service_config.h"
#include "src/core/ext/filters/client_channel/service_config_call_data.h"
#include "src/core/ext/filters/client_channel/subchannel.h"
@@ -61,7 +61,6 @@
#include "src/core/lib/channel/connected_channel.h"
#include "src/core/lib/channel/status_util.h"
#include "src/core/lib/gpr/string.h"
-#include "src/core/lib/gprpp/manual_constructor.h"
#include "src/core/lib/gprpp/sync.h"
#include "src/core/lib/iomgr/iomgr.h"
#include "src/core/lib/iomgr/polling_entity.h"
@@ -81,335 +80,23 @@
// Client channel filter
//
-// By default, we buffer 256 KiB per RPC for retries.
-// TODO(roth): Do we have any data to suggest a better value?
-#define DEFAULT_PER_RPC_RETRY_BUFFER_SIZE (256 << 10)
-
-// This value was picked arbitrarily. It can be changed if there is
-// any even moderately compelling reason to do so.
-#define RETRY_BACKOFF_JITTER 0.2
-
-// Max number of batches that can be pending on a call at any given
-// time. This includes one batch for each of the following ops:
-// recv_initial_metadata
-// send_initial_metadata
-// recv_message
-// send_message
-// recv_trailing_metadata
-// send_trailing_metadata
-#define MAX_PENDING_BATCHES 6
-
-// Channel arg containing a pointer to the ChannelData object.
-#define GRPC_ARG_CLIENT_CHANNEL_DATA "grpc.internal.client_channel_data"
-
-// Channel arg containing a pointer to the RetryThrottleData object.
-#define GRPC_ARG_RETRY_THROTTLE_DATA "grpc.internal.retry_throttle_data"
-
namespace grpc_core {
using internal::ClientChannelGlobalParsedConfig;
using internal::ClientChannelMethodParsedConfig;
using internal::ClientChannelServiceConfigParser;
-using internal::ServerRetryThrottleData;
TraceFlag grpc_client_channel_call_trace(false, "client_channel_call");
TraceFlag grpc_client_channel_routing_trace(false, "client_channel_routing");
-namespace {
-
-//
-// ChannelData definition
-//
-
-class LoadBalancedCall;
-
-class ChannelData {
- public:
- struct ResolverQueuedCall {
- grpc_call_element* elem;
- ResolverQueuedCall* next = nullptr;
- };
- struct LbQueuedCall {
- LoadBalancedCall* lb_call;
- LbQueuedCall* next = nullptr;
- };
-
- static grpc_error* Init(grpc_channel_element* elem,
- grpc_channel_element_args* args);
- static void Destroy(grpc_channel_element* elem);
- static void StartTransportOp(grpc_channel_element* elem,
- grpc_transport_op* op);
- static void GetChannelInfo(grpc_channel_element* elem,
- const grpc_channel_info* info);
-
- bool deadline_checking_enabled() const { return deadline_checking_enabled_; }
- bool enable_retries() const { return enable_retries_; }
- size_t per_rpc_retry_buffer_size() const {
- return per_rpc_retry_buffer_size_;
- }
- grpc_channel_stack* owning_stack() const { return owning_stack_; }
-
- // Note: Does NOT return a new ref.
- grpc_error* disconnect_error() const {
- return disconnect_error_.Load(MemoryOrder::ACQUIRE);
- }
-
- Mutex* resolution_mu() const { return &resolution_mu_; }
- // These methods all require holding resolution_mu_.
- void AddResolverQueuedCall(ResolverQueuedCall* call,
- grpc_polling_entity* pollent);
- void RemoveResolverQueuedCall(ResolverQueuedCall* to_remove,
- grpc_polling_entity* pollent);
- bool received_service_config_data() const {
- return received_service_config_data_;
- }
- grpc_error* resolver_transient_failure_error() const {
- return resolver_transient_failure_error_;
- }
- RefCountedPtr service_config() const {
- return service_config_;
- }
- ConfigSelector* config_selector() const { return config_selector_.get(); }
- RefCountedPtr dynamic_filters() const {
- return dynamic_filters_;
- }
-
- Mutex* data_plane_mu() const { return &data_plane_mu_; }
- // These methods all require holding data_plane_mu_.
- LoadBalancingPolicy::SubchannelPicker* picker() const {
- return picker_.get();
- }
- void AddLbQueuedCall(LbQueuedCall* call, grpc_polling_entity* pollent);
- void RemoveLbQueuedCall(LbQueuedCall* to_remove,
- grpc_polling_entity* pollent);
- RefCountedPtr GetConnectedSubchannelInDataPlane(
- SubchannelInterface* subchannel) const;
-
- WorkSerializer* work_serializer() const { return work_serializer_.get(); }
-
- grpc_connectivity_state CheckConnectivityState(bool try_to_connect);
-
- void AddExternalConnectivityWatcher(grpc_polling_entity pollent,
- grpc_connectivity_state* state,
- grpc_closure* on_complete,
- grpc_closure* watcher_timer_init) {
- new ExternalConnectivityWatcher(this, pollent, state, on_complete,
- watcher_timer_init);
- }
-
- void RemoveExternalConnectivityWatcher(grpc_closure* on_complete,
- bool cancel) {
- ExternalConnectivityWatcher::RemoveWatcherFromExternalWatchersMap(
- this, on_complete, cancel);
- }
-
- int NumExternalConnectivityWatchers() const {
- MutexLock lock(&external_watchers_mu_);
- return static_cast(external_watchers_.size());
- }
-
- void AddConnectivityWatcher(
- grpc_connectivity_state initial_state,
- OrphanablePtr watcher);
- void RemoveConnectivityWatcher(
- AsyncConnectivityStateWatcherInterface* watcher);
-
- private:
- class SubchannelWrapper;
- class ClientChannelControlHelper;
- class ConnectivityWatcherAdder;
- class ConnectivityWatcherRemover;
-
- // Represents a pending connectivity callback from an external caller
- // via grpc_client_channel_watch_connectivity_state().
- class ExternalConnectivityWatcher : public ConnectivityStateWatcherInterface {
- public:
- ExternalConnectivityWatcher(ChannelData* chand, grpc_polling_entity pollent,
- grpc_connectivity_state* state,
- grpc_closure* on_complete,
- grpc_closure* watcher_timer_init);
-
- ~ExternalConnectivityWatcher() override;
-
- // Removes the watcher from the external_watchers_ map.
- static void RemoveWatcherFromExternalWatchersMap(ChannelData* chand,
- grpc_closure* on_complete,
- bool cancel);
-
- void Notify(grpc_connectivity_state state,
- const absl::Status& /* status */) override;
-
- void Cancel();
-
- private:
- // Adds the watcher to state_tracker_. Consumes the ref that is passed to it
- // from Start().
- void AddWatcherLocked();
- void RemoveWatcherLocked();
-
- ChannelData* chand_;
- grpc_polling_entity pollent_;
- grpc_connectivity_state initial_state_;
- grpc_connectivity_state* state_;
- grpc_closure* on_complete_;
- grpc_closure* watcher_timer_init_;
- Atomic done_{false};
- };
-
- class ResolverResultHandler : public Resolver::ResultHandler {
- public:
- explicit ResolverResultHandler(ChannelData* chand) : chand_(chand) {
- GRPC_CHANNEL_STACK_REF(chand_->owning_stack_, "ResolverResultHandler");
- }
-
- ~ResolverResultHandler() override {
- if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) {
- gpr_log(GPR_INFO, "chand=%p: resolver shutdown complete", chand_);
- }
- GRPC_CHANNEL_STACK_UNREF(chand_->owning_stack_, "ResolverResultHandler");
- }
-
- void ReturnResult(Resolver::Result result) override {
- chand_->OnResolverResultChangedLocked(std::move(result));
- }
-
- void ReturnError(grpc_error* error) override {
- chand_->OnResolverErrorLocked(error);
- }
-
- private:
- ChannelData* chand_;
- };
-
- ChannelData(grpc_channel_element_args* args, grpc_error** error);
- ~ChannelData();
-
- // Note: All methods with "Locked" suffix must be invoked from within
- // work_serializer_.
-
- void OnResolverResultChangedLocked(Resolver::Result result);
- void OnResolverErrorLocked(grpc_error* error);
-
- void CreateOrUpdateLbPolicyLocked(
- RefCountedPtr lb_policy_config,
- Resolver::Result result);
- OrphanablePtr CreateLbPolicyLocked(
- const grpc_channel_args& args);
-
- void UpdateStateAndPickerLocked(
- grpc_connectivity_state state, const absl::Status& status,
- const char* reason,
- std::unique_ptr picker);
-
- void UpdateServiceConfigInControlPlaneLocked(
- RefCountedPtr service_config,
- RefCountedPtr config_selector,
- const internal::ClientChannelGlobalParsedConfig* parsed_service_config,
- const char* lb_policy_name);
-
- void UpdateServiceConfigInDataPlaneLocked();
-
- void CreateResolverLocked();
- void DestroyResolverAndLbPolicyLocked();
-
- grpc_error* DoPingLocked(grpc_transport_op* op);
-
- void StartTransportOpLocked(grpc_transport_op* op);
-
- void TryToConnectLocked();
-
- //
- // Fields set at construction and never modified.
- //
- const bool deadline_checking_enabled_;
- const bool enable_retries_;
- const size_t per_rpc_retry_buffer_size_;
- grpc_channel_stack* owning_stack_;
- ClientChannelFactory* client_channel_factory_;
- const grpc_channel_args* channel_args_;
- RefCountedPtr default_service_config_;
- std::string server_name_;
- UniquePtr target_uri_;
- channelz::ChannelNode* channelz_node_;
-
- //
- // Fields related to name resolution. Guarded by resolution_mu_.
- //
- mutable Mutex resolution_mu_;
- // Linked list of calls queued waiting for resolver result.
- ResolverQueuedCall* resolver_queued_calls_ = nullptr;
- // Data from service config.
- grpc_error* resolver_transient_failure_error_ = GRPC_ERROR_NONE;
- bool received_service_config_data_ = false;
- RefCountedPtr service_config_;
- RefCountedPtr config_selector_;
- RefCountedPtr dynamic_filters_;
-
- //
- // Fields used in the data plane. Guarded by data_plane_mu_.
- //
- mutable Mutex data_plane_mu_;
- std::unique_ptr picker_;
- // Linked list of calls queued waiting for LB pick.
- LbQueuedCall* lb_queued_calls_ = nullptr;
-
- //
- // Fields used in the control plane. Guarded by work_serializer.
- //
- std::shared_ptr work_serializer_;
- grpc_pollset_set* interested_parties_;
- ConnectivityStateTracker state_tracker_;
- OrphanablePtr resolver_;
- bool previous_resolution_contained_addresses_ = false;
- RefCountedPtr saved_service_config_;
- RefCountedPtr saved_config_selector_;
- absl::optional health_check_service_name_;
- OrphanablePtr lb_policy_;
- RefCountedPtr subchannel_pool_;
- // The number of SubchannelWrapper instances referencing a given Subchannel.
- std::map subchannel_refcount_map_;
- // The set of SubchannelWrappers that currently exist.
- // No need to hold a ref, since the map is updated in the control-plane
- // work_serializer when the SubchannelWrappers are created and destroyed.
- std::set subchannel_wrappers_;
- // Pending ConnectedSubchannel updates for each SubchannelWrapper.
- // Updates are queued here in the control plane work_serializer and then
- // applied in the data plane mutex when the picker is updated.
- std::map, RefCountedPtr>
- pending_subchannel_updates_;
- int keepalive_time_ = -1;
-
- //
- // Fields accessed from both data plane mutex and control plane
- // work_serializer.
- //
- Atomic disconnect_error_;
-
- //
- // Fields guarded by a mutex, since they need to be accessed
- // synchronously via get_channel_info().
- //
- Mutex info_mu_;
- UniquePtr info_lb_policy_name_;
- UniquePtr info_service_config_json_;
-
- //
- // Fields guarded by a mutex, since they need to be accessed
- // synchronously via grpc_channel_num_external_connectivity_watchers().
- //
- mutable Mutex external_watchers_mu_;
- std::map>
- external_watchers_;
-};
-
//
-// CallData definition
+// ClientChannel::CallData definition
//
-class CallData {
+class ClientChannel::CallData {
public:
- static grpc_error* Init(grpc_call_element* elem,
- const grpc_call_element_args* args);
+ static grpc_error_handle Init(grpc_call_element* elem,
+ const grpc_call_element_args* args);
static void Destroy(grpc_call_element* elem,
const grpc_call_final_info* final_info,
grpc_closure* then_schedule_closure);
@@ -418,22 +105,23 @@ class CallData {
static void SetPollent(grpc_call_element* elem, grpc_polling_entity* pollent);
// Invoked by channel for queued calls when name resolution is completed.
- static void CheckResolution(void* arg, grpc_error* error);
+ static void CheckResolution(void* arg, grpc_error_handle error);
// Helper function for applying the service config to a call while
- // holding ChannelData::resolution_mu_.
+ // holding ClientChannel::resolution_mu_.
// Returns true if the service config has been applied to the call, in which
// case the caller must invoke ResolutionDone() or AsyncResolutionDone()
// with the returned error.
- bool CheckResolutionLocked(grpc_call_element* elem, grpc_error** error);
+ bool CheckResolutionLocked(grpc_call_element* elem, grpc_error_handle* error)
+ ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannel::resolution_mu_);
// Schedules a callback to continue processing the call once
// resolution is complete. The callback will not run until after this
// method returns.
- void AsyncResolutionDone(grpc_call_element* elem, grpc_error* error);
+ void AsyncResolutionDone(grpc_call_element* elem, grpc_error_handle error);
private:
class ResolverQueuedCallCanceller;
- CallData(grpc_call_element* elem, const ChannelData& chand,
+ CallData(grpc_call_element* elem, const ClientChannel& chand,
const grpc_call_element_args& args);
~CallData();
@@ -441,7 +129,8 @@ class CallData {
static size_t GetBatchIndex(grpc_transport_stream_op_batch* batch);
void PendingBatchesAdd(grpc_call_element* elem,
grpc_transport_stream_op_batch* batch);
- static void FailPendingBatchInCallCombiner(void* arg, grpc_error* error);
+ static void FailPendingBatchInCallCombiner(void* arg,
+ grpc_error_handle error);
// A predicate type and some useful implementations for PendingBatchesFail().
typedef bool (*YieldCallCombinerPredicate)(
const CallCombinerClosureList& closures);
@@ -459,9 +148,10 @@ class CallData {
// If yield_call_combiner_predicate returns true, assumes responsibility for
// yielding the call combiner.
void PendingBatchesFail(
- grpc_call_element* elem, grpc_error* error,
+ grpc_call_element* elem, grpc_error_handle error,
YieldCallCombinerPredicate yield_call_combiner_predicate);
- static void ResumePendingBatchInCallCombiner(void* arg, grpc_error* ignored);
+ static void ResumePendingBatchInCallCombiner(void* arg,
+ grpc_error_handle ignored);
// Resumes all pending batches on lb_call_.
void PendingBatchesResume(grpc_call_element* elem);
@@ -469,20 +159,23 @@ class CallData {
// that the resolver has returned results to the channel.
// If an error is returned, the error indicates the status with which
// the call should be failed.
- grpc_error* ApplyServiceConfigToCallLocked(
- grpc_call_element* elem, grpc_metadata_batch* initial_metadata);
+ grpc_error_handle ApplyServiceConfigToCallLocked(
+ grpc_call_element* elem, grpc_metadata_batch* initial_metadata)
+ ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannel::resolution_mu_);
// Invoked when the resolver result is applied to the caller, on both
// success or failure.
- static void ResolutionDone(void* arg, grpc_error* error);
+ static void ResolutionDone(void* arg, grpc_error_handle error);
// Removes the call (if present) from the channel's list of calls queued
// for name resolution.
- void MaybeRemoveCallFromResolverQueuedCallsLocked(grpc_call_element* elem);
+ void MaybeRemoveCallFromResolverQueuedCallsLocked(grpc_call_element* elem)
+ ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannel::resolution_mu_);
// Adds the call (if not already present) to the channel's list of
// calls queued for name resolution.
- void MaybeAddCallToResolverQueuedCallsLocked(grpc_call_element* elem);
+ void MaybeAddCallToResolverQueuedCallsLocked(grpc_call_element* elem)
+ ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannel::resolution_mu_);
static void RecvInitialMetadataReadyForConfigSelectorCommitCallback(
- void* arg, grpc_error* error);
+ void* arg, grpc_error_handle error);
void InjectRecvInitialMetadataReadyForConfigSelectorCommitCallback(
grpc_transport_stream_op_batch* batch);
@@ -508,11 +201,15 @@ class CallData {
grpc_closure pick_closure_;
- // Accessed while holding ChannelData::resolution_mu_.
- bool service_config_applied_ = false;
- bool queued_pending_resolver_result_ = false;
- ChannelData::ResolverQueuedCall resolver_queued_call_;
- ResolverQueuedCallCanceller* resolver_call_canceller_ = nullptr;
+ // Accessed while holding ClientChannel::resolution_mu_.
+ bool service_config_applied_ ABSL_GUARDED_BY(&ClientChannel::resolution_mu_) =
+ false;
+ bool queued_pending_resolver_result_
+ ABSL_GUARDED_BY(&ClientChannel::resolution_mu_) = false;
+ ClientChannel::ResolverQueuedCall resolver_queued_call_
+ ABSL_GUARDED_BY(&ClientChannel::resolution_mu_);
+ ResolverQueuedCallCanceller* resolver_call_canceller_
+ ABSL_GUARDED_BY(&ClientChannel::resolution_mu_) = nullptr;
std::function on_call_committed_;
@@ -530,552 +227,72 @@ class CallData {
grpc_transport_stream_op_batch* pending_batches_[MAX_PENDING_BATCHES] = {};
// Set when we get a cancel_stream op.
- grpc_error* cancel_error_ = GRPC_ERROR_NONE;
-};
-
-//
-// RetryingCall definition
-//
-
-class RetryingCall {
- public:
- RetryingCall(
- ChannelData* chand, const grpc_call_element_args& args,
- grpc_polling_entity* pollent,
- RefCountedPtr retry_throttle_data,
- const ClientChannelMethodParsedConfig::RetryPolicy* retry_policy);
- ~RetryingCall();
-
- void StartTransportStreamOpBatch(grpc_transport_stream_op_batch* batch);
-
- RefCountedPtr subchannel_call() const;
-
- private:
- // State used for starting a retryable batch on a subchannel call.
- // This provides its own grpc_transport_stream_op_batch and other data
- // structures needed to populate the ops in the batch.
- // We allocate one struct on the arena for each attempt at starting a
- // batch on a given subchannel call.
- struct SubchannelCallBatchData {
- // Creates a SubchannelCallBatchData object on the call's arena with the
- // specified refcount. If set_on_complete is true, the batch's
- // on_complete callback will be set to point to on_complete();
- // otherwise, the batch's on_complete callback will be null.
- static SubchannelCallBatchData* Create(RetryingCall* call, int refcount,
- bool set_on_complete);
-
- void Unref() {
- if (gpr_unref(&refs)) Destroy();
- }
-
- SubchannelCallBatchData(RetryingCall* call, int refcount,
- bool set_on_complete);
- // All dtor code must be added in `Destroy()`. This is because we may
- // call closures in `SubchannelCallBatchData` after they are unrefed by
- // `Unref()`, and msan would complain about accessing this class
- // after calling dtor. As a result we cannot call the `dtor` in `Unref()`.
- // TODO(soheil): We should try to call the dtor in `Unref()`.
- ~SubchannelCallBatchData() { Destroy(); }
- void Destroy();
-
- gpr_refcount refs;
- grpc_call_element* elem;
- RetryingCall* call;
- RefCountedPtr