From 147d7c1ec59466c4cc20cf39c0b47b369586c823 Mon Sep 17 00:00:00 2001 From: Robert Bradshaw Date: Thu, 19 Sep 2019 13:58:32 -0700 Subject: [PATCH 001/133] Fix issue with exception being out of scope in Python 3. --- .../grpcio/grpc/_cython/_cygrpc/aio/iomgr/resolver.pyx.pxi | 3 ++- .../grpcio/grpc/_cython/_cygrpc/aio/iomgr/socket.pyx.pxi | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/iomgr/resolver.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/iomgr/resolver.pyx.pxi index 4c102392e5c..d533d6e3a37 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/iomgr/resolver.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/iomgr/resolver.pyx.pxi @@ -35,6 +35,7 @@ cdef class _AsyncioResolver: res = future.result() except Exception as e: error = True + error_msg = str(e) finally: self._task_resolve = None @@ -48,7 +49,7 @@ cdef class _AsyncioResolver: grpc_custom_resolve_callback( self._grpc_resolver, NULL, - grpc_socket_error("getaddrinfo {}".format(str(e)).encode()) + grpc_socket_error("getaddrinfo {}".format(error_msg).encode()) ) cdef void resolve(self, char* host, char* port): diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/iomgr/socket.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/iomgr/socket.pyx.pxi index 690c34c2da9..ebe6bee8316 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/iomgr/socket.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/iomgr/socket.pyx.pxi @@ -45,6 +45,7 @@ cdef class _AsyncioSocket: self._reader, self._writer = future.result() except Exception as e: error = True + error_msg = str(e) finally: self._task_connect = None @@ -61,7 +62,7 @@ cdef class _AsyncioSocket: else: self._grpc_connect_cb( self._grpc_socket, - grpc_socket_error("connect {}".format(str(e)).encode()) + grpc_socket_error("connect {}".format(error_msg).encode()) ) def _read_cb(self, future): From 7fd8c40d2ba54c4d7ecff433d6e8717c92c8193e Mon Sep 17 00:00:00 2001 From: Joey Date: Wed, 9 Oct 2019 00:34:55 +0800 Subject: [PATCH 002/133] Docs: Correct the text format Some minor changes that improve the docs upon markdown format. --- doc/core/grpc-polling-engines.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/core/grpc-polling-engines.md b/doc/core/grpc-polling-engines.md index f93f72be405..e5b700c0b28 100644 --- a/doc/core/grpc-polling-engines.md +++ b/doc/core/grpc-polling-engines.md @@ -36,7 +36,7 @@ The following are the **Opaque** structures exposed by Polling Engine interface - **grpc_fd:** Structure representing a file descriptor - **grpc_pollset:** A set of one or more grpc_fds that are ‘polled’ for readable/writable/error events. One grpc_fd can be in multiple `grpc_pollset`s - **grpc_pollset_worker:** Structure representing a ‘polling thread’ - more specifically, the thread that calls `grpc_pollset_work()` API -- **grpc_pollset_set:** A group of `grpc_fds`, `grpc_pollsets` and `grpc_pollset_sets` (yes, a `grpc_pollset_set` can contain other `grpc_pollset_sets`) +- **grpc_pollset_set:** A group of `grpc_fd`s, `grpc_pollset`s and `grpc_pollset_set`s (yes, a `grpc_pollset_set` can contain other `grpc_pollset_set`s) ### Polling engine API @@ -58,12 +58,12 @@ The following are the **Opaque** structures exposed by Polling Engine interface #### grpc_pollset -- **grpc_pollset_add_fd ** +- **grpc_pollset_add_fd** - Signature: `grpc_pollset_add_fd(grpc_pollset* ps, grpc_fd *fd)` - Add fd to pollset > **NOTE**: There is no `grpc_pollset_remove_fd`. This is because calling `grpc_fd_orphan()` will effectively remove the fd from all the pollsets it’s a part of -- ** grpc_pollset_work ** +- **grpc_pollset_work** - Signature: `grpc_pollset_work(grpc_pollset* ps, grpc_pollset_worker** worker, grpc_millis deadline)` > **NOTE**: `grpc_pollset_work()` requires the pollset mutex to be locked before calling it. Shortly after calling `grpc_pollset_work()`, the function populates the `*worker` pointer (among other things) and releases the mutex. Once `grpc_pollset_work()` returns, the `*worker` pointer is **invalid** and should not be used anymore. See the code in `completion_queue.cc` to see how this is used. - Poll the fds in the pollset for events AND return when ANY of the following is true: @@ -72,15 +72,15 @@ The following are the **Opaque** structures exposed by Polling Engine interface - worker is “kicked” (see `grpc_pollset_kick` for more details) - **grpc_pollset_kick** - - Signature: `grpc_pollset_kick(grpc_pollset* ps, grpc_pollset_worker* worker)` - - “Kick the worker” i.e Force the worker to return from grpc_pollset_work() - - If `worker == nullptr`, kick ANY worker active on that pollset + - Signature: `grpc_pollset_kick(grpc_pollset* ps, grpc_pollset_worker* worker)` + - “Kick the worker” i.e Force the worker to return from grpc_pollset_work() + - If `worker == nullptr`, kick ANY worker active on that pollset #### grpc_pollset_set - **grpc\_pollset\_set\_[add|del]\_fd** - Signature: `grpc_pollset_set_[add|del]_fd(grpc_pollset_set* pss, grpc_fd *fd)` -Add/Remove fd to the `grpc_pollset_set` + - Add/Remove fd to the `grpc_pollset_set` - **grpc\_pollset\_set_[add|del]\_pollset** - Signature: `grpc_pollset_set_[add|del]_pollset(grpc_pollset_set* pss, grpc_pollset* ps)` From a64f149d7fc09d3d2598a7237f5d7f3b4d6bec60 Mon Sep 17 00:00:00 2001 From: Kuang-che Wu Date: Mon, 14 Oct 2019 00:50:58 +0800 Subject: [PATCH 003/133] Fix assertion failure in grpc_channel_create_with_builder This fixes https://bugs.chromium.org/p/chromium/issues/detail?id=986179 --- src/core/lib/surface/channel.cc | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/core/lib/surface/channel.cc b/src/core/lib/surface/channel.cc index 7f48f258318..35ffc8b0af5 100644 --- a/src/core/lib/surface/channel.cc +++ b/src/core/lib/surface/channel.cc @@ -122,11 +122,15 @@ grpc_channel* grpc_channel_create_with_builder( static_cast(args->args[i].value.integer) | 0x1; /* always support no compression */ } else if (0 == strcmp(args->args[i].key, GRPC_ARG_CHANNELZ_CHANNEL_NODE)) { - GPR_ASSERT(args->args[i].type == GRPC_ARG_POINTER); - GPR_ASSERT(args->args[i].value.pointer.p != nullptr); - channel->channelz_node = static_cast( - args->args[i].value.pointer.p) - ->Ref(); + if (args->args[i].type == GRPC_ARG_POINTER) { + GPR_ASSERT(args->args[i].value.pointer.p != nullptr); + channel->channelz_node = static_cast( + args->args[i].value.pointer.p) + ->Ref(); + } else { + gpr_log(GPR_DEBUG, + GRPC_ARG_CHANNELZ_CHANNEL_NODE " should be a pointer"); + } } } From db577b33604b23a2b8aaf92c9ac70018207f0b85 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Tue, 22 Oct 2019 19:22:45 -0700 Subject: [PATCH 004/133] Convert some GRPC_CLOSURE_SCHED to GRPC_CLOSURE_RUN --- .../client_channel/http_connect_handshaker.cc | 60 ++++++++++--------- src/core/lib/iomgr/tcp_posix.cc | 18 +++--- src/core/lib/surface/call.cc | 10 +--- 3 files changed, 45 insertions(+), 43 deletions(-) diff --git a/src/core/ext/filters/client_channel/http_connect_handshaker.cc b/src/core/ext/filters/client_channel/http_connect_handshaker.cc index 660f6b85c00..96be9205e39 100644 --- a/src/core/ext/filters/client_channel/http_connect_handshaker.cc +++ b/src/core/ext/filters/client_channel/http_connect_handshaker.cc @@ -58,7 +58,7 @@ class HttpConnectHandshaker : public Handshaker { static void OnWriteDone(void* arg, grpc_error* error); static void OnReadDone(void* arg, grpc_error* error); - gpr_mu mu_; + Mutex mu_; bool is_shutdown_ = false; // Endpoint and read buffer to destroy after a shutdown. @@ -78,7 +78,6 @@ class HttpConnectHandshaker : public Handshaker { }; HttpConnectHandshaker::~HttpConnectHandshaker() { - gpr_mu_destroy(&mu_); if (endpoint_to_destroy_ != nullptr) { grpc_endpoint_destroy(endpoint_to_destroy_); } @@ -131,20 +130,21 @@ void HttpConnectHandshaker::HandshakeFailedLocked(grpc_error* error) { // Callback invoked when finished writing HTTP CONNECT request. void HttpConnectHandshaker::OnWriteDone(void* arg, grpc_error* error) { auto* handshaker = static_cast(arg); - gpr_mu_lock(&handshaker->mu_); + ReleasableMutexLock lock(&handshaker->mu_); if (error != GRPC_ERROR_NONE || handshaker->is_shutdown_) { // If the write failed or we're shutting down, clean up and invoke the // callback with the error. handshaker->HandshakeFailedLocked(GRPC_ERROR_REF(error)); - gpr_mu_unlock(&handshaker->mu_); + lock.Unlock(); handshaker->Unref(); } else { // Otherwise, read the response. // The read callback inherits our ref to the handshaker. - grpc_endpoint_read(handshaker->args_->endpoint, - handshaker->args_->read_buffer, - &handshaker->response_read_closure_, /*urgent=*/true); - gpr_mu_unlock(&handshaker->mu_); + grpc_endpoint* ep = handshaker->args_->endpoint; + grpc_slice_buffer* read_buffer = handshaker->args_->read_buffer; + grpc_closure* closure = &handshaker->response_read_closure_; + lock.Unlock(); + grpc_endpoint_read(ep, read_buffer, closure, /*urgent=*/true); } } @@ -152,7 +152,7 @@ void HttpConnectHandshaker::OnWriteDone(void* arg, grpc_error* error) { void HttpConnectHandshaker::OnReadDone(void* arg, grpc_error* error) { auto* handshaker = static_cast(arg); - gpr_mu_lock(&handshaker->mu_); + ReleasableMutexLock lock(&handshaker->mu_); if (error != GRPC_ERROR_NONE || handshaker->is_shutdown_) { // If the read failed or we're shutting down, clean up and invoke the // callback with the error. @@ -204,10 +204,11 @@ void HttpConnectHandshaker::OnReadDone(void* arg, grpc_error* error) { // at the Content-Length: header). if (handshaker->http_parser_.state != GRPC_HTTP_BODY) { grpc_slice_buffer_reset_and_unref_internal(handshaker->args_->read_buffer); - grpc_endpoint_read(handshaker->args_->endpoint, - handshaker->args_->read_buffer, - &handshaker->response_read_closure_, /*urgent=*/true); - gpr_mu_unlock(&handshaker->mu_); + grpc_endpoint* ep = handshaker->args_->endpoint; + grpc_slice_buffer* read_buffer = handshaker->args_->read_buffer; + grpc_closure* closure = &handshaker->response_read_closure_; + lock.Unlock(); + grpc_endpoint_read(ep, read_buffer, closure, /*urgent=*/true); return; } // Make sure we got a 2xx response. @@ -227,7 +228,7 @@ done: // Set shutdown to true so that subsequent calls to // http_connect_handshaker_shutdown() do nothing. handshaker->is_shutdown_ = true; - gpr_mu_unlock(&handshaker->mu_); + lock.Unlock(); handshaker->Unref(); } @@ -236,13 +237,14 @@ done: // void HttpConnectHandshaker::Shutdown(grpc_error* why) { - gpr_mu_lock(&mu_); - if (!is_shutdown_) { - is_shutdown_ = true; - grpc_endpoint_shutdown(args_->endpoint, GRPC_ERROR_REF(why)); - CleanupArgsForFailureLocked(); + { + MutexLock lock(&mu_); + if (!is_shutdown_) { + is_shutdown_ = true; + grpc_endpoint_shutdown(args_->endpoint, GRPC_ERROR_REF(why)); + CleanupArgsForFailureLocked(); + } } - gpr_mu_unlock(&mu_); GRPC_ERROR_UNREF(why); } @@ -257,9 +259,10 @@ void HttpConnectHandshaker::DoHandshake(grpc_tcp_server_acceptor* acceptor, if (server_name == nullptr) { // Set shutdown to true so that subsequent calls to // http_connect_handshaker_shutdown() do nothing. - gpr_mu_lock(&mu_); - is_shutdown_ = true; - gpr_mu_unlock(&mu_); + { + MutexLock lock(&mu_); + is_shutdown_ = true; + } GRPC_CLOSURE_SCHED(on_handshake_done, GRPC_ERROR_NONE); return; } @@ -290,7 +293,7 @@ void HttpConnectHandshaker::DoHandshake(grpc_tcp_server_acceptor* acceptor, } } // Save state in the handshaker object. - MutexLock lock(&mu_); + ReleasableMutexLock lock(&mu_); args_ = args; on_handshake_done_ = on_handshake_done; // Log connection via proxy. @@ -320,12 +323,15 @@ void HttpConnectHandshaker::DoHandshake(grpc_tcp_server_acceptor* acceptor, gpr_free(header_strings); // Take a new ref to be held by the write callback. Ref().release(); - grpc_endpoint_write(args->endpoint, &write_buffer_, &request_done_closure_, - nullptr); + + grpc_endpoint* ep = args->endpoint; + grpc_slice_buffer* write_buffer = &write_buffer_; + grpc_closure* closure = &request_done_closure_; + lock.Unlock(); + grpc_endpoint_write(ep, write_buffer, closure, nullptr); } HttpConnectHandshaker::HttpConnectHandshaker() { - gpr_mu_init(&mu_); grpc_slice_buffer_init(&write_buffer_); GRPC_CLOSURE_INIT(&request_done_closure_, &HttpConnectHandshaker::OnWriteDone, this, grpc_schedule_on_exec_ctx); diff --git a/src/core/lib/iomgr/tcp_posix.cc b/src/core/lib/iomgr/tcp_posix.cc index 3c7c5496281..8e673c88ce4 100644 --- a/src/core/lib/iomgr/tcp_posix.cc +++ b/src/core/lib/iomgr/tcp_posix.cc @@ -415,7 +415,7 @@ static void call_read_cb(grpc_tcp* tcp, grpc_error* error) { tcp->read_cb = nullptr; tcp->incoming_buffer = nullptr; - GRPC_CLOSURE_SCHED(cb, error); + GRPC_CLOSURE_RUN(cb, error); } #define MAX_READ_IOVEC 4 @@ -643,7 +643,7 @@ static void tcp_read(grpc_endpoint* ep, grpc_slice_buffer* incoming_buffer, * right thing (i.e calls tcp_do_read() which either reads the available * bytes or calls notify_on_read() to be notified when new bytes become * available */ - GRPC_CLOSURE_SCHED(&tcp->read_done_closure, GRPC_ERROR_NONE); + GRPC_CLOSURE_RUN(&tcp->read_done_closure, GRPC_ERROR_NONE); } } @@ -1023,7 +1023,7 @@ static void tcp_handle_write(void* arg /* grpc_tcp */, grpc_error* error) { if (error != GRPC_ERROR_NONE) { cb = tcp->write_cb; tcp->write_cb = nullptr; - GRPC_CLOSURE_SCHED(cb, GRPC_ERROR_REF(error)); + GRPC_CLOSURE_RUN(cb, GRPC_ERROR_REF(error)); TCP_UNREF(tcp, "write"); return; } @@ -1072,11 +1072,11 @@ static void tcp_write(grpc_endpoint* ep, grpc_slice_buffer* buf, tcp->outgoing_buffer_arg = arg; if (buf->length == 0) { - GRPC_CLOSURE_SCHED( - cb, grpc_fd_is_shutdown(tcp->em_fd) - ? tcp_annotate_error( - GRPC_ERROR_CREATE_FROM_STATIC_STRING("EOF"), tcp) - : GRPC_ERROR_NONE); + GRPC_CLOSURE_RUN(cb, + grpc_fd_is_shutdown(tcp->em_fd) + ? tcp_annotate_error( + GRPC_ERROR_CREATE_FROM_STATIC_STRING("EOF"), tcp) + : GRPC_ERROR_NONE); tcp_shutdown_buffer_list(tcp); return; } @@ -1098,7 +1098,7 @@ static void tcp_write(grpc_endpoint* ep, grpc_slice_buffer* buf, const char* str = grpc_error_string(error); gpr_log(GPR_INFO, "write: %s", str); } - GRPC_CLOSURE_SCHED(cb, error); + GRPC_CLOSURE_RUN(cb, error); } } diff --git a/src/core/lib/surface/call.cc b/src/core/lib/surface/call.cc index 99ea9a453ef..8b215b3f2dd 100644 --- a/src/core/lib/surface/call.cc +++ b/src/core/lib/surface/call.cc @@ -1223,12 +1223,8 @@ static void post_batch_completion(batch_control* bctl) { if (bctl->completion_data.notify_tag.is_closure) { /* unrefs error */ bctl->call = nullptr; - /* This closure may be meant to be run within some combiner. Since we aren't - * running in any combiner here, we need to use GRPC_CLOSURE_SCHED instead - * of GRPC_CLOSURE_RUN. - */ - GRPC_CLOSURE_SCHED((grpc_closure*)bctl->completion_data.notify_tag.tag, - error); + GRPC_CLOSURE_RUN((grpc_closure*)bctl->completion_data.notify_tag.tag, + error); GRPC_CALL_INTERNAL_UNREF(call, "completion"); } else { /* unrefs error */ @@ -1573,7 +1569,7 @@ static grpc_call_error call_start_batch(grpc_call* call, const grpc_op* ops, static_cast( gpr_malloc(sizeof(grpc_cq_completion)))); } else { - GRPC_CLOSURE_SCHED((grpc_closure*)notify_tag, GRPC_ERROR_NONE); + GRPC_CLOSURE_RUN((grpc_closure*)notify_tag, GRPC_ERROR_NONE); } error = GRPC_CALL_OK; goto done; From dfd3101ae0ad029279dcf075190680cc3eaa8a46 Mon Sep 17 00:00:00 2001 From: Marc Bury Date: Thu, 24 Oct 2019 02:45:33 +0200 Subject: [PATCH 005/133] Fix typo in python_configure.bzl --- third_party/py/python_configure.bzl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/third_party/py/python_configure.bzl b/third_party/py/python_configure.bzl index 6f9a178a057..c87a2289f25 100644 --- a/third_party/py/python_configure.bzl +++ b/third_party/py/python_configure.bzl @@ -260,8 +260,8 @@ def _create_single_version_package(repository_ctx, # See https://docs.python.org/3/extending/windows.html if _is_windows(repository_ctx): python_include = _normalize_path(python_include) - python_import_lib_name = _get_python_import_lib_name, bin_path_key( - repository_ctx, python_bin) + python_import_lib_name = _get_python_import_lib_name( + repository_ctx, python_bin, bin_path_key) python_import_lib_src = python_include.rsplit( '/', 1)[0] + "/libs/" + python_import_lib_name python_import_lib_genrule = _symlink_genrule_for_dir( From 6f881ab29276096ffcb7eec3795e82276bee7c7f Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Wed, 23 Oct 2019 15:16:13 -0400 Subject: [PATCH 006/133] Fix various CMake style issues Remove some spaces at the end of lines. Change how variables are referenced inside if() statements. Remove the space between if/endif and the first parenthesis. Remove the duplicated condition from endif() blocks. Make indentation more consistent. Remove unneeded duplicate PRIVATE keywords from target_include_directories(). Remove redundant set_source_files_properties() call, as the file is already GENERATED. --- cmake/benchmark.cmake | 16 +-- cmake/cares.cmake | 4 +- cmake/gflags.cmake | 4 +- cmake/msvc_static_runtime.cmake | 8 +- cmake/protobuf.cmake | 6 +- cmake/ssl.cmake | 6 +- cmake/zlib.cmake | 6 +- templates/CMakeLists.txt.template | 219 +++++++++++++++++------------- 8 files changed, 150 insertions(+), 119 deletions(-) diff --git a/cmake/benchmark.cmake b/cmake/benchmark.cmake index 99148b52adf..646f0a6d429 100644 --- a/cmake/benchmark.cmake +++ b/cmake/benchmark.cmake @@ -12,21 +12,21 @@ # See the License for the specific language governing permissions and # limitations under the License. -if("${gRPC_BENCHMARK_PROVIDER}" STREQUAL "module") +if(gRPC_BENCHMARK_PROVIDER STREQUAL "module") set(BENCHMARK_ENABLE_GTEST_TESTS OFF CACHE BOOL "Turn off gTest in gBenchmark") if(NOT BENCHMARK_ROOT_DIR) set(BENCHMARK_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/benchmark) endif() if(EXISTS "${BENCHMARK_ROOT_DIR}/CMakeLists.txt") - add_subdirectory(${BENCHMARK_ROOT_DIR} third_party/benchmark) - if(TARGET benchmark) - set(_gRPC_BENCHMARK_LIBRARIES benchmark) - set(_gRPC_BENCHMARK_INCLUDE_DIR "${BENCHMARK_ROOT_DIR}/include") - endif() + add_subdirectory(${BENCHMARK_ROOT_DIR} third_party/benchmark) + if(TARGET benchmark) + set(_gRPC_BENCHMARK_LIBRARIES benchmark) + set(_gRPC_BENCHMARK_INCLUDE_DIR "${BENCHMARK_ROOT_DIR}/include") + endif() else() - message(WARNING "gRPC_BENCHMARK_PROVIDER is \"module\" but BENCHMARK_ROOT_DIR is wrong") + message(WARNING "gRPC_BENCHMARK_PROVIDER is \"module\" but BENCHMARK_ROOT_DIR is wrong") endif() -elseif("${gRPC_BENCHMARK_PROVIDER}" STREQUAL "package") +elseif(gRPC_BENCHMARK_PROVIDER STREQUAL "package") # Use "CONFIG" as there is no built-in cmake module for benchmark. find_package(benchmark REQUIRED CONFIG) if(TARGET benchmark::benchmark) diff --git a/cmake/cares.cmake b/cmake/cares.cmake index c09f6940c91..fb545083e1e 100644 --- a/cmake/cares.cmake +++ b/cmake/cares.cmake @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -if("${gRPC_CARES_PROVIDER}" STREQUAL "module") +if(gRPC_CARES_PROVIDER STREQUAL "module") if(NOT CARES_ROOT_DIR) set(CARES_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/cares/cares) endif() @@ -33,7 +33,7 @@ if("${gRPC_CARES_PROVIDER}" STREQUAL "module") message(WARNING "gRPC_INSTALL will be forced to FALSE because gRPC_CARES_PROVIDER is \"module\"") set(gRPC_INSTALL FALSE) endif() -elseif("${gRPC_CARES_PROVIDER}" STREQUAL "package") +elseif(gRPC_CARES_PROVIDER STREQUAL "package") # Use "CONFIG" as there is no built-in cmake module for c-ares. find_package(c-ares REQUIRED CONFIG) if(TARGET c-ares::cares) diff --git a/cmake/gflags.cmake b/cmake/gflags.cmake index 52c054ca762..aba691a2e02 100644 --- a/cmake/gflags.cmake +++ b/cmake/gflags.cmake @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -if("${gRPC_GFLAGS_PROVIDER}" STREQUAL "module") +if(gRPC_GFLAGS_PROVIDER STREQUAL "module") if(NOT GFLAGS_ROOT_DIR) set(GFLAGS_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/gflags) endif() @@ -23,7 +23,7 @@ if("${gRPC_GFLAGS_PROVIDER}" STREQUAL "module") else() message(WARNING "gRPC_GFLAGS_PROVIDER is \"module\" but GFLAGS_ROOT_DIR is wrong") endif() -elseif("${gRPC_GFLAGS_PROVIDER}" STREQUAL "package") +elseif(gRPC_GFLAGS_PROVIDER STREQUAL "package") # Use "CONFIG" as there is no built-in cmake module for gflags. find_package(gflags REQUIRED CONFIG) if(TARGET gflags::gflags) diff --git a/cmake/msvc_static_runtime.cmake b/cmake/msvc_static_runtime.cmake index 844bd026538..49e07949bf5 100644 --- a/cmake/msvc_static_runtime.cmake +++ b/cmake/msvc_static_runtime.cmake @@ -22,9 +22,9 @@ if(gRPC_MSVC_STATIC_RUNTIME) CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO) - if(${flag_var} MATCHES "/MD") - string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") - endif(${flag_var} MATCHES "/MD") - endforeach(flag_var) + if(flag_var MATCHES "/MD") + string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") + endif() + endforeach() endif() diff --git a/cmake/protobuf.cmake b/cmake/protobuf.cmake index cb799b52953..de6c6e72491 100644 --- a/cmake/protobuf.cmake +++ b/cmake/protobuf.cmake @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -if("${gRPC_PROTOBUF_PROVIDER}" STREQUAL "module") +if(gRPC_PROTOBUF_PROVIDER STREQUAL "module") # Building the protobuf tests require gmock what is not part of a standard protobuf checkout. # Disable them unless they are explicitly requested from the cmake command line (when we assume # gmock is downloaded to the right location inside protobuf). @@ -45,13 +45,13 @@ if("${gRPC_PROTOBUF_PROVIDER}" STREQUAL "module") # For well-known .proto files distributed with protobuf set(_gRPC_PROTOBUF_WELLKNOWN_INCLUDE_DIR "${PROTOBUF_ROOT_DIR}/src") else() - message(WARNING "gRPC_PROTOBUF_PROVIDER is \"module\" but PROTOBUF_ROOT_DIR is wrong") + message(WARNING "gRPC_PROTOBUF_PROVIDER is \"module\" but PROTOBUF_ROOT_DIR is wrong") endif() if(gRPC_INSTALL) message(WARNING "gRPC_INSTALL will be forced to FALSE because gRPC_PROTOBUF_PROVIDER is \"module\"") set(gRPC_INSTALL FALSE) endif() -elseif("${gRPC_PROTOBUF_PROVIDER}" STREQUAL "package") +elseif(gRPC_PROTOBUF_PROVIDER STREQUAL "package") find_package(Protobuf REQUIRED ${gRPC_PROTOBUF_PACKAGE_TYPE}) # {Protobuf,PROTOBUF}_FOUND is defined based on find_package type ("MODULE" vs "CONFIG"). diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake index 19a7d779b35..a983e98650c 100644 --- a/cmake/ssl.cmake +++ b/cmake/ssl.cmake @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -if("${gRPC_SSL_PROVIDER}" STREQUAL "module") +if(gRPC_SSL_PROVIDER STREQUAL "module") if(NOT BORINGSSL_ROOT_DIR) set(BORINGSSL_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/boringssl) endif() @@ -31,13 +31,13 @@ if("${gRPC_SSL_PROVIDER}" STREQUAL "module") set(_gRPC_SSL_INCLUDE_DIR ${BORINGSSL_ROOT_DIR}/include) endif() else() - message(WARNING "gRPC_SSL_PROVIDER is \"module\" but BORINGSSL_ROOT_DIR is wrong") + message(WARNING "gRPC_SSL_PROVIDER is \"module\" but BORINGSSL_ROOT_DIR is wrong") endif() if(gRPC_INSTALL) message(WARNING "gRPC_INSTALL will be forced to FALSE because gRPC_SSL_PROVIDER is \"module\"") set(gRPC_INSTALL FALSE) endif() -elseif("${gRPC_SSL_PROVIDER}" STREQUAL "package") +elseif(gRPC_SSL_PROVIDER STREQUAL "package") # OpenSSL installation directory can be configured by setting OPENSSL_ROOT_DIR # We expect to locate OpenSSL using the built-in cmake module as the openssl # project itself does not provide installation support in its CMakeLists.txt diff --git a/cmake/zlib.cmake b/cmake/zlib.cmake index ed7c9c216ac..794e47f7aa5 100644 --- a/cmake/zlib.cmake +++ b/cmake/zlib.cmake @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -if("${gRPC_ZLIB_PROVIDER}" STREQUAL "module") +if(gRPC_ZLIB_PROVIDER STREQUAL "module") if(NOT ZLIB_ROOT_DIR) set(ZLIB_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zlib) endif() @@ -26,13 +26,13 @@ if("${gRPC_ZLIB_PROVIDER}" STREQUAL "module") set(_gRPC_ZLIB_INCLUDE_DIR "${ZLIB_ROOT_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/third_party/zlib") endif() else() - message(WARNING "gRPC_ZLIB_PROVIDER is \"module\" but ZLIB_ROOT_DIR is wrong") + message(WARNING "gRPC_ZLIB_PROVIDER is \"module\" but ZLIB_ROOT_DIR is wrong") endif() if(gRPC_INSTALL) message(WARNING "gRPC_INSTALL will be forced to FALSE because gRPC_ZLIB_PROVIDER is \"module\"") set(gRPC_INSTALL FALSE) endif() -elseif("${gRPC_ZLIB_PROVIDER}" STREQUAL "package") +elseif(gRPC_ZLIB_PROVIDER STREQUAL "package") # zlib installation directory can be configured by setting ZLIB_ROOT # We allow locating zlib using both "CONFIG" and "MODULE" as the expectation # is that many Linux systems will have zlib installed via a distribution diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template index a2d2c745ee0..6f6354bebb0 100644 --- a/templates/CMakeLists.txt.template +++ b/templates/CMakeLists.txt.template @@ -61,12 +61,43 @@ if all(platform in platforms for platform in ['linux', 'mac', 'posix', 'windows']): return '' cond = ' OR '.join(['_gRPC_PLATFORM_%s' % platform.upper() for platform in platforms]) - return 'if(%s)\n' % cond + return 'if(%s)' % cond def get_platforms_condition_end(platforms): if not get_platforms_condition_begin(platforms): return '' - return 'endif()\n' + return 'endif()' + + def platforms_condition_block(platforms): + def _func(text): + lines = text.split('\n') + cond = get_platforms_condition_begin(platforms) + if cond: + # Remove empty line following <%block> + del lines[0] + + # Indent each line after + for i, line in enumerate(lines[:-1]): + if line: + lines[i] = ' ' + line + + # Add the condition block + lines.insert(0, cond) + + # Add endif() to the last line + lines[-1] += 'endif()' + else: + # Remove empty line following <%block> + del lines[0] + + # Strip leading whitespace from first line + lines[0] = lines[0].lstrip(' ') + + # Remove empty line before + del lines[-1] + + return '\n'.join(lines) + return _func %> <% # These files are added to a set so that they are not duplicated if multiple @@ -112,7 +143,7 @@ option(gRPC_BACKWARDS_COMPATIBILITY_MODE "Build libraries that are binary compatible across a larger number of OS and libc versions" OFF) set(gRPC_INSTALL_default ON) - if (NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) # Disable gRPC_INSTALL by default if building as a submodule set(gRPC_INSTALL_default OFF) endif() @@ -122,7 +153,7 @@ # Providers for third-party dependencies (gRPC_*_PROVIDER properties): # "module": build the dependency using sources from git submodule (under third_party) # "package": use cmake's find_package functionality to locate a pre-installed dependency - + set(gRPC_ZLIB_PROVIDER "module" CACHE STRING "Provider of zlib library") set_property(CACHE gRPC_ZLIB_PROVIDER PROPERTY STRINGS "module" "package") @@ -165,8 +196,8 @@ ## Some libraries are shared even with BUILD_SHARED_LIBRARIES=OFF set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) - - if (MSVC) + + if(MSVC) include(cmake/msvc_static_runtime.cmake) add_definitions(-D_WIN32_WINNT=0x600 -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS) # needed to compile protobuf @@ -181,7 +212,7 @@ set(CMAKE_C_FLAGS "<%text>${CMAKE_C_FLAGS} ${_gRPC_C_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "<%text>${CMAKE_CXX_FLAGS} ${_gRPC_C_CXX_FLAGS}") - if (gRPC_USE_PROTO_LITE) + if(gRPC_USE_PROTO_LITE) set(_gRPC_PROTOBUF_LIBRARY_NAME "libprotobuf-lite") add_definitions("-DGRPC_USE_PROTO_LITE") else() @@ -190,13 +221,13 @@ if(gRPC_BACKWARDS_COMPATIBILITY_MODE) add_definitions(-DGPR_BACKWARDS_COMPATIBILITY_MODE) - if (_gRPC_PLATFORM_MAC) + if(_gRPC_PLATFORM_MAC) # some C++11 constructs not supported before OS X 10.9 set(CMAKE_OSX_DEPLOYMENT_TARGET 10.9) endif() endif() - if (_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_IOS) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_IOS) set(_gRPC_CORE_NOSTDCXX_FLAGS -fno-exceptions -fno-rtti) else() set(_gRPC_CORE_NOSTDCXX_FLAGS "") @@ -259,9 +290,9 @@ #if cross-compiling, find host plugin if(CMAKE_CROSSCOMPILING) - find_program(_gRPC_CPP_PLUGIN grpc_cpp_plugin) + find_program(_gRPC_CPP_PLUGIN grpc_cpp_plugin) else() - set(_gRPC_CPP_PLUGIN $) + set(_gRPC_CPP_PLUGIN $) endif() add_custom_command( @@ -280,8 +311,6 @@ WORKING_DIRECTORY <%text>${CMAKE_CURRENT_SOURCE_DIR} COMMENT "Running gRPC C++ protocol buffer compiler on <%text>${FIL}" VERBATIM) - - <%text>set_source_files_properties("${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.grpc.pb.cc" "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.grpc.pb.h" "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}_mock.grpc.pb.h" "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.cc" "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.h" PROPERTIES GENERATED TRUE) endforeach() endfunction() @@ -321,57 +350,57 @@ ) % endfor - if (gRPC_BUILD_TESTS) - add_custom_target(buildtests_c) - % for tgt in targets: - % if tgt.build == 'test' and not tgt.language == 'c++' and not tgt.get('external_deps', None) and not tgt.boringssl: - ${get_platforms_condition_begin(tgt.platforms)}\ - add_dependencies(buildtests_c ${tgt.name}) - ${get_platforms_condition_end(tgt.platforms)}\ - % endif - % endfor - - add_custom_target(buildtests_cxx) - % for tgt in targets: - % if tgt.build == 'test' and tgt.language == 'c++' and not tgt.get('external_deps', None) and not tgt.boringssl: - ${get_platforms_condition_begin(tgt.platforms)}\ - add_dependencies(buildtests_cxx ${tgt.name}) - ${get_platforms_condition_end(tgt.platforms)}\ - % endif - % endfor + if(gRPC_BUILD_TESTS) + add_custom_target(buildtests_c) + % for tgt in targets: + % if tgt.build == 'test' and not tgt.language == 'c++' and not tgt.get('external_deps', None) and not tgt.boringssl: + <%block filter='platforms_condition_block(tgt.platforms)'> + add_dependencies(buildtests_c ${tgt.name}) + + % endif + % endfor + + add_custom_target(buildtests_cxx) + % for tgt in targets: + % if tgt.build == 'test' and tgt.language == 'c++' and not tgt.get('external_deps', None) and not tgt.boringssl: + <%block filter='platforms_condition_block(tgt.platforms)'> + add_dependencies(buildtests_cxx ${tgt.name}) + + % endif + % endfor - add_custom_target(buildtests - DEPENDS buildtests_c buildtests_cxx) - endif (gRPC_BUILD_TESTS) + add_custom_target(buildtests + DEPENDS buildtests_c buildtests_cxx) + endif() % for lib in libs: % if lib.build in ["all", "protoc", "tool", "test", "private"] and not lib.boringssl: % if not lib.get('build_system', []) or 'cmake' in lib.get('build_system', []): % if not lib.name in ['ares', 'benchmark', 'upb', 'z']: # we build these using CMake instead % if lib.build in ["test", "private"]: - if (gRPC_BUILD_TESTS) + if(gRPC_BUILD_TESTS) ${cc_library(lib)} - endif (gRPC_BUILD_TESTS) + endif() % elif lib.name in ['grpc_csharp_ext']: - if (gRPC_BUILD_CSHARP_EXT) + if(gRPC_BUILD_CSHARP_EXT) ${cc_library(lib)} % if any(proto_re.match(src) for src in lib.src): - if (gRPC_BUILD_CODEGEN) + if(gRPC_BUILD_CODEGEN) % endif ${cc_install(lib)} % if any(proto_re.match(src) for src in lib.src): - endif (gRPC_BUILD_CODEGEN) + endif() % endif - endif (gRPC_BUILD_CSHARP_EXT) + endif() % else: ${cc_library(lib)} % if not lib.build in ["tool"]: % if any(proto_re.match(src) for src in lib.src): - if (gRPC_BUILD_CODEGEN) + if(gRPC_BUILD_CODEGEN) % endif ${cc_install(lib)} % if any(proto_re.match(src) for src in lib.src): - endif (gRPC_BUILD_CODEGEN) + endif() % endif % endif % endif @@ -383,32 +412,32 @@ % for tgt in targets: % if tgt.build in ["all", "protoc", "tool", "test", "private"] and not tgt.boringssl: % if tgt.build in ["test", "private"]: - if (gRPC_BUILD_TESTS) - ${get_platforms_condition_begin(tgt.platforms)}\ + if(gRPC_BUILD_TESTS) + <%block filter='platforms_condition_block(tgt.platforms)'> ${cc_binary(tgt)} - ${get_platforms_condition_end(tgt.platforms)}\ - endif (gRPC_BUILD_TESTS) + + endif() % elif tgt.build in ["protoc"]: - if (gRPC_BUILD_CODEGEN) - ${get_platforms_condition_begin(tgt.platforms)}\ + if(gRPC_BUILD_CODEGEN) + <%block filter='platforms_condition_block(tgt.platforms)'> ${cc_binary(tgt)} ${cc_install(tgt)} - ${get_platforms_condition_end(tgt.platforms)}\ - endif (gRPC_BUILD_CODEGEN) + + endif() % else: - ${get_platforms_condition_begin(tgt.platforms)}\ + <%block filter='platforms_condition_block(tgt.platforms)'> ${cc_binary(tgt)} % if not tgt.build in ["tool"]: ${cc_install(tgt)} % endif - ${get_platforms_condition_end(tgt.platforms)}\ + % endif % endif % endfor <%def name="cc_library(lib)"> % if any(proto_re.match(src) for src in lib.src): - if (gRPC_BUILD_CODEGEN) + if(gRPC_BUILD_CODEGEN) % endif add_library(${lib.name}${' SHARED' if lib.get('dll', None) == 'only' else ''} % for src in lib.src: @@ -443,7 +472,7 @@ set_target_properties(${lib.name} PROPERTIES COMPILE_PDB_NAME "${lib.name}" COMPILE_PDB_OUTPUT_DIRECTORY <%text>"${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES <%text>${CMAKE_CURRENT_BINARY_DIR}/${lib.name}.pdb DESTINATION <%text>${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -452,25 +481,26 @@ target_include_directories(${lib.name} PUBLIC <%text>$ $ - PRIVATE <%text>${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE <%text>${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE <%text>${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE <%text>${_gRPC_CARES_INCLUDE_DIR} - PRIVATE <%text>${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE <%text>${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE <%text>${_gRPC_SSL_INCLUDE_DIR} - PRIVATE <%text>${_gRPC_UPB_GENERATED_DIR} - PRIVATE <%text>${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE <%text>${_gRPC_UPB_INCLUDE_DIR} - PRIVATE <%text>${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + <%text>${CMAKE_CURRENT_SOURCE_DIR} + <%text>${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + <%text>${_gRPC_BENCHMARK_INCLUDE_DIR} + <%text>${_gRPC_CARES_INCLUDE_DIR} + <%text>${_gRPC_GFLAGS_INCLUDE_DIR} + <%text>${_gRPC_PROTOBUF_INCLUDE_DIR} + <%text>${_gRPC_SSL_INCLUDE_DIR} + <%text>${_gRPC_UPB_GENERATED_DIR} + <%text>${_gRPC_UPB_GRPC_GENERATED_DIR} + <%text>${_gRPC_UPB_INCLUDE_DIR} + <%text>${_gRPC_ZLIB_INCLUDE_DIR} % if lib.build in ['test', 'private'] and lib.language == 'c++': - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock % endif % if lib.language == 'c++': - PRIVATE <%text>${_gRPC_PROTO_GENS_DIR} + <%text>${_gRPC_PROTO_GENS_DIR} % endif ) % if len(get_deps(lib)) > 0: @@ -481,17 +511,17 @@ ) % endif % if lib.name in ["gpr"]: - if (_gRPC_PLATFORM_ANDROID) + if(_gRPC_PLATFORM_ANDROID) target_link_libraries(gpr android log ) - endif (_gRPC_PLATFORM_ANDROID) + endif() % endif % if lib.name in ["grpc", "grpc_cronet", "grpc_test_util", \ "grpc_test_util_unsecure", "grpc_unsecure", \ "grpc++_cronet"]: - if (_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) + if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) target_link_libraries(${lib.name} "-framework CoreFoundation") endif() %endif @@ -510,7 +540,7 @@ endforeach() % endif % if any(proto_re.match(src) for src in lib.src): - endif (gRPC_BUILD_CODEGEN) + endif() % endif @@ -533,26 +563,27 @@ ) target_include_directories(${tgt.name} - PRIVATE <%text>${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE <%text>${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE <%text>${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE <%text>${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE <%text>${_gRPC_CARES_INCLUDE_DIR} - PRIVATE <%text>${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE <%text>${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE <%text>${_gRPC_SSL_INCLUDE_DIR} - PRIVATE <%text>${_gRPC_UPB_GENERATED_DIR} - PRIVATE <%text>${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE <%text>${_gRPC_UPB_INCLUDE_DIR} - PRIVATE <%text>${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + <%text>${CMAKE_CURRENT_SOURCE_DIR} + <%text>${CMAKE_CURRENT_SOURCE_DIR}/include + <%text>${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + <%text>${_gRPC_BENCHMARK_INCLUDE_DIR} + <%text>${_gRPC_CARES_INCLUDE_DIR} + <%text>${_gRPC_GFLAGS_INCLUDE_DIR} + <%text>${_gRPC_PROTOBUF_INCLUDE_DIR} + <%text>${_gRPC_SSL_INCLUDE_DIR} + <%text>${_gRPC_UPB_GENERATED_DIR} + <%text>${_gRPC_UPB_GRPC_GENERATED_DIR} + <%text>${_gRPC_UPB_INCLUDE_DIR} + <%text>${_gRPC_ZLIB_INCLUDE_DIR} % if tgt.build in ['test', 'private'] and tgt.language == 'c++': - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock % endif % if tgt.language == 'c++': - PRIVATE <%text>${_gRPC_PROTO_GENS_DIR} + <%text>${_gRPC_PROTO_GENS_DIR} % endif ) @@ -567,7 +598,7 @@ <%def name="cc_install(tgt)"> - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(TARGETS ${tgt.name} EXPORT gRPCTargets RUNTIME DESTINATION <%text>${gRPC_INSTALL_BINDIR} LIBRARY DESTINATION <%text>${gRPC_INSTALL_LIBDIR} @@ -576,7 +607,7 @@ endif() - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(EXPORT gRPCTargets DESTINATION <%text>${gRPC_INSTALL_CMAKEDIR} NAMESPACE gRPC:: @@ -590,7 +621,7 @@ DESTINATION <%text>${gRPC_INSTALL_CMAKEDIR} ) endforeach() - + install(FILES <%text>${CMAKE_CURRENT_SOURCE_DIR}/etc/roots.pem DESTINATION <%text>${gRPC_INSTALL_SHAREDIR}) From 14055e24d02e13b481339332be0a74a146acb892 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Wed, 23 Oct 2019 15:18:18 -0400 Subject: [PATCH 007/133] Fix line endings of cmake/gRPCConfig.cmake.in --- cmake/gRPCConfig.cmake.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cmake/gRPCConfig.cmake.in b/cmake/gRPCConfig.cmake.in index 1a0fa6a4624..504d5a7f959 100644 --- a/cmake/gRPCConfig.cmake.in +++ b/cmake/gRPCConfig.cmake.in @@ -1,8 +1,8 @@ -# Depend packages -@_gRPC_FIND_ZLIB@ -@_gRPC_FIND_PROTOBUF@ -@_gRPC_FIND_SSL@ -@_gRPC_FIND_CARES@ - -# Targets -include(${CMAKE_CURRENT_LIST_DIR}/gRPCTargets.cmake) +# Depend packages +@_gRPC_FIND_ZLIB@ +@_gRPC_FIND_PROTOBUF@ +@_gRPC_FIND_SSL@ +@_gRPC_FIND_CARES@ + +# Targets +include(${CMAKE_CURRENT_LIST_DIR}/gRPCTargets.cmake) From 0f2ad2a06c4cfd00b257eb6da285894be72b64ea Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Wed, 23 Oct 2019 15:25:05 -0400 Subject: [PATCH 008/133] Use CMakePackageConfigHelpers to generate version file The version file that already existed looks like it was generated by this module. Replace it with proper usage of the module. --- cmake/gRPCConfigVersion.cmake.in | 11 ----------- templates/CMakeLists.txt.template | 19 ++++++++++++------- 2 files changed, 12 insertions(+), 18 deletions(-) delete mode 100644 cmake/gRPCConfigVersion.cmake.in diff --git a/cmake/gRPCConfigVersion.cmake.in b/cmake/gRPCConfigVersion.cmake.in deleted file mode 100644 index f3c19fd403a..00000000000 --- a/cmake/gRPCConfigVersion.cmake.in +++ /dev/null @@ -1,11 +0,0 @@ -set(PACKAGE_VERSION "@PACKAGE_VERSION@") - -# Check whether the requested PACKAGE_FIND_VERSION is compatible -if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}") - set(PACKAGE_VERSION_COMPATIBLE FALSE) -else() - set(PACKAGE_VERSION_COMPATIBLE TRUE) - if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}") - set(PACKAGE_VERSION_EXACT TRUE) - endif() -endif() diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template index 6f6354bebb0..0756e8db917 100644 --- a/templates/CMakeLists.txt.template +++ b/templates/CMakeLists.txt.template @@ -614,13 +614,18 @@ ) endif() - foreach(_config gRPCConfig gRPCConfigVersion) - configure_file(cmake/<%text>${_config}.cmake.in - <%text>${_config}.cmake @ONLY) - install(FILES <%text>${CMAKE_CURRENT_BINARY_DIR}/${_config}.cmake - DESTINATION <%text>${gRPC_INSTALL_CMAKEDIR} - ) - endforeach() + include(CMakePackageConfigHelpers) + + configure_file(cmake/gRPCConfig.cmake.in + gRPCConfig.cmake @ONLY) + write_basic_package_version_file(<%text>${CMAKE_CURRENT_BINARY_DIR}/gRPCConfigVersion.cmake + VERSION <%text>${PACKAGE_VERSION} + COMPATIBILITY AnyNewerVersion) + install(FILES + <%text>${CMAKE_CURRENT_BINARY_DIR}/gRPCConfig.cmake + <%text>${CMAKE_CURRENT_BINARY_DIR}/gRPCConfigVersion.cmake + DESTINATION <%text>${gRPC_INSTALL_CMAKEDIR} + ) install(FILES <%text>${CMAKE_CURRENT_SOURCE_DIR}/etc/roots.pem DESTINATION <%text>${gRPC_INSTALL_SHAREDIR}) From 78a5d593d3a08ac1b626e7f0fbeea5f69dbce54e Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Wed, 23 Oct 2019 15:25:45 -0400 Subject: [PATCH 009/133] Regenerate CMakeLists.txt --- CMakeLists.txt | 17186 ++++++++++++++++++++++++----------------------- 1 file changed, 8795 insertions(+), 8391 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d9819760c0c..16c3b6ce6d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,7 +50,7 @@ option(gRPC_BUILD_CSHARP_EXT "Build C# extensions" ON) option(gRPC_BACKWARDS_COMPATIBILITY_MODE "Build libraries that are binary compatible across a larger number of OS and libc versions" OFF) set(gRPC_INSTALL_default ON) -if (NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) +if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) # Disable gRPC_INSTALL by default if building as a submodule set(gRPC_INSTALL_default OFF) endif() @@ -103,7 +103,7 @@ endif() set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) -if (MSVC) +if(MSVC) include(cmake/msvc_static_runtime.cmake) add_definitions(-D_WIN32_WINNT=0x600 -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS) # needed to compile protobuf @@ -118,7 +118,7 @@ endif() set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_gRPC_C_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_gRPC_C_CXX_FLAGS}") -if (gRPC_USE_PROTO_LITE) +if(gRPC_USE_PROTO_LITE) set(_gRPC_PROTOBUF_LIBRARY_NAME "libprotobuf-lite") add_definitions("-DGRPC_USE_PROTO_LITE") else() @@ -127,13 +127,13 @@ endif() if(gRPC_BACKWARDS_COMPATIBILITY_MODE) add_definitions(-DGPR_BACKWARDS_COMPATIBILITY_MODE) - if (_gRPC_PLATFORM_MAC) + if(_gRPC_PLATFORM_MAC) # some C++11 constructs not supported before OS X 10.9 set(CMAKE_OSX_DEPLOYMENT_TARGET 10.9) endif() endif() -if (_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_IOS) +if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_IOS) set(_gRPC_CORE_NOSTDCXX_FLAGS -fno-exceptions -fno-rtti) else() set(_gRPC_CORE_NOSTDCXX_FLAGS "") @@ -196,9 +196,9 @@ function(protobuf_generate_grpc_cpp) #if cross-compiling, find host plugin if(CMAKE_CROSSCOMPILING) - find_program(_gRPC_CPP_PLUGIN grpc_cpp_plugin) + find_program(_gRPC_CPP_PLUGIN grpc_cpp_plugin) else() - set(_gRPC_CPP_PLUGIN $) + set(_gRPC_CPP_PLUGIN $) endif() add_custom_command( @@ -217,8 +217,6 @@ function(protobuf_generate_grpc_cpp) WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMENT "Running gRPC C++ protocol buffer compiler on ${FIL}" VERBATIM) - - set_source_files_properties("${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.grpc.pb.cc" "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.grpc.pb.h" "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}_mock.grpc.pb.h" "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.cc" "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.h" PROPERTIES GENERATED TRUE) endforeach() endfunction() @@ -327,522 +325,522 @@ protobuf_generate_grpc_cpp( src/proto/grpc/testing/xds/orca_load_report_for_test.proto ) -if (gRPC_BUILD_TESTS) -add_custom_target(buildtests_c) -add_dependencies(buildtests_c algorithm_test) -add_dependencies(buildtests_c alloc_test) -add_dependencies(buildtests_c alpn_test) -add_dependencies(buildtests_c arena_test) -add_dependencies(buildtests_c avl_test) -add_dependencies(buildtests_c bad_server_response_test) -add_dependencies(buildtests_c bin_decoder_test) -add_dependencies(buildtests_c bin_encoder_test) -if(_gRPC_PLATFORM_LINUX) -add_dependencies(buildtests_c buffer_list_test) -endif() -add_dependencies(buildtests_c channel_create_test) -add_dependencies(buildtests_c chttp2_hpack_encoder_test) -add_dependencies(buildtests_c chttp2_stream_map_test) -add_dependencies(buildtests_c chttp2_varint_test) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_c close_fd_test) -endif() -add_dependencies(buildtests_c cmdline_test) -add_dependencies(buildtests_c combiner_test) -add_dependencies(buildtests_c compression_test) -add_dependencies(buildtests_c concurrent_connectivity_test) -add_dependencies(buildtests_c connection_refused_test) -add_dependencies(buildtests_c dns_resolver_connectivity_test) -add_dependencies(buildtests_c dns_resolver_cooldown_using_ares_resolver_test) -add_dependencies(buildtests_c dns_resolver_cooldown_using_native_resolver_test) -add_dependencies(buildtests_c dns_resolver_test) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_c dualstack_socket_test) -endif() -add_dependencies(buildtests_c endpoint_pair_test) -add_dependencies(buildtests_c error_test) -if(_gRPC_PLATFORM_LINUX) -add_dependencies(buildtests_c ev_epollex_linux_test) -endif() -add_dependencies(buildtests_c fake_resolver_test) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_c fake_transport_security_test) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_c fd_conservation_posix_test) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_c fd_posix_test) -endif() -add_dependencies(buildtests_c fling_client) -add_dependencies(buildtests_c fling_server) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_c fling_stream_test) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_c fling_test) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC) -add_dependencies(buildtests_c fork_test) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_c goaway_server_test) -endif() -add_dependencies(buildtests_c gpr_cpu_test) -add_dependencies(buildtests_c gpr_env_test) -add_dependencies(buildtests_c gpr_host_port_test) -add_dependencies(buildtests_c gpr_log_test) -add_dependencies(buildtests_c gpr_manual_constructor_test) -add_dependencies(buildtests_c gpr_spinlock_test) -add_dependencies(buildtests_c gpr_string_test) -add_dependencies(buildtests_c gpr_sync_test) -add_dependencies(buildtests_c gpr_thd_test) -add_dependencies(buildtests_c gpr_time_test) -add_dependencies(buildtests_c gpr_tls_test) -add_dependencies(buildtests_c gpr_useful_test) -add_dependencies(buildtests_c grpc_auth_context_test) -add_dependencies(buildtests_c grpc_b64_test) -add_dependencies(buildtests_c grpc_byte_buffer_reader_test) -add_dependencies(buildtests_c grpc_channel_args_test) -add_dependencies(buildtests_c grpc_channel_stack_builder_test) -add_dependencies(buildtests_c grpc_channel_stack_test) -add_dependencies(buildtests_c grpc_completion_queue_test) -add_dependencies(buildtests_c grpc_completion_queue_threading_test) -add_dependencies(buildtests_c grpc_control_plane_credentials_test) -add_dependencies(buildtests_c grpc_credentials_test) -add_dependencies(buildtests_c grpc_ipv6_loopback_available_test) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_c grpc_json_token_test) -endif() -add_dependencies(buildtests_c grpc_jwt_verifier_test) -add_dependencies(buildtests_c grpc_security_connector_test) -add_dependencies(buildtests_c grpc_ssl_credentials_test) -if(_gRPC_PLATFORM_LINUX) -add_dependencies(buildtests_c handshake_client_ssl) -endif() -if(_gRPC_PLATFORM_LINUX) -add_dependencies(buildtests_c handshake_server_ssl) -endif() -if(_gRPC_PLATFORM_LINUX) -add_dependencies(buildtests_c handshake_server_with_readahead_handshaker) -endif() -if(_gRPC_PLATFORM_LINUX) -add_dependencies(buildtests_c handshake_verify_peer_options) -endif() -add_dependencies(buildtests_c histogram_test) -add_dependencies(buildtests_c hpack_parser_test) -add_dependencies(buildtests_c hpack_table_test) -add_dependencies(buildtests_c http_parser_test) -add_dependencies(buildtests_c httpcli_format_request_test) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_c httpcli_test) -endif() -if(_gRPC_PLATFORM_LINUX) -add_dependencies(buildtests_c httpscli_test) -endif() -add_dependencies(buildtests_c init_test) -add_dependencies(buildtests_c inproc_callback_test) -add_dependencies(buildtests_c invalid_call_argument_test) -add_dependencies(buildtests_c json_rewrite) -add_dependencies(buildtests_c json_rewrite_test) -add_dependencies(buildtests_c json_stream_error_test) -add_dependencies(buildtests_c json_test) -add_dependencies(buildtests_c lame_client_test) -add_dependencies(buildtests_c load_file_test) -add_dependencies(buildtests_c memory_usage_client) -add_dependencies(buildtests_c memory_usage_server) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_c memory_usage_test) -endif() -add_dependencies(buildtests_c message_compress_test) -add_dependencies(buildtests_c minimal_stack_is_minimal_test) -add_dependencies(buildtests_c mpmcqueue_test) -add_dependencies(buildtests_c multiple_server_queues_test) -add_dependencies(buildtests_c murmur_hash_test) -add_dependencies(buildtests_c no_server_test) -add_dependencies(buildtests_c num_external_connectivity_watchers_test) -add_dependencies(buildtests_c parse_address_test) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_c parse_address_with_named_scope_id_test) -endif() -add_dependencies(buildtests_c percent_encoding_test) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_c resolve_address_using_ares_resolver_posix_test) -endif() -add_dependencies(buildtests_c resolve_address_using_ares_resolver_test) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_c resolve_address_using_native_resolver_posix_test) -endif() -add_dependencies(buildtests_c resolve_address_using_native_resolver_test) -add_dependencies(buildtests_c resource_quota_test) -add_dependencies(buildtests_c secure_channel_create_test) -add_dependencies(buildtests_c secure_endpoint_test) -add_dependencies(buildtests_c sequential_connectivity_test) -add_dependencies(buildtests_c server_chttp2_test) -add_dependencies(buildtests_c server_test) -add_dependencies(buildtests_c slice_buffer_test) -add_dependencies(buildtests_c slice_string_helpers_test) -add_dependencies(buildtests_c slice_test) -add_dependencies(buildtests_c sockaddr_resolver_test) -add_dependencies(buildtests_c sockaddr_utils_test) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_c socket_utils_test) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_c ssl_transport_security_test) -endif() -add_dependencies(buildtests_c status_conversion_test) -add_dependencies(buildtests_c stream_compression_test) -add_dependencies(buildtests_c stream_owned_slice_test) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_c tcp_client_posix_test) -endif() -add_dependencies(buildtests_c tcp_client_uv_test) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_c tcp_posix_test) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_c tcp_server_posix_test) -endif() -add_dependencies(buildtests_c tcp_server_uv_test) -add_dependencies(buildtests_c threadpool_test) -add_dependencies(buildtests_c time_averaged_stats_test) -add_dependencies(buildtests_c timeout_encoding_test) -add_dependencies(buildtests_c timer_heap_test) -add_dependencies(buildtests_c timer_list_test) -add_dependencies(buildtests_c transport_metadata_test) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_c transport_security_test) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_c udp_server_test) -endif() -add_dependencies(buildtests_c uri_parser_test) -add_dependencies(buildtests_c public_headers_must_be_c89) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_c bad_ssl_cert_server) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_c bad_ssl_cert_test) -endif() -add_dependencies(buildtests_c h2_census_test) -add_dependencies(buildtests_c h2_compress_test) -add_dependencies(buildtests_c h2_fakesec_test) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_c h2_fd_test) -endif() -add_dependencies(buildtests_c h2_full_test) -if(_gRPC_PLATFORM_LINUX) -add_dependencies(buildtests_c h2_full+pipe_test) -endif() -add_dependencies(buildtests_c h2_full+trace_test) -add_dependencies(buildtests_c h2_full+workarounds_test) -add_dependencies(buildtests_c h2_http_proxy_test) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_c h2_local_ipv4_test) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_c h2_local_ipv6_test) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_c h2_local_uds_test) -endif() -add_dependencies(buildtests_c h2_oauth2_test) -add_dependencies(buildtests_c h2_proxy_test) -add_dependencies(buildtests_c h2_sockpair_test) -add_dependencies(buildtests_c h2_sockpair+trace_test) -add_dependencies(buildtests_c h2_sockpair_1byte_test) -add_dependencies(buildtests_c h2_spiffe_test) -add_dependencies(buildtests_c h2_ssl_test) -add_dependencies(buildtests_c h2_ssl_cred_reload_test) -add_dependencies(buildtests_c h2_ssl_proxy_test) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_c h2_uds_test) -endif() -add_dependencies(buildtests_c inproc_test) -add_dependencies(buildtests_c h2_census_nosec_test) -add_dependencies(buildtests_c h2_compress_nosec_test) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_c h2_fd_nosec_test) -endif() -add_dependencies(buildtests_c h2_full_nosec_test) -if(_gRPC_PLATFORM_LINUX) -add_dependencies(buildtests_c h2_full+pipe_nosec_test) -endif() -add_dependencies(buildtests_c h2_full+trace_nosec_test) -add_dependencies(buildtests_c h2_full+workarounds_nosec_test) -add_dependencies(buildtests_c h2_http_proxy_nosec_test) -add_dependencies(buildtests_c h2_proxy_nosec_test) -add_dependencies(buildtests_c h2_sockpair_nosec_test) -add_dependencies(buildtests_c h2_sockpair+trace_nosec_test) -add_dependencies(buildtests_c h2_sockpair_1byte_nosec_test) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_c h2_uds_nosec_test) -endif() -add_dependencies(buildtests_c alts_credentials_fuzzer_one_entry) -add_dependencies(buildtests_c api_fuzzer_one_entry) -add_dependencies(buildtests_c client_fuzzer_one_entry) -add_dependencies(buildtests_c hpack_parser_fuzzer_test_one_entry) -add_dependencies(buildtests_c http_request_fuzzer_test_one_entry) -add_dependencies(buildtests_c http_response_fuzzer_test_one_entry) -add_dependencies(buildtests_c json_fuzzer_test_one_entry) -add_dependencies(buildtests_c nanopb_fuzzer_response_test_one_entry) -add_dependencies(buildtests_c nanopb_fuzzer_serverlist_test_one_entry) -add_dependencies(buildtests_c percent_decode_fuzzer_one_entry) -add_dependencies(buildtests_c percent_encode_fuzzer_one_entry) -add_dependencies(buildtests_c server_fuzzer_one_entry) -add_dependencies(buildtests_c ssl_server_fuzzer_one_entry) -add_dependencies(buildtests_c uri_fuzzer_test_one_entry) - -add_custom_target(buildtests_cxx) -add_dependencies(buildtests_cxx alarm_test) -add_dependencies(buildtests_cxx alts_counter_test) -add_dependencies(buildtests_cxx alts_crypt_test) -add_dependencies(buildtests_cxx alts_crypter_test) -add_dependencies(buildtests_cxx alts_frame_handler_test) -add_dependencies(buildtests_cxx alts_frame_protector_test) -add_dependencies(buildtests_cxx alts_grpc_record_protocol_test) -add_dependencies(buildtests_cxx alts_handshaker_client_test) -add_dependencies(buildtests_cxx alts_iovec_record_protocol_test) -add_dependencies(buildtests_cxx alts_security_connector_test) -add_dependencies(buildtests_cxx alts_tsi_handshaker_test) -add_dependencies(buildtests_cxx alts_tsi_utils_test) -add_dependencies(buildtests_cxx alts_zero_copy_grpc_protector_test) -add_dependencies(buildtests_cxx async_end2end_test) -add_dependencies(buildtests_cxx auth_property_iterator_test) -add_dependencies(buildtests_cxx backoff_test) -add_dependencies(buildtests_cxx bdp_estimator_test) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx bm_alarm) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx bm_arena) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx bm_byte_buffer) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx bm_call_create) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx bm_callback_streaming_ping_pong) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx bm_callback_unary_ping_pong) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx bm_channel) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx bm_chttp2_hpack) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx bm_chttp2_transport) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx bm_closure) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx bm_cq) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx bm_cq_multiple_threads) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx bm_error) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx bm_fullstack_streaming_ping_pong) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx bm_fullstack_streaming_pump) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx bm_fullstack_trickle) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx bm_fullstack_unary_ping_pong) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx bm_metadata) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx bm_pollset) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx bm_threadpool) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx bm_timer) -endif() -add_dependencies(buildtests_cxx byte_stream_test) -add_dependencies(buildtests_cxx channel_arguments_test) -add_dependencies(buildtests_cxx channel_filter_test) -add_dependencies(buildtests_cxx channel_trace_test) -add_dependencies(buildtests_cxx channelz_registry_test) -add_dependencies(buildtests_cxx channelz_service_test) -add_dependencies(buildtests_cxx channelz_test) -add_dependencies(buildtests_cxx check_gcp_environment_linux_test) -add_dependencies(buildtests_cxx check_gcp_environment_windows_test) -add_dependencies(buildtests_cxx chttp2_settings_timeout_test) -add_dependencies(buildtests_cxx cli_call_test) -add_dependencies(buildtests_cxx client_callback_end2end_test) -add_dependencies(buildtests_cxx client_channel_stress_test) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx client_crash_test) -endif() -add_dependencies(buildtests_cxx client_crash_test_server) -add_dependencies(buildtests_cxx client_interceptors_end2end_test) -add_dependencies(buildtests_cxx client_lb_end2end_test) -add_dependencies(buildtests_cxx codegen_test_full) -add_dependencies(buildtests_cxx codegen_test_minimal) -add_dependencies(buildtests_cxx context_list_test) -add_dependencies(buildtests_cxx credentials_test) -add_dependencies(buildtests_cxx cxx_byte_buffer_test) -add_dependencies(buildtests_cxx cxx_slice_test) -add_dependencies(buildtests_cxx cxx_string_ref_test) -add_dependencies(buildtests_cxx cxx_time_test) -add_dependencies(buildtests_cxx delegating_channel_test) -add_dependencies(buildtests_cxx end2end_test) -add_dependencies(buildtests_cxx error_details_test) -add_dependencies(buildtests_cxx exception_test) -add_dependencies(buildtests_cxx filter_end2end_test) -add_dependencies(buildtests_cxx generic_end2end_test) -add_dependencies(buildtests_cxx global_config_env_test) -add_dependencies(buildtests_cxx global_config_test) -add_dependencies(buildtests_cxx golden_file_test) -add_dependencies(buildtests_cxx gprpp_mpscq_test) -add_dependencies(buildtests_cxx grpc_alts_credentials_options_test) -add_dependencies(buildtests_cxx grpc_cli) -add_dependencies(buildtests_cxx grpc_fetch_oauth2) -add_dependencies(buildtests_cxx grpc_linux_system_roots_test) -add_dependencies(buildtests_cxx grpc_spiffe_security_connector_test) -add_dependencies(buildtests_cxx grpc_tool_test) -add_dependencies(buildtests_cxx grpclb_api_test) -add_dependencies(buildtests_cxx grpclb_end2end_test) -if(_gRPC_PLATFORM_LINUX) -add_dependencies(buildtests_cxx grpclb_fallback_test) -endif() -add_dependencies(buildtests_cxx h2_ssl_cert_test) -add_dependencies(buildtests_cxx h2_ssl_session_reuse_test) -add_dependencies(buildtests_cxx health_service_end2end_test) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx http2_client) -endif() -add_dependencies(buildtests_cxx hybrid_end2end_test) -add_dependencies(buildtests_cxx inlined_vector_test) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx inproc_sync_unary_ping_pong_test) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx interop_client) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx interop_server) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx interop_test) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx json_run_localhost) -endif() -add_dependencies(buildtests_cxx memory_test) -add_dependencies(buildtests_cxx message_allocator_end2end_test) -add_dependencies(buildtests_cxx metrics_client) -add_dependencies(buildtests_cxx mock_test) -add_dependencies(buildtests_cxx nonblocking_test) -add_dependencies(buildtests_cxx noop-benchmark) -add_dependencies(buildtests_cxx optional_test) -add_dependencies(buildtests_cxx orphanable_test) -add_dependencies(buildtests_cxx port_sharing_end2end_test) -add_dependencies(buildtests_cxx proto_server_reflection_test) -add_dependencies(buildtests_cxx proto_utils_test) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx qps_interarrival_test) -endif() -add_dependencies(buildtests_cxx qps_json_driver) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx qps_openloop_test) -endif() -add_dependencies(buildtests_cxx qps_worker) -add_dependencies(buildtests_cxx raw_end2end_test) -add_dependencies(buildtests_cxx reconnect_interop_client) -add_dependencies(buildtests_cxx reconnect_interop_server) -add_dependencies(buildtests_cxx ref_counted_ptr_test) -add_dependencies(buildtests_cxx ref_counted_test) -add_dependencies(buildtests_cxx retry_throttle_test) -add_dependencies(buildtests_cxx secure_auth_context_test) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx secure_sync_unary_ping_pong_test) -endif() -add_dependencies(buildtests_cxx server_builder_plugin_test) -add_dependencies(buildtests_cxx server_builder_test) -if(_gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx server_builder_with_socket_mutator_test) -endif() -add_dependencies(buildtests_cxx server_context_test_spouse_test) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx server_crash_test) -endif() -add_dependencies(buildtests_cxx server_crash_test_client) -add_dependencies(buildtests_cxx server_early_return_test) -add_dependencies(buildtests_cxx server_interceptors_end2end_test) -add_dependencies(buildtests_cxx server_request_call_test) -add_dependencies(buildtests_cxx service_config_end2end_test) -add_dependencies(buildtests_cxx service_config_test) -add_dependencies(buildtests_cxx shutdown_test) -add_dependencies(buildtests_cxx slice_hash_table_test) -add_dependencies(buildtests_cxx slice_weak_hash_table_test) -add_dependencies(buildtests_cxx stats_test) -add_dependencies(buildtests_cxx status_metadata_test) -add_dependencies(buildtests_cxx status_util_test) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx streaming_throughput_test) -endif() -add_dependencies(buildtests_cxx stress_test) -add_dependencies(buildtests_cxx string_view_test) -add_dependencies(buildtests_cxx thread_manager_test) -add_dependencies(buildtests_cxx thread_stress_test) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx time_change_test) -endif() -add_dependencies(buildtests_cxx timer_test) -add_dependencies(buildtests_cxx transport_connectivity_state_test) -add_dependencies(buildtests_cxx transport_pid_controller_test) -add_dependencies(buildtests_cxx transport_security_common_api_test) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx writes_per_rpc_test) -endif() -add_dependencies(buildtests_cxx xds_bootstrap_test) -add_dependencies(buildtests_cxx xds_end2end_test) -add_dependencies(buildtests_cxx bad_streaming_id_bad_client_test) -add_dependencies(buildtests_cxx badreq_bad_client_test) -add_dependencies(buildtests_cxx connection_prefix_bad_client_test) -add_dependencies(buildtests_cxx duplicate_header_bad_client_test) -add_dependencies(buildtests_cxx head_of_line_blocking_bad_client_test) -add_dependencies(buildtests_cxx headers_bad_client_test) -add_dependencies(buildtests_cxx initial_settings_frame_bad_client_test) -add_dependencies(buildtests_cxx large_metadata_bad_client_test) -add_dependencies(buildtests_cxx out_of_bounds_bad_client_test) -add_dependencies(buildtests_cxx server_registered_method_bad_client_test) -add_dependencies(buildtests_cxx simple_request_bad_client_test) -add_dependencies(buildtests_cxx unknown_frame_bad_client_test) -add_dependencies(buildtests_cxx window_overflow_bad_client_test) -add_dependencies(buildtests_cxx resolver_component_test_unsecure) -add_dependencies(buildtests_cxx resolver_component_test) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx resolver_component_tests_runner_invoker_unsecure) -endif() -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_dependencies(buildtests_cxx resolver_component_tests_runner_invoker) -endif() -add_dependencies(buildtests_cxx address_sorting_test_unsecure) -add_dependencies(buildtests_cxx address_sorting_test) -add_dependencies(buildtests_cxx cancel_ares_query_test) +if(gRPC_BUILD_TESTS) + add_custom_target(buildtests_c) + add_dependencies(buildtests_c algorithm_test) + add_dependencies(buildtests_c alloc_test) + add_dependencies(buildtests_c alpn_test) + add_dependencies(buildtests_c arena_test) + add_dependencies(buildtests_c avl_test) + add_dependencies(buildtests_c bad_server_response_test) + add_dependencies(buildtests_c bin_decoder_test) + add_dependencies(buildtests_c bin_encoder_test) + if(_gRPC_PLATFORM_LINUX) + add_dependencies(buildtests_c buffer_list_test) + endif() + add_dependencies(buildtests_c channel_create_test) + add_dependencies(buildtests_c chttp2_hpack_encoder_test) + add_dependencies(buildtests_c chttp2_stream_map_test) + add_dependencies(buildtests_c chttp2_varint_test) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_c close_fd_test) + endif() + add_dependencies(buildtests_c cmdline_test) + add_dependencies(buildtests_c combiner_test) + add_dependencies(buildtests_c compression_test) + add_dependencies(buildtests_c concurrent_connectivity_test) + add_dependencies(buildtests_c connection_refused_test) + add_dependencies(buildtests_c dns_resolver_connectivity_test) + add_dependencies(buildtests_c dns_resolver_cooldown_using_ares_resolver_test) + add_dependencies(buildtests_c dns_resolver_cooldown_using_native_resolver_test) + add_dependencies(buildtests_c dns_resolver_test) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_c dualstack_socket_test) + endif() + add_dependencies(buildtests_c endpoint_pair_test) + add_dependencies(buildtests_c error_test) + if(_gRPC_PLATFORM_LINUX) + add_dependencies(buildtests_c ev_epollex_linux_test) + endif() + add_dependencies(buildtests_c fake_resolver_test) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_c fake_transport_security_test) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_c fd_conservation_posix_test) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_c fd_posix_test) + endif() + add_dependencies(buildtests_c fling_client) + add_dependencies(buildtests_c fling_server) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_c fling_stream_test) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_c fling_test) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC) + add_dependencies(buildtests_c fork_test) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_c goaway_server_test) + endif() + add_dependencies(buildtests_c gpr_cpu_test) + add_dependencies(buildtests_c gpr_env_test) + add_dependencies(buildtests_c gpr_host_port_test) + add_dependencies(buildtests_c gpr_log_test) + add_dependencies(buildtests_c gpr_manual_constructor_test) + add_dependencies(buildtests_c gpr_spinlock_test) + add_dependencies(buildtests_c gpr_string_test) + add_dependencies(buildtests_c gpr_sync_test) + add_dependencies(buildtests_c gpr_thd_test) + add_dependencies(buildtests_c gpr_time_test) + add_dependencies(buildtests_c gpr_tls_test) + add_dependencies(buildtests_c gpr_useful_test) + add_dependencies(buildtests_c grpc_auth_context_test) + add_dependencies(buildtests_c grpc_b64_test) + add_dependencies(buildtests_c grpc_byte_buffer_reader_test) + add_dependencies(buildtests_c grpc_channel_args_test) + add_dependencies(buildtests_c grpc_channel_stack_builder_test) + add_dependencies(buildtests_c grpc_channel_stack_test) + add_dependencies(buildtests_c grpc_completion_queue_test) + add_dependencies(buildtests_c grpc_completion_queue_threading_test) + add_dependencies(buildtests_c grpc_control_plane_credentials_test) + add_dependencies(buildtests_c grpc_credentials_test) + add_dependencies(buildtests_c grpc_ipv6_loopback_available_test) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_c grpc_json_token_test) + endif() + add_dependencies(buildtests_c grpc_jwt_verifier_test) + add_dependencies(buildtests_c grpc_security_connector_test) + add_dependencies(buildtests_c grpc_ssl_credentials_test) + if(_gRPC_PLATFORM_LINUX) + add_dependencies(buildtests_c handshake_client_ssl) + endif() + if(_gRPC_PLATFORM_LINUX) + add_dependencies(buildtests_c handshake_server_ssl) + endif() + if(_gRPC_PLATFORM_LINUX) + add_dependencies(buildtests_c handshake_server_with_readahead_handshaker) + endif() + if(_gRPC_PLATFORM_LINUX) + add_dependencies(buildtests_c handshake_verify_peer_options) + endif() + add_dependencies(buildtests_c histogram_test) + add_dependencies(buildtests_c hpack_parser_test) + add_dependencies(buildtests_c hpack_table_test) + add_dependencies(buildtests_c http_parser_test) + add_dependencies(buildtests_c httpcli_format_request_test) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_c httpcli_test) + endif() + if(_gRPC_PLATFORM_LINUX) + add_dependencies(buildtests_c httpscli_test) + endif() + add_dependencies(buildtests_c init_test) + add_dependencies(buildtests_c inproc_callback_test) + add_dependencies(buildtests_c invalid_call_argument_test) + add_dependencies(buildtests_c json_rewrite) + add_dependencies(buildtests_c json_rewrite_test) + add_dependencies(buildtests_c json_stream_error_test) + add_dependencies(buildtests_c json_test) + add_dependencies(buildtests_c lame_client_test) + add_dependencies(buildtests_c load_file_test) + add_dependencies(buildtests_c memory_usage_client) + add_dependencies(buildtests_c memory_usage_server) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_c memory_usage_test) + endif() + add_dependencies(buildtests_c message_compress_test) + add_dependencies(buildtests_c minimal_stack_is_minimal_test) + add_dependencies(buildtests_c mpmcqueue_test) + add_dependencies(buildtests_c multiple_server_queues_test) + add_dependencies(buildtests_c murmur_hash_test) + add_dependencies(buildtests_c no_server_test) + add_dependencies(buildtests_c num_external_connectivity_watchers_test) + add_dependencies(buildtests_c parse_address_test) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_c parse_address_with_named_scope_id_test) + endif() + add_dependencies(buildtests_c percent_encoding_test) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_c resolve_address_using_ares_resolver_posix_test) + endif() + add_dependencies(buildtests_c resolve_address_using_ares_resolver_test) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_c resolve_address_using_native_resolver_posix_test) + endif() + add_dependencies(buildtests_c resolve_address_using_native_resolver_test) + add_dependencies(buildtests_c resource_quota_test) + add_dependencies(buildtests_c secure_channel_create_test) + add_dependencies(buildtests_c secure_endpoint_test) + add_dependencies(buildtests_c sequential_connectivity_test) + add_dependencies(buildtests_c server_chttp2_test) + add_dependencies(buildtests_c server_test) + add_dependencies(buildtests_c slice_buffer_test) + add_dependencies(buildtests_c slice_string_helpers_test) + add_dependencies(buildtests_c slice_test) + add_dependencies(buildtests_c sockaddr_resolver_test) + add_dependencies(buildtests_c sockaddr_utils_test) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_c socket_utils_test) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_c ssl_transport_security_test) + endif() + add_dependencies(buildtests_c status_conversion_test) + add_dependencies(buildtests_c stream_compression_test) + add_dependencies(buildtests_c stream_owned_slice_test) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_c tcp_client_posix_test) + endif() + add_dependencies(buildtests_c tcp_client_uv_test) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_c tcp_posix_test) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_c tcp_server_posix_test) + endif() + add_dependencies(buildtests_c tcp_server_uv_test) + add_dependencies(buildtests_c threadpool_test) + add_dependencies(buildtests_c time_averaged_stats_test) + add_dependencies(buildtests_c timeout_encoding_test) + add_dependencies(buildtests_c timer_heap_test) + add_dependencies(buildtests_c timer_list_test) + add_dependencies(buildtests_c transport_metadata_test) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_c transport_security_test) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_c udp_server_test) + endif() + add_dependencies(buildtests_c uri_parser_test) + add_dependencies(buildtests_c public_headers_must_be_c89) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_c bad_ssl_cert_server) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_c bad_ssl_cert_test) + endif() + add_dependencies(buildtests_c h2_census_test) + add_dependencies(buildtests_c h2_compress_test) + add_dependencies(buildtests_c h2_fakesec_test) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_c h2_fd_test) + endif() + add_dependencies(buildtests_c h2_full_test) + if(_gRPC_PLATFORM_LINUX) + add_dependencies(buildtests_c h2_full+pipe_test) + endif() + add_dependencies(buildtests_c h2_full+trace_test) + add_dependencies(buildtests_c h2_full+workarounds_test) + add_dependencies(buildtests_c h2_http_proxy_test) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_c h2_local_ipv4_test) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_c h2_local_ipv6_test) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_c h2_local_uds_test) + endif() + add_dependencies(buildtests_c h2_oauth2_test) + add_dependencies(buildtests_c h2_proxy_test) + add_dependencies(buildtests_c h2_sockpair_test) + add_dependencies(buildtests_c h2_sockpair+trace_test) + add_dependencies(buildtests_c h2_sockpair_1byte_test) + add_dependencies(buildtests_c h2_spiffe_test) + add_dependencies(buildtests_c h2_ssl_test) + add_dependencies(buildtests_c h2_ssl_cred_reload_test) + add_dependencies(buildtests_c h2_ssl_proxy_test) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_c h2_uds_test) + endif() + add_dependencies(buildtests_c inproc_test) + add_dependencies(buildtests_c h2_census_nosec_test) + add_dependencies(buildtests_c h2_compress_nosec_test) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_c h2_fd_nosec_test) + endif() + add_dependencies(buildtests_c h2_full_nosec_test) + if(_gRPC_PLATFORM_LINUX) + add_dependencies(buildtests_c h2_full+pipe_nosec_test) + endif() + add_dependencies(buildtests_c h2_full+trace_nosec_test) + add_dependencies(buildtests_c h2_full+workarounds_nosec_test) + add_dependencies(buildtests_c h2_http_proxy_nosec_test) + add_dependencies(buildtests_c h2_proxy_nosec_test) + add_dependencies(buildtests_c h2_sockpair_nosec_test) + add_dependencies(buildtests_c h2_sockpair+trace_nosec_test) + add_dependencies(buildtests_c h2_sockpair_1byte_nosec_test) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_c h2_uds_nosec_test) + endif() + add_dependencies(buildtests_c alts_credentials_fuzzer_one_entry) + add_dependencies(buildtests_c api_fuzzer_one_entry) + add_dependencies(buildtests_c client_fuzzer_one_entry) + add_dependencies(buildtests_c hpack_parser_fuzzer_test_one_entry) + add_dependencies(buildtests_c http_request_fuzzer_test_one_entry) + add_dependencies(buildtests_c http_response_fuzzer_test_one_entry) + add_dependencies(buildtests_c json_fuzzer_test_one_entry) + add_dependencies(buildtests_c nanopb_fuzzer_response_test_one_entry) + add_dependencies(buildtests_c nanopb_fuzzer_serverlist_test_one_entry) + add_dependencies(buildtests_c percent_decode_fuzzer_one_entry) + add_dependencies(buildtests_c percent_encode_fuzzer_one_entry) + add_dependencies(buildtests_c server_fuzzer_one_entry) + add_dependencies(buildtests_c ssl_server_fuzzer_one_entry) + add_dependencies(buildtests_c uri_fuzzer_test_one_entry) + + add_custom_target(buildtests_cxx) + add_dependencies(buildtests_cxx alarm_test) + add_dependencies(buildtests_cxx alts_counter_test) + add_dependencies(buildtests_cxx alts_crypt_test) + add_dependencies(buildtests_cxx alts_crypter_test) + add_dependencies(buildtests_cxx alts_frame_handler_test) + add_dependencies(buildtests_cxx alts_frame_protector_test) + add_dependencies(buildtests_cxx alts_grpc_record_protocol_test) + add_dependencies(buildtests_cxx alts_handshaker_client_test) + add_dependencies(buildtests_cxx alts_iovec_record_protocol_test) + add_dependencies(buildtests_cxx alts_security_connector_test) + add_dependencies(buildtests_cxx alts_tsi_handshaker_test) + add_dependencies(buildtests_cxx alts_tsi_utils_test) + add_dependencies(buildtests_cxx alts_zero_copy_grpc_protector_test) + add_dependencies(buildtests_cxx async_end2end_test) + add_dependencies(buildtests_cxx auth_property_iterator_test) + add_dependencies(buildtests_cxx backoff_test) + add_dependencies(buildtests_cxx bdp_estimator_test) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx bm_alarm) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx bm_arena) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx bm_byte_buffer) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx bm_call_create) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx bm_callback_streaming_ping_pong) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx bm_callback_unary_ping_pong) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx bm_channel) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx bm_chttp2_hpack) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx bm_chttp2_transport) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx bm_closure) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx bm_cq) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx bm_cq_multiple_threads) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx bm_error) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx bm_fullstack_streaming_ping_pong) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx bm_fullstack_streaming_pump) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx bm_fullstack_trickle) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx bm_fullstack_unary_ping_pong) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx bm_metadata) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx bm_pollset) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx bm_threadpool) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx bm_timer) + endif() + add_dependencies(buildtests_cxx byte_stream_test) + add_dependencies(buildtests_cxx channel_arguments_test) + add_dependencies(buildtests_cxx channel_filter_test) + add_dependencies(buildtests_cxx channel_trace_test) + add_dependencies(buildtests_cxx channelz_registry_test) + add_dependencies(buildtests_cxx channelz_service_test) + add_dependencies(buildtests_cxx channelz_test) + add_dependencies(buildtests_cxx check_gcp_environment_linux_test) + add_dependencies(buildtests_cxx check_gcp_environment_windows_test) + add_dependencies(buildtests_cxx chttp2_settings_timeout_test) + add_dependencies(buildtests_cxx cli_call_test) + add_dependencies(buildtests_cxx client_callback_end2end_test) + add_dependencies(buildtests_cxx client_channel_stress_test) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx client_crash_test) + endif() + add_dependencies(buildtests_cxx client_crash_test_server) + add_dependencies(buildtests_cxx client_interceptors_end2end_test) + add_dependencies(buildtests_cxx client_lb_end2end_test) + add_dependencies(buildtests_cxx codegen_test_full) + add_dependencies(buildtests_cxx codegen_test_minimal) + add_dependencies(buildtests_cxx context_list_test) + add_dependencies(buildtests_cxx credentials_test) + add_dependencies(buildtests_cxx cxx_byte_buffer_test) + add_dependencies(buildtests_cxx cxx_slice_test) + add_dependencies(buildtests_cxx cxx_string_ref_test) + add_dependencies(buildtests_cxx cxx_time_test) + add_dependencies(buildtests_cxx delegating_channel_test) + add_dependencies(buildtests_cxx end2end_test) + add_dependencies(buildtests_cxx error_details_test) + add_dependencies(buildtests_cxx exception_test) + add_dependencies(buildtests_cxx filter_end2end_test) + add_dependencies(buildtests_cxx generic_end2end_test) + add_dependencies(buildtests_cxx global_config_env_test) + add_dependencies(buildtests_cxx global_config_test) + add_dependencies(buildtests_cxx golden_file_test) + add_dependencies(buildtests_cxx gprpp_mpscq_test) + add_dependencies(buildtests_cxx grpc_alts_credentials_options_test) + add_dependencies(buildtests_cxx grpc_cli) + add_dependencies(buildtests_cxx grpc_fetch_oauth2) + add_dependencies(buildtests_cxx grpc_linux_system_roots_test) + add_dependencies(buildtests_cxx grpc_spiffe_security_connector_test) + add_dependencies(buildtests_cxx grpc_tool_test) + add_dependencies(buildtests_cxx grpclb_api_test) + add_dependencies(buildtests_cxx grpclb_end2end_test) + if(_gRPC_PLATFORM_LINUX) + add_dependencies(buildtests_cxx grpclb_fallback_test) + endif() + add_dependencies(buildtests_cxx h2_ssl_cert_test) + add_dependencies(buildtests_cxx h2_ssl_session_reuse_test) + add_dependencies(buildtests_cxx health_service_end2end_test) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx http2_client) + endif() + add_dependencies(buildtests_cxx hybrid_end2end_test) + add_dependencies(buildtests_cxx inlined_vector_test) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx inproc_sync_unary_ping_pong_test) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx interop_client) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx interop_server) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx interop_test) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx json_run_localhost) + endif() + add_dependencies(buildtests_cxx memory_test) + add_dependencies(buildtests_cxx message_allocator_end2end_test) + add_dependencies(buildtests_cxx metrics_client) + add_dependencies(buildtests_cxx mock_test) + add_dependencies(buildtests_cxx nonblocking_test) + add_dependencies(buildtests_cxx noop-benchmark) + add_dependencies(buildtests_cxx optional_test) + add_dependencies(buildtests_cxx orphanable_test) + add_dependencies(buildtests_cxx port_sharing_end2end_test) + add_dependencies(buildtests_cxx proto_server_reflection_test) + add_dependencies(buildtests_cxx proto_utils_test) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx qps_interarrival_test) + endif() + add_dependencies(buildtests_cxx qps_json_driver) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx qps_openloop_test) + endif() + add_dependencies(buildtests_cxx qps_worker) + add_dependencies(buildtests_cxx raw_end2end_test) + add_dependencies(buildtests_cxx reconnect_interop_client) + add_dependencies(buildtests_cxx reconnect_interop_server) + add_dependencies(buildtests_cxx ref_counted_ptr_test) + add_dependencies(buildtests_cxx ref_counted_test) + add_dependencies(buildtests_cxx retry_throttle_test) + add_dependencies(buildtests_cxx secure_auth_context_test) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx secure_sync_unary_ping_pong_test) + endif() + add_dependencies(buildtests_cxx server_builder_plugin_test) + add_dependencies(buildtests_cxx server_builder_test) + if(_gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx server_builder_with_socket_mutator_test) + endif() + add_dependencies(buildtests_cxx server_context_test_spouse_test) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx server_crash_test) + endif() + add_dependencies(buildtests_cxx server_crash_test_client) + add_dependencies(buildtests_cxx server_early_return_test) + add_dependencies(buildtests_cxx server_interceptors_end2end_test) + add_dependencies(buildtests_cxx server_request_call_test) + add_dependencies(buildtests_cxx service_config_end2end_test) + add_dependencies(buildtests_cxx service_config_test) + add_dependencies(buildtests_cxx shutdown_test) + add_dependencies(buildtests_cxx slice_hash_table_test) + add_dependencies(buildtests_cxx slice_weak_hash_table_test) + add_dependencies(buildtests_cxx stats_test) + add_dependencies(buildtests_cxx status_metadata_test) + add_dependencies(buildtests_cxx status_util_test) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx streaming_throughput_test) + endif() + add_dependencies(buildtests_cxx stress_test) + add_dependencies(buildtests_cxx string_view_test) + add_dependencies(buildtests_cxx thread_manager_test) + add_dependencies(buildtests_cxx thread_stress_test) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx time_change_test) + endif() + add_dependencies(buildtests_cxx timer_test) + add_dependencies(buildtests_cxx transport_connectivity_state_test) + add_dependencies(buildtests_cxx transport_pid_controller_test) + add_dependencies(buildtests_cxx transport_security_common_api_test) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx writes_per_rpc_test) + endif() + add_dependencies(buildtests_cxx xds_bootstrap_test) + add_dependencies(buildtests_cxx xds_end2end_test) + add_dependencies(buildtests_cxx bad_streaming_id_bad_client_test) + add_dependencies(buildtests_cxx badreq_bad_client_test) + add_dependencies(buildtests_cxx connection_prefix_bad_client_test) + add_dependencies(buildtests_cxx duplicate_header_bad_client_test) + add_dependencies(buildtests_cxx head_of_line_blocking_bad_client_test) + add_dependencies(buildtests_cxx headers_bad_client_test) + add_dependencies(buildtests_cxx initial_settings_frame_bad_client_test) + add_dependencies(buildtests_cxx large_metadata_bad_client_test) + add_dependencies(buildtests_cxx out_of_bounds_bad_client_test) + add_dependencies(buildtests_cxx server_registered_method_bad_client_test) + add_dependencies(buildtests_cxx simple_request_bad_client_test) + add_dependencies(buildtests_cxx unknown_frame_bad_client_test) + add_dependencies(buildtests_cxx window_overflow_bad_client_test) + add_dependencies(buildtests_cxx resolver_component_test_unsecure) + add_dependencies(buildtests_cxx resolver_component_test) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx resolver_component_tests_runner_invoker_unsecure) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx resolver_component_tests_runner_invoker) + endif() + add_dependencies(buildtests_cxx address_sorting_test_unsecure) + add_dependencies(buildtests_cxx address_sorting_test) + add_dependencies(buildtests_cxx cancel_ares_query_test) -add_custom_target(buildtests - DEPENDS buildtests_c buildtests_cxx) -endif (gRPC_BUILD_TESTS) + add_custom_target(buildtests + DEPENDS buildtests_c buildtests_cxx) +endif() add_library(address_sorting @@ -860,7 +858,7 @@ if(WIN32 AND MSVC) set_target_properties(address_sorting PROPERTIES COMPILE_PDB_NAME "address_sorting" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/address_sorting.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -869,17 +867,18 @@ endif() target_include_directories(address_sorting PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(address_sorting ${_gRPC_BASELIB_LIBRARIES} @@ -888,7 +887,7 @@ target_link_libraries(address_sorting -if (gRPC_INSTALL) +if(gRPC_INSTALL) install(TARGETS address_sorting EXPORT gRPCTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} @@ -896,7 +895,7 @@ if (gRPC_INSTALL) ) endif() -if (gRPC_BUILD_TESTS) +if(gRPC_BUILD_TESTS) add_library(alts_test_util test/core/tsi/alts/crypt/gsec_test_util.cc @@ -912,7 +911,7 @@ if(WIN32 AND MSVC) set_target_properties(alts_test_util PROPERTIES COMPILE_PDB_NAME "alts_test_util" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/alts_test_util.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -921,17 +920,18 @@ endif() target_include_directories(alts_test_util PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(alts_test_util ${_gRPC_SSL_LIBRARIES} @@ -940,7 +940,7 @@ target_link_libraries(alts_test_util ) -endif (gRPC_BUILD_TESTS) +endif() add_library(gpr src/core/lib/gpr/alloc.cc @@ -994,7 +994,7 @@ if(WIN32 AND MSVC) set_target_properties(gpr PROPERTIES COMPILE_PDB_NAME "gpr" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gpr.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -1003,27 +1003,28 @@ endif() target_include_directories(gpr PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(gpr ${_gRPC_ALLTARGETS_LIBRARIES} ) -if (_gRPC_PLATFORM_ANDROID) +if(_gRPC_PLATFORM_ANDROID) target_link_libraries(gpr android log ) -endif (_gRPC_PLATFORM_ANDROID) +endif() foreach(_hdr include/grpc/support/alloc.h @@ -1066,7 +1067,7 @@ foreach(_hdr endforeach() -if (gRPC_INSTALL) +if(gRPC_INSTALL) install(TARGETS gpr EXPORT gRPCTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} @@ -1464,7 +1465,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc PROPERTIES COMPILE_PDB_NAME "grpc" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -1473,17 +1474,18 @@ endif() target_include_directories(grpc PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(grpc ${_gRPC_BASELIB_LIBRARIES} @@ -1494,7 +1496,7 @@ target_link_libraries(grpc ${_gRPC_ALLTARGETS_LIBRARIES} gpr ) -if (_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) +if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) target_link_libraries(grpc "-framework CoreFoundation") endif() @@ -1544,7 +1546,7 @@ foreach(_hdr endforeach() -if (gRPC_INSTALL) +if(gRPC_INSTALL) install(TARGETS grpc EXPORT gRPCTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} @@ -1883,7 +1885,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc_cronet PROPERTIES COMPILE_PDB_NAME "grpc_cronet" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc_cronet.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -1892,17 +1894,18 @@ endif() target_include_directories(grpc_cronet PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(grpc_cronet ${_gRPC_BASELIB_LIBRARIES} @@ -1913,7 +1916,7 @@ target_link_libraries(grpc_cronet ${_gRPC_ALLTARGETS_LIBRARIES} gpr ) -if (_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) +if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) target_link_libraries(grpc_cronet "-framework CoreFoundation") endif() @@ -1952,7 +1955,7 @@ foreach(_hdr endforeach() -if (gRPC_INSTALL) +if(gRPC_INSTALL) install(TARGETS grpc_cronet EXPORT gRPCTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} @@ -1960,7 +1963,7 @@ if (gRPC_INSTALL) ) endif() -if (gRPC_BUILD_TESTS) +if(gRPC_BUILD_TESTS) add_library(grpc_test_util test/core/end2end/data/client_certs.cc @@ -2238,7 +2241,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc_test_util PROPERTIES COMPILE_PDB_NAME "grpc_test_util" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc_test_util.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -2247,24 +2250,25 @@ endif() target_include_directories(grpc_test_util PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(grpc_test_util ${_gRPC_ALLTARGETS_LIBRARIES} gpr grpc ) -if (_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) +if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) target_link_libraries(grpc_test_util "-framework CoreFoundation") endif() @@ -2316,8 +2320,8 @@ foreach(_hdr ) endforeach() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_library(grpc_test_util_unsecure src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc @@ -2590,7 +2594,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc_test_util_unsecure PROPERTIES COMPILE_PDB_NAME "grpc_test_util_unsecure" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc_test_util_unsecure.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -2599,24 +2603,25 @@ endif() target_include_directories(grpc_test_util_unsecure PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(grpc_test_util_unsecure ${_gRPC_ALLTARGETS_LIBRARIES} gpr grpc_unsecure ) -if (_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) +if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) target_link_libraries(grpc_test_util_unsecure "-framework CoreFoundation") endif() @@ -2668,7 +2673,7 @@ foreach(_hdr ) endforeach() -endif (gRPC_BUILD_TESTS) +endif() add_library(grpc_unsecure src/core/lib/surface/init.cc @@ -2984,7 +2989,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc_unsecure PROPERTIES COMPILE_PDB_NAME "grpc_unsecure" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc_unsecure.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -2993,17 +2998,18 @@ endif() target_include_directories(grpc_unsecure PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(grpc_unsecure ${_gRPC_BASELIB_LIBRARIES} @@ -3013,7 +3019,7 @@ target_link_libraries(grpc_unsecure ${_gRPC_ALLTARGETS_LIBRARIES} gpr ) -if (_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) +if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) target_link_libraries(grpc_unsecure "-framework CoreFoundation") endif() @@ -3062,7 +3068,7 @@ foreach(_hdr endforeach() -if (gRPC_INSTALL) +if(gRPC_INSTALL) install(TARGETS grpc_unsecure EXPORT gRPCTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} @@ -3070,7 +3076,7 @@ if (gRPC_INSTALL) ) endif() -if (gRPC_BUILD_TESTS) +if(gRPC_BUILD_TESTS) add_library(reconnect_server test/core/util/reconnect_server.cc @@ -3085,7 +3091,7 @@ if(WIN32 AND MSVC) set_target_properties(reconnect_server PROPERTIES COMPILE_PDB_NAME "reconnect_server" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/reconnect_server.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -3094,17 +3100,18 @@ endif() target_include_directories(reconnect_server PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(reconnect_server ${_gRPC_ALLTARGETS_LIBRARIES} @@ -3115,8 +3122,8 @@ target_link_libraries(reconnect_server ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_library(test_tcp_server test/core/util/test_tcp_server.cc @@ -3131,7 +3138,7 @@ if(WIN32 AND MSVC) set_target_properties(test_tcp_server PROPERTIES COMPILE_PDB_NAME "test_tcp_server" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/test_tcp_server.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -3140,17 +3147,18 @@ endif() target_include_directories(test_tcp_server PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(test_tcp_server ${_gRPC_ALLTARGETS_LIBRARIES} @@ -3160,10 +3168,10 @@ target_link_libraries(test_tcp_server ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) -if (gRPC_BUILD_CODEGEN) +if(gRPC_BUILD_CODEGEN) add_library(bm_callback_test_service_impl ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.grpc.pb.cc @@ -3182,7 +3190,7 @@ if(WIN32 AND MSVC) set_target_properties(bm_callback_test_service_impl PROPERTIES COMPILE_PDB_NAME "bm_callback_test_service_impl" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/bm_callback_test_service_impl.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -3191,22 +3199,23 @@ endif() target_include_directories(bm_callback_test_service_impl PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(bm_callback_test_service_impl ${_gRPC_PROTOBUF_LIBRARIES} @@ -3222,10 +3231,10 @@ target_link_libraries(bm_callback_test_service_impl ${_gRPC_GFLAGS_LIBRARIES} ) -endif (gRPC_BUILD_CODEGEN) +endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_library(dns_test_util test/cpp/naming/dns_test_util.cc @@ -3240,7 +3249,7 @@ if(WIN32 AND MSVC) set_target_properties(dns_test_util PROPERTIES COMPILE_PDB_NAME "dns_test_util" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dns_test_util.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -3249,22 +3258,23 @@ endif() target_include_directories(dns_test_util PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(dns_test_util ${_gRPC_PROTOBUF_LIBRARIES} @@ -3273,7 +3283,7 @@ target_link_libraries(dns_test_util ) -endif (gRPC_BUILD_TESTS) +endif() add_library(grpc++ src/cpp/client/insecure_credentials.cc @@ -3340,7 +3350,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc++ PROPERTIES COMPILE_PDB_NAME "grpc++" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc++.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -3349,18 +3359,19 @@ endif() target_include_directories(grpc++ PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(grpc++ ${_gRPC_BASELIB_LIBRARIES} @@ -3643,7 +3654,7 @@ foreach(_hdr endforeach() -if (gRPC_INSTALL) +if(gRPC_INSTALL) install(TARGETS grpc++ EXPORT gRPCTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} @@ -3651,9 +3662,9 @@ if (gRPC_INSTALL) ) endif() -if (gRPC_BUILD_TESTS) +if(gRPC_BUILD_TESTS) -if (gRPC_BUILD_CODEGEN) +if(gRPC_BUILD_CODEGEN) add_library(grpc++_core_stats ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/core/stats.pb.cc ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/core/stats.grpc.pb.cc @@ -3671,7 +3682,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc++_core_stats PROPERTIES COMPILE_PDB_NAME "grpc++_core_stats" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc++_core_stats.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -3680,22 +3691,23 @@ endif() target_include_directories(grpc++_core_stats PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(grpc++_core_stats ${_gRPC_PROTOBUF_LIBRARIES} @@ -3704,11 +3716,11 @@ target_link_libraries(grpc++_core_stats ${_gRPC_GFLAGS_LIBRARIES} ) -endif (gRPC_BUILD_CODEGEN) +endif() -endif (gRPC_BUILD_TESTS) +endif() -if (gRPC_BUILD_CODEGEN) +if(gRPC_BUILD_CODEGEN) add_library(grpc++_error_details ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/status/status.pb.cc ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/status/status.grpc.pb.cc @@ -3726,7 +3738,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc++_error_details PROPERTIES COMPILE_PDB_NAME "grpc++_error_details" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc++_error_details.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -3735,18 +3747,19 @@ endif() target_include_directories(grpc++_error_details PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(grpc++_error_details ${_gRPC_BASELIB_LIBRARIES} @@ -3766,11 +3779,11 @@ foreach(_hdr DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}" ) endforeach() -endif (gRPC_BUILD_CODEGEN) +endif() -if (gRPC_BUILD_CODEGEN) +if(gRPC_BUILD_CODEGEN) -if (gRPC_INSTALL) +if(gRPC_INSTALL) install(TARGETS grpc++_error_details EXPORT gRPCTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} @@ -3778,10 +3791,10 @@ if (gRPC_INSTALL) ) endif() -endif (gRPC_BUILD_CODEGEN) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) -if (gRPC_BUILD_CODEGEN) +if(gRPC_BUILD_CODEGEN) add_library(grpc++_proto_reflection_desc_db test/cpp/util/proto_reflection_descriptor_database.cc ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/reflection/v1alpha/reflection.pb.cc @@ -3799,7 +3812,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc++_proto_reflection_desc_db PROPERTIES COMPILE_PDB_NAME "grpc++_proto_reflection_desc_db" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc++_proto_reflection_desc_db.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -3808,22 +3821,23 @@ endif() target_include_directories(grpc++_proto_reflection_desc_db PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(grpc++_proto_reflection_desc_db ${_gRPC_PROTOBUF_LIBRARIES} @@ -3843,11 +3857,11 @@ foreach(_hdr DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}" ) endforeach() -endif (gRPC_BUILD_CODEGEN) +endif() -endif (gRPC_BUILD_TESTS) +endif() -if (gRPC_BUILD_CODEGEN) +if(gRPC_BUILD_CODEGEN) add_library(grpc++_reflection src/cpp/ext/proto_server_reflection.cc src/cpp/ext/proto_server_reflection_plugin.cc @@ -3866,7 +3880,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc++_reflection PROPERTIES COMPILE_PDB_NAME "grpc++_reflection" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc++_reflection.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -3875,18 +3889,19 @@ endif() target_include_directories(grpc++_reflection PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(grpc++_reflection ${_gRPC_PROTOBUF_LIBRARIES} @@ -3906,11 +3921,11 @@ foreach(_hdr DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}" ) endforeach() -endif (gRPC_BUILD_CODEGEN) +endif() -if (gRPC_BUILD_CODEGEN) +if(gRPC_BUILD_CODEGEN) -if (gRPC_INSTALL) +if(gRPC_INSTALL) install(TARGETS grpc++_reflection EXPORT gRPCTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} @@ -3918,8 +3933,8 @@ if (gRPC_INSTALL) ) endif() -endif (gRPC_BUILD_CODEGEN) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_library(grpc++_test_config test/cpp/util/test_config_cc.cc @@ -3934,7 +3949,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc++_test_config PROPERTIES COMPILE_PDB_NAME "grpc++_test_config" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc++_test_config.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -3943,22 +3958,23 @@ endif() target_include_directories(grpc++_test_config PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(grpc++_test_config ${_gRPC_PROTOBUF_LIBRARIES} @@ -3967,10 +3983,10 @@ target_link_libraries(grpc++_test_config ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) -if (gRPC_BUILD_CODEGEN) +if(gRPC_BUILD_CODEGEN) add_library(grpc++_test_util ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/channelz/channelz.pb.cc ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/channelz/channelz.grpc.pb.cc @@ -4017,7 +4033,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc++_test_util PROPERTIES COMPILE_PDB_NAME "grpc++_test_util" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc++_test_util.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -4026,22 +4042,23 @@ endif() target_include_directories(grpc++_test_util PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(grpc++_test_util ${_gRPC_PROTOBUF_LIBRARIES} @@ -4171,12 +4188,12 @@ foreach(_hdr DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}" ) endforeach() -endif (gRPC_BUILD_CODEGEN) +endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) -if (gRPC_BUILD_CODEGEN) +if(gRPC_BUILD_CODEGEN) add_library(grpc++_test_util_unsecure ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/health/v1/health.pb.cc ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/health/v1/health.grpc.pb.cc @@ -4216,7 +4233,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc++_test_util_unsecure PROPERTIES COMPILE_PDB_NAME "grpc++_test_util_unsecure" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc++_test_util_unsecure.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -4225,22 +4242,23 @@ endif() target_include_directories(grpc++_test_util_unsecure PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(grpc++_test_util_unsecure ${_gRPC_PROTOBUF_LIBRARIES} @@ -4370,9 +4388,9 @@ foreach(_hdr DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}" ) endforeach() -endif (gRPC_BUILD_CODEGEN) +endif() -endif (gRPC_BUILD_TESTS) +endif() add_library(grpc++_unsecure src/cpp/client/insecure_credentials.cc @@ -4432,7 +4450,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc++_unsecure PROPERTIES COMPILE_PDB_NAME "grpc++_unsecure" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc++_unsecure.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -4441,18 +4459,19 @@ endif() target_include_directories(grpc++_unsecure PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(grpc++_unsecure ${_gRPC_BASELIB_LIBRARIES} @@ -4728,7 +4747,7 @@ foreach(_hdr endforeach() -if (gRPC_INSTALL) +if(gRPC_INSTALL) install(TARGETS grpc++_unsecure EXPORT gRPCTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} @@ -4736,7 +4755,7 @@ if (gRPC_INSTALL) ) endif() -if (gRPC_BUILD_TESTS) +if(gRPC_BUILD_TESTS) add_library(grpc_benchmark test/cpp/microbenchmarks/helpers.cc @@ -4751,7 +4770,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc_benchmark PROPERTIES COMPILE_PDB_NAME "grpc_benchmark" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc_benchmark.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -4760,22 +4779,23 @@ endif() target_include_directories(grpc_benchmark PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(grpc_benchmark ${_gRPC_PROTOBUF_LIBRARIES} @@ -4788,10 +4808,10 @@ target_link_libraries(grpc_benchmark ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) -if (gRPC_BUILD_CODEGEN) +if(gRPC_BUILD_CODEGEN) add_library(grpc_cli_libs test/cpp/util/cli_call.cc test/cpp/util/cli_credentials.cc @@ -4813,7 +4833,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc_cli_libs PROPERTIES COMPILE_PDB_NAME "grpc_cli_libs" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc_cli_libs.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -4822,22 +4842,23 @@ endif() target_include_directories(grpc_cli_libs PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(grpc_cli_libs ${_gRPC_PROTOBUF_LIBRARIES} @@ -4858,9 +4879,9 @@ foreach(_hdr DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}" ) endforeach() -endif (gRPC_BUILD_CODEGEN) +endif() -endif (gRPC_BUILD_TESTS) +endif() add_library(grpc_plugin_support src/compiler/cpp_generator.cc @@ -4881,7 +4902,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc_plugin_support PROPERTIES COMPILE_PDB_NAME "grpc_plugin_support" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc_plugin_support.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -4890,18 +4911,19 @@ endif() target_include_directories(grpc_plugin_support PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(grpc_plugin_support ${_gRPC_PROTOBUF_PROTOC_LIBRARIES} @@ -4921,7 +4943,7 @@ foreach(_hdr endforeach() -if (gRPC_INSTALL) +if(gRPC_INSTALL) install(TARGETS grpc_plugin_support EXPORT gRPCTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} @@ -4930,7 +4952,7 @@ if (gRPC_INSTALL) endif() -if (gRPC_BUILD_CODEGEN) +if(gRPC_BUILD_CODEGEN) add_library(grpcpp_channelz src/cpp/server/channelz/channelz_service.cc src/cpp/server/channelz/channelz_service_plugin.cc @@ -4949,7 +4971,7 @@ if(WIN32 AND MSVC) set_target_properties(grpcpp_channelz PROPERTIES COMPILE_PDB_NAME "grpcpp_channelz" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpcpp_channelz.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -4958,18 +4980,19 @@ endif() target_include_directories(grpcpp_channelz PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(grpcpp_channelz ${_gRPC_PROTOBUF_LIBRARIES} @@ -4988,11 +5011,11 @@ foreach(_hdr DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}" ) endforeach() -endif (gRPC_BUILD_CODEGEN) +endif() -if (gRPC_BUILD_CODEGEN) +if(gRPC_BUILD_CODEGEN) -if (gRPC_INSTALL) +if(gRPC_INSTALL) install(TARGETS grpcpp_channelz EXPORT gRPCTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} @@ -5000,10 +5023,10 @@ if (gRPC_INSTALL) ) endif() -endif (gRPC_BUILD_CODEGEN) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) -if (gRPC_BUILD_CODEGEN) +if(gRPC_BUILD_CODEGEN) add_library(http2_client_main ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/empty.pb.cc ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/empty.grpc.pb.cc @@ -5029,7 +5052,7 @@ if(WIN32 AND MSVC) set_target_properties(http2_client_main PROPERTIES COMPILE_PDB_NAME "http2_client_main" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/http2_client_main.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -5038,22 +5061,23 @@ endif() target_include_directories(http2_client_main PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(http2_client_main ${_gRPC_PROTOBUF_LIBRARIES} @@ -5066,12 +5090,12 @@ target_link_libraries(http2_client_main ${_gRPC_GFLAGS_LIBRARIES} ) -endif (gRPC_BUILD_CODEGEN) +endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) -if (gRPC_BUILD_CODEGEN) +if(gRPC_BUILD_CODEGEN) add_library(interop_client_helper ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/messages.pb.cc ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/messages.grpc.pb.cc @@ -5089,7 +5113,7 @@ if(WIN32 AND MSVC) set_target_properties(interop_client_helper PROPERTIES COMPILE_PDB_NAME "interop_client_helper" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/interop_client_helper.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -5098,22 +5122,23 @@ endif() target_include_directories(interop_client_helper PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(interop_client_helper ${_gRPC_PROTOBUF_LIBRARIES} @@ -5126,12 +5151,12 @@ target_link_libraries(interop_client_helper ${_gRPC_GFLAGS_LIBRARIES} ) -endif (gRPC_BUILD_CODEGEN) +endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) -if (gRPC_BUILD_CODEGEN) +if(gRPC_BUILD_CODEGEN) add_library(interop_client_main ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/empty.pb.cc ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/empty.grpc.pb.cc @@ -5158,7 +5183,7 @@ if(WIN32 AND MSVC) set_target_properties(interop_client_main PROPERTIES COMPILE_PDB_NAME "interop_client_main" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/interop_client_main.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -5167,22 +5192,23 @@ endif() target_include_directories(interop_client_main PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(interop_client_main ${_gRPC_PROTOBUF_LIBRARIES} @@ -5197,10 +5223,10 @@ target_link_libraries(interop_client_main ${_gRPC_GFLAGS_LIBRARIES} ) -endif (gRPC_BUILD_CODEGEN) +endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_library(interop_server_helper test/cpp/interop/server_helper.cc @@ -5215,7 +5241,7 @@ if(WIN32 AND MSVC) set_target_properties(interop_server_helper PROPERTIES COMPILE_PDB_NAME "interop_server_helper" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/interop_server_helper.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -5224,22 +5250,23 @@ endif() target_include_directories(interop_server_helper PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(interop_server_helper ${_gRPC_PROTOBUF_LIBRARIES} @@ -5253,10 +5280,10 @@ target_link_libraries(interop_server_helper ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) -if (gRPC_BUILD_CODEGEN) +if(gRPC_BUILD_CODEGEN) add_library(interop_server_lib ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/empty.pb.cc ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/empty.grpc.pb.cc @@ -5282,7 +5309,7 @@ if(WIN32 AND MSVC) set_target_properties(interop_server_lib PROPERTIES COMPILE_PDB_NAME "interop_server_lib" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/interop_server_lib.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -5291,22 +5318,23 @@ endif() target_include_directories(interop_server_lib PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(interop_server_lib ${_gRPC_PROTOBUF_LIBRARIES} @@ -5321,10 +5349,10 @@ target_link_libraries(interop_server_lib ${_gRPC_GFLAGS_LIBRARIES} ) -endif (gRPC_BUILD_CODEGEN) +endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_library(interop_server_main test/cpp/interop/interop_server_bootstrap.cc @@ -5339,7 +5367,7 @@ if(WIN32 AND MSVC) set_target_properties(interop_server_main PROPERTIES COMPILE_PDB_NAME "interop_server_main" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/interop_server_main.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -5348,22 +5376,23 @@ endif() target_include_directories(interop_server_main PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(interop_server_main ${_gRPC_PROTOBUF_LIBRARIES} @@ -5373,10 +5402,10 @@ target_link_libraries(interop_server_main ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) -if (gRPC_BUILD_CODEGEN) +if(gRPC_BUILD_CODEGEN) add_library(qps ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/messages.pb.cc ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/messages.grpc.pb.cc @@ -5430,7 +5459,7 @@ if(WIN32 AND MSVC) set_target_properties(qps PROPERTIES COMPILE_PDB_NAME "qps" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qps.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -5439,22 +5468,23 @@ endif() target_include_directories(qps PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(qps ${_gRPC_PROTOBUF_LIBRARIES} @@ -5467,10 +5497,10 @@ target_link_libraries(qps ${_gRPC_GFLAGS_LIBRARIES} ) -endif (gRPC_BUILD_CODEGEN) +endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_CSHARP_EXT) +endif() +if(gRPC_BUILD_CSHARP_EXT) add_library(grpc_csharp_ext SHARED src/csharp/ext/grpc_csharp_ext.c @@ -5485,7 +5515,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc_csharp_ext PROPERTIES COMPILE_PDB_NAME "grpc_csharp_ext" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc_csharp_ext.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -5494,17 +5524,18 @@ endif() target_include_directories(grpc_csharp_ext PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(grpc_csharp_ext ${_gRPC_ALLTARGETS_LIBRARIES} @@ -5514,7 +5545,7 @@ target_link_libraries(grpc_csharp_ext -if (gRPC_INSTALL) +if(gRPC_INSTALL) install(TARGETS grpc_csharp_ext EXPORT gRPCTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} @@ -5522,8 +5553,8 @@ if (gRPC_INSTALL) ) endif() -endif (gRPC_BUILD_CSHARP_EXT) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_library(bad_client_test test/core/bad_client/bad_client.cc @@ -5538,7 +5569,7 @@ if(WIN32 AND MSVC) set_target_properties(bad_client_test PROPERTIES COMPILE_PDB_NAME "bad_client_test" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/bad_client_test.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -5547,22 +5578,23 @@ endif() target_include_directories(bad_client_test PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(bad_client_test ${_gRPC_PROTOBUF_LIBRARIES} @@ -5574,8 +5606,8 @@ target_link_libraries(bad_client_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_library(bad_ssl_test_server test/core/bad_ssl/server_common.cc @@ -5590,7 +5622,7 @@ if(WIN32 AND MSVC) set_target_properties(bad_ssl_test_server PROPERTIES COMPILE_PDB_NAME "bad_ssl_test_server" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/bad_ssl_test_server.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -5599,17 +5631,18 @@ endif() target_include_directories(bad_ssl_test_server PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(bad_ssl_test_server ${_gRPC_ALLTARGETS_LIBRARIES} @@ -5619,8 +5652,8 @@ target_link_libraries(bad_ssl_test_server ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_library(end2end_tests test/core/end2end/end2end_tests.cc @@ -5714,7 +5747,7 @@ if(WIN32 AND MSVC) set_target_properties(end2end_tests PROPERTIES COMPILE_PDB_NAME "end2end_tests" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/end2end_tests.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -5723,17 +5756,18 @@ endif() target_include_directories(end2end_tests PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(end2end_tests ${_gRPC_SSL_LIBRARIES} @@ -5744,8 +5778,8 @@ target_link_libraries(end2end_tests ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_library(end2end_nosec_tests test/core/end2end/end2end_nosec_tests.cc @@ -5838,7 +5872,7 @@ if(WIN32 AND MSVC) set_target_properties(end2end_nosec_tests PROPERTIES COMPILE_PDB_NAME "end2end_nosec_tests" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if(gRPC_INSTALL) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/end2end_nosec_tests.pdb DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) @@ -5847,17 +5881,18 @@ endif() target_include_directories(end2end_nosec_tests PUBLIC $ $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(end2end_nosec_tests ${_gRPC_ALLTARGETS_LIBRARIES} @@ -5867,27 +5902,28 @@ target_link_libraries(end2end_nosec_tests ) -endif (gRPC_BUILD_TESTS) +endif() -if (gRPC_BUILD_TESTS) +if(gRPC_BUILD_TESTS) add_executable(algorithm_test test/core/compression/algorithm_test.cc ) target_include_directories(algorithm_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(algorithm_test @@ -5898,26 +5934,27 @@ target_link_libraries(algorithm_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(alloc_test test/core/gpr/alloc_test.cc ) target_include_directories(alloc_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(alloc_test @@ -5928,26 +5965,27 @@ target_link_libraries(alloc_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(alpn_test test/core/transport/chttp2/alpn_test.cc ) target_include_directories(alpn_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(alpn_test @@ -5958,26 +5996,27 @@ target_link_libraries(alpn_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(arena_test test/core/gpr/arena_test.cc ) target_include_directories(arena_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(arena_test @@ -5988,26 +6027,27 @@ target_link_libraries(arena_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(avl_test test/core/avl/avl_test.cc ) target_include_directories(avl_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(avl_test @@ -6018,26 +6058,27 @@ target_link_libraries(avl_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(bad_server_response_test test/core/end2end/bad_server_response_test.cc ) target_include_directories(bad_server_response_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(bad_server_response_test @@ -6049,26 +6090,27 @@ target_link_libraries(bad_server_response_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(bin_decoder_test test/core/transport/chttp2/bin_decoder_test.cc ) target_include_directories(bin_decoder_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(bin_decoder_test @@ -6078,26 +6120,27 @@ target_link_libraries(bin_decoder_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(bin_encoder_test test/core/transport/chttp2/bin_encoder_test.cc ) target_include_directories(bin_encoder_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(bin_encoder_test @@ -6107,58 +6150,60 @@ target_link_libraries(bin_encoder_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX) -add_executable(buffer_list_test - test/core/iomgr/buffer_list_test.cc -) + add_executable(buffer_list_test + test/core/iomgr/buffer_list_test.cc + ) -target_include_directories(buffer_list_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(buffer_list_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(buffer_list_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - grpc - gpr -) + target_link_libraries(buffer_list_test + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + grpc + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(channel_create_test test/core/surface/channel_create_test.cc ) target_include_directories(channel_create_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(channel_create_test @@ -6169,25 +6214,26 @@ target_link_libraries(channel_create_test ) -endif (gRPC_BUILD_TESTS) +endif() add_executable(check_epollexclusive test/build/check_epollexclusive.c ) target_include_directories(check_epollexclusive - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(check_epollexclusive @@ -6197,25 +6243,26 @@ target_link_libraries(check_epollexclusive ) -if (gRPC_BUILD_TESTS) +if(gRPC_BUILD_TESTS) add_executable(chttp2_hpack_encoder_test test/core/transport/chttp2/hpack_encoder_test.cc ) target_include_directories(chttp2_hpack_encoder_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(chttp2_hpack_encoder_test @@ -6226,26 +6273,27 @@ target_link_libraries(chttp2_hpack_encoder_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(chttp2_stream_map_test test/core/transport/chttp2/stream_map_test.cc ) target_include_directories(chttp2_stream_map_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(chttp2_stream_map_test @@ -6256,26 +6304,27 @@ target_link_libraries(chttp2_stream_map_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(chttp2_varint_test test/core/transport/chttp2/varint_test.cc ) target_include_directories(chttp2_varint_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(chttp2_varint_test @@ -6286,58 +6335,60 @@ target_link_libraries(chttp2_varint_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(close_fd_test - test/core/bad_connection/close_fd_test.cc -) + add_executable(close_fd_test + test/core/bad_connection/close_fd_test.cc + ) -target_include_directories(close_fd_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(close_fd_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(close_fd_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - grpc - gpr -) + target_link_libraries(close_fd_test + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + grpc + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(cmdline_test test/core/util/cmdline_test.cc ) target_include_directories(cmdline_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(cmdline_test @@ -6348,26 +6399,27 @@ target_link_libraries(cmdline_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(combiner_test test/core/iomgr/combiner_test.cc ) target_include_directories(combiner_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(combiner_test @@ -6378,26 +6430,27 @@ target_link_libraries(combiner_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(compression_test test/core/compression/compression_test.cc ) target_include_directories(compression_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(compression_test @@ -6408,26 +6461,27 @@ target_link_libraries(compression_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(concurrent_connectivity_test test/core/surface/concurrent_connectivity_test.cc ) target_include_directories(concurrent_connectivity_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(concurrent_connectivity_test @@ -6438,26 +6492,27 @@ target_link_libraries(concurrent_connectivity_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(connection_refused_test test/core/end2end/connection_refused_test.cc ) target_include_directories(connection_refused_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(connection_refused_test @@ -6468,26 +6523,27 @@ target_link_libraries(connection_refused_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(dns_resolver_connectivity_test test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc ) target_include_directories(dns_resolver_connectivity_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(dns_resolver_connectivity_test @@ -6498,26 +6554,27 @@ target_link_libraries(dns_resolver_connectivity_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(dns_resolver_cooldown_using_ares_resolver_test test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc ) target_include_directories(dns_resolver_cooldown_using_ares_resolver_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(dns_resolver_cooldown_using_ares_resolver_test @@ -6528,26 +6585,27 @@ target_link_libraries(dns_resolver_cooldown_using_ares_resolver_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(dns_resolver_cooldown_using_native_resolver_test test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc ) target_include_directories(dns_resolver_cooldown_using_native_resolver_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(dns_resolver_cooldown_using_native_resolver_test @@ -6558,26 +6616,27 @@ target_link_libraries(dns_resolver_cooldown_using_native_resolver_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(dns_resolver_test test/core/client_channel/resolvers/dns_resolver_test.cc ) target_include_directories(dns_resolver_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(dns_resolver_test @@ -6588,58 +6647,60 @@ target_link_libraries(dns_resolver_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(dualstack_socket_test - test/core/end2end/dualstack_socket_test.cc -) + add_executable(dualstack_socket_test + test/core/end2end/dualstack_socket_test.cc + ) -target_include_directories(dualstack_socket_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(dualstack_socket_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(dualstack_socket_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - grpc - gpr -) + target_link_libraries(dualstack_socket_test + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + grpc + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(endpoint_pair_test test/core/iomgr/endpoint_pair_test.cc ) target_include_directories(endpoint_pair_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(endpoint_pair_test @@ -6650,26 +6711,27 @@ target_link_libraries(endpoint_pair_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(error_test test/core/iomgr/error_test.cc ) target_include_directories(error_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(error_test @@ -6680,58 +6742,60 @@ target_link_libraries(error_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX) -add_executable(ev_epollex_linux_test - test/core/iomgr/ev_epollex_linux_test.cc -) + add_executable(ev_epollex_linux_test + test/core/iomgr/ev_epollex_linux_test.cc + ) -target_include_directories(ev_epollex_linux_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(ev_epollex_linux_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(ev_epollex_linux_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - grpc - gpr -) + target_link_libraries(ev_epollex_linux_test + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + grpc + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(fake_resolver_test test/core/client_channel/resolvers/fake_resolver_test.cc ) target_include_directories(fake_resolver_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(fake_resolver_test @@ -6742,123 +6806,127 @@ target_link_libraries(fake_resolver_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(fake_transport_security_test - test/core/tsi/fake_transport_security_test.cc - test/core/tsi/transport_security_test_lib.cc -) + add_executable(fake_transport_security_test + test/core/tsi/fake_transport_security_test.cc + test/core/tsi/transport_security_test_lib.cc + ) -target_include_directories(fake_transport_security_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(fake_transport_security_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(fake_transport_security_test - ${_gRPC_ALLTARGETS_LIBRARIES} - gpr - grpc_test_util - grpc -) + target_link_libraries(fake_transport_security_test + ${_gRPC_ALLTARGETS_LIBRARIES} + gpr + grpc_test_util + grpc + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(fd_conservation_posix_test - test/core/iomgr/fd_conservation_posix_test.cc -) + add_executable(fd_conservation_posix_test + test/core/iomgr/fd_conservation_posix_test.cc + ) -target_include_directories(fd_conservation_posix_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(fd_conservation_posix_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(fd_conservation_posix_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - grpc - gpr -) + target_link_libraries(fd_conservation_posix_test + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + grpc + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(fd_posix_test - test/core/iomgr/fd_posix_test.cc -) + add_executable(fd_posix_test + test/core/iomgr/fd_posix_test.cc + ) -target_include_directories(fd_posix_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(fd_posix_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(fd_posix_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - grpc - gpr -) + target_link_libraries(fd_posix_test + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + grpc + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(fling_client test/core/fling/client.cc ) target_include_directories(fling_client - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(fling_client @@ -6869,26 +6937,27 @@ target_link_libraries(fling_client ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(fling_server test/core/fling/server.cc ) target_include_directories(fling_server - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(fling_server @@ -6899,154 +6968,159 @@ target_link_libraries(fling_server ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(fling_stream_test - test/core/fling/fling_stream_test.cc -) + add_executable(fling_stream_test + test/core/fling/fling_stream_test.cc + ) -target_include_directories(fling_stream_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(fling_stream_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(fling_stream_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - grpc - gpr -) + target_link_libraries(fling_stream_test + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + grpc + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(fling_test - test/core/fling/fling_test.cc -) + add_executable(fling_test + test/core/fling/fling_test.cc + ) -target_include_directories(fling_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(fling_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(fling_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - grpc - gpr -) + target_link_libraries(fling_test + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + grpc + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC) -add_executable(fork_test - test/core/gprpp/fork_test.cc -) + add_executable(fork_test + test/core/gprpp/fork_test.cc + ) -target_include_directories(fork_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(fork_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(fork_test - ${_gRPC_ALLTARGETS_LIBRARIES} - gpr - grpc_test_util_unsecure - grpc_unsecure -) + target_link_libraries(fork_test + ${_gRPC_ALLTARGETS_LIBRARIES} + gpr + grpc_test_util_unsecure + grpc_unsecure + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(goaway_server_test - test/core/end2end/goaway_server_test.cc -) + add_executable(goaway_server_test + test/core/end2end/goaway_server_test.cc + ) -target_include_directories(goaway_server_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(goaway_server_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(goaway_server_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - grpc - gpr -) + target_link_libraries(goaway_server_test + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + grpc + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(gpr_cpu_test test/core/gpr/cpu_test.cc ) target_include_directories(gpr_cpu_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(gpr_cpu_test @@ -7057,26 +7131,27 @@ target_link_libraries(gpr_cpu_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(gpr_env_test test/core/gpr/env_test.cc ) target_include_directories(gpr_env_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(gpr_env_test @@ -7087,26 +7162,27 @@ target_link_libraries(gpr_env_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(gpr_host_port_test test/core/gprpp/host_port_test.cc ) target_include_directories(gpr_host_port_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(gpr_host_port_test @@ -7117,26 +7193,27 @@ target_link_libraries(gpr_host_port_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(gpr_log_test test/core/gpr/log_test.cc ) target_include_directories(gpr_log_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(gpr_log_test @@ -7147,26 +7224,27 @@ target_link_libraries(gpr_log_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(gpr_manual_constructor_test test/core/gprpp/manual_constructor_test.cc ) target_include_directories(gpr_manual_constructor_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(gpr_manual_constructor_test @@ -7177,26 +7255,27 @@ target_link_libraries(gpr_manual_constructor_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(gpr_spinlock_test test/core/gpr/spinlock_test.cc ) target_include_directories(gpr_spinlock_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(gpr_spinlock_test @@ -7207,26 +7286,27 @@ target_link_libraries(gpr_spinlock_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(gpr_string_test test/core/gpr/string_test.cc ) target_include_directories(gpr_string_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(gpr_string_test @@ -7237,26 +7317,27 @@ target_link_libraries(gpr_string_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(gpr_sync_test test/core/gpr/sync_test.cc ) target_include_directories(gpr_sync_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(gpr_sync_test @@ -7267,26 +7348,27 @@ target_link_libraries(gpr_sync_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(gpr_thd_test test/core/gprpp/thd_test.cc ) target_include_directories(gpr_thd_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(gpr_thd_test @@ -7297,26 +7379,27 @@ target_link_libraries(gpr_thd_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(gpr_time_test test/core/gpr/time_test.cc ) target_include_directories(gpr_time_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(gpr_time_test @@ -7327,26 +7410,27 @@ target_link_libraries(gpr_time_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(gpr_tls_test test/core/gpr/tls_test.cc ) target_include_directories(gpr_tls_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(gpr_tls_test @@ -7357,26 +7441,27 @@ target_link_libraries(gpr_tls_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(gpr_useful_test test/core/gpr/useful_test.cc ) target_include_directories(gpr_useful_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(gpr_useful_test @@ -7387,26 +7472,27 @@ target_link_libraries(gpr_useful_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(grpc_auth_context_test test/core/security/auth_context_test.cc ) target_include_directories(grpc_auth_context_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(grpc_auth_context_test @@ -7417,26 +7503,27 @@ target_link_libraries(grpc_auth_context_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(grpc_b64_test test/core/slice/b64_test.cc ) target_include_directories(grpc_b64_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(grpc_b64_test @@ -7447,26 +7534,27 @@ target_link_libraries(grpc_b64_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(grpc_byte_buffer_reader_test test/core/surface/byte_buffer_reader_test.cc ) target_include_directories(grpc_byte_buffer_reader_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(grpc_byte_buffer_reader_test @@ -7477,26 +7565,27 @@ target_link_libraries(grpc_byte_buffer_reader_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(grpc_channel_args_test test/core/channel/channel_args_test.cc ) target_include_directories(grpc_channel_args_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(grpc_channel_args_test @@ -7507,26 +7596,27 @@ target_link_libraries(grpc_channel_args_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(grpc_channel_stack_builder_test test/core/channel/channel_stack_builder_test.cc ) target_include_directories(grpc_channel_stack_builder_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(grpc_channel_stack_builder_test @@ -7537,26 +7627,27 @@ target_link_libraries(grpc_channel_stack_builder_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(grpc_channel_stack_test test/core/channel/channel_stack_test.cc ) target_include_directories(grpc_channel_stack_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(grpc_channel_stack_test @@ -7567,26 +7658,27 @@ target_link_libraries(grpc_channel_stack_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(grpc_completion_queue_test test/core/surface/completion_queue_test.cc ) target_include_directories(grpc_completion_queue_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(grpc_completion_queue_test @@ -7597,26 +7689,27 @@ target_link_libraries(grpc_completion_queue_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(grpc_completion_queue_threading_test test/core/surface/completion_queue_threading_test.cc ) target_include_directories(grpc_completion_queue_threading_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(grpc_completion_queue_threading_test @@ -7627,26 +7720,27 @@ target_link_libraries(grpc_completion_queue_threading_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(grpc_control_plane_credentials_test test/core/security/control_plane_credentials_test.cc ) target_include_directories(grpc_control_plane_credentials_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(grpc_control_plane_credentials_test @@ -7657,7 +7751,7 @@ target_link_libraries(grpc_control_plane_credentials_test ) -endif (gRPC_BUILD_TESTS) +endif() add_executable(grpc_create_jwt test/core/security/create_jwt.cc @@ -7665,18 +7759,19 @@ add_executable(grpc_create_jwt ) target_include_directories(grpc_create_jwt - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(grpc_create_jwt @@ -7687,25 +7782,26 @@ target_link_libraries(grpc_create_jwt ) -if (gRPC_BUILD_TESTS) +if(gRPC_BUILD_TESTS) add_executable(grpc_credentials_test test/core/security/credentials_test.cc ) target_include_directories(grpc_credentials_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(grpc_credentials_test @@ -7716,26 +7812,27 @@ target_link_libraries(grpc_credentials_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(grpc_ipv6_loopback_available_test test/core/iomgr/grpc_ipv6_loopback_available_test.cc ) target_include_directories(grpc_ipv6_loopback_available_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(grpc_ipv6_loopback_available_test @@ -7746,58 +7843,60 @@ target_link_libraries(grpc_ipv6_loopback_available_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(grpc_json_token_test - test/core/security/json_token_test.cc -) + add_executable(grpc_json_token_test + test/core/security/json_token_test.cc + ) -target_include_directories(grpc_json_token_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(grpc_json_token_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(grpc_json_token_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - grpc - gpr -) + target_link_libraries(grpc_json_token_test + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + grpc + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(grpc_jwt_verifier_test test/core/security/jwt_verifier_test.cc ) target_include_directories(grpc_jwt_verifier_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(grpc_jwt_verifier_test @@ -7808,7 +7907,7 @@ target_link_libraries(grpc_jwt_verifier_test ) -endif (gRPC_BUILD_TESTS) +endif() add_executable(grpc_print_google_default_creds_token test/core/security/print_google_default_creds_token.cc @@ -7816,18 +7915,19 @@ add_executable(grpc_print_google_default_creds_token ) target_include_directories(grpc_print_google_default_creds_token - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(grpc_print_google_default_creds_token @@ -7837,25 +7937,26 @@ target_link_libraries(grpc_print_google_default_creds_token ) -if (gRPC_BUILD_TESTS) +if(gRPC_BUILD_TESTS) add_executable(grpc_security_connector_test test/core/security/security_connector_test.cc ) target_include_directories(grpc_security_connector_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(grpc_security_connector_test @@ -7866,26 +7967,27 @@ target_link_libraries(grpc_security_connector_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(grpc_ssl_credentials_test test/core/security/ssl_credentials_test.cc ) target_include_directories(grpc_ssl_credentials_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(grpc_ssl_credentials_test @@ -7896,7 +7998,7 @@ target_link_libraries(grpc_ssl_credentials_test ) -endif (gRPC_BUILD_TESTS) +endif() add_executable(grpc_verify_jwt test/core/security/verify_jwt.cc @@ -7904,18 +8006,19 @@ add_executable(grpc_verify_jwt ) target_include_directories(grpc_verify_jwt - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(grpc_verify_jwt @@ -7925,159 +8028,164 @@ target_link_libraries(grpc_verify_jwt ) -if (gRPC_BUILD_TESTS) +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX) -add_executable(handshake_client_ssl - test/core/handshake/client_ssl.cc -) + add_executable(handshake_client_ssl + test/core/handshake/client_ssl.cc + ) -target_include_directories(handshake_client_ssl - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(handshake_client_ssl + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(handshake_client_ssl - ${_gRPC_SSL_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - grpc - gpr -) + target_link_libraries(handshake_client_ssl + ${_gRPC_SSL_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + grpc + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX) -add_executable(handshake_server_ssl - test/core/handshake/server_ssl.cc - test/core/handshake/server_ssl_common.cc -) + add_executable(handshake_server_ssl + test/core/handshake/server_ssl.cc + test/core/handshake/server_ssl_common.cc + ) -target_include_directories(handshake_server_ssl - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(handshake_server_ssl + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(handshake_server_ssl - ${_gRPC_SSL_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - grpc - gpr -) + target_link_libraries(handshake_server_ssl + ${_gRPC_SSL_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + grpc + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX) -add_executable(handshake_server_with_readahead_handshaker - test/core/handshake/readahead_handshaker_server_ssl.cc - test/core/handshake/server_ssl_common.cc -) + add_executable(handshake_server_with_readahead_handshaker + test/core/handshake/readahead_handshaker_server_ssl.cc + test/core/handshake/server_ssl_common.cc + ) -target_include_directories(handshake_server_with_readahead_handshaker - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(handshake_server_with_readahead_handshaker + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(handshake_server_with_readahead_handshaker - ${_gRPC_SSL_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - grpc - gpr -) + target_link_libraries(handshake_server_with_readahead_handshaker + ${_gRPC_SSL_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + grpc + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX) -add_executable(handshake_verify_peer_options - test/core/handshake/verify_peer_options.cc -) + add_executable(handshake_verify_peer_options + test/core/handshake/verify_peer_options.cc + ) -target_include_directories(handshake_verify_peer_options - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(handshake_verify_peer_options + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(handshake_verify_peer_options - ${_gRPC_SSL_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - grpc - gpr -) + target_link_libraries(handshake_verify_peer_options + ${_gRPC_SSL_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + grpc + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(histogram_test test/core/util/histogram_test.cc ) target_include_directories(histogram_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(histogram_test @@ -8087,26 +8195,27 @@ target_link_libraries(histogram_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(hpack_parser_test test/core/transport/chttp2/hpack_parser_test.cc ) target_include_directories(hpack_parser_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(hpack_parser_test @@ -8117,26 +8226,27 @@ target_link_libraries(hpack_parser_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(hpack_table_test test/core/transport/chttp2/hpack_table_test.cc ) target_include_directories(hpack_table_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(hpack_table_test @@ -8147,26 +8257,27 @@ target_link_libraries(hpack_table_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(http_parser_test test/core/http/parser_test.cc ) target_include_directories(http_parser_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(http_parser_test @@ -8177,26 +8288,27 @@ target_link_libraries(http_parser_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(httpcli_format_request_test test/core/http/format_request_test.cc ) target_include_directories(httpcli_format_request_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(httpcli_format_request_test @@ -8207,90 +8319,93 @@ target_link_libraries(httpcli_format_request_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(httpcli_test - test/core/http/httpcli_test.cc -) + add_executable(httpcli_test + test/core/http/httpcli_test.cc + ) -target_include_directories(httpcli_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(httpcli_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(httpcli_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - grpc - gpr -) + target_link_libraries(httpcli_test + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + grpc + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX) -add_executable(httpscli_test - test/core/http/httpscli_test.cc -) + add_executable(httpscli_test + test/core/http/httpscli_test.cc + ) -target_include_directories(httpscli_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(httpscli_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(httpscli_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - grpc - gpr -) + target_link_libraries(httpscli_test + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + grpc + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(init_test test/core/surface/init_test.cc ) target_include_directories(init_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(init_test @@ -8301,26 +8416,27 @@ target_link_libraries(init_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(inproc_callback_test test/core/end2end/inproc_callback_test.cc ) target_include_directories(inproc_callback_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(inproc_callback_test @@ -8331,26 +8447,27 @@ target_link_libraries(inproc_callback_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(invalid_call_argument_test test/core/end2end/invalid_call_argument_test.cc ) target_include_directories(invalid_call_argument_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(invalid_call_argument_test @@ -8361,26 +8478,27 @@ target_link_libraries(invalid_call_argument_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(json_rewrite test/core/json/json_rewrite.cc ) target_include_directories(json_rewrite - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(json_rewrite @@ -8391,26 +8509,27 @@ target_link_libraries(json_rewrite ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(json_rewrite_test test/core/json/json_rewrite_test.cc ) target_include_directories(json_rewrite_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(json_rewrite_test @@ -8421,26 +8540,27 @@ target_link_libraries(json_rewrite_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(json_stream_error_test test/core/json/json_stream_error_test.cc ) target_include_directories(json_stream_error_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(json_stream_error_test @@ -8451,26 +8571,27 @@ target_link_libraries(json_stream_error_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(json_test test/core/json/json_test.cc ) target_include_directories(json_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(json_test @@ -8481,26 +8602,27 @@ target_link_libraries(json_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(lame_client_test test/core/surface/lame_client_test.cc ) target_include_directories(lame_client_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(lame_client_test @@ -8511,26 +8633,27 @@ target_link_libraries(lame_client_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(load_file_test test/core/iomgr/load_file_test.cc ) target_include_directories(load_file_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(load_file_test @@ -8541,26 +8664,27 @@ target_link_libraries(load_file_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(memory_usage_client test/core/memory_usage/client.cc ) target_include_directories(memory_usage_client - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(memory_usage_client @@ -8571,26 +8695,27 @@ target_link_libraries(memory_usage_client ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(memory_usage_server test/core/memory_usage/server.cc ) target_include_directories(memory_usage_server - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(memory_usage_server @@ -8601,58 +8726,60 @@ target_link_libraries(memory_usage_server ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(memory_usage_test - test/core/memory_usage/memory_usage_test.cc -) + add_executable(memory_usage_test + test/core/memory_usage/memory_usage_test.cc + ) -target_include_directories(memory_usage_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(memory_usage_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(memory_usage_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - grpc - gpr -) + target_link_libraries(memory_usage_test + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + grpc + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(message_compress_test test/core/compression/message_compress_test.cc ) target_include_directories(message_compress_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(message_compress_test @@ -8663,26 +8790,27 @@ target_link_libraries(message_compress_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(minimal_stack_is_minimal_test test/core/channel/minimal_stack_is_minimal_test.cc ) target_include_directories(minimal_stack_is_minimal_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(minimal_stack_is_minimal_test @@ -8693,26 +8821,27 @@ target_link_libraries(minimal_stack_is_minimal_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(mpmcqueue_test test/core/iomgr/mpmcqueue_test.cc ) target_include_directories(mpmcqueue_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(mpmcqueue_test @@ -8723,26 +8852,27 @@ target_link_libraries(mpmcqueue_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(multiple_server_queues_test test/core/end2end/multiple_server_queues_test.cc ) target_include_directories(multiple_server_queues_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(multiple_server_queues_test @@ -8753,26 +8883,27 @@ target_link_libraries(multiple_server_queues_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(murmur_hash_test test/core/gpr/murmur_hash_test.cc ) target_include_directories(murmur_hash_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(murmur_hash_test @@ -8783,26 +8914,27 @@ target_link_libraries(murmur_hash_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(no_server_test test/core/end2end/no_server_test.cc ) target_include_directories(no_server_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(no_server_test @@ -8813,26 +8945,27 @@ target_link_libraries(no_server_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(num_external_connectivity_watchers_test test/core/surface/num_external_connectivity_watchers_test.cc ) target_include_directories(num_external_connectivity_watchers_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(num_external_connectivity_watchers_test @@ -8843,26 +8976,27 @@ target_link_libraries(num_external_connectivity_watchers_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(parse_address_test test/core/client_channel/parse_address_test.cc ) target_include_directories(parse_address_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(parse_address_test @@ -8873,58 +9007,60 @@ target_link_libraries(parse_address_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(parse_address_with_named_scope_id_test - test/core/client_channel/parse_address_with_named_scope_id_test.cc -) + add_executable(parse_address_with_named_scope_id_test + test/core/client_channel/parse_address_with_named_scope_id_test.cc + ) -target_include_directories(parse_address_with_named_scope_id_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(parse_address_with_named_scope_id_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(parse_address_with_named_scope_id_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - grpc - gpr -) + target_link_libraries(parse_address_with_named_scope_id_test + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + grpc + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(percent_encoding_test test/core/slice/percent_encoding_test.cc ) target_include_directories(percent_encoding_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(percent_encoding_test @@ -8935,58 +9071,60 @@ target_link_libraries(percent_encoding_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(resolve_address_using_ares_resolver_posix_test - test/core/iomgr/resolve_address_posix_test.cc -) + add_executable(resolve_address_using_ares_resolver_posix_test + test/core/iomgr/resolve_address_posix_test.cc + ) -target_include_directories(resolve_address_using_ares_resolver_posix_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(resolve_address_using_ares_resolver_posix_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(resolve_address_using_ares_resolver_posix_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - grpc - gpr -) + target_link_libraries(resolve_address_using_ares_resolver_posix_test + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + grpc + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(resolve_address_using_ares_resolver_test test/core/iomgr/resolve_address_test.cc ) target_include_directories(resolve_address_using_ares_resolver_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(resolve_address_using_ares_resolver_test @@ -8997,58 +9135,60 @@ target_link_libraries(resolve_address_using_ares_resolver_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(resolve_address_using_native_resolver_posix_test - test/core/iomgr/resolve_address_posix_test.cc -) + add_executable(resolve_address_using_native_resolver_posix_test + test/core/iomgr/resolve_address_posix_test.cc + ) -target_include_directories(resolve_address_using_native_resolver_posix_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(resolve_address_using_native_resolver_posix_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(resolve_address_using_native_resolver_posix_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - grpc - gpr -) + target_link_libraries(resolve_address_using_native_resolver_posix_test + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + grpc + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(resolve_address_using_native_resolver_test test/core/iomgr/resolve_address_test.cc ) target_include_directories(resolve_address_using_native_resolver_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(resolve_address_using_native_resolver_test @@ -9059,26 +9199,27 @@ target_link_libraries(resolve_address_using_native_resolver_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(resource_quota_test test/core/iomgr/resource_quota_test.cc ) target_include_directories(resource_quota_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(resource_quota_test @@ -9089,26 +9230,27 @@ target_link_libraries(resource_quota_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(secure_channel_create_test test/core/surface/secure_channel_create_test.cc ) target_include_directories(secure_channel_create_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(secure_channel_create_test @@ -9119,26 +9261,27 @@ target_link_libraries(secure_channel_create_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(secure_endpoint_test test/core/security/secure_endpoint_test.cc ) target_include_directories(secure_endpoint_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(secure_endpoint_test @@ -9149,26 +9292,27 @@ target_link_libraries(secure_endpoint_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(sequential_connectivity_test test/core/surface/sequential_connectivity_test.cc ) target_include_directories(sequential_connectivity_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(sequential_connectivity_test @@ -9179,26 +9323,27 @@ target_link_libraries(sequential_connectivity_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(server_chttp2_test test/core/surface/server_chttp2_test.cc ) target_include_directories(server_chttp2_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(server_chttp2_test @@ -9209,26 +9354,27 @@ target_link_libraries(server_chttp2_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(server_test test/core/surface/server_test.cc ) target_include_directories(server_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(server_test @@ -9239,26 +9385,27 @@ target_link_libraries(server_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(slice_buffer_test test/core/slice/slice_buffer_test.cc ) target_include_directories(slice_buffer_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(slice_buffer_test @@ -9269,26 +9416,27 @@ target_link_libraries(slice_buffer_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(slice_string_helpers_test test/core/slice/slice_string_helpers_test.cc ) target_include_directories(slice_string_helpers_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(slice_string_helpers_test @@ -9299,26 +9447,27 @@ target_link_libraries(slice_string_helpers_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(slice_test test/core/slice/slice_test.cc ) target_include_directories(slice_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(slice_test @@ -9329,26 +9478,27 @@ target_link_libraries(slice_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(sockaddr_resolver_test test/core/client_channel/resolvers/sockaddr_resolver_test.cc ) target_include_directories(sockaddr_resolver_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(sockaddr_resolver_test @@ -9359,26 +9509,27 @@ target_link_libraries(sockaddr_resolver_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(sockaddr_utils_test test/core/iomgr/sockaddr_utils_test.cc ) target_include_directories(sockaddr_utils_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(sockaddr_utils_test @@ -9389,91 +9540,94 @@ target_link_libraries(sockaddr_utils_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(socket_utils_test - test/core/iomgr/socket_utils_test.cc -) + add_executable(socket_utils_test + test/core/iomgr/socket_utils_test.cc + ) -target_include_directories(socket_utils_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(socket_utils_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(socket_utils_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - grpc - gpr -) + target_link_libraries(socket_utils_test + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + grpc + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(ssl_transport_security_test - test/core/tsi/ssl_transport_security_test.cc - test/core/tsi/transport_security_test_lib.cc -) + add_executable(ssl_transport_security_test + test/core/tsi/ssl_transport_security_test.cc + test/core/tsi/transport_security_test_lib.cc + ) -target_include_directories(ssl_transport_security_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(ssl_transport_security_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(ssl_transport_security_test - ${_gRPC_ALLTARGETS_LIBRARIES} - gpr - grpc_test_util - grpc -) + target_link_libraries(ssl_transport_security_test + ${_gRPC_ALLTARGETS_LIBRARIES} + gpr + grpc_test_util + grpc + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(status_conversion_test test/core/transport/status_conversion_test.cc ) target_include_directories(status_conversion_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(status_conversion_test @@ -9484,26 +9638,27 @@ target_link_libraries(status_conversion_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(stream_compression_test test/core/compression/stream_compression_test.cc ) target_include_directories(stream_compression_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(stream_compression_test @@ -9514,26 +9669,27 @@ target_link_libraries(stream_compression_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(stream_owned_slice_test test/core/transport/stream_owned_slice_test.cc ) target_include_directories(stream_owned_slice_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(stream_owned_slice_test @@ -9544,58 +9700,60 @@ target_link_libraries(stream_owned_slice_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(tcp_client_posix_test - test/core/iomgr/tcp_client_posix_test.cc -) + add_executable(tcp_client_posix_test + test/core/iomgr/tcp_client_posix_test.cc + ) -target_include_directories(tcp_client_posix_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(tcp_client_posix_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(tcp_client_posix_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - grpc - gpr -) + target_link_libraries(tcp_client_posix_test + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + grpc + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(tcp_client_uv_test test/core/iomgr/tcp_client_uv_test.cc ) target_include_directories(tcp_client_uv_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(tcp_client_uv_test @@ -9606,90 +9764,93 @@ target_link_libraries(tcp_client_uv_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(tcp_posix_test - test/core/iomgr/tcp_posix_test.cc -) + add_executable(tcp_posix_test + test/core/iomgr/tcp_posix_test.cc + ) -target_include_directories(tcp_posix_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(tcp_posix_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(tcp_posix_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - grpc - gpr -) + target_link_libraries(tcp_posix_test + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + grpc + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(tcp_server_posix_test - test/core/iomgr/tcp_server_posix_test.cc -) + add_executable(tcp_server_posix_test + test/core/iomgr/tcp_server_posix_test.cc + ) -target_include_directories(tcp_server_posix_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(tcp_server_posix_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(tcp_server_posix_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - grpc - gpr -) + target_link_libraries(tcp_server_posix_test + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + grpc + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(tcp_server_uv_test test/core/iomgr/tcp_server_uv_test.cc ) target_include_directories(tcp_server_uv_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(tcp_server_uv_test @@ -9700,26 +9861,27 @@ target_link_libraries(tcp_server_uv_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(threadpool_test test/core/iomgr/threadpool_test.cc ) target_include_directories(threadpool_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(threadpool_test @@ -9730,26 +9892,27 @@ target_link_libraries(threadpool_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(time_averaged_stats_test test/core/iomgr/time_averaged_stats_test.cc ) target_include_directories(time_averaged_stats_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(time_averaged_stats_test @@ -9760,26 +9923,27 @@ target_link_libraries(time_averaged_stats_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(timeout_encoding_test test/core/transport/timeout_encoding_test.cc ) target_include_directories(timeout_encoding_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(timeout_encoding_test @@ -9790,26 +9954,27 @@ target_link_libraries(timeout_encoding_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(timer_heap_test test/core/iomgr/timer_heap_test.cc ) target_include_directories(timer_heap_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(timer_heap_test @@ -9820,26 +9985,27 @@ target_link_libraries(timer_heap_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(timer_list_test test/core/iomgr/timer_list_test.cc ) target_include_directories(timer_list_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(timer_list_test @@ -9850,26 +10016,27 @@ target_link_libraries(timer_list_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(transport_metadata_test test/core/transport/metadata_test.cc ) target_include_directories(transport_metadata_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(transport_metadata_test @@ -9880,90 +10047,93 @@ target_link_libraries(transport_metadata_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(transport_security_test - test/core/tsi/transport_security_test.cc -) + add_executable(transport_security_test + test/core/tsi/transport_security_test.cc + ) -target_include_directories(transport_security_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(transport_security_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(transport_security_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - grpc - gpr -) + target_link_libraries(transport_security_test + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + grpc + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(udp_server_test - test/core/iomgr/udp_server_test.cc -) + add_executable(udp_server_test + test/core/iomgr/udp_server_test.cc + ) -target_include_directories(udp_server_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(udp_server_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(udp_server_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - grpc - gpr -) + target_link_libraries(udp_server_test + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + grpc + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(uri_parser_test test/core/client_channel/uri_parser_test.cc ) target_include_directories(uri_parser_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(uri_parser_test @@ -9974,8 +10144,8 @@ target_link_libraries(uri_parser_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(alarm_test test/cpp/common/alarm_test.cc @@ -9984,23 +10154,24 @@ add_executable(alarm_test ) target_include_directories(alarm_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(alarm_test @@ -10015,8 +10186,8 @@ target_link_libraries(alarm_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(alts_counter_test test/core/tsi/alts/frame_protector/alts_counter_test.cc @@ -10025,23 +10196,24 @@ add_executable(alts_counter_test ) target_include_directories(alts_counter_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(alts_counter_test @@ -10054,8 +10226,8 @@ target_link_libraries(alts_counter_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(alts_crypt_test test/core/tsi/alts/crypt/aes_gcm_test.cc @@ -10064,23 +10236,24 @@ add_executable(alts_crypt_test ) target_include_directories(alts_crypt_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(alts_crypt_test @@ -10094,8 +10267,8 @@ target_link_libraries(alts_crypt_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(alts_crypter_test test/core/tsi/alts/frame_protector/alts_crypter_test.cc @@ -10104,23 +10277,24 @@ add_executable(alts_crypter_test ) target_include_directories(alts_crypter_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(alts_crypter_test @@ -10133,8 +10307,8 @@ target_link_libraries(alts_crypter_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(alts_frame_handler_test test/core/tsi/alts/frame_protector/frame_handler_test.cc @@ -10143,23 +10317,24 @@ add_executable(alts_frame_handler_test ) target_include_directories(alts_frame_handler_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(alts_frame_handler_test @@ -10172,8 +10347,8 @@ target_link_libraries(alts_frame_handler_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(alts_frame_protector_test test/core/tsi/alts/frame_protector/alts_frame_protector_test.cc @@ -10183,23 +10358,24 @@ add_executable(alts_frame_protector_test ) target_include_directories(alts_frame_protector_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(alts_frame_protector_test @@ -10212,8 +10388,8 @@ target_link_libraries(alts_frame_protector_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(alts_grpc_record_protocol_test test/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_test.cc @@ -10222,23 +10398,24 @@ add_executable(alts_grpc_record_protocol_test ) target_include_directories(alts_grpc_record_protocol_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(alts_grpc_record_protocol_test @@ -10251,8 +10428,8 @@ target_link_libraries(alts_grpc_record_protocol_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(alts_handshaker_client_test test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc @@ -10261,23 +10438,24 @@ add_executable(alts_handshaker_client_test ) target_include_directories(alts_handshaker_client_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(alts_handshaker_client_test @@ -10290,8 +10468,8 @@ target_link_libraries(alts_handshaker_client_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(alts_iovec_record_protocol_test test/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol_test.cc @@ -10300,23 +10478,24 @@ add_executable(alts_iovec_record_protocol_test ) target_include_directories(alts_iovec_record_protocol_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(alts_iovec_record_protocol_test @@ -10329,8 +10508,8 @@ target_link_libraries(alts_iovec_record_protocol_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(alts_security_connector_test test/core/security/alts_security_connector_test.cc @@ -10339,23 +10518,24 @@ add_executable(alts_security_connector_test ) target_include_directories(alts_security_connector_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(alts_security_connector_test @@ -10367,8 +10547,8 @@ target_link_libraries(alts_security_connector_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(alts_tsi_handshaker_test test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc @@ -10377,23 +10557,24 @@ add_executable(alts_tsi_handshaker_test ) target_include_directories(alts_tsi_handshaker_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(alts_tsi_handshaker_test @@ -10406,8 +10587,8 @@ target_link_libraries(alts_tsi_handshaker_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(alts_tsi_utils_test test/core/tsi/alts/handshaker/alts_tsi_utils_test.cc @@ -10416,23 +10597,24 @@ add_executable(alts_tsi_utils_test ) target_include_directories(alts_tsi_utils_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(alts_tsi_utils_test @@ -10445,8 +10627,8 @@ target_link_libraries(alts_tsi_utils_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(alts_zero_copy_grpc_protector_test test/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector_test.cc @@ -10455,23 +10637,24 @@ add_executable(alts_zero_copy_grpc_protector_test ) target_include_directories(alts_zero_copy_grpc_protector_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(alts_zero_copy_grpc_protector_test @@ -10484,8 +10667,8 @@ target_link_libraries(alts_zero_copy_grpc_protector_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(async_end2end_test test/cpp/end2end/async_end2end_test.cc @@ -10494,23 +10677,24 @@ add_executable(async_end2end_test ) target_include_directories(async_end2end_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(async_end2end_test @@ -10525,8 +10709,8 @@ target_link_libraries(async_end2end_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(auth_property_iterator_test test/cpp/common/auth_property_iterator_test.cc @@ -10535,23 +10719,24 @@ add_executable(auth_property_iterator_test ) target_include_directories(auth_property_iterator_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(auth_property_iterator_test @@ -10566,8 +10751,8 @@ target_link_libraries(auth_property_iterator_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(backoff_test test/core/backoff/backoff_test.cc @@ -10576,23 +10761,24 @@ add_executable(backoff_test ) target_include_directories(backoff_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(backoff_test @@ -10605,8 +10791,8 @@ target_link_libraries(backoff_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(bdp_estimator_test test/core/transport/bdp_estimator_test.cc @@ -10615,23 +10801,24 @@ add_executable(bdp_estimator_test ) target_include_directories(bdp_estimator_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(bdp_estimator_test @@ -10646,976 +10833,997 @@ target_link_libraries(bdp_estimator_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(bm_alarm - test/cpp/microbenchmarks/bm_alarm.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(bm_alarm + test/cpp/microbenchmarks/bm_alarm.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(bm_alarm - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(bm_alarm - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_benchmark - ${_gRPC_BENCHMARK_LIBRARIES} - grpc++_test_util_unsecure - grpc_test_util_unsecure - grpc++_unsecure - grpc_unsecure - gpr - grpc++_test_config - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(bm_alarm + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(bm_alarm + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_benchmark + ${_gRPC_BENCHMARK_LIBRARIES} + grpc++_test_util_unsecure + grpc_test_util_unsecure + grpc++_unsecure + grpc_unsecure + gpr + grpc++_test_config + ${_gRPC_GFLAGS_LIBRARIES} + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(bm_arena - test/cpp/microbenchmarks/bm_arena.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(bm_arena + test/cpp/microbenchmarks/bm_arena.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(bm_arena - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(bm_arena - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_benchmark - ${_gRPC_BENCHMARK_LIBRARIES} - grpc++_test_util_unsecure - grpc_test_util_unsecure - grpc++_unsecure - grpc_unsecure - gpr - grpc++_test_config - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(bm_arena + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(bm_arena + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_benchmark + ${_gRPC_BENCHMARK_LIBRARIES} + grpc++_test_util_unsecure + grpc_test_util_unsecure + grpc++_unsecure + grpc_unsecure + gpr + grpc++_test_config + ${_gRPC_GFLAGS_LIBRARIES} + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(bm_byte_buffer - test/cpp/microbenchmarks/bm_byte_buffer.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(bm_byte_buffer + test/cpp/microbenchmarks/bm_byte_buffer.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(bm_byte_buffer - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(bm_byte_buffer - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_benchmark - ${_gRPC_BENCHMARK_LIBRARIES} - grpc++_test_util_unsecure - grpc_test_util_unsecure - grpc++_unsecure - grpc_unsecure - gpr - grpc++_test_config - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(bm_byte_buffer + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(bm_byte_buffer + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_benchmark + ${_gRPC_BENCHMARK_LIBRARIES} + grpc++_test_util_unsecure + grpc_test_util_unsecure + grpc++_unsecure + grpc_unsecure + gpr + grpc++_test_config + ${_gRPC_GFLAGS_LIBRARIES} + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(bm_call_create - test/cpp/microbenchmarks/bm_call_create.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(bm_call_create + test/cpp/microbenchmarks/bm_call_create.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(bm_call_create - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(bm_call_create - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_benchmark - ${_gRPC_BENCHMARK_LIBRARIES} - grpc++_test_util_unsecure - grpc_test_util_unsecure - grpc++_unsecure - grpc_unsecure - gpr - grpc++_test_config - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(bm_call_create + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(bm_call_create + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_benchmark + ${_gRPC_BENCHMARK_LIBRARIES} + grpc++_test_util_unsecure + grpc_test_util_unsecure + grpc++_unsecure + grpc_unsecure + gpr + grpc++_test_config + ${_gRPC_GFLAGS_LIBRARIES} + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(bm_callback_streaming_ping_pong - test/cpp/microbenchmarks/bm_callback_streaming_ping_pong.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(bm_callback_streaming_ping_pong + test/cpp/microbenchmarks/bm_callback_streaming_ping_pong.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(bm_callback_streaming_ping_pong - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(bm_callback_streaming_ping_pong - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_benchmark - ${_gRPC_BENCHMARK_LIBRARIES} - grpc++_test_util_unsecure - grpc_test_util_unsecure - grpc++_unsecure - grpc_unsecure - gpr - grpc++_test_config - bm_callback_test_service_impl - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(bm_callback_streaming_ping_pong + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(bm_callback_streaming_ping_pong + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_benchmark + ${_gRPC_BENCHMARK_LIBRARIES} + grpc++_test_util_unsecure + grpc_test_util_unsecure + grpc++_unsecure + grpc_unsecure + gpr + grpc++_test_config + bm_callback_test_service_impl + ${_gRPC_GFLAGS_LIBRARIES} + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(bm_callback_unary_ping_pong - test/cpp/microbenchmarks/bm_callback_unary_ping_pong.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(bm_callback_unary_ping_pong + test/cpp/microbenchmarks/bm_callback_unary_ping_pong.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(bm_callback_unary_ping_pong - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(bm_callback_unary_ping_pong - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_benchmark - ${_gRPC_BENCHMARK_LIBRARIES} - grpc++_test_util_unsecure - grpc_test_util_unsecure - grpc++_unsecure - grpc_unsecure - gpr - grpc++_test_config - bm_callback_test_service_impl - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(bm_callback_unary_ping_pong + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(bm_callback_unary_ping_pong + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_benchmark + ${_gRPC_BENCHMARK_LIBRARIES} + grpc++_test_util_unsecure + grpc_test_util_unsecure + grpc++_unsecure + grpc_unsecure + gpr + grpc++_test_config + bm_callback_test_service_impl + ${_gRPC_GFLAGS_LIBRARIES} + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(bm_channel - test/cpp/microbenchmarks/bm_channel.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(bm_channel + test/cpp/microbenchmarks/bm_channel.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(bm_channel - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(bm_channel - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_benchmark - ${_gRPC_BENCHMARK_LIBRARIES} - grpc++_test_util_unsecure - grpc_test_util_unsecure - grpc++_unsecure - grpc_unsecure - gpr - grpc++_test_config - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(bm_channel + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(bm_channel + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_benchmark + ${_gRPC_BENCHMARK_LIBRARIES} + grpc++_test_util_unsecure + grpc_test_util_unsecure + grpc++_unsecure + grpc_unsecure + gpr + grpc++_test_config + ${_gRPC_GFLAGS_LIBRARIES} + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(bm_chttp2_hpack - test/cpp/microbenchmarks/bm_chttp2_hpack.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(bm_chttp2_hpack + test/cpp/microbenchmarks/bm_chttp2_hpack.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(bm_chttp2_hpack - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(bm_chttp2_hpack - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_benchmark - ${_gRPC_BENCHMARK_LIBRARIES} - grpc++_test_util_unsecure - grpc_test_util_unsecure - grpc++_unsecure - grpc_unsecure - gpr - grpc++_test_config - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(bm_chttp2_hpack + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + target_link_libraries(bm_chttp2_hpack + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_benchmark + ${_gRPC_BENCHMARK_LIBRARIES} + grpc++_test_util_unsecure + grpc_test_util_unsecure + grpc++_unsecure + grpc_unsecure + gpr + grpc++_test_config + ${_gRPC_GFLAGS_LIBRARIES} + ) + +endif() endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(bm_chttp2_transport - test/cpp/microbenchmarks/bm_chttp2_transport.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(bm_chttp2_transport + test/cpp/microbenchmarks/bm_chttp2_transport.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(bm_chttp2_transport - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(bm_chttp2_transport - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_benchmark - ${_gRPC_BENCHMARK_LIBRARIES} - grpc++_test_util_unsecure - grpc_test_util_unsecure - grpc++_unsecure - grpc_unsecure - gpr - grpc++_test_config - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(bm_chttp2_transport + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + target_link_libraries(bm_chttp2_transport + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_benchmark + ${_gRPC_BENCHMARK_LIBRARIES} + grpc++_test_util_unsecure + grpc_test_util_unsecure + grpc++_unsecure + grpc_unsecure + gpr + grpc++_test_config + ${_gRPC_GFLAGS_LIBRARIES} + ) + +endif() endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(bm_closure - test/cpp/microbenchmarks/bm_closure.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(bm_closure + test/cpp/microbenchmarks/bm_closure.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(bm_closure - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(bm_closure - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_benchmark - ${_gRPC_BENCHMARK_LIBRARIES} - grpc++_test_util_unsecure - grpc_test_util_unsecure - grpc++_unsecure - grpc_unsecure - gpr - grpc++_test_config - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(bm_closure + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(bm_closure + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_benchmark + ${_gRPC_BENCHMARK_LIBRARIES} + grpc++_test_util_unsecure + grpc_test_util_unsecure + grpc++_unsecure + grpc_unsecure + gpr + grpc++_test_config + ${_gRPC_GFLAGS_LIBRARIES} + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(bm_cq - test/cpp/microbenchmarks/bm_cq.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(bm_cq + test/cpp/microbenchmarks/bm_cq.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(bm_cq - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(bm_cq - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_benchmark - ${_gRPC_BENCHMARK_LIBRARIES} - grpc++_test_util_unsecure - grpc_test_util_unsecure - grpc++_unsecure - grpc_unsecure - gpr - grpc++_test_config - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(bm_cq + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(bm_cq + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_benchmark + ${_gRPC_BENCHMARK_LIBRARIES} + grpc++_test_util_unsecure + grpc_test_util_unsecure + grpc++_unsecure + grpc_unsecure + gpr + grpc++_test_config + ${_gRPC_GFLAGS_LIBRARIES} + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(bm_cq_multiple_threads - test/cpp/microbenchmarks/bm_cq_multiple_threads.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(bm_cq_multiple_threads + test/cpp/microbenchmarks/bm_cq_multiple_threads.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(bm_cq_multiple_threads - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(bm_cq_multiple_threads - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_benchmark - ${_gRPC_BENCHMARK_LIBRARIES} - grpc++_test_util_unsecure - grpc_test_util_unsecure - grpc++_unsecure - grpc_unsecure - gpr - grpc++_test_config - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(bm_cq_multiple_threads + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(bm_cq_multiple_threads + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_benchmark + ${_gRPC_BENCHMARK_LIBRARIES} + grpc++_test_util_unsecure + grpc_test_util_unsecure + grpc++_unsecure + grpc_unsecure + gpr + grpc++_test_config + ${_gRPC_GFLAGS_LIBRARIES} + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(bm_error - test/cpp/microbenchmarks/bm_error.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(bm_error + test/cpp/microbenchmarks/bm_error.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(bm_error - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(bm_error - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_benchmark - ${_gRPC_BENCHMARK_LIBRARIES} - grpc++_test_util_unsecure - grpc_test_util_unsecure - grpc++_unsecure - grpc_unsecure - gpr - grpc++_test_config - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(bm_error + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(bm_error + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_benchmark + ${_gRPC_BENCHMARK_LIBRARIES} + grpc++_test_util_unsecure + grpc_test_util_unsecure + grpc++_unsecure + grpc_unsecure + gpr + grpc++_test_config + ${_gRPC_GFLAGS_LIBRARIES} + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(bm_fullstack_streaming_ping_pong - test/cpp/microbenchmarks/bm_fullstack_streaming_ping_pong.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(bm_fullstack_streaming_ping_pong + test/cpp/microbenchmarks/bm_fullstack_streaming_ping_pong.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(bm_fullstack_streaming_ping_pong - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(bm_fullstack_streaming_ping_pong - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_benchmark - ${_gRPC_BENCHMARK_LIBRARIES} - grpc++_test_util_unsecure - grpc_test_util_unsecure - grpc++_unsecure - grpc_unsecure - gpr - grpc++_test_config - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(bm_fullstack_streaming_ping_pong + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(bm_fullstack_streaming_ping_pong + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_benchmark + ${_gRPC_BENCHMARK_LIBRARIES} + grpc++_test_util_unsecure + grpc_test_util_unsecure + grpc++_unsecure + grpc_unsecure + gpr + grpc++_test_config + ${_gRPC_GFLAGS_LIBRARIES} + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(bm_fullstack_streaming_pump - test/cpp/microbenchmarks/bm_fullstack_streaming_pump.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(bm_fullstack_streaming_pump + test/cpp/microbenchmarks/bm_fullstack_streaming_pump.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(bm_fullstack_streaming_pump - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(bm_fullstack_streaming_pump - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_benchmark - ${_gRPC_BENCHMARK_LIBRARIES} - grpc++_test_util_unsecure - grpc_test_util_unsecure - grpc++_unsecure - grpc_unsecure - gpr - grpc++_test_config - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(bm_fullstack_streaming_pump + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(bm_fullstack_streaming_pump + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_benchmark + ${_gRPC_BENCHMARK_LIBRARIES} + grpc++_test_util_unsecure + grpc_test_util_unsecure + grpc++_unsecure + grpc_unsecure + gpr + grpc++_test_config + ${_gRPC_GFLAGS_LIBRARIES} + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(bm_fullstack_trickle - test/cpp/microbenchmarks/bm_fullstack_trickle.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(bm_fullstack_trickle + test/cpp/microbenchmarks/bm_fullstack_trickle.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(bm_fullstack_trickle - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(bm_fullstack_trickle - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_benchmark - ${_gRPC_BENCHMARK_LIBRARIES} - grpc++_test_util_unsecure - grpc_test_util_unsecure - grpc++_unsecure - grpc_unsecure - gpr - grpc++_test_config - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(bm_fullstack_trickle + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(bm_fullstack_trickle + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_benchmark + ${_gRPC_BENCHMARK_LIBRARIES} + grpc++_test_util_unsecure + grpc_test_util_unsecure + grpc++_unsecure + grpc_unsecure + gpr + grpc++_test_config + ${_gRPC_GFLAGS_LIBRARIES} + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(bm_fullstack_unary_ping_pong - test/cpp/microbenchmarks/bm_fullstack_unary_ping_pong.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(bm_fullstack_unary_ping_pong + test/cpp/microbenchmarks/bm_fullstack_unary_ping_pong.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(bm_fullstack_unary_ping_pong - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(bm_fullstack_unary_ping_pong - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_benchmark - ${_gRPC_BENCHMARK_LIBRARIES} - grpc++_test_util_unsecure - grpc_test_util_unsecure - grpc++_unsecure - grpc_unsecure - gpr - grpc++_test_config - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(bm_fullstack_unary_ping_pong + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(bm_fullstack_unary_ping_pong + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_benchmark + ${_gRPC_BENCHMARK_LIBRARIES} + grpc++_test_util_unsecure + grpc_test_util_unsecure + grpc++_unsecure + grpc_unsecure + gpr + grpc++_test_config + ${_gRPC_GFLAGS_LIBRARIES} + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(bm_metadata - test/cpp/microbenchmarks/bm_metadata.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(bm_metadata + test/cpp/microbenchmarks/bm_metadata.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(bm_metadata - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(bm_metadata - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_benchmark - ${_gRPC_BENCHMARK_LIBRARIES} - grpc++_test_util_unsecure - grpc_test_util_unsecure - grpc++_unsecure - grpc_unsecure - gpr - grpc++_test_config - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(bm_metadata + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(bm_metadata + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_benchmark + ${_gRPC_BENCHMARK_LIBRARIES} + grpc++_test_util_unsecure + grpc_test_util_unsecure + grpc++_unsecure + grpc_unsecure + gpr + grpc++_test_config + ${_gRPC_GFLAGS_LIBRARIES} + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(bm_pollset - test/cpp/microbenchmarks/bm_pollset.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(bm_pollset + test/cpp/microbenchmarks/bm_pollset.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(bm_pollset - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(bm_pollset - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_benchmark - ${_gRPC_BENCHMARK_LIBRARIES} - grpc++_test_util_unsecure - grpc_test_util_unsecure - grpc++_unsecure - grpc_unsecure - gpr - grpc++_test_config - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(bm_pollset + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(bm_pollset + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_benchmark + ${_gRPC_BENCHMARK_LIBRARIES} + grpc++_test_util_unsecure + grpc_test_util_unsecure + grpc++_unsecure + grpc_unsecure + gpr + grpc++_test_config + ${_gRPC_GFLAGS_LIBRARIES} + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(bm_threadpool - test/cpp/microbenchmarks/bm_threadpool.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(bm_threadpool + test/cpp/microbenchmarks/bm_threadpool.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(bm_threadpool - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(bm_threadpool - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_benchmark - ${_gRPC_BENCHMARK_LIBRARIES} - grpc++_test_util_unsecure - grpc_test_util_unsecure - grpc++_unsecure - grpc_unsecure - gpr - grpc++_test_config - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(bm_threadpool + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(bm_threadpool + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_benchmark + ${_gRPC_BENCHMARK_LIBRARIES} + grpc++_test_util_unsecure + grpc_test_util_unsecure + grpc++_unsecure + grpc_unsecure + gpr + grpc++_test_config + ${_gRPC_GFLAGS_LIBRARIES} + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(bm_timer - test/cpp/microbenchmarks/bm_timer.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(bm_timer + test/cpp/microbenchmarks/bm_timer.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(bm_timer - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(bm_timer - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_benchmark - ${_gRPC_BENCHMARK_LIBRARIES} - grpc++_test_util_unsecure - grpc_test_util_unsecure - grpc++_unsecure - grpc_unsecure - gpr - grpc++_test_config - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(bm_timer + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(bm_timer + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_benchmark + ${_gRPC_BENCHMARK_LIBRARIES} + grpc++_test_util_unsecure + grpc_test_util_unsecure + grpc++_unsecure + grpc_unsecure + gpr + grpc++_test_config + ${_gRPC_GFLAGS_LIBRARIES} + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(byte_stream_test test/core/transport/byte_stream_test.cc @@ -11624,23 +11832,24 @@ add_executable(byte_stream_test ) target_include_directories(byte_stream_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(byte_stream_test @@ -11653,8 +11862,8 @@ target_link_libraries(byte_stream_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(channel_arguments_test test/cpp/common/channel_arguments_test.cc @@ -11663,23 +11872,24 @@ add_executable(channel_arguments_test ) target_include_directories(channel_arguments_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(channel_arguments_test @@ -11692,8 +11902,8 @@ target_link_libraries(channel_arguments_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(channel_filter_test test/cpp/common/channel_filter_test.cc @@ -11702,23 +11912,24 @@ add_executable(channel_filter_test ) target_include_directories(channel_filter_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(channel_filter_test @@ -11731,8 +11942,8 @@ target_link_libraries(channel_filter_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(channel_trace_test test/core/channel/channel_trace_test.cc @@ -11745,23 +11956,24 @@ add_executable(channel_trace_test ) target_include_directories(channel_trace_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(channel_trace_test @@ -11776,8 +11988,8 @@ target_link_libraries(channel_trace_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(channelz_registry_test test/core/channel/channelz_registry_test.cc @@ -11786,23 +11998,24 @@ add_executable(channelz_registry_test ) target_include_directories(channelz_registry_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(channelz_registry_test @@ -11817,8 +12030,8 @@ target_link_libraries(channelz_registry_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(channelz_service_test test/cpp/end2end/channelz_service_test.cc @@ -11831,23 +12044,24 @@ add_executable(channelz_service_test ) target_include_directories(channelz_service_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(channelz_service_test @@ -11863,8 +12077,8 @@ target_link_libraries(channelz_service_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(channelz_test test/core/channel/channelz_test.cc @@ -11877,23 +12091,24 @@ add_executable(channelz_test ) target_include_directories(channelz_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(channelz_test @@ -11908,8 +12123,8 @@ target_link_libraries(channelz_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(check_gcp_environment_linux_test test/core/security/check_gcp_environment_linux_test.cc @@ -11918,23 +12133,24 @@ add_executable(check_gcp_environment_linux_test ) target_include_directories(check_gcp_environment_linux_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(check_gcp_environment_linux_test @@ -11946,8 +12162,8 @@ target_link_libraries(check_gcp_environment_linux_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(check_gcp_environment_windows_test test/core/security/check_gcp_environment_windows_test.cc @@ -11956,23 +12172,24 @@ add_executable(check_gcp_environment_windows_test ) target_include_directories(check_gcp_environment_windows_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(check_gcp_environment_windows_test @@ -11984,8 +12201,8 @@ target_link_libraries(check_gcp_environment_windows_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(chttp2_settings_timeout_test test/core/transport/chttp2/settings_timeout_test.cc @@ -11994,23 +12211,24 @@ add_executable(chttp2_settings_timeout_test ) target_include_directories(chttp2_settings_timeout_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(chttp2_settings_timeout_test @@ -12023,8 +12241,8 @@ target_link_libraries(chttp2_settings_timeout_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(cli_call_test test/cpp/util/cli_call_test.cc @@ -12033,23 +12251,24 @@ add_executable(cli_call_test ) target_include_directories(cli_call_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(cli_call_test @@ -12065,8 +12284,8 @@ target_link_libraries(cli_call_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(client_callback_end2end_test test/cpp/end2end/client_callback_end2end_test.cc @@ -12076,23 +12295,24 @@ add_executable(client_callback_end2end_test ) target_include_directories(client_callback_end2end_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(client_callback_end2end_test @@ -12107,8 +12327,8 @@ target_link_libraries(client_callback_end2end_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(client_channel_stress_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/lb/v1/load_balancer.pb.cc @@ -12121,23 +12341,24 @@ add_executable(client_channel_stress_test ) target_include_directories(client_channel_stress_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(client_channel_stress_test @@ -12152,51 +12373,52 @@ target_link_libraries(client_channel_stress_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(client_crash_test - test/cpp/end2end/client_crash_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(client_crash_test + test/cpp/end2end/client_crash_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(client_crash_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(client_crash_test - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc++_test_util - grpc_test_util - grpc++ - grpc - gpr - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(client_crash_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(client_crash_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc++_test_util + grpc_test_util + grpc++ + grpc + gpr + ${_gRPC_GFLAGS_LIBRARIES} + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(client_crash_test_server test/cpp/end2end/client_crash_test_server.cc @@ -12205,23 +12427,24 @@ add_executable(client_crash_test_server ) target_include_directories(client_crash_test_server - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(client_crash_test_server @@ -12237,8 +12460,8 @@ target_link_libraries(client_crash_test_server ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(client_interceptors_end2end_test test/cpp/end2end/client_interceptors_end2end_test.cc @@ -12248,23 +12471,24 @@ add_executable(client_interceptors_end2end_test ) target_include_directories(client_interceptors_end2end_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(client_interceptors_end2end_test @@ -12279,8 +12503,8 @@ target_link_libraries(client_interceptors_end2end_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(client_lb_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/orca_load_report_for_test.pb.cc @@ -12293,23 +12517,24 @@ add_executable(client_lb_end2end_test ) target_include_directories(client_lb_end2end_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(client_lb_end2end_test @@ -12324,8 +12549,8 @@ target_link_libraries(client_lb_end2end_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(codegen_test_full ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/control.pb.cc @@ -12362,23 +12587,24 @@ add_executable(codegen_test_full ) target_include_directories(codegen_test_full - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(codegen_test_full @@ -12392,8 +12618,8 @@ target_link_libraries(codegen_test_full ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(codegen_test_minimal ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/control.pb.cc @@ -12431,23 +12657,24 @@ add_executable(codegen_test_minimal ) target_include_directories(codegen_test_minimal - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(codegen_test_minimal @@ -12460,8 +12687,8 @@ target_link_libraries(codegen_test_minimal ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(context_list_test test/core/transport/chttp2/context_list_test.cc @@ -12470,23 +12697,24 @@ add_executable(context_list_test ) target_include_directories(context_list_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(context_list_test @@ -12499,8 +12727,8 @@ target_link_libraries(context_list_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(credentials_test test/cpp/client/credentials_test.cc @@ -12509,23 +12737,24 @@ add_executable(credentials_test ) target_include_directories(credentials_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(credentials_test @@ -12538,8 +12767,8 @@ target_link_libraries(credentials_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(cxx_byte_buffer_test test/cpp/util/byte_buffer_test.cc @@ -12548,23 +12777,24 @@ add_executable(cxx_byte_buffer_test ) target_include_directories(cxx_byte_buffer_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(cxx_byte_buffer_test @@ -12578,8 +12808,8 @@ target_link_libraries(cxx_byte_buffer_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(cxx_slice_test test/cpp/util/slice_test.cc @@ -12588,23 +12818,24 @@ add_executable(cxx_slice_test ) target_include_directories(cxx_slice_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(cxx_slice_test @@ -12618,8 +12849,8 @@ target_link_libraries(cxx_slice_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(cxx_string_ref_test test/cpp/util/string_ref_test.cc @@ -12628,23 +12859,24 @@ add_executable(cxx_string_ref_test ) target_include_directories(cxx_string_ref_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(cxx_string_ref_test @@ -12656,8 +12888,8 @@ target_link_libraries(cxx_string_ref_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(cxx_time_test test/cpp/util/time_test.cc @@ -12666,23 +12898,24 @@ add_executable(cxx_time_test ) target_include_directories(cxx_time_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(cxx_time_test @@ -12696,8 +12929,8 @@ target_link_libraries(cxx_time_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(delegating_channel_test test/cpp/end2end/delegating_channel_test.cc @@ -12706,23 +12939,24 @@ add_executable(delegating_channel_test ) target_include_directories(delegating_channel_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(delegating_channel_test @@ -12737,8 +12971,8 @@ target_link_libraries(delegating_channel_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(end2end_test test/cpp/end2end/end2end_test.cc @@ -12748,23 +12982,24 @@ add_executable(end2end_test ) target_include_directories(end2end_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(end2end_test @@ -12779,8 +13014,8 @@ target_link_libraries(end2end_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(error_details_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.pb.cc @@ -12793,23 +13028,24 @@ add_executable(error_details_test ) target_include_directories(error_details_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(error_details_test @@ -12821,8 +13057,8 @@ target_link_libraries(error_details_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(exception_test test/cpp/end2end/exception_test.cc @@ -12831,23 +13067,24 @@ add_executable(exception_test ) target_include_directories(exception_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(exception_test @@ -12862,8 +13099,8 @@ target_link_libraries(exception_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(filter_end2end_test test/cpp/end2end/filter_end2end_test.cc @@ -12872,23 +13109,24 @@ add_executable(filter_end2end_test ) target_include_directories(filter_end2end_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(filter_end2end_test @@ -12903,26 +13141,27 @@ target_link_libraries(filter_end2end_test ) -endif (gRPC_BUILD_TESTS) +endif() add_executable(gen_hpack_tables tools/codegen/core/gen_hpack_tables.cc ) target_include_directories(gen_hpack_tables - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(gen_hpack_tables @@ -12939,19 +13178,20 @@ add_executable(gen_legal_metadata_characters ) target_include_directories(gen_legal_metadata_characters - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(gen_legal_metadata_characters @@ -12966,19 +13206,20 @@ add_executable(gen_percent_encoding_tables ) target_include_directories(gen_percent_encoding_tables - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(gen_percent_encoding_tables @@ -12987,7 +13228,7 @@ target_link_libraries(gen_percent_encoding_tables ) -if (gRPC_BUILD_TESTS) +if(gRPC_BUILD_TESTS) add_executable(generic_end2end_test test/cpp/end2end/generic_end2end_test.cc @@ -12996,23 +13237,24 @@ add_executable(generic_end2end_test ) target_include_directories(generic_end2end_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(generic_end2end_test @@ -13027,8 +13269,8 @@ target_link_libraries(generic_end2end_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(global_config_env_test test/core/gprpp/global_config_env_test.cc @@ -13037,23 +13279,24 @@ add_executable(global_config_env_test ) target_include_directories(global_config_env_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(global_config_env_test @@ -13065,8 +13308,8 @@ target_link_libraries(global_config_env_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(global_config_test test/core/gprpp/global_config_test.cc @@ -13075,23 +13318,24 @@ add_executable(global_config_test ) target_include_directories(global_config_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(global_config_test @@ -13103,8 +13347,8 @@ target_link_libraries(global_config_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(golden_file_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/compiler_test.pb.cc @@ -13117,23 +13361,24 @@ add_executable(golden_file_test ) target_include_directories(golden_file_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(golden_file_test @@ -13147,8 +13392,8 @@ target_link_libraries(golden_file_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(gprpp_mpscq_test test/core/gprpp/mpscq_test.cc @@ -13157,23 +13402,24 @@ add_executable(gprpp_mpscq_test ) target_include_directories(gprpp_mpscq_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(gprpp_mpscq_test @@ -13186,8 +13432,8 @@ target_link_libraries(gprpp_mpscq_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(grpc_alts_credentials_options_test test/core/security/grpc_alts_credentials_options_test.cc @@ -13196,23 +13442,24 @@ add_executable(grpc_alts_credentials_options_test ) target_include_directories(grpc_alts_credentials_options_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(grpc_alts_credentials_options_test @@ -13224,8 +13471,8 @@ target_link_libraries(grpc_alts_credentials_options_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(grpc_cli test/cpp/util/grpc_cli.cc @@ -13234,23 +13481,24 @@ add_executable(grpc_cli ) target_include_directories(grpc_cli - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(grpc_cli @@ -13266,27 +13514,28 @@ target_link_libraries(grpc_cli ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_CODEGEN) +endif() +if(gRPC_BUILD_CODEGEN) add_executable(grpc_cpp_plugin src/compiler/cpp_plugin.cc ) target_include_directories(grpc_cpp_plugin - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(grpc_cpp_plugin @@ -13298,7 +13547,7 @@ target_link_libraries(grpc_cpp_plugin -if (gRPC_INSTALL) +if(gRPC_INSTALL) install(TARGETS grpc_cpp_plugin EXPORT gRPCTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} @@ -13306,27 +13555,28 @@ if (gRPC_INSTALL) ) endif() -endif (gRPC_BUILD_CODEGEN) -if (gRPC_BUILD_CODEGEN) +endif() +if(gRPC_BUILD_CODEGEN) add_executable(grpc_csharp_plugin src/compiler/csharp_plugin.cc ) target_include_directories(grpc_csharp_plugin - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(grpc_csharp_plugin @@ -13338,7 +13588,7 @@ target_link_libraries(grpc_csharp_plugin -if (gRPC_INSTALL) +if(gRPC_INSTALL) install(TARGETS grpc_csharp_plugin EXPORT gRPCTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} @@ -13346,8 +13596,8 @@ if (gRPC_INSTALL) ) endif() -endif (gRPC_BUILD_CODEGEN) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(grpc_fetch_oauth2 test/core/security/fetch_oauth2.cc @@ -13356,23 +13606,24 @@ add_executable(grpc_fetch_oauth2 ) target_include_directories(grpc_fetch_oauth2 - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(grpc_fetch_oauth2 @@ -13386,8 +13637,8 @@ target_link_libraries(grpc_fetch_oauth2 ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(grpc_linux_system_roots_test test/core/security/linux_system_roots_test.cc @@ -13396,23 +13647,24 @@ add_executable(grpc_linux_system_roots_test ) target_include_directories(grpc_linux_system_roots_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(grpc_linux_system_roots_test @@ -13425,27 +13677,28 @@ target_link_libraries(grpc_linux_system_roots_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_CODEGEN) +endif() +if(gRPC_BUILD_CODEGEN) add_executable(grpc_node_plugin src/compiler/node_plugin.cc ) target_include_directories(grpc_node_plugin - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(grpc_node_plugin @@ -13457,7 +13710,7 @@ target_link_libraries(grpc_node_plugin -if (gRPC_INSTALL) +if(gRPC_INSTALL) install(TARGETS grpc_node_plugin EXPORT gRPCTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} @@ -13465,27 +13718,28 @@ if (gRPC_INSTALL) ) endif() -endif (gRPC_BUILD_CODEGEN) -if (gRPC_BUILD_CODEGEN) +endif() +if(gRPC_BUILD_CODEGEN) add_executable(grpc_objective_c_plugin src/compiler/objective_c_plugin.cc ) target_include_directories(grpc_objective_c_plugin - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(grpc_objective_c_plugin @@ -13497,7 +13751,7 @@ target_link_libraries(grpc_objective_c_plugin -if (gRPC_INSTALL) +if(gRPC_INSTALL) install(TARGETS grpc_objective_c_plugin EXPORT gRPCTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} @@ -13505,27 +13759,28 @@ if (gRPC_INSTALL) ) endif() -endif (gRPC_BUILD_CODEGEN) -if (gRPC_BUILD_CODEGEN) +endif() +if(gRPC_BUILD_CODEGEN) add_executable(grpc_php_plugin src/compiler/php_plugin.cc ) target_include_directories(grpc_php_plugin - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(grpc_php_plugin @@ -13537,7 +13792,7 @@ target_link_libraries(grpc_php_plugin -if (gRPC_INSTALL) +if(gRPC_INSTALL) install(TARGETS grpc_php_plugin EXPORT gRPCTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} @@ -13545,27 +13800,28 @@ if (gRPC_INSTALL) ) endif() -endif (gRPC_BUILD_CODEGEN) -if (gRPC_BUILD_CODEGEN) +endif() +if(gRPC_BUILD_CODEGEN) add_executable(grpc_python_plugin src/compiler/python_plugin.cc ) target_include_directories(grpc_python_plugin - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(grpc_python_plugin @@ -13577,7 +13833,7 @@ target_link_libraries(grpc_python_plugin -if (gRPC_INSTALL) +if(gRPC_INSTALL) install(TARGETS grpc_python_plugin EXPORT gRPCTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} @@ -13585,27 +13841,28 @@ if (gRPC_INSTALL) ) endif() -endif (gRPC_BUILD_CODEGEN) -if (gRPC_BUILD_CODEGEN) +endif() +if(gRPC_BUILD_CODEGEN) add_executable(grpc_ruby_plugin src/compiler/ruby_plugin.cc ) target_include_directories(grpc_ruby_plugin - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(grpc_ruby_plugin @@ -13617,7 +13874,7 @@ target_link_libraries(grpc_ruby_plugin -if (gRPC_INSTALL) +if(gRPC_INSTALL) install(TARGETS grpc_ruby_plugin EXPORT gRPCTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} @@ -13625,8 +13882,8 @@ if (gRPC_INSTALL) ) endif() -endif (gRPC_BUILD_CODEGEN) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(grpc_spiffe_security_connector_test test/core/security/spiffe_security_connector_test.cc @@ -13635,23 +13892,24 @@ add_executable(grpc_spiffe_security_connector_test ) target_include_directories(grpc_spiffe_security_connector_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(grpc_spiffe_security_connector_test @@ -13666,8 +13924,8 @@ target_link_libraries(grpc_spiffe_security_connector_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(grpc_tool_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc @@ -13684,23 +13942,24 @@ add_executable(grpc_tool_test ) target_include_directories(grpc_tool_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(grpc_tool_test @@ -13718,8 +13977,8 @@ target_link_libraries(grpc_tool_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(grpclb_api_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/lb/v1/load_balancer.pb.cc @@ -13732,23 +13991,24 @@ add_executable(grpclb_api_test ) target_include_directories(grpclb_api_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(grpclb_api_test @@ -13762,8 +14022,8 @@ target_link_libraries(grpclb_api_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(grpclb_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/lb/v1/load_balancer.pb.cc @@ -13776,23 +14036,24 @@ add_executable(grpclb_end2end_test ) target_include_directories(grpclb_end2end_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(grpclb_end2end_test @@ -13807,64 +14068,65 @@ target_link_libraries(grpclb_end2end_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX) -add_executable(grpclb_fallback_test - ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/empty.pb.cc - ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/empty.grpc.pb.cc - ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/empty.pb.h - ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/empty.grpc.pb.h - ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/messages.pb.cc - ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/messages.grpc.pb.cc - ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/messages.pb.h - ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/messages.grpc.pb.h - ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/test.pb.cc - ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/test.grpc.pb.cc - ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/test.pb.h - ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/test.grpc.pb.h - test/cpp/interop/grpclb_fallback_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(grpclb_fallback_test + ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/empty.pb.cc + ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/empty.grpc.pb.cc + ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/empty.pb.h + ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/empty.grpc.pb.h + ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/messages.pb.cc + ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/messages.grpc.pb.cc + ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/messages.pb.h + ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/messages.grpc.pb.h + ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/test.pb.cc + ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/test.grpc.pb.cc + ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/test.pb.h + ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/test.grpc.pb.h + test/cpp/interop/grpclb_fallback_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(grpclb_fallback_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(grpclb_fallback_test - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc++_test_util - grpc_test_util - grpc++ - grpc - gpr - grpc++_test_config - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(grpclb_fallback_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(grpclb_fallback_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc++_test_util + grpc_test_util + grpc++ + grpc + gpr + grpc++_test_config + ${_gRPC_GFLAGS_LIBRARIES} + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(h2_ssl_cert_test test/core/end2end/h2_ssl_cert_test.cc @@ -13873,23 +14135,24 @@ add_executable(h2_ssl_cert_test ) target_include_directories(h2_ssl_cert_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(h2_ssl_cert_test @@ -13903,8 +14166,8 @@ target_link_libraries(h2_ssl_cert_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(h2_ssl_session_reuse_test test/core/end2end/h2_ssl_session_reuse_test.cc @@ -13913,23 +14176,24 @@ add_executable(h2_ssl_session_reuse_test ) target_include_directories(h2_ssl_session_reuse_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(h2_ssl_session_reuse_test @@ -13943,8 +14207,8 @@ target_link_libraries(h2_ssl_session_reuse_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(health_service_end2end_test test/cpp/end2end/health_service_end2end_test.cc @@ -13953,23 +14217,24 @@ add_executable(health_service_end2end_test ) target_include_directories(health_service_end2end_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(health_service_end2end_test @@ -13984,51 +14249,52 @@ target_link_libraries(health_service_end2end_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(http2_client - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(http2_client + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(http2_client - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(http2_client - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - http2_client_main - grpc++_test_util - grpc_test_util - grpc++ - grpc - grpc++_test_config - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(http2_client + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(http2_client + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + http2_client_main + grpc++_test_util + grpc_test_util + grpc++ + grpc + grpc++_test_config + ${_gRPC_GFLAGS_LIBRARIES} + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(hybrid_end2end_test test/cpp/end2end/hybrid_end2end_test.cc @@ -14036,303 +14302,310 @@ add_executable(hybrid_end2end_test third_party/googletest/googlemock/src/gmock-all.cc ) -target_include_directories(hybrid_end2end_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(hybrid_end2end_test - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc++_test_util - grpc_test_util - grpc++ - grpc - gpr - ${_gRPC_GFLAGS_LIBRARIES} -) - - -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) - -add_executable(inlined_vector_test - test/core/gprpp/inlined_vector_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) - -target_include_directories(inlined_vector_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(inlined_vector_test - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - grpc++ - grpc - gpr - ${_gRPC_GFLAGS_LIBRARIES} -) - - -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) - -add_executable(inproc_sync_unary_ping_pong_test - test/cpp/qps/inproc_sync_unary_ping_pong_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) - -target_include_directories(inproc_sync_unary_ping_pong_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(inproc_sync_unary_ping_pong_test - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - qps - grpc++_core_stats - grpc++_test_util - grpc_test_util - grpc++ - grpc - gpr - grpc++_test_config - ${_gRPC_GFLAGS_LIBRARIES} -) - - -endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) - -add_executable(interop_client - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) - -target_include_directories(interop_client - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(interop_client +target_include_directories(hybrid_end2end_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} +) + +target_link_libraries(hybrid_end2end_test ${_gRPC_PROTOBUF_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} - interop_client_main - interop_client_helper grpc++_test_util grpc_test_util grpc++ grpc gpr - grpc++_test_config ${_gRPC_GFLAGS_LIBRARIES} ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) +if(gRPC_BUILD_TESTS) -add_executable(interop_server +add_executable(inlined_vector_test + test/core/gprpp/inlined_vector_test.cc third_party/googletest/googletest/src/gtest-all.cc third_party/googletest/googlemock/src/gmock-all.cc ) -target_include_directories(interop_server - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(interop_server +target_include_directories(inlined_vector_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} +) + +target_link_libraries(inlined_vector_test ${_gRPC_PROTOBUF_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} - interop_server_main - interop_server_helper - interop_server_lib - grpc++_test_util grpc_test_util grpc++ grpc gpr - grpc++_test_config ${_gRPC_GFLAGS_LIBRARIES} ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(interop_test - test/cpp/interop/interop_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(inproc_sync_unary_ping_pong_test + test/cpp/qps/inproc_sync_unary_ping_pong_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(interop_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(interop_test - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - grpc - gpr - grpc++_test_config - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(inproc_sync_unary_ping_pong_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(inproc_sync_unary_ping_pong_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + qps + grpc++_core_stats + grpc++_test_util + grpc_test_util + grpc++ + grpc + gpr + grpc++_test_config + ${_gRPC_GFLAGS_LIBRARIES} + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(json_run_localhost - test/cpp/qps/json_run_localhost.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(interop_client + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(json_run_localhost - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(json_run_localhost - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc++_test_util - grpc_test_util - grpc++ - grpc - gpr - grpc++_test_config - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(interop_client + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(interop_client + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + interop_client_main + interop_client_helper + grpc++_test_util + grpc_test_util + grpc++ + grpc + gpr + grpc++_test_config + ${_gRPC_GFLAGS_LIBRARIES} + ) + + +endif() +endif() +if(gRPC_BUILD_TESTS) +if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + + add_executable(interop_server + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) + + target_include_directories(interop_server + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(interop_server + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + interop_server_main + interop_server_helper + interop_server_lib + grpc++_test_util + grpc_test_util + grpc++ + grpc + gpr + grpc++_test_config + ${_gRPC_GFLAGS_LIBRARIES} + ) + + +endif() +endif() +if(gRPC_BUILD_TESTS) +if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + + add_executable(interop_test + test/cpp/interop/interop_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) + + target_include_directories(interop_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(interop_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + grpc + gpr + grpc++_test_config + ${_gRPC_GFLAGS_LIBRARIES} + ) + + +endif() +endif() +if(gRPC_BUILD_TESTS) +if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + + add_executable(json_run_localhost + test/cpp/qps/json_run_localhost.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) + + target_include_directories(json_run_localhost + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(json_run_localhost + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc++_test_util + grpc_test_util + grpc++ + grpc + gpr + grpc++_test_config + ${_gRPC_GFLAGS_LIBRARIES} + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(memory_test test/core/gprpp/memory_test.cc @@ -14341,23 +14614,24 @@ add_executable(memory_test ) target_include_directories(memory_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(memory_test @@ -14371,8 +14645,8 @@ target_link_libraries(memory_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(message_allocator_end2end_test test/cpp/end2end/message_allocator_end2end_test.cc @@ -14381,23 +14655,24 @@ add_executable(message_allocator_end2end_test ) target_include_directories(message_allocator_end2end_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(message_allocator_end2end_test @@ -14412,8 +14687,8 @@ target_link_libraries(message_allocator_end2end_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(metrics_client ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/metrics.pb.cc @@ -14426,23 +14701,24 @@ add_executable(metrics_client ) target_include_directories(metrics_client - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(metrics_client @@ -14456,8 +14732,8 @@ target_link_libraries(metrics_client ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(mock_test test/cpp/end2end/mock_test.cc @@ -14466,23 +14742,24 @@ add_executable(mock_test ) target_include_directories(mock_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(mock_test @@ -14497,8 +14774,8 @@ target_link_libraries(mock_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(nonblocking_test test/cpp/end2end/nonblocking_test.cc @@ -14507,23 +14784,24 @@ add_executable(nonblocking_test ) target_include_directories(nonblocking_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(nonblocking_test @@ -14538,8 +14816,8 @@ target_link_libraries(nonblocking_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(noop-benchmark test/cpp/microbenchmarks/noop-benchmark.cc @@ -14548,23 +14826,24 @@ add_executable(noop-benchmark ) target_include_directories(noop-benchmark - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(noop-benchmark @@ -14575,8 +14854,8 @@ target_link_libraries(noop-benchmark ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(optional_test test/core/gprpp/optional_test.cc @@ -14585,23 +14864,24 @@ add_executable(optional_test ) target_include_directories(optional_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(optional_test @@ -14615,8 +14895,8 @@ target_link_libraries(optional_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(orphanable_test test/core/gprpp/orphanable_test.cc @@ -14625,23 +14905,24 @@ add_executable(orphanable_test ) target_include_directories(orphanable_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(orphanable_test @@ -14655,8 +14936,8 @@ target_link_libraries(orphanable_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(port_sharing_end2end_test test/cpp/end2end/port_sharing_end2end_test.cc @@ -14665,23 +14946,24 @@ add_executable(port_sharing_end2end_test ) target_include_directories(port_sharing_end2end_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(port_sharing_end2end_test @@ -14697,8 +14979,8 @@ target_link_libraries(port_sharing_end2end_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(proto_server_reflection_test test/cpp/end2end/proto_server_reflection_test.cc @@ -14707,23 +14989,24 @@ add_executable(proto_server_reflection_test ) target_include_directories(proto_server_reflection_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(proto_server_reflection_test @@ -14740,8 +15023,8 @@ target_link_libraries(proto_server_reflection_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(proto_utils_test test/cpp/codegen/proto_utils_test.cc @@ -14750,23 +15033,24 @@ add_executable(proto_utils_test ) target_include_directories(proto_utils_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(proto_utils_test @@ -14778,53 +15062,54 @@ target_link_libraries(proto_utils_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(qps_interarrival_test - test/cpp/qps/qps_interarrival_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(qps_interarrival_test + test/cpp/qps/qps_interarrival_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(qps_interarrival_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(qps_interarrival_test - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - qps - grpc++_test_util - grpc_test_util - grpc++ - grpc - gpr - grpc++_test_config - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(qps_interarrival_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(qps_interarrival_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + qps + grpc++_test_util + grpc_test_util + grpc++ + grpc + gpr + grpc++_test_config + ${_gRPC_GFLAGS_LIBRARIES} + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(qps_json_driver test/cpp/qps/qps_json_driver.cc @@ -14833,23 +15118,24 @@ add_executable(qps_json_driver ) target_include_directories(qps_json_driver - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(qps_json_driver @@ -14867,54 +15153,55 @@ target_link_libraries(qps_json_driver ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(qps_openloop_test - test/cpp/qps/qps_openloop_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(qps_openloop_test + test/cpp/qps/qps_openloop_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(qps_openloop_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(qps_openloop_test - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - qps - grpc++_core_stats - grpc++_test_util - grpc_test_util - grpc++ - grpc - gpr - grpc++_test_config - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(qps_openloop_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(qps_openloop_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + qps + grpc++_core_stats + grpc++_test_util + grpc_test_util + grpc++ + grpc + gpr + grpc++_test_config + ${_gRPC_GFLAGS_LIBRARIES} + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(qps_worker test/cpp/qps/worker.cc @@ -14923,23 +15210,24 @@ add_executable(qps_worker ) target_include_directories(qps_worker - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(qps_worker @@ -14957,8 +15245,8 @@ target_link_libraries(qps_worker ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(raw_end2end_test test/cpp/end2end/raw_end2end_test.cc @@ -14967,23 +15255,24 @@ add_executable(raw_end2end_test ) target_include_directories(raw_end2end_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(raw_end2end_test @@ -14998,8 +15287,8 @@ target_link_libraries(raw_end2end_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(reconnect_interop_client ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/empty.pb.cc @@ -15020,23 +15309,24 @@ add_executable(reconnect_interop_client ) target_include_directories(reconnect_interop_client - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(reconnect_interop_client @@ -15052,8 +15342,8 @@ target_link_libraries(reconnect_interop_client ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(reconnect_interop_server ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/empty.pb.cc @@ -15074,23 +15364,24 @@ add_executable(reconnect_interop_server ) target_include_directories(reconnect_interop_server - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(reconnect_interop_server @@ -15108,8 +15399,8 @@ target_link_libraries(reconnect_interop_server ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(ref_counted_ptr_test test/core/gprpp/ref_counted_ptr_test.cc @@ -15118,23 +15409,24 @@ add_executable(ref_counted_ptr_test ) target_include_directories(ref_counted_ptr_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(ref_counted_ptr_test @@ -15148,8 +15440,8 @@ target_link_libraries(ref_counted_ptr_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(ref_counted_test test/core/gprpp/ref_counted_test.cc @@ -15158,23 +15450,24 @@ add_executable(ref_counted_test ) target_include_directories(ref_counted_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(ref_counted_test @@ -15188,8 +15481,8 @@ target_link_libraries(ref_counted_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(retry_throttle_test test/core/client_channel/retry_throttle_test.cc @@ -15198,23 +15491,24 @@ add_executable(retry_throttle_test ) target_include_directories(retry_throttle_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(retry_throttle_test @@ -15227,8 +15521,8 @@ target_link_libraries(retry_throttle_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(secure_auth_context_test test/cpp/common/secure_auth_context_test.cc @@ -15237,23 +15531,24 @@ add_executable(secure_auth_context_test ) target_include_directories(secure_auth_context_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(secure_auth_context_test @@ -15268,54 +15563,55 @@ target_link_libraries(secure_auth_context_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(secure_sync_unary_ping_pong_test - test/cpp/qps/secure_sync_unary_ping_pong_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(secure_sync_unary_ping_pong_test + test/cpp/qps/secure_sync_unary_ping_pong_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(secure_sync_unary_ping_pong_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(secure_sync_unary_ping_pong_test - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - qps - grpc++_core_stats - grpc++_test_util - grpc_test_util - grpc++ - grpc - gpr - grpc++_test_config - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(secure_sync_unary_ping_pong_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(secure_sync_unary_ping_pong_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + qps + grpc++_core_stats + grpc++_test_util + grpc_test_util + grpc++ + grpc + gpr + grpc++_test_config + ${_gRPC_GFLAGS_LIBRARIES} + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(server_builder_plugin_test test/cpp/end2end/server_builder_plugin_test.cc @@ -15324,23 +15620,24 @@ add_executable(server_builder_plugin_test ) target_include_directories(server_builder_plugin_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(server_builder_plugin_test @@ -15355,8 +15652,8 @@ target_link_libraries(server_builder_plugin_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(server_builder_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.pb.cc @@ -15373,23 +15670,24 @@ add_executable(server_builder_test ) target_include_directories(server_builder_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(server_builder_test @@ -15404,59 +15702,60 @@ target_link_libraries(server_builder_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_POSIX) -add_executable(server_builder_with_socket_mutator_test - ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.pb.cc - ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.grpc.pb.cc - ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.pb.h - ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.grpc.pb.h - ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc - ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.grpc.pb.cc - ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.h - ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.grpc.pb.h - test/cpp/server/server_builder_with_socket_mutator_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(server_builder_with_socket_mutator_test + ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.pb.cc + ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.grpc.pb.cc + ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.pb.h + ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.grpc.pb.h + ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc + ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.grpc.pb.cc + ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.h + ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.grpc.pb.h + test/cpp/server/server_builder_with_socket_mutator_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(server_builder_with_socket_mutator_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(server_builder_with_socket_mutator_test - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc++_test_util_unsecure - grpc_test_util_unsecure - grpc++_unsecure - grpc_unsecure - gpr - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(server_builder_with_socket_mutator_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(server_builder_with_socket_mutator_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc++_test_util_unsecure + grpc_test_util_unsecure + grpc++_unsecure + grpc_unsecure + gpr + ${_gRPC_GFLAGS_LIBRARIES} + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(server_context_test_spouse_test test/cpp/test/server_context_test_spouse_test.cc @@ -15465,23 +15764,24 @@ add_executable(server_context_test_spouse_test ) target_include_directories(server_context_test_spouse_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(server_context_test_spouse_test @@ -15495,51 +15795,52 @@ target_link_libraries(server_context_test_spouse_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(server_crash_test - test/cpp/end2end/server_crash_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(server_crash_test + test/cpp/end2end/server_crash_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(server_crash_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(server_crash_test - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc++_test_util - grpc_test_util - grpc++ - grpc - gpr - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(server_crash_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(server_crash_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc++_test_util + grpc_test_util + grpc++ + grpc + gpr + ${_gRPC_GFLAGS_LIBRARIES} + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(server_crash_test_client test/cpp/end2end/server_crash_test_client.cc @@ -15548,23 +15849,24 @@ add_executable(server_crash_test_client ) target_include_directories(server_crash_test_client - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(server_crash_test_client @@ -15580,8 +15882,8 @@ target_link_libraries(server_crash_test_client ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(server_early_return_test test/cpp/end2end/server_early_return_test.cc @@ -15590,23 +15892,24 @@ add_executable(server_early_return_test ) target_include_directories(server_early_return_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(server_early_return_test @@ -15621,8 +15924,8 @@ target_link_libraries(server_early_return_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(server_interceptors_end2end_test test/cpp/end2end/interceptors_util.cc @@ -15632,23 +15935,24 @@ add_executable(server_interceptors_end2end_test ) target_include_directories(server_interceptors_end2end_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(server_interceptors_end2end_test @@ -15663,8 +15967,8 @@ target_link_libraries(server_interceptors_end2end_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(server_request_call_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.pb.cc @@ -15681,23 +15985,24 @@ add_executable(server_request_call_test ) target_include_directories(server_request_call_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(server_request_call_test @@ -15712,8 +16017,8 @@ target_link_libraries(server_request_call_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(service_config_end2end_test test/cpp/end2end/service_config_end2end_test.cc @@ -15722,23 +16027,24 @@ add_executable(service_config_end2end_test ) target_include_directories(service_config_end2end_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(service_config_end2end_test @@ -15753,8 +16059,8 @@ target_link_libraries(service_config_end2end_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(service_config_test test/core/client_channel/service_config_test.cc @@ -15763,23 +16069,24 @@ add_executable(service_config_test ) target_include_directories(service_config_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(service_config_test @@ -15793,8 +16100,8 @@ target_link_libraries(service_config_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(shutdown_test test/cpp/end2end/shutdown_test.cc @@ -15803,23 +16110,24 @@ add_executable(shutdown_test ) target_include_directories(shutdown_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(shutdown_test @@ -15834,8 +16142,8 @@ target_link_libraries(shutdown_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(slice_hash_table_test test/core/slice/slice_hash_table_test.cc @@ -15844,23 +16152,24 @@ add_executable(slice_hash_table_test ) target_include_directories(slice_hash_table_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(slice_hash_table_test @@ -15873,8 +16182,8 @@ target_link_libraries(slice_hash_table_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(slice_weak_hash_table_test test/core/slice/slice_weak_hash_table_test.cc @@ -15883,23 +16192,24 @@ add_executable(slice_weak_hash_table_test ) target_include_directories(slice_weak_hash_table_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(slice_weak_hash_table_test @@ -15912,8 +16222,8 @@ target_link_libraries(slice_weak_hash_table_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(stats_test test/core/debug/stats_test.cc @@ -15922,23 +16232,24 @@ add_executable(stats_test ) target_include_directories(stats_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(stats_test @@ -15952,8 +16263,8 @@ target_link_libraries(stats_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(status_metadata_test test/core/transport/status_metadata_test.cc @@ -15962,23 +16273,24 @@ add_executable(status_metadata_test ) target_include_directories(status_metadata_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(status_metadata_test @@ -15989,8 +16301,8 @@ target_link_libraries(status_metadata_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(status_util_test test/core/channel/status_util_test.cc @@ -15999,23 +16311,24 @@ add_executable(status_util_test ) target_include_directories(status_util_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(status_util_test @@ -16026,51 +16339,52 @@ target_link_libraries(status_util_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(streaming_throughput_test - test/cpp/end2end/streaming_throughput_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(streaming_throughput_test + test/cpp/end2end/streaming_throughput_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(streaming_throughput_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(streaming_throughput_test - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc++_test_util - grpc_test_util - grpc++ - grpc - gpr - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(streaming_throughput_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(streaming_throughput_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc++_test_util + grpc_test_util + grpc++ + grpc + gpr + ${_gRPC_GFLAGS_LIBRARIES} + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(stress_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/empty.pb.cc @@ -16098,23 +16412,24 @@ add_executable(stress_test ) target_include_directories(stress_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(stress_test @@ -16130,8 +16445,8 @@ target_link_libraries(stress_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(string_view_test test/core/gprpp/string_view_test.cc @@ -16140,23 +16455,24 @@ add_executable(string_view_test ) target_include_directories(string_view_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(string_view_test @@ -16170,8 +16486,8 @@ target_link_libraries(string_view_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(thread_manager_test test/cpp/thread_manager/thread_manager_test.cc @@ -16180,23 +16496,24 @@ add_executable(thread_manager_test ) target_include_directories(thread_manager_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(thread_manager_test @@ -16212,8 +16529,8 @@ target_link_libraries(thread_manager_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(thread_stress_test test/cpp/end2end/thread_stress_test.cc @@ -16222,23 +16539,24 @@ add_executable(thread_stress_test ) target_include_directories(thread_stress_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(thread_stress_test @@ -16253,51 +16571,52 @@ target_link_libraries(thread_stress_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(time_change_test - test/cpp/end2end/time_change_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(time_change_test + test/cpp/end2end/time_change_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(time_change_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(time_change_test - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc++_test_util - grpc_test_util - grpc++ - grpc - gpr - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(time_change_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(time_change_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc++_test_util + grpc_test_util + grpc++ + grpc + gpr + ${_gRPC_GFLAGS_LIBRARIES} + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(timer_test test/cpp/common/timer_test.cc @@ -16306,23 +16625,24 @@ add_executable(timer_test ) target_include_directories(timer_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(timer_test @@ -16336,8 +16656,8 @@ target_link_libraries(timer_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(transport_connectivity_state_test test/core/transport/connectivity_state_test.cc @@ -16346,23 +16666,24 @@ add_executable(transport_connectivity_state_test ) target_include_directories(transport_connectivity_state_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(transport_connectivity_state_test @@ -16375,8 +16696,8 @@ target_link_libraries(transport_connectivity_state_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(transport_pid_controller_test test/core/transport/pid_controller_test.cc @@ -16385,23 +16706,24 @@ add_executable(transport_pid_controller_test ) target_include_directories(transport_pid_controller_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(transport_pid_controller_test @@ -16416,8 +16738,8 @@ target_link_libraries(transport_pid_controller_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(transport_security_common_api_test test/core/tsi/alts/handshaker/transport_security_common_api_test.cc @@ -16426,23 +16748,24 @@ add_executable(transport_security_common_api_test ) target_include_directories(transport_security_common_api_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(transport_security_common_api_test @@ -16455,51 +16778,52 @@ target_link_libraries(transport_security_common_api_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(writes_per_rpc_test - test/cpp/performance/writes_per_rpc_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(writes_per_rpc_test + test/cpp/performance/writes_per_rpc_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(writes_per_rpc_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(writes_per_rpc_test - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc++_test_util - grpc_test_util - grpc++ - grpc - gpr - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(writes_per_rpc_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(writes_per_rpc_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc++_test_util + grpc_test_util + grpc++ + grpc + gpr + ${_gRPC_GFLAGS_LIBRARIES} + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(xds_bootstrap_test test/core/client_channel/xds_bootstrap_test.cc @@ -16508,23 +16832,24 @@ add_executable(xds_bootstrap_test ) target_include_directories(xds_bootstrap_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(xds_bootstrap_test @@ -16538,8 +16863,8 @@ target_link_libraries(xds_bootstrap_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(xds_end2end_test ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/ads_for_test.pb.cc @@ -16560,23 +16885,24 @@ add_executable(xds_end2end_test ) target_include_directories(xds_end2end_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(xds_end2end_test @@ -16591,26 +16917,27 @@ target_link_libraries(xds_end2end_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(public_headers_must_be_c89 test/core/surface/public_headers_must_be_c89.c ) target_include_directories(public_headers_must_be_c89 - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(public_headers_must_be_c89 @@ -16620,8 +16947,8 @@ target_link_libraries(public_headers_must_be_c89 ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(bad_streaming_id_bad_client_test test/core/bad_client/tests/bad_streaming_id.cc @@ -16630,23 +16957,24 @@ add_executable(bad_streaming_id_bad_client_test ) target_include_directories(bad_streaming_id_bad_client_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(bad_streaming_id_bad_client_test @@ -16660,8 +16988,8 @@ target_link_libraries(bad_streaming_id_bad_client_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(badreq_bad_client_test test/core/bad_client/tests/badreq.cc @@ -16670,23 +16998,24 @@ add_executable(badreq_bad_client_test ) target_include_directories(badreq_bad_client_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(badreq_bad_client_test @@ -16700,8 +17029,8 @@ target_link_libraries(badreq_bad_client_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(connection_prefix_bad_client_test test/core/bad_client/tests/connection_prefix.cc @@ -16710,23 +17039,24 @@ add_executable(connection_prefix_bad_client_test ) target_include_directories(connection_prefix_bad_client_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(connection_prefix_bad_client_test @@ -16740,8 +17070,8 @@ target_link_libraries(connection_prefix_bad_client_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(duplicate_header_bad_client_test test/core/bad_client/tests/duplicate_header.cc @@ -16750,23 +17080,24 @@ add_executable(duplicate_header_bad_client_test ) target_include_directories(duplicate_header_bad_client_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(duplicate_header_bad_client_test @@ -16780,8 +17111,8 @@ target_link_libraries(duplicate_header_bad_client_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(head_of_line_blocking_bad_client_test test/core/bad_client/tests/head_of_line_blocking.cc @@ -16790,23 +17121,24 @@ add_executable(head_of_line_blocking_bad_client_test ) target_include_directories(head_of_line_blocking_bad_client_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(head_of_line_blocking_bad_client_test @@ -16820,8 +17152,8 @@ target_link_libraries(head_of_line_blocking_bad_client_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(headers_bad_client_test test/core/bad_client/tests/headers.cc @@ -16830,23 +17162,24 @@ add_executable(headers_bad_client_test ) target_include_directories(headers_bad_client_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(headers_bad_client_test @@ -16860,8 +17193,8 @@ target_link_libraries(headers_bad_client_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(initial_settings_frame_bad_client_test test/core/bad_client/tests/initial_settings_frame.cc @@ -16870,23 +17203,24 @@ add_executable(initial_settings_frame_bad_client_test ) target_include_directories(initial_settings_frame_bad_client_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(initial_settings_frame_bad_client_test @@ -16900,8 +17234,8 @@ target_link_libraries(initial_settings_frame_bad_client_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(large_metadata_bad_client_test test/core/bad_client/tests/large_metadata.cc @@ -16910,23 +17244,24 @@ add_executable(large_metadata_bad_client_test ) target_include_directories(large_metadata_bad_client_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(large_metadata_bad_client_test @@ -16940,8 +17275,8 @@ target_link_libraries(large_metadata_bad_client_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(out_of_bounds_bad_client_test test/core/bad_client/tests/out_of_bounds.cc @@ -16950,23 +17285,24 @@ add_executable(out_of_bounds_bad_client_test ) target_include_directories(out_of_bounds_bad_client_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(out_of_bounds_bad_client_test @@ -16980,8 +17316,8 @@ target_link_libraries(out_of_bounds_bad_client_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(server_registered_method_bad_client_test test/core/bad_client/tests/server_registered_method.cc @@ -16990,23 +17326,24 @@ add_executable(server_registered_method_bad_client_test ) target_include_directories(server_registered_method_bad_client_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(server_registered_method_bad_client_test @@ -17020,8 +17357,8 @@ target_link_libraries(server_registered_method_bad_client_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(simple_request_bad_client_test test/core/bad_client/tests/simple_request.cc @@ -17030,23 +17367,24 @@ add_executable(simple_request_bad_client_test ) target_include_directories(simple_request_bad_client_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(simple_request_bad_client_test @@ -17060,8 +17398,8 @@ target_link_libraries(simple_request_bad_client_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(unknown_frame_bad_client_test test/core/bad_client/tests/unknown_frame.cc @@ -17070,23 +17408,24 @@ add_executable(unknown_frame_bad_client_test ) target_include_directories(unknown_frame_bad_client_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(unknown_frame_bad_client_test @@ -17100,8 +17439,8 @@ target_link_libraries(unknown_frame_bad_client_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(window_overflow_bad_client_test test/core/bad_client/tests/window_overflow.cc @@ -17110,23 +17449,24 @@ add_executable(window_overflow_bad_client_test ) target_include_directories(window_overflow_bad_client_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(window_overflow_bad_client_test @@ -17140,91 +17480,94 @@ target_link_libraries(window_overflow_bad_client_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(bad_ssl_cert_server - test/core/bad_ssl/servers/cert.cc -) + add_executable(bad_ssl_cert_server + test/core/bad_ssl/servers/cert.cc + ) -target_include_directories(bad_ssl_cert_server - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(bad_ssl_cert_server + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(bad_ssl_cert_server - ${_gRPC_ALLTARGETS_LIBRARIES} - bad_ssl_test_server - grpc_test_util - grpc - gpr -) + target_link_libraries(bad_ssl_cert_server + ${_gRPC_ALLTARGETS_LIBRARIES} + bad_ssl_test_server + grpc_test_util + grpc + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(bad_ssl_cert_test - test/core/bad_ssl/bad_ssl_test.cc -) + add_executable(bad_ssl_cert_test + test/core/bad_ssl/bad_ssl_test.cc + ) -target_include_directories(bad_ssl_cert_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(bad_ssl_cert_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(bad_ssl_cert_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - grpc - gpr -) + target_link_libraries(bad_ssl_cert_test + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + grpc + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(h2_census_test test/core/end2end/fixtures/h2_census.cc ) target_include_directories(h2_census_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(h2_census_test @@ -17236,26 +17579,27 @@ target_link_libraries(h2_census_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(h2_compress_test test/core/end2end/fixtures/h2_compress.cc ) target_include_directories(h2_compress_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(h2_compress_test @@ -17267,26 +17611,27 @@ target_link_libraries(h2_compress_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(h2_fakesec_test test/core/end2end/fixtures/h2_fakesec.cc ) target_include_directories(h2_fakesec_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(h2_fakesec_test @@ -17298,59 +17643,61 @@ target_link_libraries(h2_fakesec_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(h2_fd_test - test/core/end2end/fixtures/h2_fd.cc -) + add_executable(h2_fd_test + test/core/end2end/fixtures/h2_fd.cc + ) -target_include_directories(h2_fd_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(h2_fd_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(h2_fd_test - ${_gRPC_ALLTARGETS_LIBRARIES} - end2end_tests - grpc_test_util - grpc - gpr -) + target_link_libraries(h2_fd_test + ${_gRPC_ALLTARGETS_LIBRARIES} + end2end_tests + grpc_test_util + grpc + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(h2_full_test test/core/end2end/fixtures/h2_full.cc ) target_include_directories(h2_full_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(h2_full_test @@ -17362,59 +17709,61 @@ target_link_libraries(h2_full_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX) -add_executable(h2_full+pipe_test - test/core/end2end/fixtures/h2_full+pipe.cc -) + add_executable(h2_full+pipe_test + test/core/end2end/fixtures/h2_full+pipe.cc + ) -target_include_directories(h2_full+pipe_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(h2_full+pipe_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(h2_full+pipe_test - ${_gRPC_ALLTARGETS_LIBRARIES} - end2end_tests - grpc_test_util - grpc - gpr -) + target_link_libraries(h2_full+pipe_test + ${_gRPC_ALLTARGETS_LIBRARIES} + end2end_tests + grpc_test_util + grpc + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(h2_full+trace_test test/core/end2end/fixtures/h2_full+trace.cc ) target_include_directories(h2_full+trace_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(h2_full+trace_test @@ -17426,26 +17775,27 @@ target_link_libraries(h2_full+trace_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(h2_full+workarounds_test test/core/end2end/fixtures/h2_full+workarounds.cc ) target_include_directories(h2_full+workarounds_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(h2_full+workarounds_test @@ -17457,26 +17807,27 @@ target_link_libraries(h2_full+workarounds_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(h2_http_proxy_test test/core/end2end/fixtures/h2_http_proxy.cc ) target_include_directories(h2_http_proxy_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(h2_http_proxy_test @@ -17488,125 +17839,129 @@ target_link_libraries(h2_http_proxy_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(h2_local_ipv4_test - test/core/end2end/fixtures/h2_local_ipv4.cc -) + add_executable(h2_local_ipv4_test + test/core/end2end/fixtures/h2_local_ipv4.cc + ) -target_include_directories(h2_local_ipv4_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(h2_local_ipv4_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(h2_local_ipv4_test - ${_gRPC_ALLTARGETS_LIBRARIES} - end2end_tests - grpc_test_util - grpc - gpr -) + target_link_libraries(h2_local_ipv4_test + ${_gRPC_ALLTARGETS_LIBRARIES} + end2end_tests + grpc_test_util + grpc + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(h2_local_ipv6_test - test/core/end2end/fixtures/h2_local_ipv6.cc -) + add_executable(h2_local_ipv6_test + test/core/end2end/fixtures/h2_local_ipv6.cc + ) -target_include_directories(h2_local_ipv6_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(h2_local_ipv6_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(h2_local_ipv6_test - ${_gRPC_ALLTARGETS_LIBRARIES} - end2end_tests - grpc_test_util - grpc - gpr -) + target_link_libraries(h2_local_ipv6_test + ${_gRPC_ALLTARGETS_LIBRARIES} + end2end_tests + grpc_test_util + grpc + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(h2_local_uds_test - test/core/end2end/fixtures/h2_local_uds.cc -) + add_executable(h2_local_uds_test + test/core/end2end/fixtures/h2_local_uds.cc + ) -target_include_directories(h2_local_uds_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(h2_local_uds_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(h2_local_uds_test - ${_gRPC_ALLTARGETS_LIBRARIES} - end2end_tests - grpc_test_util - grpc - gpr -) + target_link_libraries(h2_local_uds_test + ${_gRPC_ALLTARGETS_LIBRARIES} + end2end_tests + grpc_test_util + grpc + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(h2_oauth2_test test/core/end2end/fixtures/h2_oauth2.cc ) target_include_directories(h2_oauth2_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(h2_oauth2_test @@ -17618,26 +17973,27 @@ target_link_libraries(h2_oauth2_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(h2_proxy_test test/core/end2end/fixtures/h2_proxy.cc ) target_include_directories(h2_proxy_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(h2_proxy_test @@ -17649,26 +18005,27 @@ target_link_libraries(h2_proxy_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(h2_sockpair_test test/core/end2end/fixtures/h2_sockpair.cc ) target_include_directories(h2_sockpair_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(h2_sockpair_test @@ -17680,26 +18037,27 @@ target_link_libraries(h2_sockpair_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(h2_sockpair+trace_test test/core/end2end/fixtures/h2_sockpair+trace.cc ) target_include_directories(h2_sockpair+trace_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(h2_sockpair+trace_test @@ -17711,26 +18069,27 @@ target_link_libraries(h2_sockpair+trace_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(h2_sockpair_1byte_test test/core/end2end/fixtures/h2_sockpair_1byte.cc ) target_include_directories(h2_sockpair_1byte_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(h2_sockpair_1byte_test @@ -17742,26 +18101,27 @@ target_link_libraries(h2_sockpair_1byte_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(h2_spiffe_test test/core/end2end/fixtures/h2_spiffe.cc ) target_include_directories(h2_spiffe_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(h2_spiffe_test @@ -17773,26 +18133,27 @@ target_link_libraries(h2_spiffe_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(h2_ssl_test test/core/end2end/fixtures/h2_ssl.cc ) target_include_directories(h2_ssl_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(h2_ssl_test @@ -17804,26 +18165,27 @@ target_link_libraries(h2_ssl_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(h2_ssl_cred_reload_test test/core/end2end/fixtures/h2_ssl_cred_reload.cc ) target_include_directories(h2_ssl_cred_reload_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(h2_ssl_cred_reload_test @@ -17835,26 +18197,27 @@ target_link_libraries(h2_ssl_cred_reload_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(h2_ssl_proxy_test test/core/end2end/fixtures/h2_ssl_proxy.cc ) target_include_directories(h2_ssl_proxy_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(h2_ssl_proxy_test @@ -17866,59 +18229,61 @@ target_link_libraries(h2_ssl_proxy_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(h2_uds_test - test/core/end2end/fixtures/h2_uds.cc -) + add_executable(h2_uds_test + test/core/end2end/fixtures/h2_uds.cc + ) -target_include_directories(h2_uds_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(h2_uds_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(h2_uds_test - ${_gRPC_ALLTARGETS_LIBRARIES} - end2end_tests - grpc_test_util - grpc - gpr -) + target_link_libraries(h2_uds_test + ${_gRPC_ALLTARGETS_LIBRARIES} + end2end_tests + grpc_test_util + grpc + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(inproc_test test/core/end2end/fixtures/inproc.cc ) target_include_directories(inproc_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(inproc_test @@ -17930,26 +18295,27 @@ target_link_libraries(inproc_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(h2_census_nosec_test test/core/end2end/fixtures/h2_census.cc ) target_include_directories(h2_census_nosec_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(h2_census_nosec_test @@ -17961,26 +18327,27 @@ target_link_libraries(h2_census_nosec_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(h2_compress_nosec_test test/core/end2end/fixtures/h2_compress.cc ) target_include_directories(h2_compress_nosec_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(h2_compress_nosec_test @@ -17992,59 +18359,61 @@ target_link_libraries(h2_compress_nosec_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(h2_fd_nosec_test - test/core/end2end/fixtures/h2_fd.cc -) + add_executable(h2_fd_nosec_test + test/core/end2end/fixtures/h2_fd.cc + ) -target_include_directories(h2_fd_nosec_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(h2_fd_nosec_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(h2_fd_nosec_test - ${_gRPC_ALLTARGETS_LIBRARIES} - end2end_nosec_tests - grpc_test_util_unsecure - grpc_unsecure - gpr -) + target_link_libraries(h2_fd_nosec_test + ${_gRPC_ALLTARGETS_LIBRARIES} + end2end_nosec_tests + grpc_test_util_unsecure + grpc_unsecure + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(h2_full_nosec_test test/core/end2end/fixtures/h2_full.cc ) target_include_directories(h2_full_nosec_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(h2_full_nosec_test @@ -18056,59 +18425,61 @@ target_link_libraries(h2_full_nosec_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX) -add_executable(h2_full+pipe_nosec_test - test/core/end2end/fixtures/h2_full+pipe.cc -) + add_executable(h2_full+pipe_nosec_test + test/core/end2end/fixtures/h2_full+pipe.cc + ) -target_include_directories(h2_full+pipe_nosec_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(h2_full+pipe_nosec_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(h2_full+pipe_nosec_test - ${_gRPC_ALLTARGETS_LIBRARIES} - end2end_nosec_tests - grpc_test_util_unsecure - grpc_unsecure - gpr -) + target_link_libraries(h2_full+pipe_nosec_test + ${_gRPC_ALLTARGETS_LIBRARIES} + end2end_nosec_tests + grpc_test_util_unsecure + grpc_unsecure + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(h2_full+trace_nosec_test test/core/end2end/fixtures/h2_full+trace.cc ) target_include_directories(h2_full+trace_nosec_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(h2_full+trace_nosec_test @@ -18120,26 +18491,27 @@ target_link_libraries(h2_full+trace_nosec_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(h2_full+workarounds_nosec_test test/core/end2end/fixtures/h2_full+workarounds.cc ) target_include_directories(h2_full+workarounds_nosec_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(h2_full+workarounds_nosec_test @@ -18151,26 +18523,27 @@ target_link_libraries(h2_full+workarounds_nosec_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(h2_http_proxy_nosec_test test/core/end2end/fixtures/h2_http_proxy.cc ) target_include_directories(h2_http_proxy_nosec_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(h2_http_proxy_nosec_test @@ -18182,26 +18555,27 @@ target_link_libraries(h2_http_proxy_nosec_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(h2_proxy_nosec_test test/core/end2end/fixtures/h2_proxy.cc ) target_include_directories(h2_proxy_nosec_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(h2_proxy_nosec_test @@ -18213,26 +18587,27 @@ target_link_libraries(h2_proxy_nosec_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(h2_sockpair_nosec_test test/core/end2end/fixtures/h2_sockpair.cc ) target_include_directories(h2_sockpair_nosec_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(h2_sockpair_nosec_test @@ -18244,26 +18619,27 @@ target_link_libraries(h2_sockpair_nosec_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(h2_sockpair+trace_nosec_test test/core/end2end/fixtures/h2_sockpair+trace.cc ) target_include_directories(h2_sockpair+trace_nosec_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(h2_sockpair+trace_nosec_test @@ -18275,26 +18651,27 @@ target_link_libraries(h2_sockpair+trace_nosec_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(h2_sockpair_1byte_nosec_test test/core/end2end/fixtures/h2_sockpair_1byte.cc ) target_include_directories(h2_sockpair_1byte_nosec_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(h2_sockpair_1byte_nosec_test @@ -18306,41 +18683,42 @@ target_link_libraries(h2_sockpair_1byte_nosec_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(h2_uds_nosec_test - test/core/end2end/fixtures/h2_uds.cc -) + add_executable(h2_uds_nosec_test + test/core/end2end/fixtures/h2_uds.cc + ) -target_include_directories(h2_uds_nosec_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} -) + target_include_directories(h2_uds_nosec_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + ) -target_link_libraries(h2_uds_nosec_test - ${_gRPC_ALLTARGETS_LIBRARIES} - end2end_nosec_tests - grpc_test_util_unsecure - grpc_unsecure - gpr -) + target_link_libraries(h2_uds_nosec_test + ${_gRPC_ALLTARGETS_LIBRARIES} + end2end_nosec_tests + grpc_test_util_unsecure + grpc_unsecure + gpr + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(resolver_component_test_unsecure test/cpp/naming/resolver_component_test.cc @@ -18349,23 +18727,24 @@ add_executable(resolver_component_test_unsecure ) target_include_directories(resolver_component_test_unsecure - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(resolver_component_test_unsecure @@ -18382,8 +18761,8 @@ target_link_libraries(resolver_component_test_unsecure ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(resolver_component_test test/cpp/naming/resolver_component_test.cc @@ -18392,23 +18771,24 @@ add_executable(resolver_component_test ) target_include_directories(resolver_component_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(resolver_component_test @@ -18425,96 +18805,98 @@ target_link_libraries(resolver_component_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(resolver_component_tests_runner_invoker_unsecure - test/cpp/naming/resolver_component_tests_runner_invoker.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(resolver_component_tests_runner_invoker_unsecure + test/cpp/naming/resolver_component_tests_runner_invoker.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(resolver_component_tests_runner_invoker_unsecure - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(resolver_component_tests_runner_invoker_unsecure - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc++_test_util - grpc_test_util - grpc++ - grpc - gpr - grpc++_test_config - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(resolver_component_tests_runner_invoker_unsecure + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(resolver_component_tests_runner_invoker_unsecure + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc++_test_util + grpc_test_util + grpc++ + grpc + gpr + grpc++_test_config + ${_gRPC_GFLAGS_LIBRARIES} + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(resolver_component_tests_runner_invoker - test/cpp/naming/resolver_component_tests_runner_invoker.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(resolver_component_tests_runner_invoker + test/cpp/naming/resolver_component_tests_runner_invoker.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(resolver_component_tests_runner_invoker - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(resolver_component_tests_runner_invoker - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc++_test_util - grpc_test_util - grpc++ - grpc - gpr - grpc++_test_config - ${_gRPC_GFLAGS_LIBRARIES} -) + target_include_directories(resolver_component_tests_runner_invoker + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(resolver_component_tests_runner_invoker + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc++_test_util + grpc_test_util + grpc++ + grpc + gpr + grpc++_test_config + ${_gRPC_GFLAGS_LIBRARIES} + ) endif() -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(address_sorting_test_unsecure test/cpp/naming/address_sorting_test.cc @@ -18523,23 +18905,24 @@ add_executable(address_sorting_test_unsecure ) target_include_directories(address_sorting_test_unsecure - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(address_sorting_test_unsecure @@ -18555,8 +18938,8 @@ target_link_libraries(address_sorting_test_unsecure ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(address_sorting_test test/cpp/naming/address_sorting_test.cc @@ -18565,23 +18948,24 @@ add_executable(address_sorting_test ) target_include_directories(address_sorting_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(address_sorting_test @@ -18597,8 +18981,8 @@ target_link_libraries(address_sorting_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(cancel_ares_query_test test/cpp/naming/cancel_ares_query_test.cc @@ -18607,23 +18991,24 @@ add_executable(cancel_ares_query_test ) target_include_directories(cancel_ares_query_test - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} - PRIVATE third_party/googletest/googletest/include - PRIVATE third_party/googletest/googletest - PRIVATE third_party/googletest/googlemock/include - PRIVATE third_party/googletest/googlemock - PRIVATE ${_gRPC_PROTO_GENS_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} ) target_link_libraries(cancel_ares_query_test @@ -18640,8 +19025,8 @@ target_link_libraries(cancel_ares_query_test ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(alts_credentials_fuzzer_one_entry test/core/security/alts_credentials_fuzzer.cc @@ -18649,18 +19034,19 @@ add_executable(alts_credentials_fuzzer_one_entry ) target_include_directories(alts_credentials_fuzzer_one_entry - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(alts_credentials_fuzzer_one_entry @@ -18671,8 +19057,8 @@ target_link_libraries(alts_credentials_fuzzer_one_entry ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(api_fuzzer_one_entry test/core/end2end/fuzzers/api_fuzzer.cc @@ -18680,18 +19066,19 @@ add_executable(api_fuzzer_one_entry ) target_include_directories(api_fuzzer_one_entry - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(api_fuzzer_one_entry @@ -18702,8 +19089,8 @@ target_link_libraries(api_fuzzer_one_entry ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(client_fuzzer_one_entry test/core/end2end/fuzzers/client_fuzzer.cc @@ -18711,18 +19098,19 @@ add_executable(client_fuzzer_one_entry ) target_include_directories(client_fuzzer_one_entry - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(client_fuzzer_one_entry @@ -18733,8 +19121,8 @@ target_link_libraries(client_fuzzer_one_entry ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(hpack_parser_fuzzer_test_one_entry test/core/transport/chttp2/hpack_parser_fuzzer_test.cc @@ -18742,18 +19130,19 @@ add_executable(hpack_parser_fuzzer_test_one_entry ) target_include_directories(hpack_parser_fuzzer_test_one_entry - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(hpack_parser_fuzzer_test_one_entry @@ -18764,8 +19153,8 @@ target_link_libraries(hpack_parser_fuzzer_test_one_entry ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(http_request_fuzzer_test_one_entry test/core/http/request_fuzzer.cc @@ -18773,18 +19162,19 @@ add_executable(http_request_fuzzer_test_one_entry ) target_include_directories(http_request_fuzzer_test_one_entry - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(http_request_fuzzer_test_one_entry @@ -18795,8 +19185,8 @@ target_link_libraries(http_request_fuzzer_test_one_entry ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(http_response_fuzzer_test_one_entry test/core/http/response_fuzzer.cc @@ -18804,18 +19194,19 @@ add_executable(http_response_fuzzer_test_one_entry ) target_include_directories(http_response_fuzzer_test_one_entry - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(http_response_fuzzer_test_one_entry @@ -18826,8 +19217,8 @@ target_link_libraries(http_response_fuzzer_test_one_entry ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(json_fuzzer_test_one_entry test/core/json/fuzzer.cc @@ -18835,18 +19226,19 @@ add_executable(json_fuzzer_test_one_entry ) target_include_directories(json_fuzzer_test_one_entry - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(json_fuzzer_test_one_entry @@ -18857,8 +19249,8 @@ target_link_libraries(json_fuzzer_test_one_entry ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(nanopb_fuzzer_response_test_one_entry test/core/nanopb/fuzzer_response.cc @@ -18866,18 +19258,19 @@ add_executable(nanopb_fuzzer_response_test_one_entry ) target_include_directories(nanopb_fuzzer_response_test_one_entry - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(nanopb_fuzzer_response_test_one_entry @@ -18888,8 +19281,8 @@ target_link_libraries(nanopb_fuzzer_response_test_one_entry ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(nanopb_fuzzer_serverlist_test_one_entry test/core/nanopb/fuzzer_serverlist.cc @@ -18897,18 +19290,19 @@ add_executable(nanopb_fuzzer_serverlist_test_one_entry ) target_include_directories(nanopb_fuzzer_serverlist_test_one_entry - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(nanopb_fuzzer_serverlist_test_one_entry @@ -18919,8 +19313,8 @@ target_link_libraries(nanopb_fuzzer_serverlist_test_one_entry ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(percent_decode_fuzzer_one_entry test/core/slice/percent_decode_fuzzer.cc @@ -18928,18 +19322,19 @@ add_executable(percent_decode_fuzzer_one_entry ) target_include_directories(percent_decode_fuzzer_one_entry - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(percent_decode_fuzzer_one_entry @@ -18950,8 +19345,8 @@ target_link_libraries(percent_decode_fuzzer_one_entry ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(percent_encode_fuzzer_one_entry test/core/slice/percent_encode_fuzzer.cc @@ -18959,18 +19354,19 @@ add_executable(percent_encode_fuzzer_one_entry ) target_include_directories(percent_encode_fuzzer_one_entry - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(percent_encode_fuzzer_one_entry @@ -18981,8 +19377,8 @@ target_link_libraries(percent_encode_fuzzer_one_entry ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(server_fuzzer_one_entry test/core/end2end/fuzzers/server_fuzzer.cc @@ -18990,18 +19386,19 @@ add_executable(server_fuzzer_one_entry ) target_include_directories(server_fuzzer_one_entry - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(server_fuzzer_one_entry @@ -19012,8 +19409,8 @@ target_link_libraries(server_fuzzer_one_entry ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(ssl_server_fuzzer_one_entry test/core/security/ssl_server_fuzzer.cc @@ -19021,18 +19418,19 @@ add_executable(ssl_server_fuzzer_one_entry ) target_include_directories(ssl_server_fuzzer_one_entry - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(ssl_server_fuzzer_one_entry @@ -19043,8 +19441,8 @@ target_link_libraries(ssl_server_fuzzer_one_entry ) -endif (gRPC_BUILD_TESTS) -if (gRPC_BUILD_TESTS) +endif() +if(gRPC_BUILD_TESTS) add_executable(uri_fuzzer_test_one_entry test/core/client_channel/uri_fuzzer_test.cc @@ -19052,18 +19450,19 @@ add_executable(uri_fuzzer_test_one_entry ) target_include_directories(uri_fuzzer_test_one_entry - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include - PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR} - PRIVATE ${_gRPC_CARES_INCLUDE_DIR} - PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR} - PRIVATE ${_gRPC_SSL_INCLUDE_DIR} - PRIVATE ${_gRPC_UPB_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_GRPC_GENERATED_DIR} - PRIVATE ${_gRPC_UPB_INCLUDE_DIR} - PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} ) target_link_libraries(uri_fuzzer_test_one_entry @@ -19074,7 +19473,7 @@ target_link_libraries(uri_fuzzer_test_one_entry ) -endif (gRPC_BUILD_TESTS) +endif() @@ -19082,20 +19481,25 @@ endif (gRPC_BUILD_TESTS) -if (gRPC_INSTALL) +if(gRPC_INSTALL) install(EXPORT gRPCTargets DESTINATION ${gRPC_INSTALL_CMAKEDIR} NAMESPACE gRPC:: ) endif() -foreach(_config gRPCConfig gRPCConfigVersion) - configure_file(cmake/${_config}.cmake.in - ${_config}.cmake @ONLY) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${_config}.cmake - DESTINATION ${gRPC_INSTALL_CMAKEDIR} - ) -endforeach() +include(CMakePackageConfigHelpers) + +configure_file(cmake/gRPCConfig.cmake.in + gRPCConfig.cmake @ONLY) +write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/gRPCConfigVersion.cmake + VERSION ${PACKAGE_VERSION} + COMPATIBILITY AnyNewerVersion) +install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/gRPCConfig.cmake + ${CMAKE_CURRENT_BINARY_DIR}/gRPCConfigVersion.cmake + DESTINATION ${gRPC_INSTALL_CMAKEDIR} +) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/etc/roots.pem DESTINATION ${gRPC_INSTALL_SHAREDIR}) From 3b652bc3ef7b849e6cdfaf5534a3c6162c34516f Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Fri, 25 Oct 2019 15:23:45 -0700 Subject: [PATCH 010/133] WIP. Start writing signatures --- .../tests/stress/single_thread.cprof | Bin 0 -> 122523 bytes .../tests/unit/_metadata_flags_test.py | 135 +++++++++--------- .../tests/unit/framework/common/BUILD.bazel | 1 + .../tests/unit/framework/common/__init__.py | 42 ++++++ 4 files changed, 112 insertions(+), 66 deletions(-) create mode 100644 src/python/grpcio_tests/tests/stress/single_thread.cprof diff --git a/src/python/grpcio_tests/tests/stress/single_thread.cprof b/src/python/grpcio_tests/tests/stress/single_thread.cprof new file mode 100644 index 0000000000000000000000000000000000000000..3ae627d1c7b80c4b0b408adb7e9e285beb3b9656 GIT binary patch literal 122523 zcmd4437AyH)jp2G0K>kBD9YvnqB5u`qLOJ4L=g}K1UJ$)Gd-6pGt*;r4=_wzV@#qZ znrQMxvuWJo5=G;dsEKAVpG%auMLRL#ZfE<5OB9Uyf8VNG=ib|OyFoHOzkffEWij{E zIj2sYI(6#Q_Thx?TXs0B)D6EahfHh97FOmO$Bg$2*_QnHF}bEO;~R3#&Dn;6pKHz6 zEl`bFm2I5mHx%%3#p(EazJ5YY={G2?dLZ$>_K&-+djH`~^^)nlvHO;VliKrYQgf~$ z(>%$`<-F$Xq?Ngr>?E}!3*4*yNwc!6CwZ!^VPbo0Ms-Zg7gRRWGHG?Tb@ilXf5oJ> z4sg{vxo*m&Y-@W2y9@$P@~S%v38E zXJ%hvCL-@j?35ZLo)V?`nh`6IVXpOlh5hLdD+GT5^r;&Dr`1 zJxW?0gNX|N>7Qh7G!-jdg+FhporZcf_qwsb)e@G{U>0fcq(X3TtXz2R_MOI&}b&!%X?3K@7&i~Qj%e}ztnKo1-3O0BQ&us)37SzW%Jq``?-k+)*W<6 z-2rut+0_S3Z0mptp4jZSwy&MIcIuS$l!NQCo~I!vrC}vna;;R4nQXnDrb@7e8+w6% zCSFU+%N;j9zcM8mS}kqy)5hYbSD@6&mW*0OJckfZFQ`S6-wbQwzlA=m6R)(P)N$y} zvr>`)qT{+u4moy1{|z*%nhX}IwPN==Sl7vFquQEj$u<_++t?zSoeDg~>o`{G zm~U(LgK@V^(Mv6?;gPK2%_l!~{D7wJDao*gN!`$I%QQBsz;ONmMT^7JnnF6)Mvo=a z3=g5ulF6@vHJ?QMM-#s@a-bDw;e$UHBUW)}+HZr&D5RTIu7#S3ZjRzRvG}npZW?rh z9Sk_RVW$fBXk=SjZ<49BmPQMPbc0n4=w)RZ>^h>k_`Q1wpHl} zBwPASYxeWj$*)!{&c!&f2C6Ni3O>zkGAF}OU7tx{6ZS|+h9c2g^9PEgmSTnd&Ne{R zE`}cI#Cz()hyVD4lXgr=1|4-|H65<^uc8w61YeLXH1F4_rz#)`hRhvOk_i|nrSKK= zIIZk@1VOROS!^wf8HN4CD(ok;_zEBVA9L6rj-~|T8T{9r%QU9jTQSvLMZdfBBckXe ziobN5{L(`U{!=d*wE}-eyEhVqNg$QC?S$s-`nbfyZqeR`c~PRUOM4O9nZ)L3Gn<{} zMOP`_?7BpSVsR$IX3rPU?D;i*VPzsG{wNLwOuWX_Mb{nk3pBgU*om5gCE>)hIn%PD zF~d1#mi(Pd_BXA3^(%LM@JzjAz&$5-C4N=sAc5?3UV}Tm&4OQ$2yTQE8Nx02MTy{* zm@$p#Fk`SshI5PkTUD^XW~=%dwTlB+iS9#CRe$0R5GNDwk>CAu$GvO*T`w66etaUh z<1Sioj)E@s;eDPTF#GTC)O$7)fUALt;QPK*;4P>jA{a0%&g+y`o}8iUnTSG zdl+{(toH#}z*%V>^Bg)7hP%LzI+`HgAjpr#ZTZ6GgWs%|3`iZ{wPQN@;}DJx)QB)x z5FAn3d1d0-eF$&?K9r^-Dc1P;%nF+OYQ9P^jE56Rl+?e72#wv`p+=i6%#fPXddx*1 zVu(n67fB$oNYo=Wu65;oWaQQB!qyBMLO-eFiz

Y>?eY1h7SfE zSfoO^I3wW{$j?`{ZT@4ZtWLbutFGwxyLWa?Nv2b=pJUiavzsvSI=@u&e)mxy)JsNv z#ekef5GJCtl2I2L5JvTMXfN>DKeW#KhxO`W1G0i3Ok^4+8TB;{QsPWNU5zAYh=@Um z*FOwO`gy+*W0v3KS1|CV8?rBo^CTJiJzY0z$g3=dLzSls>pzEz7JHh1qh%S>Gl4y4 zl(CMs9%-&8pH8$gUir|SX~Lu=lRP=}zX+|?iTBa`eP%s4_VScuSnY3gSttK5qaZ6Y zt*u#Y#5h>FJ|_OCf6|lH!T2{6Hw=?_&%Sy3e*a#R@@xhMgs~8{8cDH7OGdlmVKn4B zb8ou)yBjY`c{VelyP`YeUyDXV2-nNDX4keU46oWq8cVtPd-pA$G#`$T&DcWMqmcTE z<|zWMj-R;4g^%=2c{UR?vyQ}?aP0Ndo4h|9F)ZcTjOx%>N?KWNMP4Srl0nV18}&Nf zs6lB6ud&%o8|agQ;c&8K=Ij-nqdKu=X@sI$3lLI1oi?6{neHI6jDO0Sg`#fi#I@L+ zwsuuu;!3=~koWU2VOeyWK#>!PmuQOAPbm}Q7xqg@hR)F}eDVLxJ~twm`kA?unFfY2 ziCu~2E~0T98i-b7$@T!2ex~Q9a}5Q?s7ni3?p~I2I;SmncTbe-ACz0kSs@FKX2JVd z(6k4|G?Rr?>&Zkq7;jnTesQCL)1~mxcFo^HJ zbqz`|@iugPZTXMZp@hw#z!(;IoYftGS!}kUy^u{etn{1X@oxa>U)TYS7ZFi*$BR%W zqX@K-v+fF0Z_w9M_hAGvGs{vV^PGFQ_8%r|L6@1V%!&qjCFheI{B3f23G+-`A7DcF zEz7!$bb3uTvkI{Zs5@9tI&je)Ee;mKfIZmIKM{FcRl)&4Wm|HqZTz!LTiWhH+cWY0 z=smIJ@`mRSdI&OBTS{v{209yJ2@qpPW33LveUsf zo3Q)+zq?{wbLym&XERXxC&}8?l>4q}?ftE2_pxx)N+XQuM0-O)uUu8pMa(ONe zg$fI-`X@Su27eiU@h6g0ufUk0NZ8GT65&P`6uAt4H1gYeWz=r~jPAcb%hbSFOM6Ks zt_NXAWOb&wJzGhQL*r_CVPqKUR6Rf^CN2l263zCuMp)ux>rfiUI`n2848B3Bpbk5w zI@O1|o)O78p;PE*U4mMb?>C9;+9(YqMMubH>hfY3-~s0Uzr+E;EhpN@Smr|=bd08Y z&qyw`6wanI)UWHpJ5BAa@Xd0~-0Yw=vN*uBdU_3(0WpJxwi@l)25k*j1y*3EO*2Me zyDETn^r*+FR2we_6B&Rd&a>3b{Fzy}p(G_yjfxC-w+P5Yk{{njzT zRz|&uzoMg%)f*M*U#VfN(Xs2NesA-$n0LSM#>4NPzxOEU?lJfXV#gAOiG(S<_s(08 ze|wLiDR4-)pv0IBJT!&%9_|f@tl^m8e9u%6obQ>6^A~n&%GfR=;E*G&jkwikSc@YLRvjbnGfoBoMN)F1Khtubg^icK702Ba}VK1Rp7)S_$? zN>(2=wKKAwo@k%2V2obCQP^A%$fyJ(ORHYM-oWz8h5gGkUc5E*q~w1f3%wfvp{;bj zov!C#iie3vLNe+aEt1k6_@6q6AW1GZb*3~MNw9;K1H9fr`xTV%naC=XWCC}v^b2C1 zLJ(&+f!c^~FkjlyIFukY4)e!399Ho-+|tl9^!Uq@|l#lb*(Cp#(Xvz`ostQeCHLM*V(d zbU6J|6W-)TKbX{p3^xeJ^-r{+l1mxaUfs6KA!ZEXTo5!nI!a@K zOD!bn0Bx9omgz#buuyO7`hndcEW<5p0lS;*BKf-&H%H{Lr^$G(<-=-Z!f)oveNx`; zd(GN>-p)hN{*M18i=D>63{2UMA9``lM#8vShHeq|g$7Y@uEwYgqGHhjKO*z8X4$}P zLtFN#qIL~AY%D{>Evq%}GzhFX1hK<(ho5b3H2rEtJDrq@F5IU^k{P8kvBMORT?=NK7TJT+siqmS zE$o6!f>~Y!CNA&&WXVUXO0&!$lWEfk8B63$5ux&CLcSI-a5`F6aUOt!G0@^F#p3LQ zaiA=V5=>Otqk>En@tCWi~6Gr=ZP{C9`?dR%dV~CxzASQ%xRcrN@8OyI-I2+q4f(&`l zhPj@+^rkU~3z-2URSLx!nIu}Vh5?+AlO-6c=PX!eCYw=)B17<~m;Q3dTXTPy@@%G4 z(GiKQO4v^VQ;B|4b9+A6t42v|3;iKK`ofI9wI`-Ln@ON=KM72nzH3ai1I~oTw4zZq z)`zaYX>`Y%*oqN2OysUZ(A=14x0I~&+sxMAI?3rz(l1JTl58tFU$9GhKuR*~n_4A~ z<5)cilYKAK&=DEub-4V|`wq*V$G^!pVR$9}`BZz{DAGgDv``K^=C67NFbykr2O5ys1quT=w7_r=}!h z4NGY*G)+${vB{j}(6y@+i_;(F_$h`yTBu=7BYW4m)MF;zcRyJ+^022Sq$Ja+KEmH) zZjmDrtLjs!>N`Q!VAAv)EKCL4?eqe_S>^9@|78m#a5&y-Gi;tQAm>lR6usD&-fKFqw`ax# zX2GRgoPkOeUX$?)ZN6@x(EOQbCpw1Buor6{PG{s}08ixTg9+(297v9_VM|ESI2$7? z$i1N%3j-8HsPM)Uc{iM7bgEw(saJuCQ>!F(4#RP&54-r-zxFuz_>^ZeLM)Vu{Uk8k zMy$xMX22{h0&;a}D3*wF zyJsu5;=7Ma*Qgt3yj)*%BR>xLxGGhs1r9>97Ga+@ z%^eBabgFNHUaa3cFmY0@TdM_@KSOcokGQptQV6XoDjTOY)@d9}E!X;mI+gV>c4qa^ z85(FunLE{&P3@{sM37}tf|Y@RYG_wHMl`9Zz0i)MrjyLkZ?=&p>Gh`Q_WkgSzMN`wMk#d zt}}?_M|g5z;`G98z);5qJKJLo7cV+0y%1M)z=w!VHcL&kB0oU2!ULi9WGFq5#rRyh z5lOK|V?-YzaD@_aX2v^un+}u*Cp#JC*1_&o5Q6_V48l6`*65R!3saKe=t2hkmoNtp zMwiGG`HrKWYJK;>1u4&Fpl(UqHf)qy?~1Gvq;^ycLKs8xr@@6(`ERq8oUu6IHXOxJJAxa7rPh+7vO?;Ujwq z%|~THZvtC=M#yt`n=aQ#daDi85^t1YqXOwo5LW zhclZ|%Mdw`>v)fB2OXNBIN&@77>NQbg=^bR!AdLz0^W9(9G}~=RCd$#W@N` z7!-#S@@W{FHSFVlxuqLZp3MkDZ<8S`d>M=}ek`mMit`hmJV{h*j5Beq4yS~Ua(1e7 z&`hyD<-kDkwY{Xhg9NRP#0sG<`X^(8y0aXw15&9{i5;EiFaK-n{6DEDU3N_?V(KvPHsGK%H%28%mH!2 z&H-oks>@LC(rIXpVh`eo>8Dd5&c&{d2(Vhft>q*ePNJLxX`SjiBkU?LaY|t%w~#B~ zu9`fytKuZCX>Zx9!=(c3fhuI8qf^8KJbCtCKliPtTT`CRBrH7HD)p9CgO#hnb`s;B%)ocU(_U#~5P%SyL2kAC~xH=mvI zY=*6>7am@Rl(DJC?u+5-VzAYvO6fQ!37#0@x^;mC zk_?AiI!OLpdgTx4hWA(Ee>!pJ66zlSh8Bj~^__?W>Ze_42PB64CsiZ0LJ! zb(dlJE=Y#0FzQOBQ#$a3PYYsvp`R61Y_RV`t`5=aym9i+l=MO z|21b+XBfR8Xa)E<^)bm(0d;fI6ap!oPU5eUxKXmm#U;|P{n)Spae`KWj}x!nB#j+d z6Z0F`B;hLkhT5yYSod-p;`-;@d-JkyoPmW59&ClctH8vmR_Luf!?&v!+c#@>ogWk^&z%2Nc#(c-RH#G+w=WG`|nn)N_p>P z9yor#d1ph+KQ`JN?)|g-tGvga*=z005r?D@A4s~a(S|2*V=4TMLXIxTO)y#d<@Db3#H$(pDcAxUP*;L&R@n9^-GY>#~T}VguWD^)d&YaKOGdYHs(e!fgT9 z`#F^leJ}}a7`MM0`K*SHgTI3=l%+K1e{THOQ}b7hNloa!WqcLxv^L{TMF(XVLp3+; z;JQP*;}9HH3*q5%U7QFi?;)X5ni|)lUk1k()EuY+EN-Zj_KT;Zhoi@AP0K2`TPSEb ze`v0h7z~_hDRnTaKRVAOym`Q0G^9>2T!tW~#V~Z*QxFrd8yP_UVHi1!BX|StEOU_Y zD4zA6m&>&+%r*NB2r)z^CN(;E7QMpd8bc^-RC5W#?x|px`JNO<(xRj7AX=A$1%dK* z2-#2Y@TzVgu7EIPvQ1u0i)vgMaTe0pSHmxRKAux;;G}~n-blS3gj}2E#3rlR z-+uh|`)?ja^&63Zt$AHbhFG)_c6gG=o}C@Ii+X0}i(6kT+aQ#*HdVg3j%jJDxdWc$ zqf6|eT%{7$wkTdDgVqTfP~zjZ4M09=)vcVoz7&9G0?Mg}sw8s>d#+2(HPpkdVJ?K) z#jcc$PT6hqAr{#dZZad-5J`s>6P5+jviWJ&RYhlkGi-j}tZt>%en zLmN6_H%071*nPx|*nL;1@$-Q6Cv(wYfS&H*G+;(Mu~5ix6RlCzJ#k6xEjKJpFW)<5 zk8*_$tWoPx(3*1#xBJ)Wk#ebNl`gn*JDoO0U*Aq%Iv`TLa2PT66ZZ$(DYfcnREHZh z%|=V{#r$3B_qcx6qLf`14(A?I&)@fu&a3uLdDg*1BPN|AG>$aYOZ%jOdWFhhEr+-2 zXOoBad-K?osx#b#jePbG&v<$IG0+!dVWCnt8jx^dL_lnJsGw5tZX2@Px>>I8Awx!Q zu_wk}M5G>q7}3n3gC#thFi!cQOm|irng5vmerZm9492^FJ=hB01BUd^v%9bDd#zrX zqt5ADmAG3?->n!xw(B zfhImZln!Szj6O_4bNG!&>~%rmRMCRT2A6Fo-P!@tB}QA+{*0N4y)}OPo|qo;1SncY zdmT)KiX86)cRH+APwsw;1k02wh_a3-MQuhMxUTi;{l=CF#tjsRU>NwxV9zgEoJxEL z5Fax7CmBemD=&=1c>`?>UqnTUwQ^DiA|Uw+Jj5lwN9D;mg2H@rgbg05S5lR z#D$3q&<%VGMFz2K1C~w(QSa`1ANKAz8{zz0UYa*=c*`l%JMEwp*03hn4=4#TAcW~D@7yC6-Z1UwGtl3IU`WV#nJ_ohySqt^Cl|THRrN9A4zYlF{gZAB?RXM@ zDHV_)%B$6bD>jHG!2^$8L=_I~&eEpq4mzfKLU+{%3Rv11bmBKFo{7Jh3zWrzn$jEV zZS#c=3t;sx%0I+t?51kcRxfhjjo~zM?#kNHp8--akqsx3Q7-}?y3|;rWfBfqc6vS` z`868Ii*M$btH;a`g1h^jDn-b$Pp7cdnp-+cOZcDLr!HE zRELT!(;S;Ysow%!>B~rBFBbVNK&BH}wvmjzkmYOSW)AzX_z^Y(rP4#u2f$JsVs7*Z z7G$XW*e31ogMvB>rx?6K@MW$I_U@@Hh&L_VHUCb{1 z+mNi%QEb4V8psnMfp*fqHWSfO$*9_`6MDvAsX_?y{W@!-K>|NB1b3vRMi>Y;&{Vl&!UbqXt3|n0OZ)x@yxe_VrSd=~QnUX;ou92+&mn`2dWf zS*n3JhSHT#5DqEF5>X>Hcfo-_HtF zz$sxZbUF7?XFAXl4shCEmzI}|+C8~~Q5kG~TP?WPCi_@&4}U+8drI;Rc#c6|c<9dq z4V`#qU*_mY*dg$OvE?&(G|vXQCE{(*goVb#l|{~IRX7PWjlI#HOTfT$oCfi4!~b*= z`p?#pwl?l|fD{LXH!+ywf>1ZT51olb)Ffle9*n9M2L+Z!l^G~*1c(2UX>H)t#s4w-lTLya?lbICH`i4e zKER+9?%8;9@aDSf>im>vGmt44rv1s#JzOoqWBuU+NzSFQk#1!RzKVi&SM7bkWbOiX z%!~!U6RK{(Lrrpwg$3tnGqoI2gyMxOVimC;+bhJr8%52;9TzS3H158z%!Gc5xNA0J zckxuSL&2f25X9keLU*+p@+tigNwJTgw;P*KvlA&dChmcH^?TF+AXN}sZ<6dQ8R z3P<`qXzR_XQ-BNy$ng?S!>V}*qVd#Rk;RyZIg||K#A5zesT{R%@y#=NC=|wRT&MYT z6ah%sksVP0uMRluN!>vk#KG}z{fn}p!CR<10eCoyIM`8H4c?QL#Z5k}EYAvJxg7Uj zfU|M~8PRH6_7IlEjv`&Qu#PwFq%$ghXNJS4GPA%^JHDu9D6QL^sQI=0dKmCq&8spn z1>pWPhAr_J&f0WSbH?Lwys(f{f3*k{01~Q=*m z)lCi2Sp4(QJ~|1OWDrR;OU!$w>>MS;;!OL&7l%-vEyUY0aYPbFA`tL-gp~6Xsk6Jm zmiYi*vH!FM*R5mSKYmNBkx^tgw}nPhuszdhEbQw52<0&tNzjENnqf=q$r6Z}U^k*J z5^mozJt1;bbV6`v#ct%RH~0!3j*IMbLACTRs_Rsc(ltnU)dM=6y#p(9KfT#FFwpKG zz(q9mfJY03lOm_e;AS9d=08Z;);6nlIjXe}jETcOF z%mgFQ`e?*mic~INMLHpY}2vj7bm}>u*ng_fJ`u=6G}`pNV(OK{v0tcjU2n z)hoz+3Xj58fF8w3B+4Xk-LY-p@Nb-U(-n8&HcvE@?x5G;b8tks#b3*p72swpV?ieJ zD6(YKx#$BivB;2bS0LluR&l`4AIc(}jy83wkI_6a)o@_q^r}QOaj^r%a?Ve2sNq5+ z-kq;r@Y4KyaNYbXkIfpq2$@bb(~vuwO2NdnAMRa}hNBJEJ4fW}ZiD4sVqxNXE-G#0 z_!2>w1Z@86ZpXKl5ayw4rr_RGX1o6`=%uNJ|wb zwm460Z^czCKs**K=p>MKL^*6Jh80bzye(Bt88#Y@L*LLc8u%v9)GIz&1lr-UIEv_B zSnqBIBy_r55OX(F=|Fr@mp}#yiaFh2sWOEPn$^4-(NkaCPG=`vvo!LK4CJ;%14wdM zMrYN-@;LIrBtdWM@n>KyA1fom#+pypJ=+jGh{5$reNZ%rorbCicJxo=jY?gH`uJlY zFg%{FuU-bjRdi|_j^5uGY?i;3NOw)+5^0|Y3etABe0nABqtIH|2yXNRwm}<~>>dAKv^O#^J0-VyL}>B#$&b~bpr2rJ<fl<0~DM;Id0 z2!j&cWXRBGHchLk&BZdz+zj24jWs6BwGy~0r%9IWw+H1g% z*ec0%x&~d>1c~&b;Ko_C2QcVFN=s&&<%`SPw9gUR3{$&Ej7gq|ssa3&;vjSE=tBUP5!>66(-|B0&M!JY+L*Ay!!|=0&5~vO9fDr-_VM35Vbu zm^j5M{eCr$OR?XFl9WzrGjfk<6__|ZS1;4JC#@CsGhfFH35KmJTWM^jQ;mZLVUVZ- z6DN4Ev!fx6Amo~KdQ7fq3~x#dZfFe7{WTukG?gd*{O*Y4>cp!(?#wYAZ{kde&2Xl2 zBU;vf0`v7CXcUQq`it8yX}`f%pa_H1epR{z=b5HFWIjFTF7M^$G$g;Im2* z*NQmmXm8kl7R1!8U_#DrNT$*wFj1NP2F1Zk4du+l+jq(v?Y|j&L`pJowQ%(w7ev)D zHlUAcQ4K>|YlF42fhfTqJ20fDwPXkKq#d)G$T`X(7wjE2;`j~Vy!7f+rps=Ea6B*MX+ zPHnY9LWG6X9aNMkk$2}`+4HE$@1(plzJB=Ow{8FtdsZ`K#DNiv-Nir63iSr8hqKjc#nzKt*@VKY8`=%?boYhzf3E7P(Ag zGcqx$ee$oLe(qr0^*VCty|3>%;m?o~pV^4vbYKMMYn0OXGTqYRTC7?7 ztb{fkdJmo6CQ7J{{)zogXdVYfYRH4e>^-_VpQ$4Jkd#IQls;SWh2wSftoes;`VWpN zeGvigX-B_y-{lu3b(j-&{?hWDK6g&at6%=&?az<<5~nBHSU*MXhw4q=yl66w>k4qn zH`B;_M?$-O(AUNdZ#WHo^7Cii@W{pYWc74K%Bu&7RqTZF$ITJL*fe|X<1yNC(ojv~fqyEr6 z2j}OEhYuLPGSY$9qXP%aQW42G@PhwE)?#paCa#IZ%{{b0i+K}I7n-1tNMQ`0$sh%+ zPq${gEKZ+-RPc`$ob!sAjS;8s^v%criiWhAPW5v(UbM08CxMYF@i7S3<_&)JklX%x z%j%RjarK9{9JF{H8k@HO#Be$=f^!`0;;tg5;ONY1ztB-hT(S9rGyIqakH83}>qu!( zI@9h^Ec%%dY<7%^=a$2!A8_;~xJF^@qr>mK^qg~(s^Y*1flx!D8uj?zC;VytCd6k8 z8|VkTpofJ17-s#kbVLVXfdH@X@>xjJjxo78g@qW$6LnvC$Md)R{hYsD*a1)bh#OA2 z>cwxM0?x4DzzEL28VR+xV#$NMb5>+^v^i>Q-kI9(joU8$YRa=28Q?ata8I0l)(^-< zy2wu7$PCLho|W=!#@e19n8&K|+Bb=SKeh4hyEokr+hH@p9x15D%B%e5fsam}^yM>C z-XBI^*`a>FQ7^=3+w>9PP3R?p-+>qWTL}LU`H8mQ`Nv$a`zcRiqpr;)h}3=(7{M9x z5XJe*jYp68^K(rpuhYBpggLK)XSbOg7{M9JEsFE(o#%ez3wxiI@&-4b`pKR@Q;Bcq8w*MJ>0PY~VJuzl=KnoG;WKrTYW~ zANZ@&wE2k4ksWyA*WvV=Pzsx0`Q{_9IEhccjV;(%FE1KVSxqt0s<4YP0xx8AxNS1U z8SM;rXCFN2*l*`k-c3*K{KpUGU65oh^zQD#XzDjkzO!4)%^fM%;2zld!s_CPOv-CL zw&N$~|5NGFRkO+P4Hh)?sdbFZEmTaI9Nm8Upf^@edM4%B3@1mr7 zaCcoq{ms$3!&AW-yTj=Tuuv(@LVd9 z{Y#HrGv|9Jq`dZ#H%)lt@KYfg#{+O+1m{ygr=B)ALmtjL^u;@7{^zZf*Rgxgcb0wS zU%>e&h@*N{U<4;O=b9#uYNFYIfz#yn$YH1YeYy5IFvR&+D4zcQGO+GY^GU!MAG5cff1Yx_hQyehH>Y0j9F(&n82(9V-cIz zn}=z{fh3mj0URDViBWN?n?S{ZAr&2f+MD9;lMXz>c65h`jWER!fw!58s3S0fdT^q4 z$XwPg#3xAGfdS4f-|Dh6kMRe$J=KQCv+(BjL5I{GP}i7U9Xz}}5!2}QwG-D)osz~I zKv~b5M94{H2dYbZqn5>C!PX(`H|E;(17gv!>LDuKuxl;WkN|e}$&G%!h!`=*=NiY@mlfZ-opc8JlwmKlI83_&N zz_8)2`2R`6nTE!*-bP^Y1D&qgM?#4eYZ`%JO|9KY6x!DaBhL~#K86EB!@=2s*)iyZwGZBZ z_VQK#hhWO6-#oF?;kR)D<=}K+1n1SXcD3n63ujiEyhb`<#qlWuBbXl}%a0?03wZC% z@XDBYhvx^@zI4&x>E3{UkGtTtJ9kCs`T@f9s0Krvj9N$DiHjN(@gD5`1qlYlfg#Rt zh#nH$GqV(~WK#$35nq`Uu8!=>N)Ux15rGjB-=!$@GF0^Xbz{v%bPv|k*B<~-eZ`<% zWU9Dq^`O2^FRVh}^o+&F9k^h{>F5nz<7WI5BKP}onuTCtaQDM3#I-zJt=GlQ5=lj_ zVu`kHjlJIInR^~D-SM5ZN&ce)L(x-|3IU65>Kr5x$+^rkk%P%{ES;k7i7);c=nrK_ z6RQ*xGUpNXIY?q;3|qL_!CqU_sThQZ%?xomFoN@oi8#%~68A3JP1^}L9T>rRej-kz ziIG`k0!{};a5h%QX$o$tuZGjY2+l7h;*=g{;S+E=FoJXW4qKggOJ~IEY?Tf-M_?@K z5)b1R2hGeX+<)!!;{T(R%Bff{1cd%Y{01iy=)hP45sMJDAZ2y!hOU7C74<8$8V-!$ zY=At}>(s|+cQc}mR5HQRIWU6LJoB=!UExyU3bVDa?VS1>ULUa&qD|VuX^VI^dEJe5 zi}EUUGYXH_THM7w2S#{36jfIv%W)d^HrP#aFC^h~U<4M?UW)kb2+(S63pmfQH`o>gcg0CJ*|iO9ATKqtY0!JV?fGxK0_I;#@Pn+ZzmT+ z(|(&d3#D=`d`A>#ionKQB*7%uc^Gj?I@PI$#wCPd5}=NBc*U1Mz-hR3S^@?(BW&<$ z8+9kp#K;=?#>S`$WFaAYAB0ObvFqwKIG42_ke;(J&|uya7_$skULv>z%izFBt;RtB z+lB_SFuGB;TT$0(DaC2(1beUs z*UKl=DI%|mb&9}9op{vMoGFd&o3lz4G#E!l#|k(wf^#l$&M{ie^WTbzI9%T9Raf-; z-8;JiXV9m0D2_=$4h?H{*ClI2xvAbeaQRoB9i7=l$Ii8!vLt(tAFY#N&lS_J(MRvvaj7M-;Uyi{vf;D=gMx0W6pYXZYlOs$;(%7GEQ;i2Igy-DBf)VKRB z1G()8aaAw^V&8D2-DxGGRyc=ej|#$5*V5_6B0#6r|w*?HFHTS~s zixfoPISW@GoYcpxkqa!-`$-;v10%Q>!2>JyC+<0XTcQc~o5e&eC2b}_+wCWb1q$}? zz;#sHji})Z9COW%gK=*&hQj@jXrf_4m25=iJtTXPG?YeU_51X|f2ID;czRbT|?K2-Xk3r~s3 z)X|v)nL03nH#}-z6FGQgrO9WYQB_JAt5^p({rtQQ?{WazPSw@ z@y*ar`+&IF5vL?~L}!>x5SRlaoQIbUM3vB9z2rT3yZ2=F^n%#sH6?1T zLS1u;3aJGw%KkZ}a{r9DZwb{f{WAh1xXG6KxV(Rgsoy`-a`E>!p&D-gbYLt_bAZ8F z1~j?{_rPouo(r5#+}wd7&VONmE6qUHDGpf17v_^APx!8Xp3Nk%Y(EK%MXwgpL#h1? zFqggyqQ$}0qh=0YpN99+9i%XHv0S|VS=8bUU5oT=Jn9JTEvQ`ce4Z1I86X)1Y$l-= z_LKNY(gIsq%`}7m&Xtws8S5bIto^BXpfvj6VsU5e-SpSm@TJ@%9%EhXqT!F;qB9;j zFl3!%d>(lV$SlG>M6OdOw}GIrnQCM#jF8ztGQ)LkbU&y}$J9c+Dm-B9R>y%6I=8Ve za6dAn_E{;FmfQc5&`vW}U~h4zp)hl$-`u#2k9y+NV$@l1bf#i$%H~s=$N=s*97LCQ zD+D6eu_A#8jEGBb+a0tx)3h}L5$-Ayh`uU~FZoZV}mB@AY|R#ij%P(V5iE4bBJ*alXfHu1)N4Hu2W<)%Gd5;wpi6 z2gcIz^$j$;=)M;cVlUKNX<|C-2q1xw10#gS>Yh$pvNbx}J#uKlCEHxX7Y=&19Qx3q z^M5$9a$`hb$h%&{VeG0nOgBcbVw7xhO|RZ)Cubj3wowrnOT`~d(=kLArIO99Bj9aq z1ikKcl`(^M;8?7$uS+Jh-4;p{+Kc@g8<7HWEzUPrqp}@V{e55#UVIe7%`F$#zG~W8Fv*MYJ8 z`d6~o)-KMrWZG8d@N{t0;ENHmFNed_0Oo=78vCxFMqXWa%{101`+h~h@j_0FFN42ySI%3+r-Rx@Azar{d zje2%FZmp@(Z?;{nHD(3|iZvQ@46CUo0^vp!iNQ$+#)_i!DzWxosQese(j6{#(01W&djOYGL>m-D+_Rl za@kA*Zu?34u*F^C5Tqu9eJFLfz-%9a^k&~Va`Bq%p*j#PK`~W}IR{pU!h0kHzkLx7 ztjpwD4Kd*1WfrD}8^TR!0GH{X8deT2*iGi$di8IJ1q|?bgifSha!o%l>Pd#)3^Agd zU&Fvgdrs=ZdI1Nd+TDPctFtJ_1_3{e4Di~}w_w*#*Qr(3N? zSHx~j7Qki9SK|$M*fbU@=#!hsyB=I<`c+*rcF|N_Rk5+^z;bYCkNySNLvXFQ2O042 z4Kry;vy}5my?uHzVZ)hS00zI>DjW=C>JWpmyy3AfVCI?K@je;qh2{w5D-y7SIWUfd z#+RM|>&2dnvkGHttO2Ej$-F?B=@K8Ygtj7KSfYoyCWc`onLWun61JaJF!TmLqEh#s zJihLC`z=f|^bQPgR((>m!7gWa{V9aVmginGls5-AA;$(otMH-@3AV_Ap^PH?kZ0mN zElvk7#briajhjm}=Dn~OX39)BVg&m z*ck5mwGNCZY76w(Zt|&U0qMt{VES1V7>l!{H?95D3^E}+2ZppQ%pw<@-2htbk;hFmF|{!=lu>~) zagaJNg7hZVv1We9(WqLN%=@&(rR3CXR?WTs596)XVxDdTWUvQ_w*E9$;6qf-xzo7x=D!BEbYB z<-l0<`V}Z_*bNrT!oe#_!6-*$2VMdN2gXwHheIoh!yO92gUeAmPM=7im4u?YCQG0wtV~u1Wv+E{-IPi85$@)kx3w`6w!=)LKdd}PMqpTr z9+cBKR1g=dh&K_ugyCvVq~Q|8l&It+P--QCp0nEvaD)6 zCB)h@ops{Vj*2CqbzlVTi9|afy)Z-P7Q0dB`eiPV2-42y63{y^g1$iXwSqm?jE)i~ zV0K^xbH6@hTrV48n$phekK&UFXCO{M@4yK9uM>UkV&7}cI6YLVYcmO$?I-caEM~O@ zZR{S_G5w=&%IkB~&wsf1(p*vxbzq3ICymMLz*+2jT&^*@6t6|`{jq2#G(wCxZwdT5 zFc!Dp2kusJAaU!!7q4t73r{&pn}FYevG`Rln%fHF1vcx38*81&y^(PQhB#}9u7>V> z-#NjvpXDo|4lmovFLC=?mX#Ad>_^Z-?E`OedRespOW^cHQmgFDyt>3gOdAGhC-Gkgc*%NFtooZKu zmH`wUN)ZoNGHRp&2?I%vMyfFeB)r_&X-H-GFD)mbm1M?X*g zct&oURkJX}8HRTH;f6!()@#?-EyVhU5iFJ^Z6=}9*-ru!M_xMvkFNSF+7mAv z+zy8+WV^PDhma66V`z)pvJDBc*p4$=A>O`RO-{mX^;QO+1UWk}l=D}hVx`NVz{TFP z{Z@0yR@7QpMGLwVV@?(3GLezSBK8?zE)JcIlU*}#rFd}nud}Dd>Cg!@92lW-3TX@w z8eKSlq-@ONh?P6d`9FK{u`|`Is-4EdkmWI`h&l~PabUQR*M*ZYjejhO?13bvf6|oJ z+9inDff1hfB+k8(amv_NMLi-g7H5f9f#4FahURRhwSB8|=W$$v zE-{wTFMs~72VVT)IJX=+3 zZu;i6x6ufxQ%b0?lv>LciAvb6eR)GSt=g;hSHr;h>he}|U zZ@}Jy_5v=ZPb@ClYxnXByI-KqIn!uwNKOJuW9!$y`pfA!4|8L%uyYvU^=^Y6k=+Ik zyx>2J@Mo9fm+L7FV>|7=9TF5kBcdFbD#RyrMqX(Q^s z8Y{dc>~)HDzwO42o?=#Nwz$tErStjby29GRLAe#D^DbDeluQCQ86$~`%=ztCk>)oGy zZz*sVdmVZ5L9_kDwWIAY78-A|JdLl7C6`GrZCU@9ALCkJ*H}0(t*b=*OSxZk&EH9Efg^Y-y}@bMR8yR=MzNyWHL^4 z2iZyN^5Ei+zzhCwP>p*o!fI_U?g2Ork{}8P#-jDV2bI94(2hJDiv;ANMmCdx+=^;5sM`PqIc?@Md<`uq=`$R=ro14D+NWV2n(myYhDsH`aT& z>0tD|kM0SaDbx&YR|Q6Ja?ib*LHHVTGdXv&%kAL7i@cl^a4!^a^0Q7{7{R%LFizcV zJTH*dX-Rc=V1RSWqAt7ObA^wG1-7~|1}YdnPUg5~rpY5Pto9H}aepM{xKgXRFqDQj z*3BGUOi(EY#^U!+MGq_X!SS2`eGIj*Witt=?WdpxHt0hxWZl1>sC&=z(G}n(CLoSj z=!%FVFv9b}l*s^dxUCBM^)|w~?HevM-zB0S9Ev1q`>Uz-_EPwS6#Aan(%kjjR|p9i z*8?vB>@)L(dDs2$oTPr@z);{fpb`C{Y{{W%W6zGms@&r28SUBDvP)tdO{mzYP;?6{ zG$v9eJEfOkH8H2~dJ_jzZp!N_&CwM(kwk{YiF9f6YAQR@A>V0n8zz9+##n`7oj}|{ zn@NzD{UnoTk=M6LWQbs&)xG8hJb2cE{ZlMy*LwB?pFV z)59+v3NwyFhFy2lq@FkEZEgJ*Lo=y1F81w~gT_9Kq8`MMIUagQCV*P$->06zX##qy zUoC?LF6;jtX1%AemVR_sW7hr?4j*{1@2bPazTG0<34OHmII3OTF+DTZVYXWo8s)o0 zInZtuTa;~VZ|Ex9Li`mBuk};C?nnOZ<;P~7k@o4tG8Po z8n;%B{u(!;zFpXW8v7a!83RvfZ6oiA`2RcZzfZ~3;5oRm?QQ=R))J4`Ra~2vfa0hF z*R@`~-+^e#xu|7qKI6dHrYzk{hI^&;j_o98XghofE$B%!PPMoQLqAB`g_!-5*o3{) zM*HH3ondKPhc2@07s+xTu&kA%tP_d^Z6*P={UrC2St(Z-vg|$~Z{(6!4u5#qvZPMv zz!2wu&}gL_s1&u+80=hYp5W&F^NNWK%aZ9-9|9aYQ3XaYUk6Zi8>9gj!>550LOu=*adJS@uLA@Zh5Ko?AQR7ABDZVG`^wXE?*94r7=$+$ zg;#?SoL?p4bCBSs{nLn(NpO&AP%3h_Lx8gijNoMW-Qvs;ClgsS@fJLK?FCc1@xF)v zXB8O1soz}+_*_ApOak{6e5&Io?s4HG5u8*=EZ6>Mpeyz^)2=xSx(>0q)z$GcO((}=>vs=cuzK<} z>7-8Uz>wLUS@)gMO2vNMHIF3*cW^@k=-;RI*EDi2I>44M!%LoJ*6Y8+t9_~==^1%h z98Msy-Hw%JojZ^)1DfqCT+L*cpu3t%sTp#>gmFf5^JhonLedzRp3!hdJLW!S%WQnR z<$on9{}5=9T5625jvF%xZ1Q&OlcDteU33?!vMRV8{arV!UR-gykcoWZu7Q0ftnYSx zziCNb$bn%O`aA2+#e?FoS-IBijMm2Eas}opi#al+Mi?wyEDq z3PU5ft8}S|(p7BF2#jq{y-UCiIGf=S>zlXsyQ%+ivo1;MQVtApvg@0pE;U_vp^L^k zn9}Is+~tDy)xS?Y#%ZL#LRoXJJG#DSs#co{>|iabe>W-?n*%v8w)&;#h;u@D7cpGI zw%SYrPWwq<1ZRmj_v=!e6;3(H`qvI$xo_RDT@&w^b706Px2vlo+5R&rs~WupS|@=Y zxzWZ$H`T|_NcKWW$d+5CE5HkW{qTV^0ti2UTJZ1(2XuBMsjCA+oO@HOT$d^K3%Xes zI#C+A*4hC_wl_6p)skFpG4Ak6dID-YOoT>%EGuwlm+6JZIUns%96F;N$8=f?d@={y z_`6yx&ysI;l&zS{8>5F~>#0}nx@Sao(xyB`rpA}!H+>d&Bic+tAGDtYMsTjDg6m5X zqPAkYhbJxTpAo0CrVPIIPwW6T@|V}$fw6p+UdE^5fZ)DREb#CKzyvWzM)w3UI9`H9 z?{j%J9w-Pqt`QzKXxWS~UIj)l4+7?5Uv4Ar(%qsIv_G7<`z>zEtg(Z2f=D8oR8b@m z7-5_T4~m1yxH(+h_3UdeRf{I6K^BfCqeXB|#_U&Jy3JGJ(8mFoILh;T?GzYu+v8otS&3&(rT8nd$0Vq3WH1u4dY_y=Rf0Z}6rUHBwV8yj zVm}2V(j$7~248Y2{T_lxcv5fi3oiJbgX;!kozdYxfr10W3Xp=&vt!u7p^@7=gu4*^ zGNSK?OCXx7Add`J6?u=q2=5mXdHWl{tjNqI`oS!SlX)eVbn(`id zX0Np~N9+w5I5-^`!O5wNJDay##l21c9@FEsx!*~Ws{;d^TP7r2LeP+FZD>~tQ-f`I zuG!Q+qF)IMG7bzWA6T7olfJznALAf7IB5DmJkm!`|M?Hz`uU|vb$4JW&z;%sHRuKE zit;vsko7O(o;z*izzEJgfVendW(FIJnz3`H3ujhfHrUHPZrX}=zqv5cZykfn1y<%7 z$D~(g@++JD6?Hthf_?4jmc~Q4r#+1Mns$iU^I$V%6&ThkBs+fVWb-RC2gd0-7Fsr8 zhIAd6INb@`ME9VB4vtfHG%ta&1G8O}51I1+i1OsA|F7zN$bkoSd7T$b3$%HBp`$H3 zeoU@u%y>_=HPodW^c6LA4ITQQi?R(_tUB_Ro%Z~K)|t&d%+&&1?x|xLD7S(yap%FG z{}wv8PCVll&P++BQ$30fh3C(!z{IuT)Q~@w@wp)+4Tdv~c$mA3ncc7<_0VrGJUr#u zOaim^lfcB84TZ_;6uOu{`^Z-K+LkL!2PV$nA`xaIWau~NyO_mi|9bPyJKi-l<=ISv z2<<06KHuCoNj3=9(ee(|~&t?*M zv!4Ve&f7xaZJUHPrxhvY!Md&ef-p*{5vL*T+9wKk||}DbHpSxU-)G zCeGbVky$?LsjP={*^Oyj9N1jB56@hg!3hikBn`lWFaF}(-+k}7l=sWG$9(Rn0e?h0 zu7|H28-N{{I8TQOPYv8uzrCE)9e&d354`kJ$~*b_rw5!pe7HZMlY(@e1#D=HtD39Nv)fY=(!wZ{(~mJewGGS1p*p#~GMZk%2~R zrHA{PH8%uf%Fi{VI4|Z=)EOzyX1JzHUi`I?gSxj|7#2+6*lq(#;r_8ahC=N@<}wjGXV3UhJ=>6Sol8R3aXX<@&PC zk0v4z30NmY=o}a!a+(pVRx@r$itpt^CG>B*RLnn;6&P7T^yxNS`W`=1>BKfF)+Ex< zwkCdaRcd-d6pJtYcXd05)J9jTo8n2me0-JrzoU02>5ZvOFW-ij0J>6~kC5P=6$$26 zA;9u97{X*3HaI?&L{N<5eYz6#;L>a zcn+I5!=7w>dR#&DwI>@tnbx0o1O$9mfe}6#c~?ykKn$nc=3>_w5^y>&f^#Z6cP&Fc z4b7Q6yLQNlbDARovjZcTCzD%lO^@L;3l_MC^NieCzn=BQgCT)_tWnh7IWQKd`V|D~ zE*3od_{n{a`EYc~JLaLq|NE_Vvw_n&$nC%o=U6uURZN2YEc#{#CczqC#E5jNF|11u zbB-e!MsVKBp3yr!JL_HuyWJK{Gs{T4D*&U0STV52I}-%pz<}8;S9IB7d)y?Oo!FLX zScND|eiHp-KR5Bfx`Pg>JD{#HyZV5MZ5_Ccdm=ov_O%n&PMwmTa&TSN^EBk7AQl>1 z8_|(;XH^(Yqkoan#%XE?hBY0RusUO}22ZCMjYy{}-w)pTrJDD*hMk%Up?zqIb}=+Gxvde}4u?k9=u#5e z)e!n@t8_PQ;N!F#iS1!mZ>zP3g%L3wfx!>gK;kYyALnF~HYeFFGoiO>N13p_9T>s? z8u1TW)Ybr(63cMrX^Z#}?zCY-1soV5(7Of%h6H%2N3%?@JSHQj6DN>xV1&eAk{FD) zRB&s11FF*XmDod52wLGYp>UW`$f`M*%_<&~D7&rOk-(>t(g~oj)hz;vzLaTP>3`;K z5#6_*!v%)Lq53*isAh0?$r3Dm#adVVCdX$9HPnHT)*agmeE+ZRRgs0RvxeW@wBMw! zro5M~`FP!zYW@TpeK6z`i^VxGg7b3VEaFi;bH7#jE#RiU8|=m*>;`vxlmlaNn_G08 zp{&pSmo2!Y1*bHBu%=-~X5sZoV~PVqocp0xY6?uV${NcOdMzR|n_;wt@P2n%BJJfw z-$HXbsRe%*M!ATju!Yy=x@a#=DY`lQjNrRxOSQZcVglJ8|?2%j7)7W+MfWe)$`B@O5e7b zPBn@FgQ(RhYm4>uYP10fjh!(}k%Ix&r1(E(ZE*29YtyCm*~I#A?=q}t_+X{s6@yP` zt18qd0wc_ZhChl^Di_|08BD{=brCoX0~`75rEbm7MFxj*aQFl^*dQ#7p}*ay0dt2! zw(>RZwn?P5Lev;b^iO8xf_e*^qE}`2PF$2KcZ^411n)g$xxbklRK~u&diyr9_vM8} zU5`6#oT%*)3EIXf!GsO9>!C5W`w2AfX1ZNc(!Pxt%xIarH+LTZH)?Tyt%dgO^^p^*W_44lww}|iiN?Bz@Y3rnyaYt6zzELQDXyLg56)TP zM_R!N#W*m6Hmq9Ih*%EARj;Vw(j(2xP;2ZyoEi36l*<(o*cB<*Ou_`qev;Uqusek< zu|K{;xkIT*^$g#M6IlmFaE2W$+9AyljPUgnFQ5F6%%r{aUFK-g;OW%Y*}ATQ!We3m zNBx*=MqNIsmUUN@v&>*Bu(3Y4ptV;DD!7;vI$c>kvy5W2^_6Lt8b-t7f}ojfg=`c) z6rZ%Vy>4Da^9$OZeV}w1>U3=L%_?sH&IoL(o5X<-ECcjy)j(U)LyR>CD+yC_pm zVmmw!vR%?odiJ*So>==yd)rJ!-lcb&>4}zy-Yc+IxlR~V+sUj-J~?l2qDz@)Jmw|E zO&l1?Snp|AgC2^N8SX!5%<-kAaIm#HDfUG+A5?)6#P_1O+Q$swVQV?|g>!Drh`v9# zcN({;=bBf?p9gUY2@zhdXSMEO=9vV+2RuSzEXY6fT?HgkVid*>QTkvA6FDm+8Ozfg zYIYDL(xjMpCPs(LYHUW>(N}OyDX+5#Kb)^r*dT&Nv@nA6B9O!#bn`OnI%Z|_4PE2| zXpv8adRpm)(wO<%sb>%EgX^q}i5>!d3fQdzBkZyn75(GnzGRy61x)o1p_md)u!Rwv zw^K*^>irgGaXlHgk@L1sY_vw4B^nX+1MScwaV(KR=m$A4!Y@oW_|;98z%M@PU!+?( zHqn6*+@VU=s8A)tqhBju{mNY*@Ku$d&8ol<=Ol>M=YdY#5|(bwdg*jbw!(*P6UI+< zncs1I>RrIKW$SR;Qmi4JLPCgL32y+QP-C{akcp8pivNu50na3blpPqsd^^=H*j`W` zDUeZ}QO!EA0B)_(nNVNvq3(|N5{|lBR+dUhuz3{zsO} z#Dab5Zlvo-j|h(jWt8&EVi>}=%_PX$ev+BH@VbF`hnVZz0_lwEWm|9b#%tt3*NU`?w7ShCNW*@TsG6XiEiGN+KTYjt;xPlQGCQ*1P-Qn{U1H&98jn%PDWa_xA7o`k5D})PJZW(QVmp z-27U@nsZgkJGbM1FCRFgJ*9qZ#@ceVhL>vynP3Rzthn~4*dKA8^Q2QochiaYe8V2s zz3`tcDeq4&b}yvAUNfC)4WJ;p@Sb5|11rnK`{=&<{Bt*)n)2?;{OL!J_w-XS@PC(c zJnfvL&iZH&4gj2T(vN=n_#R8*;O__EayDbv-S@uji38tEdE@WzaYOxvf5pK+FyP^# ziCs#Zl`veU;U*puGF!C6;dGIe+^!HN1L*TiTI?jNE$6ZQX zuR*FQwX<{w9#4``hJ)wkiS3lr~+TNWHP?y*l&-mmXj z-+KQMJL0U%g=h@awhD~p)6Wv;MTD=3z~c<>h)Ci)<0+8f&4h^> z7YBxXYMiTylkYsn>VDU+-hJSLjo(RmQwM)k+~NZ#dY^{Z*2oDFI`D!&gpbPBx@q2b z3#aTcyoEeF`z{?A;^gE>oy~!3aJn(mkx#G4;;2wI-I2|3Y9D%#39aXNnGTGlP^yDK zutKFN_^mjC(OOsu^m~&!lfVK;8lD2uGrQsVjHp|~%51|bASmDjk)LgD%%kU3DQ+qI zJxStp-Ahy}^Gw9xONgaYEj1QG2ep{EECu57`QW>7L>E8g=vcNsld!b)7lb2LNG&6^ zr~t&JsnKUo|Ar~YE!q}D=7#RT=o^rPX0qeGkk!{RuQGxN1qW93&$F3MwX&S7{Uk8T zA?tt$Sqe*?SYBJBDHwTel@iE`HdzU}WCg_H6S9pY8_es%tp{%&-1p8SuEjoK^V;i9 zdc96!4vK5D2?iZ(8WvutSM}u}R?Zy?-mX=KsU`;OyHD9L-+_O8`_L6R;lMo^6YDKHG*tsdx0YGhM&KP|VIgLMldNct+C{ zL_8GC6W*T(`(CUu$BLqSIVD7b7m=}^j1}=lO8;{FQz!DifMhyVixFbTh}9Y~2SIg9 zA5bD!0~hL|TQ~>Vx!PjDMfVbl^ z)Mk+Q9LX^e2};J6p*9tJ8~oT#CY)mKoR2HI$hP!#gWtUcz@8Q}Df20ER10%KSk zE#ewP>Gm^+&C*TH8IPtvY{WnUp~bblXgRBl<|P6z+FGLx?T0Y5LH$CU4vgUBm5b_P zDpK_25z)_Z`$izv`Cw1qUM(YyWGvZn1Ysgy#FhwIZA?~}s)Vg?^f%`H1XZa5BRKiE zx_SY0QI*h2SYsvu0FqR)Gn*XEuhq8zvJ%-N5rDRnAE7}XwWX^Te4K1Z_GnW|{A>>=LjRaf-; z-8&Of-u{`Ei@(2#7s^FD5CL5n!AVtC4W=2xs*A|&SRz%a0wXwekINa23^mw@e519o z97CMCJ1~Nic33Sh?>Tlans>pWt2X^&-=l$ZM>b1To(>FgE{0UpRg|Z;sWpmE3+P0a zz~!2mPQcIOXPy>TKSl!lRp2fD(wijGo%|%atq0%xlZn$NouD@al&uga8q^a%{=zBi zmmHl^4^agYBlPAb(V2QU*Hv6X7EU01)Hk=SD&4zNWsMq!z0`rR)$(}}uzJPd)C*)x zLSy;MXP*4-g-cFEQ~Z!skBUk*#+Zfd2{fph%|>7_l8SDHFj}~|-m72!;_c6mJ3&`V zPf?D5a;Y_JiRczZ*_*R$EU)!g4i@H^)(W-Ofnl|JQcBuUUSzZu>~vF10%rzmeM|o} z`;Bj;_5sexrdm~C1m`^B`I^D0hd(CX_0yZYKO8X(*W&!}jF+b$vvY`3Z#`$?{c+gj zU;XKegF+82VAG$9uUIeB-lYG__hUtei5Ul0Ac0*v517`!XaK%hclUC+DahNbD{horpKTV^c3b|DUi zLhb`V&0kCSzZ?AFWJQd1O)y6S_-2BiSPSq|jrN7ZlwG`$-E#o%55ztX!KmFKa&Vu3 z-IlZ9JbR)>8t`zvwQNu;)w}W#^*5OTDccM;QLIctpVHLrqk46QsdXnom;?^&ekqT~ zX5Po$6ail)K0{p`8r*DE>BPjN}uQJV{WvYiTm16O7}{w z+QPbdtgKdB1Ko4=ih6L$IaCibq3V$esIcb-tH`0mtmb&T?=@@lc{>kD*}8^KlI=*| z3vWF9?)iI<3dtS~vEYTlM!%uZfKx!YIV7TZvfgYnqVOSy_EXULx`n8RQq(&kiQ!ze z??u0=yRa_hef6#ncIx)(VW?5ii9(zXj3_)uulSYr*PsH5N$5SBHaGJhv`7#}-p?pN zE8B=ks3WGULem09`Vxdm7;P|GX*T}o=7R3ZL^x!8<5>@O@7{X>BGa3`_|Ad}}__j~Py*H1}{OnuE7SHUq4mH_-5;1MnCeftL+`W!?D2ioYULpl_MOOB062+Z2)h<7}qwXN@b z<=+!p%VBQqsVM~gsT?aGNg_y;;~TP!sMlpK= z^CH%u&r?W6YK_8pJD~!x7t1UIeLSxb&?`RT(7K{Zx&@m|00|Dxas)qs33LW8=!^`e zk*RtejiuHg5GK?DG>VEy!F&cT;)Yw*WAmR!K1|J}*TG{O z-rD%ATs}6SQB3$+xs<45189B`+KFpZ;~I4C z`)@hJHik8jWDXu5F=y7Jeoyaii|m2vX#TS+Pn-E$jQ3ZAhMGPkL6{Ytc;hAa-||=D ze&Nw)opkJ+lhOvqCS`FZ4On5I5L>KGk)8wwB&Prufi}N%F@t{HZzN2GuR@UxUe}HGH#ZwVw)+}F9(NVSQ(?yD&7Lc zjD_NJnmT8<_qJUPI);q*81ahIenjXMe;e>Wre9{^Ync1|qN#g-R@aI&HU>PzF#{UK z#0nELj(JXc7#j0%7u1F@gOR&-V3NNym0YZ^1tk&Vle+X16WW3C%f=EhA@2v&8?lws zT!c%$coHp0NL0S|kZ%IZ_c^J~;1P8ie9gNDlu;k|>{EC2xNo^;*(hATh=71QcuQ=&h+|(SF3_HvMG>SPC zm{VAG->uO9?MIbNK7qT}0yK(wIxu(Q%JprGW!D`>G=(UYTYyF}QM=|c@Q~u|6L$2b zZkmm@-cE>FYw)@%Dnt+bH6*Gzh1fME%(It~oeIrF={7}aTLowY)6OWGiBZN#`ZIZ{EzsbFM$15E&y_)Ez0ygA zWAc}g6@r}#{pIvKTn3-Cu!i)V`G`mj##32sP926%IR+6yK%;!yBcmp=ulBkWm#4mu zB53xqz8#AS{9wv;5lNDmxLWM~gl4)YMPYNNxmvmgxy|yody=^am;sGq9tq5ylbF&? zM7Lb=>Xyy>U}sk#N) zuNL~D{iusEpV0rwdh9J^c&MXxd7lsc^!PvNYx61S<10Z_6!iu&v*mM@0gZ~Xj5K2g za%=VUDhgwM=O;Z2&2M^tQVXe{hGizKflQ(?XZ6S4hx^~|IHqbCHLc&JwN z#niH0dnGIP@*

AuzBTx#A8XWS&P=?FfB#T4Orn`x;{USfda@3bY%klh!B|4{dbX zLY2$Q!Q~|8@?Oy6;g@-gI)3T#z3;@exNa&j8Cnr%8eKa5`BNa-IB9p8>;sk1Y6eQh zLnr%nv4|M}1Br+8tO8ws#f$lDd;1@BSuS<&t0adza-0>QQHAtC?f0Yy8Gah?cxZ&_ zS`4NboI<=og;nK>eIL@|;ZHS^kOIZp6v9d>rLNJ4VHI?KI+g5$6_v)fbYAjTh(=+j zQf=1l?#_}PrCZ}Y(+p2rbj0av43>ih=~&HqTt_)bSP84GBS}-?nfcJ+B6=gKynzkg zyT0caze&mUGsTI`(C31_s1Q9QwD|Yt#OIKihJbQ=Sgo1FJbNAj8pRw2%u|_X--tTZ zzJFO=>rUxt!NAL|nY_|aqj2lPy&hzY6n%Q$pbNeo+)1;LUgMfM>-2fYL$*HIBW<>@ zwB9(s zH#s&P?&a17+Pc;5R}S5&OWL$f79@5N?X~r;TROaVjLtfHUKoYeJIEb8P$ag5@#MJk z&RzprDjN%qM4OgmUaVc?_;7PeKqAH3#GUy)B-u{LHjAb8tR;L6PgX#bOgU^K5JkMW z_N282YeKT>A;2`ZBuTW9%L_!Yeqj`9+!gCJE@VzSbUuO5!;hHS?KDqzp%x$Kf4bcS zG3#QMDID4M@|e#y{cRwbdf;>d8s+&eV7>quH0rgOD=+phsQt zP#kwg*ILn4Q^Utr4#8dBR7Q?CK~m002KFEoW_X%}Y=`{)5+c76U6vg(2MepUQY9Cp!asvb{SDyb!fFMG5!RZ?T=8B& z#grE_C21QB6OS;iNRp`B@?xguB@s9{)mK%I^BW)aXR=GCO8x>R3Uhn?N22a@GL4QLeA zZ&VB07qwZRO<4#H#d{5wK1QRM^TBCTd+l-G5p>+v&vd4swSY%~-K@07*ioY<{M_K| zw1N{lbd2_TyA}hxy;Dxk=8a_Y3}~Q?Ltq7V`9ZT@hGt#PC#LE6;w+m`8p|h*Xseqp2aq?^KBS|%&-tl7qta7Z~ z2MU+aFuI_{1B)N|<;A%a9?%fm-(T>voguUkLaC^dLL)lltmc7@TsMj+6S) z;AH2rN-U@Geu(~PKhEatZeI(Jbuo3RQDqa#v69C34*COmkrjm){qhi4d5~yJwQ()A zYI7Yuvf73qDG#-ZNndg78qg@FUBGiaV-{djF$>Tr=6IC*8+s6*erT$;$O7WLgNr~D zzf2&YQOtqB9K@JDx5}Y1&1R=;V!J6>*HXqTKqHv-Sngc6tF^A5aci!v{|Dg}=v>sQ zY73vCBNd|DwMIPHPY&yque8Tj&R5Y_bxkj*9D|mTnV9J7ep<_TmaxNH3uIImee?Cb z?e==HU#@l>(172Y0QY-5Zl*_;4rEBKnTT3bM0(3=VF8U|ZpSO`{`YNNU!Q|1oS++0 zD-#-EevSrcd7RoRXowTCLp3;}czZUV?sgn~-NoQ38^q7$!ezo%zsoA7MayG4~xnwLMv2Waugw7 zsozv-rlN>FaaRZ3my)MWf?xkfC0vgZ_ID)=Gh;HtGec-6IaSQ?Of;77aL*Fxr|IlY z6xYgop8OZ(sDG4~9Ae2=S@TL=Ng)RPb7B!!vI~x%I%rNHzOq6s$;i3H%NKS=!9pXx zFkL|(Pk$&YyzCTR>TqHt3p1cWJp(f{m*8X?%nvFwRN#P~Hontd1l=(|ABFx5?Y9+sF65ex;5COoLU=VDNcyl23_bVxeuI z@_#dE6R;0Dgqi{Em`Ld`4n9$X zt`?+Qq|m`8t%NLmXv8jJZZU2QYDY3I&oLt_igQ!=AC;JGFxj{$O2VvtY`Yp;&mTg|UD#7~gr~(L z+P~Ap%DWDyh1cDdG~D%@O?0%rnSzmMk^MRk4Mf3AmhBnMFTew-2Y)@-DYrE0SV>N zW%r@mRJyZWp>BmjN~JC}&XiT7x%%~{Y$dCuxne*bh^0)(ODI;t*yzrc`;(#sB&u+t zY+!nEB_>7J#*K4!Zv#!dTV#e}G>UmUk(xVlV^V5{Yic85Za_tcm@yh)z5o{Mpu^qE z%4^0@`hE;MKT@XMF@lF$u)d&Iw@dQuEN*jF$=<-iL!()JA#yuP!@Z2An903&q@UPN zKyGswEtouqQ<2{ZI_^j`d+jj#BOrgBReu2510K#(#i9X0#~p^IC8OJUR6LYreGzh8 z=V$iWVP)ANpy4z&FFr5?Zf z%LJTA@A3tH8c4VAjsEu`E!wRDf`)uw@%tR7z}0&?$gSO zsMN{H!X$VVn}4>h!Oo$D4vd_l(5r}~;0ETZB)%>nl3mWgC#AX#T33TUjvvqi|0U4d zlMBwJpA!F%!)xFX?R3o(6ZhI@zqGz&Zvguk^f`Nb5uD&Rqmp|=Jr@#W7J1M*O%Tq8 zBzY#@W6erT$C?EmZjB@@`jXXO5+C_KD=0`+gF_5xik(K3m1D{>mAuW@|4>BLak>Uy z1!xr9Mz}8%kED0sd~#r(zTFnNgEEy;VHvx7aWu`&Q%v~?MC~8zim`H z_t&)Qd*RN;(tk>%_UtOsf;}>zz>grC{n00=`FCL>DT~jAj2N(a##NuSr85z6bZFNp z)GQxh**s=IqnOQLNH{%;F#ie0@rX|T!|Vf=yxKk;{c73tQy!jitY`dnf;Q)XzQ`;A zJsuidx((1rq|Ima=d7k8p|lPr%=u7PyftaeD4TkfOGGbqyYba(bn4;IvGyuPFQ3jo z$V;ucfYA%kC^{mNx~9X%4;$jKZKs4E`v`jNajl;j*mfc57yD3&bBhhakVdgl(dI$a zN4(Btm1AUgJkGq@>(@p{e@WI~K(F|1;ai-a@v?GgO{*N`rPe%@#FVd;Mlrh*W?eIE zDj809x4Hei9-JFfy(DaC!MYfzz0zdEoiuY!oMFLO)7BqU4TY0?*yi`DL2T) zkMxl1=J`}w=+&>cm+m%pY9MyXk{J}BQEYoY zQ>`_F%o_T~J|Yc2x=)`?{wYoTo^3G;(I_Sk?={sHGj@Kd^7+BnKV;^ec%)($qEXDj zz_h+FW!4h3eMFZ{|JR}`7M+%kX15>O_RXUv+a0>re`8g*8O@Hd0KMXS`ZzxGT%3*? zjQZ1n=yJlRPQ?&vX1FzVYP6L@OKYl!4Iy>=VuGJ(F|fAmGgjKcY2lGf*l-GqM0Ekt z8MXo}X&!nl<~=<~ow!KBC#5tn2*4f`RF1?b4P{OzJm5 zEvXQVV(x^o*{$Fq-imb5pU>SmKE3P#jbcK9=1F2U3sd`8IXp<6H(In=0{VC>4d@mB z1mM>*&ptBKurK8{%+{KJaBo?F2AI}@aY~sO$x$#uJamzZzGx3zfJQNo2j)^3YRbYf zCii}HI)}XEz?83)MlrEfF{{aBuA#r!hughPhvRb9G$u=^v|24hqsZ8FD(lg`bnO4> zxWtzpUvhn;FJZAR1}Q)TO!ysRClgw+28QAfc=&x&a{5oLxtVLK0FClF8hpCuYC{_d4m?@Q+)xtChg3*{EYVoTmUOB>YX#Z)m#GEGcgLEMA$^szN@66k3cCE=vs zcNmZ;^EXj}b&c%$OIkZzKNmWAhU!R%Gj8{E57IN{xru*#orgwY{|KGb5Exn74WP$E z&q#Jwg#BrY=^@Qwc`iftAlrik5A7B7+E8tfcIi^H5oI-{6;-rQf!CIMkI7An&YhGOZS4hU z0B*gi-R)FK4A4fJQODBFws7Gc`0c95Rw_w-M30LPw9y&}E^ev-He#G~txF zEe^Qz5>gV!(V0PLw|GPgpZfaR=9}mUM%fc$$^lbkVLAS1$mHxpkHw3wS$WBtgWf3hV{fE^3^sRBmHPY-oBEd}`a>}cKd@sG z@b^n(Kb@hrK z44M=eif{GMS!)hnab%eD5q>*JK%C`ZnBJ$C9>onpKjc`%k+uxkN*Nqkv$QM{bN9*m@fizT@rKr_&2Zk zq%obM+4;t|EB2oT%pg$KIE}4`4r_CPGHk%$;SNWo?fRzk=s&e>ba#4Td{AKPSAb=sVjRDhC{E!{e0mqvZ`bV$#xN+**zBTNQRzVs-waK!fpf8*%4yp3rD{C(txxA&w`68o zu2c5XX=U8Dt^a;q-=^d9p5;yhD_-of7Z*N%Plp3^?RHz6lDo(nS&e>>qsLiXe8p#H z-m-!;U6HIW8U94e*Uv1U(&PNJX`k0%Ww%wnYkuimDanq@aVK7AO@l0W=*gCwR^692 z3z?Us(9|+!9q`rRf3Ge}n}d_QXl2ab>mPl#R18KpIGr>T+q@cgnM!{5oO6$O^x=zg zoW!9d5)Nzk@Cj=0LA0t=W*fa{>ZqXT^5uUS@Xccr)6tiI>s#^qy8EbmxQ|<&t!zAW zy`D?LcTSr(lY$VL{kSmcnUXM%qMY#y9TB;XHHMTp=ed`ZmJH}Lh$h%lZu=yu!$#;h zh>rIF#?_H1l-7g=nHec78gbIS>t8*JE?L=)enm~(XJ*(oHF~BCJ-^IdlS)DbZDbOU zqV{l4#|@+JZBm;qkl&G3YJ&WZwiDso1o<6RqoM@)9VL;MFux-|cF`K^LxuDKFB6=RgtB@^#_yg68BlOzPxRyNBkkfH;cl<-IRcy@>ae zUf#1Sg7|`5FYmpxqVNml16>#HQ4%Dix|g{cz0*t-L=})H??yuJetQ4<^(UUC-L^+b z6htVl+xEPO-kq;mS0dfEou|b^WmN|#`$;@Xf?blxo$TY2pv()gD{aoSV(;lIAb~=v z3(|xt(P?kYJnVPE-Oaya=3x5MF5IMM;8uB+E)Y z=rMm>b=|EGl&8%rT+?1?)r+FMN9<({5khud*x)mn{9_6nS$<pV1y30@55q)BGagQ&)J88}q(Z=i|u8PEu3W*4eBGlYN%b13lf zh~{_cxN-3z$I&g-d#qnpH|liaGgve8-R(~dKDsw;4dCl2=(Myy04AOvIp@{+S0C4a z?#zjwmWJxfWKis#ppVb2%K+Iei0Wpm&!)&Qe)uVPIH{Ue}{uh;ou z)HyR(uHRi!(#>;;70>|F<`^pplh&+M4jbp!dHGzB{!U&rm0EyCvF*xtHy?@&N#bO1 z&V?Xd_Z~4pIxaw?n08U&1E5ct2cZu<+)~yq6bFx3d(B_B9HZ+$OeNxGo4bqS^TF?j z`q_hpP91icS23nWM$#2n_8+&juBd(xM0ktT?@nlHlaBb*b-qf-s?$zZEKahgclpQ> zglNH*ek!78n+A-tCpTI6^UB|3D?#bZ0=pNQtCvPDR>C(fH>Ip`McMe$A!Rj`ZH}$C z&@)ctMH*`%8rA;s(0EXza*va)u+C0=p<4ATeNjwbL#dbr$a2SM>VDf&QyZK~RuWI9 zSr_mk%G z=%g9nuiJ|p)fFf8S#a{>^?4!e|+jdF9B$!{WZLy8s)D>uslnX=Zz zCZz|i%&K2rKjC;RsBpQ)WLHaz$GM?>tdsISzK|Z)k33#t=J$lKcsQp{t0l#XWxVM} zt%|}gbTO419r^%IdRV=!V!J~>3eDWm&(HoVir%2$ruMzi+R^ZciS8+ILqFfAE4z}2 zmZ6_VAxL%#&ciV{i9dWkfaP>F(}pQ5OC^AD7mmd3mJ=jx@hB$W3tpcbSkdE#`60hJ`r zbiR(rR+mTy&KrXYEn6WZU*>tyYE*VzzRZ(o9SPsseC@8rRqQovosK73x2&`&O@mcF zefi>Ya+xS)`DLFdaCP+prxnDi&$icQM zExPIalb%~K`)pdhI;E>3p4hGB=X4X#X)C6j5GPGmP$AtEsV5wVC4@Q*4Ka z+p<8HO7h+X+5%u!pc>-gA+t%#lI0}~GE=VU`oZfvTv0iEoA7H^BuTV# Date: Mon, 28 Oct 2019 10:55:40 -0700 Subject: [PATCH 011/133] Get metadata flags test working --- .../grpcio_tests/tests/unit/_metadata_flags_test.py | 6 +++--- .../tests/unit/framework/common/__init__.py | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/python/grpcio_tests/tests/unit/_metadata_flags_test.py b/src/python/grpcio_tests/tests/unit/_metadata_flags_test.py index 47cb26d8693..16f861ed527 100644 --- a/src/python/grpcio_tests/tests/unit/_metadata_flags_test.py +++ b/src/python/grpcio_tests/tests/unit/_metadata_flags_test.py @@ -25,7 +25,7 @@ import grpc from tests.unit import test_common from tests.unit.framework.common import test_constants import tests.unit.framework.common -from tests.unit.framework.common import listening_socket +from tests.unit.framework.common import bound_socket _UNARY_UNARY = '/test/UnaryUnary' _UNARY_STREAM = '/test/UnaryStream' @@ -123,7 +123,7 @@ class _GenericHandler(grpc.GenericRpcHandler): def create_dummy_channel(): """Creating dummy channels is a workaround for retries""" # _, addr = get_free_loopback_tcp_port() - with listening_socket() as host, port: + with bound_socket() as (host, port): return grpc.insecure_channel('{}:{}'.format(host, port)) @@ -224,7 +224,7 @@ class MetadataFlagsTest(unittest.TestCase): # main thread. So, it need another method to store the # exceptions and raise them again in main thread. unhandled_exceptions = queue.Queue() - with listening_socket() as (host, port): + with bound_socket(listen=False) as (host, port): addr = '{}:{}'.format(host, port) wg = test_common.WaitGroup(len(_ALL_CALL_CASES)) diff --git a/src/python/grpcio_tests/tests/unit/framework/common/__init__.py b/src/python/grpcio_tests/tests/unit/framework/common/__init__.py index 21440430a28..a32ea98d229 100644 --- a/src/python/grpcio_tests/tests/unit/framework/common/__init__.py +++ b/src/python/grpcio_tests/tests/unit/framework/common/__init__.py @@ -16,7 +16,7 @@ import contextlib import socket -def get_socket(bind_address='localhost', sock_options=(socket.SO_REUSEPORT,)): +def get_socket(bind_address='localhost', listen=True, sock_options=(socket.SO_REUSEPORT,)): """Opens a listening socket on an arbitrary port. Useful for reserving a port for a system-under-test. @@ -38,7 +38,8 @@ def get_socket(bind_address='localhost', sock_options=(socket.SO_REUSEPORT,)): for sock_option in _sock_options: sock.setsockopt(socket.SOL_SOCKET, sock_option, 1) sock.bind((bind_address, 0)) - sock.listen(1) + if listen: + sock.listen(1) return bind_address, sock.getsockname()[1], sock except socket.error: continue @@ -46,9 +47,10 @@ def get_socket(bind_address='localhost', sock_options=(socket.SO_REUSEPORT,)): @contextlib.contextmanager -def listening_socket(bind_address='localhost', sock_options=(socket.SO_REUSEPORT,)): +def bound_socket(bind_address='localhost', listen=True, sock_options=(socket.SO_REUSEPORT,)): # TODO: Docstring. - host, port, sock = get_socket(bind_address=bind_address, sock_options=sock_options) + # TODO: Just yield address? + host, port, sock = get_socket(bind_address=bind_address, listen=listen, sock_options=sock_options) try: yield host, port finally: From 800e0bb17a504e69f0a5f67a96fd5a30dd2ddf10 Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Mon, 28 Oct 2019 11:00:56 -0700 Subject: [PATCH 012/133] Migrate compression test --- .../tests/unit/_metadata_flags_test.py | 1 - .../grpcio_tests/tests/unit/_tcp_proxy.py | 31 +++---------------- 2 files changed, 4 insertions(+), 28 deletions(-) diff --git a/src/python/grpcio_tests/tests/unit/_metadata_flags_test.py b/src/python/grpcio_tests/tests/unit/_metadata_flags_test.py index 16f861ed527..ff02560d11e 100644 --- a/src/python/grpcio_tests/tests/unit/_metadata_flags_test.py +++ b/src/python/grpcio_tests/tests/unit/_metadata_flags_test.py @@ -122,7 +122,6 @@ class _GenericHandler(grpc.GenericRpcHandler): def create_dummy_channel(): """Creating dummy channels is a workaround for retries""" - # _, addr = get_free_loopback_tcp_port() with bound_socket() as (host, port): return grpc.insecure_channel('{}:{}'.format(host, port)) diff --git a/src/python/grpcio_tests/tests/unit/_tcp_proxy.py b/src/python/grpcio_tests/tests/unit/_tcp_proxy.py index 5ad0bf8f028..84dc0e2d6cf 100644 --- a/src/python/grpcio_tests/tests/unit/_tcp_proxy.py +++ b/src/python/grpcio_tests/tests/unit/_tcp_proxy.py @@ -27,35 +27,12 @@ import select import socket import threading +from tests.unit.framework.common import get_socket + _TCP_PROXY_BUFFER_SIZE = 1024 _TCP_PROXY_TIMEOUT = datetime.timedelta(milliseconds=500) -def _create_socket_ipv6(bind_address): - listen_socket = socket.socket(socket.AF_INET6, socket.SOCK_STREAM) - listen_socket.bind((bind_address, 0, 0, 0)) - return listen_socket - - -def _create_socket_ipv4(bind_address): - listen_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - listen_socket.bind((bind_address, 0)) - return listen_socket - - -def _init_listen_socket(bind_address): - listen_socket = None - if socket.has_ipv6: - try: - listen_socket = _create_socket_ipv6(bind_address) - except socket.error: - listen_socket = _create_socket_ipv4(bind_address) - else: - listen_socket = _create_socket_ipv4(bind_address) - listen_socket.listen(1) - return listen_socket, listen_socket.getsockname()[1] - - def _init_proxy_socket(gateway_address, gateway_port): proxy_socket = socket.create_connection((gateway_address, gateway_port)) return proxy_socket @@ -87,8 +64,8 @@ class TcpProxy(object): self._thread = threading.Thread(target=self._run_proxy) def start(self): - self._listen_socket, self._port = _init_listen_socket( - self._bind_address) + _, self._port, self._listen_socket = get_socket( + bind_address=self._bind_address) self._proxy_socket = _init_proxy_socket(self._gateway_address, self._gateway_port) self._thread.start() From 09ac5fe57385046befc8dcbf4ba651450ef5814b Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Mon, 28 Oct 2019 11:15:57 -0700 Subject: [PATCH 013/133] Fix up reconnect test --- .../grpcio_tests/tests/unit/BUILD.bazel | 3 +- .../tests/unit/_reconnect_test.py | 78 +++++-------------- 2 files changed, 20 insertions(+), 61 deletions(-) diff --git a/src/python/grpcio_tests/tests/unit/BUILD.bazel b/src/python/grpcio_tests/tests/unit/BUILD.bazel index 5fb7c1f74d0..60a77dbd4a7 100644 --- a/src/python/grpcio_tests/tests/unit/BUILD.bazel +++ b/src/python/grpcio_tests/tests/unit/BUILD.bazel @@ -26,8 +26,7 @@ GRPCIO_TESTS_UNIT = [ "_metadata_flags_test.py", "_metadata_code_details_test.py", "_metadata_test.py", - # TODO: Issue 16336 - # "_reconnect_test.py", + "_reconnect_test.py", "_resource_exhausted_test.py", "_rpc_test.py", "_signal_handling_test.py", diff --git a/src/python/grpcio_tests/tests/unit/_reconnect_test.py b/src/python/grpcio_tests/tests/unit/_reconnect_test.py index d4ea126e2b5..3861dee0265 100644 --- a/src/python/grpcio_tests/tests/unit/_reconnect_test.py +++ b/src/python/grpcio_tests/tests/unit/_reconnect_test.py @@ -22,6 +22,7 @@ import grpc from grpc.framework.foundation import logging_pool from tests.unit.framework.common import test_constants +from tests.unit.framework.common import bound_socket _REQUEST = b'\x00\x00\x00' _RESPONSE = b'\x00\x00\x01' @@ -33,44 +34,6 @@ def _handle_unary_unary(unused_request, unused_servicer_context): return _RESPONSE -def _get_reuse_socket_option(): - try: - return socket.SO_REUSEPORT - except AttributeError: - # SO_REUSEPORT is unavailable on Windows, but SO_REUSEADDR - # allows forcibly re-binding to a port - return socket.SO_REUSEADDR - - -def _pick_and_bind_port(sock_opt): - # Reserve a port, when we restart the server we want - # to hold onto the port - port = 0 - for address_family in (socket.AF_INET6, socket.AF_INET): - try: - s = socket.socket(address_family, socket.SOCK_STREAM) - except socket.error: - continue # this address family is unavailable - s.setsockopt(socket.SOL_SOCKET, sock_opt, 1) - try: - s.bind(('localhost', port)) - # for socket.SOCK_STREAM sockets, it is necessary to call - # listen to get the desired behavior. - s.listen(1) - port = s.getsockname()[1] - except socket.error: - # port was not available on the current address family - # try again - port = 0 - break - finally: - s.close() - if s: - return port if port != 0 else _pick_and_bind_port(sock_opt) - else: - return None # no address family was available - - class ReconnectTest(unittest.TestCase): def test_reconnect(self): @@ -79,27 +42,24 @@ class ReconnectTest(unittest.TestCase): 'UnaryUnary': grpc.unary_unary_rpc_method_handler(_handle_unary_unary) }) - sock_opt = _get_reuse_socket_option() - port = _pick_and_bind_port(sock_opt) - self.assertIsNotNone(port) - - server = grpc.server(server_pool, (handler,)) - server.add_insecure_port('[::]:{}'.format(port)) - server.start() - channel = grpc.insecure_channel('localhost:%d' % port) - multi_callable = channel.unary_unary(_UNARY_UNARY) - self.assertEqual(_RESPONSE, multi_callable(_REQUEST)) - server.stop(None) - # By default, the channel connectivity is checked every 5s - # GRPC_CLIENT_CHANNEL_BACKUP_POLL_INTERVAL_MS can be set to change - # this. - time.sleep(5.1) - server = grpc.server(server_pool, (handler,)) - server.add_insecure_port('[::]:{}'.format(port)) - server.start() - self.assertEqual(_RESPONSE, multi_callable(_REQUEST)) - server.stop(None) - channel.close() + with bound_socket() as (_, port): + server = grpc.server(server_pool, (handler,)) + server.add_insecure_port('[::]:{}'.format(port)) + server.start() + channel = grpc.insecure_channel('localhost:%d' % port) + multi_callable = channel.unary_unary(_UNARY_UNARY) + self.assertEqual(_RESPONSE, multi_callable(_REQUEST)) + server.stop(None) + # By default, the channel connectivity is checked every 5s + # GRPC_CLIENT_CHANNEL_BACKUP_POLL_INTERVAL_MS can be set to change + # this. + time.sleep(5.1) + server = grpc.server(server_pool, (handler,)) + server.add_insecure_port('[::]:{}'.format(port)) + server.start() + self.assertEqual(_RESPONSE, multi_callable(_REQUEST)) + server.stop(None) + channel.close() if __name__ == '__main__': From bf7accb2dbee820c6902ab41c953ebe822706453 Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Mon, 28 Oct 2019 11:18:48 -0700 Subject: [PATCH 014/133] Remove unused code --- .../tests/unit/_metadata_flags_test.py | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/src/python/grpcio_tests/tests/unit/_metadata_flags_test.py b/src/python/grpcio_tests/tests/unit/_metadata_flags_test.py index ff02560d11e..59fb83708ce 100644 --- a/src/python/grpcio_tests/tests/unit/_metadata_flags_test.py +++ b/src/python/grpcio_tests/tests/unit/_metadata_flags_test.py @@ -95,31 +95,6 @@ class _GenericHandler(grpc.GenericRpcHandler): return None -# def _create_socket_ipv6(bind_address): -# listen_socket = socket.socket(socket.AF_INET6, socket.SOCK_STREAM) -# listen_socket.bind((bind_address, 0, 0, 0)) -# return listen_socket -# -# -# def _create_socket_ipv4(bind_address): -# listen_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) -# listen_socket.bind((bind_address, 0)) -# return listen_socket -# -# -# def get_free_loopback_tcp_port(): -# listen_socket = None -# if socket.has_ipv6: -# try: -# listen_socket = _create_socket_ipv6('') -# except socket.error: -# listen_socket = _create_socket_ipv4('') -# else: -# listen_socket = _create_socket_ipv4('') -# address_tuple = listen_socket.getsockname() -# return listen_socket, "localhost:%s" % (address_tuple[1]) - - def create_dummy_channel(): """Creating dummy channels is a workaround for retries""" with bound_socket() as (host, port): From 349d79cae92d7da4b9a5d9bfdd055eb5fb07c7d3 Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Mon, 28 Oct 2019 11:46:40 -0700 Subject: [PATCH 015/133] Integrate with asyncio tests --- .../grpcio_tests/tests_aio/unit/BUILD.bazel | 22 +++++++++++++++++++ .../grpcio_tests/tests_aio/unit/test_base.py | 16 +++----------- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/src/python/grpcio_tests/tests_aio/unit/BUILD.bazel b/src/python/grpcio_tests/tests_aio/unit/BUILD.bazel index c6d0a9f7728..877337eb582 100644 --- a/src/python/grpcio_tests/tests_aio/unit/BUILD.bazel +++ b/src/python/grpcio_tests/tests_aio/unit/BUILD.bazel @@ -19,8 +19,27 @@ package( GRPC_ASYNC_TESTS = [ "server_test.py", + "init_test.py", + "channel_test.py", ] +py_library( + name = "test_base", + srcs = ["test_base.py"], + srcs_version = "PY3", +) + +py_library( + name = "sync_server", + srcs = ["sync_server.py"], + deps = [ + "//src/proto/grpc/testing:empty_py_pb2", + "//src/proto/grpc/testing:py_messages_proto", + "//src/proto/grpc/testing:test_py_pb2_grpc", + ], + srcs_version = "PY3", +) + [ py_test( name=test_file_name[:-3], @@ -33,6 +52,9 @@ GRPC_ASYNC_TESTS = [ "//src/proto/grpc/testing:py_messages_proto", "//src/proto/grpc/testing:benchmark_service_py_pb2_grpc", "//src/proto/grpc/testing:benchmark_service_py_pb2", + "//src/python/grpcio_tests/tests/unit/framework/common", + ":test_base", + ":sync_server", "//external:six" ], imports=["../../",], diff --git a/src/python/grpcio_tests/tests_aio/unit/test_base.py b/src/python/grpcio_tests/tests_aio/unit/test_base.py index 0b325523e0f..22c79e0f825 100644 --- a/src/python/grpcio_tests/tests_aio/unit/test_base.py +++ b/src/python/grpcio_tests/tests_aio/unit/test_base.py @@ -22,21 +22,11 @@ import socket from grpc.experimental import aio from tests_aio.unit import sync_server - +from tests.unit.framework.common import get_socket def _get_free_loopback_tcp_port(): - if socket.has_ipv6: - tcp_socket = socket.socket(socket.AF_INET6) - host = "::1" - host_target = "[::1]" - else: - tcp_socket = socket.socket(socket.AF_INET) - host = "127.0.0.1" - host_target = host - tcp_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1) - tcp_socket.bind((host, 0)) - address_tuple = tcp_socket.getsockname() - return tcp_socket, "%s:%s" % (host_target, address_tuple[1]) + host, port, sock = get_socket(listen=False) + return sock, "{}:{}".format(host, port) class _Server: From a577c75cb1a28af2de074be1d65fc3d7319b1e54 Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Mon, 28 Oct 2019 11:48:57 -0700 Subject: [PATCH 016/133] Update docstrings --- .../tests/unit/framework/common/__init__.py | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/python/grpcio_tests/tests/unit/framework/common/__init__.py b/src/python/grpcio_tests/tests/unit/framework/common/__init__.py index a32ea98d229..70a66a7a864 100644 --- a/src/python/grpcio_tests/tests/unit/framework/common/__init__.py +++ b/src/python/grpcio_tests/tests/unit/framework/common/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015 gRPC authors. +# Copyright 2019 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. @@ -17,12 +17,13 @@ import socket def get_socket(bind_address='localhost', listen=True, sock_options=(socket.SO_REUSEPORT,)): - """Opens a listening socket on an arbitrary port. + """Opens a socket bound to an arbitrary port. Useful for reserving a port for a system-under-test. Args: bind_address: The host to which to bind. + listen: A boolean value indicating whether or not to listen on the socket. sock_options: A sequence of socket options to apply to the socket. Returns: @@ -48,8 +49,20 @@ def get_socket(bind_address='localhost', listen=True, sock_options=(socket.SO_RE @contextlib.contextmanager def bound_socket(bind_address='localhost', listen=True, sock_options=(socket.SO_REUSEPORT,)): - # TODO: Docstring. - # TODO: Just yield address? + """Opens a socket bound to an arbitrary port. + + Useful for reserving a port for a system-under-test. + + Args: + bind_address: The host to which to bind. + listen: A boolean value indicating whether or not to listen on the socket. + sock_options: A sequence of socket options to apply to the socket. + + Yields: + A tuple containing: + - the address to which the socket is bound + - the port to which the socket is bound + """ host, port, sock = get_socket(bind_address=bind_address, listen=listen, sock_options=sock_options) try: yield host, port From 89fba9789272a649b140a140d595a0ec4eda72c2 Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Mon, 28 Oct 2019 12:17:16 -0700 Subject: [PATCH 017/133] Yapf. Pylint --- .../tests/unit/_metadata_flags_test.py | 3 ++- .../tests/unit/framework/common/__init__.py | 14 ++++++++++---- .../grpcio_tests/tests_aio/unit/test_base.py | 1 + 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/python/grpcio_tests/tests/unit/_metadata_flags_test.py b/src/python/grpcio_tests/tests/unit/_metadata_flags_test.py index 59fb83708ce..c2d2aa7c2e3 100644 --- a/src/python/grpcio_tests/tests/unit/_metadata_flags_test.py +++ b/src/python/grpcio_tests/tests/unit/_metadata_flags_test.py @@ -229,7 +229,8 @@ class MetadataFlagsTest(unittest.TestCase): # Start the server after the connections are waiting wg.wait() server = test_common.test_server() - server.add_generic_rpc_handlers((_GenericHandler(weakref.proxy(self)),)) + server.add_generic_rpc_handlers((_GenericHandler( + weakref.proxy(self)),)) server.add_insecure_port(addr) server.start() diff --git a/src/python/grpcio_tests/tests/unit/framework/common/__init__.py b/src/python/grpcio_tests/tests/unit/framework/common/__init__.py index 70a66a7a864..79b6a603344 100644 --- a/src/python/grpcio_tests/tests/unit/framework/common/__init__.py +++ b/src/python/grpcio_tests/tests/unit/framework/common/__init__.py @@ -16,7 +16,9 @@ import contextlib import socket -def get_socket(bind_address='localhost', listen=True, sock_options=(socket.SO_REUSEPORT,)): +def get_socket(bind_address='localhost', + listen=True, + sock_options=(socket.SO_REUSEPORT,)): """Opens a socket bound to an arbitrary port. Useful for reserving a port for a system-under-test. @@ -44,11 +46,14 @@ def get_socket(bind_address='localhost', listen=True, sock_options=(socket.SO_RE return bind_address, sock.getsockname()[1], sock except socket.error: continue - raise RuntimeError("Failed to find to {} with sock_options {}".format(bind_address, sock_options)) + raise RuntimeError("Failed to bind to {} with sock_options {}".format( + bind_address, sock_options)) @contextlib.contextmanager -def bound_socket(bind_address='localhost', listen=True, sock_options=(socket.SO_REUSEPORT,)): +def bound_socket(bind_address='localhost', + listen=True, + sock_options=(socket.SO_REUSEPORT,)): """Opens a socket bound to an arbitrary port. Useful for reserving a port for a system-under-test. @@ -63,7 +68,8 @@ def bound_socket(bind_address='localhost', listen=True, sock_options=(socket.SO_ - the address to which the socket is bound - the port to which the socket is bound """ - host, port, sock = get_socket(bind_address=bind_address, listen=listen, sock_options=sock_options) + host, port, sock = get_socket( + bind_address=bind_address, listen=listen, sock_options=sock_options) try: yield host, port finally: diff --git a/src/python/grpcio_tests/tests_aio/unit/test_base.py b/src/python/grpcio_tests/tests_aio/unit/test_base.py index 22c79e0f825..a0078cd7d5c 100644 --- a/src/python/grpcio_tests/tests_aio/unit/test_base.py +++ b/src/python/grpcio_tests/tests_aio/unit/test_base.py @@ -24,6 +24,7 @@ from grpc.experimental import aio from tests_aio.unit import sync_server from tests.unit.framework.common import get_socket + def _get_free_loopback_tcp_port(): host, port, sock = get_socket(listen=False) return sock, "{}:{}".format(host, port) From 90ee052cb837c17c29b11ae83182958bebe0b1e1 Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Mon, 28 Oct 2019 12:45:03 -0700 Subject: [PATCH 018/133] Attempt to work on kokoro --- .../tests/stress/single_thread.cprof | Bin 122523 -> 0 bytes .../tests/unit/framework/common/__init__.py | 6 +++++- 2 files changed, 5 insertions(+), 1 deletion(-) delete mode 100644 src/python/grpcio_tests/tests/stress/single_thread.cprof diff --git a/src/python/grpcio_tests/tests/stress/single_thread.cprof b/src/python/grpcio_tests/tests/stress/single_thread.cprof deleted file mode 100644 index 3ae627d1c7b80c4b0b408adb7e9e285beb3b9656..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 122523 zcmd4437AyH)jp2G0K>kBD9YvnqB5u`qLOJ4L=g}K1UJ$)Gd-6pGt*;r4=_wzV@#qZ znrQMxvuWJo5=G;dsEKAVpG%auMLRL#ZfE<5OB9Uyf8VNG=ib|OyFoHOzkffEWij{E zIj2sYI(6#Q_Thx?TXs0B)D6EahfHh97FOmO$Bg$2*_QnHF}bEO;~R3#&Dn;6pKHz6 zEl`bFm2I5mHx%%3#p(EazJ5YY={G2?dLZ$>_K&-+djH`~^^)nlvHO;VliKrYQgf~$ z(>%$`<-F$Xq?Ngr>?E}!3*4*yNwc!6CwZ!^VPbo0Ms-Zg7gRRWGHG?Tb@ilXf5oJ> z4sg{vxo*m&Y-@W2y9@$P@~S%v38E zXJ%hvCL-@j?35ZLo)V?`nh`6IVXpOlh5hLdD+GT5^r;&Dr`1 zJxW?0gNX|N>7Qh7G!-jdg+FhporZcf_qwsb)e@G{U>0fcq(X3TtXz2R_MOI&}b&!%X?3K@7&i~Qj%e}ztnKo1-3O0BQ&us)37SzW%Jq``?-k+)*W<6 z-2rut+0_S3Z0mptp4jZSwy&MIcIuS$l!NQCo~I!vrC}vna;;R4nQXnDrb@7e8+w6% zCSFU+%N;j9zcM8mS}kqy)5hYbSD@6&mW*0OJckfZFQ`S6-wbQwzlA=m6R)(P)N$y} zvr>`)qT{+u4moy1{|z*%nhX}IwPN==Sl7vFquQEj$u<_++t?zSoeDg~>o`{G zm~U(LgK@V^(Mv6?;gPK2%_l!~{D7wJDao*gN!`$I%QQBsz;ONmMT^7JnnF6)Mvo=a z3=g5ulF6@vHJ?QMM-#s@a-bDw;e$UHBUW)}+HZr&D5RTIu7#S3ZjRzRvG}npZW?rh z9Sk_RVW$fBXk=SjZ<49BmPQMPbc0n4=w)RZ>^h>k_`Q1wpHl} zBwPASYxeWj$*)!{&c!&f2C6Ni3O>zkGAF}OU7tx{6ZS|+h9c2g^9PEgmSTnd&Ne{R zE`}cI#Cz()hyVD4lXgr=1|4-|H65<^uc8w61YeLXH1F4_rz#)`hRhvOk_i|nrSKK= zIIZk@1VOROS!^wf8HN4CD(ok;_zEBVA9L6rj-~|T8T{9r%QU9jTQSvLMZdfBBckXe ziobN5{L(`U{!=d*wE}-eyEhVqNg$QC?S$s-`nbfyZqeR`c~PRUOM4O9nZ)L3Gn<{} zMOP`_?7BpSVsR$IX3rPU?D;i*VPzsG{wNLwOuWX_Mb{nk3pBgU*om5gCE>)hIn%PD zF~d1#mi(Pd_BXA3^(%LM@JzjAz&$5-C4N=sAc5?3UV}Tm&4OQ$2yTQE8Nx02MTy{* zm@$p#Fk`SshI5PkTUD^XW~=%dwTlB+iS9#CRe$0R5GNDwk>CAu$GvO*T`w66etaUh z<1Sioj)E@s;eDPTF#GTC)O$7)fUALt;QPK*;4P>jA{a0%&g+y`o}8iUnTSG zdl+{(toH#}z*%V>^Bg)7hP%LzI+`HgAjpr#ZTZ6GgWs%|3`iZ{wPQN@;}DJx)QB)x z5FAn3d1d0-eF$&?K9r^-Dc1P;%nF+OYQ9P^jE56Rl+?e72#wv`p+=i6%#fPXddx*1 zVu(n67fB$oNYo=Wu65;oWaQQB!qyBMLO-eFiz

Y>?eY1h7SfE zSfoO^I3wW{$j?`{ZT@4ZtWLbutFGwxyLWa?Nv2b=pJUiavzsvSI=@u&e)mxy)JsNv z#ekef5GJCtl2I2L5JvTMXfN>DKeW#KhxO`W1G0i3Ok^4+8TB;{QsPWNU5zAYh=@Um z*FOwO`gy+*W0v3KS1|CV8?rBo^CTJiJzY0z$g3=dLzSls>pzEz7JHh1qh%S>Gl4y4 zl(CMs9%-&8pH8$gUir|SX~Lu=lRP=}zX+|?iTBa`eP%s4_VScuSnY3gSttK5qaZ6Y zt*u#Y#5h>FJ|_OCf6|lH!T2{6Hw=?_&%Sy3e*a#R@@xhMgs~8{8cDH7OGdlmVKn4B zb8ou)yBjY`c{VelyP`YeUyDXV2-nNDX4keU46oWq8cVtPd-pA$G#`$T&DcWMqmcTE z<|zWMj-R;4g^%=2c{UR?vyQ}?aP0Ndo4h|9F)ZcTjOx%>N?KWNMP4Srl0nV18}&Nf zs6lB6ud&%o8|agQ;c&8K=Ij-nqdKu=X@sI$3lLI1oi?6{neHI6jDO0Sg`#fi#I@L+ zwsuuu;!3=~koWU2VOeyWK#>!PmuQOAPbm}Q7xqg@hR)F}eDVLxJ~twm`kA?unFfY2 ziCu~2E~0T98i-b7$@T!2ex~Q9a}5Q?s7ni3?p~I2I;SmncTbe-ACz0kSs@FKX2JVd z(6k4|G?Rr?>&Zkq7;jnTesQCL)1~mxcFo^HJ zbqz`|@iugPZTXMZp@hw#z!(;IoYftGS!}kUy^u{etn{1X@oxa>U)TYS7ZFi*$BR%W zqX@K-v+fF0Z_w9M_hAGvGs{vV^PGFQ_8%r|L6@1V%!&qjCFheI{B3f23G+-`A7DcF zEz7!$bb3uTvkI{Zs5@9tI&je)Ee;mKfIZmIKM{FcRl)&4Wm|HqZTz!LTiWhH+cWY0 z=smIJ@`mRSdI&OBTS{v{209yJ2@qpPW33LveUsf zo3Q)+zq?{wbLym&XERXxC&}8?l>4q}?ftE2_pxx)N+XQuM0-O)uUu8pMa(ONe zg$fI-`X@Su27eiU@h6g0ufUk0NZ8GT65&P`6uAt4H1gYeWz=r~jPAcb%hbSFOM6Ks zt_NXAWOb&wJzGhQL*r_CVPqKUR6Rf^CN2l263zCuMp)ux>rfiUI`n2848B3Bpbk5w zI@O1|o)O78p;PE*U4mMb?>C9;+9(YqMMubH>hfY3-~s0Uzr+E;EhpN@Smr|=bd08Y z&qyw`6wanI)UWHpJ5BAa@Xd0~-0Yw=vN*uBdU_3(0WpJxwi@l)25k*j1y*3EO*2Me zyDETn^r*+FR2we_6B&Rd&a>3b{Fzy}p(G_yjfxC-w+P5Yk{{njzT zRz|&uzoMg%)f*M*U#VfN(Xs2NesA-$n0LSM#>4NPzxOEU?lJfXV#gAOiG(S<_s(08 ze|wLiDR4-)pv0IBJT!&%9_|f@tl^m8e9u%6obQ>6^A~n&%GfR=;E*G&jkwikSc@YLRvjbnGfoBoMN)F1Khtubg^icK702Ba}VK1Rp7)S_$? zN>(2=wKKAwo@k%2V2obCQP^A%$fyJ(ORHYM-oWz8h5gGkUc5E*q~w1f3%wfvp{;bj zov!C#iie3vLNe+aEt1k6_@6q6AW1GZb*3~MNw9;K1H9fr`xTV%naC=XWCC}v^b2C1 zLJ(&+f!c^~FkjlyIFukY4)e!399Ho-+|tl9^!Uq@|l#lb*(Cp#(Xvz`ostQeCHLM*V(d zbU6J|6W-)TKbX{p3^xeJ^-r{+l1mxaUfs6KA!ZEXTo5!nI!a@K zOD!bn0Bx9omgz#buuyO7`hndcEW<5p0lS;*BKf-&H%H{Lr^$G(<-=-Z!f)oveNx`; zd(GN>-p)hN{*M18i=D>63{2UMA9``lM#8vShHeq|g$7Y@uEwYgqGHhjKO*z8X4$}P zLtFN#qIL~AY%D{>Evq%}GzhFX1hK<(ho5b3H2rEtJDrq@F5IU^k{P8kvBMORT?=NK7TJT+siqmS zE$o6!f>~Y!CNA&&WXVUXO0&!$lWEfk8B63$5ux&CLcSI-a5`F6aUOt!G0@^F#p3LQ zaiA=V5=>Otqk>En@tCWi~6Gr=ZP{C9`?dR%dV~CxzASQ%xRcrN@8OyI-I2+q4f(&`l zhPj@+^rkU~3z-2URSLx!nIu}Vh5?+AlO-6c=PX!eCYw=)B17<~m;Q3dTXTPy@@%G4 z(GiKQO4v^VQ;B|4b9+A6t42v|3;iKK`ofI9wI`-Ln@ON=KM72nzH3ai1I~oTw4zZq z)`zaYX>`Y%*oqN2OysUZ(A=14x0I~&+sxMAI?3rz(l1JTl58tFU$9GhKuR*~n_4A~ z<5)cilYKAK&=DEub-4V|`wq*V$G^!pVR$9}`BZz{DAGgDv``K^=C67NFbykr2O5ys1quT=w7_r=}!h z4NGY*G)+${vB{j}(6y@+i_;(F_$h`yTBu=7BYW4m)MF;zcRyJ+^022Sq$Ja+KEmH) zZjmDrtLjs!>N`Q!VAAv)EKCL4?eqe_S>^9@|78m#a5&y-Gi;tQAm>lR6usD&-fKFqw`ax# zX2GRgoPkOeUX$?)ZN6@x(EOQbCpw1Buor6{PG{s}08ixTg9+(297v9_VM|ESI2$7? z$i1N%3j-8HsPM)Uc{iM7bgEw(saJuCQ>!F(4#RP&54-r-zxFuz_>^ZeLM)Vu{Uk8k zMy$xMX22{h0&;a}D3*wF zyJsu5;=7Ma*Qgt3yj)*%BR>xLxGGhs1r9>97Ga+@ z%^eBabgFNHUaa3cFmY0@TdM_@KSOcokGQptQV6XoDjTOY)@d9}E!X;mI+gV>c4qa^ z85(FunLE{&P3@{sM37}tf|Y@RYG_wHMl`9Zz0i)MrjyLkZ?=&p>Gh`Q_WkgSzMN`wMk#d zt}}?_M|g5z;`G98z);5qJKJLo7cV+0y%1M)z=w!VHcL&kB0oU2!ULi9WGFq5#rRyh z5lOK|V?-YzaD@_aX2v^un+}u*Cp#JC*1_&o5Q6_V48l6`*65R!3saKe=t2hkmoNtp zMwiGG`HrKWYJK;>1u4&Fpl(UqHf)qy?~1Gvq;^ycLKs8xr@@6(`ERq8oUu6IHXOxJJAxa7rPh+7vO?;Ujwq z%|~THZvtC=M#yt`n=aQ#daDi85^t1YqXOwo5LW zhclZ|%Mdw`>v)fB2OXNBIN&@77>NQbg=^bR!AdLz0^W9(9G}~=RCd$#W@N` z7!-#S@@W{FHSFVlxuqLZp3MkDZ<8S`d>M=}ek`mMit`hmJV{h*j5Beq4yS~Ua(1e7 z&`hyD<-kDkwY{Xhg9NRP#0sG<`X^(8y0aXw15&9{i5;EiFaK-n{6DEDU3N_?V(KvPHsGK%H%28%mH!2 z&H-oks>@LC(rIXpVh`eo>8Dd5&c&{d2(Vhft>q*ePNJLxX`SjiBkU?LaY|t%w~#B~ zu9`fytKuZCX>Zx9!=(c3fhuI8qf^8KJbCtCKliPtTT`CRBrH7HD)p9CgO#hnb`s;B%)ocU(_U#~5P%SyL2kAC~xH=mvI zY=*6>7am@Rl(DJC?u+5-VzAYvO6fQ!37#0@x^;mC zk_?AiI!OLpdgTx4hWA(Ee>!pJ66zlSh8Bj~^__?W>Ze_42PB64CsiZ0LJ! zb(dlJE=Y#0FzQOBQ#$a3PYYsvp`R61Y_RV`t`5=aym9i+l=MO z|21b+XBfR8Xa)E<^)bm(0d;fI6ap!oPU5eUxKXmm#U;|P{n)Spae`KWj}x!nB#j+d z6Z0F`B;hLkhT5yYSod-p;`-;@d-JkyoPmW59&ClctH8vmR_Luf!?&v!+c#@>ogWk^&z%2Nc#(c-RH#G+w=WG`|nn)N_p>P z9yor#d1ph+KQ`JN?)|g-tGvga*=z005r?D@A4s~a(S|2*V=4TMLXIxTO)y#d<@Db3#H$(pDcAxUP*;L&R@n9^-GY>#~T}VguWD^)d&YaKOGdYHs(e!fgT9 z`#F^leJ}}a7`MM0`K*SHgTI3=l%+K1e{THOQ}b7hNloa!WqcLxv^L{TMF(XVLp3+; z;JQP*;}9HH3*q5%U7QFi?;)X5ni|)lUk1k()EuY+EN-Zj_KT;Zhoi@AP0K2`TPSEb ze`v0h7z~_hDRnTaKRVAOym`Q0G^9>2T!tW~#V~Z*QxFrd8yP_UVHi1!BX|StEOU_Y zD4zA6m&>&+%r*NB2r)z^CN(;E7QMpd8bc^-RC5W#?x|px`JNO<(xRj7AX=A$1%dK* z2-#2Y@TzVgu7EIPvQ1u0i)vgMaTe0pSHmxRKAux;;G}~n-blS3gj}2E#3rlR z-+uh|`)?ja^&63Zt$AHbhFG)_c6gG=o}C@Ii+X0}i(6kT+aQ#*HdVg3j%jJDxdWc$ zqf6|eT%{7$wkTdDgVqTfP~zjZ4M09=)vcVoz7&9G0?Mg}sw8s>d#+2(HPpkdVJ?K) z#jcc$PT6hqAr{#dZZad-5J`s>6P5+jviWJ&RYhlkGi-j}tZt>%en zLmN6_H%071*nPx|*nL;1@$-Q6Cv(wYfS&H*G+;(Mu~5ix6RlCzJ#k6xEjKJpFW)<5 zk8*_$tWoPx(3*1#xBJ)Wk#ebNl`gn*JDoO0U*Aq%Iv`TLa2PT66ZZ$(DYfcnREHZh z%|=V{#r$3B_qcx6qLf`14(A?I&)@fu&a3uLdDg*1BPN|AG>$aYOZ%jOdWFhhEr+-2 zXOoBad-K?osx#b#jePbG&v<$IG0+!dVWCnt8jx^dL_lnJsGw5tZX2@Px>>I8Awx!Q zu_wk}M5G>q7}3n3gC#thFi!cQOm|irng5vmerZm9492^FJ=hB01BUd^v%9bDd#zrX zqt5ADmAG3?->n!xw(B zfhImZln!Szj6O_4bNG!&>~%rmRMCRT2A6Fo-P!@tB}QA+{*0N4y)}OPo|qo;1SncY zdmT)KiX86)cRH+APwsw;1k02wh_a3-MQuhMxUTi;{l=CF#tjsRU>NwxV9zgEoJxEL z5Fax7CmBemD=&=1c>`?>UqnTUwQ^DiA|Uw+Jj5lwN9D;mg2H@rgbg05S5lR z#D$3q&<%VGMFz2K1C~w(QSa`1ANKAz8{zz0UYa*=c*`l%JMEwp*03hn4=4#TAcW~D@7yC6-Z1UwGtl3IU`WV#nJ_ohySqt^Cl|THRrN9A4zYlF{gZAB?RXM@ zDHV_)%B$6bD>jHG!2^$8L=_I~&eEpq4mzfKLU+{%3Rv11bmBKFo{7Jh3zWrzn$jEV zZS#c=3t;sx%0I+t?51kcRxfhjjo~zM?#kNHp8--akqsx3Q7-}?y3|;rWfBfqc6vS` z`868Ii*M$btH;a`g1h^jDn-b$Pp7cdnp-+cOZcDLr!HE zRELT!(;S;Ysow%!>B~rBFBbVNK&BH}wvmjzkmYOSW)AzX_z^Y(rP4#u2f$JsVs7*Z z7G$XW*e31ogMvB>rx?6K@MW$I_U@@Hh&L_VHUCb{1 z+mNi%QEb4V8psnMfp*fqHWSfO$*9_`6MDvAsX_?y{W@!-K>|NB1b3vRMi>Y;&{Vl&!UbqXt3|n0OZ)x@yxe_VrSd=~QnUX;ou92+&mn`2dWf zS*n3JhSHT#5DqEF5>X>Hcfo-_HtF zz$sxZbUF7?XFAXl4shCEmzI}|+C8~~Q5kG~TP?WPCi_@&4}U+8drI;Rc#c6|c<9dq z4V`#qU*_mY*dg$OvE?&(G|vXQCE{(*goVb#l|{~IRX7PWjlI#HOTfT$oCfi4!~b*= z`p?#pwl?l|fD{LXH!+ywf>1ZT51olb)Ffle9*n9M2L+Z!l^G~*1c(2UX>H)t#s4w-lTLya?lbICH`i4e zKER+9?%8;9@aDSf>im>vGmt44rv1s#JzOoqWBuU+NzSFQk#1!RzKVi&SM7bkWbOiX z%!~!U6RK{(Lrrpwg$3tnGqoI2gyMxOVimC;+bhJr8%52;9TzS3H158z%!Gc5xNA0J zckxuSL&2f25X9keLU*+p@+tigNwJTgw;P*KvlA&dChmcH^?TF+AXN}sZ<6dQ8R z3P<`qXzR_XQ-BNy$ng?S!>V}*qVd#Rk;RyZIg||K#A5zesT{R%@y#=NC=|wRT&MYT z6ah%sksVP0uMRluN!>vk#KG}z{fn}p!CR<10eCoyIM`8H4c?QL#Z5k}EYAvJxg7Uj zfU|M~8PRH6_7IlEjv`&Qu#PwFq%$ghXNJS4GPA%^JHDu9D6QL^sQI=0dKmCq&8spn z1>pWPhAr_J&f0WSbH?Lwys(f{f3*k{01~Q=*m z)lCi2Sp4(QJ~|1OWDrR;OU!$w>>MS;;!OL&7l%-vEyUY0aYPbFA`tL-gp~6Xsk6Jm zmiYi*vH!FM*R5mSKYmNBkx^tgw}nPhuszdhEbQw52<0&tNzjENnqf=q$r6Z}U^k*J z5^mozJt1;bbV6`v#ct%RH~0!3j*IMbLACTRs_Rsc(ltnU)dM=6y#p(9KfT#FFwpKG zz(q9mfJY03lOm_e;AS9d=08Z;);6nlIjXe}jETcOF z%mgFQ`e?*mic~INMLHpY}2vj7bm}>u*ng_fJ`u=6G}`pNV(OK{v0tcjU2n z)hoz+3Xj58fF8w3B+4Xk-LY-p@Nb-U(-n8&HcvE@?x5G;b8tks#b3*p72swpV?ieJ zD6(YKx#$BivB;2bS0LluR&l`4AIc(}jy83wkI_6a)o@_q^r}QOaj^r%a?Ve2sNq5+ z-kq;r@Y4KyaNYbXkIfpq2$@bb(~vuwO2NdnAMRa}hNBJEJ4fW}ZiD4sVqxNXE-G#0 z_!2>w1Z@86ZpXKl5ayw4rr_RGX1o6`=%uNJ|wb zwm460Z^czCKs**K=p>MKL^*6Jh80bzye(Bt88#Y@L*LLc8u%v9)GIz&1lr-UIEv_B zSnqBIBy_r55OX(F=|Fr@mp}#yiaFh2sWOEPn$^4-(NkaCPG=`vvo!LK4CJ;%14wdM zMrYN-@;LIrBtdWM@n>KyA1fom#+pypJ=+jGh{5$reNZ%rorbCicJxo=jY?gH`uJlY zFg%{FuU-bjRdi|_j^5uGY?i;3NOw)+5^0|Y3etABe0nABqtIH|2yXNRwm}<~>>dAKv^O#^J0-VyL}>B#$&b~bpr2rJ<fl<0~DM;Id0 z2!j&cWXRBGHchLk&BZdz+zj24jWs6BwGy~0r%9IWw+H1g% z*ec0%x&~d>1c~&b;Ko_C2QcVFN=s&&<%`SPw9gUR3{$&Ej7gq|ssa3&;vjSE=tBUP5!>66(-|B0&M!JY+L*Ay!!|=0&5~vO9fDr-_VM35Vbu zm^j5M{eCr$OR?XFl9WzrGjfk<6__|ZS1;4JC#@CsGhfFH35KmJTWM^jQ;mZLVUVZ- z6DN4Ev!fx6Amo~KdQ7fq3~x#dZfFe7{WTukG?gd*{O*Y4>cp!(?#wYAZ{kde&2Xl2 zBU;vf0`v7CXcUQq`it8yX}`f%pa_H1epR{z=b5HFWIjFTF7M^$G$g;Im2* z*NQmmXm8kl7R1!8U_#DrNT$*wFj1NP2F1Zk4du+l+jq(v?Y|j&L`pJowQ%(w7ev)D zHlUAcQ4K>|YlF42fhfTqJ20fDwPXkKq#d)G$T`X(7wjE2;`j~Vy!7f+rps=Ea6B*MX+ zPHnY9LWG6X9aNMkk$2}`+4HE$@1(plzJB=Ow{8FtdsZ`K#DNiv-Nir63iSr8hqKjc#nzKt*@VKY8`=%?boYhzf3E7P(Ag zGcqx$ee$oLe(qr0^*VCty|3>%;m?o~pV^4vbYKMMYn0OXGTqYRTC7?7 ztb{fkdJmo6CQ7J{{)zogXdVYfYRH4e>^-_VpQ$4Jkd#IQls;SWh2wSftoes;`VWpN zeGvigX-B_y-{lu3b(j-&{?hWDK6g&at6%=&?az<<5~nBHSU*MXhw4q=yl66w>k4qn zH`B;_M?$-O(AUNdZ#WHo^7Cii@W{pYWc74K%Bu&7RqTZF$ITJL*fe|X<1yNC(ojv~fqyEr6 z2j}OEhYuLPGSY$9qXP%aQW42G@PhwE)?#paCa#IZ%{{b0i+K}I7n-1tNMQ`0$sh%+ zPq${gEKZ+-RPc`$ob!sAjS;8s^v%criiWhAPW5v(UbM08CxMYF@i7S3<_&)JklX%x z%j%RjarK9{9JF{H8k@HO#Be$=f^!`0;;tg5;ONY1ztB-hT(S9rGyIqakH83}>qu!( zI@9h^Ec%%dY<7%^=a$2!A8_;~xJF^@qr>mK^qg~(s^Y*1flx!D8uj?zC;VytCd6k8 z8|VkTpofJ17-s#kbVLVXfdH@X@>xjJjxo78g@qW$6LnvC$Md)R{hYsD*a1)bh#OA2 z>cwxM0?x4DzzEL28VR+xV#$NMb5>+^v^i>Q-kI9(joU8$YRa=28Q?ata8I0l)(^-< zy2wu7$PCLho|W=!#@e19n8&K|+Bb=SKeh4hyEokr+hH@p9x15D%B%e5fsam}^yM>C z-XBI^*`a>FQ7^=3+w>9PP3R?p-+>qWTL}LU`H8mQ`Nv$a`zcRiqpr;)h}3=(7{M9x z5XJe*jYp68^K(rpuhYBpggLK)XSbOg7{M9JEsFE(o#%ez3wxiI@&-4b`pKR@Q;Bcq8w*MJ>0PY~VJuzl=KnoG;WKrTYW~ zANZ@&wE2k4ksWyA*WvV=Pzsx0`Q{_9IEhccjV;(%FE1KVSxqt0s<4YP0xx8AxNS1U z8SM;rXCFN2*l*`k-c3*K{KpUGU65oh^zQD#XzDjkzO!4)%^fM%;2zld!s_CPOv-CL zw&N$~|5NGFRkO+P4Hh)?sdbFZEmTaI9Nm8Upf^@edM4%B3@1mr7 zaCcoq{ms$3!&AW-yTj=Tuuv(@LVd9 z{Y#HrGv|9Jq`dZ#H%)lt@KYfg#{+O+1m{ygr=B)ALmtjL^u;@7{^zZf*Rgxgcb0wS zU%>e&h@*N{U<4;O=b9#uYNFYIfz#yn$YH1YeYy5IFvR&+D4zcQGO+GY^GU!MAG5cff1Yx_hQyehH>Y0j9F(&n82(9V-cIz zn}=z{fh3mj0URDViBWN?n?S{ZAr&2f+MD9;lMXz>c65h`jWER!fw!58s3S0fdT^q4 z$XwPg#3xAGfdS4f-|Dh6kMRe$J=KQCv+(BjL5I{GP}i7U9Xz}}5!2}QwG-D)osz~I zKv~b5M94{H2dYbZqn5>C!PX(`H|E;(17gv!>LDuKuxl;WkN|e}$&G%!h!`=*=NiY@mlfZ-opc8JlwmKlI83_&N zz_8)2`2R`6nTE!*-bP^Y1D&qgM?#4eYZ`%JO|9KY6x!DaBhL~#K86EB!@=2s*)iyZwGZBZ z_VQK#hhWO6-#oF?;kR)D<=}K+1n1SXcD3n63ujiEyhb`<#qlWuBbXl}%a0?03wZC% z@XDBYhvx^@zI4&x>E3{UkGtTtJ9kCs`T@f9s0Krvj9N$DiHjN(@gD5`1qlYlfg#Rt zh#nH$GqV(~WK#$35nq`Uu8!=>N)Ux15rGjB-=!$@GF0^Xbz{v%bPv|k*B<~-eZ`<% zWU9Dq^`O2^FRVh}^o+&F9k^h{>F5nz<7WI5BKP}onuTCtaQDM3#I-zJt=GlQ5=lj_ zVu`kHjlJIInR^~D-SM5ZN&ce)L(x-|3IU65>Kr5x$+^rkk%P%{ES;k7i7);c=nrK_ z6RQ*xGUpNXIY?q;3|qL_!CqU_sThQZ%?xomFoN@oi8#%~68A3JP1^}L9T>rRej-kz ziIG`k0!{};a5h%QX$o$tuZGjY2+l7h;*=g{;S+E=FoJXW4qKggOJ~IEY?Tf-M_?@K z5)b1R2hGeX+<)!!;{T(R%Bff{1cd%Y{01iy=)hP45sMJDAZ2y!hOU7C74<8$8V-!$ zY=At}>(s|+cQc}mR5HQRIWU6LJoB=!UExyU3bVDa?VS1>ULUa&qD|VuX^VI^dEJe5 zi}EUUGYXH_THM7w2S#{36jfIv%W)d^HrP#aFC^h~U<4M?UW)kb2+(S63pmfQH`o>gcg0CJ*|iO9ATKqtY0!JV?fGxK0_I;#@Pn+ZzmT+ z(|(&d3#D=`d`A>#ionKQB*7%uc^Gj?I@PI$#wCPd5}=NBc*U1Mz-hR3S^@?(BW&<$ z8+9kp#K;=?#>S`$WFaAYAB0ObvFqwKIG42_ke;(J&|uya7_$skULv>z%izFBt;RtB z+lB_SFuGB;TT$0(DaC2(1beUs z*UKl=DI%|mb&9}9op{vMoGFd&o3lz4G#E!l#|k(wf^#l$&M{ie^WTbzI9%T9Raf-; z-8;JiXV9m0D2_=$4h?H{*ClI2xvAbeaQRoB9i7=l$Ii8!vLt(tAFY#N&lS_J(MRvvaj7M-;Uyi{vf;D=gMx0W6pYXZYlOs$;(%7GEQ;i2Igy-DBf)VKRB z1G()8aaAw^V&8D2-DxGGRyc=ej|#$5*V5_6B0#6r|w*?HFHTS~s zixfoPISW@GoYcpxkqa!-`$-;v10%Q>!2>JyC+<0XTcQc~o5e&eC2b}_+wCWb1q$}? zz;#sHji})Z9COW%gK=*&hQj@jXrf_4m25=iJtTXPG?YeU_51X|f2ID;czRbT|?K2-Xk3r~s3 z)X|v)nL03nH#}-z6FGQgrO9WYQB_JAt5^p({rtQQ?{WazPSw@ z@y*ar`+&IF5vL?~L}!>x5SRlaoQIbUM3vB9z2rT3yZ2=F^n%#sH6?1T zLS1u;3aJGw%KkZ}a{r9DZwb{f{WAh1xXG6KxV(Rgsoy`-a`E>!p&D-gbYLt_bAZ8F z1~j?{_rPouo(r5#+}wd7&VONmE6qUHDGpf17v_^APx!8Xp3Nk%Y(EK%MXwgpL#h1? zFqggyqQ$}0qh=0YpN99+9i%XHv0S|VS=8bUU5oT=Jn9JTEvQ`ce4Z1I86X)1Y$l-= z_LKNY(gIsq%`}7m&Xtws8S5bIto^BXpfvj6VsU5e-SpSm@TJ@%9%EhXqT!F;qB9;j zFl3!%d>(lV$SlG>M6OdOw}GIrnQCM#jF8ztGQ)LkbU&y}$J9c+Dm-B9R>y%6I=8Ve za6dAn_E{;FmfQc5&`vW}U~h4zp)hl$-`u#2k9y+NV$@l1bf#i$%H~s=$N=s*97LCQ zD+D6eu_A#8jEGBb+a0tx)3h}L5$-Ayh`uU~FZoZV}mB@AY|R#ij%P(V5iE4bBJ*alXfHu1)N4Hu2W<)%Gd5;wpi6 z2gcIz^$j$;=)M;cVlUKNX<|C-2q1xw10#gS>Yh$pvNbx}J#uKlCEHxX7Y=&19Qx3q z^M5$9a$`hb$h%&{VeG0nOgBcbVw7xhO|RZ)Cubj3wowrnOT`~d(=kLArIO99Bj9aq z1ikKcl`(^M;8?7$uS+Jh-4;p{+Kc@g8<7HWEzUPrqp}@V{e55#UVIe7%`F$#zG~W8Fv*MYJ8 z`d6~o)-KMrWZG8d@N{t0;ENHmFNed_0Oo=78vCxFMqXWa%{101`+h~h@j_0FFN42ySI%3+r-Rx@Azar{d zje2%FZmp@(Z?;{nHD(3|iZvQ@46CUo0^vp!iNQ$+#)_i!DzWxosQese(j6{#(01W&djOYGL>m-D+_Rl za@kA*Zu?34u*F^C5Tqu9eJFLfz-%9a^k&~Va`Bq%p*j#PK`~W}IR{pU!h0kHzkLx7 ztjpwD4Kd*1WfrD}8^TR!0GH{X8deT2*iGi$di8IJ1q|?bgifSha!o%l>Pd#)3^Agd zU&Fvgdrs=ZdI1Nd+TDPctFtJ_1_3{e4Di~}w_w*#*Qr(3N? zSHx~j7Qki9SK|$M*fbU@=#!hsyB=I<`c+*rcF|N_Rk5+^z;bYCkNySNLvXFQ2O042 z4Kry;vy}5my?uHzVZ)hS00zI>DjW=C>JWpmyy3AfVCI?K@je;qh2{w5D-y7SIWUfd z#+RM|>&2dnvkGHttO2Ej$-F?B=@K8Ygtj7KSfYoyCWc`onLWun61JaJF!TmLqEh#s zJihLC`z=f|^bQPgR((>m!7gWa{V9aVmginGls5-AA;$(otMH-@3AV_Ap^PH?kZ0mN zElvk7#briajhjm}=Dn~OX39)BVg&m z*ck5mwGNCZY76w(Zt|&U0qMt{VES1V7>l!{H?95D3^E}+2ZppQ%pw<@-2htbk;hFmF|{!=lu>~) zagaJNg7hZVv1We9(WqLN%=@&(rR3CXR?WTs596)XVxDdTWUvQ_w*E9$;6qf-xzo7x=D!BEbYB z<-l0<`V}Z_*bNrT!oe#_!6-*$2VMdN2gXwHheIoh!yO92gUeAmPM=7im4u?YCQG0wtV~u1Wv+E{-IPi85$@)kx3w`6w!=)LKdd}PMqpTr z9+cBKR1g=dh&K_ugyCvVq~Q|8l&It+P--QCp0nEvaD)6 zCB)h@ops{Vj*2CqbzlVTi9|afy)Z-P7Q0dB`eiPV2-42y63{y^g1$iXwSqm?jE)i~ zV0K^xbH6@hTrV48n$phekK&UFXCO{M@4yK9uM>UkV&7}cI6YLVYcmO$?I-caEM~O@ zZR{S_G5w=&%IkB~&wsf1(p*vxbzq3ICymMLz*+2jT&^*@6t6|`{jq2#G(wCxZwdT5 zFc!Dp2kusJAaU!!7q4t73r{&pn}FYevG`Rln%fHF1vcx38*81&y^(PQhB#}9u7>V> z-#NjvpXDo|4lmovFLC=?mX#Ad>_^Z-?E`OedRespOW^cHQmgFDyt>3gOdAGhC-Gkgc*%NFtooZKu zmH`wUN)ZoNGHRp&2?I%vMyfFeB)r_&X-H-GFD)mbm1M?X*g zct&oURkJX}8HRTH;f6!()@#?-EyVhU5iFJ^Z6=}9*-ru!M_xMvkFNSF+7mAv z+zy8+WV^PDhma66V`z)pvJDBc*p4$=A>O`RO-{mX^;QO+1UWk}l=D}hVx`NVz{TFP z{Z@0yR@7QpMGLwVV@?(3GLezSBK8?zE)JcIlU*}#rFd}nud}Dd>Cg!@92lW-3TX@w z8eKSlq-@ONh?P6d`9FK{u`|`Is-4EdkmWI`h&l~PabUQR*M*ZYjejhO?13bvf6|oJ z+9inDff1hfB+k8(amv_NMLi-g7H5f9f#4FahURRhwSB8|=W$$v zE-{wTFMs~72VVT)IJX=+3 zZu;i6x6ufxQ%b0?lv>LciAvb6eR)GSt=g;hSHr;h>he}|U zZ@}Jy_5v=ZPb@ClYxnXByI-KqIn!uwNKOJuW9!$y`pfA!4|8L%uyYvU^=^Y6k=+Ik zyx>2J@Mo9fm+L7FV>|7=9TF5kBcdFbD#RyrMqX(Q^s z8Y{dc>~)HDzwO42o?=#Nwz$tErStjby29GRLAe#D^DbDeluQCQ86$~`%=ztCk>)oGy zZz*sVdmVZ5L9_kDwWIAY78-A|JdLl7C6`GrZCU@9ALCkJ*H}0(t*b=*OSxZk&EH9Efg^Y-y}@bMR8yR=MzNyWHL^4 z2iZyN^5Ei+zzhCwP>p*o!fI_U?g2Ork{}8P#-jDV2bI94(2hJDiv;ANMmCdx+=^;5sM`PqIc?@Md<`uq=`$R=ro14D+NWV2n(myYhDsH`aT& z>0tD|kM0SaDbx&YR|Q6Ja?ib*LHHVTGdXv&%kAL7i@cl^a4!^a^0Q7{7{R%LFizcV zJTH*dX-Rc=V1RSWqAt7ObA^wG1-7~|1}YdnPUg5~rpY5Pto9H}aepM{xKgXRFqDQj z*3BGUOi(EY#^U!+MGq_X!SS2`eGIj*Witt=?WdpxHt0hxWZl1>sC&=z(G}n(CLoSj z=!%FVFv9b}l*s^dxUCBM^)|w~?HevM-zB0S9Ev1q`>Uz-_EPwS6#Aan(%kjjR|p9i z*8?vB>@)L(dDs2$oTPr@z);{fpb`C{Y{{W%W6zGms@&r28SUBDvP)tdO{mzYP;?6{ zG$v9eJEfOkH8H2~dJ_jzZp!N_&CwM(kwk{YiF9f6YAQR@A>V0n8zz9+##n`7oj}|{ zn@NzD{UnoTk=M6LWQbs&)xG8hJb2cE{ZlMy*LwB?pFV z)59+v3NwyFhFy2lq@FkEZEgJ*Lo=y1F81w~gT_9Kq8`MMIUagQCV*P$->06zX##qy zUoC?LF6;jtX1%AemVR_sW7hr?4j*{1@2bPazTG0<34OHmII3OTF+DTZVYXWo8s)o0 zInZtuTa;~VZ|Ex9Li`mBuk};C?nnOZ<;P~7k@o4tG8Po z8n;%B{u(!;zFpXW8v7a!83RvfZ6oiA`2RcZzfZ~3;5oRm?QQ=R))J4`Ra~2vfa0hF z*R@`~-+^e#xu|7qKI6dHrYzk{hI^&;j_o98XghofE$B%!PPMoQLqAB`g_!-5*o3{) zM*HH3ondKPhc2@07s+xTu&kA%tP_d^Z6*P={UrC2St(Z-vg|$~Z{(6!4u5#qvZPMv zz!2wu&}gL_s1&u+80=hYp5W&F^NNWK%aZ9-9|9aYQ3XaYUk6Zi8>9gj!>550LOu=*adJS@uLA@Zh5Ko?AQR7ABDZVG`^wXE?*94r7=$+$ zg;#?SoL?p4bCBSs{nLn(NpO&AP%3h_Lx8gijNoMW-Qvs;ClgsS@fJLK?FCc1@xF)v zXB8O1soz}+_*_ApOak{6e5&Io?s4HG5u8*=EZ6>Mpeyz^)2=xSx(>0q)z$GcO((}=>vs=cuzK<} z>7-8Uz>wLUS@)gMO2vNMHIF3*cW^@k=-;RI*EDi2I>44M!%LoJ*6Y8+t9_~==^1%h z98Msy-Hw%JojZ^)1DfqCT+L*cpu3t%sTp#>gmFf5^JhonLedzRp3!hdJLW!S%WQnR z<$on9{}5=9T5625jvF%xZ1Q&OlcDteU33?!vMRV8{arV!UR-gykcoWZu7Q0ftnYSx zziCNb$bn%O`aA2+#e?FoS-IBijMm2Eas}opi#al+Mi?wyEDq z3PU5ft8}S|(p7BF2#jq{y-UCiIGf=S>zlXsyQ%+ivo1;MQVtApvg@0pE;U_vp^L^k zn9}Is+~tDy)xS?Y#%ZL#LRoXJJG#DSs#co{>|iabe>W-?n*%v8w)&;#h;u@D7cpGI zw%SYrPWwq<1ZRmj_v=!e6;3(H`qvI$xo_RDT@&w^b706Px2vlo+5R&rs~WupS|@=Y zxzWZ$H`T|_NcKWW$d+5CE5HkW{qTV^0ti2UTJZ1(2XuBMsjCA+oO@HOT$d^K3%Xes zI#C+A*4hC_wl_6p)skFpG4Ak6dID-YOoT>%EGuwlm+6JZIUns%96F;N$8=f?d@={y z_`6yx&ysI;l&zS{8>5F~>#0}nx@Sao(xyB`rpA}!H+>d&Bic+tAGDtYMsTjDg6m5X zqPAkYhbJxTpAo0CrVPIIPwW6T@|V}$fw6p+UdE^5fZ)DREb#CKzyvWzM)w3UI9`H9 z?{j%J9w-Pqt`QzKXxWS~UIj)l4+7?5Uv4Ar(%qsIv_G7<`z>zEtg(Z2f=D8oR8b@m z7-5_T4~m1yxH(+h_3UdeRf{I6K^BfCqeXB|#_U&Jy3JGJ(8mFoILh;T?GzYu+v8otS&3&(rT8nd$0Vq3WH1u4dY_y=Rf0Z}6rUHBwV8yj zVm}2V(j$7~248Y2{T_lxcv5fi3oiJbgX;!kozdYxfr10W3Xp=&vt!u7p^@7=gu4*^ zGNSK?OCXx7Add`J6?u=q2=5mXdHWl{tjNqI`oS!SlX)eVbn(`id zX0Np~N9+w5I5-^`!O5wNJDay##l21c9@FEsx!*~Ws{;d^TP7r2LeP+FZD>~tQ-f`I zuG!Q+qF)IMG7bzWA6T7olfJznALAf7IB5DmJkm!`|M?Hz`uU|vb$4JW&z;%sHRuKE zit;vsko7O(o;z*izzEJgfVendW(FIJnz3`H3ujhfHrUHPZrX}=zqv5cZykfn1y<%7 z$D~(g@++JD6?Hthf_?4jmc~Q4r#+1Mns$iU^I$V%6&ThkBs+fVWb-RC2gd0-7Fsr8 zhIAd6INb@`ME9VB4vtfHG%ta&1G8O}51I1+i1OsA|F7zN$bkoSd7T$b3$%HBp`$H3 zeoU@u%y>_=HPodW^c6LA4ITQQi?R(_tUB_Ro%Z~K)|t&d%+&&1?x|xLD7S(yap%FG z{}wv8PCVll&P++BQ$30fh3C(!z{IuT)Q~@w@wp)+4Tdv~c$mA3ncc7<_0VrGJUr#u zOaim^lfcB84TZ_;6uOu{`^Z-K+LkL!2PV$nA`xaIWau~NyO_mi|9bPyJKi-l<=ISv z2<<06KHuCoNj3=9(ee(|~&t?*M zv!4Ve&f7xaZJUHPrxhvY!Md&ef-p*{5vL*T+9wKk||}DbHpSxU-)G zCeGbVky$?LsjP={*^Oyj9N1jB56@hg!3hikBn`lWFaF}(-+k}7l=sWG$9(Rn0e?h0 zu7|H28-N{{I8TQOPYv8uzrCE)9e&d354`kJ$~*b_rw5!pe7HZMlY(@e1#D=HtD39Nv)fY=(!wZ{(~mJewGGS1p*p#~GMZk%2~R zrHA{PH8%uf%Fi{VI4|Z=)EOzyX1JzHUi`I?gSxj|7#2+6*lq(#;r_8ahC=N@<}wjGXV3UhJ=>6Sol8R3aXX<@&PC zk0v4z30NmY=o}a!a+(pVRx@r$itpt^CG>B*RLnn;6&P7T^yxNS`W`=1>BKfF)+Ex< zwkCdaRcd-d6pJtYcXd05)J9jTo8n2me0-JrzoU02>5ZvOFW-ij0J>6~kC5P=6$$26 zA;9u97{X*3HaI?&L{N<5eYz6#;L>a zcn+I5!=7w>dR#&DwI>@tnbx0o1O$9mfe}6#c~?ykKn$nc=3>_w5^y>&f^#Z6cP&Fc z4b7Q6yLQNlbDARovjZcTCzD%lO^@L;3l_MC^NieCzn=BQgCT)_tWnh7IWQKd`V|D~ zE*3od_{n{a`EYc~JLaLq|NE_Vvw_n&$nC%o=U6uURZN2YEc#{#CczqC#E5jNF|11u zbB-e!MsVKBp3yr!JL_HuyWJK{Gs{T4D*&U0STV52I}-%pz<}8;S9IB7d)y?Oo!FLX zScND|eiHp-KR5Bfx`Pg>JD{#HyZV5MZ5_Ccdm=ov_O%n&PMwmTa&TSN^EBk7AQl>1 z8_|(;XH^(Yqkoan#%XE?hBY0RusUO}22ZCMjYy{}-w)pTrJDD*hMk%Up?zqIb}=+Gxvde}4u?k9=u#5e z)e!n@t8_PQ;N!F#iS1!mZ>zP3g%L3wfx!>gK;kYyALnF~HYeFFGoiO>N13p_9T>s? z8u1TW)Ybr(63cMrX^Z#}?zCY-1soV5(7Of%h6H%2N3%?@JSHQj6DN>xV1&eAk{FD) zRB&s11FF*XmDod52wLGYp>UW`$f`M*%_<&~D7&rOk-(>t(g~oj)hz;vzLaTP>3`;K z5#6_*!v%)Lq53*isAh0?$r3Dm#adVVCdX$9HPnHT)*agmeE+ZRRgs0RvxeW@wBMw! zro5M~`FP!zYW@TpeK6z`i^VxGg7b3VEaFi;bH7#jE#RiU8|=m*>;`vxlmlaNn_G08 zp{&pSmo2!Y1*bHBu%=-~X5sZoV~PVqocp0xY6?uV${NcOdMzR|n_;wt@P2n%BJJfw z-$HXbsRe%*M!ATju!Yy=x@a#=DY`lQjNrRxOSQZcVglJ8|?2%j7)7W+MfWe)$`B@O5e7b zPBn@FgQ(RhYm4>uYP10fjh!(}k%Ix&r1(E(ZE*29YtyCm*~I#A?=q}t_+X{s6@yP` zt18qd0wc_ZhChl^Di_|08BD{=brCoX0~`75rEbm7MFxj*aQFl^*dQ#7p}*ay0dt2! zw(>RZwn?P5Lev;b^iO8xf_e*^qE}`2PF$2KcZ^411n)g$xxbklRK~u&diyr9_vM8} zU5`6#oT%*)3EIXf!GsO9>!C5W`w2AfX1ZNc(!Pxt%xIarH+LTZH)?Tyt%dgO^^p^*W_44lww}|iiN?Bz@Y3rnyaYt6zzELQDXyLg56)TP zM_R!N#W*m6Hmq9Ih*%EARj;Vw(j(2xP;2ZyoEi36l*<(o*cB<*Ou_`qev;Uqusek< zu|K{;xkIT*^$g#M6IlmFaE2W$+9AyljPUgnFQ5F6%%r{aUFK-g;OW%Y*}ATQ!We3m zNBx*=MqNIsmUUN@v&>*Bu(3Y4ptV;DD!7;vI$c>kvy5W2^_6Lt8b-t7f}ojfg=`c) z6rZ%Vy>4Da^9$OZeV}w1>U3=L%_?sH&IoL(o5X<-ECcjy)j(U)LyR>CD+yC_pm zVmmw!vR%?odiJ*So>==yd)rJ!-lcb&>4}zy-Yc+IxlR~V+sUj-J~?l2qDz@)Jmw|E zO&l1?Snp|AgC2^N8SX!5%<-kAaIm#HDfUG+A5?)6#P_1O+Q$swVQV?|g>!Drh`v9# zcN({;=bBf?p9gUY2@zhdXSMEO=9vV+2RuSzEXY6fT?HgkVid*>QTkvA6FDm+8Ozfg zYIYDL(xjMpCPs(LYHUW>(N}OyDX+5#Kb)^r*dT&Nv@nA6B9O!#bn`OnI%Z|_4PE2| zXpv8adRpm)(wO<%sb>%EgX^q}i5>!d3fQdzBkZyn75(GnzGRy61x)o1p_md)u!Rwv zw^K*^>irgGaXlHgk@L1sY_vw4B^nX+1MScwaV(KR=m$A4!Y@oW_|;98z%M@PU!+?( zHqn6*+@VU=s8A)tqhBju{mNY*@Ku$d&8ol<=Ol>M=YdY#5|(bwdg*jbw!(*P6UI+< zncs1I>RrIKW$SR;Qmi4JLPCgL32y+QP-C{akcp8pivNu50na3blpPqsd^^=H*j`W` zDUeZ}QO!EA0B)_(nNVNvq3(|N5{|lBR+dUhuz3{zsO} z#Dab5Zlvo-j|h(jWt8&EVi>}=%_PX$ev+BH@VbF`hnVZz0_lwEWm|9b#%tt3*NU`?w7ShCNW*@TsG6XiEiGN+KTYjt;xPlQGCQ*1P-Qn{U1H&98jn%PDWa_xA7o`k5D})PJZW(QVmp z-27U@nsZgkJGbM1FCRFgJ*9qZ#@ceVhL>vynP3Rzthn~4*dKA8^Q2QochiaYe8V2s zz3`tcDeq4&b}yvAUNfC)4WJ;p@Sb5|11rnK`{=&<{Bt*)n)2?;{OL!J_w-XS@PC(c zJnfvL&iZH&4gj2T(vN=n_#R8*;O__EayDbv-S@uji38tEdE@WzaYOxvf5pK+FyP^# ziCs#Zl`veU;U*puGF!C6;dGIe+^!HN1L*TiTI?jNE$6ZQX zuR*FQwX<{w9#4``hJ)wkiS3lr~+TNWHP?y*l&-mmXj z-+KQMJL0U%g=h@awhD~p)6Wv;MTD=3z~c<>h)Ci)<0+8f&4h^> z7YBxXYMiTylkYsn>VDU+-hJSLjo(RmQwM)k+~NZ#dY^{Z*2oDFI`D!&gpbPBx@q2b z3#aTcyoEeF`z{?A;^gE>oy~!3aJn(mkx#G4;;2wI-I2|3Y9D%#39aXNnGTGlP^yDK zutKFN_^mjC(OOsu^m~&!lfVK;8lD2uGrQsVjHp|~%51|bASmDjk)LgD%%kU3DQ+qI zJxStp-Ahy}^Gw9xONgaYEj1QG2ep{EECu57`QW>7L>E8g=vcNsld!b)7lb2LNG&6^ zr~t&JsnKUo|Ar~YE!q}D=7#RT=o^rPX0qeGkk!{RuQGxN1qW93&$F3MwX&S7{Uk8T zA?tt$Sqe*?SYBJBDHwTel@iE`HdzU}WCg_H6S9pY8_es%tp{%&-1p8SuEjoK^V;i9 zdc96!4vK5D2?iZ(8WvutSM}u}R?Zy?-mX=KsU`;OyHD9L-+_O8`_L6R;lMo^6YDKHG*tsdx0YGhM&KP|VIgLMldNct+C{ zL_8GC6W*T(`(CUu$BLqSIVD7b7m=}^j1}=lO8;{FQz!DifMhyVixFbTh}9Y~2SIg9 zA5bD!0~hL|TQ~>Vx!PjDMfVbl^ z)Mk+Q9LX^e2};J6p*9tJ8~oT#CY)mKoR2HI$hP!#gWtUcz@8Q}Df20ER10%KSk zE#ewP>Gm^+&C*TH8IPtvY{WnUp~bblXgRBl<|P6z+FGLx?T0Y5LH$CU4vgUBm5b_P zDpK_25z)_Z`$izv`Cw1qUM(YyWGvZn1Ysgy#FhwIZA?~}s)Vg?^f%`H1XZa5BRKiE zx_SY0QI*h2SYsvu0FqR)Gn*XEuhq8zvJ%-N5rDRnAE7}XwWX^Te4K1Z_GnW|{A>>=LjRaf-; z-8&Of-u{`Ei@(2#7s^FD5CL5n!AVtC4W=2xs*A|&SRz%a0wXwekINa23^mw@e519o z97CMCJ1~Nic33Sh?>Tlans>pWt2X^&-=l$ZM>b1To(>FgE{0UpRg|Z;sWpmE3+P0a zz~!2mPQcIOXPy>TKSl!lRp2fD(wijGo%|%atq0%xlZn$NouD@al&uga8q^a%{=zBi zmmHl^4^agYBlPAb(V2QU*Hv6X7EU01)Hk=SD&4zNWsMq!z0`rR)$(}}uzJPd)C*)x zLSy;MXP*4-g-cFEQ~Z!skBUk*#+Zfd2{fph%|>7_l8SDHFj}~|-m72!;_c6mJ3&`V zPf?D5a;Y_JiRczZ*_*R$EU)!g4i@H^)(W-Ofnl|JQcBuUUSzZu>~vF10%rzmeM|o} z`;Bj;_5sexrdm~C1m`^B`I^D0hd(CX_0yZYKO8X(*W&!}jF+b$vvY`3Z#`$?{c+gj zU;XKegF+82VAG$9uUIeB-lYG__hUtei5Ul0Ac0*v517`!XaK%hclUC+DahNbD{horpKTV^c3b|DUi zLhb`V&0kCSzZ?AFWJQd1O)y6S_-2BiSPSq|jrN7ZlwG`$-E#o%55ztX!KmFKa&Vu3 z-IlZ9JbR)>8t`zvwQNu;)w}W#^*5OTDccM;QLIctpVHLrqk46QsdXnom;?^&ekqT~ zX5Po$6ail)K0{p`8r*DE>BPjN}uQJV{WvYiTm16O7}{w z+QPbdtgKdB1Ko4=ih6L$IaCibq3V$esIcb-tH`0mtmb&T?=@@lc{>kD*}8^KlI=*| z3vWF9?)iI<3dtS~vEYTlM!%uZfKx!YIV7TZvfgYnqVOSy_EXULx`n8RQq(&kiQ!ze z??u0=yRa_hef6#ncIx)(VW?5ii9(zXj3_)uulSYr*PsH5N$5SBHaGJhv`7#}-p?pN zE8B=ks3WGULem09`Vxdm7;P|GX*T}o=7R3ZL^x!8<5>@O@7{X>BGa3`_|Ad}}__j~Py*H1}{OnuE7SHUq4mH_-5;1MnCeftL+`W!?D2ioYULpl_MOOB062+Z2)h<7}qwXN@b z<=+!p%VBQqsVM~gsT?aGNg_y;;~TP!sMlpK= z^CH%u&r?W6YK_8pJD~!x7t1UIeLSxb&?`RT(7K{Zx&@m|00|Dxas)qs33LW8=!^`e zk*RtejiuHg5GK?DG>VEy!F&cT;)Yw*WAmR!K1|J}*TG{O z-rD%ATs}6SQB3$+xs<45189B`+KFpZ;~I4C z`)@hJHik8jWDXu5F=y7Jeoyaii|m2vX#TS+Pn-E$jQ3ZAhMGPkL6{Ytc;hAa-||=D ze&Nw)opkJ+lhOvqCS`FZ4On5I5L>KGk)8wwB&Prufi}N%F@t{HZzN2GuR@UxUe}HGH#ZwVw)+}F9(NVSQ(?yD&7Lc zjD_NJnmT8<_qJUPI);q*81ahIenjXMe;e>Wre9{^Ync1|qN#g-R@aI&HU>PzF#{UK z#0nELj(JXc7#j0%7u1F@gOR&-V3NNym0YZ^1tk&Vle+X16WW3C%f=EhA@2v&8?lws zT!c%$coHp0NL0S|kZ%IZ_c^J~;1P8ie9gNDlu;k|>{EC2xNo^;*(hATh=71QcuQ=&h+|(SF3_HvMG>SPC zm{VAG->uO9?MIbNK7qT}0yK(wIxu(Q%JprGW!D`>G=(UYTYyF}QM=|c@Q~u|6L$2b zZkmm@-cE>FYw)@%Dnt+bH6*Gzh1fME%(It~oeIrF={7}aTLowY)6OWGiBZN#`ZIZ{EzsbFM$15E&y_)Ez0ygA zWAc}g6@r}#{pIvKTn3-Cu!i)V`G`mj##32sP926%IR+6yK%;!yBcmp=ulBkWm#4mu zB53xqz8#AS{9wv;5lNDmxLWM~gl4)YMPYNNxmvmgxy|yody=^am;sGq9tq5ylbF&? zM7Lb=>Xyy>U}sk#N) zuNL~D{iusEpV0rwdh9J^c&MXxd7lsc^!PvNYx61S<10Z_6!iu&v*mM@0gZ~Xj5K2g za%=VUDhgwM=O;Z2&2M^tQVXe{hGizKflQ(?XZ6S4hx^~|IHqbCHLc&JwN z#niH0dnGIP@*

AuzBTx#A8XWS&P=?FfB#T4Orn`x;{USfda@3bY%klh!B|4{dbX zLY2$Q!Q~|8@?Oy6;g@-gI)3T#z3;@exNa&j8Cnr%8eKa5`BNa-IB9p8>;sk1Y6eQh zLnr%nv4|M}1Br+8tO8ws#f$lDd;1@BSuS<&t0adza-0>QQHAtC?f0Yy8Gah?cxZ&_ zS`4NboI<=og;nK>eIL@|;ZHS^kOIZp6v9d>rLNJ4VHI?KI+g5$6_v)fbYAjTh(=+j zQf=1l?#_}PrCZ}Y(+p2rbj0av43>ih=~&HqTt_)bSP84GBS}-?nfcJ+B6=gKynzkg zyT0caze&mUGsTI`(C31_s1Q9QwD|Yt#OIKihJbQ=Sgo1FJbNAj8pRw2%u|_X--tTZ zzJFO=>rUxt!NAL|nY_|aqj2lPy&hzY6n%Q$pbNeo+)1;LUgMfM>-2fYL$*HIBW<>@ zwB9(s zH#s&P?&a17+Pc;5R}S5&OWL$f79@5N?X~r;TROaVjLtfHUKoYeJIEb8P$ag5@#MJk z&RzprDjN%qM4OgmUaVc?_;7PeKqAH3#GUy)B-u{LHjAb8tR;L6PgX#bOgU^K5JkMW z_N282YeKT>A;2`ZBuTW9%L_!Yeqj`9+!gCJE@VzSbUuO5!;hHS?KDqzp%x$Kf4bcS zG3#QMDID4M@|e#y{cRwbdf;>d8s+&eV7>quH0rgOD=+phsQt zP#kwg*ILn4Q^Utr4#8dBR7Q?CK~m002KFEoW_X%}Y=`{)5+c76U6vg(2MepUQY9Cp!asvb{SDyb!fFMG5!RZ?T=8B& z#grE_C21QB6OS;iNRp`B@?xguB@s9{)mK%I^BW)aXR=GCO8x>R3Uhn?N22a@GL4QLeA zZ&VB07qwZRO<4#H#d{5wK1QRM^TBCTd+l-G5p>+v&vd4swSY%~-K@07*ioY<{M_K| zw1N{lbd2_TyA}hxy;Dxk=8a_Y3}~Q?Ltq7V`9ZT@hGt#PC#LE6;w+m`8p|h*Xseqp2aq?^KBS|%&-tl7qta7Z~ z2MU+aFuI_{1B)N|<;A%a9?%fm-(T>voguUkLaC^dLL)lltmc7@TsMj+6S) z;AH2rN-U@Geu(~PKhEatZeI(Jbuo3RQDqa#v69C34*COmkrjm){qhi4d5~yJwQ()A zYI7Yuvf73qDG#-ZNndg78qg@FUBGiaV-{djF$>Tr=6IC*8+s6*erT$;$O7WLgNr~D zzf2&YQOtqB9K@JDx5}Y1&1R=;V!J6>*HXqTKqHv-Sngc6tF^A5aci!v{|Dg}=v>sQ zY73vCBNd|DwMIPHPY&yque8Tj&R5Y_bxkj*9D|mTnV9J7ep<_TmaxNH3uIImee?Cb z?e==HU#@l>(172Y0QY-5Zl*_;4rEBKnTT3bM0(3=VF8U|ZpSO`{`YNNU!Q|1oS++0 zD-#-EevSrcd7RoRXowTCLp3;}czZUV?sgn~-NoQ38^q7$!ezo%zsoA7MayG4~xnwLMv2Waugw7 zsozv-rlN>FaaRZ3my)MWf?xkfC0vgZ_ID)=Gh;HtGec-6IaSQ?Of;77aL*Fxr|IlY z6xYgop8OZ(sDG4~9Ae2=S@TL=Ng)RPb7B!!vI~x%I%rNHzOq6s$;i3H%NKS=!9pXx zFkL|(Pk$&YyzCTR>TqHt3p1cWJp(f{m*8X?%nvFwRN#P~Hontd1l=(|ABFx5?Y9+sF65ex;5COoLU=VDNcyl23_bVxeuI z@_#dE6R;0Dgqi{Em`Ld`4n9$X zt`?+Qq|m`8t%NLmXv8jJZZU2QYDY3I&oLt_igQ!=AC;JGFxj{$O2VvtY`Yp;&mTg|UD#7~gr~(L z+P~Ap%DWDyh1cDdG~D%@O?0%rnSzmMk^MRk4Mf3AmhBnMFTew-2Y)@-DYrE0SV>N zW%r@mRJyZWp>BmjN~JC}&XiT7x%%~{Y$dCuxne*bh^0)(ODI;t*yzrc`;(#sB&u+t zY+!nEB_>7J#*K4!Zv#!dTV#e}G>UmUk(xVlV^V5{Yic85Za_tcm@yh)z5o{Mpu^qE z%4^0@`hE;MKT@XMF@lF$u)d&Iw@dQuEN*jF$=<-iL!()JA#yuP!@Z2An903&q@UPN zKyGswEtouqQ<2{ZI_^j`d+jj#BOrgBReu2510K#(#i9X0#~p^IC8OJUR6LYreGzh8 z=V$iWVP)ANpy4z&FFr5?Zf z%LJTA@A3tH8c4VAjsEu`E!wRDf`)uw@%tR7z}0&?$gSO zsMN{H!X$VVn}4>h!Oo$D4vd_l(5r}~;0ETZB)%>nl3mWgC#AX#T33TUjvvqi|0U4d zlMBwJpA!F%!)xFX?R3o(6ZhI@zqGz&Zvguk^f`Nb5uD&Rqmp|=Jr@#W7J1M*O%Tq8 zBzY#@W6erT$C?EmZjB@@`jXXO5+C_KD=0`+gF_5xik(K3m1D{>mAuW@|4>BLak>Uy z1!xr9Mz}8%kED0sd~#r(zTFnNgEEy;VHvx7aWu`&Q%v~?MC~8zim`H z_t&)Qd*RN;(tk>%_UtOsf;}>zz>grC{n00=`FCL>DT~jAj2N(a##NuSr85z6bZFNp z)GQxh**s=IqnOQLNH{%;F#ie0@rX|T!|Vf=yxKk;{c73tQy!jitY`dnf;Q)XzQ`;A zJsuidx((1rq|Ima=d7k8p|lPr%=u7PyftaeD4TkfOGGbqyYba(bn4;IvGyuPFQ3jo z$V;ucfYA%kC^{mNx~9X%4;$jKZKs4E`v`jNajl;j*mfc57yD3&bBhhakVdgl(dI$a zN4(Btm1AUgJkGq@>(@p{e@WI~K(F|1;ai-a@v?GgO{*N`rPe%@#FVd;Mlrh*W?eIE zDj809x4Hei9-JFfy(DaC!MYfzz0zdEoiuY!oMFLO)7BqU4TY0?*yi`DL2T) zkMxl1=J`}w=+&>cm+m%pY9MyXk{J}BQEYoY zQ>`_F%o_T~J|Yc2x=)`?{wYoTo^3G;(I_Sk?={sHGj@Kd^7+BnKV;^ec%)($qEXDj zz_h+FW!4h3eMFZ{|JR}`7M+%kX15>O_RXUv+a0>re`8g*8O@Hd0KMXS`ZzxGT%3*? zjQZ1n=yJlRPQ?&vX1FzVYP6L@OKYl!4Iy>=VuGJ(F|fAmGgjKcY2lGf*l-GqM0Ekt z8MXo}X&!nl<~=<~ow!KBC#5tn2*4f`RF1?b4P{OzJm5 zEvXQVV(x^o*{$Fq-imb5pU>SmKE3P#jbcK9=1F2U3sd`8IXp<6H(In=0{VC>4d@mB z1mM>*&ptBKurK8{%+{KJaBo?F2AI}@aY~sO$x$#uJamzZzGx3zfJQNo2j)^3YRbYf zCii}HI)}XEz?83)MlrEfF{{aBuA#r!hughPhvRb9G$u=^v|24hqsZ8FD(lg`bnO4> zxWtzpUvhn;FJZAR1}Q)TO!ysRClgw+28QAfc=&x&a{5oLxtVLK0FClF8hpCuYC{_d4m?@Q+)xtChg3*{EYVoTmUOB>YX#Z)m#GEGcgLEMA$^szN@66k3cCE=vs zcNmZ;^EXj}b&c%$OIkZzKNmWAhU!R%Gj8{E57IN{xru*#orgwY{|KGb5Exn74WP$E z&q#Jwg#BrY=^@Qwc`iftAlrik5A7B7+E8tfcIi^H5oI-{6;-rQf!CIMkI7An&YhGOZS4hU z0B*gi-R)FK4A4fJQODBFws7Gc`0c95Rw_w-M30LPw9y&}E^ev-He#G~txF zEe^Qz5>gV!(V0PLw|GPgpZfaR=9}mUM%fc$$^lbkVLAS1$mHxpkHw3wS$WBtgWf3hV{fE^3^sRBmHPY-oBEd}`a>}cKd@sG z@b^n(Kb@hrK z44M=eif{GMS!)hnab%eD5q>*JK%C`ZnBJ$C9>onpKjc`%k+uxkN*Nqkv$QM{bN9*m@fizT@rKr_&2Zk zq%obM+4;t|EB2oT%pg$KIE}4`4r_CPGHk%$;SNWo?fRzk=s&e>ba#4Td{AKPSAb=sVjRDhC{E!{e0mqvZ`bV$#xN+**zBTNQRzVs-waK!fpf8*%4yp3rD{C(txxA&w`68o zu2c5XX=U8Dt^a;q-=^d9p5;yhD_-of7Z*N%Plp3^?RHz6lDo(nS&e>>qsLiXe8p#H z-m-!;U6HIW8U94e*Uv1U(&PNJX`k0%Ww%wnYkuimDanq@aVK7AO@l0W=*gCwR^692 z3z?Us(9|+!9q`rRf3Ge}n}d_QXl2ab>mPl#R18KpIGr>T+q@cgnM!{5oO6$O^x=zg zoW!9d5)Nzk@Cj=0LA0t=W*fa{>ZqXT^5uUS@Xccr)6tiI>s#^qy8EbmxQ|<&t!zAW zy`D?LcTSr(lY$VL{kSmcnUXM%qMY#y9TB;XHHMTp=ed`ZmJH}Lh$h%lZu=yu!$#;h zh>rIF#?_H1l-7g=nHec78gbIS>t8*JE?L=)enm~(XJ*(oHF~BCJ-^IdlS)DbZDbOU zqV{l4#|@+JZBm;qkl&G3YJ&WZwiDso1o<6RqoM@)9VL;MFux-|cF`K^LxuDKFB6=RgtB@^#_yg68BlOzPxRyNBkkfH;cl<-IRcy@>ae zUf#1Sg7|`5FYmpxqVNml16>#HQ4%Dix|g{cz0*t-L=})H??yuJetQ4<^(UUC-L^+b z6htVl+xEPO-kq;mS0dfEou|b^WmN|#`$;@Xf?blxo$TY2pv()gD{aoSV(;lIAb~=v z3(|xt(P?kYJnVPE-Oaya=3x5MF5IMM;8uB+E)Y z=rMm>b=|EGl&8%rT+?1?)r+FMN9<({5khud*x)mn{9_6nS$<pV1y30@55q)BGagQ&)J88}q(Z=i|u8PEu3W*4eBGlYN%b13lf zh~{_cxN-3z$I&g-d#qnpH|liaGgve8-R(~dKDsw;4dCl2=(Myy04AOvIp@{+S0C4a z?#zjwmWJxfWKis#ppVb2%K+Iei0Wpm&!)&Qe)uVPIH{Ue}{uh;ou z)HyR(uHRi!(#>;;70>|F<`^pplh&+M4jbp!dHGzB{!U&rm0EyCvF*xtHy?@&N#bO1 z&V?Xd_Z~4pIxaw?n08U&1E5ct2cZu<+)~yq6bFx3d(B_B9HZ+$OeNxGo4bqS^TF?j z`q_hpP91icS23nWM$#2n_8+&juBd(xM0ktT?@nlHlaBb*b-qf-s?$zZEKahgclpQ> zglNH*ek!78n+A-tCpTI6^UB|3D?#bZ0=pNQtCvPDR>C(fH>Ip`McMe$A!Rj`ZH}$C z&@)ctMH*`%8rA;s(0EXza*va)u+C0=p<4ATeNjwbL#dbr$a2SM>VDf&QyZK~RuWI9 zSr_mk%G z=%g9nuiJ|p)fFf8S#a{>^?4!e|+jdF9B$!{WZLy8s)D>uslnX=Zz zCZz|i%&K2rKjC;RsBpQ)WLHaz$GM?>tdsISzK|Z)k33#t=J$lKcsQp{t0l#XWxVM} zt%|}gbTO419r^%IdRV=!V!J~>3eDWm&(HoVir%2$ruMzi+R^ZciS8+ILqFfAE4z}2 zmZ6_VAxL%#&ciV{i9dWkfaP>F(}pQ5OC^AD7mmd3mJ=jx@hB$W3tpcbSkdE#`60hJ`r zbiR(rR+mTy&KrXYEn6WZU*>tyYE*VzzRZ(o9SPsseC@8rRqQovosK73x2&`&O@mcF zefi>Ya+xS)`DLFdaCP+prxnDi&$icQM zExPIalb%~K`)pdhI;E>3p4hGB=X4X#X)C6j5GPGmP$AtEsV5wVC4@Q*4Ka z+p<8HO7h+X+5%u!pc>-gA+t%#lI0}~GE=VU`oZfvTv0iEoA7H^BuTV# Date: Mon, 28 Oct 2019 15:25:12 -0700 Subject: [PATCH 019/133] Incorporate review comments --- .../tests/unit/_metadata_flags_test.py | 2 +- .../tests/unit/_reconnect_test.py | 36 ++++++++++--------- .../grpcio_tests/tests/unit/test_common.py | 4 +-- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/python/grpcio_tests/tests/unit/_metadata_flags_test.py b/src/python/grpcio_tests/tests/unit/_metadata_flags_test.py index c2d2aa7c2e3..efc55ea2ddf 100644 --- a/src/python/grpcio_tests/tests/unit/_metadata_flags_test.py +++ b/src/python/grpcio_tests/tests/unit/_metadata_flags_test.py @@ -228,7 +228,7 @@ class MetadataFlagsTest(unittest.TestCase): # Start the server after the connections are waiting wg.wait() - server = test_common.test_server() + server = test_common.test_server(reuse_port=True) server.add_generic_rpc_handlers((_GenericHandler( weakref.proxy(self)),)) server.add_insecure_port(addr) diff --git a/src/python/grpcio_tests/tests/unit/_reconnect_test.py b/src/python/grpcio_tests/tests/unit/_reconnect_test.py index 3861dee0265..8d7fd38868b 100644 --- a/src/python/grpcio_tests/tests/unit/_reconnect_test.py +++ b/src/python/grpcio_tests/tests/unit/_reconnect_test.py @@ -42,24 +42,26 @@ class ReconnectTest(unittest.TestCase): 'UnaryUnary': grpc.unary_unary_rpc_method_handler(_handle_unary_unary) }) - with bound_socket() as (_, port): - server = grpc.server(server_pool, (handler,)) - server.add_insecure_port('[::]:{}'.format(port)) + options=(('grpc.so_reuseport', 0),) + with bound_socket() as (host, port): + addr = '{}:{}'.format(host, port) + server = grpc.server(server_pool, (handler,), options=options) + server.add_insecure_port(addr) server.start() - channel = grpc.insecure_channel('localhost:%d' % port) - multi_callable = channel.unary_unary(_UNARY_UNARY) - self.assertEqual(_RESPONSE, multi_callable(_REQUEST)) - server.stop(None) - # By default, the channel connectivity is checked every 5s - # GRPC_CLIENT_CHANNEL_BACKUP_POLL_INTERVAL_MS can be set to change - # this. - time.sleep(5.1) - server = grpc.server(server_pool, (handler,)) - server.add_insecure_port('[::]:{}'.format(port)) - server.start() - self.assertEqual(_RESPONSE, multi_callable(_REQUEST)) - server.stop(None) - channel.close() + channel = grpc.insecure_channel(addr) + multi_callable = channel.unary_unary(_UNARY_UNARY) + self.assertEqual(_RESPONSE, multi_callable(_REQUEST)) + server.stop(None) + # By default, the channel connectivity is checked every 5s + # GRPC_CLIENT_CHANNEL_BACKUP_POLL_INTERVAL_MS can be set to change + # this. + time.sleep(5.1) + server = grpc.server(server_pool, (handler,), options=options) + server.add_insecure_port(addr) + server.start() + self.assertEqual(_RESPONSE, multi_callable(_REQUEST)) + server.stop(None) + channel.close() if __name__ == '__main__': diff --git a/src/python/grpcio_tests/tests/unit/test_common.py b/src/python/grpcio_tests/tests/unit/test_common.py index bc3b24862dc..305781bd533 100644 --- a/src/python/grpcio_tests/tests/unit/test_common.py +++ b/src/python/grpcio_tests/tests/unit/test_common.py @@ -100,14 +100,14 @@ def test_secure_channel(target, channel_credentials, server_host_override): return channel -def test_server(max_workers=10): +def test_server(max_workers=10, reuse_port=False): """Creates an insecure grpc server. These servers have SO_REUSEPORT disabled to prevent cross-talk. """ return grpc.server( futures.ThreadPoolExecutor(max_workers=max_workers), - options=(('grpc.so_reuseport', 0),)) + options=(('grpc.so_reuseport', int(reuse_port)),)) class WaitGroup(object): From 9b058aa157c4905d61d203289d8ab8943cad3bf6 Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Mon, 28 Oct 2019 15:50:39 -0700 Subject: [PATCH 020/133] =?UTF-8?q?=E5=BF=83=E3=82=88=E3=80=82=E5=BF=83?= =?UTF-8?q?=E3=82=88=E3=80=82=E3=81=93=E3=81=93=E3=81=AF=E3=80=81=E6=82=AA?= =?UTF-8?q?=E3=81=84=E6=89=80=E3=82=88=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/python/grpcio_tests/tests/unit/_reconnect_test.py | 2 +- src/python/grpcio_tests/tests/unit/framework/common/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/python/grpcio_tests/tests/unit/_reconnect_test.py b/src/python/grpcio_tests/tests/unit/_reconnect_test.py index 8d7fd38868b..b19a5b5d76f 100644 --- a/src/python/grpcio_tests/tests/unit/_reconnect_test.py +++ b/src/python/grpcio_tests/tests/unit/_reconnect_test.py @@ -42,7 +42,7 @@ class ReconnectTest(unittest.TestCase): 'UnaryUnary': grpc.unary_unary_rpc_method_handler(_handle_unary_unary) }) - options=(('grpc.so_reuseport', 0),) + options=(('grpc.so_reuseport', 1),) with bound_socket() as (host, port): addr = '{}:{}'.format(host, port) server = grpc.server(server_pool, (handler,), options=options) diff --git a/src/python/grpcio_tests/tests/unit/framework/common/__init__.py b/src/python/grpcio_tests/tests/unit/framework/common/__init__.py index e1979c96b09..488c712c704 100644 --- a/src/python/grpcio_tests/tests/unit/framework/common/__init__.py +++ b/src/python/grpcio_tests/tests/unit/framework/common/__init__.py @@ -15,7 +15,6 @@ import contextlib import socket - def get_socket(bind_address='localhost', listen=True, sock_options=(socket.SO_REUSEPORT,)): @@ -49,6 +48,7 @@ def get_socket(bind_address='localhost', sock.listen(1) return bind_address, sock.getsockname()[1], sock except socket.error: + sock.close() continue raise RuntimeError("Failed to bind to {} with sock_options {}".format( bind_address, sock_options)) From e071b7d0f9c496a3b47febe7f694b496d4c0fa51 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 29 Oct 2019 12:41:02 -0400 Subject: [PATCH 021/133] try to fix #20782 --- src/csharp/Grpc.Core/build/net45/Grpc.Core.targets | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/csharp/Grpc.Core/build/net45/Grpc.Core.targets b/src/csharp/Grpc.Core/build/net45/Grpc.Core.targets index cce53db82bb..531760909f1 100644 --- a/src/csharp/Grpc.Core/build/net45/Grpc.Core.targets +++ b/src/csharp/Grpc.Core/build/net45/Grpc.Core.targets @@ -2,32 +2,32 @@ - PreserveNewest + Always grpc_csharp_ext.x86.dll false - PreserveNewest + Always grpc_csharp_ext.x64.dll false - PreserveNewest + Always libgrpc_csharp_ext.x86.so false - PreserveNewest + Always libgrpc_csharp_ext.x64.so false - PreserveNewest + Always libgrpc_csharp_ext.x86.dylib false - PreserveNewest + Always libgrpc_csharp_ext.x64.dylib false From c97ce9057b861048cec920e47d70e69e8ad3fcec Mon Sep 17 00:00:00 2001 From: Eytan Kidron Date: Tue, 29 Oct 2019 15:40:28 -0400 Subject: [PATCH 022/133] Simplify the platform and constraints settings for remote execution * Remove the toolchains //third_party/toolchains:local and //third_party/toolchains:local_large. * Remove the platforms :rbe_ubuntu1604, :rbe_ubuntu1604_large, :local and :local_large. * No longer inherit from @rbe_default//config:platform but instead use it directly. It is now the only non-windows platform. * When creating @rbe_default//config:platform directly with rbe_autoconfig, set dockerAddCapabilities and dockerPrivileged directly in the exec_properties field. No need to set dockerNetwork to "off" and dockerSiblingContainers to false since these are the defaults. * Also set gceMachineType = "n1-highmem-2" on the default platform. This value can be overridden by specific targets that want to use LARGE_MACHINE. * Use create_exec_properties_dict where appropriate. * Use custom_exec_properties to define LARGE_MACHINE. I wasn't able to test thoroughly that this PR does not break any existing targets. I was not able to run anything on windows/mac and I also don't have access to gRPC's RBE setup. --- WORKSPACE | 19 +++++++- bazel/grpc_deps.bzl | 8 +-- test/core/gprpp/BUILD | 3 +- test/core/iomgr/BUILD | 3 +- test/cpp/qps/BUILD | 3 +- third_party/toolchains/BUILD | 59 +++-------------------- third_party/toolchains/machine_size/BUILD | 31 ------------ tools/remote_build/rbe_common.bazelrc | 8 +-- 8 files changed, 38 insertions(+), 96 deletions(-) delete mode 100644 third_party/toolchains/machine_size/BUILD diff --git a/WORKSPACE b/WORKSPACE index 1b46a6c1348..c1862c15435 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -13,8 +13,6 @@ load("//bazel:grpc_extra_deps.bzl", "grpc_extra_deps") grpc_extra_deps() register_execution_platforms( - "//third_party/toolchains:local", - "//third_party/toolchains:local_large", "//third_party/toolchains:rbe_windows", ) @@ -22,6 +20,15 @@ register_toolchains( "//third_party/toolchains/bazel_0.26.0_rbe_windows:cc-toolchain-x64_windows", ) +load("@bazel_toolchains//rules/exec_properties:exec_properties.bzl", "create_exec_properties_dict", "custom_exec_properties") + +custom_exec_properties( + name = "grpc_custom_exec_properties", + constants = { + "LARGE_MACHINE": create_exec_properties_dict(gce_machine_type = "n1-standard-8"), + }, +) + load("@bazel_toolchains//rules:rbe_repo.bzl", "rbe_autoconfig") # Create toolchain configuration for remote execution. @@ -29,6 +36,14 @@ rbe_autoconfig( name = "rbe_default", # use exec_properties instead of deprecated remote_execution_properties use_legacy_platform_definition = False, + exec_properties = create_exec_properties_dict( + # n1-highmem-2 is the default (small machine) machine type. Targets + # that want to use other machines (such as LARGE_MACHINE) will override + # this value. + gce_machine_type = "n1-highmem-2", + docker_add_capabilities = "SYS_PTRACE", + docker_privileged = True, + ), ) load("@bazel_toolchains//rules:environments.bzl", "clang_env") diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl index a6b62554f38..ec571423df1 100644 --- a/bazel/grpc_deps.bzl +++ b/bazel/grpc_deps.bzl @@ -174,11 +174,11 @@ def grpc_deps(): # list of releases is at https://releases.bazel.build/bazel-toolchains.html http_archive( name = "bazel_toolchains", - sha256 = "e9bab54199722935f239cb1cd56a80be2ac3c3843e1a6d3492e2bc11f9c21daf", - strip_prefix = "bazel-toolchains-1.0.0", + sha256 = "0b36eef8a66f39c8dbae88e522d5bbbef49d5e66e834a982402c79962281be10", + strip_prefix = "bazel-toolchains-1.0.1", urls = [ - "https://github.com/bazelbuild/bazel-toolchains/releases/download/1.0.0/bazel-toolchains-1.0.0.tar.gz", - "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/1.0.0.tar.gz", + "https://github.com/bazelbuild/bazel-toolchains/releases/download/1.0.1/bazel-toolchains-1.0.1.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/1.0.1.tar.gz", ], ) diff --git a/test/core/gprpp/BUILD b/test/core/gprpp/BUILD index 3e23d78b124..c0d3d0d275e 100644 --- a/test/core/gprpp/BUILD +++ b/test/core/gprpp/BUILD @@ -12,7 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package", "LARGE_MACHINE") +load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") +load("@grpc_custom_exec_properties//:constants.bzl", "LARGE_MACHINE") licenses(["notice"]) # Apache v2 diff --git a/test/core/iomgr/BUILD b/test/core/iomgr/BUILD index 13327db112f..6ebca950988 100644 --- a/test/core/iomgr/BUILD +++ b/test/core/iomgr/BUILD @@ -12,7 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package", "LARGE_MACHINE") +load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") +load("@grpc_custom_exec_properties//:constants.bzl", "LARGE_MACHINE") licenses(["notice"]) # Apache v2 diff --git a/test/cpp/qps/BUILD b/test/cpp/qps/BUILD index 60596c8e31d..1b8fe306a1b 100644 --- a/test/cpp/qps/BUILD +++ b/test/cpp/qps/BUILD @@ -14,8 +14,9 @@ licenses(["notice"]) # Apache v2 -load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_cc_library", "grpc_cc_binary", "grpc_package", "LARGE_MACHINE") +load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_cc_library", "grpc_cc_binary", "grpc_package") load("//test/cpp/qps:qps_benchmark_script.bzl", "qps_json_driver_batch", "json_run_localhost_batch") +load("@grpc_custom_exec_properties//:constants.bzl", "LARGE_MACHINE") grpc_package(name = "test/cpp/qps") diff --git a/third_party/toolchains/BUILD b/third_party/toolchains/BUILD index 93b8bead777..a581d1fe1e3 100644 --- a/third_party/toolchains/BUILD +++ b/third_party/toolchains/BUILD @@ -16,6 +16,8 @@ licenses(["notice"]) # Apache v2 package(default_visibility = ["//visibility:public"]) +load("@bazel_toolchains//rules/exec_properties:exec_properties.bzl", "create_exec_properties_dict") + alias( name = "rbe_windows", actual = ":rbe_windows_1803", @@ -29,56 +31,9 @@ platform( "@bazel_tools//platforms:windows", "@bazel_tools//tools/cpp:msvc", ], - exec_properties = { - "container-image" : "docker://gcr.io/grpc-testing/rbe_windows_toolchain@sha256:75728e7d6d804090f71095e5fec627b18cfa1f47adc52096c209f2a687e06b2e", - "gceMachineType" : "n1-highmem-2", - "OSFamily" : "Windows", - }, -) - -# RBE Ubuntu16_04 r346485 -platform( - name = "rbe_ubuntu1604", - parents = ["@rbe_default//config:platform"], - constraint_values = [ - "//third_party/toolchains/machine_size:standard", - ], - exec_properties = { - "gceMachineType" : "n1-highmem-2", # Small machines for majority of tests - "dockerSiblingContainers" : "false", - "dockerNetwork" : "off", - "dockerAddCapabilities" : "SYS_PTRACE", - "dockerPrivileged" : "true" - }, -) - -platform( - name = "rbe_ubuntu1604_large", - parents = ["@rbe_default//config:platform"], - constraint_values = [ - "//third_party/toolchains/machine_size:large", - ], - exec_properties = { - "gceMachineType" : "n1-standard-8", # Large machines for some resource demanding tests (TSAN). - "dockerSiblingContainers" : "false", - "dockerNetwork" : "off", - "dockerAddCapabilities" : "SYS_PTRACE", - "dockerPrivileged" : "true" - }, -) - -platform( - name = "local", - parents = ["@bazel_tools//platforms:target_platform"], - constraint_values = [ - "//third_party/toolchains/machine_size:standard", - ], -) - -platform( - name = "local_large", - parents = ["@bazel_tools//platforms:target_platform"], - constraint_values = [ - "//third_party/toolchains/machine_size:large", - ], + exec_properties = create_exec_properties_dict( + container_image = "docker://gcr.io/grpc-testing/rbe_windows_toolchain@sha256:75728e7d6d804090f71095e5fec627b18cfa1f47adc52096c209f2a687e06b2e", + gce_machine_type = "n1-highmem-2", + os_family = "Windows", + ), ) diff --git a/third_party/toolchains/machine_size/BUILD b/third_party/toolchains/machine_size/BUILD deleted file mode 100644 index cc962946c31..00000000000 --- a/third_party/toolchains/machine_size/BUILD +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2018 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. - -licenses(["notice"]) # Apache v2 - -package(default_visibility = ["//visibility:public"]) - -constraint_setting(name = "machine_size") - -constraint_value( - name = "large", - constraint_setting = ":machine_size", -) - -constraint_value( - name = "standard", - constraint_setting = ":machine_size", -) - -# Add other constraint values as needed (tiny, huge, etc.) in the future. diff --git a/tools/remote_build/rbe_common.bazelrc b/tools/remote_build/rbe_common.bazelrc index d4242baaae9..78f29206ced 100644 --- a/tools/remote_build/rbe_common.bazelrc +++ b/tools/remote_build/rbe_common.bazelrc @@ -22,9 +22,9 @@ startup --host_jvm_args=-Dbazel.DigestFunction=SHA256 build --crosstool_top=@rbe_default//cc:toolchain build --extra_toolchains=@rbe_default//config:cc-toolchain # Use custom execution platforms defined in third_party/toolchains -build --extra_execution_platforms=//third_party/toolchains:rbe_ubuntu1604,//third_party/toolchains:rbe_ubuntu1604_large -build --host_platform=//third_party/toolchains:rbe_ubuntu1604 -build --platforms=//third_party/toolchains:rbe_ubuntu1604 +build --extra_execution_platforms=@rbe_default//config:platform +build --host_platform=@rbe_default//config:platform +build --platforms=@rbe_default//config:platform build --spawn_strategy=remote build --strategy=Javac=remote @@ -81,7 +81,7 @@ build:tsan --copt=-gmlt # TODO(jtattermusch): use more reasonable test timeout build:tsan --test_timeout=3600 build:tsan --test_tag_filters=-no_linux,-qps_json_driver -build:tsan --extra_execution_platforms=//third_party/toolchains:rbe_ubuntu1604,//third_party/toolchains:rbe_ubuntu1604_large +build:tsan --extra_execution_platforms=@rbe_default//config:platform # undefined behavior sanitizer: most settings are already in %workspace%/.bazelrc # we only need a few additional ones that are Foundry specific From bcb870bf2050ff4d6243c2921a5bdc179e8fef37 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Wed, 30 Oct 2019 11:02:13 -0700 Subject: [PATCH 023/133] Make Windows test gRPC with Python 3.6 --- tools/run_tests/run_tests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 59edaaed4ed..a27b4a96c1e 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -872,7 +872,7 @@ class PythonLanguage(object): if args.compiler == 'default': if os.name == 'nt': - return (python35_config,) + return (python36_config,) else: if args.iomgr_platform == 'asyncio': return (python36_config,) @@ -907,7 +907,7 @@ class PythonLanguage(object): python35_config, python36_config, python37_config, - # TODO: Add Python 3.8 once it's released. + python38_config, ) else: raise Exception('Compiler %s not supported.' % args.compiler) From 6b92b4af05b2a5f4800ac7aa25dbf3b6a8547b2b Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Thu, 24 Oct 2019 13:16:31 -0700 Subject: [PATCH 024/133] Attempt to drop support for Python 3.4 --- .../python_jessie_x64/Dockerfile.template | 28 ------- .../Dockerfile | 1 - .../Dockerfile | 1 - .../Dockerfile | 1 - .../Dockerfile | 1 - .../test/python_jessie_x64/Dockerfile | 80 ------------------- .../internal_ci/macos/grpc_build_artifacts.sh | 1 - .../windows/grpc_build_artifacts.bat | 1 - .../windows/grpc_build_packages.bat | 1 - .../internal_ci/windows/grpc_distribtests.bat | 1 - .../windows/grpc_distribtests_standalone.bat | 1 - tools/run_tests/artifacts/artifact_targets.py | 11 +-- tools/run_tests/run_tests.py | 15 +--- 13 files changed, 3 insertions(+), 140 deletions(-) delete mode 100644 templates/tools/dockerfile/test/python_jessie_x64/Dockerfile.template delete mode 100644 tools/dockerfile/test/python_jessie_x64/Dockerfile diff --git a/templates/tools/dockerfile/test/python_jessie_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_jessie_x64/Dockerfile.template deleted file mode 100644 index dde33a9e1a4..00000000000 --- a/templates/tools/dockerfile/test/python_jessie_x64/Dockerfile.template +++ /dev/null @@ -1,28 +0,0 @@ -%YAML 1.2 ---- | - # 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 file="../../debian_jessie_header.include"/> - - <%include file="../../apt_get_basic.include"/> - <%include file="../../gcp_api_libraries.include"/> - <%include file="../../python_deps.include"/> - # Install pip and virtualenv for Python 3.4 - RUN curl https://bootstrap.pypa.io/get-pip.py | python3.4 - RUN python3.4 -m pip install virtualenv - - <%include file="../../run_tests_addons.include"/> - # Define the default command. - CMD ["bash"] diff --git a/tools/dockerfile/grpc_artifact_python_manylinux1_x64/Dockerfile b/tools/dockerfile/grpc_artifact_python_manylinux1_x64/Dockerfile index 1ff6aa062a2..7cbcc5f9917 100644 --- a/tools/dockerfile/grpc_artifact_python_manylinux1_x64/Dockerfile +++ b/tools/dockerfile/grpc_artifact_python_manylinux1_x64/Dockerfile @@ -24,7 +24,6 @@ RUN yum install -y curl-devel expat-devel gettext-devel linux-headers openssl-de # Install Python build requirements RUN /opt/python/cp27-cp27m/bin/pip install cython RUN /opt/python/cp27-cp27mu/bin/pip install cython -RUN /opt/python/cp34-cp34m/bin/pip install cython RUN /opt/python/cp35-cp35m/bin/pip install cython RUN /opt/python/cp36-cp36m/bin/pip install cython RUN /opt/python/cp37-cp37m/bin/pip install cython diff --git a/tools/dockerfile/grpc_artifact_python_manylinux1_x86/Dockerfile b/tools/dockerfile/grpc_artifact_python_manylinux1_x86/Dockerfile index 18b4cb62927..079901cffaa 100644 --- a/tools/dockerfile/grpc_artifact_python_manylinux1_x86/Dockerfile +++ b/tools/dockerfile/grpc_artifact_python_manylinux1_x86/Dockerfile @@ -24,7 +24,6 @@ RUN yum install -y curl-devel expat-devel gettext-devel linux-headers openssl-de # Install Python build requirements RUN /opt/python/cp27-cp27m/bin/pip install cython RUN /opt/python/cp27-cp27mu/bin/pip install cython -RUN /opt/python/cp34-cp34m/bin/pip install cython RUN /opt/python/cp35-cp35m/bin/pip install cython RUN /opt/python/cp36-cp36m/bin/pip install cython RUN /opt/python/cp37-cp37m/bin/pip install cython diff --git a/tools/dockerfile/grpc_artifact_python_manylinux2010_x64/Dockerfile b/tools/dockerfile/grpc_artifact_python_manylinux2010_x64/Dockerfile index 66aefcaac28..f8ea86465f2 100644 --- a/tools/dockerfile/grpc_artifact_python_manylinux2010_x64/Dockerfile +++ b/tools/dockerfile/grpc_artifact_python_manylinux2010_x64/Dockerfile @@ -24,7 +24,6 @@ RUN yum install -y curl-devel expat-devel gettext-devel linux-headers openssl-de # Install Python build requirements RUN /opt/python/cp27-cp27m/bin/pip install cython RUN /opt/python/cp27-cp27mu/bin/pip install cython -RUN /opt/python/cp34-cp34m/bin/pip install cython RUN /opt/python/cp35-cp35m/bin/pip install cython RUN /opt/python/cp36-cp36m/bin/pip install cython RUN /opt/python/cp37-cp37m/bin/pip install cython diff --git a/tools/dockerfile/grpc_artifact_python_manylinux2010_x86/Dockerfile b/tools/dockerfile/grpc_artifact_python_manylinux2010_x86/Dockerfile index f55a8785182..adc392c25c3 100644 --- a/tools/dockerfile/grpc_artifact_python_manylinux2010_x86/Dockerfile +++ b/tools/dockerfile/grpc_artifact_python_manylinux2010_x86/Dockerfile @@ -24,7 +24,6 @@ RUN yum install -y curl-devel expat-devel gettext-devel linux-headers openssl-de # Install Python build requirements RUN /opt/python/cp27-cp27m/bin/pip install cython RUN /opt/python/cp27-cp27mu/bin/pip install cython -RUN /opt/python/cp34-cp34m/bin/pip install cython RUN /opt/python/cp35-cp35m/bin/pip install cython RUN /opt/python/cp36-cp36m/bin/pip install cython RUN /opt/python/cp37-cp37m/bin/pip install cython diff --git a/tools/dockerfile/test/python_jessie_x64/Dockerfile b/tools/dockerfile/test/python_jessie_x64/Dockerfile deleted file mode 100644 index 367785f42fd..00000000000 --- a/tools/dockerfile/test/python_jessie_x64/Dockerfile +++ /dev/null @@ -1,80 +0,0 @@ -# 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. - -FROM debian:jessie - - -# Install Git and basic packages. -RUN apt-get update && apt-get install -y \ - autoconf \ - autotools-dev \ - build-essential \ - bzip2 \ - ccache \ - curl \ - dnsutils \ - gcc \ - gcc-multilib \ - git \ - golang \ - gyp \ - lcov \ - libc6 \ - libc6-dbg \ - libc6-dev \ - libgtest-dev \ - libtool \ - make \ - perl \ - strace \ - python-dev \ - python-setuptools \ - python-yaml \ - telnet \ - unzip \ - wget \ - zip && apt-get clean - -#================ -# Build profiling -RUN apt-get update && apt-get install -y time && apt-get clean - -# Google Cloud platform API libraries -RUN apt-get update && apt-get install -y python-pip && apt-get clean -RUN pip install --upgrade google-api-python-client oauth2client - -#==================== -# Python dependencies - -# Install dependencies - -RUN apt-get update && apt-get install -y \ - python-all-dev \ - python3-all-dev \ - python-pip - -# Install Python packages from PyPI -RUN pip install --upgrade pip==10.0.1 -RUN pip install virtualenv -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 - -# Install pip and virtualenv for Python 3.4 -RUN curl https://bootstrap.pypa.io/get-pip.py | python3.4 -RUN python3.4 -m pip install virtualenv - - -RUN mkdir /var/local/jenkins - -# Define the default command. -CMD ["bash"] diff --git a/tools/internal_ci/macos/grpc_build_artifacts.sh b/tools/internal_ci/macos/grpc_build_artifacts.sh index 54b171d209f..7b9c5eb673d 100755 --- a/tools/internal_ci/macos/grpc_build_artifacts.sh +++ b/tools/internal_ci/macos/grpc_build_artifacts.sh @@ -22,7 +22,6 @@ source tools/internal_ci/helper_scripts/prepare_build_macos_rc # install cython for all python versions python2.7 -m pip install cython setuptools wheel -python3.4 -m pip install cython setuptools wheel python3.5 -m pip install cython setuptools wheel python3.6 -m pip install cython setuptools wheel python3.7 -m pip install cython setuptools wheel diff --git a/tools/internal_ci/windows/grpc_build_artifacts.bat b/tools/internal_ci/windows/grpc_build_artifacts.bat index 5f184e5e75a..190e848b267 100644 --- a/tools/internal_ci/windows/grpc_build_artifacts.bat +++ b/tools/internal_ci/windows/grpc_build_artifacts.bat @@ -15,7 +15,6 @@ @rem Move python installation from _32bit to _32bits where they are expected by python artifact builder @rem TODO(jtattermusch): get rid of this hack rename C:\Python27_32bit Python27_32bits -rename C:\Python34_32bit Python34_32bits rename C:\Python35_32bit Python35_32bits rename C:\Python36_32bit Python36_32bits rename C:\Python37_32bit Python37_32bits diff --git a/tools/internal_ci/windows/grpc_build_packages.bat b/tools/internal_ci/windows/grpc_build_packages.bat index 61a636f6073..3cf90af39e6 100644 --- a/tools/internal_ci/windows/grpc_build_packages.bat +++ b/tools/internal_ci/windows/grpc_build_packages.bat @@ -15,7 +15,6 @@ @rem Move python installation from _32bit to _32bits where they are expected by python artifact builder @rem TODO(jtattermusch): get rid of this hack rename C:\Python27_32bit Python27_32bits -rename C:\Python34_32bit Python34_32bits rename C:\Python35_32bit Python35_32bits rename C:\Python36_32bit Python36_32bits diff --git a/tools/internal_ci/windows/grpc_distribtests.bat b/tools/internal_ci/windows/grpc_distribtests.bat index 65fd01ef72a..effeee649b1 100644 --- a/tools/internal_ci/windows/grpc_distribtests.bat +++ b/tools/internal_ci/windows/grpc_distribtests.bat @@ -15,7 +15,6 @@ @rem Move python installation from _32bit to _32bits where they are expected by python artifact builder @rem TODO(jtattermusch): get rid of this hack rename C:\Python27_32bit Python27_32bits -rename C:\Python34_32bit Python34_32bits rename C:\Python35_32bit Python35_32bits rename C:\Python36_32bit Python36_32bits diff --git a/tools/internal_ci/windows/grpc_distribtests_standalone.bat b/tools/internal_ci/windows/grpc_distribtests_standalone.bat index ea4c0d7a976..b33b99c71e8 100644 --- a/tools/internal_ci/windows/grpc_distribtests_standalone.bat +++ b/tools/internal_ci/windows/grpc_distribtests_standalone.bat @@ -15,7 +15,6 @@ @rem Move python installation from _32bit to _32bits where they are expected by python artifact builder @rem TODO(jtattermusch): get rid of this hack rename C:\Python27_32bit Python27_32bits -rename C:\Python34_32bit Python34_32bits rename C:\Python35_32bit Python35_32bits rename C:\Python36_32bit Python36_32bits diff --git a/tools/run_tests/artifacts/artifact_targets.py b/tools/run_tests/artifacts/artifact_targets.py index f3b6c1b93c6..62dd3e12f8f 100644 --- a/tools/run_tests/artifacts/artifact_targets.py +++ b/tools/run_tests/artifacts/artifact_targets.py @@ -170,7 +170,7 @@ class PythonArtifact: docker_base_image='quay.io/pypa/manylinux1_i686' if self.arch == 'x86' else 'quay.io/pypa/manylinux1_x86_64') elif self.platform == 'windows': - if 'Python27' in self.py_version or 'Python34' in self.py_version: + if 'Python27' in self.py_version: environ['EXT_COMPILER'] = 'mingw32' else: environ['EXT_COMPILER'] = 'msvc' @@ -374,56 +374,47 @@ def targets(): # Add manylinux2010_x86 targets once this issue is resolved. PythonArtifact('manylinux1', 'x86', 'cp27-cp27m'), PythonArtifact('manylinux1', 'x86', 'cp27-cp27mu'), - PythonArtifact('manylinux1', 'x86', 'cp34-cp34m'), PythonArtifact('manylinux1', 'x86', 'cp35-cp35m'), PythonArtifact('manylinux1', 'x86', 'cp36-cp36m'), PythonArtifact('manylinux1', 'x86', 'cp37-cp37m'), PythonArtifact('manylinux1', 'x86', 'cp38-cp38'), PythonArtifact('manylinux2010', 'x86', 'cp27-cp27m'), PythonArtifact('manylinux2010', 'x86', 'cp27-cp27mu'), - PythonArtifact('manylinux2010', 'x86', 'cp34-cp34m'), PythonArtifact('manylinux2010', 'x86', 'cp35-cp35m'), PythonArtifact('manylinux2010', 'x86', 'cp36-cp36m'), PythonArtifact('manylinux2010', 'x86', 'cp37-cp37m'), PythonArtifact('manylinux2010', 'x86', 'cp38-cp38'), PythonArtifact('linux_extra', 'armv7', '2.7'), - PythonArtifact('linux_extra', 'armv7', '3.4'), PythonArtifact('linux_extra', 'armv7', '3.5'), PythonArtifact('linux_extra', 'armv7', '3.6'), PythonArtifact('linux_extra', 'armv6', '2.7'), - PythonArtifact('linux_extra', 'armv6', '3.4'), PythonArtifact('linux_extra', 'armv6', '3.5'), PythonArtifact('linux_extra', 'armv6', '3.6'), PythonArtifact('manylinux1', 'x64', 'cp27-cp27m'), PythonArtifact('manylinux1', 'x64', 'cp27-cp27mu'), - PythonArtifact('manylinux1', 'x64', 'cp34-cp34m'), PythonArtifact('manylinux1', 'x64', 'cp35-cp35m'), PythonArtifact('manylinux1', 'x64', 'cp36-cp36m'), PythonArtifact('manylinux1', 'x64', 'cp37-cp37m'), PythonArtifact('manylinux1', 'x64', 'cp38-cp38'), PythonArtifact('manylinux2010', 'x64', 'cp27-cp27m'), PythonArtifact('manylinux2010', 'x64', 'cp27-cp27mu'), - PythonArtifact('manylinux2010', 'x64', 'cp34-cp34m'), PythonArtifact('manylinux2010', 'x64', 'cp35-cp35m'), PythonArtifact('manylinux2010', 'x64', 'cp36-cp36m'), PythonArtifact('manylinux2010', 'x64', 'cp37-cp37m'), PythonArtifact('manylinux2010', 'x64', 'cp38-cp38'), PythonArtifact('macos', 'x64', 'python2.7'), - PythonArtifact('macos', 'x64', 'python3.4'), PythonArtifact('macos', 'x64', 'python3.5'), PythonArtifact('macos', 'x64', 'python3.6'), PythonArtifact('macos', 'x64', 'python3.7'), # TODO(https://github.com/grpc/grpc/issues/20615) Enable this artifact # PythonArtifact('macos', 'x64', 'python3.8'), PythonArtifact('windows', 'x86', 'Python27_32bits'), - PythonArtifact('windows', 'x86', 'Python34_32bits'), PythonArtifact('windows', 'x86', 'Python35_32bits'), PythonArtifact('windows', 'x86', 'Python36_32bits'), PythonArtifact('windows', 'x86', 'Python37_32bits'), # TODO(https://github.com/grpc/grpc/issues/20615) Enable this artifact # PythonArtifact('windows', 'x86', 'Python38_32bits'), PythonArtifact('windows', 'x64', 'Python27'), - PythonArtifact('windows', 'x64', 'Python34'), PythonArtifact('windows', 'x64', 'Python35'), PythonArtifact('windows', 'x64', 'Python36'), PythonArtifact('windows', 'x64', 'Python37'), diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 59edaaed4ed..7a5a6e90aac 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -773,8 +773,6 @@ class PythonLanguage(object): return 'stretch_' + self.args.compiler[len('python'):] elif self.args.compiler == 'python_alpine': return 'alpine' - elif self.args.compiler == 'python3.4': - return 'jessie' else: return 'stretch_default' @@ -828,12 +826,6 @@ class PythonLanguage(object): minor='7', bits=bits, config_vars=config_vars) - python34_config = _python_config_generator( - name='py34', - major='3', - minor='4', - bits=bits, - config_vars=config_vars) python35_config = _python_config_generator( name='py35', major='3', @@ -884,8 +876,6 @@ class PythonLanguage(object): ) elif args.compiler == 'python2.7': return (python27_config,) - elif args.compiler == 'python3.4': - return (python34_config,) elif args.compiler == 'python3.5': return (python35_config,) elif args.compiler == 'python3.6': @@ -903,11 +893,10 @@ class PythonLanguage(object): elif args.compiler == 'all_the_cpythons': return ( python27_config, - python34_config, python35_config, python36_config, python37_config, - # TODO: Add Python 3.8 once it's released. + python38_config, ) else: raise Exception('Compiler %s not supported.' % args.compiler) @@ -1479,7 +1468,7 @@ argp.add_argument( choices=[ 'default', 'gcc4.4', 'gcc4.6', 'gcc4.8', 'gcc4.9', 'gcc5.3', 'gcc7.4', 'gcc8.3', 'gcc_musl', 'clang3.4', 'clang3.5', 'clang3.6', 'clang3.7', - 'clang7.0', 'python2.7', 'python3.4', 'python3.5', 'python3.6', + 'clang7.0', 'python2.7', 'python3.5', 'python3.6', 'python3.7', 'python3.8', 'pypy', 'pypy3', 'python_alpine', 'all_the_cpythons', 'electron1.3', 'electron1.6', 'coreclr', 'cmake', 'cmake_vs2015', 'cmake_vs2017' From 99478f1fe9a2da65861b4d8cf8219007439c874b Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Wed, 30 Oct 2019 14:48:40 -0700 Subject: [PATCH 025/133] Security Handshaker changes --- .../security/transport/security_handshaker.cc | 35 ++++++++++++++----- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/src/core/lib/security/transport/security_handshaker.cc b/src/core/lib/security/transport/security_handshaker.cc index 0128a344e1f..3bb0b14d1c5 100644 --- a/src/core/lib/security/transport/security_handshaker.cc +++ b/src/core/lib/security/transport/security_handshaker.cc @@ -66,6 +66,8 @@ class SecurityHandshaker : public Handshaker { void HandshakeFailedLocked(grpc_error* error); void CleanupArgsForFailureLocked(); + static void ScheduleRead(void* arg, grpc_error* /* error */); + static void ScheduleWrite(void* arg, grpc_error* /* error */); static void OnHandshakeDataReceivedFromPeerFn(void* arg, grpc_error* error); static void OnHandshakeDataSentToPeerFn(void* arg, grpc_error* error); static void OnHandshakeNextDoneGrpcWrapper( @@ -94,6 +96,8 @@ class SecurityHandshaker : public Handshaker { size_t handshake_buffer_size_; unsigned char* handshake_buffer_; grpc_slice_buffer outgoing_; + grpc_closure schedule_read_closure_; + grpc_closure schedule_write_closure_; grpc_closure on_handshake_data_sent_to_peer_; grpc_closure on_handshake_data_received_from_peer_; grpc_closure on_peer_checked_; @@ -118,6 +122,11 @@ SecurityHandshaker::SecurityHandshaker(tsi_handshaker* handshaker, } gpr_mu_init(&mu_); grpc_slice_buffer_init(&outgoing_); + GRPC_CLOSURE_INIT(&schedule_read_closure_, &SecurityHandshaker::ScheduleRead, + this, grpc_schedule_on_exec_ctx); + GRPC_CLOSURE_INIT(&schedule_write_closure_, + &SecurityHandshaker::ScheduleWrite, this, + grpc_schedule_on_exec_ctx); GRPC_CLOSURE_INIT(&on_handshake_data_sent_to_peer_, &SecurityHandshaker::OnHandshakeDataSentToPeerFn, this, grpc_schedule_on_exec_ctx); @@ -283,6 +292,19 @@ grpc_error* SecurityHandshaker::CheckPeerLocked() { return GRPC_ERROR_NONE; } +void SecurityHandshaker::ScheduleRead(void* arg, grpc_error* /* error */) { + SecurityHandshaker* h = static_cast(arg); + grpc_endpoint_read(h->args_->endpoint, h->args_->read_buffer, + &h->on_handshake_data_received_from_peer_, + /*urgent=*/true); +} + +void SecurityHandshaker::ScheduleWrite(void* arg, grpc_error* /* error */) { + SecurityHandshaker* h = static_cast(arg); + grpc_endpoint_write(h->args_->endpoint, &h->outgoing_, + &h->on_handshake_data_sent_to_peer_, nullptr); +} + grpc_error* SecurityHandshaker::OnHandshakeNextDoneLocked( tsi_result result, const unsigned char* bytes_to_send, size_t bytes_to_send_size, tsi_handshaker_result* handshaker_result) { @@ -294,8 +316,7 @@ grpc_error* SecurityHandshaker::OnHandshakeNextDoneLocked( // Read more if we need to. if (result == TSI_INCOMPLETE_DATA) { GPR_ASSERT(bytes_to_send_size == 0); - grpc_endpoint_read(args_->endpoint, args_->read_buffer, - &on_handshake_data_received_from_peer_, /*urgent=*/true); + GRPC_CLOSURE_SCHED(&schedule_read_closure_, GRPC_ERROR_NONE); return error; } if (result != TSI_OK) { @@ -313,12 +334,10 @@ grpc_error* SecurityHandshaker::OnHandshakeNextDoneLocked( reinterpret_cast(bytes_to_send), bytes_to_send_size); grpc_slice_buffer_reset_and_unref_internal(&outgoing_); grpc_slice_buffer_add(&outgoing_, to_send); - grpc_endpoint_write(args_->endpoint, &outgoing_, - &on_handshake_data_sent_to_peer_, nullptr); + GRPC_CLOSURE_SCHED(&schedule_write_closure_, GRPC_ERROR_NONE); } else if (handshaker_result == nullptr) { // There is nothing to send, but need to read from peer. - grpc_endpoint_read(args_->endpoint, args_->read_buffer, - &on_handshake_data_received_from_peer_, /*urgent=*/true); + GRPC_CLOSURE_SCHED(&schedule_read_closure_, GRPC_ERROR_NONE); } else { // Handshake has finished, check peer and so on. error = CheckPeerLocked(); @@ -393,9 +412,7 @@ void SecurityHandshaker::OnHandshakeDataSentToPeerFn(void* arg, } // We may be done. if (h->handshaker_result_ == nullptr) { - grpc_endpoint_read(h->args_->endpoint, h->args_->read_buffer, - &h->on_handshake_data_received_from_peer_, - /*urgent=*/true); + GRPC_CLOSURE_SCHED(&h->schedule_read_closure_, GRPC_ERROR_NONE); } else { error = h->CheckPeerLocked(); if (error != GRPC_ERROR_NONE) { From 160d33076f4c4f98d4b11ef6025bdb201aecdb15 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Wed, 30 Oct 2019 16:12:46 -0700 Subject: [PATCH 026/133] Make YAPF happy --- tools/run_tests/run_tests.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 7a5a6e90aac..71f401e4b2a 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -1468,10 +1468,10 @@ argp.add_argument( choices=[ 'default', 'gcc4.4', 'gcc4.6', 'gcc4.8', 'gcc4.9', 'gcc5.3', 'gcc7.4', 'gcc8.3', 'gcc_musl', 'clang3.4', 'clang3.5', 'clang3.6', 'clang3.7', - 'clang7.0', 'python2.7', 'python3.5', 'python3.6', - 'python3.7', 'python3.8', 'pypy', 'pypy3', 'python_alpine', - 'all_the_cpythons', 'electron1.3', 'electron1.6', 'coreclr', 'cmake', - 'cmake_vs2015', 'cmake_vs2017' + 'clang7.0', 'python2.7', 'python3.5', 'python3.6', 'python3.7', + 'python3.8', 'pypy', 'pypy3', 'python_alpine', 'all_the_cpythons', + 'electron1.3', 'electron1.6', 'coreclr', 'cmake', 'cmake_vs2015', + 'cmake_vs2017' ], default='default', help= From a5ba140f3cac6bd60df193cd0925d2cdababd47a Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Wed, 30 Oct 2019 16:51:51 -0700 Subject: [PATCH 027/133] Test changes --- test/core/iomgr/endpoint_tests.cc | 32 +++++++++++++++++++++++++++---- test/core/iomgr/tcp_posix_test.cc | 2 +- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/test/core/iomgr/endpoint_tests.cc b/test/core/iomgr/endpoint_tests.cc index beae24769f6..c34676cecdd 100644 --- a/test/core/iomgr/endpoint_tests.cc +++ b/test/core/iomgr/endpoint_tests.cc @@ -114,8 +114,17 @@ struct read_and_write_test_state { grpc_slice_buffer outgoing; grpc_closure done_read; grpc_closure done_write; + grpc_closure read_scheduler; + grpc_closure write_scheduler; }; +static void read_scheduler(void* data, grpc_error* /* error */) { + struct read_and_write_test_state* state = + static_cast(data); + grpc_endpoint_read(state->read_ep, &state->incoming, &state->done_read, + /*urgent=*/false); +} + static void read_and_write_test_read_handler(void* data, grpc_error* error) { struct read_and_write_test_state* state = static_cast(data); @@ -129,11 +138,20 @@ static void read_and_write_test_read_handler(void* data, grpc_error* error) { GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr)); gpr_mu_unlock(g_mu); } else if (error == GRPC_ERROR_NONE) { - grpc_endpoint_read(state->read_ep, &state->incoming, &state->done_read, - /*urgent=*/false); + /* We perform many reads one after another. If grpc_endpoint_read and the + * read_handler are both run inline, we might end up growing the stack + * beyond the limit. Schedule the read on ExecCtx to avoid this. */ + GRPC_CLOSURE_SCHED(&state->read_scheduler, GRPC_ERROR_NONE); } } +static void write_scheduler(void* data, grpc_error* /* error */) { + struct read_and_write_test_state* state = + static_cast(data); + grpc_endpoint_write(state->write_ep, &state->outgoing, &state->done_write, + nullptr); +} + static void read_and_write_test_write_handler(void* data, grpc_error* error) { struct read_and_write_test_state* state = static_cast(data); @@ -151,8 +169,10 @@ static void read_and_write_test_write_handler(void* data, grpc_error* error) { &state->current_write_data); grpc_slice_buffer_reset_and_unref(&state->outgoing); grpc_slice_buffer_addn(&state->outgoing, slices, nslices); - grpc_endpoint_write(state->write_ep, &state->outgoing, &state->done_write, - nullptr); + /* We perform many writes one after another. If grpc_endpoint_write and + * the write_handler are both run inline, we might end up growing the + * stack beyond the limit. Schedule the write on ExecCtx to avoid this. */ + GRPC_CLOSURE_SCHED(&state->write_scheduler, GRPC_ERROR_NONE); gpr_free(slices); return; } @@ -202,8 +222,12 @@ static void read_and_write_test(grpc_endpoint_test_config config, state.write_done = 0; state.current_read_data = 0; state.current_write_data = 0; + GRPC_CLOSURE_INIT(&state.read_scheduler, read_scheduler, &state, + grpc_schedule_on_exec_ctx); GRPC_CLOSURE_INIT(&state.done_read, read_and_write_test_read_handler, &state, grpc_schedule_on_exec_ctx); + GRPC_CLOSURE_INIT(&state.write_scheduler, write_scheduler, &state, + grpc_schedule_on_exec_ctx); GRPC_CLOSURE_INIT(&state.done_write, read_and_write_test_write_handler, &state, grpc_schedule_on_exec_ctx); grpc_slice_buffer_init(&state.outgoing); diff --git a/test/core/iomgr/tcp_posix_test.cc b/test/core/iomgr/tcp_posix_test.cc index a202533889d..f56f4f128e4 100644 --- a/test/core/iomgr/tcp_posix_test.cc +++ b/test/core/iomgr/tcp_posix_test.cc @@ -191,9 +191,9 @@ static void read_cb(void* user_data, grpc_error* error) { GRPC_LOG_IF_ERROR("kick", grpc_pollset_kick(g_pollset, nullptr))); gpr_mu_unlock(g_mu); } else { + gpr_mu_unlock(g_mu); grpc_endpoint_read(state->ep, &state->incoming, &state->read_cb, /*urgent=*/false); - gpr_mu_unlock(g_mu); } } From e2ee7bb679cfc41d86ea8267750648df7b0bd44a Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Wed, 30 Oct 2019 17:00:16 -0700 Subject: [PATCH 028/133] Disable unit._channel_close_test.ChannelCloseTest --- src/python/grpcio_tests/commands.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/python/grpcio_tests/commands.py b/src/python/grpcio_tests/commands.py index 301a2bea23b..c1bad9c9123 100644 --- a/src/python/grpcio_tests/commands.py +++ b/src/python/grpcio_tests/commands.py @@ -191,7 +191,8 @@ class TestGevent(setuptools.Command): ) BANNED_WINDOWS_TESTS = ( # TODO(https://github.com/grpc/grpc/pull/15411) enable this test - 'unit._dns_resolver_test.DNSResolverTest.test_connect_loopback',) + 'unit._dns_resolver_test.DNSResolverTest.test_connect_loopback', + 'unit._channel_close_test.ChannelCloseTest',) description = 'run tests with gevent. Assumes grpc/gevent are installed' user_options = [] From f994f2ea180cce56f31b86243a00543d8c59ede2 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Wed, 30 Oct 2019 17:17:12 -0700 Subject: [PATCH 029/133] Keep the manylinux Dockerfiles unchanged --- tools/dockerfile/grpc_artifact_python_manylinux1_x64/Dockerfile | 1 + tools/dockerfile/grpc_artifact_python_manylinux1_x86/Dockerfile | 1 + .../dockerfile/grpc_artifact_python_manylinux2010_x64/Dockerfile | 1 + .../dockerfile/grpc_artifact_python_manylinux2010_x86/Dockerfile | 1 + 4 files changed, 4 insertions(+) diff --git a/tools/dockerfile/grpc_artifact_python_manylinux1_x64/Dockerfile b/tools/dockerfile/grpc_artifact_python_manylinux1_x64/Dockerfile index 7cbcc5f9917..1ff6aa062a2 100644 --- a/tools/dockerfile/grpc_artifact_python_manylinux1_x64/Dockerfile +++ b/tools/dockerfile/grpc_artifact_python_manylinux1_x64/Dockerfile @@ -24,6 +24,7 @@ RUN yum install -y curl-devel expat-devel gettext-devel linux-headers openssl-de # Install Python build requirements RUN /opt/python/cp27-cp27m/bin/pip install cython RUN /opt/python/cp27-cp27mu/bin/pip install cython +RUN /opt/python/cp34-cp34m/bin/pip install cython RUN /opt/python/cp35-cp35m/bin/pip install cython RUN /opt/python/cp36-cp36m/bin/pip install cython RUN /opt/python/cp37-cp37m/bin/pip install cython diff --git a/tools/dockerfile/grpc_artifact_python_manylinux1_x86/Dockerfile b/tools/dockerfile/grpc_artifact_python_manylinux1_x86/Dockerfile index 079901cffaa..18b4cb62927 100644 --- a/tools/dockerfile/grpc_artifact_python_manylinux1_x86/Dockerfile +++ b/tools/dockerfile/grpc_artifact_python_manylinux1_x86/Dockerfile @@ -24,6 +24,7 @@ RUN yum install -y curl-devel expat-devel gettext-devel linux-headers openssl-de # Install Python build requirements RUN /opt/python/cp27-cp27m/bin/pip install cython RUN /opt/python/cp27-cp27mu/bin/pip install cython +RUN /opt/python/cp34-cp34m/bin/pip install cython RUN /opt/python/cp35-cp35m/bin/pip install cython RUN /opt/python/cp36-cp36m/bin/pip install cython RUN /opt/python/cp37-cp37m/bin/pip install cython diff --git a/tools/dockerfile/grpc_artifact_python_manylinux2010_x64/Dockerfile b/tools/dockerfile/grpc_artifact_python_manylinux2010_x64/Dockerfile index f8ea86465f2..66aefcaac28 100644 --- a/tools/dockerfile/grpc_artifact_python_manylinux2010_x64/Dockerfile +++ b/tools/dockerfile/grpc_artifact_python_manylinux2010_x64/Dockerfile @@ -24,6 +24,7 @@ RUN yum install -y curl-devel expat-devel gettext-devel linux-headers openssl-de # Install Python build requirements RUN /opt/python/cp27-cp27m/bin/pip install cython RUN /opt/python/cp27-cp27mu/bin/pip install cython +RUN /opt/python/cp34-cp34m/bin/pip install cython RUN /opt/python/cp35-cp35m/bin/pip install cython RUN /opt/python/cp36-cp36m/bin/pip install cython RUN /opt/python/cp37-cp37m/bin/pip install cython diff --git a/tools/dockerfile/grpc_artifact_python_manylinux2010_x86/Dockerfile b/tools/dockerfile/grpc_artifact_python_manylinux2010_x86/Dockerfile index adc392c25c3..f55a8785182 100644 --- a/tools/dockerfile/grpc_artifact_python_manylinux2010_x86/Dockerfile +++ b/tools/dockerfile/grpc_artifact_python_manylinux2010_x86/Dockerfile @@ -24,6 +24,7 @@ RUN yum install -y curl-devel expat-devel gettext-devel linux-headers openssl-de # Install Python build requirements RUN /opt/python/cp27-cp27m/bin/pip install cython RUN /opt/python/cp27-cp27mu/bin/pip install cython +RUN /opt/python/cp34-cp34m/bin/pip install cython RUN /opt/python/cp35-cp35m/bin/pip install cython RUN /opt/python/cp36-cp36m/bin/pip install cython RUN /opt/python/cp37-cp37m/bin/pip install cython From 3cd792ad70b875ee088cc5015b8e02d498e2d428 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Wed, 30 Oct 2019 18:21:41 -0700 Subject: [PATCH 030/133] Make YAPF happy --- src/python/grpcio_tests/commands.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/python/grpcio_tests/commands.py b/src/python/grpcio_tests/commands.py index c1bad9c9123..dd11ab1261d 100644 --- a/src/python/grpcio_tests/commands.py +++ b/src/python/grpcio_tests/commands.py @@ -192,7 +192,8 @@ class TestGevent(setuptools.Command): BANNED_WINDOWS_TESTS = ( # TODO(https://github.com/grpc/grpc/pull/15411) enable this test 'unit._dns_resolver_test.DNSResolverTest.test_connect_loopback', - 'unit._channel_close_test.ChannelCloseTest',) + 'unit._channel_close_test.ChannelCloseTest', + ) description = 'run tests with gevent. Assumes grpc/gevent are installed' user_options = [] From 8b597ad5ba1434db81df33d587b2218ebfc3944a Mon Sep 17 00:00:00 2001 From: Vijay Pai Date: Wed, 30 Oct 2019 22:05:43 -0700 Subject: [PATCH 031/133] Change unused parameter name comment to cast --- src/core/lib/iomgr/buffer_list.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/core/lib/iomgr/buffer_list.cc b/src/core/lib/iomgr/buffer_list.cc index f2691b0826a..ed9dd64c44e 100644 --- a/src/core/lib/iomgr/buffer_list.cc +++ b/src/core/lib/iomgr/buffer_list.cc @@ -294,7 +294,11 @@ void grpc_tcp_set_write_timestamps_callback(void (*fn)(void*, namespace grpc_core { void grpc_tcp_set_write_timestamps_callback( - void (*/*fn*/)(void*, grpc_core::Timestamps*, grpc_error* error)) { + void (*fn)(void*, grpc_core::Timestamps*, grpc_error* error)) { + // Cast value of fn to void to avoid unused parameter warning. + // Can't comment out the name because some compilers and formatters don't + // like the sequence */* , which would arise from */*fn*/. + (void)fn; gpr_log(GPR_DEBUG, "Timestamps callback is not enabled for this platform"); } } /* namespace grpc_core */ From 7b9349de049878df17efda0694032297f02ef524 Mon Sep 17 00:00:00 2001 From: Vijay Pai Date: Wed, 30 Oct 2019 22:29:03 -0700 Subject: [PATCH 032/133] clang-format --- src/core/lib/iomgr/buffer_list.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/core/lib/iomgr/buffer_list.cc b/src/core/lib/iomgr/buffer_list.cc index ed9dd64c44e..722e9036b32 100644 --- a/src/core/lib/iomgr/buffer_list.cc +++ b/src/core/lib/iomgr/buffer_list.cc @@ -293,8 +293,9 @@ void grpc_tcp_set_write_timestamps_callback(void (*fn)(void*, #else /* GRPC_LINUX_ERRQUEUE */ namespace grpc_core { -void grpc_tcp_set_write_timestamps_callback( - void (*fn)(void*, grpc_core::Timestamps*, grpc_error* error)) { +void grpc_tcp_set_write_timestamps_callback(void (*fn)(void*, + grpc_core::Timestamps*, + grpc_error* error)) { // Cast value of fn to void to avoid unused parameter warning. // Can't comment out the name because some compilers and formatters don't // like the sequence */* , which would arise from */*fn*/. From 6aa41ee7607f3b266d508c653e2f5c3b36c5e3f7 Mon Sep 17 00:00:00 2001 From: Eytan Kidron Date: Thu, 31 Oct 2019 11:04:07 -0400 Subject: [PATCH 033/133] Removed LARGE_MACHINE from bazel/grpc_build_system.bzl --- bazel/grpc_build_system.bzl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl index 3450b791bbd..0ca38b0b2b5 100644 --- a/bazel/grpc_build_system.bzl +++ b/bazel/grpc_build_system.bzl @@ -31,10 +31,6 @@ load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test") # The set of pollers to test against if a test exercises polling POLLERS = ["epollex", "epoll1", "poll"] -# set exec_properties = LARGE_MACHINE, to run the test on a large machine -# see //third_party/toolchains/machine_size for details -LARGE_MACHINE = { "gceMachineType" : "n1-standard-8"} - def if_not_windows(a): return select({ "//:windows": [], From 61d463672db63eab311a14587d33bef60e600927 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Thu, 31 Oct 2019 13:39:43 -0700 Subject: [PATCH 034/133] Windows' gevent is always special! --- src/python/grpcio_tests/commands.py | 4 +--- tools/run_tests/helper_scripts/build_python.sh | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/python/grpcio_tests/commands.py b/src/python/grpcio_tests/commands.py index dd11ab1261d..301a2bea23b 100644 --- a/src/python/grpcio_tests/commands.py +++ b/src/python/grpcio_tests/commands.py @@ -191,9 +191,7 @@ class TestGevent(setuptools.Command): ) BANNED_WINDOWS_TESTS = ( # TODO(https://github.com/grpc/grpc/pull/15411) enable this test - 'unit._dns_resolver_test.DNSResolverTest.test_connect_loopback', - 'unit._channel_close_test.ChannelCloseTest', - ) + 'unit._dns_resolver_test.DNSResolverTest.test_connect_loopback',) description = 'run tests with gevent. Assumes grpc/gevent are installed' user_options = [] diff --git a/tools/run_tests/helper_scripts/build_python.sh b/tools/run_tests/helper_scripts/build_python.sh index 87c16a2ec4f..32cf2325769 100755 --- a/tools/run_tests/helper_scripts/build_python.sh +++ b/tools/run_tests/helper_scripts/build_python.sh @@ -166,7 +166,7 @@ pip_install_dir() { } case "$VENV" in - *py35_gevent*) + *py36_gevent*) # TODO(https://github.com/grpc/grpc/issues/15411) unpin this $VENV_PYTHON -m pip install gevent==1.3.b1 ;; From 8086d8ee42268fe9b2faf9ff25cc4abb3fcb4c36 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Thu, 31 Oct 2019 14:09:55 -0700 Subject: [PATCH 035/133] Update abseil-cpp to HEAD --- bazel/grpc_deps.bzl | 6 +++--- third_party/abseil-cpp | 2 +- tools/run_tests/sanity/check_submodules.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl index a6b62554f38..a32d9480090 100644 --- a/bazel/grpc_deps.bzl +++ b/bazel/grpc_deps.bzl @@ -165,9 +165,9 @@ def grpc_deps(): if "com_google_absl" not in native.existing_rules(): http_archive( name = "com_google_absl", - sha256 = "fd4edc10767c28b23bf9f41114c6bcd9625c165a31baa0e6939f01058029a912", - strip_prefix = "abseil-cpp-74d91756c11bc22f9b0108b94da9326f7f9e376f", - url = "https://github.com/abseil/abseil-cpp/archive/74d91756c11bc22f9b0108b94da9326f7f9e376f.tar.gz", + sha256 = "c5f6429c067e6b8f3c6d13d1ab2bdcd559c6f8b85317aa5b0dc8c364c37d1742", + strip_prefix = "abseil-cpp-846e5dbedac123d12455adcfe6f53c8b5dcbfeef", + url = "https://github.com/abseil/abseil-cpp/archive/846e5dbedac123d12455adcfe6f53c8b5dcbfeef.tar.gz", ) if "bazel_toolchains" not in native.existing_rules(): diff --git a/third_party/abseil-cpp b/third_party/abseil-cpp index 74d91756c11..846e5dbedac 160000 --- a/third_party/abseil-cpp +++ b/third_party/abseil-cpp @@ -1 +1 @@ -Subproject commit 74d91756c11bc22f9b0108b94da9326f7f9e376f +Subproject commit 846e5dbedac123d12455adcfe6f53c8b5dcbfeef diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh index 15965463179..340372c3034 100755 --- a/tools/run_tests/sanity/check_submodules.sh +++ b/tools/run_tests/sanity/check_submodules.sh @@ -26,7 +26,7 @@ want_submodules=$(mktemp /tmp/submXXXXXX) git submodule | awk '{ print $1 }' | sort > "$submodules" cat << EOF | awk '{ print $1 }' | sort > "$want_submodules" - 74d91756c11bc22f9b0108b94da9326f7f9e376f third_party/abseil-cpp (74d9175) + 846e5dbedac123d12455adcfe6f53c8b5dcbfeef third_party/abseil-cpp (heads/master) 090faecb454fbd6e6e17a75ef8146acb037118d4 third_party/benchmark (v1.5.0) 73594cde8c9a52a102c4341c244c833aa61b9c06 third_party/bloaty (remotes/origin/wide-14-g73594cd) 7f02881e96e51f1873afcf384d02f782b48967ca third_party/boringssl (remotes/origin/HEAD) From 2817afd4e96cc9be2095d120accb012f457274c6 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Thu, 31 Oct 2019 16:41:14 -0700 Subject: [PATCH 036/133] Make sure Core aware of gevent Cython objects --- .../grpcio/grpc/_cython/_cygrpc/grpc_gevent.pyx.pxi | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/grpc_gevent.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/grpc_gevent.pyx.pxi index 13256ed49b8..1f59cfd159d 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/grpc_gevent.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/grpc_gevent.pyx.pxi @@ -32,12 +32,16 @@ def _spawn_greenlet(*args): cdef class SocketWrapper: def __cinit__(self): + fork_handlers_and_grpc_init() self.sockopts = [] self.socket = None self.c_socket = NULL self.c_buffer = NULL self.len = 0 + def __dealloc__(self): + grpc_shutdown_blocking() + cdef grpc_error* socket_init(grpc_custom_socket* socket, int domain) with gil: sw = SocketWrapper() sw.c_socket = socket @@ -258,10 +262,14 @@ cdef void socket_accept(grpc_custom_socket* socket, grpc_custom_socket* client, cdef class ResolveWrapper: def __cinit__(self): + fork_handlers_and_grpc_init() self.c_resolver = NULL self.c_host = NULL self.c_port = NULL + def __dealloc__(self): + grpc_shutdown_blocking() + cdef socket_resolve_async_cython(ResolveWrapper resolve_wrapper): try: res = gevent_socket.getaddrinfo(resolve_wrapper.c_host, resolve_wrapper.c_port) @@ -298,6 +306,7 @@ cdef grpc_error* socket_resolve(char* host, char* port, cdef class TimerWrapper: def __cinit__(self, deadline): + fork_handlers_and_grpc_init() self.timer = gevent_hub.get_hub().loop.timer(deadline) self.event = None @@ -314,6 +323,9 @@ cdef class TimerWrapper: self.event.set() self.timer.stop() + def __dealloc__(self): + grpc_shutdown_blocking() + cdef void timer_start(grpc_custom_timer* t) with gil: timer = TimerWrapper(t.timeout_ms / 1000.0) timer.c_timer = t From 336b476d32621cd9f5a896bbdbd8e31dc9a3176f Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Thu, 31 Oct 2019 16:41:40 -0700 Subject: [PATCH 037/133] Adding ExecCtx::Run --- src/core/lib/iomgr/closure.h | 38 ---------------------------------- src/core/lib/iomgr/exec_ctx.cc | 22 ++++++++++++++++++++ src/core/lib/iomgr/exec_ctx.h | 4 ++++ 3 files changed, 26 insertions(+), 38 deletions(-) diff --git a/src/core/lib/iomgr/closure.h b/src/core/lib/iomgr/closure.h index c7b2e8299b9..a7bf4f70c98 100644 --- a/src/core/lib/iomgr/closure.h +++ b/src/core/lib/iomgr/closure.h @@ -277,44 +277,6 @@ inline void grpc_closure_run(grpc_closure* c, grpc_error* error) { #define GRPC_CLOSURE_RUN(closure, error) grpc_closure_run(closure, error) #endif -#ifndef NDEBUG -inline void grpc_closure_sched(const char* file, int line, grpc_closure* c, - grpc_error* error) { -#else -inline void grpc_closure_sched(grpc_closure* c, grpc_error* error) { -#endif - GPR_TIMER_SCOPE("grpc_closure_sched", 0); - if (c != nullptr) { -#ifndef NDEBUG - if (c->scheduled) { - gpr_log(GPR_ERROR, - "Closure already scheduled. (closure: %p, created: [%s:%d], " - "previously scheduled at: [%s: %d], newly scheduled at [%s: %d], " - "run?: %s", - c, c->file_created, c->line_created, c->file_initiated, - c->line_initiated, file, line, c->run ? "true" : "false"); - abort(); - } - c->scheduled = true; - c->file_initiated = file; - c->line_initiated = line; - c->run = false; - GPR_ASSERT(c->cb != nullptr); -#endif - c->scheduler->vtable->sched(c, error); - } else { - GRPC_ERROR_UNREF(error); - } -} - -/** Schedule a closure to be run. Does not need to be run from a safe point. */ -#ifndef NDEBUG -#define GRPC_CLOSURE_SCHED(closure, error) \ - grpc_closure_sched(__FILE__, __LINE__, closure, error) -#else -#define GRPC_CLOSURE_SCHED(closure, error) grpc_closure_sched(closure, error) -#endif - #ifndef NDEBUG inline void grpc_closure_list_sched(const char* file, int line, grpc_closure_list* list) { diff --git a/src/core/lib/iomgr/exec_ctx.cc b/src/core/lib/iomgr/exec_ctx.cc index 730237a250d..ac78b566ec9 100644 --- a/src/core/lib/iomgr/exec_ctx.cc +++ b/src/core/lib/iomgr/exec_ctx.cc @@ -174,4 +174,26 @@ grpc_millis ExecCtx::Now() { return now_; } +void ExecCtx::Run(const DebugLocation& location, grpc_closure* closure, + grpc_error* error) { +#ifndef NDEBUG + if (closure->scheduled) { + gpr_log(GPR_ERROR, + "Closure already scheduled. (closure: %p, created: [%s:%d], " + "previously scheduled at: [%s: %d], newly scheduled at [%s: %d], " + "run?: %s", + closure, closure->file_created, closure->line_created, + closure->file_initiated, closure->line_initiated, location.file(), + location.line(), closure->run ? "true" : "false"); + abort(); + } + closure->scheduled = true; + closure->file_initiated = file; + closure->line_initiated = line; + closure->run = false; + GPR_ASSERT(closure->cb != nullptr); +#endif + exec_ctx_sched(closure, error); +} + } // namespace grpc_core diff --git a/src/core/lib/iomgr/exec_ctx.h b/src/core/lib/iomgr/exec_ctx.h index 32bbcbf8a19..49251b99ecb 100644 --- a/src/core/lib/iomgr/exec_ctx.h +++ b/src/core/lib/iomgr/exec_ctx.h @@ -28,6 +28,7 @@ #include "src/core/lib/gpr/time_precise.h" #include "src/core/lib/gpr/tls.h" +#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/fork.h" #include "src/core/lib/iomgr/closure.h" @@ -221,6 +222,9 @@ class ExecCtx { gpr_tls_set(&exec_ctx_, reinterpret_cast(exec_ctx)); } + static void Run(const DebugLocation& location, grpc_closure* closure, + grpc_error* error); + protected: /** Check if ready to finish. */ virtual bool CheckReadyToFinish() { return false; } From 5d18d4450a04b0e4cad8a3e66894e08e62b8187e Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Thu, 31 Oct 2019 17:05:31 -0700 Subject: [PATCH 038/133] src/core changes --- .../filters/client_channel/client_channel.cc | 15 ++-- .../health/health_check_client.cc | 3 +- .../client_channel/http_connect_handshaker.cc | 6 +- .../dns/c_ares/grpc_ares_ev_driver_libuv.cc | 8 +- .../dns/c_ares/grpc_ares_ev_driver_windows.cc | 4 +- .../resolver/dns/c_ares/grpc_ares_wrapper.cc | 7 +- .../ext/filters/client_channel/subchannel.cc | 7 +- .../ext/filters/deadline/deadline_filter.cc | 2 +- .../ext/filters/max_age/max_age_filter.cc | 9 +- .../chttp2/client/chttp2_connector.cc | 4 +- .../transport/chttp2/server/chttp2_server.cc | 3 +- .../chttp2/transport/chttp2_transport.cc | 32 ++++--- .../transport/chttp2/transport/frame_data.cc | 2 +- .../chttp2/transport/frame_settings.cc | 5 +- .../cronet/transport/cronet_transport.cc | 71 +++++++++------ .../ext/transport/inproc/inproc_transport.cc | 87 ++++++++++++------- src/core/lib/channel/handshaker.cc | 2 +- src/core/lib/http/httpcli.cc | 2 +- .../lib/http/httpcli_security_connector.cc | 2 +- src/core/lib/iomgr/call_combiner.cc | 10 +-- src/core/lib/iomgr/call_combiner.h | 7 +- src/core/lib/iomgr/endpoint_cfstream.cc | 4 +- src/core/lib/iomgr/ev_epoll1_linux.cc | 5 +- src/core/lib/iomgr/ev_epollex_linux.cc | 8 +- src/core/lib/iomgr/ev_poll_posix.cc | 20 +++-- src/core/lib/iomgr/lockfree_event.cc | 17 ++-- src/core/lib/iomgr/pollset_custom.cc | 2 +- src/core/lib/iomgr/pollset_windows.cc | 4 +- src/core/lib/iomgr/resolve_address_custom.cc | 4 +- src/core/lib/iomgr/resolve_address_posix.cc | 5 +- src/core/lib/iomgr/resolve_address_windows.cc | 2 +- src/core/lib/iomgr/resource_quota.cc | 22 +++-- src/core/lib/iomgr/socket_windows.cc | 4 +- src/core/lib/iomgr/tcp_client_cfstream.cc | 4 +- src/core/lib/iomgr/tcp_client_custom.cc | 2 +- src/core/lib/iomgr/tcp_client_posix.cc | 9 +- src/core/lib/iomgr/tcp_client_windows.cc | 4 +- src/core/lib/iomgr/tcp_custom.cc | 19 ++-- src/core/lib/iomgr/tcp_posix.cc | 20 +++-- src/core/lib/iomgr/tcp_server_custom.cc | 3 +- src/core/lib/iomgr/tcp_server_posix.cc | 3 +- src/core/lib/iomgr/tcp_server_windows.cc | 5 +- src/core/lib/iomgr/tcp_windows.cc | 26 +++--- src/core/lib/iomgr/timer_custom.cc | 7 +- src/core/lib/iomgr/timer_generic.cc | 15 ++-- src/core/lib/iomgr/udp_server.cc | 3 +- .../composite/composite_credentials.cc | 3 +- .../credentials/fake/fake_credentials.cc | 3 +- .../credentials/oauth2/oauth2_credentials.cc | 8 +- .../credentials/plugin/plugin_credentials.cc | 7 +- .../alts/alts_security_connector.cc | 2 +- .../fake/fake_security_connector.cc | 2 +- .../local/local_security_connector.cc | 4 +- .../ssl/ssl_security_connector.cc | 4 +- .../tls/spiffe_security_connector.cc | 8 +- .../lib/security/transport/secure_endpoint.cc | 9 +- .../security/transport/security_handshaker.cc | 10 +-- .../security/transport/server_auth_filter.cc | 2 +- src/core/lib/surface/call.cc | 8 +- src/core/lib/surface/completion_queue.cc | 4 +- src/core/lib/surface/lame_client.cc | 14 ++- src/core/lib/surface/server.cc | 15 ++-- src/core/lib/transport/connectivity_state.cc | 2 +- src/core/lib/transport/transport.cc | 6 +- 64 files changed, 354 insertions(+), 262 deletions(-) diff --git a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc index 8812b2b1ad6..a8395d8d504 100644 --- a/src/core/ext/filters/client_channel/client_channel.cc +++ b/src/core/ext/filters/client_channel/client_channel.cc @@ -1163,7 +1163,7 @@ void ChannelData::ExternalConnectivityWatcher::Notify( chand_->RemoveExternalConnectivityWatcher(on_complete_, /*cancel=*/false); // Report new state to the user. *state_ = state; - GRPC_CLOSURE_SCHED(on_complete_, GRPC_ERROR_NONE); + ExecCtx::Run(DEBUG_LOCATION, on_complete_, GRPC_ERROR_NONE); // Hop back into the combiner to clean up. // Not needed in state SHUTDOWN, because the tracker will // automatically remove all watchers in that case. @@ -1180,7 +1180,7 @@ void ChannelData::ExternalConnectivityWatcher::Cancel() { MemoryOrder::RELAXED)) { return; // Already done. } - GRPC_CLOSURE_SCHED(on_complete_, GRPC_ERROR_CANCELLED); + ExecCtx::Run(DEBUG_LOCATION, on_complete_, GRPC_ERROR_CANCELLED); // Hop back into the combiner to clean up. chand_->combiner_->Run( GRPC_CLOSURE_INIT(&remove_closure_, RemoveWatcherLocked, this, nullptr), @@ -1826,8 +1826,9 @@ void ChannelData::StartTransportOpLocked(void* arg, grpc_error* /*ignored*/) { if (op->send_ping.on_initiate != nullptr || op->send_ping.on_ack != nullptr) { grpc_error* error = chand->DoPingLocked(op); if (error != GRPC_ERROR_NONE) { - GRPC_CLOSURE_SCHED(op->send_ping.on_initiate, GRPC_ERROR_REF(error)); - GRPC_CLOSURE_SCHED(op->send_ping.on_ack, error); + ExecCtx::Run(DEBUG_LOCATION, op->send_ping.on_initiate, + GRPC_ERROR_REF(error)); + ExecCtx::Run(DEBUG_LOCATION, op->send_ping.on_ack, error); } op->bind_pollset = nullptr; op->send_ping.on_initiate = nullptr; @@ -1869,7 +1870,7 @@ void ChannelData::StartTransportOpLocked(void* arg, grpc_error* /*ignored*/) { } } GRPC_CHANNEL_STACK_UNREF(chand->owning_stack_, "start_transport_op"); - GRPC_CLOSURE_SCHED(op->on_consumed, GRPC_ERROR_NONE); + ExecCtx::Run(DEBUG_LOCATION, op->on_consumed, GRPC_ERROR_NONE); } void ChannelData::StartTransportOp(grpc_channel_element* elem, @@ -2058,7 +2059,7 @@ void CallData::Destroy(grpc_call_element* elem, then_schedule_closure = nullptr; } calld->~CallData(); - GRPC_CLOSURE_SCHED(then_schedule_closure, GRPC_ERROR_NONE); + ExecCtx::Run(DEBUG_LOCATION, then_schedule_closure, GRPC_ERROR_NONE); } void CallData::StartTransportStreamOpBatch( @@ -3679,7 +3680,7 @@ void CallData::CreateSubchannelCall(grpc_call_element* elem) { void CallData::AsyncPickDone(grpc_call_element* elem, grpc_error* error) { GRPC_CLOSURE_INIT(&pick_closure_, PickDone, elem, grpc_schedule_on_exec_ctx); - GRPC_CLOSURE_SCHED(&pick_closure_, error); + ExecCtx::Run(DEBUG_LOCATION, &pick_closure_, error); } void CallData::PickDone(void* arg, grpc_error* error) { diff --git a/src/core/ext/filters/client_channel/health/health_check_client.cc b/src/core/ext/filters/client_channel/health/health_check_client.cc index b5bca9887c9..aa90c3dd2a5 100644 --- a/src/core/ext/filters/client_channel/health/health_check_client.cc +++ b/src/core/ext/filters/client_channel/health/health_check_client.cc @@ -300,7 +300,8 @@ void HealthCheckClient::CallState::StartCall() { // Schedule instead of running directly, since we must not be // holding health_check_client_->mu_ when CallEnded() is called. call_->Ref(DEBUG_LOCATION, "call_end_closure").release(); - GRPC_CLOSURE_SCHED( + ExecCtx::Run( + DEBUG_LOCATION, GRPC_CLOSURE_INIT(&batch_.handler_private.closure, CallEndedRetry, this, grpc_schedule_on_exec_ctx), GRPC_ERROR_NONE); diff --git a/src/core/ext/filters/client_channel/http_connect_handshaker.cc b/src/core/ext/filters/client_channel/http_connect_handshaker.cc index 64ed7746761..28ec64e8605 100644 --- a/src/core/ext/filters/client_channel/http_connect_handshaker.cc +++ b/src/core/ext/filters/client_channel/http_connect_handshaker.cc @@ -125,7 +125,7 @@ void HttpConnectHandshaker::HandshakeFailedLocked(grpc_error* error) { is_shutdown_ = true; } // Invoke callback. - GRPC_CLOSURE_SCHED(on_handshake_done_, error); + ExecCtx::Run(DEBUG_LOCATION, on_handshake_done_, error); } // Callback invoked when finished writing HTTP CONNECT request. @@ -222,7 +222,7 @@ void HttpConnectHandshaker::OnReadDone(void* arg, grpc_error* error) { goto done; } // Success. Invoke handshake-done callback. - GRPC_CLOSURE_SCHED(handshaker->on_handshake_done_, error); + ExecCtx::Run(DEBUG_LOCATION, handshaker->on_handshake_done_, error); done: // Set shutdown to true so that subsequent calls to // http_connect_handshaker_shutdown() do nothing. @@ -260,7 +260,7 @@ void HttpConnectHandshaker::DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/, gpr_mu_lock(&mu_); is_shutdown_ = true; gpr_mu_unlock(&mu_); - GRPC_CLOSURE_SCHED(on_handshake_done, GRPC_ERROR_NONE); + ExecCtx::Run(DEBUG_LOCATION, on_handshake_done, GRPC_ERROR_NONE); return; } // Get headers from channel args. diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc index f5acec4fda7..7fb6cde600c 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc @@ -81,10 +81,10 @@ class GrpcPolledFdLibuv : public GrpcPolledFd { uv_poll_stop(handle_); uv_close(reinterpret_cast(handle_), ares_uv_poll_close_cb); if (read_closure_ != nullptr) { - GRPC_CLOSURE_SCHED(read_closure_, GRPC_ERROR_CANCELLED); + ExecCtx::Run(DEBUG_LOCATION, read_closure_, GRPC_ERROR_CANCELLED); } if (write_closure_ != nullptr) { - GRPC_CLOSURE_SCHED(write_closure_, GRPC_ERROR_CANCELLED); + ExecCtx::Run(DEBUG_LOCATION, write_closure_, GRPC_ERROR_CANCELLED); } } @@ -135,13 +135,13 @@ static void ares_uv_poll_cb_locked(void* arg, grpc_error* error) { } if (events & UV_READABLE) { GPR_ASSERT(polled_fd->read_closure_ != nullptr); - GRPC_CLOSURE_SCHED(polled_fd->read_closure_, error); + ExecCtx::Run(DEBUG_LOCATION, polled_fd->read_closure_, error); polled_fd->read_closure_ = nullptr; polled_fd->poll_events_ &= ~UV_READABLE; } if (events & UV_WRITABLE) { GPR_ASSERT(polled_fd->write_closure_ != nullptr); - GRPC_CLOSURE_SCHED(polled_fd->write_closure_, error); + ExecCtx::Run(DEBUG_LOCATION, polled_fd->write_closure_, error); polled_fd->write_closure_ = nullptr; polled_fd->poll_events_ &= ~UV_WRITABLE; } diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc index 437645345ba..c25891ac442 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc @@ -128,12 +128,12 @@ class GrpcPolledFdWindows { } void ScheduleAndNullReadClosure(grpc_error* error) { - GRPC_CLOSURE_SCHED(read_closure_, error); + ExecCtx::Run(DEBUG_LOCATION, read_closure_, error); read_closure_ = nullptr; } void ScheduleAndNullWriteClosure(grpc_error* error) { - GRPC_CLOSURE_SCHED(write_closure_, error); + ExecCtx::Run(DEBUG_LOCATION, write_closure_, error); write_closure_ = nullptr; } diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc index 381cbf63b9c..69257bd60cc 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc @@ -148,7 +148,7 @@ void grpc_ares_complete_request_locked(grpc_ares_request* r) { // TODO(apolcyn): allow c-ares to return a service config // with no addresses along side it } - GRPC_CLOSURE_SCHED(r->on_done, r->error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, r->on_done, r->error); } static grpc_ares_hostbyname_request* create_hostbyname_request_locked( @@ -447,7 +447,7 @@ void grpc_dns_lookup_ares_continue_after_check_localhost_and_ip_literals_locked( return; error_cleanup: - GRPC_CLOSURE_SCHED(r->on_done, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, r->on_done, error); } static bool inner_resolve_as_ip_literal_locked( @@ -714,7 +714,8 @@ static void on_dns_lookup_done_locked(void* arg, grpc_error* error) { sizeof(grpc_resolved_address)); } } - GRPC_CLOSURE_SCHED(r->on_resolve_address_done, GRPC_ERROR_REF(error)); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, r->on_resolve_address_done, + GRPC_ERROR_REF(error)); GRPC_COMBINER_UNREF(r->combiner, "on_dns_lookup_done_cb"); grpc_core::Delete(r); } diff --git a/src/core/ext/filters/client_channel/subchannel.cc b/src/core/ext/filters/client_channel/subchannel.cc index 1c245ae427a..c61616aafda 100644 --- a/src/core/ext/filters/client_channel/subchannel.cc +++ b/src/core/ext/filters/client_channel/subchannel.cc @@ -734,9 +734,10 @@ void Subchannel::WeakUnref(GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { old_refs = RefMutate(-static_cast(1), 1 GRPC_SUBCHANNEL_REF_MUTATE_PURPOSE("WEAK_UNREF")); if (old_refs == 1) { - GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(subchannel_destroy, this, - grpc_schedule_on_exec_ctx), - GRPC_ERROR_NONE); + ExecCtx::Run(DEBUG_LOCATION, + GRPC_CLOSURE_CREATE(subchannel_destroy, this, + grpc_schedule_on_exec_ctx), + GRPC_ERROR_NONE); } } diff --git a/src/core/ext/filters/deadline/deadline_filter.cc b/src/core/ext/filters/deadline/deadline_filter.cc index a99d9cb595b..1ea170ec595 100644 --- a/src/core/ext/filters/deadline/deadline_filter.cc +++ b/src/core/ext/filters/deadline/deadline_filter.cc @@ -199,7 +199,7 @@ grpc_deadline_state::grpc_deadline_state(grpc_call_element* elem, grpc_core::New(elem, deadline); GRPC_CLOSURE_INIT(&state->closure, start_timer_after_init, state, grpc_schedule_on_exec_ctx); - GRPC_CLOSURE_SCHED(&state->closure, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, &state->closure, GRPC_ERROR_NONE); } } diff --git a/src/core/ext/filters/max_age/max_age_filter.cc b/src/core/ext/filters/max_age/max_age_filter.cc index c95c687d103..b926be7018c 100644 --- a/src/core/ext/filters/max_age/max_age_filter.cc +++ b/src/core/ext/filters/max_age/max_age_filter.cc @@ -492,7 +492,9 @@ static grpc_error* max_age_init_channel_elem(grpc_channel_element* elem, initialization is done. */ GRPC_CHANNEL_STACK_REF(chand->channel_stack, "max_age start_max_age_timer_after_init"); - GRPC_CLOSURE_SCHED(&chand->start_max_age_timer_after_init, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, + &chand->start_max_age_timer_after_init, + GRPC_ERROR_NONE); } /* Initialize the number of calls as 1, so that the max_idle_timer will not @@ -501,8 +503,9 @@ static grpc_error* max_age_init_channel_elem(grpc_channel_element* elem, if (chand->max_connection_idle != GRPC_MILLIS_INF_FUTURE) { GRPC_CHANNEL_STACK_REF(chand->channel_stack, "max_age start_max_idle_timer_after_init"); - GRPC_CLOSURE_SCHED(&chand->start_max_idle_timer_after_init, - GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, + &chand->start_max_idle_timer_after_init, + GRPC_ERROR_NONE); } return GRPC_ERROR_NONE; } diff --git a/src/core/ext/transport/chttp2/client/chttp2_connector.cc b/src/core/ext/transport/chttp2/client/chttp2_connector.cc index 6b6d299b6e2..18a2df8a2d0 100644 --- a/src/core/ext/transport/chttp2/client/chttp2_connector.cc +++ b/src/core/ext/transport/chttp2/client/chttp2_connector.cc @@ -150,7 +150,7 @@ static void on_handshake_done(void* arg, grpc_error* error) { } grpc_closure* notify = c->notify; c->notify = nullptr; - GRPC_CLOSURE_SCHED(notify, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, notify, error); c->handshake_mgr.reset(); gpr_mu_unlock(&c->mu); chttp2_connector_unref(reinterpret_cast(c)); @@ -182,7 +182,7 @@ static void connected(void* arg, grpc_error* error) { c->result->reset(); grpc_closure* notify = c->notify; c->notify = nullptr; - GRPC_CLOSURE_SCHED(notify, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, notify, error); if (c->endpoint != nullptr) { grpc_endpoint_shutdown(c->endpoint, GRPC_ERROR_REF(error)); } diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc index 4761af78bcf..f37551fce2d 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.cc +++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc @@ -266,7 +266,8 @@ static void tcp_server_shutdown_complete(void* arg, grpc_error* error) { // may do a synchronous unref. grpc_core::ExecCtx::Get()->Flush(); if (destroy_done != nullptr) { - GRPC_CLOSURE_SCHED(destroy_done, GRPC_ERROR_REF(error)); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, destroy_done, + GRPC_ERROR_REF(error)); grpc_core::ExecCtx::Get()->Flush(); } grpc_channel_args_destroy(state->args); diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc index 0936ee854cc..e6f37b89ef0 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc @@ -593,7 +593,8 @@ static void close_transport_locked(grpc_chttp2_transport* t, grpc_endpoint_shutdown(t->ep, GRPC_ERROR_REF(error)); } if (t->notify_on_receive_settings != nullptr) { - GRPC_CLOSURE_SCHED(t->notify_on_receive_settings, GRPC_ERROR_CANCELLED); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, t->notify_on_receive_settings, + GRPC_ERROR_CANCELLED); t->notify_on_receive_settings = nullptr; } GRPC_ERROR_UNREF(error); @@ -706,7 +707,7 @@ grpc_chttp2_stream::~grpc_chttp2_stream() { } GRPC_CHTTP2_UNREF_TRANSPORT(t, "stream"); - GRPC_CLOSURE_SCHED(destroy_stream_arg, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, destroy_stream_arg, GRPC_ERROR_NONE); } static int init_stream(grpc_transport* gt, grpc_stream* gs, @@ -1177,7 +1178,7 @@ static grpc_closure* add_closure_barrier(grpc_closure* closure) { static void null_then_sched_closure(grpc_closure** closure) { grpc_closure* c = *closure; *closure = nullptr; - GRPC_CLOSURE_SCHED(c, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, c, GRPC_ERROR_NONE); } void grpc_chttp2_complete_closure_step(grpc_chttp2_transport* t, @@ -1220,7 +1221,8 @@ void grpc_chttp2_complete_closure_step(grpc_chttp2_transport* t, !(closure->next_data.scratch & CLOSURE_BARRIER_MAY_COVER_WRITE)) { // Using GRPC_CLOSURE_SCHED instead of GRPC_CLOSURE_RUN to avoid running // closures earlier than when it is safe to do so. - GRPC_CLOSURE_SCHED(closure, closure->error_data.error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, closure, + closure->error_data.error); } else { grpc_closure_list_append(&t->run_after_write, closure, closure->error_data.error); @@ -1678,8 +1680,10 @@ static void cancel_pings(grpc_chttp2_transport* t, grpc_error* error) { static void send_ping_locked(grpc_chttp2_transport* t, grpc_closure* on_initiate, grpc_closure* on_ack) { if (t->closed_with_error != GRPC_ERROR_NONE) { - GRPC_CLOSURE_SCHED(on_initiate, GRPC_ERROR_REF(t->closed_with_error)); - GRPC_CLOSURE_SCHED(on_ack, GRPC_ERROR_REF(t->closed_with_error)); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_initiate, + GRPC_ERROR_REF(t->closed_with_error)); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_ack, + GRPC_ERROR_REF(t->closed_with_error)); return; } grpc_chttp2_ping_queue* pq = &t->ping_queue; @@ -2933,7 +2937,7 @@ static void reset_byte_stream(void* arg, grpc_error* error) { grpc_chttp2_maybe_complete_recv_trailing_metadata(s->t, s); } else { GPR_ASSERT(error != GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(s->on_next, GRPC_ERROR_REF(error)); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, s->on_next, GRPC_ERROR_REF(error)); s->on_next = nullptr; GRPC_ERROR_UNREF(s->byte_stream_error); s->byte_stream_error = GRPC_ERROR_NONE; @@ -2991,10 +2995,11 @@ void Chttp2IncomingByteStream::NextLocked(void* arg, grpc_slice_buffer_swap(&s->frame_storage, &s->unprocessed_incoming_frames_buffer); s->unprocessed_incoming_frames_decompressed = false; - GRPC_CLOSURE_SCHED(bs->next_action_.on_complete, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, bs->next_action_.on_complete, + GRPC_ERROR_NONE); } else if (s->byte_stream_error != GRPC_ERROR_NONE) { - GRPC_CLOSURE_SCHED(bs->next_action_.on_complete, - GRPC_ERROR_REF(s->byte_stream_error)); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, bs->next_action_.on_complete, + GRPC_ERROR_REF(s->byte_stream_error)); if (s->data_parser.parsing_frame != nullptr) { s->data_parser.parsing_frame->Unref(); s->data_parser.parsing_frame = nullptr; @@ -3003,8 +3008,8 @@ void Chttp2IncomingByteStream::NextLocked(void* arg, if (bs->remaining_bytes_ != 0) { s->byte_stream_error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Truncated message"); - GRPC_CLOSURE_SCHED(bs->next_action_.on_complete, - GRPC_ERROR_REF(s->byte_stream_error)); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, bs->next_action_.on_complete, + GRPC_ERROR_REF(s->byte_stream_error)); if (s->data_parser.parsing_frame != nullptr) { s->data_parser.parsing_frame->Unref(); s->data_parser.parsing_frame = nullptr; @@ -3092,7 +3097,8 @@ grpc_error* Chttp2IncomingByteStream::Pull(grpc_slice* slice) { void Chttp2IncomingByteStream::PublishError(grpc_error* error) { GPR_ASSERT(error != GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(stream_->on_next, GRPC_ERROR_REF(error)); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, stream_->on_next, + GRPC_ERROR_REF(error)); stream_->on_next = nullptr; GRPC_ERROR_UNREF(stream_->byte_stream_error); stream_->byte_stream_error = GRPC_ERROR_REF(error); diff --git a/src/core/ext/transport/chttp2/transport/frame_data.cc b/src/core/ext/transport/chttp2/transport/frame_data.cc index 20ea966c047..f2ff4d37b77 100644 --- a/src/core/ext/transport/chttp2/transport/frame_data.cc +++ b/src/core/ext/transport/chttp2/transport/frame_data.cc @@ -291,7 +291,7 @@ grpc_error* grpc_chttp2_data_parser_parse(void* /*parser*/, GPR_ASSERT(s->frame_storage.length == 0); grpc_slice_ref_internal(slice); grpc_slice_buffer_add(&s->unprocessed_incoming_frames_buffer, slice); - GRPC_CLOSURE_SCHED(s->on_next, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, s->on_next, GRPC_ERROR_NONE); s->on_next = nullptr; s->unprocessed_incoming_frames_decompressed = false; } else { diff --git a/src/core/ext/transport/chttp2/transport/frame_settings.cc b/src/core/ext/transport/chttp2/transport/frame_settings.cc index 4d739e85daa..60432d26f26 100644 --- a/src/core/ext/transport/chttp2/transport/frame_settings.cc +++ b/src/core/ext/transport/chttp2/transport/frame_settings.cc @@ -135,8 +135,9 @@ grpc_error* grpc_chttp2_settings_parser_parse(void* p, grpc_chttp2_transport* t, t->num_pending_induced_frames++; grpc_slice_buffer_add(&t->qbuf, grpc_chttp2_settings_ack_create()); if (t->notify_on_receive_settings != nullptr) { - GRPC_CLOSURE_SCHED(t->notify_on_receive_settings, - GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, + t->notify_on_receive_settings, + GRPC_ERROR_NONE); t->notify_on_receive_settings = nullptr; } } diff --git a/src/core/ext/transport/cronet/transport/cronet_transport.cc b/src/core/ext/transport/cronet/transport/cronet_transport.cc index 60959d3a495..8cc4becfff9 100644 --- a/src/core/ext/transport/cronet/transport/cronet_transport.cc +++ b/src/core/ext/transport/cronet/transport/cronet_transport.cc @@ -1150,22 +1150,26 @@ static enum e_op_result execute_stream_op(struct op_and_state* oas) { OP_RECV_INITIAL_METADATA)) { CRONET_LOG(GPR_DEBUG, "running: %p OP_RECV_INITIAL_METADATA", oas); if (stream_state->state_op_done[OP_CANCEL_ERROR]) { - GRPC_CLOSURE_SCHED( + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, stream_op->payload->recv_initial_metadata.recv_initial_metadata_ready, GRPC_ERROR_NONE); } else if (stream_state->state_callback_received[OP_FAILED]) { - GRPC_CLOSURE_SCHED( + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, stream_op->payload->recv_initial_metadata.recv_initial_metadata_ready, GRPC_ERROR_NONE); } else if (stream_state->state_op_done[OP_RECV_TRAILING_METADATA]) { - GRPC_CLOSURE_SCHED( + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, stream_op->payload->recv_initial_metadata.recv_initial_metadata_ready, GRPC_ERROR_NONE); } else { grpc_chttp2_incoming_metadata_buffer_publish( &oas->s->state.rs.initial_metadata, stream_op->payload->recv_initial_metadata.recv_initial_metadata); - GRPC_CLOSURE_SCHED( + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, stream_op->payload->recv_initial_metadata.recv_initial_metadata_ready, GRPC_ERROR_NONE); } @@ -1176,30 +1180,34 @@ static enum e_op_result execute_stream_op(struct op_and_state* oas) { CRONET_LOG(GPR_DEBUG, "running: %p OP_RECV_MESSAGE", oas); if (stream_state->state_op_done[OP_CANCEL_ERROR]) { CRONET_LOG(GPR_DEBUG, "Stream is cancelled."); - GRPC_CLOSURE_SCHED(stream_op->payload->recv_message.recv_message_ready, - GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, stream_op->payload->recv_message.recv_message_ready, + GRPC_ERROR_NONE); stream_state->state_op_done[OP_RECV_MESSAGE] = true; oas->state.state_op_done[OP_RECV_MESSAGE] = true; result = ACTION_TAKEN_NO_CALLBACK; } else if (stream_state->state_callback_received[OP_FAILED]) { CRONET_LOG(GPR_DEBUG, "Stream failed."); - GRPC_CLOSURE_SCHED(stream_op->payload->recv_message.recv_message_ready, - GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, stream_op->payload->recv_message.recv_message_ready, + GRPC_ERROR_NONE); stream_state->state_op_done[OP_RECV_MESSAGE] = true; oas->state.state_op_done[OP_RECV_MESSAGE] = true; result = ACTION_TAKEN_NO_CALLBACK; } else if (stream_state->rs.read_stream_closed == true) { /* No more data will be received */ CRONET_LOG(GPR_DEBUG, "read stream closed"); - GRPC_CLOSURE_SCHED(stream_op->payload->recv_message.recv_message_ready, - GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, stream_op->payload->recv_message.recv_message_ready, + GRPC_ERROR_NONE); stream_state->state_op_done[OP_RECV_MESSAGE] = true; oas->state.state_op_done[OP_RECV_MESSAGE] = true; result = ACTION_TAKEN_NO_CALLBACK; } else if (stream_state->flush_read) { CRONET_LOG(GPR_DEBUG, "flush read"); - GRPC_CLOSURE_SCHED(stream_op->payload->recv_message.recv_message_ready, - GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, stream_op->payload->recv_message.recv_message_ready, + GRPC_ERROR_NONE); stream_state->state_op_done[OP_RECV_MESSAGE] = true; oas->state.state_op_done[OP_RECV_MESSAGE] = true; result = ACTION_TAKEN_NO_CALLBACK; @@ -1240,7 +1248,8 @@ static enum e_op_result execute_stream_op(struct op_and_state* oas) { stream_state->rs.sbs.Init(&stream_state->rs.read_slice_buffer, flags); stream_op->payload->recv_message.recv_message->reset( stream_state->rs.sbs.get()); - GRPC_CLOSURE_SCHED( + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, stream_op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE); stream_state->state_op_done[OP_RECV_MESSAGE] = true; @@ -1296,8 +1305,9 @@ static enum e_op_result execute_stream_op(struct op_and_state* oas) { stream_state->rs.sbs.Init(&stream_state->rs.read_slice_buffer, flags); stream_op->payload->recv_message.recv_message->reset( stream_state->rs.sbs.get()); - GRPC_CLOSURE_SCHED(stream_op->payload->recv_message.recv_message_ready, - GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, stream_op->payload->recv_message.recv_message_ready, + GRPC_ERROR_NONE); stream_state->state_op_done[OP_RECV_MESSAGE] = true; oas->state.state_op_done[OP_RECV_MESSAGE] = true; /* Do an extra read to trigger on_succeeded() callback in case connection @@ -1328,7 +1338,8 @@ static enum e_op_result execute_stream_op(struct op_and_state* oas) { stream_op->payload->recv_trailing_metadata.recv_trailing_metadata); stream_state->rs.trailing_metadata_valid = false; } - GRPC_CLOSURE_SCHED( + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, stream_op->payload->recv_trailing_metadata.recv_trailing_metadata_ready, error); stream_state->state_op_done[OP_RECV_TRAILING_METADATA] = true; @@ -1352,13 +1363,13 @@ static enum e_op_result execute_stream_op(struct op_and_state* oas) { CRONET_LOG(GPR_DEBUG, "running: %p OP_ON_COMPLETE", oas); if (stream_state->state_op_done[OP_CANCEL_ERROR]) { if (stream_op->on_complete) { - GRPC_CLOSURE_SCHED(stream_op->on_complete, - GRPC_ERROR_REF(stream_state->cancel_error)); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, stream_op->on_complete, + GRPC_ERROR_REF(stream_state->cancel_error)); } } else if (stream_state->state_callback_received[OP_FAILED]) { if (stream_op->on_complete) { - GRPC_CLOSURE_SCHED( - stream_op->on_complete, + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, stream_op->on_complete, make_error_with_desc(GRPC_STATUS_UNAVAILABLE, "Unavailable.")); } } else { @@ -1366,7 +1377,8 @@ static enum e_op_result execute_stream_op(struct op_and_state* oas) { * callback */ if (stream_op->on_complete) { - GRPC_CLOSURE_SCHED(stream_op->on_complete, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, stream_op->on_complete, + GRPC_ERROR_NONE); } } oas->state.state_op_done[OP_ON_COMPLETE] = true; @@ -1433,20 +1445,24 @@ static void perform_stream_op(grpc_transport* gt, grpc_stream* gs, /* Cronet does not support :authority header field. We cancel the call when this field is present in metadata */ if (op->recv_initial_metadata) { - GRPC_CLOSURE_SCHED( + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, op->payload->recv_initial_metadata.recv_initial_metadata_ready, GRPC_ERROR_CANCELLED); } if (op->recv_message) { - GRPC_CLOSURE_SCHED(op->payload->recv_message.recv_message_ready, - GRPC_ERROR_CANCELLED); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, + op->payload->recv_message.recv_message_ready, + GRPC_ERROR_CANCELLED); } if (op->recv_trailing_metadata) { - GRPC_CLOSURE_SCHED( + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, op->payload->recv_trailing_metadata.recv_trailing_metadata_ready, GRPC_ERROR_CANCELLED); } - GRPC_CLOSURE_SCHED(op->on_complete, GRPC_ERROR_CANCELLED); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, op->on_complete, + GRPC_ERROR_CANCELLED); return; } stream_obj* s = reinterpret_cast(gs); @@ -1458,7 +1474,8 @@ static void destroy_stream(grpc_transport* gt, grpc_stream* gs, grpc_closure* then_schedule_closure) { stream_obj* s = reinterpret_cast(gs); s->~stream_obj(); - GRPC_CLOSURE_SCHED(then_schedule_closure, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, then_schedule_closure, + GRPC_ERROR_NONE); } static void destroy_transport(grpc_transport* gt) {} diff --git a/src/core/ext/transport/inproc/inproc_transport.cc b/src/core/ext/transport/inproc/inproc_transport.cc index 9cb79f5cbe7..1271e79abf7 100644 --- a/src/core/ext/transport/inproc/inproc_transport.cc +++ b/src/core/ext/transport/inproc/inproc_transport.cc @@ -204,7 +204,8 @@ struct inproc_stream { t->unref(); if (closure_at_destroy) { - GRPC_CLOSURE_SCHED(closure_at_destroy, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, closure_at_destroy, + GRPC_ERROR_NONE); } } @@ -390,13 +391,15 @@ void complete_if_batch_end_locked(inproc_stream* s, grpc_error* error, if ((is_sm + is_stm + is_rim + is_rm + is_rtm) == 1) { INPROC_LOG(GPR_INFO, "%s %p %p %p", msg, s, op, error); - GRPC_CLOSURE_SCHED(op->on_complete, GRPC_ERROR_REF(error)); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, op->on_complete, + GRPC_ERROR_REF(error)); } } void maybe_schedule_op_closure_locked(inproc_stream* s, grpc_error* error) { if (s && s->ops_needed && !s->op_closure_scheduled) { - GRPC_CLOSURE_SCHED(&s->op_closure, GRPC_ERROR_REF(error)); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, &s->op_closure, + GRPC_ERROR_REF(error)); s->op_closure_scheduled = true; s->ops_needed = false; } @@ -471,9 +474,11 @@ void fail_helper_locked(inproc_stream* s, grpc_error* error) { INPROC_LOG(GPR_INFO, "fail_helper %p scheduling initial-metadata-ready %p %p", s, error, err); - GRPC_CLOSURE_SCHED(s->recv_initial_md_op->payload->recv_initial_metadata - .recv_initial_metadata_ready, - err); + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, + s->recv_initial_md_op->payload->recv_initial_metadata + .recv_initial_metadata_ready, + err); // Last use of err so no need to REF and then UNREF it complete_if_batch_end_locked( @@ -484,7 +489,8 @@ void fail_helper_locked(inproc_stream* s, grpc_error* error) { if (s->recv_message_op) { INPROC_LOG(GPR_INFO, "fail_helper %p scheduling message-ready %p", s, error); - GRPC_CLOSURE_SCHED( + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, s->recv_message_op->payload->recv_message.recv_message_ready, GRPC_ERROR_REF(error)); complete_if_batch_end_locked( @@ -508,9 +514,11 @@ void fail_helper_locked(inproc_stream* s, grpc_error* error) { if (s->recv_trailing_md_op) { INPROC_LOG(GPR_INFO, "fail_helper %p scheduling trailing-metadata-ready %p", s, error); - GRPC_CLOSURE_SCHED(s->recv_trailing_md_op->payload->recv_trailing_metadata - .recv_trailing_metadata_ready, - GRPC_ERROR_REF(error)); + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, + s->recv_trailing_md_op->payload->recv_trailing_metadata + .recv_trailing_metadata_ready, + GRPC_ERROR_REF(error)); INPROC_LOG(GPR_INFO, "fail_helper %p scheduling trailing-md-on-complete %p", s, error); complete_if_batch_end_locked( @@ -564,7 +572,8 @@ void message_transfer_locked(inproc_stream* sender, inproc_stream* receiver) { receiver->recv_stream.get()); INPROC_LOG(GPR_INFO, "message_transfer_locked %p scheduling message-ready", receiver); - GRPC_CLOSURE_SCHED( + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, receiver->recv_message_op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE); complete_if_batch_end_locked( @@ -656,14 +665,16 @@ void op_state_machine(void* arg, grpc_error* error) { if (!s->t->is_client && s->trailing_md_recvd && s->recv_trailing_md_op) { INPROC_LOG(GPR_INFO, "op_state_machine %p scheduling trailing-metadata-ready", s); - GRPC_CLOSURE_SCHED( + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, s->recv_trailing_md_op->payload->recv_trailing_metadata .recv_trailing_metadata_ready, GRPC_ERROR_NONE); INPROC_LOG(GPR_INFO, "op_state_machine %p scheduling trailing-md-on-complete", s); - GRPC_CLOSURE_SCHED(s->recv_trailing_md_op->on_complete, - GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, + s->recv_trailing_md_op->on_complete, + GRPC_ERROR_NONE); s->recv_trailing_md_op = nullptr; needs_close = true; } @@ -708,9 +719,11 @@ void op_state_machine(void* arg, grpc_error* error) { INPROC_LOG(GPR_INFO, "op_state_machine %p scheduling initial-metadata-ready %p", s, new_err); - GRPC_CLOSURE_SCHED(s->recv_initial_md_op->payload->recv_initial_metadata - .recv_initial_metadata_ready, - GRPC_ERROR_REF(new_err)); + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, + s->recv_initial_md_op->payload->recv_initial_metadata + .recv_initial_metadata_ready, + GRPC_ERROR_REF(new_err)); complete_if_batch_end_locked( s, new_err, s->recv_initial_md_op, "op_state_machine scheduling recv-initial-metadata-on-complete"); @@ -748,7 +761,8 @@ void op_state_machine(void* arg, grpc_error* error) { // satisfied *s->recv_message_op->payload->recv_message.recv_message = nullptr; INPROC_LOG(GPR_INFO, "op_state_machine %p scheduling message-ready", s); - GRPC_CLOSURE_SCHED( + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, s->recv_message_op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE); complete_if_batch_end_locked( @@ -785,12 +799,14 @@ void op_state_machine(void* arg, grpc_error* error) { INPROC_LOG(GPR_INFO, "op_state_machine %p scheduling trailing-md-on-complete %p", s, new_err); - GRPC_CLOSURE_SCHED( + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, s->recv_trailing_md_op->payload->recv_trailing_metadata .recv_trailing_metadata_ready, GRPC_ERROR_REF(new_err)); - GRPC_CLOSURE_SCHED(s->recv_trailing_md_op->on_complete, - GRPC_ERROR_REF(new_err)); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, + s->recv_trailing_md_op->on_complete, + GRPC_ERROR_REF(new_err)); s->recv_trailing_md_op = nullptr; needs_close = true; } else { @@ -810,7 +826,8 @@ void op_state_machine(void* arg, grpc_error* error) { // recv_message_op INPROC_LOG(GPR_INFO, "op_state_machine %p scheduling message-ready", s); *s->recv_message_op->payload->recv_message.recv_message = nullptr; - GRPC_CLOSURE_SCHED( + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, s->recv_message_op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE); complete_if_batch_end_locked( @@ -883,9 +900,11 @@ bool cancel_stream_locked(inproc_stream* s, grpc_error* error) { // couldn't complete that because we hadn't yet sent out trailing // md, now's the chance if (!s->t->is_client && s->trailing_md_recvd && s->recv_trailing_md_op) { - GRPC_CLOSURE_SCHED(s->recv_trailing_md_op->payload->recv_trailing_metadata - .recv_trailing_metadata_ready, - GRPC_ERROR_REF(s->cancel_self_error)); + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, + s->recv_trailing_md_op->payload->recv_trailing_metadata + .recv_trailing_metadata_ready, + GRPC_ERROR_REF(s->cancel_self_error)); complete_if_batch_end_locked( s, s->cancel_self_error, s->recv_trailing_md_op, "cancel_stream scheduling trailing-md-on-complete"); @@ -1026,7 +1045,8 @@ void perform_stream_op(grpc_transport* gt, grpc_stream* gs, (op->recv_message && other && other->send_message_op != nullptr) || (s->to_read_trailing_md_filled || s->trailing_md_recvd)) { if (!s->op_closure_scheduled) { - GRPC_CLOSURE_SCHED(&s->op_closure, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, &s->op_closure, + GRPC_ERROR_NONE); s->op_closure_scheduled = true; } } else { @@ -1054,7 +1074,8 @@ void perform_stream_op(grpc_transport* gt, grpc_stream* gs, GPR_INFO, "perform_stream_op error %p scheduling initial-metadata-ready %p", s, error); - GRPC_CLOSURE_SCHED( + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, op->payload->recv_initial_metadata.recv_initial_metadata_ready, GRPC_ERROR_REF(error)); } @@ -1063,22 +1084,24 @@ void perform_stream_op(grpc_transport* gt, grpc_stream* gs, GPR_INFO, "perform_stream_op error %p scheduling recv message-ready %p", s, error); - GRPC_CLOSURE_SCHED(op->payload->recv_message.recv_message_ready, - GRPC_ERROR_REF(error)); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, + op->payload->recv_message.recv_message_ready, + GRPC_ERROR_REF(error)); } if (op->recv_trailing_metadata) { INPROC_LOG( GPR_INFO, "perform_stream_op error %p scheduling trailing-metadata-ready %p", s, error); - GRPC_CLOSURE_SCHED( + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, op->payload->recv_trailing_metadata.recv_trailing_metadata_ready, GRPC_ERROR_REF(error)); } } INPROC_LOG(GPR_INFO, "perform_stream_op %p scheduling on_complete %p", s, error); - GRPC_CLOSURE_SCHED(on_complete, GRPC_ERROR_REF(error)); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_complete, GRPC_ERROR_REF(error)); } if (needs_close) { close_other_side_locked(s, "perform_stream_op:other_side"); @@ -1121,7 +1144,7 @@ void perform_transport_op(grpc_transport* gt, grpc_transport_op* op) { t->accept_stream_data = op->set_accept_stream_user_data; } if (op->on_consumed) { - GRPC_CLOSURE_SCHED(op->on_consumed, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, op->on_consumed, GRPC_ERROR_NONE); } bool do_close = false; diff --git a/src/core/lib/channel/handshaker.cc b/src/core/lib/channel/handshaker.cc index ad0bc875fd2..2bcc60abfa9 100644 --- a/src/core/lib/channel/handshaker.cc +++ b/src/core/lib/channel/handshaker.cc @@ -169,7 +169,7 @@ bool HandshakeManager::CallNextHandshakerLocked(grpc_error* error) { // Cancel deadline timer, since we're invoking the on_handshake_done // callback now. grpc_timer_cancel(&deadline_timer_); - GRPC_CLOSURE_SCHED(&on_handshake_done_, error); + ExecCtx::Run(DEBUG_LOCATION, &on_handshake_done_, error); is_shutdown_ = true; } else { auto handshaker = handshakers_[index_]; diff --git a/src/core/lib/http/httpcli.cc b/src/core/lib/http/httpcli.cc index 7319409c66f..7edcdcc8427 100644 --- a/src/core/lib/http/httpcli.cc +++ b/src/core/lib/http/httpcli.cc @@ -88,7 +88,7 @@ static void next_address(internal_request* req, grpc_error* due_to_error); static void finish(internal_request* req, grpc_error* error) { grpc_polling_entity_del_from_pollset_set(req->pollent, req->context->pollset_set); - GRPC_CLOSURE_SCHED(req->on_done, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, req->on_done, error); grpc_http_parser_destroy(&req->parser); if (req->addresses != nullptr) { grpc_resolved_addresses_destroy(req->addresses); diff --git a/src/core/lib/http/httpcli_security_connector.cc b/src/core/lib/http/httpcli_security_connector.cc index fef467e8afa..5d8d177fe67 100644 --- a/src/core/lib/http/httpcli_security_connector.cc +++ b/src/core/lib/http/httpcli_security_connector.cc @@ -100,7 +100,7 @@ class grpc_httpcli_ssl_channel_security_connector final error = GRPC_ERROR_CREATE_FROM_COPIED_STRING(msg); gpr_free(msg); } - GRPC_CLOSURE_SCHED(on_peer_checked, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_peer_checked, error); tsi_peer_destruct(&peer); } diff --git a/src/core/lib/iomgr/call_combiner.cc b/src/core/lib/iomgr/call_combiner.cc index bfbbb7f385d..4092e5d8e08 100644 --- a/src/core/lib/iomgr/call_combiner.cc +++ b/src/core/lib/iomgr/call_combiner.cc @@ -92,9 +92,9 @@ void CallCombiner::TsanClosure(void* arg, grpc_error* error) { void CallCombiner::ScheduleClosure(grpc_closure* closure, grpc_error* error) { #ifdef GRPC_TSAN_ENABLED original_closure_ = closure; - GRPC_CLOSURE_SCHED(&tsan_closure_, error); + ExecCtx::Run(DEBUG_LOCATION, &tsan_closure_, error); #else - GRPC_CLOSURE_SCHED(closure, error); + ExecCtx::Run(DEBUG_LOCATION, closure, error); #endif } @@ -199,7 +199,7 @@ void CallCombiner::SetNotifyOnCancel(grpc_closure* closure) { "for pre-existing cancellation", this, closure); } - GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_REF(original_error)); + ExecCtx::Run(DEBUG_LOCATION, closure, GRPC_ERROR_REF(original_error)); break; } else { if (gpr_atm_full_cas(&cancel_state_, original_state, (gpr_atm)closure)) { @@ -217,7 +217,7 @@ void CallCombiner::SetNotifyOnCancel(grpc_closure* closure) { "call_combiner=%p: scheduling old cancel callback=%p", this, closure); } - GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); + ExecCtx::Run(DEBUG_LOCATION, closure, GRPC_ERROR_NONE); } break; } @@ -244,7 +244,7 @@ void CallCombiner::Cancel(grpc_error* error) { "call_combiner=%p: scheduling notify_on_cancel callback=%p", this, notify_on_cancel); } - GRPC_CLOSURE_SCHED(notify_on_cancel, GRPC_ERROR_REF(error)); + ExecCtx::Run(DEBUG_LOCATION, notify_on_cancel, GRPC_ERROR_REF(error)); } break; } diff --git a/src/core/lib/iomgr/call_combiner.h b/src/core/lib/iomgr/call_combiner.h index c90e565860a..c440241d0da 100644 --- a/src/core/lib/iomgr/call_combiner.h +++ b/src/core/lib/iomgr/call_combiner.h @@ -31,6 +31,7 @@ #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/dynamic_annotations.h" +#include "src/core/lib/iomgr/exec_ctx.h" // A simple, lock-free mechanism for serializing activity related to a // single call. This is similar to a combiner but is more lightweight. @@ -156,8 +157,8 @@ class CallCombinerClosureList { // // All but one of the closures in the list will be scheduled via // GRPC_CALL_COMBINER_START(), and the remaining closure will be - // scheduled via GRPC_CLOSURE_SCHED(), which will eventually result in - // yielding the call combiner. If the list is empty, then the call + // scheduled via ExecCtx::Run(DEBUG_LOCATION,), which will eventually result + // in yielding the call combiner. If the list is empty, then the call // combiner will be yielded immediately. void RunClosures(CallCombiner* call_combiner) { if (closures_.empty()) { @@ -177,7 +178,7 @@ class CallCombinerClosureList { grpc_error_string(closures_[0].error), closures_[0].reason); } // This will release the call combiner. - GRPC_CLOSURE_SCHED(closures_[0].closure, closures_[0].error); + ExecCtx::Run(DEBUG_LOCATION, closures_[0].closure, closures_[0].error); closures_.clear(); } diff --git a/src/core/lib/iomgr/endpoint_cfstream.cc b/src/core/lib/iomgr/endpoint_cfstream.cc index c3af2ffa4cb..180a61b841e 100644 --- a/src/core/lib/iomgr/endpoint_cfstream.cc +++ b/src/core/lib/iomgr/endpoint_cfstream.cc @@ -132,7 +132,7 @@ static void CallReadCb(CFStreamEndpoint* ep, grpc_error* error) { grpc_closure* cb = ep->read_cb; ep->read_cb = nullptr; ep->read_slices = nullptr; - GRPC_CLOSURE_SCHED(cb, error); + ExecCtx::Run(DEBUG_LOCATION, cb, error); } static void CallWriteCb(CFStreamEndpoint* ep, grpc_error* error) { @@ -145,7 +145,7 @@ static void CallWriteCb(CFStreamEndpoint* ep, grpc_error* error) { grpc_closure* cb = ep->write_cb; ep->write_cb = nullptr; ep->write_slices = nullptr; - GRPC_CLOSURE_SCHED(cb, error); + ExecCtx::Run(DEBUG_LOCATION, cb, error); } static void ReadAction(void* arg, grpc_error* error) { diff --git a/src/core/lib/iomgr/ev_epoll1_linux.cc b/src/core/lib/iomgr/ev_epoll1_linux.cc index f8f9aa2192c..e6935518980 100644 --- a/src/core/lib/iomgr/ev_epoll1_linux.cc +++ b/src/core/lib/iomgr/ev_epoll1_linux.cc @@ -420,7 +420,7 @@ static void fd_orphan(grpc_fd* fd, grpc_closure* on_done, int* release_fd, close(fd->fd); } - GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_REF(error)); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_done, GRPC_ERROR_REF(error)); grpc_iomgr_unregister_object(&fd->iomgr_object); fork_fd_list_remove_grpc_fd(fd); @@ -623,7 +623,8 @@ static void pollset_maybe_finish_shutdown(grpc_pollset* pollset) { if (pollset->shutdown_closure != nullptr && pollset->root_worker == nullptr && pollset->begin_refs == 0) { GPR_TIMER_MARK("pollset_finish_shutdown", 0); - GRPC_CLOSURE_SCHED(pollset->shutdown_closure, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, pollset->shutdown_closure, + GRPC_ERROR_NONE); pollset->shutdown_closure = nullptr; } } diff --git a/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc index 927ed57e762..e44b7a4b4d1 100644 --- a/src/core/lib/iomgr/ev_epollex_linux.cc +++ b/src/core/lib/iomgr/ev_epollex_linux.cc @@ -393,7 +393,8 @@ static void unref_by(grpc_fd* fd, int n) { #endif gpr_atm old = gpr_atm_full_fetch_add(&fd->refst, -n); if (old == n) { - GRPC_CLOSURE_SCHED( + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, GRPC_CLOSURE_CREATE(fd_destroy, fd, grpc_schedule_on_exec_ctx), GRPC_ERROR_NONE); } else { @@ -487,7 +488,7 @@ static void fd_orphan(grpc_fd* fd, grpc_closure* on_done, int* release_fd, to be alive (and not added to freelist) until the end of this function */ REF_BY(fd, 1, reason); - GRPC_CLOSURE_SCHED(fd->on_done_closure, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, fd->on_done_closure, GRPC_ERROR_NONE); if (pollable_obj) { gpr_mu_unlock(&pollable_obj->owner_orphan_mu); @@ -662,7 +663,8 @@ static void pollset_maybe_finish_shutdown(grpc_pollset* pollset) { if (pollset->shutdown_closure != nullptr && pollset->root_worker == nullptr && pollset->containing_pollset_set_count == 0) { GPR_TIMER_MARK("pollset_finish_shutdown", 0); - GRPC_CLOSURE_SCHED(pollset->shutdown_closure, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, pollset->shutdown_closure, + GRPC_ERROR_NONE); pollset->shutdown_closure = nullptr; pollset->already_shutdown = true; } diff --git a/src/core/lib/iomgr/ev_poll_posix.cc b/src/core/lib/iomgr/ev_poll_posix.cc index c1d84888dbc..3daa1bd8f97 100644 --- a/src/core/lib/iomgr/ev_poll_posix.cc +++ b/src/core/lib/iomgr/ev_poll_posix.cc @@ -436,7 +436,7 @@ static void close_fd_locked(grpc_fd* fd) { if (!fd->released) { close(fd->fd); } - GRPC_CLOSURE_SCHED(fd->on_done_closure, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, fd->on_done_closure, GRPC_ERROR_NONE); } static int fd_wrapped_fd(grpc_fd* fd) { @@ -497,17 +497,18 @@ static grpc_error* fd_shutdown_error(grpc_fd* fd) { static void notify_on_locked(grpc_fd* fd, grpc_closure** st, grpc_closure* closure) { if (fd->shutdown || gpr_atm_no_barrier_load(&fd->pollhup)) { - GRPC_CLOSURE_SCHED( - closure, grpc_error_set_int( - GRPC_ERROR_CREATE_FROM_STATIC_STRING("FD shutdown"), - GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE)); + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, closure, + grpc_error_set_int(GRPC_ERROR_CREATE_FROM_STATIC_STRING("FD shutdown"), + GRPC_ERROR_INT_GRPC_STATUS, + GRPC_STATUS_UNAVAILABLE)); } else if (*st == CLOSURE_NOT_READY) { /* not ready ==> switch to a waiting state by setting the closure */ *st = closure; } else if (*st == CLOSURE_READY) { /* already ready ==> queue the closure to run immediately */ *st = CLOSURE_NOT_READY; - GRPC_CLOSURE_SCHED(closure, fd_shutdown_error(fd)); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, closure, fd_shutdown_error(fd)); maybe_wake_one_watcher_locked(fd); } else { /* upcallptr was set to a different closure. This is an error! */ @@ -529,7 +530,7 @@ static int set_ready_locked(grpc_fd* fd, grpc_closure** st) { return 0; } else { /* waiting ==> queue closure */ - GRPC_CLOSURE_SCHED(*st, fd_shutdown_error(fd)); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, *st, fd_shutdown_error(fd)); *st = CLOSURE_NOT_READY; return 1; } @@ -574,7 +575,7 @@ static void fd_notify_on_error(grpc_fd* /*fd*/, grpc_closure* closure) { if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) { gpr_log(GPR_ERROR, "Polling engine does not support tracking errors."); } - GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_CANCELLED); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, closure, GRPC_ERROR_CANCELLED); } static void fd_set_readable(grpc_fd* fd) { @@ -896,7 +897,8 @@ static void finish_shutdown(grpc_pollset* pollset) { GRPC_FD_UNREF(pollset->fds[i], "multipoller"); } pollset->fd_count = 0; - GRPC_CLOSURE_SCHED(pollset->shutdown_done, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, pollset->shutdown_done, + GRPC_ERROR_NONE); } static void work_combine_error(grpc_error** composite, grpc_error* error) { diff --git a/src/core/lib/iomgr/lockfree_event.cc b/src/core/lib/iomgr/lockfree_event.cc index c7082345fd2..4b28af4ba4b 100644 --- a/src/core/lib/iomgr/lockfree_event.cc +++ b/src/core/lib/iomgr/lockfree_event.cc @@ -23,6 +23,7 @@ #include #include "src/core/lib/debug/trace.h" +#include "src/core/lib/iomgr/exec_ctx.h" extern grpc_core::DebugOnlyTraceFlag grpc_polling_trace; @@ -124,7 +125,7 @@ void LockfreeEvent::NotifyOn(grpc_closure* closure) { closure when transitioning out of CLOSURE_NO_READY state (i.e there is no other code that needs to 'happen-after' this) */ if (gpr_atm_no_barrier_cas(&state_, kClosureReady, kClosureNotReady)) { - GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); + ExecCtx::Run(DEBUG_LOCATION, closure, GRPC_ERROR_NONE); return; /* Successful. Return */ } @@ -137,9 +138,9 @@ void LockfreeEvent::NotifyOn(grpc_closure* closure) { schedule the closure with the shutdown error */ if ((curr & kShutdownBit) > 0) { grpc_error* shutdown_err = (grpc_error*)(curr & ~kShutdownBit); - GRPC_CLOSURE_SCHED(closure, - GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "FD Shutdown", &shutdown_err, 1)); + ExecCtx::Run(DEBUG_LOCATION, closure, + GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "FD Shutdown", &shutdown_err, 1)); return; } @@ -189,9 +190,9 @@ bool LockfreeEvent::SetShutdown(grpc_error* shutdown_err) { happens-after on that edge), and a release to pair with anything loading the shutdown state. */ if (gpr_atm_full_cas(&state_, curr, new_state)) { - GRPC_CLOSURE_SCHED((grpc_closure*)curr, - GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "FD Shutdown", &shutdown_err, 1)); + ExecCtx::Run(DEBUG_LOCATION, (grpc_closure*)curr, + GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "FD Shutdown", &shutdown_err, 1)); return true; } @@ -239,7 +240,7 @@ void LockfreeEvent::SetReady() { spurious set_ready; release pairs with this or the acquire in notify_on (or set_shutdown) */ else if (gpr_atm_full_cas(&state_, curr, kClosureNotReady)) { - GRPC_CLOSURE_SCHED((grpc_closure*)curr, GRPC_ERROR_NONE); + ExecCtx::Run(DEBUG_LOCATION, (grpc_closure*)curr, GRPC_ERROR_NONE); return; } /* else the state changed again (only possible by either a racing diff --git a/src/core/lib/iomgr/pollset_custom.cc b/src/core/lib/iomgr/pollset_custom.cc index 3ec2d3d573b..98c8e64e2f0 100644 --- a/src/core/lib/iomgr/pollset_custom.cc +++ b/src/core/lib/iomgr/pollset_custom.cc @@ -55,7 +55,7 @@ static void pollset_init(grpc_pollset* pollset, gpr_mu** mu) { static void pollset_shutdown(grpc_pollset* /*pollset*/, grpc_closure* closure) { GRPC_CUSTOM_IOMGR_ASSERT_SAME_THREAD(); - GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, closure, GRPC_ERROR_NONE); } static void pollset_destroy(grpc_pollset* pollset) { diff --git a/src/core/lib/iomgr/pollset_windows.cc b/src/core/lib/iomgr/pollset_windows.cc index e9a808d8ad9..22ed6540e3b 100644 --- a/src/core/lib/iomgr/pollset_windows.cc +++ b/src/core/lib/iomgr/pollset_windows.cc @@ -98,7 +98,7 @@ static void pollset_shutdown(grpc_pollset* pollset, grpc_closure* closure) { pollset->shutting_down = 1; grpc_pollset_kick(pollset, GRPC_POLLSET_KICK_BROADCAST); if (!pollset->is_iocp_worker) { - GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); + ExecCtx::Run(DEBUG_LOCATION, closure, GRPC_ERROR_NONE); } else { pollset->on_shutdown = closure; } @@ -146,7 +146,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, } if (pollset->shutting_down && pollset->on_shutdown != NULL) { - GRPC_CLOSURE_SCHED(pollset->on_shutdown, GRPC_ERROR_NONE); + ExecCtx::Run(DEBUG_LOCATION, pollset->on_shutdown, GRPC_ERROR_NONE); pollset->on_shutdown = NULL; } goto done; diff --git a/src/core/lib/iomgr/resolve_address_custom.cc b/src/core/lib/iomgr/resolve_address_custom.cc index 2b3452cc1d7..5c081309c7d 100644 --- a/src/core/lib/iomgr/resolve_address_custom.cc +++ b/src/core/lib/iomgr/resolve_address_custom.cc @@ -79,7 +79,7 @@ void grpc_custom_resolve_callback(grpc_custom_resolver* r, return; } if (r->on_done) { - GRPC_CLOSURE_SCHED(r->on_done, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, r->on_done, error); } gpr_free(r->host); gpr_free(r->port); @@ -161,7 +161,7 @@ static void resolve_address_impl(const char* name, const char* default_port, GRPC_CUSTOM_IOMGR_ASSERT_SAME_THREAD(); err = try_split_host_port(name, default_port, &host, &port); if (err != GRPC_ERROR_NONE) { - GRPC_CLOSURE_SCHED(on_done, err); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_done, err); return; } r = (grpc_custom_resolver*)gpr_malloc(sizeof(grpc_custom_resolver)); diff --git a/src/core/lib/iomgr/resolve_address_posix.cc b/src/core/lib/iomgr/resolve_address_posix.cc index 2de8768afe1..1d2a79f41d8 100644 --- a/src/core/lib/iomgr/resolve_address_posix.cc +++ b/src/core/lib/iomgr/resolve_address_posix.cc @@ -152,8 +152,9 @@ typedef struct { * grpc_blocking_resolve_address */ static void do_request_thread(void* rp, grpc_error* /*error*/) { request* r = static_cast(rp); - GRPC_CLOSURE_SCHED(r->on_done, grpc_blocking_resolve_address( - r->name, r->default_port, r->addrs_out)); + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, r->on_done, + grpc_blocking_resolve_address(r->name, r->default_port, r->addrs_out)); gpr_free(r->name); gpr_free(r->default_port); gpr_free(r); diff --git a/src/core/lib/iomgr/resolve_address_windows.cc b/src/core/lib/iomgr/resolve_address_windows.cc index cd52f13f1ef..7cc2998900d 100644 --- a/src/core/lib/iomgr/resolve_address_windows.cc +++ b/src/core/lib/iomgr/resolve_address_windows.cc @@ -138,7 +138,7 @@ static void do_request_thread(void* rp, grpc_error* error) { } else { GRPC_ERROR_REF(error); } - GRPC_CLOSURE_SCHED(r->on_done, error); + ExecCtx::Run(DEBUG_LOCATION, r->on_done, error); gpr_free(r->name); gpr_free(r->default_port); gpr_free(r); diff --git a/src/core/lib/iomgr/resource_quota.cc b/src/core/lib/iomgr/resource_quota.cc index 661783eeedd..91c8b8cb151 100644 --- a/src/core/lib/iomgr/resource_quota.cc +++ b/src/core/lib/iomgr/resource_quota.cc @@ -424,7 +424,7 @@ static bool rq_reclaim(grpc_resource_quota* resource_quota, bool destructive) { resource_quota->debug_only_last_reclaimer_resource_user = resource_user; resource_quota->debug_only_last_initiated_reclaimer = c; resource_user->reclaimers[destructive] = nullptr; - GRPC_CLOSURE_SCHED(c, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, c, GRPC_ERROR_NONE); return true; } @@ -506,7 +506,7 @@ static bool ru_post_reclaimer(grpc_resource_user* resource_user, resource_user->new_reclaimers[destructive] = nullptr; GPR_ASSERT(resource_user->reclaimers[destructive] == nullptr); if (gpr_atm_acq_load(&resource_user->shutdown) > 0) { - GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_CANCELLED); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, closure, GRPC_ERROR_CANCELLED); return false; } resource_user->reclaimers[destructive] = closure; @@ -549,8 +549,10 @@ static void ru_shutdown(void* ru, grpc_error* /*error*/) { } grpc_resource_user* resource_user = static_cast(ru); gpr_mu_lock(&resource_user->mu); - GRPC_CLOSURE_SCHED(resource_user->reclaimers[0], GRPC_ERROR_CANCELLED); - GRPC_CLOSURE_SCHED(resource_user->reclaimers[1], GRPC_ERROR_CANCELLED); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, resource_user->reclaimers[0], + GRPC_ERROR_CANCELLED); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, resource_user->reclaimers[1], + GRPC_ERROR_CANCELLED); resource_user->reclaimers[0] = nullptr; resource_user->reclaimers[1] = nullptr; rulist_remove(resource_user, GRPC_RULIST_RECLAIMER_BENIGN); @@ -572,8 +574,10 @@ static void ru_destroy(void* ru, grpc_error* /*error*/) { for (int i = 0; i < GRPC_RULIST_COUNT; i++) { rulist_remove(resource_user, static_cast(i)); } - GRPC_CLOSURE_SCHED(resource_user->reclaimers[0], GRPC_ERROR_CANCELLED); - GRPC_CLOSURE_SCHED(resource_user->reclaimers[1], GRPC_ERROR_CANCELLED); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, resource_user->reclaimers[0], + GRPC_ERROR_CANCELLED); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, resource_user->reclaimers[1], + GRPC_ERROR_CANCELLED); if (resource_user->free_pool != 0) { resource_user->resource_quota->free_pool += resource_user->free_pool; rq_step_sched(resource_user->resource_quota); @@ -719,7 +723,7 @@ void grpc_resource_quota_resize(grpc_resource_quota* resource_quota, gpr_atm_no_barrier_store(&resource_quota->last_size, (gpr_atm)GPR_MIN((size_t)GPR_ATM_MAX, size)); GRPC_CLOSURE_INIT(&a->closure, rq_resize, a, grpc_schedule_on_exec_ctx); - GRPC_CLOSURE_SCHED(&a->closure, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, &a->closure, GRPC_ERROR_NONE); } size_t grpc_resource_quota_peek_size(grpc_resource_quota* resource_quota) { @@ -994,8 +998,8 @@ bool grpc_resource_user_alloc_slices( size_t count, grpc_slice_buffer* dest) { if (GPR_UNLIKELY( gpr_atm_no_barrier_load(&slice_allocator->resource_user->shutdown))) { - GRPC_CLOSURE_SCHED( - &slice_allocator->on_allocated, + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, &slice_allocator->on_allocated, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Resource user shutdown")); return false; } diff --git a/src/core/lib/iomgr/socket_windows.cc b/src/core/lib/iomgr/socket_windows.cc index c87cfa8e831..abc8d937fcb 100644 --- a/src/core/lib/iomgr/socket_windows.cc +++ b/src/core/lib/iomgr/socket_windows.cc @@ -124,7 +124,7 @@ static void socket_notify_on_iocp(grpc_winsocket* socket, grpc_closure* closure, gpr_mu_lock(&socket->state_mu); if (info->has_pending_iocp) { info->has_pending_iocp = 0; - GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); + ExecCtx::Run(DEBUG_LOCATION, closure, GRPC_ERROR_NONE); } else { info->closure = closure; } @@ -145,7 +145,7 @@ void grpc_socket_become_ready(grpc_winsocket* socket, GPR_ASSERT(!info->has_pending_iocp); gpr_mu_lock(&socket->state_mu); if (info->closure) { - GRPC_CLOSURE_SCHED(info->closure, GRPC_ERROR_NONE); + ExecCtx::Run(DEBUG_LOCATION, info->closure, GRPC_ERROR_NONE); info->closure = NULL; } else { info->has_pending_iocp = 1; diff --git a/src/core/lib/iomgr/tcp_client_cfstream.cc b/src/core/lib/iomgr/tcp_client_cfstream.cc index fcad5edd222..a4596246e6a 100644 --- a/src/core/lib/iomgr/tcp_client_cfstream.cc +++ b/src/core/lib/iomgr/tcp_client_cfstream.cc @@ -96,7 +96,7 @@ static void OnAlarm(void* arg, grpc_error* error) { } else { grpc_error* error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("connect() timed out"); - GRPC_CLOSURE_SCHED(closure, error); + ExecCtx::Run(DEBUG_LOCATION, closure, error); } } @@ -137,7 +137,7 @@ static void OnOpen(void* arg, grpc_error* error) { GRPC_ERROR_REF(error); } gpr_mu_unlock(&connect->mu); - GRPC_CLOSURE_SCHED(closure, error); + ExecCtx::Run(DEBUG_LOCATION, closure, error); } } diff --git a/src/core/lib/iomgr/tcp_client_custom.cc b/src/core/lib/iomgr/tcp_client_custom.cc index 28da83366df..0295d449ae2 100644 --- a/src/core/lib/iomgr/tcp_client_custom.cc +++ b/src/core/lib/iomgr/tcp_client_custom.cc @@ -96,7 +96,7 @@ static void custom_connect_callback_internal(grpc_custom_socket* socket, grpc_core::ExecCtx::Get()->Flush(); custom_tcp_connect_cleanup(connect); } - GRPC_CLOSURE_SCHED(closure, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, closure, error); } static void custom_connect_callback(grpc_custom_socket* socket, diff --git a/src/core/lib/iomgr/tcp_client_posix.cc b/src/core/lib/iomgr/tcp_client_posix.cc index e48555b6f9f..b74bd1f665f 100644 --- a/src/core/lib/iomgr/tcp_client_posix.cc +++ b/src/core/lib/iomgr/tcp_client_posix.cc @@ -241,7 +241,7 @@ finish: grpc_channel_args_destroy(ac->channel_args); gpr_free(ac); } - GRPC_CLOSURE_SCHED(closure, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, closure, error); } grpc_error* grpc_tcp_client_prepare_fd(const grpc_channel_args* channel_args, @@ -298,12 +298,13 @@ void grpc_tcp_client_create_from_prepared_fd( char* addr_str = grpc_sockaddr_to_uri(addr); *ep = grpc_tcp_client_create_from_fd(fdobj, channel_args, addr_str); gpr_free(addr_str); - GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, closure, GRPC_ERROR_NONE); return; } if (errno != EWOULDBLOCK && errno != EINPROGRESS) { grpc_fd_orphan(fdobj, nullptr, nullptr, "tcp_client_connect_error"); - GRPC_CLOSURE_SCHED(closure, GRPC_OS_ERROR(errno, "connect")); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, closure, + GRPC_OS_ERROR(errno, "connect")); return; } @@ -344,7 +345,7 @@ static void tcp_connect(grpc_closure* closure, grpc_endpoint** ep, *ep = nullptr; if ((error = grpc_tcp_client_prepare_fd(channel_args, addr, &mapped_addr, &fdobj)) != GRPC_ERROR_NONE) { - GRPC_CLOSURE_SCHED(closure, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, closure, error); return; } grpc_tcp_client_create_from_prepared_fd(interested_parties, closure, fdobj, diff --git a/src/core/lib/iomgr/tcp_client_windows.cc b/src/core/lib/iomgr/tcp_client_windows.cc index 66699533d7a..047a9f36c0e 100644 --- a/src/core/lib/iomgr/tcp_client_windows.cc +++ b/src/core/lib/iomgr/tcp_client_windows.cc @@ -117,7 +117,7 @@ static void on_connect(void* acp, grpc_error* error) { async_connect_unlock_and_cleanup(ac, socket); /* If the connection was aborted, the callback was already called when the deadline was met. */ - GRPC_CLOSURE_SCHED(on_done, error); + ExecCtx::Run(DEBUG_LOCATION, on_done, error); } /* Tries to issue one async connection, then schedules both an IOCP @@ -225,7 +225,7 @@ failure: } else if (sock != INVALID_SOCKET) { closesocket(sock); } - GRPC_CLOSURE_SCHED(on_done, final_error); + ExecCtx::Run(DEBUG_LOCATION, on_done, final_error); } grpc_tcp_client_vtable grpc_windows_tcp_client_vtable = {tcp_connect}; diff --git a/src/core/lib/iomgr/tcp_custom.cc b/src/core/lib/iomgr/tcp_custom.cc index d594f01d89a..9141c65cb18 100644 --- a/src/core/lib/iomgr/tcp_custom.cc +++ b/src/core/lib/iomgr/tcp_custom.cc @@ -140,7 +140,7 @@ static void call_read_cb(custom_tcp_endpoint* tcp, grpc_error* error) { TCP_UNREF(tcp, "read"); tcp->read_slices = nullptr; tcp->read_cb = nullptr; - GRPC_CLOSURE_SCHED(cb, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, cb, error); } static void custom_read_callback(grpc_custom_socket* socket, size_t nread, @@ -220,7 +220,7 @@ static void custom_write_callback(grpc_custom_socket* socket, gpr_log(GPR_INFO, "write complete on %p: error=%s", tcp->socket, str); } TCP_UNREF(tcp, "write"); - GRPC_CLOSURE_SCHED(cb, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, cb, error); } static void endpoint_write(grpc_endpoint* ep, grpc_slice_buffer* write_slices, @@ -241,8 +241,9 @@ static void endpoint_write(grpc_endpoint* ep, grpc_slice_buffer* write_slices, } if (tcp->shutting_down) { - GRPC_CLOSURE_SCHED(cb, GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "TCP socket is shutting down")); + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, cb, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("TCP socket is shutting down")); return; } @@ -252,7 +253,7 @@ static void endpoint_write(grpc_endpoint* ep, grpc_slice_buffer* write_slices, if (tcp->write_slices->count == 0) { // No slices means we don't have to do anything, // and libuv doesn't like empty writes - GRPC_CLOSURE_SCHED(cb, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, cb, GRPC_ERROR_NONE); return; } tcp->write_cb = cb; @@ -289,10 +290,10 @@ static void endpoint_shutdown(grpc_endpoint* ep, grpc_error* why) { gpr_log(GPR_INFO, "TCP %p shutdown why=%s", tcp->socket, str); } tcp->shutting_down = true; - // GRPC_CLOSURE_SCHED(tcp->read_cb, GRPC_ERROR_REF(why)); - // GRPC_CLOSURE_SCHED(tcp->write_cb, GRPC_ERROR_REF(why)); - // tcp->read_cb = nullptr; - // tcp->write_cb = nullptr; + // grpc_core::ExecCtx::Run(DEBUG_LOCATION,tcp->read_cb, + // GRPC_ERROR_REF(why)); + // grpc_core::ExecCtx::Run(DEBUG_LOCATION,tcp->write_cb, + // GRPC_ERROR_REF(why)); tcp->read_cb = nullptr; tcp->write_cb = nullptr; grpc_resource_user_shutdown(tcp->resource_user); grpc_custom_socket_vtable->shutdown(tcp->socket); } diff --git a/src/core/lib/iomgr/tcp_posix.cc b/src/core/lib/iomgr/tcp_posix.cc index f783a4fd6cf..51f87e03faa 100644 --- a/src/core/lib/iomgr/tcp_posix.cc +++ b/src/core/lib/iomgr/tcp_posix.cc @@ -417,7 +417,7 @@ static void call_read_cb(grpc_tcp* tcp, grpc_error* error) { tcp->read_cb = nullptr; tcp->incoming_buffer = nullptr; - GRPC_CLOSURE_SCHED(cb, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, cb, error); } #define MAX_READ_IOVEC 4 @@ -645,7 +645,8 @@ static void tcp_read(grpc_endpoint* ep, grpc_slice_buffer* incoming_buffer, * right thing (i.e calls tcp_do_read() which either reads the available * bytes or calls notify_on_read() to be notified when new bytes become * available */ - GRPC_CLOSURE_SCHED(&tcp->read_done_closure, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, &tcp->read_done_closure, + GRPC_ERROR_NONE); } } @@ -1026,7 +1027,7 @@ static void tcp_handle_write(void* arg /* grpc_tcp */, grpc_error* error) { if (error != GRPC_ERROR_NONE) { cb = tcp->write_cb; tcp->write_cb = nullptr; - GRPC_CLOSURE_SCHED(cb, GRPC_ERROR_REF(error)); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, cb, GRPC_ERROR_REF(error)); TCP_UNREF(tcp, "write"); return; } @@ -1075,11 +1076,12 @@ static void tcp_write(grpc_endpoint* ep, grpc_slice_buffer* buf, tcp->outgoing_buffer_arg = arg; if (buf->length == 0) { - GRPC_CLOSURE_SCHED( - cb, grpc_fd_is_shutdown(tcp->em_fd) - ? tcp_annotate_error( - GRPC_ERROR_CREATE_FROM_STATIC_STRING("EOF"), tcp) - : GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, cb, + grpc_fd_is_shutdown(tcp->em_fd) + ? tcp_annotate_error(GRPC_ERROR_CREATE_FROM_STATIC_STRING("EOF"), + tcp) + : GRPC_ERROR_NONE); tcp_shutdown_buffer_list(tcp); return; } @@ -1101,7 +1103,7 @@ static void tcp_write(grpc_endpoint* ep, grpc_slice_buffer* buf, const char* str = grpc_error_string(error); gpr_log(GPR_INFO, "write: %s", str); } - GRPC_CLOSURE_SCHED(cb, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, cb, error); } } diff --git a/src/core/lib/iomgr/tcp_server_custom.cc b/src/core/lib/iomgr/tcp_server_custom.cc index 90ed555f38a..d5fd1919ca2 100644 --- a/src/core/lib/iomgr/tcp_server_custom.cc +++ b/src/core/lib/iomgr/tcp_server_custom.cc @@ -124,7 +124,8 @@ static void tcp_server_shutdown_starting_add(grpc_tcp_server* s, static void finish_shutdown(grpc_tcp_server* s) { GPR_ASSERT(s->shutdown); if (s->shutdown_complete != nullptr) { - GRPC_CLOSURE_SCHED(s->shutdown_complete, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, s->shutdown_complete, + GRPC_ERROR_NONE); } while (s->head) { diff --git a/src/core/lib/iomgr/tcp_server_posix.cc b/src/core/lib/iomgr/tcp_server_posix.cc index b1637e9981a..eb4d3cbdef6 100644 --- a/src/core/lib/iomgr/tcp_server_posix.cc +++ b/src/core/lib/iomgr/tcp_server_posix.cc @@ -108,7 +108,8 @@ static void finish_shutdown(grpc_tcp_server* s) { GPR_ASSERT(s->shutdown); gpr_mu_unlock(&s->mu); if (s->shutdown_complete != nullptr) { - GRPC_CLOSURE_SCHED(s->shutdown_complete, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, s->shutdown_complete, + GRPC_ERROR_NONE); } gpr_mu_destroy(&s->mu); diff --git a/src/core/lib/iomgr/tcp_server_windows.cc b/src/core/lib/iomgr/tcp_server_windows.cc index 0024f807ed3..0f485d720f5 100644 --- a/src/core/lib/iomgr/tcp_server_windows.cc +++ b/src/core/lib/iomgr/tcp_server_windows.cc @@ -135,10 +135,11 @@ static void destroy_server(void* arg, grpc_error* error) { static void finish_shutdown_locked(grpc_tcp_server* s) { if (s->shutdown_complete != NULL) { - GRPC_CLOSURE_SCHED(s->shutdown_complete, GRPC_ERROR_NONE); + ExecCtx::Run(DEBUG_LOCATION, s->shutdown_complete, GRPC_ERROR_NONE); } - GRPC_CLOSURE_SCHED( + ExecCtx::Run( + DEBUG_LOCATION, GRPC_CLOSURE_CREATE(destroy_server, s, grpc_schedule_on_exec_ctx), GRPC_ERROR_NONE); } diff --git a/src/core/lib/iomgr/tcp_windows.cc b/src/core/lib/iomgr/tcp_windows.cc index 32d0bb36ea7..3e9c94a54fb 100644 --- a/src/core/lib/iomgr/tcp_windows.cc +++ b/src/core/lib/iomgr/tcp_windows.cc @@ -233,7 +233,7 @@ static void on_read(void* tcpp, grpc_error* error) { tcp->read_cb = NULL; TCP_UNREF(tcp, "read"); - GRPC_CLOSURE_SCHED(cb, error); + ExecCtx::Run(DEBUG_LOCATION, cb, error); } #define DEFAULT_TARGET_READ_SIZE 8192 @@ -254,9 +254,9 @@ static void win_read(grpc_endpoint* ep, grpc_slice_buffer* read_slices, } if (tcp->shutting_down) { - GRPC_CLOSURE_SCHED( - cb, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "TCP socket is shutting down", &tcp->shutdown_error, 1)); + ExecCtx::Run(DEBUG_LOCATION, cb, + GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "TCP socket is shutting down", &tcp->shutdown_error, 1)); return; } @@ -289,7 +289,7 @@ static void win_read(grpc_endpoint* ep, grpc_slice_buffer* read_slices, /* Did we get data immediately ? Yay. */ if (info->wsa_error != WSAEWOULDBLOCK) { info->bytes_transferred = bytes_read; - GRPC_CLOSURE_SCHED(&tcp->on_read, GRPC_ERROR_NONE); + ExecCtx::Run(DEBUG_LOCATION, &tcp->on_read, GRPC_ERROR_NONE); return; } @@ -302,8 +302,8 @@ static void win_read(grpc_endpoint* ep, grpc_slice_buffer* read_slices, int wsa_error = WSAGetLastError(); if (wsa_error != WSA_IO_PENDING) { info->wsa_error = wsa_error; - GRPC_CLOSURE_SCHED(&tcp->on_read, - GRPC_WSA_ERROR(info->wsa_error, "WSARecv")); + ExecCtx::Run(DEBUG_LOCATION, &tcp->on_read, + GRPC_WSA_ERROR(info->wsa_error, "WSARecv")); return; } } @@ -338,7 +338,7 @@ static void on_write(void* tcpp, grpc_error* error) { } TCP_UNREF(tcp, "write"); - GRPC_CLOSURE_SCHED(cb, error); + ExecCtx::Run(DEBUG_LOCATION, cb, error); } /* Initiates a write. */ @@ -366,9 +366,9 @@ static void win_write(grpc_endpoint* ep, grpc_slice_buffer* slices, } if (tcp->shutting_down) { - GRPC_CLOSURE_SCHED( - cb, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "TCP socket is shutting down", &tcp->shutdown_error, 1)); + ExecCtx::Run(DEBUG_LOCATION, cb, + GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "TCP socket is shutting down", &tcp->shutdown_error, 1)); return; } @@ -399,7 +399,7 @@ static void win_write(grpc_endpoint* ep, grpc_slice_buffer* slices, grpc_error* error = status == 0 ? GRPC_ERROR_NONE : GRPC_WSA_ERROR(info->wsa_error, "WSASend"); - GRPC_CLOSURE_SCHED(cb, error); + ExecCtx::Run(DEBUG_LOCATION, cb, error); if (allocated) gpr_free(allocated); return; } @@ -417,7 +417,7 @@ static void win_write(grpc_endpoint* ep, grpc_slice_buffer* slices, int wsa_error = WSAGetLastError(); if (wsa_error != WSA_IO_PENDING) { TCP_UNREF(tcp, "write"); - GRPC_CLOSURE_SCHED(cb, GRPC_WSA_ERROR(wsa_error, "WSASend")); + ExecCtx::Run(DEBUG_LOCATION, cb, GRPC_WSA_ERROR(wsa_error, "WSASend")); return; } } diff --git a/src/core/lib/iomgr/timer_custom.cc b/src/core/lib/iomgr/timer_custom.cc index 0af30ca5497..c550d441229 100644 --- a/src/core/lib/iomgr/timer_custom.cc +++ b/src/core/lib/iomgr/timer_custom.cc @@ -37,7 +37,7 @@ void grpc_custom_timer_callback(grpc_custom_timer* t, grpc_error* /*error*/) { grpc_timer* timer = t->original; GPR_ASSERT(timer->pending); timer->pending = 0; - GRPC_CLOSURE_SCHED(timer->closure, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, timer->closure, GRPC_ERROR_NONE); custom_timer_impl->stop(t); gpr_free(t); } @@ -48,7 +48,7 @@ static void timer_init(grpc_timer* timer, grpc_millis deadline, GRPC_CUSTOM_IOMGR_ASSERT_SAME_THREAD(); grpc_millis now = grpc_core::ExecCtx::Get()->Now(); if (deadline <= grpc_core::ExecCtx::Get()->Now()) { - GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, closure, GRPC_ERROR_NONE); timer->pending = false; return; } else { @@ -69,7 +69,8 @@ static void timer_cancel(grpc_timer* timer) { grpc_custom_timer* tw = (grpc_custom_timer*)timer->custom_timer; if (timer->pending) { timer->pending = 0; - GRPC_CLOSURE_SCHED(timer->closure, GRPC_ERROR_CANCELLED); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, timer->closure, + GRPC_ERROR_CANCELLED); custom_timer_impl->stop(tw); gpr_free(tw); } diff --git a/src/core/lib/iomgr/timer_generic.cc b/src/core/lib/iomgr/timer_generic.cc index 00c18789481..dc3016ad8ec 100644 --- a/src/core/lib/iomgr/timer_generic.cc +++ b/src/core/lib/iomgr/timer_generic.cc @@ -369,9 +369,10 @@ static void timer_init(grpc_timer* timer, grpc_millis deadline, if (!g_shared_mutables.initialized) { timer->pending = false; - GRPC_CLOSURE_SCHED(timer->closure, - GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "Attempt to create timer before initialization")); + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, timer->closure, + GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Attempt to create timer before initialization")); return; } @@ -380,7 +381,7 @@ static void timer_init(grpc_timer* timer, grpc_millis deadline, grpc_millis now = grpc_core::ExecCtx::Get()->Now(); if (deadline <= now) { timer->pending = false; - GRPC_CLOSURE_SCHED(timer->closure, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, timer->closure, GRPC_ERROR_NONE); gpr_mu_unlock(&shard->mu); /* early out */ return; @@ -471,7 +472,8 @@ static void timer_cancel(grpc_timer* timer) { if (timer->pending) { REMOVE_FROM_HASH_TABLE(timer); - GRPC_CLOSURE_SCHED(timer->closure, GRPC_ERROR_CANCELLED); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, timer->closure, + GRPC_ERROR_CANCELLED); timer->pending = false; if (timer->heap_index == INVALID_HEAP_INDEX) { list_remove(timer); @@ -564,7 +566,8 @@ static size_t pop_timers(timer_shard* shard, grpc_millis now, gpr_mu_lock(&shard->mu); while ((timer = pop_one(shard, now))) { REMOVE_FROM_HASH_TABLE(timer); - GRPC_CLOSURE_SCHED(timer->closure, GRPC_ERROR_REF(error)); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, timer->closure, + GRPC_ERROR_REF(error)); n++; } *new_min_deadline = compute_min_deadline(shard); diff --git a/src/core/lib/iomgr/udp_server.cc b/src/core/lib/iomgr/udp_server.cc index 498369ba47e..8bac6dd6a2d 100644 --- a/src/core/lib/iomgr/udp_server.cc +++ b/src/core/lib/iomgr/udp_server.cc @@ -243,7 +243,8 @@ void GrpcUdpListener::shutdown_fd(void* args, grpc_error* error) { static void finish_shutdown(grpc_udp_server* s) { if (s->shutdown_complete != nullptr) { - GRPC_CLOSURE_SCHED(s->shutdown_complete, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, s->shutdown_complete, + GRPC_ERROR_NONE); } gpr_mu_destroy(&s->mu); diff --git a/src/core/lib/security/credentials/composite/composite_credentials.cc b/src/core/lib/security/credentials/composite/composite_credentials.cc index 586bbed778e..1e46798ff2c 100644 --- a/src/core/lib/security/credentials/composite/composite_credentials.cc +++ b/src/core/lib/security/credentials/composite/composite_credentials.cc @@ -80,7 +80,8 @@ static void composite_call_metadata_cb(void* arg, grpc_error* error) { } // We're done! } - GRPC_CLOSURE_SCHED(ctx->on_request_metadata, GRPC_ERROR_REF(error)); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, ctx->on_request_metadata, + GRPC_ERROR_REF(error)); gpr_free(ctx); } diff --git a/src/core/lib/security/credentials/fake/fake_credentials.cc b/src/core/lib/security/credentials/fake/fake_credentials.cc index f6a04db3c1a..77aed2c1b9d 100644 --- a/src/core/lib/security/credentials/fake/fake_credentials.cc +++ b/src/core/lib/security/credentials/fake/fake_credentials.cc @@ -94,7 +94,8 @@ bool grpc_md_only_test_credentials::get_request_metadata( grpc_error** /*error*/) { grpc_credentials_mdelem_array_add(md_array, md_); if (is_async_) { - GRPC_CLOSURE_SCHED(on_request_metadata, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_request_metadata, + GRPC_ERROR_NONE); return false; } return true; diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc index f72679257c5..1c6ea9388b0 100644 --- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc +++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc @@ -256,7 +256,8 @@ void grpc_oauth2_token_fetcher_credentials::on_http_response( new_error = GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Error occurred when fetching oauth2 token.", &error, 1); } - GRPC_CLOSURE_SCHED(pending_request->on_request_metadata, new_error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, + pending_request->on_request_metadata, new_error); grpc_polling_entity_del_from_pollset_set( pending_request->pollent, grpc_polling_entity_pollset_set(&pollent_)); grpc_oauth2_pending_get_request_metadata* prev = pending_request; @@ -332,8 +333,9 @@ void grpc_oauth2_token_fetcher_credentials::cancel_get_request_metadata( pending_requests_ = pending_request->next; } // Invoke the callback immediately with an error. - GRPC_CLOSURE_SCHED(pending_request->on_request_metadata, - GRPC_ERROR_REF(error)); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, + pending_request->on_request_metadata, + GRPC_ERROR_REF(error)); gpr_free(pending_request); break; } diff --git a/src/core/lib/security/credentials/plugin/plugin_credentials.cc b/src/core/lib/security/credentials/plugin/plugin_credentials.cc index c1966ae3753..d74f77282a2 100644 --- a/src/core/lib/security/credentials/plugin/plugin_credentials.cc +++ b/src/core/lib/security/credentials/plugin/plugin_credentials.cc @@ -131,7 +131,7 @@ static void plugin_md_request_metadata_ready(void* request, if (!r->cancelled) { grpc_error* error = process_plugin_result(r, md, num_md, status, error_details); - GRPC_CLOSURE_SCHED(r->on_request_metadata, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, r->on_request_metadata, error); } else if (GRPC_TRACE_FLAG_ENABLED(grpc_plugin_credentials_trace)) { gpr_log(GPR_INFO, "plugin_credentials[%p]: request %p: plugin was previously " @@ -228,8 +228,9 @@ void grpc_plugin_credentials::cancel_get_request_metadata( pending_request); } pending_request->cancelled = true; - GRPC_CLOSURE_SCHED(pending_request->on_request_metadata, - GRPC_ERROR_REF(error)); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, + pending_request->on_request_metadata, + GRPC_ERROR_REF(error)); pending_request_remove_locked(pending_request); break; } diff --git a/src/core/lib/security/security_connector/alts/alts_security_connector.cc b/src/core/lib/security/security_connector/alts/alts_security_connector.cc index a20cf448f8d..e4e33256364 100644 --- a/src/core/lib/security/security_connector/alts/alts_security_connector.cc +++ b/src/core/lib/security/security_connector/alts/alts_security_connector.cc @@ -59,7 +59,7 @@ void alts_check_peer(tsi_peer peer, ? GRPC_ERROR_NONE : GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Could not get ALTS auth context from TSI peer"); - GRPC_CLOSURE_SCHED(on_peer_checked, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_peer_checked, error); } class grpc_alts_channel_security_connector final diff --git a/src/core/lib/security/security_connector/fake/fake_security_connector.cc b/src/core/lib/security/security_connector/fake/fake_security_connector.cc index 39006348f7f..d4203d1dfe8 100644 --- a/src/core/lib/security/security_connector/fake/fake_security_connector.cc +++ b/src/core/lib/security/security_connector/fake/fake_security_connector.cc @@ -245,7 +245,7 @@ static void fake_check_peer( auth_context->get(), GRPC_TRANSPORT_SECURITY_TYPE_PROPERTY_NAME, GRPC_FAKE_TRANSPORT_SECURITY_TYPE); end: - GRPC_CLOSURE_SCHED(on_peer_checked, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_peer_checked, error); tsi_peer_destruct(&peer); } diff --git a/src/core/lib/security/security_connector/local/local_security_connector.cc b/src/core/lib/security/security_connector/local/local_security_connector.cc index d56fc450a9c..20d0888320b 100644 --- a/src/core/lib/security/security_connector/local/local_security_connector.cc +++ b/src/core/lib/security/security_connector/local/local_security_connector.cc @@ -100,7 +100,7 @@ void local_check_peer(grpc_security_connector* /*sc*/, tsi_peer /*peer*/, if (!is_endpoint_local) { error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Endpoint is neither UDS or TCP loopback address."); - GRPC_CLOSURE_SCHED(on_peer_checked, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_peer_checked, error); return; } /* Create an auth context which is necessary to pass the santiy check in @@ -112,7 +112,7 @@ void local_check_peer(grpc_security_connector* /*sc*/, tsi_peer /*peer*/, error = *auth_context != nullptr ? GRPC_ERROR_NONE : GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Could not create local auth context"); - GRPC_CLOSURE_SCHED(on_peer_checked, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_peer_checked, error); } class grpc_local_channel_security_connector final diff --git a/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc b/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc index 8e3558f102a..b28cee3c13b 100644 --- a/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc +++ b/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc @@ -167,7 +167,7 @@ class grpc_ssl_channel_security_connector final } } } - GRPC_CLOSURE_SCHED(on_peer_checked, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_peer_checked, error); tsi_peer_destruct(&peer); } @@ -302,7 +302,7 @@ class grpc_ssl_server_security_connector grpc_closure* on_peer_checked) override { grpc_error* error = ssl_check_peer(nullptr, &peer, auth_context); tsi_peer_destruct(&peer); - GRPC_CLOSURE_SCHED(on_peer_checked, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_peer_checked, error); } int cmp(const grpc_security_connector* other) const override { diff --git a/src/core/lib/security/security_connector/tls/spiffe_security_connector.cc b/src/core/lib/security/security_connector/tls/spiffe_security_connector.cc index 8fedff78266..8dc2937c152 100644 --- a/src/core/lib/security/security_connector/tls/spiffe_security_connector.cc +++ b/src/core/lib/security/security_connector/tls/spiffe_security_connector.cc @@ -172,7 +172,7 @@ void SpiffeChannelSecurityConnector::check_peer( : target_name_.get(); grpc_error* error = grpc_ssl_check_alpn(&peer); if (error != GRPC_ERROR_NONE) { - GRPC_CLOSURE_SCHED(on_peer_checked, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_peer_checked, error); tsi_peer_destruct(&peer); return; } @@ -213,7 +213,7 @@ void SpiffeChannelSecurityConnector::check_peer( error = ProcessServerAuthorizationCheckResult(check_arg_); } } - GRPC_CLOSURE_SCHED(on_peer_checked, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_peer_checked, error); tsi_peer_destruct(&peer); } @@ -342,7 +342,7 @@ void SpiffeChannelSecurityConnector::ServerAuthorizationCheckDone( grpc_error* error = ProcessServerAuthorizationCheckResult(arg); SpiffeChannelSecurityConnector* connector = static_cast(arg->cb_user_data); - GRPC_CLOSURE_SCHED(connector->on_peer_checked_, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, connector->on_peer_checked_, error); } grpc_error* @@ -446,7 +446,7 @@ void SpiffeServerSecurityConnector::check_peer( *auth_context = grpc_ssl_peer_to_auth_context( &peer, GRPC_TLS_SPIFFE_TRANSPORT_SECURITY_TYPE); tsi_peer_destruct(&peer); - GRPC_CLOSURE_SCHED(on_peer_checked, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_peer_checked, error); } int SpiffeServerSecurityConnector::cmp( diff --git a/src/core/lib/security/transport/secure_endpoint.cc b/src/core/lib/security/transport/secure_endpoint.cc index 0aac7d8d780..705d1675615 100644 --- a/src/core/lib/security/transport/secure_endpoint.cc +++ b/src/core/lib/security/transport/secure_endpoint.cc @@ -165,7 +165,7 @@ static void call_read_cb(secure_endpoint* ep, grpc_error* error) { } } ep->read_buffer = nullptr; - GRPC_CLOSURE_SCHED(ep->read_cb, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, ep->read_cb, error); SECURE_ENDPOINT_UNREF(ep, "read"); } @@ -363,9 +363,10 @@ static void endpoint_write(grpc_endpoint* secure_ep, grpc_slice_buffer* slices, if (result != TSI_OK) { /* TODO(yangg) do different things according to the error type? */ grpc_slice_buffer_reset_and_unref_internal(&ep->output_buffer); - GRPC_CLOSURE_SCHED( - cb, grpc_set_tsi_error_result( - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Wrap failed"), result)); + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, cb, + grpc_set_tsi_error_result( + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Wrap failed"), result)); return; } diff --git a/src/core/lib/security/transport/security_handshaker.cc b/src/core/lib/security/transport/security_handshaker.cc index 74062be682f..7beb216063f 100644 --- a/src/core/lib/security/transport/security_handshaker.cc +++ b/src/core/lib/security/transport/security_handshaker.cc @@ -199,7 +199,7 @@ void SecurityHandshaker::HandshakeFailedLocked(grpc_error* error) { is_shutdown_ = true; } // Invoke callback. - GRPC_CLOSURE_SCHED(on_handshake_done_, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_handshake_done_, error); } void SecurityHandshaker::OnPeerCheckedInner(grpc_error* error) { @@ -259,7 +259,7 @@ void SecurityHandshaker::OnPeerCheckedInner(grpc_error* error) { args_->args = grpc_channel_args_copy_and_add(tmp_args, &auth_context_arg, 1); grpc_channel_args_destroy(tmp_args); // Invoke callback. - GRPC_CLOSURE_SCHED(on_handshake_done_, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_handshake_done_, GRPC_ERROR_NONE); // Set shutdown to true so that subsequent calls to // security_handshaker_shutdown() do nothing. is_shutdown_ = true; @@ -449,9 +449,9 @@ class FailHandshaker : public Handshaker { void DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/, grpc_closure* on_handshake_done, HandshakerArgs* /*args*/) override { - GRPC_CLOSURE_SCHED(on_handshake_done, - GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "Failed to create security handshaker")); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_handshake_done, + GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Failed to create security handshaker")); } private: diff --git a/src/core/lib/security/transport/server_auth_filter.cc b/src/core/lib/security/transport/server_auth_filter.cc index d7b33f99509..ebf0d1a92fa 100644 --- a/src/core/lib/security/transport/server_auth_filter.cc +++ b/src/core/lib/security/transport/server_auth_filter.cc @@ -159,7 +159,7 @@ static void on_md_processing_done_inner(grpc_call_element* elem, calld->recv_trailing_metadata_error, "continue recv_trailing_metadata_ready"); } - GRPC_CLOSURE_SCHED(closure, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, closure, error); } // Called from application code. diff --git a/src/core/lib/surface/call.cc b/src/core/lib/surface/call.cc index 605d69a2ebf..258d5555e0e 100644 --- a/src/core/lib/surface/call.cc +++ b/src/core/lib/surface/call.cc @@ -1228,8 +1228,9 @@ static void post_batch_completion(batch_control* bctl) { * running in any combiner here, we need to use GRPC_CLOSURE_SCHED instead * of GRPC_CLOSURE_RUN. */ - GRPC_CLOSURE_SCHED((grpc_closure*)bctl->completion_data.notify_tag.tag, - error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, + (grpc_closure*)bctl->completion_data.notify_tag.tag, + error); GRPC_CALL_INTERNAL_UNREF(call, "completion"); } else { /* unrefs error */ @@ -1574,7 +1575,8 @@ static grpc_call_error call_start_batch(grpc_call* call, const grpc_op* ops, static_cast( gpr_malloc(sizeof(grpc_cq_completion)))); } else { - GRPC_CLOSURE_SCHED((grpc_closure*)notify_tag, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, (grpc_closure*)notify_tag, + GRPC_ERROR_NONE); } error = GRPC_CALL_OK; goto done; diff --git a/src/core/lib/surface/completion_queue.cc b/src/core/lib/surface/completion_queue.cc index 0f882851966..9b29b54ab25 100644 --- a/src/core/lib/surface/completion_queue.cc +++ b/src/core/lib/surface/completion_queue.cc @@ -131,7 +131,7 @@ grpc_error* non_polling_poller_work(grpc_pollset* pollset, npp->root = w.next; if (&w == npp->root) { if (npp->shutdown) { - GRPC_CLOSURE_SCHED(npp->shutdown, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, npp->shutdown, GRPC_ERROR_NONE); } npp->root = nullptr; } @@ -166,7 +166,7 @@ void non_polling_poller_shutdown(grpc_pollset* pollset, grpc_closure* closure) { GPR_ASSERT(closure != nullptr); p->shutdown = closure; if (p->root == nullptr) { - GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, closure, GRPC_ERROR_NONE); } else { non_polling_worker* w = p->root; do { diff --git a/src/core/lib/surface/lame_client.cc b/src/core/lib/surface/lame_client.cc index e2a0cfd2dd3..a9f5c9c7791 100644 --- a/src/core/lib/surface/lame_client.cc +++ b/src/core/lib/surface/lame_client.cc @@ -111,18 +111,16 @@ static void lame_start_transport_op(grpc_channel_element* elem, } } if (op->send_ping.on_initiate != nullptr) { - GRPC_CLOSURE_SCHED( - op->send_ping.on_initiate, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("lame client channel")); + ExecCtx::Run(DEBUG_LOCATION, op->send_ping.on_initiate, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("lame client channel")); } if (op->send_ping.on_ack != nullptr) { - GRPC_CLOSURE_SCHED( - op->send_ping.on_ack, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("lame client channel")); + ExecCtx::Run(DEBUG_LOCATION, op->send_ping.on_ack, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("lame client channel")); } GRPC_ERROR_UNREF(op->disconnect_with_error); if (op->on_consumed != nullptr) { - GRPC_CLOSURE_SCHED(op->on_consumed, GRPC_ERROR_NONE); + ExecCtx::Run(DEBUG_LOCATION, op->on_consumed, GRPC_ERROR_NONE); } } @@ -136,7 +134,7 @@ static grpc_error* lame_init_call_elem(grpc_call_element* elem, static void lame_destroy_call_elem(grpc_call_element* /*elem*/, const grpc_call_final_info* /*final_info*/, grpc_closure* then_schedule_closure) { - GRPC_CLOSURE_SCHED(then_schedule_closure, GRPC_ERROR_NONE); + ExecCtx::Run(DEBUG_LOCATION, then_schedule_closure, GRPC_ERROR_NONE); } static grpc_error* lame_init_channel_elem(grpc_channel_element* elem, diff --git a/src/core/lib/surface/server.cc b/src/core/lib/surface/server.cc index eed32a9a23d..f3848fd4ffa 100644 --- a/src/core/lib/surface/server.cc +++ b/src/core/lib/surface/server.cc @@ -381,7 +381,8 @@ static void request_matcher_zombify_all_pending_calls(request_matcher* rm) { &calld->kill_zombie_closure, kill_zombie, grpc_call_stack_element(grpc_call_get_call_stack(calld->call), 0), grpc_schedule_on_exec_ctx); - GRPC_CLOSURE_SCHED(&calld->kill_zombie_closure, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, &calld->kill_zombie_closure, + GRPC_ERROR_NONE); } } @@ -527,7 +528,8 @@ static void publish_new_rpc(void* arg, grpc_error* error) { &calld->kill_zombie_closure, kill_zombie, grpc_call_stack_element(grpc_call_get_call_stack(calld->call), 0), grpc_schedule_on_exec_ctx); - GRPC_CLOSURE_SCHED(&calld->kill_zombie_closure, GRPC_ERROR_REF(error)); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, &calld->kill_zombie_closure, + GRPC_ERROR_REF(error)); return; } @@ -588,7 +590,8 @@ static void finish_start_new_rpc( gpr_atm_no_barrier_store(&calld->state, ZOMBIED); GRPC_CLOSURE_INIT(&calld->kill_zombie_closure, kill_zombie, elem, grpc_schedule_on_exec_ctx); - GRPC_CLOSURE_SCHED(&calld->kill_zombie_closure, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, &calld->kill_zombie_closure, + GRPC_ERROR_NONE); return; } @@ -843,7 +846,8 @@ static void got_initial_metadata(void* ptr, grpc_error* error) { if (gpr_atm_full_cas(&calld->state, NOT_STARTED, ZOMBIED)) { GRPC_CLOSURE_INIT(&calld->kill_zombie_closure, kill_zombie, elem, grpc_schedule_on_exec_ctx); - GRPC_CLOSURE_SCHED(&calld->kill_zombie_closure, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, &calld->kill_zombie_closure, + GRPC_ERROR_NONE); } else if (gpr_atm_full_cas(&calld->state, PENDING, ZOMBIED)) { /* zombied call will be destroyed when it's removed from the pending queue... later */ @@ -1448,7 +1452,8 @@ static grpc_call_error queue_call_request(grpc_server* server, size_t cq_idx, &calld->kill_zombie_closure, kill_zombie, grpc_call_stack_element(grpc_call_get_call_stack(calld->call), 0), grpc_schedule_on_exec_ctx); - GRPC_CLOSURE_SCHED(&calld->kill_zombie_closure, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, &calld->kill_zombie_closure, + GRPC_ERROR_NONE); } else { publish_call(server, calld, cq_idx, rc); } diff --git a/src/core/lib/transport/connectivity_state.cc b/src/core/lib/transport/connectivity_state.cc index b51fdfdb13d..d8b8022aae1 100644 --- a/src/core/lib/transport/connectivity_state.cc +++ b/src/core/lib/transport/connectivity_state.cc @@ -67,7 +67,7 @@ class AsyncConnectivityStateWatcherInterface::Notifier { } else { GRPC_CLOSURE_INIT(&closure_, SendNotification, this, grpc_schedule_on_exec_ctx); - GRPC_CLOSURE_SCHED(&closure_, GRPC_ERROR_NONE); + ExecCtx::Run(DEBUG_LOCATION, &closure_, GRPC_ERROR_NONE); } } diff --git a/src/core/lib/transport/transport.cc b/src/core/lib/transport/transport.cc index 0a82f7cb8ca..f691074cf67 100644 --- a/src/core/lib/transport/transport.cc +++ b/src/core/lib/transport/transport.cc @@ -52,7 +52,8 @@ void grpc_stream_destroy(grpc_stream_refcount* refcount) { there. */ grpc_core::Executor::Run(&refcount->destroy, GRPC_ERROR_NONE); } else { - GRPC_CLOSURE_SCHED(&refcount->destroy, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, &refcount->destroy, + GRPC_ERROR_NONE); } } @@ -218,7 +219,8 @@ struct made_transport_op { static void destroy_made_transport_op(void* arg, grpc_error* error) { made_transport_op* op = static_cast(arg); - GRPC_CLOSURE_SCHED(op->inner_on_complete, GRPC_ERROR_REF(error)); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, op->inner_on_complete, + GRPC_ERROR_REF(error)); grpc_core::Delete(op); } From 3a189d7e08e7416fe74304281f5606f889fbcdb0 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Thu, 31 Oct 2019 17:09:38 -0700 Subject: [PATCH 039/133] test changes --- .../dns_resolver_connectivity_test.cc | 4 ++-- test/core/end2end/fuzzers/api_fuzzer.cc | 17 +++++++------- test/core/end2end/goaway_server_test.cc | 4 ++-- test/core/iomgr/udp_server_test.cc | 2 +- test/core/security/credentials_test.cc | 14 +++++------ test/core/security/jwt_verifier_test.cc | 10 ++++---- test/core/util/mock_endpoint.cc | 12 +++++----- test/core/util/passthru_endpoint.cc | 19 +++++++-------- test/core/util/trickle_endpoint.cc | 3 ++- test/cpp/microbenchmarks/bm_call_create.cc | 6 ++--- .../microbenchmarks/bm_chttp2_transport.cc | 15 ++++++------ test/cpp/microbenchmarks/bm_closure.cc | 23 +++++++++++-------- .../microbenchmarks/bm_cq_multiple_threads.cc | 2 +- 13 files changed, 69 insertions(+), 62 deletions(-) diff --git a/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc b/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc index a7b08393b33..549255fbf01 100644 --- a/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc +++ b/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc @@ -54,7 +54,7 @@ static void my_resolve_address(const char* addr, const char* /*default_port*/, gpr_malloc(sizeof(*(*addrs)->addrs))); (*addrs)->addrs[0].len = 123; } - GRPC_CLOSURE_SCHED(on_done, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_done, error); } static grpc_address_resolver_vtable test_resolver = {my_resolve_address, @@ -81,7 +81,7 @@ static grpc_ares_request* my_dns_lookup_ares_locked( dummy_resolved_address.len = 123; (*addresses)->emplace_back(dummy_resolved_address, nullptr); } - GRPC_CLOSURE_SCHED(on_done, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_done, error); return nullptr; } diff --git a/test/core/end2end/fuzzers/api_fuzzer.cc b/test/core/end2end/fuzzers/api_fuzzer.cc index c5d5aa8afc7..7cc2360b920 100644 --- a/test/core/end2end/fuzzers/api_fuzzer.cc +++ b/test/core/end2end/fuzzers/api_fuzzer.cc @@ -347,11 +347,11 @@ static void finish_resolve(void* arg, grpc_error* error) { dummy_resolved_address.len = 0; (*r->addresses)->emplace_back(dummy_resolved_address, nullptr); } - GRPC_CLOSURE_SCHED(r->on_done, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, r->on_done, GRPC_ERROR_NONE); } else { - GRPC_CLOSURE_SCHED(r->on_done, - GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "Resolution failed", &error, 1)); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, r->on_done, + GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "Resolution failed", &error, 1)); } gpr_free(r->addr); @@ -412,7 +412,7 @@ static void do_connect(void* arg, grpc_error* error) { future_connect* fc = static_cast(arg); if (error != GRPC_ERROR_NONE) { *fc->ep = nullptr; - GRPC_CLOSURE_SCHED(fc->closure, GRPC_ERROR_REF(error)); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, fc->closure, GRPC_ERROR_REF(error)); } else if (g_server != nullptr) { grpc_endpoint* client; grpc_endpoint* server; @@ -424,7 +424,7 @@ static void do_connect(void* arg, grpc_error* error) { grpc_server_setup_transport(g_server, transport, nullptr, nullptr, nullptr); grpc_chttp2_transport_start_reading(transport, nullptr, nullptr); - GRPC_CLOSURE_SCHED(fc->closure, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, fc->closure, GRPC_ERROR_NONE); } else { sched_connect(fc->closure, fc->ep, fc->deadline); } @@ -435,8 +435,9 @@ static void sched_connect(grpc_closure* closure, grpc_endpoint** ep, gpr_timespec deadline) { if (gpr_time_cmp(deadline, gpr_now(deadline.clock_type)) < 0) { *ep = nullptr; - GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "Connect deadline exceeded")); + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, closure, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Connect deadline exceeded")); return; } diff --git a/test/core/end2end/goaway_server_test.cc b/test/core/end2end/goaway_server_test.cc index e180ec8f29c..8d7df94aa6d 100644 --- a/test/core/end2end/goaway_server_test.cc +++ b/test/core/end2end/goaway_server_test.cc @@ -88,7 +88,7 @@ static void my_resolve_address(const char* addr, const char* default_port, (*addrs)->addrs[0].len = static_cast(sizeof(*sa)); gpr_mu_unlock(&g_mu); } - GRPC_CLOSURE_SCHED(on_done, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_done, error); } static grpc_error* my_blocking_resolve_address( @@ -127,7 +127,7 @@ static grpc_ares_request* my_dns_lookup_ares_locked( (*addresses)->emplace_back(&sa, sizeof(sa), nullptr); gpr_mu_unlock(&g_mu); } - GRPC_CLOSURE_SCHED(on_done, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_done, error); return nullptr; } diff --git a/test/core/iomgr/udp_server_test.cc b/test/core/iomgr/udp_server_test.cc index 8965373327c..84a93154b4f 100644 --- a/test/core/iomgr/udp_server_test.cc +++ b/test/core/iomgr/udp_server_test.cc @@ -99,7 +99,7 @@ class TestGrpcUdpHandler : public GrpcUdpHandler { void* /*user_data*/) override { gpr_log(GPR_INFO, "gRPC FD about to be orphaned: %d", grpc_fd_wrapped_fd(emfd())); - GRPC_CLOSURE_SCHED(orphan_fd_closure, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, orphan_fd_closure, GRPC_ERROR_NONE); g_number_of_orphan_calls++; } diff --git a/test/core/security/credentials_test.cc b/test/core/security/credentials_test.cc index 0a7d550f359..955afb3b071 100644 --- a/test/core/security/credentials_test.cc +++ b/test/core/security/credentials_test.cc @@ -564,7 +564,7 @@ static int compute_engine_httpcli_get_success_override( grpc_closure* on_done, grpc_httpcli_response* response) { validate_compute_engine_http_request(request); *response = http_response(200, valid_oauth2_json_response); - GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_done, GRPC_ERROR_NONE); return 1; } @@ -573,7 +573,7 @@ static int compute_engine_httpcli_get_failure_override( grpc_closure* on_done, grpc_httpcli_response* response) { validate_compute_engine_http_request(request); *response = http_response(403, "Not Authorized."); - GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_done, GRPC_ERROR_NONE); return 1; } @@ -667,7 +667,7 @@ static int refresh_token_httpcli_post_success( grpc_httpcli_response* response) { validate_refresh_token_http_request(request, body, body_size); *response = http_response(200, valid_oauth2_json_response); - GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_done, GRPC_ERROR_NONE); return 1; } @@ -678,7 +678,7 @@ static int token_httpcli_post_failure(const grpc_httpcli_request* /*request*/, grpc_closure* on_done, grpc_httpcli_response* response) { *response = http_response(403, "Not Authorized."); - GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_done, GRPC_ERROR_NONE); return 1; } @@ -881,7 +881,7 @@ static int sts_token_httpcli_post_success(const grpc_httpcli_request* request, grpc_httpcli_response* response) { validate_sts_token_http_request(request, body, body_size); *response = http_response(200, valid_sts_json_response); - GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_done, GRPC_ERROR_NONE); return 1; } @@ -1215,7 +1215,7 @@ static int default_creds_metadata_server_detection_httpcli_get_success_override( response->hdrs = headers; GPR_ASSERT(strcmp(request->http.path, "/") == 0); GPR_ASSERT(strcmp(request->host, "metadata.google.internal.") == 0); - GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_done, GRPC_ERROR_NONE); return 1; } @@ -1306,7 +1306,7 @@ static int default_creds_gce_detection_httpcli_get_failure_override( GPR_ASSERT(strcmp(request->http.path, "/") == 0); GPR_ASSERT(strcmp(request->host, "metadata.google.internal.") == 0); *response = http_response(200, ""); - GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_done, GRPC_ERROR_NONE); return 1; } diff --git a/test/core/security/jwt_verifier_test.cc b/test/core/security/jwt_verifier_test.cc index b4bb20fa983..1e33b45f3c5 100644 --- a/test/core/security/jwt_verifier_test.cc +++ b/test/core/security/jwt_verifier_test.cc @@ -335,7 +335,7 @@ static int httpcli_get_google_keys_for_email( "/robot/v1/metadata/x509/" "777-abaslkan11hlb6nmim3bpspl31ud@developer." "gserviceaccount.com") == 0); - GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_done, GRPC_ERROR_NONE); return 1; } @@ -378,7 +378,7 @@ static int httpcli_get_custom_keys_for_email( GPR_ASSERT(request->handshaker == &grpc_httpcli_ssl); GPR_ASSERT(strcmp(request->host, "keys.bar.com") == 0); GPR_ASSERT(strcmp(request->http.path, "/jwk/foo@bar.com") == 0); - GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_done, GRPC_ERROR_NONE); return 1; } @@ -411,7 +411,7 @@ static int httpcli_get_jwk_set(const grpc_httpcli_request* request, GPR_ASSERT(request->handshaker == &grpc_httpcli_ssl); GPR_ASSERT(strcmp(request->host, "www.googleapis.com") == 0); GPR_ASSERT(strcmp(request->http.path, "/oauth2/v3/certs") == 0); - GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_done, GRPC_ERROR_NONE); return 1; } @@ -425,7 +425,7 @@ static int httpcli_get_openid_config(const grpc_httpcli_request* request, GPR_ASSERT(strcmp(request->http.path, GRPC_OPENID_CONFIG_URL_SUFFIX) == 0); grpc_httpcli_set_override(httpcli_get_jwk_set, httpcli_post_should_not_be_called); - GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_done, GRPC_ERROR_NONE); return 1; } @@ -464,7 +464,7 @@ static int httpcli_get_bad_json(const grpc_httpcli_request* request, grpc_httpcli_response* response) { *response = http_response(200, gpr_strdup("{\"bad\": \"stuff\"}")); GPR_ASSERT(request->handshaker == &grpc_httpcli_ssl); - GRPC_CLOSURE_SCHED(on_done, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_done, GRPC_ERROR_NONE); return 1; } diff --git a/test/core/util/mock_endpoint.cc b/test/core/util/mock_endpoint.cc index 01d90b49f41..1a9d7ad2101 100644 --- a/test/core/util/mock_endpoint.cc +++ b/test/core/util/mock_endpoint.cc @@ -46,7 +46,7 @@ static void me_read(grpc_endpoint* ep, grpc_slice_buffer* slices, gpr_mu_lock(&m->mu); if (m->read_buffer.count > 0) { grpc_slice_buffer_swap(&m->read_buffer, slices); - GRPC_CLOSURE_SCHED(cb, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, cb, GRPC_ERROR_NONE); } else { m->on_read = cb; m->on_read_out = slices; @@ -60,7 +60,7 @@ static void me_write(grpc_endpoint* ep, grpc_slice_buffer* slices, for (size_t i = 0; i < slices->count; i++) { m->on_write(slices->slices[i]); } - GRPC_CLOSURE_SCHED(cb, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, cb, GRPC_ERROR_NONE); } static void me_add_to_pollset(grpc_endpoint* /*ep*/, @@ -76,9 +76,9 @@ static void me_shutdown(grpc_endpoint* ep, grpc_error* why) { mock_endpoint* m = reinterpret_cast(ep); gpr_mu_lock(&m->mu); if (m->on_read) { - GRPC_CLOSURE_SCHED(m->on_read, - GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "Endpoint Shutdown", &why, 1)); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, m->on_read, + GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "Endpoint Shutdown", &why, 1)); m->on_read = nullptr; } gpr_mu_unlock(&m->mu); @@ -139,7 +139,7 @@ void grpc_mock_endpoint_put_read(grpc_endpoint* ep, grpc_slice slice) { gpr_mu_lock(&m->mu); if (m->on_read != nullptr) { grpc_slice_buffer_add(m->on_read_out, slice); - GRPC_CLOSURE_SCHED(m->on_read, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, m->on_read, GRPC_ERROR_NONE); m->on_read = nullptr; } else { grpc_slice_buffer_add(&m->read_buffer, slice); diff --git a/test/core/util/passthru_endpoint.cc b/test/core/util/passthru_endpoint.cc index 021a94421c2..c9dbd7c3f4e 100644 --- a/test/core/util/passthru_endpoint.cc +++ b/test/core/util/passthru_endpoint.cc @@ -58,11 +58,12 @@ static void me_read(grpc_endpoint* ep, grpc_slice_buffer* slices, half* m = reinterpret_cast(ep); gpr_mu_lock(&m->parent->mu); if (m->parent->shutdown) { - GRPC_CLOSURE_SCHED( - cb, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Already shutdown")); + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, cb, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Already shutdown")); } else if (m->read_buffer.count > 0) { grpc_slice_buffer_swap(&m->read_buffer, slices); - GRPC_CLOSURE_SCHED(cb, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, cb, GRPC_ERROR_NONE); } else { m->on_read = cb; m->on_read_out = slices; @@ -87,7 +88,7 @@ static void me_write(grpc_endpoint* ep, grpc_slice_buffer* slices, for (size_t i = 0; i < slices->count; i++) { grpc_slice_buffer_add(m->on_read_out, grpc_slice_copy(slices->slices[i])); } - GRPC_CLOSURE_SCHED(m->on_read, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, m->on_read, GRPC_ERROR_NONE); m->on_read = nullptr; } else { for (size_t i = 0; i < slices->count; i++) { @@ -96,7 +97,7 @@ static void me_write(grpc_endpoint* ep, grpc_slice_buffer* slices, } } gpr_mu_unlock(&m->parent->mu); - GRPC_CLOSURE_SCHED(cb, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, cb, error); } static void me_add_to_pollset(grpc_endpoint* /*ep*/, @@ -113,15 +114,15 @@ static void me_shutdown(grpc_endpoint* ep, grpc_error* why) { gpr_mu_lock(&m->parent->mu); m->parent->shutdown = true; if (m->on_read) { - GRPC_CLOSURE_SCHED( - m->on_read, + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, m->on_read, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING("Shutdown", &why, 1)); m->on_read = nullptr; } m = other_half(m); if (m->on_read) { - GRPC_CLOSURE_SCHED( - m->on_read, + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, m->on_read, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING("Shutdown", &why, 1)); m->on_read = nullptr; } diff --git a/test/core/util/trickle_endpoint.cc b/test/core/util/trickle_endpoint.cc index ccafa3e6d79..f313d05f593 100644 --- a/test/core/util/trickle_endpoint.cc +++ b/test/core/util/trickle_endpoint.cc @@ -56,7 +56,8 @@ static void maybe_call_write_cb_locked(trickle_endpoint* te) { if (te->write_cb != nullptr && (te->error != GRPC_ERROR_NONE || te->write_buffer.length <= WRITE_BUFFER_SIZE)) { - GRPC_CLOSURE_SCHED(te->write_cb, GRPC_ERROR_REF(te->error)); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, te->write_cb, + GRPC_ERROR_REF(te->error)); te->write_cb = nullptr; } } diff --git a/test/cpp/microbenchmarks/bm_call_create.cc b/test/cpp/microbenchmarks/bm_call_create.cc index ad461909054..f09f9e4baa3 100644 --- a/test/cpp/microbenchmarks/bm_call_create.cc +++ b/test/cpp/microbenchmarks/bm_call_create.cc @@ -414,7 +414,7 @@ void SetPollsetSet(grpc_transport* /*self*/, grpc_stream* /*stream*/, /* implementation of grpc_transport_perform_stream_op */ void PerformStreamOp(grpc_transport* /*self*/, grpc_stream* /*stream*/, grpc_transport_stream_op_batch* op) { - GRPC_CLOSURE_SCHED(op->on_complete, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, op->on_complete, GRPC_ERROR_NONE); } /* implementation of grpc_transport_perform_op */ @@ -636,7 +636,7 @@ static void StartTransportOp(grpc_channel_element* /*elem*/, if (op->disconnect_with_error != GRPC_ERROR_NONE) { GRPC_ERROR_UNREF(op->disconnect_with_error); } - GRPC_CLOSURE_SCHED(op->on_consumed, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, op->on_consumed, GRPC_ERROR_NONE); } static grpc_error* InitCallElem(grpc_call_element* elem, @@ -652,7 +652,7 @@ static void SetPollsetOrPollsetSet(grpc_call_element* /*elem*/, static void DestroyCallElem(grpc_call_element* /*elem*/, const grpc_call_final_info* /*final_info*/, grpc_closure* then_sched_closure) { - GRPC_CLOSURE_SCHED(then_sched_closure, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, then_sched_closure, GRPC_ERROR_NONE); } grpc_error* InitChannelElem(grpc_channel_element* /*elem*/, diff --git a/test/cpp/microbenchmarks/bm_chttp2_transport.cc b/test/cpp/microbenchmarks/bm_chttp2_transport.cc index ac77d6cab1f..13b1ce20ef0 100644 --- a/test/cpp/microbenchmarks/bm_chttp2_transport.cc +++ b/test/cpp/microbenchmarks/bm_chttp2_transport.cc @@ -67,7 +67,7 @@ class DummyEndpoint : public grpc_endpoint { return; } grpc_slice_buffer_add(slices_, slice); - GRPC_CLOSURE_SCHED(read_cb_, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, read_cb_, GRPC_ERROR_NONE); read_cb_ = nullptr; } @@ -83,7 +83,7 @@ class DummyEndpoint : public grpc_endpoint { if (have_slice_) { have_slice_ = false; grpc_slice_buffer_add(slices, buffered_slice_); - GRPC_CLOSURE_SCHED(cb, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, cb, GRPC_ERROR_NONE); return; } read_cb_ = cb; @@ -97,7 +97,7 @@ class DummyEndpoint : public grpc_endpoint { static void write(grpc_endpoint* /*ep*/, grpc_slice_buffer* /*slices*/, grpc_closure* cb, void* /*arg*/) { - GRPC_CLOSURE_SCHED(cb, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, cb, GRPC_ERROR_NONE); } static void add_to_pollset(grpc_endpoint* /*ep*/, grpc_pollset* /*pollset*/) { @@ -111,7 +111,8 @@ class DummyEndpoint : public grpc_endpoint { static void shutdown(grpc_endpoint* ep, grpc_error* why) { grpc_resource_user_shutdown(static_cast(ep)->ru_); - GRPC_CLOSURE_SCHED(static_cast(ep)->read_cb_, why); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, + static_cast(ep)->read_cb_, why); } static void destroy(grpc_endpoint* ep) { @@ -354,7 +355,7 @@ static void BM_StreamCreateSendInitialMetadataDestroy(benchmark::State& state) { s->Op(&op); s->DestroyThen(start.get()); }); - GRPC_CLOSURE_SCHED(start.get(), GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, start.get(), GRPC_ERROR_NONE); f.FlushExecCtx(); gpr_event_wait(&bm_done, gpr_inf_future(GPR_CLOCK_REALTIME)); grpc_metadata_batch_destroy(&b); @@ -381,7 +382,7 @@ static void BM_TransportEmptyOp(benchmark::State& state) { op.on_complete = c.get(); s->Op(&op); }); - GRPC_CLOSURE_SCHED(c.get(), GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, c.get(), GRPC_ERROR_NONE); f.FlushExecCtx(); reset_op(); op.cancel_stream = true; @@ -613,7 +614,7 @@ static void BM_TransportStreamRecv(benchmark::State& state) { do { if (received == recv_stream->length()) { recv_stream.reset(); - GRPC_CLOSURE_SCHED(c.get(), GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, c.get(), GRPC_ERROR_NONE); return; } } while (recv_stream->Next(recv_stream->length() - received, diff --git a/test/cpp/microbenchmarks/bm_closure.cc b/test/cpp/microbenchmarks/bm_closure.cc index 0a0e8d664e7..457b2531cfe 100644 --- a/test/cpp/microbenchmarks/bm_closure.cc +++ b/test/cpp/microbenchmarks/bm_closure.cc @@ -125,7 +125,7 @@ static void BM_ClosureSchedOnExecCtx(benchmark::State& state) { GRPC_CLOSURE_INIT(&c, DoNothing, nullptr, grpc_schedule_on_exec_ctx); grpc_core::ExecCtx exec_ctx; for (auto _ : state) { - GRPC_CLOSURE_SCHED(&c, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, &c, GRPC_ERROR_NONE); grpc_core::ExecCtx::Get()->Flush(); } @@ -141,8 +141,8 @@ static void BM_ClosureSched2OnExecCtx(benchmark::State& state) { GRPC_CLOSURE_INIT(&c2, DoNothing, nullptr, grpc_schedule_on_exec_ctx); grpc_core::ExecCtx exec_ctx; for (auto _ : state) { - GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, &c1, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, &c2, GRPC_ERROR_NONE); grpc_core::ExecCtx::Get()->Flush(); } @@ -160,9 +160,9 @@ static void BM_ClosureSched3OnExecCtx(benchmark::State& state) { GRPC_CLOSURE_INIT(&c3, DoNothing, nullptr, grpc_schedule_on_exec_ctx); grpc_core::ExecCtx exec_ctx; for (auto _ : state) { - GRPC_CLOSURE_SCHED(&c1, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&c2, GRPC_ERROR_NONE); - GRPC_CLOSURE_SCHED(&c3, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, &c1, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, &c2, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, &c3, GRPC_ERROR_NONE); grpc_core::ExecCtx::Get()->Flush(); } @@ -354,12 +354,15 @@ class Rescheduler { GRPC_CLOSURE_INIT(&closure_, Step, this, scheduler); } - void ScheduleFirst() { GRPC_CLOSURE_SCHED(&closure_, GRPC_ERROR_NONE); } + void ScheduleFirst() { + grpc_core::ExecCtx::Run(DEBUG_LOCATION, &closure_, GRPC_ERROR_NONE); + } void ScheduleFirstAgainstDifferentScheduler( grpc_closure_scheduler* scheduler) { - GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(Step, this, scheduler), - GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, + GRPC_CLOSURE_CREATE(Step, this, scheduler), + GRPC_ERROR_NONE); } private: @@ -369,7 +372,7 @@ class Rescheduler { static void Step(void* arg, grpc_error* /*error*/) { Rescheduler* self = static_cast(arg); if (self->state_.KeepRunning()) { - GRPC_CLOSURE_SCHED(&self->closure_, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, &self->closure_, GRPC_ERROR_NONE); } } }; diff --git a/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc b/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc index 11c86f7ad37..edb14116e8d 100644 --- a/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc +++ b/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc @@ -45,7 +45,7 @@ static grpc_completion_queue* g_cq; static grpc_event_engine_vtable g_vtable; static void pollset_shutdown(grpc_pollset* /*ps*/, grpc_closure* closure) { - GRPC_CLOSURE_SCHED(closure, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, closure, GRPC_ERROR_NONE); } static void pollset_init(grpc_pollset* ps, gpr_mu** mu) { From 3dd6292f5ddae32c9db9b2f9cc3f03ed3986d34c Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Thu, 31 Oct 2019 17:22:03 -0700 Subject: [PATCH 040/133] Debug mode changes --- src/core/lib/iomgr/exec_ctx.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/lib/iomgr/exec_ctx.cc b/src/core/lib/iomgr/exec_ctx.cc index ac78b566ec9..15521267836 100644 --- a/src/core/lib/iomgr/exec_ctx.cc +++ b/src/core/lib/iomgr/exec_ctx.cc @@ -188,8 +188,8 @@ void ExecCtx::Run(const DebugLocation& location, grpc_closure* closure, abort(); } closure->scheduled = true; - closure->file_initiated = file; - closure->line_initiated = line; + closure->file_initiated = location.file(); + closure->line_initiated = location.line(); closure->run = false; GPR_ASSERT(closure->cb != nullptr); #endif From cd2c3cdfaa3c8f13c270ac57b92e1e344e9c641e Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Thu, 31 Oct 2019 17:34:42 -0700 Subject: [PATCH 041/133] Windows changes --- .../dns/c_ares/grpc_ares_ev_driver_windows.cc | 4 +-- src/core/lib/iomgr/pollset_windows.cc | 5 ++-- src/core/lib/iomgr/resolve_address_windows.cc | 2 +- src/core/lib/iomgr/socket_windows.cc | 4 +-- src/core/lib/iomgr/tcp_client_windows.cc | 4 +-- src/core/lib/iomgr/tcp_server_windows.cc | 5 ++-- src/core/lib/iomgr/tcp_windows.cc | 29 ++++++++++--------- 7 files changed, 29 insertions(+), 24 deletions(-) diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc index c25891ac442..9151bee22e6 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc @@ -128,12 +128,12 @@ class GrpcPolledFdWindows { } void ScheduleAndNullReadClosure(grpc_error* error) { - ExecCtx::Run(DEBUG_LOCATION, read_closure_, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, read_closure_, error); read_closure_ = nullptr; } void ScheduleAndNullWriteClosure(grpc_error* error) { - ExecCtx::Run(DEBUG_LOCATION, write_closure_, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, write_closure_, error); write_closure_ = nullptr; } diff --git a/src/core/lib/iomgr/pollset_windows.cc b/src/core/lib/iomgr/pollset_windows.cc index 22ed6540e3b..cdc0c1dc628 100644 --- a/src/core/lib/iomgr/pollset_windows.cc +++ b/src/core/lib/iomgr/pollset_windows.cc @@ -98,7 +98,7 @@ static void pollset_shutdown(grpc_pollset* pollset, grpc_closure* closure) { pollset->shutting_down = 1; grpc_pollset_kick(pollset, GRPC_POLLSET_KICK_BROADCAST); if (!pollset->is_iocp_worker) { - ExecCtx::Run(DEBUG_LOCATION, closure, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, closure, GRPC_ERROR_NONE); } else { pollset->on_shutdown = closure; } @@ -146,7 +146,8 @@ static grpc_error* pollset_work(grpc_pollset* pollset, } if (pollset->shutting_down && pollset->on_shutdown != NULL) { - ExecCtx::Run(DEBUG_LOCATION, pollset->on_shutdown, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, pollset->on_shutdown, + GRPC_ERROR_NONE); pollset->on_shutdown = NULL; } goto done; diff --git a/src/core/lib/iomgr/resolve_address_windows.cc b/src/core/lib/iomgr/resolve_address_windows.cc index 7cc2998900d..5a9d4421bb4 100644 --- a/src/core/lib/iomgr/resolve_address_windows.cc +++ b/src/core/lib/iomgr/resolve_address_windows.cc @@ -138,7 +138,7 @@ static void do_request_thread(void* rp, grpc_error* error) { } else { GRPC_ERROR_REF(error); } - ExecCtx::Run(DEBUG_LOCATION, r->on_done, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, r->on_done, error); gpr_free(r->name); gpr_free(r->default_port); gpr_free(r); diff --git a/src/core/lib/iomgr/socket_windows.cc b/src/core/lib/iomgr/socket_windows.cc index abc8d937fcb..2890866f41f 100644 --- a/src/core/lib/iomgr/socket_windows.cc +++ b/src/core/lib/iomgr/socket_windows.cc @@ -124,7 +124,7 @@ static void socket_notify_on_iocp(grpc_winsocket* socket, grpc_closure* closure, gpr_mu_lock(&socket->state_mu); if (info->has_pending_iocp) { info->has_pending_iocp = 0; - ExecCtx::Run(DEBUG_LOCATION, closure, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, closure, GRPC_ERROR_NONE); } else { info->closure = closure; } @@ -145,7 +145,7 @@ void grpc_socket_become_ready(grpc_winsocket* socket, GPR_ASSERT(!info->has_pending_iocp); gpr_mu_lock(&socket->state_mu); if (info->closure) { - ExecCtx::Run(DEBUG_LOCATION, info->closure, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, info->closure, GRPC_ERROR_NONE); info->closure = NULL; } else { info->has_pending_iocp = 1; diff --git a/src/core/lib/iomgr/tcp_client_windows.cc b/src/core/lib/iomgr/tcp_client_windows.cc index 047a9f36c0e..5f32f5d96eb 100644 --- a/src/core/lib/iomgr/tcp_client_windows.cc +++ b/src/core/lib/iomgr/tcp_client_windows.cc @@ -117,7 +117,7 @@ static void on_connect(void* acp, grpc_error* error) { async_connect_unlock_and_cleanup(ac, socket); /* If the connection was aborted, the callback was already called when the deadline was met. */ - ExecCtx::Run(DEBUG_LOCATION, on_done, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_done, error); } /* Tries to issue one async connection, then schedules both an IOCP @@ -225,7 +225,7 @@ failure: } else if (sock != INVALID_SOCKET) { closesocket(sock); } - ExecCtx::Run(DEBUG_LOCATION, on_done, final_error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_done, final_error); } grpc_tcp_client_vtable grpc_windows_tcp_client_vtable = {tcp_connect}; diff --git a/src/core/lib/iomgr/tcp_server_windows.cc b/src/core/lib/iomgr/tcp_server_windows.cc index 0f485d720f5..fc09481098d 100644 --- a/src/core/lib/iomgr/tcp_server_windows.cc +++ b/src/core/lib/iomgr/tcp_server_windows.cc @@ -135,10 +135,11 @@ static void destroy_server(void* arg, grpc_error* error) { static void finish_shutdown_locked(grpc_tcp_server* s) { if (s->shutdown_complete != NULL) { - ExecCtx::Run(DEBUG_LOCATION, s->shutdown_complete, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, s->shutdown_complete, + GRPC_ERROR_NONE); } - ExecCtx::Run( + grpc_core::ExecCtx::Run( DEBUG_LOCATION, GRPC_CLOSURE_CREATE(destroy_server, s, grpc_schedule_on_exec_ctx), GRPC_ERROR_NONE); diff --git a/src/core/lib/iomgr/tcp_windows.cc b/src/core/lib/iomgr/tcp_windows.cc index 3e9c94a54fb..ab5a2a21e15 100644 --- a/src/core/lib/iomgr/tcp_windows.cc +++ b/src/core/lib/iomgr/tcp_windows.cc @@ -233,7 +233,7 @@ static void on_read(void* tcpp, grpc_error* error) { tcp->read_cb = NULL; TCP_UNREF(tcp, "read"); - ExecCtx::Run(DEBUG_LOCATION, cb, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, cb, error); } #define DEFAULT_TARGET_READ_SIZE 8192 @@ -254,9 +254,10 @@ static void win_read(grpc_endpoint* ep, grpc_slice_buffer* read_slices, } if (tcp->shutting_down) { - ExecCtx::Run(DEBUG_LOCATION, cb, - GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "TCP socket is shutting down", &tcp->shutdown_error, 1)); + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, cb, + GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "TCP socket is shutting down", &tcp->shutdown_error, 1)); return; } @@ -289,7 +290,7 @@ static void win_read(grpc_endpoint* ep, grpc_slice_buffer* read_slices, /* Did we get data immediately ? Yay. */ if (info->wsa_error != WSAEWOULDBLOCK) { info->bytes_transferred = bytes_read; - ExecCtx::Run(DEBUG_LOCATION, &tcp->on_read, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, &tcp->on_read, GRPC_ERROR_NONE); return; } @@ -302,8 +303,8 @@ static void win_read(grpc_endpoint* ep, grpc_slice_buffer* read_slices, int wsa_error = WSAGetLastError(); if (wsa_error != WSA_IO_PENDING) { info->wsa_error = wsa_error; - ExecCtx::Run(DEBUG_LOCATION, &tcp->on_read, - GRPC_WSA_ERROR(info->wsa_error, "WSARecv")); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, &tcp->on_read, + GRPC_WSA_ERROR(info->wsa_error, "WSARecv")); return; } } @@ -338,7 +339,7 @@ static void on_write(void* tcpp, grpc_error* error) { } TCP_UNREF(tcp, "write"); - ExecCtx::Run(DEBUG_LOCATION, cb, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, cb, error); } /* Initiates a write. */ @@ -366,9 +367,10 @@ static void win_write(grpc_endpoint* ep, grpc_slice_buffer* slices, } if (tcp->shutting_down) { - ExecCtx::Run(DEBUG_LOCATION, cb, - GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "TCP socket is shutting down", &tcp->shutdown_error, 1)); + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, cb, + GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "TCP socket is shutting down", &tcp->shutdown_error, 1)); return; } @@ -399,7 +401,7 @@ static void win_write(grpc_endpoint* ep, grpc_slice_buffer* slices, grpc_error* error = status == 0 ? GRPC_ERROR_NONE : GRPC_WSA_ERROR(info->wsa_error, "WSASend"); - ExecCtx::Run(DEBUG_LOCATION, cb, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, cb, error); if (allocated) gpr_free(allocated); return; } @@ -417,7 +419,8 @@ static void win_write(grpc_endpoint* ep, grpc_slice_buffer* slices, int wsa_error = WSAGetLastError(); if (wsa_error != WSA_IO_PENDING) { TCP_UNREF(tcp, "write"); - ExecCtx::Run(DEBUG_LOCATION, cb, GRPC_WSA_ERROR(wsa_error, "WSASend")); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, cb, + GRPC_WSA_ERROR(wsa_error, "WSASend")); return; } } From 01ea1dea07c5c7af2e65c054ce3615b4624483e9 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Thu, 31 Oct 2019 17:38:45 -0700 Subject: [PATCH 042/133] libuv changes --- .../resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc index 7fb6cde600c..3d7140cb4b8 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc @@ -81,10 +81,12 @@ class GrpcPolledFdLibuv : public GrpcPolledFd { uv_poll_stop(handle_); uv_close(reinterpret_cast(handle_), ares_uv_poll_close_cb); if (read_closure_ != nullptr) { - ExecCtx::Run(DEBUG_LOCATION, read_closure_, GRPC_ERROR_CANCELLED); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, read_closure_, + GRPC_ERROR_CANCELLED); } if (write_closure_ != nullptr) { - ExecCtx::Run(DEBUG_LOCATION, write_closure_, GRPC_ERROR_CANCELLED); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, write_closure_, + GRPC_ERROR_CANCELLED); } } @@ -135,13 +137,13 @@ static void ares_uv_poll_cb_locked(void* arg, grpc_error* error) { } if (events & UV_READABLE) { GPR_ASSERT(polled_fd->read_closure_ != nullptr); - ExecCtx::Run(DEBUG_LOCATION, polled_fd->read_closure_, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, polled_fd->read_closure_, error); polled_fd->read_closure_ = nullptr; polled_fd->poll_events_ &= ~UV_READABLE; } if (events & UV_WRITABLE) { GPR_ASSERT(polled_fd->write_closure_ != nullptr); - ExecCtx::Run(DEBUG_LOCATION, polled_fd->write_closure_, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, polled_fd->write_closure_, error); polled_fd->write_closure_ = nullptr; polled_fd->poll_events_ &= ~UV_WRITABLE; } From d2f96d6d64bebcc7e42c4492847732910a28618f Mon Sep 17 00:00:00 2001 From: Muxi Yan Date: Thu, 17 Oct 2019 11:25:04 -0700 Subject: [PATCH 043/133] Use new transport selector --- examples/objective-c/helloworld/main.m | 3 ++- examples/objective-c/helloworld_macos/main.m | 3 ++- examples/objective-c/route_guide/ViewControllers.m | 10 ++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/examples/objective-c/helloworld/main.m b/examples/objective-c/helloworld/main.m index d193af862ba..95b05e0ac99 100644 --- a/examples/objective-c/helloworld/main.m +++ b/examples/objective-c/helloworld/main.m @@ -21,6 +21,7 @@ #import #import +#import #if COCOAPODS #import #else @@ -55,7 +56,7 @@ int main(int argc, char * argv[]) { GRPCMutableCallOptions *options = [[GRPCMutableCallOptions alloc] init]; // this example does not use TLS (secure channel); use insecure channel instead - options.transportType = GRPCTransportTypeInsecure; + options.transport = GRPCDefaultTransportImplList.core_insecure; options.userAgentPrefix = @"HelloWorld/1.0"; GRPCUnaryProtoCall *call = [client sayHelloWithMessage:request diff --git a/examples/objective-c/helloworld_macos/main.m b/examples/objective-c/helloworld_macos/main.m index c0e7ef3c9ab..12b2d94154a 100644 --- a/examples/objective-c/helloworld_macos/main.m +++ b/examples/objective-c/helloworld_macos/main.m @@ -20,6 +20,7 @@ #import #import +#import #if COCOAPODS #import #else @@ -54,7 +55,7 @@ int main(int argc, const char * argv[]) { GRPCMutableCallOptions *options = [[GRPCMutableCallOptions alloc] init]; // this example does not use TLS (secure channel); use insecure channel instead - options.transportType = GRPCTransportTypeInsecure; + options.transport = GRPCDefaultTransportImplList.core_insecure; options.userAgentPrefix = @"HelloWorld/1.0"; GRPCUnaryProtoCall *call = [client sayHelloWithMessage:request diff --git a/examples/objective-c/route_guide/ViewControllers.m b/examples/objective-c/route_guide/ViewControllers.m index f36bfe607b5..7033cb28f78 100644 --- a/examples/objective-c/route_guide/ViewControllers.m +++ b/examples/objective-c/route_guide/ViewControllers.m @@ -23,6 +23,8 @@ #import "examples/protos/RouteGuide.pbrpc.h" #endif +#import + static NSString * const kHostAddress = @"localhost:50051"; /** Category to override RTGPoint's description. */ @@ -123,7 +125,7 @@ static NSString * const kHostAddress = @"localhost:50051"; [super viewDidLoad]; GRPCMutableCallOptions *options = [[GRPCMutableCallOptions alloc] init]; - options.transportType = GRPCTransportTypeInsecure; + options.transport = GRPCDefaultTransportImplList.core_insecure; _service = [[RTGRouteGuide alloc] initWithHost:kHostAddress callOptions:options]; } @@ -193,7 +195,7 @@ static NSString * const kHostAddress = @"localhost:50051"; [super viewDidLoad]; GRPCMutableCallOptions *options = [[GRPCMutableCallOptions alloc] init]; - options.transportType = GRPCTransportTypeInsecure; + options.transport = GRPCDefaultTransportImplList.core_insecure; _service = [[RTGRouteGuide alloc] initWithHost:kHostAddress callOptions:options]; } @@ -286,7 +288,7 @@ static NSString * const kHostAddress = @"localhost:50051"; [super viewDidLoad]; GRPCMutableCallOptions *options = [[GRPCMutableCallOptions alloc] init]; - options.transportType = GRPCTransportTypeInsecure; + options.transport = GRPCDefaultTransportImplList.core_insecure; _service = [[RTGRouteGuide alloc] initWithHost:kHostAddress callOptions:options]; } @@ -360,7 +362,7 @@ static NSString * const kHostAddress = @"localhost:50051"; [super viewDidLoad]; GRPCMutableCallOptions *options = [[GRPCMutableCallOptions alloc] init]; - options.transportType = GRPCTransportTypeInsecure; + options.transport = GRPCDefaultTransportImplList.core_insecure; _service = [[RTGRouteGuide alloc] initWithHost:kHostAddress callOptions:options]; } From c562da0f769e8b8bed9709ac542f416c53ab4f95 Mon Sep 17 00:00:00 2001 From: Muxi Yan Date: Thu, 17 Oct 2019 11:29:03 -0700 Subject: [PATCH 044/133] Start the call directly --- examples/objective-c/helloworld/main.m | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/examples/objective-c/helloworld/main.m b/examples/objective-c/helloworld/main.m index 95b05e0ac99..72c1c232254 100644 --- a/examples/objective-c/helloworld/main.m +++ b/examples/objective-c/helloworld/main.m @@ -59,11 +59,9 @@ int main(int argc, char * argv[]) { options.transport = GRPCDefaultTransportImplList.core_insecure; options.userAgentPrefix = @"HelloWorld/1.0"; - GRPCUnaryProtoCall *call = [client sayHelloWithMessage:request - responseHandler:[[HLWResponseHandler alloc] init] - callOptions:options]; - - [call start]; + [[client sayHelloWithMessage:request + responseHandler:[[HLWResponseHandler alloc] init] + callOptions:options] start]; return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); } From d10eabf18b5c3f7a3b4a3071b556bb975933d771 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Fri, 1 Nov 2019 14:20:56 -0700 Subject: [PATCH 045/133] Add a test case to catch the failure --- src/python/grpcio_tests/tests/tests.json | 1 + .../grpcio_tests/tests/unit/BUILD.bazel | 1 + .../tests/unit/_grpc_shutdown_test.py | 54 +++++++++++++++++++ 3 files changed, 56 insertions(+) create mode 100644 src/python/grpcio_tests/tests/unit/_grpc_shutdown_test.py diff --git a/src/python/grpcio_tests/tests/tests.json b/src/python/grpcio_tests/tests/tests.json index c636ee5d4e3..eb702f6c8b0 100644 --- a/src/python/grpcio_tests/tests/tests.json +++ b/src/python/grpcio_tests/tests/tests.json @@ -50,6 +50,7 @@ "unit._empty_message_test.EmptyMessageTest", "unit._error_message_encoding_test.ErrorMessageEncodingTest", "unit._exit_test.ExitTest", + "unit._grpc_shutdown_test.GrpcShutdownTest", "unit._interceptor_test.InterceptorTest", "unit._invalid_metadata_test.InvalidMetadataTest", "unit._invocation_defects_test.InvocationDefectsTest", diff --git a/src/python/grpcio_tests/tests/unit/BUILD.bazel b/src/python/grpcio_tests/tests/unit/BUILD.bazel index 5fb7c1f74d0..42da77dbad2 100644 --- a/src/python/grpcio_tests/tests/unit/BUILD.bazel +++ b/src/python/grpcio_tests/tests/unit/BUILD.bazel @@ -18,6 +18,7 @@ GRPCIO_TESTS_UNIT = [ "_empty_message_test.py", "_error_message_encoding_test.py", "_exit_test.py", + "_grpc_shutdown_test.py", "_interceptor_test.py", "_invalid_metadata_test.py", "_invocation_defects_test.py", diff --git a/src/python/grpcio_tests/tests/unit/_grpc_shutdown_test.py b/src/python/grpcio_tests/tests/unit/_grpc_shutdown_test.py new file mode 100644 index 00000000000..969dc284d16 --- /dev/null +++ b/src/python/grpcio_tests/tests/unit/_grpc_shutdown_test.py @@ -0,0 +1,54 @@ +# Copyright 2019 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. +"""Tests the gRPC Core shutdown path.""" + +import time +import threading +import unittest +import datetime + +import grpc + +_TIMEOUT_FOR_SEGFAULT = datetime.timedelta(seconds=10) + + +class GrpcShutdownTest(unittest.TestCase): + + def test_channel_close_with_connectivity_watcher(self): + """Originated by https://github.com/grpc/grpc/issues/20299. + + The grpc_shutdown happens synchronously, but there might be Core object + references left in Cython which might lead to ABORT or SIGSEGV. + """ + connection_failed = threading.Event() + + def on_state_change(state): + if state in (grpc.ChannelConnectivity.TRANSIENT_FAILURE, + grpc.ChannelConnectivity.SHUTDOWN): + connection_failed.set() + + # Connects to an void address, and subscribes state changes + channel = grpc.insecure_channel("0.1.1.1:12345") + channel.subscribe(on_state_change, True) + + deadline = datetime.datetime.now() + _TIMEOUT_FOR_SEGFAULT + + while datetime.datetime.now() < deadline: + time.sleep(0.1) + if connection_failed.is_set(): + channel.close() + + +if __name__ == '__main__': + unittest.main(verbosity=2) From d8d1119ff397e5e30055f544ae4f061a1f5eecf8 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Fri, 1 Nov 2019 14:23:41 -0700 Subject: [PATCH 046/133] Reviewer comments --- .../client_channel/http_connect_handshaker.cc | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/src/core/ext/filters/client_channel/http_connect_handshaker.cc b/src/core/ext/filters/client_channel/http_connect_handshaker.cc index 96be9205e39..4cd0f8197a6 100644 --- a/src/core/ext/filters/client_channel/http_connect_handshaker.cc +++ b/src/core/ext/filters/client_channel/http_connect_handshaker.cc @@ -140,18 +140,16 @@ void HttpConnectHandshaker::OnWriteDone(void* arg, grpc_error* error) { } else { // Otherwise, read the response. // The read callback inherits our ref to the handshaker. - grpc_endpoint* ep = handshaker->args_->endpoint; - grpc_slice_buffer* read_buffer = handshaker->args_->read_buffer; - grpc_closure* closure = &handshaker->response_read_closure_; lock.Unlock(); - grpc_endpoint_read(ep, read_buffer, closure, /*urgent=*/true); + grpc_endpoint_read(handshaker->args_->endpoint, + handshaker->args_->read_buffer, + &handshaker->response_read_closure_, /*urgent=*/true); } } // Callback invoked for reading HTTP CONNECT response. void HttpConnectHandshaker::OnReadDone(void* arg, grpc_error* error) { auto* handshaker = static_cast(arg); - ReleasableMutexLock lock(&handshaker->mu_); if (error != GRPC_ERROR_NONE || handshaker->is_shutdown_) { // If the read failed or we're shutting down, clean up and invoke the @@ -204,11 +202,10 @@ void HttpConnectHandshaker::OnReadDone(void* arg, grpc_error* error) { // at the Content-Length: header). if (handshaker->http_parser_.state != GRPC_HTTP_BODY) { grpc_slice_buffer_reset_and_unref_internal(handshaker->args_->read_buffer); - grpc_endpoint* ep = handshaker->args_->endpoint; - grpc_slice_buffer* read_buffer = handshaker->args_->read_buffer; - grpc_closure* closure = &handshaker->response_read_closure_; lock.Unlock(); - grpc_endpoint_read(ep, read_buffer, closure, /*urgent=*/true); + grpc_endpoint_read(handshaker->args_->endpoint, + handshaker->args_->read_buffer, + &handshaker->response_read_closure_, /*urgent=*/true); return; } // Make sure we got a 2xx response. @@ -323,12 +320,9 @@ void HttpConnectHandshaker::DoHandshake(grpc_tcp_server_acceptor* acceptor, gpr_free(header_strings); // Take a new ref to be held by the write callback. Ref().release(); - - grpc_endpoint* ep = args->endpoint; - grpc_slice_buffer* write_buffer = &write_buffer_; - grpc_closure* closure = &request_done_closure_; lock.Unlock(); - grpc_endpoint_write(ep, write_buffer, closure, nullptr); + grpc_endpoint_write(args->endpoint, &write_buffer_, &request_done_closure_, + nullptr); } HttpConnectHandshaker::HttpConnectHandshaker() { From 2b8cd9a01be7a35010426b8ea8b566c1b2bd89b1 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Fri, 1 Nov 2019 14:41:18 -0700 Subject: [PATCH 047/133] Nullptr check --- src/core/lib/iomgr/exec_ctx.cc | 36 +++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/src/core/lib/iomgr/exec_ctx.cc b/src/core/lib/iomgr/exec_ctx.cc index 15521267836..9a5ad6eee0a 100644 --- a/src/core/lib/iomgr/exec_ctx.cc +++ b/src/core/lib/iomgr/exec_ctx.cc @@ -176,24 +176,28 @@ grpc_millis ExecCtx::Now() { void ExecCtx::Run(const DebugLocation& location, grpc_closure* closure, grpc_error* error) { + if (closure != nullptr) { #ifndef NDEBUG - if (closure->scheduled) { - gpr_log(GPR_ERROR, - "Closure already scheduled. (closure: %p, created: [%s:%d], " - "previously scheduled at: [%s: %d], newly scheduled at [%s: %d], " - "run?: %s", - closure, closure->file_created, closure->line_created, - closure->file_initiated, closure->line_initiated, location.file(), - location.line(), closure->run ? "true" : "false"); - abort(); - } - closure->scheduled = true; - closure->file_initiated = location.file(); - closure->line_initiated = location.line(); - closure->run = false; - GPR_ASSERT(closure->cb != nullptr); + if (closure->scheduled) { + gpr_log(GPR_ERROR, + "Closure already scheduled. (closure: %p, created: [%s:%d], " + "previously scheduled at: [%s: %d], newly scheduled at [%s: %d], " + "run?: %s", + closure, closure->file_created, closure->line_created, + closure->file_initiated, closure->line_initiated, location.file(), + location.line(), closure->run ? "true" : "false"); + abort(); + } + closure->scheduled = true; + closure->file_initiated = location.file(); + closure->line_initiated = location.line(); + closure->run = false; + GPR_ASSERT(closure->cb != nullptr); #endif - exec_ctx_sched(closure, error); + exec_ctx_sched(closure, error); + } else { + GRPC_ERROR_UNREF(error); + } } } // namespace grpc_core From dd468c926877ca4672c80380296f5c460a4e5cb2 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Fri, 1 Nov 2019 15:19:56 -0700 Subject: [PATCH 048/133] iOS changes --- src/core/lib/iomgr/endpoint_cfstream.cc | 4 ++-- src/core/lib/iomgr/tcp_client_cfstream.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/lib/iomgr/endpoint_cfstream.cc b/src/core/lib/iomgr/endpoint_cfstream.cc index 180a61b841e..987f2d270b6 100644 --- a/src/core/lib/iomgr/endpoint_cfstream.cc +++ b/src/core/lib/iomgr/endpoint_cfstream.cc @@ -132,7 +132,7 @@ static void CallReadCb(CFStreamEndpoint* ep, grpc_error* error) { grpc_closure* cb = ep->read_cb; ep->read_cb = nullptr; ep->read_slices = nullptr; - ExecCtx::Run(DEBUG_LOCATION, cb, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, cb, error); } static void CallWriteCb(CFStreamEndpoint* ep, grpc_error* error) { @@ -145,7 +145,7 @@ static void CallWriteCb(CFStreamEndpoint* ep, grpc_error* error) { grpc_closure* cb = ep->write_cb; ep->write_cb = nullptr; ep->write_slices = nullptr; - ExecCtx::Run(DEBUG_LOCATION, cb, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, cb, error); } static void ReadAction(void* arg, grpc_error* error) { diff --git a/src/core/lib/iomgr/tcp_client_cfstream.cc b/src/core/lib/iomgr/tcp_client_cfstream.cc index a4596246e6a..23d8c0c0089 100644 --- a/src/core/lib/iomgr/tcp_client_cfstream.cc +++ b/src/core/lib/iomgr/tcp_client_cfstream.cc @@ -96,7 +96,7 @@ static void OnAlarm(void* arg, grpc_error* error) { } else { grpc_error* error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("connect() timed out"); - ExecCtx::Run(DEBUG_LOCATION, closure, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, closure, error); } } @@ -137,7 +137,7 @@ static void OnOpen(void* arg, grpc_error* error) { GRPC_ERROR_REF(error); } gpr_mu_unlock(&connect->mu); - ExecCtx::Run(DEBUG_LOCATION, closure, error); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, closure, error); } } From acc605371647bd349dbcf79c0dc490f136c182ff Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Fri, 1 Nov 2019 15:28:48 -0700 Subject: [PATCH 049/133] Fix interceptors for unary-unary case --- src/python/grpcio/grpc/_channel.py | 63 +++++++++++++++---- .../tests/unit/_interceptor_test.py | 28 ++++++++- 2 files changed, 79 insertions(+), 12 deletions(-) diff --git a/src/python/grpcio/grpc/_channel.py b/src/python/grpcio/grpc/_channel.py index 232688c1ca1..5fb843acbde 100644 --- a/src/python/grpcio/grpc/_channel.py +++ b/src/python/grpcio/grpc/_channel.py @@ -263,35 +263,41 @@ def _rpc_state_string(class_name, rpc_state): rpc_state.debug_error_string) -class _RpcError(grpc.RpcError, grpc.Call): +class _RpcError(grpc.RpcError, grpc.Call, grpc.Future): """An RPC error not tied to the execution of a particular RPC. + The state passed to _RpcError must be guaranteed not to be accessed by any + other threads. + + The RPC represented by the state object must not be in-progress. + Attributes: _state: An instance of _RPCState. """ def __init__(self, state): + if state.cancelled: + raise ValueError("Cannot instantiate an _RpcError for a cancelled RPC.") + if state.code is grpc.StatusCode.OK: + raise ValueError("Cannot instantiate an _RpcError for a successfully completed RPC.") + if state.code is None: + raise ValueError("Cannot instantiate an _RpcError for an incomplete RPC.") self._state = state def initial_metadata(self): - with self._state.condition: - return self._state.initial_metadata + return self._state.initial_metadata def trailing_metadata(self): - with self._state.condition: - return self._state.trailing_metadata + return self._state.trailing_metadata def code(self): - with self._state.condition: - return self._state.code + return self._state.code def details(self): - with self._state.condition: - return _common.decode(self._state.details) + return _common.decode(self._state.details) def debug_error_string(self): - with self._state.condition: - return _common.decode(self._state.debug_error_string) + return _common.decode(self._state.debug_error_string) def _repr(self): return _rpc_state_string(self.__class__.__name__, self._state) @@ -302,6 +308,41 @@ class _RpcError(grpc.RpcError, grpc.Call): def __str__(self): return self._repr() + def cancel(self): + """See grpc.Future.cancel.""" + return False + + def cancelled(self): + """See grpc.Future.cancelled.""" + return False + + def running(self): + """See grpc.Future.running.""" + return False + + def done(self): + """See grpc.Future.done.""" + return True + + def result(self, timeout=None): + """See grpc.Future.result.""" + raise self + + def exception(self, timeout=None): + """See grpc.Future.exception.""" + return self + + def traceback(self, timeout=None): + """See grpc.Future.traceback.""" + try: + raise self + except grpc.RpcError: + return sys.exc_info()[2] + + def add_done_callback(self, timeout=None): + """See grpc.Future.add_done_callback.""" + fn(self) + class _Rendezvous(grpc.RpcError, grpc.RpcContext): """An RPC iterator. diff --git a/src/python/grpcio_tests/tests/unit/_interceptor_test.py b/src/python/grpcio_tests/tests/unit/_interceptor_test.py index a647e5e720c..1b72123153e 100644 --- a/src/python/grpcio_tests/tests/unit/_interceptor_test.py +++ b/src/python/grpcio_tests/tests/unit/_interceptor_test.py @@ -32,6 +32,8 @@ _DESERIALIZE_REQUEST = lambda bytestring: bytestring[len(bytestring) // 2:] _SERIALIZE_RESPONSE = lambda bytestring: bytestring * 3 _DESERIALIZE_RESPONSE = lambda bytestring: bytestring[:len(bytestring) // 3] +_EXCEPTION_REQUEST = b'\x09\x0a' + _UNARY_UNARY = '/test/UnaryUnary' _UNARY_STREAM = '/test/UnaryStream' _STREAM_UNARY = '/test/StreamUnary' @@ -70,8 +72,11 @@ class _Handler(object): 'testkey', 'testvalue', ),)) + if request == _EXCEPTION_REQUEST: + raise RuntimeError() return request + # TODO(gnossen): Instrument this for a test of exception handling. def handle_unary_stream(self, request, servicer_context): for _ in range(test_constants.STREAM_LENGTH): self._control.control() @@ -232,7 +237,10 @@ class _LoggingInterceptor( def intercept_unary_unary(self, continuation, client_call_details, request): self.record.append(self.tag + ':intercept_unary_unary') - return continuation(client_call_details, request) + result = continuation(client_call_details, request) + assert isinstance(result, grpc.Call), '{} is not an instance of grpc.Call'.format(result) + assert isinstance(result, grpc.Future), '{} is not an instance of grpc.Future'.format(result) + return result def intercept_unary_stream(self, continuation, client_call_details, request): @@ -440,6 +448,24 @@ class InterceptorTest(unittest.TestCase): 's1:intercept_service', 's2:intercept_service' ]) + def testInterceptedUnaryRequestBlockingUnaryResponseWithException(self): + request = _EXCEPTION_REQUEST + + self._record[:] = [] + + channel = grpc.intercept_channel(self._channel, + _LoggingInterceptor( + 'c1', self._record), + _LoggingInterceptor( + 'c2', self._record)) + + multi_callable = _unary_unary_multi_callable(channel) + with self.assertRaises(grpc.RpcError) as exception_context: + multi_callable( + request, + metadata=(('test', + 'InterceptedUnaryRequestBlockingUnaryResponse'),)) + def testInterceptedUnaryRequestBlockingUnaryResponseWithCall(self): request = b'\x07\x08' From aeb19f5d50d6a714fcecb2f8389db5f249ee9910 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Fri, 1 Nov 2019 14:58:50 -0700 Subject: [PATCH 050/133] Clean up scripts for cmake tests --- test/distrib/cpp/run_distrib_test_cmake.bat | 59 +++++++++++-------- test/distrib/cpp/run_distrib_test_cmake.sh | 51 ++++++++-------- .../cpp/run_distrib_test_cmake_pkgconfig.sh | 47 +++++++-------- 3 files changed, 78 insertions(+), 79 deletions(-) diff --git a/test/distrib/cpp/run_distrib_test_cmake.bat b/test/distrib/cpp/run_distrib_test_cmake.bat index 7658156be1d..041803663ea 100644 --- a/test/distrib/cpp/run_distrib_test_cmake.bat +++ b/test/distrib/cpp/run_distrib_test_cmake.bat @@ -29,44 +29,51 @@ powershell -Command "Add-Type -Assembly 'System.IO.Compression.FileSystem'; [Sys @rem set absolute path to OpenSSL with forward slashes set OPENSSL_DIR=%cd:\=/%/OpenSSL-Win32 -cd third_party/zlib -mkdir cmake -cd cmake -cmake -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% .. +@rem Install c-ares +mkdir third_party\cares\cares\cmake\build +pushd third_party\cares\cares\cmake\build +cmake -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% ..\.. cmake --build . --config Release --target install || goto :error -cd ../../.. +popd -cd third_party/protobuf/cmake -mkdir build -cd build +@rem Install protobuf +mkdir third_party\protobuf\cmake\build +pushd third_party\protobuf\cmake\build cmake -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DZLIB_ROOT=%INSTALL_DIR% -Dprotobuf_MSVC_STATIC_RUNTIME=OFF -Dprotobuf_BUILD_TESTS=OFF .. cmake --build . --config Release --target install || goto :error -cd ../../../.. +popd -cd third_party/cares/cares -mkdir cmake -cd cmake -cmake -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% .. +@rem Install zlib +mkdir third_party\zlib\cmake\build +pushd third_party\zlib\cmake\build +cmake -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% ..\.. cmake --build . --config Release --target install || goto :error -cd ../../../.. +popd -@rem OpenSSL-Win32 and OpenSSL-Win64 can be downloaded from https://slproweb.com/products/Win32OpenSSL.html -cd cmake -mkdir build -cd build -cmake -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DOPENSSL_ROOT_DIR=%OPENSSL_DIR% -DZLIB_ROOT=%INSTALL_DIR% -DgRPC_INSTALL=ON -DgRPC_BUILD_TESTS=OFF -DgRPC_PROTOBUF_PROVIDER=package -DgRPC_ZLIB_PROVIDER=package -DgRPC_CARES_PROVIDER=package -DgRPC_SSL_PROVIDER=package -DCMAKE_BUILD_TYPE=Release ../.. || goto :error +@rem Install gRPC +mkdir cmake\build +pushd cmake\build +cmake ^ + -DCMAKE_BUILD_TYPE=Release ^ + -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% ^ + -DOPENSSL_ROOT_DIR=%OPENSSL_DIR% ^ + -DZLIB_ROOT=%INSTALL_DIR% ^ + -DgRPC_INSTALL=ON ^ + -DgRPC_BUILD_TESTS=OFF ^ + -DgRPC_CARES_PROVIDER=package ^ + -DgRPC_PROTOBUF_PROVIDER=package ^ + -DgRPC_SSL_PROVIDER=package ^ + -DgRPC_ZLIB_PROVIDER=package ^ + ../.. || goto :error cmake --build . --config Release --target install || goto :error -cd ../.. +popd @rem Build helloworld example using cmake -cd examples/cpp/helloworld -mkdir cmake -cd cmake -mkdir build -cd build +mkdir examples\cpp\helloworld\cmake\build +pushd examples\cpp\helloworld\cmake\build cmake -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DOPENSSL_ROOT_DIR=%OPENSSL_DIR% -DZLIB_ROOT=%INSTALL_DIR% ../.. || goto :error cmake --build . --config Release || goto :error -cd ../../../../.. +popd goto :EOF diff --git a/test/distrib/cpp/run_distrib_test_cmake.sh b/test/distrib/cpp/run_distrib_test_cmake.sh index a73cbdf1f0b..c1bd4c4c227 100755 --- a/test/distrib/cpp/run_distrib_test_cmake.sh +++ b/test/distrib/cpp/run_distrib_test_cmake.sh @@ -24,33 +24,22 @@ apt-get update apt-get install -t jessie-backports -y libssl-dev # Install c-ares -cd third_party/cares/cares -git fetch origin -git checkout cares-1_15_0 -mkdir -p cmake/build -cd cmake/build +mkdir -p "third_party/cares/cares/cmake/build" && pushd "$_" cmake -DCMAKE_BUILD_TYPE=Release ../.. make -j4 install -cd ../../../../.. -rm -rf third_party/cares/cares # wipe out to prevent influencing the grpc build - -# Install zlib -cd third_party/zlib -mkdir -p cmake/build -cd cmake/build -cmake -DCMAKE_BUILD_TYPE=Release ../.. -make -j4 install -cd ../../../.. -rm -rf third_party/zlib # wipe out to prevent influencing the grpc build +popd # Install protobuf -cd third_party/protobuf -mkdir -p cmake/build -cd cmake/build +mkdir -p "third_party/protobuf/cmake/build" && pushd "$_" cmake -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release .. make -j4 install -cd ../../../.. -rm -rf third_party/protobuf # wipe out to prevent influencing the grpc build +popd + +# Install zlib +mkdir -p "third_party/zlib/cmake/build" && pushd "$_" +cmake -DCMAKE_BUILD_TYPE=Release ../.. +make -j4 install +popd # Just before installing gRPC, wipe out contents of all the submodules to simulate # a standalone build from an archive @@ -58,15 +47,21 @@ rm -rf third_party/protobuf # wipe out to prevent influencing the grpc build git submodule foreach 'cd $toplevel; rm -rf $name' # Install gRPC -mkdir -p cmake/build -cd cmake/build -cmake -DgRPC_INSTALL=ON -DgRPC_BUILD_TESTS=OFF -DgRPC_PROTOBUF_PROVIDER=package -DgRPC_ZLIB_PROVIDER=package -DgRPC_CARES_PROVIDER=package -DgRPC_SSL_PROVIDER=package -DCMAKE_BUILD_TYPE=Release ../.. +mkdir -p "cmake/build" && pushd "$_" +cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DgRPC_INSTALL=ON \ + -DgRPC_BUILD_TESTS=OFF \ + -DgRPC_CARES_PROVIDER=package \ + -DgRPC_PROTOBUF_PROVIDER=package \ + -DgRPC_SSL_PROVIDER=package \ + -DgRPC_ZLIB_PROVIDER=package \ +../.. make -j4 install -cd ../.. +popd # Build helloworld example using cmake -cd examples/cpp/helloworld -mkdir -p cmake/build -cd cmake/build +mkdir -p "examples/cpp/helloworld/cmake/build" && pushd "$_" cmake ../.. make +popd diff --git a/test/distrib/cpp/run_distrib_test_cmake_pkgconfig.sh b/test/distrib/cpp/run_distrib_test_cmake_pkgconfig.sh index e78b1997cf7..90fd8cd96ce 100755 --- a/test/distrib/cpp/run_distrib_test_cmake_pkgconfig.sh +++ b/test/distrib/cpp/run_distrib_test_cmake_pkgconfig.sh @@ -24,33 +24,22 @@ apt-get update apt-get install -t jessie-backports -y libssl-dev pkg-config # Install c-ares -cd third_party/cares/cares -git fetch origin -git checkout cares-1_15_0 -mkdir -p cmake/build -cd cmake/build +mkdir -p "third_party/cares/cares/cmake/build" && pushd "$_" cmake -DCMAKE_BUILD_TYPE=Release ../.. make -j4 install -cd ../../../../.. -rm -rf third_party/cares/cares # wipe out to prevent influencing the grpc build - -# Install zlib -cd third_party/zlib -mkdir -p cmake/build -cd cmake/build -cmake -DCMAKE_BUILD_TYPE=Release ../.. -make -j4 install -cd ../../../.. -rm -rf third_party/zlib # wipe out to prevent influencing the grpc build +popd # Install protobuf -cd third_party/protobuf -mkdir -p cmake/build -cd cmake/build +mkdir -p "third_party/protobuf/cmake/build" && pushd "$_" cmake -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release .. make -j4 install -cd ../../../.. -rm -rf third_party/protobuf # wipe out to prevent influencing the grpc build +popd + +# Install zlib +mkdir -p "third_party/zlib/cmake/build" && pushd "$_" +cmake -DCMAKE_BUILD_TYPE=Release ../.. +make -j4 install +popd # Just before installing gRPC, wipe out contents of all the submodules to simulate # a standalone build from an archive @@ -58,11 +47,19 @@ rm -rf third_party/protobuf # wipe out to prevent influencing the grpc build git submodule foreach 'cd $toplevel; rm -rf $name' # Install gRPC -mkdir -p cmake/build -cd cmake/build -cmake -DgRPC_INSTALL=ON -DgRPC_BUILD_TESTS=OFF -DgRPC_PROTOBUF_PROVIDER=package -DgRPC_ZLIB_PROVIDER=package -DgRPC_CARES_PROVIDER=package -DgRPC_SSL_PROVIDER=package -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local/grpc ../.. +mkdir -p "cmake/build" && pushd "$_" +cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr/local/grpc \ + -DgRPC_INSTALL=ON \ + -DgRPC_BUILD_TESTS=OFF \ + -DgRPC_CARES_PROVIDER=package \ + -DgRPC_PROTOBUF_PROVIDER=package \ + -DgRPC_SSL_PROVIDER=package \ + -DgRPC_ZLIB_PROVIDER=package \ + ../.. make -j4 install -cd ../.. +popd # Build helloworld example using Makefiles and pkg-config cd examples/cpp/helloworld From 6f0b772afaef8f3743b723d16a1c013b5b3284b0 Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Fri, 1 Nov 2019 15:39:49 -0700 Subject: [PATCH 051/133] Add tests for other arities --- .../tests/unit/_interceptor_test.py | 71 +++++++++++++++++-- 1 file changed, 67 insertions(+), 4 deletions(-) diff --git a/src/python/grpcio_tests/tests/unit/_interceptor_test.py b/src/python/grpcio_tests/tests/unit/_interceptor_test.py index 1b72123153e..243c95468bc 100644 --- a/src/python/grpcio_tests/tests/unit/_interceptor_test.py +++ b/src/python/grpcio_tests/tests/unit/_interceptor_test.py @@ -76,8 +76,9 @@ class _Handler(object): raise RuntimeError() return request - # TODO(gnossen): Instrument this for a test of exception handling. def handle_unary_stream(self, request, servicer_context): + if request == _EXCEPTION_REQUEST: + raise RuntimeError() for _ in range(test_constants.STREAM_LENGTH): self._control.control() yield request @@ -102,6 +103,8 @@ class _Handler(object): 'testkey', 'testvalue', ),)) + if _EXCEPTION_REQUEST in response_elements: + raise RuntimeError() return b''.join(response_elements) def handle_stream_stream(self, request_iterator, servicer_context): @@ -112,6 +115,8 @@ class _Handler(object): 'testvalue', ),)) for request in request_iterator: + if request == _EXCEPTION_REQUEST: + raise RuntimeError() self._control.control() yield request self._control.control() @@ -250,7 +255,10 @@ class _LoggingInterceptor( def intercept_stream_unary(self, continuation, client_call_details, request_iterator): self.record.append(self.tag + ':intercept_stream_unary') - return continuation(client_call_details, request_iterator) + result = continuation(client_call_details, request_iterator) + assert isinstance(result, grpc.Call), '{} is not an instance of grpc.Call'.format(result) + assert isinstance(result, grpc.Future), '{} is not an instance of grpc.Future'.format(result) + return result def intercept_stream_stream(self, continuation, client_call_details, request_iterator): @@ -448,7 +456,7 @@ class InterceptorTest(unittest.TestCase): 's1:intercept_service', 's2:intercept_service' ]) - def testInterceptedUnaryRequestBlockingUnaryResponseWithException(self): + def testInterceptedUnaryRequestBlockingUnaryResponseWithError(self): request = _EXCEPTION_REQUEST self._record[:] = [] @@ -460,7 +468,7 @@ class InterceptorTest(unittest.TestCase): 'c2', self._record)) multi_callable = _unary_unary_multi_callable(channel) - with self.assertRaises(grpc.RpcError) as exception_context: + with self.assertRaises(grpc.RpcError): multi_callable( request, metadata=(('test', @@ -531,6 +539,23 @@ class InterceptorTest(unittest.TestCase): 's1:intercept_service', 's2:intercept_service' ]) + def testInterceptedUnaryRequestStreamResponseWithError(self): + request = _EXCEPTION_REQUEST + + self._record[:] = [] + channel = grpc.intercept_channel(self._channel, + _LoggingInterceptor( + 'c1', self._record), + _LoggingInterceptor( + 'c2', self._record)) + + multi_callable = _unary_stream_multi_callable(channel) + response_iterator = multi_callable( + request, + metadata=(('test', 'InterceptedUnaryRequestStreamResponse'),)) + with self.assertRaises(grpc.RpcError): + tuple(response_iterator) + def testInterceptedStreamRequestBlockingUnaryResponse(self): requests = tuple( b'\x07\x08' for _ in range(test_constants.STREAM_LENGTH)) @@ -601,6 +626,25 @@ class InterceptorTest(unittest.TestCase): 's1:intercept_service', 's2:intercept_service' ]) + def testInterceptedStreamRequestFutureUnaryResponseWithError(self): + requests = tuple( + _EXCEPTION_REQUEST for _ in range(test_constants.STREAM_LENGTH)) + request_iterator = iter(requests) + + self._record[:] = [] + channel = grpc.intercept_channel(self._channel, + _LoggingInterceptor( + 'c1', self._record), + _LoggingInterceptor( + 'c2', self._record)) + + multi_callable = _stream_unary_multi_callable(channel) + response_future = multi_callable.future( + request_iterator, + metadata=(('test', 'InterceptedStreamRequestFutureUnaryResponse'),)) + with self.assertRaises(grpc.RpcError): + response_future.result() + def testInterceptedStreamRequestStreamResponse(self): requests = tuple( b'\x77\x58' for _ in range(test_constants.STREAM_LENGTH)) @@ -624,6 +668,25 @@ class InterceptorTest(unittest.TestCase): 's1:intercept_service', 's2:intercept_service' ]) + def testInterceptedStreamRequestStreamResponseWithError(self): + requests = tuple( + _EXCEPTION_REQUEST for _ in range(test_constants.STREAM_LENGTH)) + request_iterator = iter(requests) + + self._record[:] = [] + channel = grpc.intercept_channel(self._channel, + _LoggingInterceptor( + 'c1', self._record), + _LoggingInterceptor( + 'c2', self._record)) + + multi_callable = _stream_stream_multi_callable(channel) + response_iterator = multi_callable( + request_iterator, + metadata=(('test', 'InterceptedStreamRequestStreamResponse'),)) + with self.assertRaises(grpc.RpcError): + tuple(response_iterator) + if __name__ == '__main__': logging.basicConfig() From e4d58fba6d84d157696876d5be77def9eee618ab Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Fri, 1 Nov 2019 16:34:41 -0700 Subject: [PATCH 052/133] Sanity --- src/python/grpcio/grpc/_channel.py | 18 +++++++++++------- .../tests/unit/_interceptor_test.py | 16 ++++++++++++---- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/src/python/grpcio/grpc/_channel.py b/src/python/grpcio/grpc/_channel.py index 5fb843acbde..fb25d91e401 100644 --- a/src/python/grpcio/grpc/_channel.py +++ b/src/python/grpcio/grpc/_channel.py @@ -277,11 +277,15 @@ class _RpcError(grpc.RpcError, grpc.Call, grpc.Future): def __init__(self, state): if state.cancelled: - raise ValueError("Cannot instantiate an _RpcError for a cancelled RPC.") + raise ValueError( + "Cannot instantiate an _RpcError for a cancelled RPC.") if state.code is grpc.StatusCode.OK: - raise ValueError("Cannot instantiate an _RpcError for a successfully completed RPC.") + raise ValueError( + "Cannot instantiate an _RpcError for a successfully completed RPC." + ) if state.code is None: - raise ValueError("Cannot instantiate an _RpcError for an incomplete RPC.") + raise ValueError( + "Cannot instantiate an _RpcError for an incomplete RPC.") self._state = state def initial_metadata(self): @@ -324,22 +328,22 @@ class _RpcError(grpc.RpcError, grpc.Call, grpc.Future): """See grpc.Future.done.""" return True - def result(self, timeout=None): + def result(self, timeout=None): # pylint: disable=unused-argument """See grpc.Future.result.""" raise self - def exception(self, timeout=None): + def exception(self, timeout=None): # pylint: disable=unused-argument """See grpc.Future.exception.""" return self - def traceback(self, timeout=None): + def traceback(self, timeout=None): # pylint: disable=unused-argument """See grpc.Future.traceback.""" try: raise self except grpc.RpcError: return sys.exc_info()[2] - def add_done_callback(self, timeout=None): + def add_done_callback(self, fn, timeout=None): # pylint: disable=unused-argument """See grpc.Future.add_done_callback.""" fn(self) diff --git a/src/python/grpcio_tests/tests/unit/_interceptor_test.py b/src/python/grpcio_tests/tests/unit/_interceptor_test.py index 243c95468bc..5a6434e987e 100644 --- a/src/python/grpcio_tests/tests/unit/_interceptor_test.py +++ b/src/python/grpcio_tests/tests/unit/_interceptor_test.py @@ -243,8 +243,12 @@ class _LoggingInterceptor( def intercept_unary_unary(self, continuation, client_call_details, request): self.record.append(self.tag + ':intercept_unary_unary') result = continuation(client_call_details, request) - assert isinstance(result, grpc.Call), '{} is not an instance of grpc.Call'.format(result) - assert isinstance(result, grpc.Future), '{} is not an instance of grpc.Future'.format(result) + assert isinstance( + result, + grpc.Call), '{} is not an instance of grpc.Call'.format(result) + assert isinstance( + result, + grpc.Future), '{} is not an instance of grpc.Future'.format(result) return result def intercept_unary_stream(self, continuation, client_call_details, @@ -256,8 +260,12 @@ class _LoggingInterceptor( request_iterator): self.record.append(self.tag + ':intercept_stream_unary') result = continuation(client_call_details, request_iterator) - assert isinstance(result, grpc.Call), '{} is not an instance of grpc.Call'.format(result) - assert isinstance(result, grpc.Future), '{} is not an instance of grpc.Future'.format(result) + assert isinstance( + result, + grpc.Call), '{} is not an instance of grpc.Call'.format(result) + assert isinstance( + result, + grpc.Future), '{} is not an instance of grpc.Future'.format(result) return result def intercept_stream_stream(self, continuation, client_call_details, From a5db5d5450534a5144069afe2f6bdb420a5e335a Mon Sep 17 00:00:00 2001 From: Prashant Jaikumar Date: Fri, 1 Nov 2019 16:44:14 -0700 Subject: [PATCH 053/133] C++ tests on iOS to work with bazel 1.0 --- third_party/objective_c/google_toolbox_for_mac/BUILD | 2 +- .../macos/grpc_run_bazel_cpp_ios_tests.sh | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/third_party/objective_c/google_toolbox_for_mac/BUILD b/third_party/objective_c/google_toolbox_for_mac/BUILD index 9fc517c45eb..49f110e485f 100644 --- a/third_party/objective_c/google_toolbox_for_mac/BUILD +++ b/third_party/objective_c/google_toolbox_for_mac/BUILD @@ -15,7 +15,7 @@ # limitations under the License. licenses(["notice"]) -native.objc_library( +objc_library( name = "GTM_GoogleTestRunner_GTM_USING_XCTEST", testonly = 1, srcs = [ diff --git a/tools/internal_ci/macos/grpc_run_bazel_cpp_ios_tests.sh b/tools/internal_ci/macos/grpc_run_bazel_cpp_ios_tests.sh index bc2a8295521..c6523408040 100644 --- a/tools/internal_ci/macos/grpc_run_bazel_cpp_ios_tests.sh +++ b/tools/internal_ci/macos/grpc_run_bazel_cpp_ios_tests.sh @@ -18,22 +18,14 @@ set -ex # change to grpc repo root cd $(dirname $0)/../../.. -# Download bazel -temp_dir="$(mktemp -d)" -wget -q https://github.com/bazelbuild/bazel/releases/download/0.26.0/bazel-0.26.0-darwin-x86_64 -O "${temp_dir}/bazel" -chmod 755 "${temp_dir}/bazel" -export PATH="${temp_dir}:${PATH}" -# This should show ${temp_dir}/bazel -which bazel - ./tools/run_tests/start_port_server.py dirs=(end2end server client common codegen util grpclb test) for dir in ${dirs[*]}; do echo $dir - out=`bazel query "kind(ios_unit_test, tests(//test/cpp/$dir/...))"` + out=`tools/bazel query "kind(ios_unit_test, tests(//test/cpp/$dir/...))" 2>/dev/null | grep '^//'` for test in $out; do echo "Running: $test" - bazel test --test_summary=detailed --test_output=all $test + tools/bazel test --test_summary=detailed --test_output=all $test done done From f33a7645c58bd3c55673b277f85e66cbc44f796a Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Fri, 1 Nov 2019 12:44:07 -0700 Subject: [PATCH 054/133] Removed _gRPC_*_INCLUDE_DIR --- CMakeLists.txt | 1604 ----------------------------- cmake/benchmark.cmake | 3 - cmake/cares.cmake | 2 - cmake/gflags.cmake | 2 - cmake/protobuf.cmake | 2 - templates/CMakeLists.txt.template | 8 - 6 files changed, 1621 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e29d8f47b97..ce4d55a04ac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -870,10 +870,6 @@ target_include_directories(address_sorting PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -923,10 +919,6 @@ target_include_directories(alts_test_util PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -1006,10 +998,6 @@ target_include_directories(gpr PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -1479,10 +1467,6 @@ target_include_directories(grpc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -1899,10 +1883,6 @@ target_include_directories(grpc_cronet PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -2255,10 +2235,6 @@ target_include_directories(grpc_test_util PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -2608,10 +2584,6 @@ target_include_directories(grpc_test_util_unsecure PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -3005,10 +2977,6 @@ target_include_directories(grpc_unsecure PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -3107,10 +3075,6 @@ target_include_directories(reconnect_server PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -3154,10 +3118,6 @@ target_include_directories(test_tcp_server PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -3206,10 +3166,6 @@ target_include_directories(bm_callback_test_service_impl PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -3265,10 +3221,6 @@ target_include_directories(dns_test_util PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -3366,10 +3318,6 @@ target_include_directories(grpc++ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -3698,10 +3646,6 @@ target_include_directories(grpc++_core_stats PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -3754,10 +3698,6 @@ target_include_directories(grpc++_error_details PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -3828,10 +3768,6 @@ target_include_directories(grpc++_proto_reflection_desc_db PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -3896,10 +3832,6 @@ target_include_directories(grpc++_reflection PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -3965,10 +3897,6 @@ target_include_directories(grpc++_test_config PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -4049,10 +3977,6 @@ target_include_directories(grpc++_test_util PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -4249,10 +4173,6 @@ target_include_directories(grpc++_test_util_unsecure PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -4466,10 +4386,6 @@ target_include_directories(grpc++_unsecure PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -4786,10 +4702,6 @@ target_include_directories(grpc_benchmark PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -4849,10 +4761,6 @@ target_include_directories(grpc_cli_libs PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -4918,10 +4826,6 @@ target_include_directories(grpc_plugin_support PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -4987,10 +4891,6 @@ target_include_directories(grpcpp_channelz PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -5068,10 +4968,6 @@ target_include_directories(http2_client_main PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -5129,10 +5025,6 @@ target_include_directories(interop_client_helper PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -5199,10 +5091,6 @@ target_include_directories(interop_client_main PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -5257,10 +5145,6 @@ target_include_directories(interop_server_helper PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -5325,10 +5209,6 @@ target_include_directories(interop_server_lib PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -5383,10 +5263,6 @@ target_include_directories(interop_server_main PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -5475,10 +5351,6 @@ target_include_directories(qps PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -5531,10 +5403,6 @@ target_include_directories(grpc_csharp_ext PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -5585,10 +5453,6 @@ target_include_directories(bad_client_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -5638,10 +5502,6 @@ target_include_directories(bad_ssl_test_server PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -5763,10 +5623,6 @@ target_include_directories(end2end_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -5888,10 +5744,6 @@ target_include_directories(end2end_nosec_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -5919,10 +5771,6 @@ target_include_directories(algorithm_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -5950,10 +5798,6 @@ target_include_directories(alloc_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -5981,10 +5825,6 @@ target_include_directories(alpn_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -6012,10 +5852,6 @@ target_include_directories(arena_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -6043,10 +5879,6 @@ target_include_directories(avl_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -6074,10 +5906,6 @@ target_include_directories(bad_server_response_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -6106,10 +5934,6 @@ target_include_directories(bin_decoder_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -6136,10 +5960,6 @@ target_include_directories(bin_encoder_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -6167,10 +5987,6 @@ if(_gRPC_PLATFORM_LINUX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -6199,10 +6015,6 @@ target_include_directories(channel_create_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -6229,10 +6041,6 @@ target_include_directories(check_epollexclusive ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -6258,10 +6066,6 @@ target_include_directories(chttp2_hpack_encoder_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -6289,10 +6093,6 @@ target_include_directories(chttp2_stream_map_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -6320,10 +6120,6 @@ target_include_directories(chttp2_varint_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -6352,10 +6148,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -6384,10 +6176,6 @@ target_include_directories(cmdline_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -6415,10 +6203,6 @@ target_include_directories(combiner_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -6446,10 +6230,6 @@ target_include_directories(compression_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -6477,10 +6257,6 @@ target_include_directories(concurrent_connectivity_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -6508,10 +6284,6 @@ target_include_directories(connection_refused_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -6539,10 +6311,6 @@ target_include_directories(dns_resolver_connectivity_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -6570,10 +6338,6 @@ target_include_directories(dns_resolver_cooldown_using_ares_resolver_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -6601,10 +6365,6 @@ target_include_directories(dns_resolver_cooldown_using_native_resolver_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -6632,10 +6392,6 @@ target_include_directories(dns_resolver_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -6664,10 +6420,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -6696,10 +6448,6 @@ target_include_directories(endpoint_pair_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -6727,10 +6475,6 @@ target_include_directories(error_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -6759,10 +6503,6 @@ if(_gRPC_PLATFORM_LINUX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -6791,10 +6531,6 @@ target_include_directories(fake_resolver_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -6824,10 +6560,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -6857,10 +6589,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -6890,10 +6618,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -6922,10 +6646,6 @@ target_include_directories(fling_client ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -6953,10 +6673,6 @@ target_include_directories(fling_server ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -6985,10 +6701,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -7018,10 +6730,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -7051,10 +6759,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -7084,10 +6788,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -7116,10 +6816,6 @@ target_include_directories(gpr_cpu_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -7147,10 +6843,6 @@ target_include_directories(gpr_env_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -7178,10 +6870,6 @@ target_include_directories(gpr_host_port_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -7209,10 +6897,6 @@ target_include_directories(gpr_log_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -7240,10 +6924,6 @@ target_include_directories(gpr_manual_constructor_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -7271,10 +6951,6 @@ target_include_directories(gpr_spinlock_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -7302,10 +6978,6 @@ target_include_directories(gpr_string_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -7333,10 +7005,6 @@ target_include_directories(gpr_sync_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -7364,10 +7032,6 @@ target_include_directories(gpr_thd_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -7395,10 +7059,6 @@ target_include_directories(gpr_time_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -7426,10 +7086,6 @@ target_include_directories(gpr_tls_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -7457,10 +7113,6 @@ target_include_directories(gpr_useful_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -7488,10 +7140,6 @@ target_include_directories(grpc_auth_context_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -7519,10 +7167,6 @@ target_include_directories(grpc_b64_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -7550,10 +7194,6 @@ target_include_directories(grpc_byte_buffer_reader_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -7581,10 +7221,6 @@ target_include_directories(grpc_channel_args_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -7612,10 +7248,6 @@ target_include_directories(grpc_channel_stack_builder_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -7643,10 +7275,6 @@ target_include_directories(grpc_channel_stack_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -7674,10 +7302,6 @@ target_include_directories(grpc_completion_queue_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -7705,10 +7329,6 @@ target_include_directories(grpc_completion_queue_threading_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -7736,10 +7356,6 @@ target_include_directories(grpc_control_plane_credentials_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -7767,10 +7383,6 @@ target_include_directories(grpc_create_jwt ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -7797,10 +7409,6 @@ target_include_directories(grpc_credentials_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -7828,10 +7436,6 @@ target_include_directories(grpc_ipv6_loopback_available_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -7860,10 +7464,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -7892,10 +7492,6 @@ target_include_directories(grpc_jwt_verifier_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -7923,10 +7519,6 @@ target_include_directories(grpc_print_google_default_creds_token ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -7952,10 +7544,6 @@ target_include_directories(grpc_security_connector_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -7983,10 +7571,6 @@ target_include_directories(grpc_ssl_credentials_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -8014,10 +7598,6 @@ target_include_directories(grpc_verify_jwt ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -8044,10 +7624,6 @@ if(_gRPC_PLATFORM_LINUX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -8079,10 +7655,6 @@ if(_gRPC_PLATFORM_LINUX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -8114,10 +7686,6 @@ if(_gRPC_PLATFORM_LINUX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -8148,10 +7716,6 @@ if(_gRPC_PLATFORM_LINUX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -8181,10 +7745,6 @@ target_include_directories(histogram_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -8211,10 +7771,6 @@ target_include_directories(hpack_parser_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -8242,10 +7798,6 @@ target_include_directories(hpack_table_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -8273,10 +7825,6 @@ target_include_directories(http_parser_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -8304,10 +7852,6 @@ target_include_directories(httpcli_format_request_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -8336,10 +7880,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -8369,10 +7909,6 @@ if(_gRPC_PLATFORM_LINUX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -8401,10 +7937,6 @@ target_include_directories(init_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -8432,10 +7964,6 @@ target_include_directories(inproc_callback_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -8463,10 +7991,6 @@ target_include_directories(invalid_call_argument_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -8494,10 +8018,6 @@ target_include_directories(json_rewrite ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -8525,10 +8045,6 @@ target_include_directories(json_rewrite_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -8556,10 +8072,6 @@ target_include_directories(json_stream_error_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -8587,10 +8099,6 @@ target_include_directories(json_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -8618,10 +8126,6 @@ target_include_directories(lame_client_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -8649,10 +8153,6 @@ target_include_directories(load_file_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -8680,10 +8180,6 @@ target_include_directories(memory_usage_client ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -8711,10 +8207,6 @@ target_include_directories(memory_usage_server ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -8743,10 +8235,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -8775,10 +8263,6 @@ target_include_directories(message_compress_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -8806,10 +8290,6 @@ target_include_directories(minimal_stack_is_minimal_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -8837,10 +8317,6 @@ target_include_directories(mpmcqueue_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -8868,10 +8344,6 @@ target_include_directories(multiple_server_queues_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -8899,10 +8371,6 @@ target_include_directories(murmur_hash_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -8930,10 +8398,6 @@ target_include_directories(no_server_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -8961,10 +8425,6 @@ target_include_directories(num_external_connectivity_watchers_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -8992,10 +8452,6 @@ target_include_directories(parse_address_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -9024,10 +8480,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -9056,10 +8508,6 @@ target_include_directories(percent_encoding_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -9088,10 +8536,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -9120,10 +8564,6 @@ target_include_directories(resolve_address_using_ares_resolver_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -9152,10 +8592,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -9184,10 +8620,6 @@ target_include_directories(resolve_address_using_native_resolver_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -9215,10 +8647,6 @@ target_include_directories(resource_quota_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -9246,10 +8674,6 @@ target_include_directories(secure_channel_create_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -9277,10 +8701,6 @@ target_include_directories(secure_endpoint_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -9308,10 +8728,6 @@ target_include_directories(sequential_connectivity_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -9339,10 +8755,6 @@ target_include_directories(server_chttp2_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -9370,10 +8782,6 @@ target_include_directories(server_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -9401,10 +8809,6 @@ target_include_directories(slice_buffer_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -9432,10 +8836,6 @@ target_include_directories(slice_string_helpers_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -9463,10 +8863,6 @@ target_include_directories(slice_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -9494,10 +8890,6 @@ target_include_directories(sockaddr_resolver_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -9525,10 +8917,6 @@ target_include_directories(sockaddr_utils_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -9557,10 +8945,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -9591,10 +8975,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -9623,10 +9003,6 @@ target_include_directories(status_conversion_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -9654,10 +9030,6 @@ target_include_directories(stream_compression_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -9685,10 +9057,6 @@ target_include_directories(stream_owned_slice_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -9717,10 +9085,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -9749,10 +9113,6 @@ target_include_directories(tcp_client_uv_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -9781,10 +9141,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -9814,10 +9170,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -9846,10 +9198,6 @@ target_include_directories(tcp_server_uv_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -9877,10 +9225,6 @@ target_include_directories(threadpool_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -9908,10 +9252,6 @@ target_include_directories(time_averaged_stats_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -9939,10 +9279,6 @@ target_include_directories(timeout_encoding_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -9970,10 +9306,6 @@ target_include_directories(timer_heap_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -10001,10 +9333,6 @@ target_include_directories(timer_list_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -10032,10 +9360,6 @@ target_include_directories(transport_metadata_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -10064,10 +9388,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -10097,10 +9417,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -10129,10 +9445,6 @@ target_include_directories(uri_parser_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -10162,10 +9474,6 @@ target_include_directories(alarm_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -10204,10 +9512,6 @@ target_include_directories(alts_counter_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -10244,10 +9548,6 @@ target_include_directories(alts_crypt_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -10285,10 +9585,6 @@ target_include_directories(alts_crypter_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -10325,10 +9621,6 @@ target_include_directories(alts_frame_handler_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -10366,10 +9658,6 @@ target_include_directories(alts_frame_protector_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -10406,10 +9694,6 @@ target_include_directories(alts_grpc_record_protocol_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -10446,10 +9730,6 @@ target_include_directories(alts_handshaker_client_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -10486,10 +9766,6 @@ target_include_directories(alts_iovec_record_protocol_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -10526,10 +9802,6 @@ target_include_directories(alts_security_connector_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -10565,10 +9837,6 @@ target_include_directories(alts_tsi_handshaker_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -10605,10 +9873,6 @@ target_include_directories(alts_tsi_utils_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -10645,10 +9909,6 @@ target_include_directories(alts_zero_copy_grpc_protector_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -10685,10 +9945,6 @@ target_include_directories(async_end2end_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -10727,10 +9983,6 @@ target_include_directories(auth_property_iterator_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -10769,10 +10021,6 @@ target_include_directories(backoff_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -10809,10 +10057,6 @@ target_include_directories(bdp_estimator_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -10852,10 +10096,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -10899,10 +10139,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -10946,10 +10182,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -10993,10 +10225,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -11040,10 +10268,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -11088,10 +10312,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -11136,10 +10356,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -11183,10 +10399,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -11230,10 +10442,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -11277,10 +10485,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -11324,10 +10528,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -11371,10 +10571,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -11418,10 +10614,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -11465,10 +10657,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -11512,10 +10700,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -11559,10 +10743,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -11606,10 +10786,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -11653,10 +10829,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -11700,10 +10872,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -11747,10 +10915,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -11794,10 +10958,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -11840,10 +11000,6 @@ target_include_directories(byte_stream_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -11880,10 +11036,6 @@ target_include_directories(channel_arguments_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -11920,10 +11072,6 @@ target_include_directories(channel_filter_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -11964,10 +11112,6 @@ target_include_directories(channel_trace_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -12006,10 +11150,6 @@ target_include_directories(channelz_registry_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -12052,10 +11192,6 @@ target_include_directories(channelz_service_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -12099,10 +11235,6 @@ target_include_directories(channelz_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -12141,10 +11273,6 @@ target_include_directories(check_gcp_environment_linux_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -12180,10 +11308,6 @@ target_include_directories(check_gcp_environment_windows_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -12219,10 +11343,6 @@ target_include_directories(chttp2_settings_timeout_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -12259,10 +11379,6 @@ target_include_directories(cli_call_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -12303,10 +11419,6 @@ target_include_directories(client_callback_end2end_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -12349,10 +11461,6 @@ target_include_directories(client_channel_stress_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -12392,10 +11500,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -12435,10 +11539,6 @@ target_include_directories(client_crash_test_server ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -12479,10 +11579,6 @@ target_include_directories(client_interceptors_end2end_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -12525,10 +11621,6 @@ target_include_directories(client_lb_end2end_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -12595,10 +11687,6 @@ target_include_directories(codegen_test_full ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -12665,10 +11753,6 @@ target_include_directories(codegen_test_minimal ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -12705,10 +11789,6 @@ target_include_directories(context_list_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -12745,10 +11825,6 @@ target_include_directories(credentials_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -12785,10 +11861,6 @@ target_include_directories(cxx_byte_buffer_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -12826,10 +11898,6 @@ target_include_directories(cxx_slice_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -12867,10 +11935,6 @@ target_include_directories(cxx_string_ref_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -12906,10 +11970,6 @@ target_include_directories(cxx_time_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -12947,10 +12007,6 @@ target_include_directories(delegating_channel_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -12990,10 +12046,6 @@ target_include_directories(end2end_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -13036,10 +12088,6 @@ target_include_directories(error_details_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -13075,10 +12123,6 @@ target_include_directories(exception_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -13117,10 +12161,6 @@ target_include_directories(filter_end2end_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -13156,10 +12196,6 @@ target_include_directories(gen_hpack_tables ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -13186,10 +12222,6 @@ target_include_directories(gen_legal_metadata_characters ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -13214,10 +12246,6 @@ target_include_directories(gen_percent_encoding_tables ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -13245,10 +12273,6 @@ target_include_directories(generic_end2end_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -13287,10 +12311,6 @@ target_include_directories(global_config_env_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -13326,10 +12346,6 @@ target_include_directories(global_config_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -13369,10 +12385,6 @@ target_include_directories(golden_file_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -13410,10 +12422,6 @@ target_include_directories(gprpp_mpscq_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -13450,10 +12458,6 @@ target_include_directories(grpc_alts_credentials_options_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -13489,10 +12493,6 @@ target_include_directories(grpc_cli ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -13530,10 +12530,6 @@ target_include_directories(grpc_cpp_plugin ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -13571,10 +12567,6 @@ target_include_directories(grpc_csharp_plugin ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -13614,10 +12606,6 @@ target_include_directories(grpc_fetch_oauth2 ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -13655,10 +12643,6 @@ target_include_directories(grpc_linux_system_roots_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -13693,10 +12677,6 @@ target_include_directories(grpc_node_plugin ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -13734,10 +12714,6 @@ target_include_directories(grpc_objective_c_plugin ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -13775,10 +12751,6 @@ target_include_directories(grpc_php_plugin ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -13816,10 +12788,6 @@ target_include_directories(grpc_python_plugin ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -13857,10 +12825,6 @@ target_include_directories(grpc_ruby_plugin ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -13900,10 +12864,6 @@ target_include_directories(grpc_spiffe_security_connector_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -13950,10 +12910,6 @@ target_include_directories(grpc_tool_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -13999,10 +12955,6 @@ target_include_directories(grpclb_api_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -14044,10 +12996,6 @@ target_include_directories(grpclb_end2end_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -14099,10 +13047,6 @@ if(_gRPC_PLATFORM_LINUX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -14143,10 +13087,6 @@ target_include_directories(h2_ssl_cert_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -14184,10 +13124,6 @@ target_include_directories(h2_ssl_session_reuse_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -14225,10 +13161,6 @@ target_include_directories(health_service_end2end_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -14267,10 +13199,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -14311,10 +13239,6 @@ target_include_directories(hybrid_end2end_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -14353,10 +13277,6 @@ target_include_directories(inlined_vector_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -14395,10 +13315,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -14441,10 +13357,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -14487,10 +13399,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -14535,10 +13443,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -14578,10 +13482,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -14622,10 +13522,6 @@ target_include_directories(memory_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -14663,10 +13559,6 @@ target_include_directories(message_allocator_end2end_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -14709,10 +13601,6 @@ target_include_directories(metrics_client ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -14750,10 +13638,6 @@ target_include_directories(mock_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -14792,10 +13676,6 @@ target_include_directories(nonblocking_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -14834,10 +13714,6 @@ target_include_directories(noop-benchmark ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -14872,10 +13748,6 @@ target_include_directories(optional_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -14913,10 +13785,6 @@ target_include_directories(orphanable_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -14954,10 +13822,6 @@ target_include_directories(port_sharing_end2end_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -14997,10 +13861,6 @@ target_include_directories(proto_server_reflection_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -15041,10 +13901,6 @@ target_include_directories(proto_utils_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -15081,10 +13937,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -15126,10 +13978,6 @@ target_include_directories(qps_json_driver ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -15172,10 +14020,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -15218,10 +14062,6 @@ target_include_directories(qps_worker ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -15263,10 +14103,6 @@ target_include_directories(raw_end2end_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -15317,10 +14153,6 @@ target_include_directories(reconnect_interop_client ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -15372,10 +14204,6 @@ target_include_directories(reconnect_interop_server ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -15417,10 +14245,6 @@ target_include_directories(ref_counted_ptr_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -15458,10 +14282,6 @@ target_include_directories(ref_counted_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -15499,10 +14319,6 @@ target_include_directories(retry_throttle_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -15539,10 +14355,6 @@ target_include_directories(secure_auth_context_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -15582,10 +14394,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -15628,10 +14436,6 @@ target_include_directories(server_builder_plugin_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -15678,10 +14482,6 @@ target_include_directories(server_builder_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -15729,10 +14529,6 @@ if(_gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -15772,10 +14568,6 @@ target_include_directories(server_context_test_spouse_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -15814,10 +14606,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -15857,10 +14645,6 @@ target_include_directories(server_crash_test_client ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -15900,10 +14684,6 @@ target_include_directories(server_early_return_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -15943,10 +14723,6 @@ target_include_directories(server_interceptors_end2end_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -15993,10 +14769,6 @@ target_include_directories(server_request_call_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -16035,10 +14807,6 @@ target_include_directories(service_config_end2end_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -16077,10 +14845,6 @@ target_include_directories(service_config_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -16118,10 +14882,6 @@ target_include_directories(shutdown_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -16160,10 +14920,6 @@ target_include_directories(slice_hash_table_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -16200,10 +14956,6 @@ target_include_directories(slice_weak_hash_table_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -16240,10 +14992,6 @@ target_include_directories(stats_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -16281,10 +15029,6 @@ target_include_directories(status_metadata_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -16319,10 +15063,6 @@ target_include_directories(status_util_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -16358,10 +15098,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -16420,10 +15156,6 @@ target_include_directories(stress_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -16463,10 +15195,6 @@ target_include_directories(string_view_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -16504,10 +15232,6 @@ target_include_directories(thread_manager_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -16547,10 +15271,6 @@ target_include_directories(thread_stress_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -16590,10 +15310,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -16633,10 +15349,6 @@ target_include_directories(timer_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -16674,10 +15386,6 @@ target_include_directories(transport_connectivity_state_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -16714,10 +15422,6 @@ target_include_directories(transport_pid_controller_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -16756,10 +15460,6 @@ target_include_directories(transport_security_common_api_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -16797,10 +15497,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -16840,10 +15536,6 @@ target_include_directories(xds_bootstrap_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -16893,10 +15585,6 @@ target_include_directories(xds_end2end_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -16933,10 +15621,6 @@ target_include_directories(public_headers_must_be_c89 ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -16965,10 +15649,6 @@ target_include_directories(bad_streaming_id_bad_client_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -17006,10 +15686,6 @@ target_include_directories(badreq_bad_client_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -17047,10 +15723,6 @@ target_include_directories(connection_prefix_bad_client_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -17088,10 +15760,6 @@ target_include_directories(duplicate_header_bad_client_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -17129,10 +15797,6 @@ target_include_directories(head_of_line_blocking_bad_client_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -17170,10 +15834,6 @@ target_include_directories(headers_bad_client_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -17211,10 +15871,6 @@ target_include_directories(initial_settings_frame_bad_client_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -17252,10 +15908,6 @@ target_include_directories(large_metadata_bad_client_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -17293,10 +15945,6 @@ target_include_directories(out_of_bounds_bad_client_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -17334,10 +15982,6 @@ target_include_directories(server_registered_method_bad_client_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -17375,10 +16019,6 @@ target_include_directories(simple_request_bad_client_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -17416,10 +16056,6 @@ target_include_directories(unknown_frame_bad_client_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -17457,10 +16093,6 @@ target_include_directories(window_overflow_bad_client_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -17497,10 +16129,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -17531,10 +16159,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -17563,10 +16187,6 @@ target_include_directories(h2_census_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -17595,10 +16215,6 @@ target_include_directories(h2_compress_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -17627,10 +16243,6 @@ target_include_directories(h2_fakesec_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -17660,10 +16272,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -17693,10 +16301,6 @@ target_include_directories(h2_full_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -17726,10 +16330,6 @@ if(_gRPC_PLATFORM_LINUX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -17759,10 +16359,6 @@ target_include_directories(h2_full+trace_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -17791,10 +16387,6 @@ target_include_directories(h2_full+workarounds_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -17823,10 +16415,6 @@ target_include_directories(h2_http_proxy_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -17856,10 +16444,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -17890,10 +16474,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -17924,10 +16504,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -17957,10 +16533,6 @@ target_include_directories(h2_oauth2_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -17989,10 +16561,6 @@ target_include_directories(h2_proxy_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -18021,10 +16589,6 @@ target_include_directories(h2_sockpair_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -18053,10 +16617,6 @@ target_include_directories(h2_sockpair+trace_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -18085,10 +16645,6 @@ target_include_directories(h2_sockpair_1byte_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -18117,10 +16673,6 @@ target_include_directories(h2_spiffe_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -18149,10 +16701,6 @@ target_include_directories(h2_ssl_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -18181,10 +16729,6 @@ target_include_directories(h2_ssl_cred_reload_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -18213,10 +16757,6 @@ target_include_directories(h2_ssl_proxy_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -18246,10 +16786,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -18279,10 +16815,6 @@ target_include_directories(inproc_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -18311,10 +16843,6 @@ target_include_directories(h2_census_nosec_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -18343,10 +16871,6 @@ target_include_directories(h2_compress_nosec_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -18376,10 +16900,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -18409,10 +16929,6 @@ target_include_directories(h2_full_nosec_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -18442,10 +16958,6 @@ if(_gRPC_PLATFORM_LINUX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -18475,10 +16987,6 @@ target_include_directories(h2_full+trace_nosec_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -18507,10 +17015,6 @@ target_include_directories(h2_full+workarounds_nosec_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -18539,10 +17043,6 @@ target_include_directories(h2_http_proxy_nosec_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -18571,10 +17071,6 @@ target_include_directories(h2_proxy_nosec_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -18603,10 +17099,6 @@ target_include_directories(h2_sockpair_nosec_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -18635,10 +17127,6 @@ target_include_directories(h2_sockpair+trace_nosec_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -18667,10 +17155,6 @@ target_include_directories(h2_sockpair_1byte_nosec_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -18700,10 +17184,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -18735,10 +17215,6 @@ target_include_directories(resolver_component_test_unsecure ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -18779,10 +17255,6 @@ target_include_directories(resolver_component_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -18824,10 +17296,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -18869,10 +17337,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -18913,10 +17377,6 @@ target_include_directories(address_sorting_test_unsecure ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -18956,10 +17416,6 @@ target_include_directories(address_sorting_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -18999,10 +17455,6 @@ target_include_directories(cancel_ares_query_test ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -19042,10 +17494,6 @@ target_include_directories(alts_credentials_fuzzer_one_entry ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -19074,10 +17522,6 @@ target_include_directories(api_fuzzer_one_entry ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -19106,10 +17550,6 @@ target_include_directories(client_fuzzer_one_entry ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -19138,10 +17578,6 @@ target_include_directories(hpack_parser_fuzzer_test_one_entry ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -19170,10 +17606,6 @@ target_include_directories(http_request_fuzzer_test_one_entry ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -19202,10 +17634,6 @@ target_include_directories(http_response_fuzzer_test_one_entry ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -19234,10 +17662,6 @@ target_include_directories(json_fuzzer_test_one_entry ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -19266,10 +17690,6 @@ target_include_directories(nanopb_fuzzer_response_test_one_entry ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -19298,10 +17718,6 @@ target_include_directories(nanopb_fuzzer_serverlist_test_one_entry ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -19330,10 +17746,6 @@ target_include_directories(percent_decode_fuzzer_one_entry ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -19362,10 +17774,6 @@ target_include_directories(percent_encode_fuzzer_one_entry ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -19394,10 +17802,6 @@ target_include_directories(server_fuzzer_one_entry ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -19426,10 +17830,6 @@ target_include_directories(ssl_server_fuzzer_one_entry ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -19458,10 +17858,6 @@ target_include_directories(uri_fuzzer_test_one_entry ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} diff --git a/cmake/benchmark.cmake b/cmake/benchmark.cmake index 646f0a6d429..7bfc69f8181 100644 --- a/cmake/benchmark.cmake +++ b/cmake/benchmark.cmake @@ -21,7 +21,6 @@ if(gRPC_BENCHMARK_PROVIDER STREQUAL "module") add_subdirectory(${BENCHMARK_ROOT_DIR} third_party/benchmark) if(TARGET benchmark) set(_gRPC_BENCHMARK_LIBRARIES benchmark) - set(_gRPC_BENCHMARK_INCLUDE_DIR "${BENCHMARK_ROOT_DIR}/include") endif() else() message(WARNING "gRPC_BENCHMARK_PROVIDER is \"module\" but BENCHMARK_ROOT_DIR is wrong") @@ -31,8 +30,6 @@ elseif(gRPC_BENCHMARK_PROVIDER STREQUAL "package") find_package(benchmark REQUIRED CONFIG) if(TARGET benchmark::benchmark) set(_gRPC_BENCHMARK_LIBRARIES benchmark::benchmark) - # extract the include dir from target's properties - get_target_property(_gRPC_BENCHMARK_INCLUDE_DIR benchmark::benchmark INTERFACE_INCLUDE_DIRECTORIES) endif() set(_gRPC_FIND_BENCHMARK "if(NOT benchmark_FOUND)\n find_package(benchmark CONFIG)\nendif()") endif() diff --git a/cmake/cares.cmake b/cmake/cares.cmake index fb545083e1e..cf7d74cc0fc 100644 --- a/cmake/cares.cmake +++ b/cmake/cares.cmake @@ -26,7 +26,6 @@ if(gRPC_CARES_PROVIDER STREQUAL "module") if(TARGET c-ares) set(_gRPC_CARES_LIBRARIES c-ares) - set(_gRPC_CARES_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party/cares/cares" "${CMAKE_CURRENT_BINARY_DIR}/third_party/cares/cares") endif() if(gRPC_INSTALL) @@ -38,7 +37,6 @@ elseif(gRPC_CARES_PROVIDER STREQUAL "package") find_package(c-ares REQUIRED CONFIG) if(TARGET c-ares::cares) set(_gRPC_CARES_LIBRARIES c-ares::cares) - set(_gRPC_CARES_INCLUDE_DIR ${c-ares_INCLUDE_DIR}) endif() set(_gRPC_FIND_CARES "if(NOT c-ares_FOUND)\n find_package(c-ares CONFIG)\nendif()") endif() diff --git a/cmake/gflags.cmake b/cmake/gflags.cmake index aba691a2e02..820f84a1a20 100644 --- a/cmake/gflags.cmake +++ b/cmake/gflags.cmake @@ -19,7 +19,6 @@ if(gRPC_GFLAGS_PROVIDER STREQUAL "module") if(EXISTS "${GFLAGS_ROOT_DIR}/CMakeLists.txt") add_subdirectory(${GFLAGS_ROOT_DIR} third_party/gflags) set(_gRPC_GFLAGS_LIBRARIES gflags::gflags) - set(_gRPC_GFLAGS_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/third_party/gflags/include") else() message(WARNING "gRPC_GFLAGS_PROVIDER is \"module\" but GFLAGS_ROOT_DIR is wrong") endif() @@ -28,7 +27,6 @@ elseif(gRPC_GFLAGS_PROVIDER STREQUAL "package") find_package(gflags REQUIRED CONFIG) if(TARGET gflags::gflags) set(_gRPC_GFLAGS_LIBRARIES gflags::gflags) - set(_gRPC_GFLAGS_INCLUDE_DIR ${GFLAGS_INCLUDE_DIR}) endif() set(_gRPC_FIND_GFLAGS "if(NOT gflags_FOUND)\n find_package(gflags CONFIG)\nendif()") endif() diff --git a/cmake/protobuf.cmake b/cmake/protobuf.cmake index de6c6e72491..df88fddba8c 100644 --- a/cmake/protobuf.cmake +++ b/cmake/protobuf.cmake @@ -41,7 +41,6 @@ if(gRPC_PROTOBUF_PROVIDER STREQUAL "module") set(_gRPC_PROTOBUF_PROTOC protoc) set(_gRPC_PROTOBUF_PROTOC_EXECUTABLE $) endif() - set(_gRPC_PROTOBUF_INCLUDE_DIR "${PROTOBUF_ROOT_DIR}") # For well-known .proto files distributed with protobuf set(_gRPC_PROTOBUF_WELLKNOWN_INCLUDE_DIR "${PROTOBUF_ROOT_DIR}/src") else() @@ -79,7 +78,6 @@ elseif(gRPC_PROTOBUF_PROVIDER STREQUAL "package") set(_gRPC_PROTOBUF_PROTOC ${PROTOBUF_PROTOC_EXECUTABLE}) set(_gRPC_PROTOBUF_PROTOC_EXECUTABLE ${PROTOBUF_PROTOC_EXECUTABLE}) endif() - set(_gRPC_PROTOBUF_INCLUDE_DIR ${PROTOBUF_INCLUDE_DIRS}) set(_gRPC_FIND_PROTOBUF "if(NOT Protobuf_FOUND AND NOT PROTOBUF_FOUND)\n find_package(Protobuf ${gRPC_PROTOBUF_PACKAGE_TYPE})\nendif()") endif() endif() diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template index 0756e8db917..2a1160faaee 100644 --- a/templates/CMakeLists.txt.template +++ b/templates/CMakeLists.txt.template @@ -484,10 +484,6 @@ PRIVATE <%text>${CMAKE_CURRENT_SOURCE_DIR} <%text>${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - <%text>${_gRPC_BENCHMARK_INCLUDE_DIR} - <%text>${_gRPC_CARES_INCLUDE_DIR} - <%text>${_gRPC_GFLAGS_INCLUDE_DIR} - <%text>${_gRPC_PROTOBUF_INCLUDE_DIR} <%text>${_gRPC_SSL_INCLUDE_DIR} <%text>${_gRPC_UPB_GENERATED_DIR} <%text>${_gRPC_UPB_GRPC_GENERATED_DIR} @@ -567,10 +563,6 @@ <%text>${CMAKE_CURRENT_SOURCE_DIR} <%text>${CMAKE_CURRENT_SOURCE_DIR}/include <%text>${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - <%text>${_gRPC_BENCHMARK_INCLUDE_DIR} - <%text>${_gRPC_CARES_INCLUDE_DIR} - <%text>${_gRPC_GFLAGS_INCLUDE_DIR} - <%text>${_gRPC_PROTOBUF_INCLUDE_DIR} <%text>${_gRPC_SSL_INCLUDE_DIR} <%text>${_gRPC_UPB_GENERATED_DIR} <%text>${_gRPC_UPB_GRPC_GENERATED_DIR} From 294aecfed6b244e414cbdb21687fd67c247e5d6a Mon Sep 17 00:00:00 2001 From: Yihua Zhang Date: Sun, 3 Nov 2019 09:33:06 -0800 Subject: [PATCH 055/133] add more documentation on local credentials --- src/python/grpcio/grpc/__init__.py | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/src/python/grpcio/grpc/__init__.py b/src/python/grpcio/grpc/__init__.py index c8d1e92edfb..876b96f941a 100644 --- a/src/python/grpcio/grpc/__init__.py +++ b/src/python/grpcio/grpc/__init__.py @@ -1765,11 +1765,18 @@ def local_channel_credentials(local_connect_type=LocalConnectionType.LOCAL_TCP): This is an EXPERIMENTAL API. Local credentials are used by local TCP endpoints (e.g. localhost:10000) - also UDS connections. It allows them to create secure channel, hence - transmitting call credentials become possible. + also UDS connections. - It is useful for 1) eliminating insecure_channel usage; 2) enable unit - testing for call credentials without setting up secrets. + The connections created by local channel credentials are not + encrypted, but will be checked if they are local or not. + The UDS connections are considered secure by providing peer authentication + and data confidentiality while TCP connections are considered insecure. + + It is allowed to transmit call credentials over connections created by + local channel credentials. + + Local channel credentials are useful for 1) eliminating insecure_channel usage; + 2) enable unit testing for call credentials without setting up secrets. Args: local_connect_type: Local connection type (either @@ -1788,11 +1795,18 @@ def local_server_credentials(local_connect_type=LocalConnectionType.LOCAL_TCP): This is an EXPERIMENTAL API. Local credentials are used by local TCP endpoints (e.g. localhost:10000) - also UDS connections. It allows them to create secure channel, hence - transmitting call credentials become possible. + also UDS connections. + + The connections created by local server credentials are not + encrypted, but will be checked if they are local or not. + The UDS connections are considered secure by providing peer authentication + and data confidentiality while TCP connections are considered insecure. + + It is allowed to transmit call credentials over connections created by local + server credentials. - It is useful for 1) eliminating insecure_channel usage; 2) enable unit - testing for call credentials without setting up secrets. + Local server credentials are useful for 1) eliminating insecure_channel usage; + 2) enable unit testing for call credentials without setting up secrets. Args: local_connect_type: Local connection type (either From f43cb1a2a174840834a41240a9c1c8efd5d62d7a Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Mon, 4 Nov 2019 08:49:18 -0800 Subject: [PATCH 056/133] Update by review --- test/distrib/cpp/run_distrib_test_cmake.bat | 4 ++++ test/distrib/cpp/run_distrib_test_cmake.sh | 17 +++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/test/distrib/cpp/run_distrib_test_cmake.bat b/test/distrib/cpp/run_distrib_test_cmake.bat index 041803663ea..48d510100e2 100644 --- a/test/distrib/cpp/run_distrib_test_cmake.bat +++ b/test/distrib/cpp/run_distrib_test_cmake.bat @@ -50,6 +50,10 @@ cmake -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% ..\.. cmake --build . --config Release --target install || goto :error popd +@rem Just before installing gRPC, wipe out contents of all the submodules to simulate +@rem a standalone build from an archive +git submodule deinit --all --force + @rem Install gRPC mkdir cmake\build pushd cmake\build diff --git a/test/distrib/cpp/run_distrib_test_cmake.sh b/test/distrib/cpp/run_distrib_test_cmake.sh index c1bd4c4c227..457b65ffcb3 100755 --- a/test/distrib/cpp/run_distrib_test_cmake.sh +++ b/test/distrib/cpp/run_distrib_test_cmake.sh @@ -24,19 +24,22 @@ apt-get update apt-get install -t jessie-backports -y libssl-dev # Install c-ares -mkdir -p "third_party/cares/cares/cmake/build" && pushd "$_" +mkdir -p "third_party/cares/cares/cmake/build" +pushd "third_party/cares/cares/cmake/build" cmake -DCMAKE_BUILD_TYPE=Release ../.. make -j4 install popd # Install protobuf -mkdir -p "third_party/protobuf/cmake/build" && pushd "$_" +mkdir -p "third_party/protobuf/cmake/build" +pushd "third_party/protobuf/cmake/build" cmake -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release .. make -j4 install popd # Install zlib -mkdir -p "third_party/zlib/cmake/build" && pushd "$_" +mkdir -p "third_party/zlib/cmake/build" +pushd "third_party/zlib/cmake/build" cmake -DCMAKE_BUILD_TYPE=Release ../.. make -j4 install popd @@ -47,7 +50,8 @@ popd git submodule foreach 'cd $toplevel; rm -rf $name' # Install gRPC -mkdir -p "cmake/build" && pushd "$_" +mkdir -p "cmake/build" +pushd "cmake/build" cmake \ -DCMAKE_BUILD_TYPE=Release \ -DgRPC_INSTALL=ON \ @@ -56,12 +60,13 @@ cmake \ -DgRPC_PROTOBUF_PROVIDER=package \ -DgRPC_SSL_PROVIDER=package \ -DgRPC_ZLIB_PROVIDER=package \ -../.. + ../.. make -j4 install popd # Build helloworld example using cmake -mkdir -p "examples/cpp/helloworld/cmake/build" && pushd "$_" +mkdir -p "examples/cpp/helloworld/cmake/build" +pushd "examples/cpp/helloworld/cmake/build" cmake ../.. make popd From a416a20d0ef39dbc1ed95c2aa9d91b0a1b256418 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Mon, 4 Nov 2019 09:18:48 -0800 Subject: [PATCH 057/133] Update by review --- test/distrib/cpp/run_distrib_test_cmake_pkgconfig.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/test/distrib/cpp/run_distrib_test_cmake_pkgconfig.sh b/test/distrib/cpp/run_distrib_test_cmake_pkgconfig.sh index 90fd8cd96ce..6f98f3e72c4 100755 --- a/test/distrib/cpp/run_distrib_test_cmake_pkgconfig.sh +++ b/test/distrib/cpp/run_distrib_test_cmake_pkgconfig.sh @@ -24,19 +24,22 @@ apt-get update apt-get install -t jessie-backports -y libssl-dev pkg-config # Install c-ares -mkdir -p "third_party/cares/cares/cmake/build" && pushd "$_" +mkdir -p "third_party/cares/cares/cmake/build" +pushd "third_party/cares/cares/cmake/build" cmake -DCMAKE_BUILD_TYPE=Release ../.. make -j4 install popd # Install protobuf -mkdir -p "third_party/protobuf/cmake/build" && pushd "$_" +mkdir -p "third_party/protobuf/cmake/build" +pushd "third_party/protobuf/cmake/build" cmake -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release .. make -j4 install popd # Install zlib -mkdir -p "third_party/zlib/cmake/build" && pushd "$_" +mkdir -p "third_party/zlib/cmake/build" +pushd "third_party/zlib/cmake/build" cmake -DCMAKE_BUILD_TYPE=Release ../.. make -j4 install popd @@ -47,7 +50,8 @@ popd git submodule foreach 'cd $toplevel; rm -rf $name' # Install gRPC -mkdir -p "cmake/build" && pushd "$_" +mkdir -p "cmake/build" +pushd "cmake/build" cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local/grpc \ From cf02badf87fce456f07c919bfe13fc66194e18cf Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Mon, 4 Nov 2019 10:41:11 -0800 Subject: [PATCH 058/133] Make PyLint happy --- src/python/grpcio_tests/tests/unit/_grpc_shutdown_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python/grpcio_tests/tests/unit/_grpc_shutdown_test.py b/src/python/grpcio_tests/tests/unit/_grpc_shutdown_test.py index 969dc284d16..1c4890b97f1 100644 --- a/src/python/grpcio_tests/tests/unit/_grpc_shutdown_test.py +++ b/src/python/grpcio_tests/tests/unit/_grpc_shutdown_test.py @@ -27,7 +27,7 @@ class GrpcShutdownTest(unittest.TestCase): def test_channel_close_with_connectivity_watcher(self): """Originated by https://github.com/grpc/grpc/issues/20299. - + The grpc_shutdown happens synchronously, but there might be Core object references left in Cython which might lead to ABORT or SIGSEGV. """ From 1f3675005d7ebec0ea5508af3d1280a3ee3cf1e4 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Mon, 4 Nov 2019 10:47:35 -0800 Subject: [PATCH 059/133] Disable StrictRealTimeTest for gevent --- src/python/grpcio_tests/commands.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/python/grpcio_tests/commands.py b/src/python/grpcio_tests/commands.py index 301a2bea23b..98b0312b404 100644 --- a/src/python/grpcio_tests/commands.py +++ b/src/python/grpcio_tests/commands.py @@ -188,6 +188,7 @@ class TestGevent(setuptools.Command): 'unit._cython._channel_test.ChannelTest.test_negative_deadline_connectivity', # TODO(https://github.com/grpc/grpc/issues/15411) enable this test 'unit._local_credentials_test.LocalCredentialsTest', + 'testing._time_test.StrictRealTimeTest', ) BANNED_WINDOWS_TESTS = ( # TODO(https://github.com/grpc/grpc/pull/15411) enable this test From 57c0ac011d26c874d13c728e59dee61949b21506 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Mon, 4 Nov 2019 10:49:37 -0800 Subject: [PATCH 060/133] Reviewer comments --- .../filters/client_channel/client_channel.cc | 1 + src/core/lib/iomgr/call_combiner.h | 2 +- src/core/lib/iomgr/exec_ctx.cc | 40 +++++++++---------- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc index a8395d8d504..ed61537cb03 100644 --- a/src/core/ext/filters/client_channel/client_channel.cc +++ b/src/core/ext/filters/client_channel/client_channel.cc @@ -2059,6 +2059,7 @@ void CallData::Destroy(grpc_call_element* elem, then_schedule_closure = nullptr; } calld->~CallData(); + // TODO(yashkt) : This can potentially be a Closure::Run ExecCtx::Run(DEBUG_LOCATION, then_schedule_closure, GRPC_ERROR_NONE); } diff --git a/src/core/lib/iomgr/call_combiner.h b/src/core/lib/iomgr/call_combiner.h index c440241d0da..d3f43cf547f 100644 --- a/src/core/lib/iomgr/call_combiner.h +++ b/src/core/lib/iomgr/call_combiner.h @@ -157,7 +157,7 @@ class CallCombinerClosureList { // // All but one of the closures in the list will be scheduled via // GRPC_CALL_COMBINER_START(), and the remaining closure will be - // scheduled via ExecCtx::Run(DEBUG_LOCATION,), which will eventually result + // scheduled via ExecCtx::Run(), which will eventually result // in yielding the call combiner. If the list is empty, then the call // combiner will be yielded immediately. void RunClosures(CallCombiner* call_combiner) { diff --git a/src/core/lib/iomgr/exec_ctx.cc b/src/core/lib/iomgr/exec_ctx.cc index 9a5ad6eee0a..5c40c00d49c 100644 --- a/src/core/lib/iomgr/exec_ctx.cc +++ b/src/core/lib/iomgr/exec_ctx.cc @@ -176,28 +176,28 @@ grpc_millis ExecCtx::Now() { void ExecCtx::Run(const DebugLocation& location, grpc_closure* closure, grpc_error* error) { - if (closure != nullptr) { -#ifndef NDEBUG - if (closure->scheduled) { - gpr_log(GPR_ERROR, - "Closure already scheduled. (closure: %p, created: [%s:%d], " - "previously scheduled at: [%s: %d], newly scheduled at [%s: %d], " - "run?: %s", - closure, closure->file_created, closure->line_created, - closure->file_initiated, closure->line_initiated, location.file(), - location.line(), closure->run ? "true" : "false"); - abort(); - } - closure->scheduled = true; - closure->file_initiated = location.file(); - closure->line_initiated = location.line(); - closure->run = false; - GPR_ASSERT(closure->cb != nullptr); -#endif - exec_ctx_sched(closure, error); - } else { + if (closure == nullptr) { GRPC_ERROR_UNREF(error); + return; } +#ifndef NDEBUG + if (closure->scheduled) { + gpr_log(GPR_ERROR, + "Closure already scheduled. (closure: %p, created: [%s:%d], " + "previously scheduled at: [%s: %d], newly scheduled at [%s: %d], " + "run?: %s", + closure, closure->file_created, closure->line_created, + closure->file_initiated, closure->line_initiated, location.file(), + location.line(), closure->run ? "true" : "false"); + abort(); + } + closure->scheduled = true; + closure->file_initiated = location.file(); + closure->line_initiated = location.line(); + closure->run = false; + GPR_ASSERT(closure->cb != nullptr); +#endif + exec_ctx_sched(closure, error); } } // namespace grpc_core From 54399447324427c638e0ecb95c0cbe941a6df5e3 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Mon, 4 Nov 2019 11:43:24 -0800 Subject: [PATCH 061/133] Revert "Fix error object memory leak in GetSystemRootCerts" --- .../lib/security/security_connector/load_system_roots_linux.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/src/core/lib/security/security_connector/load_system_roots_linux.cc b/src/core/lib/security/security_connector/load_system_roots_linux.cc index d568d1f3ad2..61b0b9be5b9 100644 --- a/src/core/lib/security/security_connector/load_system_roots_linux.cc +++ b/src/core/lib/security/security_connector/load_system_roots_linux.cc @@ -69,7 +69,6 @@ grpc_slice GetSystemRootCerts() { } else { GRPC_ERROR_UNREF(error); } - GRPC_ERROR_UNREF(error); } return grpc_empty_slice(); } From f7249fcd3accbc001e45d7dca36fcaad2e70b96a Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Mon, 4 Nov 2019 13:44:39 -0800 Subject: [PATCH 062/133] Adopt reviewer's advice --- src/python/grpcio/grpc/_channel.py | 24 ++++----- .../tests/unit/_interceptor_test.py | 54 +++++++++++++++---- 2 files changed, 53 insertions(+), 25 deletions(-) diff --git a/src/python/grpcio/grpc/_channel.py b/src/python/grpcio/grpc/_channel.py index fb25d91e401..4044228bbb8 100644 --- a/src/python/grpcio/grpc/_channel.py +++ b/src/python/grpcio/grpc/_channel.py @@ -13,6 +13,7 @@ # limitations under the License. """Invocation-side implementation of gRPC Python.""" +import copy import functools import logging import sys @@ -266,27 +267,20 @@ def _rpc_state_string(class_name, rpc_state): class _RpcError(grpc.RpcError, grpc.Call, grpc.Future): """An RPC error not tied to the execution of a particular RPC. - The state passed to _RpcError must be guaranteed not to be accessed by any - other threads. - - The RPC represented by the state object must not be in-progress. + The RPC represented by the state object must not be in-progress or + cancelled. Attributes: _state: An instance of _RPCState. """ def __init__(self, state): - if state.cancelled: - raise ValueError( - "Cannot instantiate an _RpcError for a cancelled RPC.") - if state.code is grpc.StatusCode.OK: - raise ValueError( - "Cannot instantiate an _RpcError for a successfully completed RPC." - ) - if state.code is None: - raise ValueError( - "Cannot instantiate an _RpcError for an incomplete RPC.") - self._state = state + with state.condition: + self._state = _RPCState((), copy.deepcopy(state.initial_metadata), + copy.deepcopy(state.trailing_metadata), + state.code, copy.deepcopy(state.details)) + self._state.response = copy.copy(state.response) + self._state.debug_error_string = copy.copy(state.debug_error_string) def initial_metadata(self): return self._state.initial_metadata diff --git a/src/python/grpcio_tests/tests/unit/_interceptor_test.py b/src/python/grpcio_tests/tests/unit/_interceptor_test.py index 5a6434e987e..6da3d53816a 100644 --- a/src/python/grpcio_tests/tests/unit/_interceptor_test.py +++ b/src/python/grpcio_tests/tests/unit/_interceptor_test.py @@ -40,6 +40,10 @@ _STREAM_UNARY = '/test/StreamUnary' _STREAM_STREAM = '/test/StreamStream' +class _ApplicationErrorStandin(Exception): + pass + + class _Callback(object): def __init__(self): @@ -73,12 +77,12 @@ class _Handler(object): 'testvalue', ),)) if request == _EXCEPTION_REQUEST: - raise RuntimeError() + raise _ApplicationErrorStandin() return request def handle_unary_stream(self, request, servicer_context): if request == _EXCEPTION_REQUEST: - raise RuntimeError() + raise _ApplicationErrorStandin() for _ in range(test_constants.STREAM_LENGTH): self._control.control() yield request @@ -104,7 +108,7 @@ class _Handler(object): 'testvalue', ),)) if _EXCEPTION_REQUEST in response_elements: - raise RuntimeError() + raise _ApplicationErrorStandin() return b''.join(response_elements) def handle_stream_stream(self, request_iterator, servicer_context): @@ -116,7 +120,7 @@ class _Handler(object): ),)) for request in request_iterator: if request == _EXCEPTION_REQUEST: - raise RuntimeError() + raise _ApplicationErrorStandin() self._control.control() yield request self._control.control() @@ -245,10 +249,12 @@ class _LoggingInterceptor( result = continuation(client_call_details, request) assert isinstance( result, - grpc.Call), '{} is not an instance of grpc.Call'.format(result) + grpc.Call), '{} ({}) is not an instance of grpc.Call'.format( + result, type(result)) assert isinstance( result, - grpc.Future), '{} is not an instance of grpc.Future'.format(result) + grpc.Future), '{} ({}) is not an instance of grpc.Future'.format( + result, type(result)) return result def intercept_unary_stream(self, continuation, client_call_details, @@ -476,11 +482,18 @@ class InterceptorTest(unittest.TestCase): 'c2', self._record)) multi_callable = _unary_unary_multi_callable(channel) - with self.assertRaises(grpc.RpcError): + with self.assertRaises(grpc.RpcError) as exception_context: multi_callable( request, metadata=(('test', 'InterceptedUnaryRequestBlockingUnaryResponse'),)) + exception = exception_context.exception + self.assertFalse(exception.cancelled()) + self.assertFalse(exception.running()) + self.assertTrue(exception.done()) + with self.assertRaises(grpc.RpcError): + exception.result() + self.assertIsInstance(exception.exception(), grpc.RpcError) def testInterceptedUnaryRequestBlockingUnaryResponseWithCall(self): request = b'\x07\x08' @@ -561,8 +574,15 @@ class InterceptorTest(unittest.TestCase): response_iterator = multi_callable( request, metadata=(('test', 'InterceptedUnaryRequestStreamResponse'),)) - with self.assertRaises(grpc.RpcError): + with self.assertRaises(grpc.RpcError) as exception_context: tuple(response_iterator) + exception = exception_context.exception + self.assertFalse(exception.cancelled()) + self.assertFalse(exception.running()) + self.assertTrue(exception.done()) + with self.assertRaises(grpc.RpcError): + exception.result() + self.assertIsInstance(exception.exception(), grpc.RpcError) def testInterceptedStreamRequestBlockingUnaryResponse(self): requests = tuple( @@ -650,8 +670,15 @@ class InterceptorTest(unittest.TestCase): response_future = multi_callable.future( request_iterator, metadata=(('test', 'InterceptedStreamRequestFutureUnaryResponse'),)) - with self.assertRaises(grpc.RpcError): + with self.assertRaises(grpc.RpcError) as exception_context: response_future.result() + exception = exception_context.exception + self.assertFalse(exception.cancelled()) + self.assertFalse(exception.running()) + self.assertTrue(exception.done()) + with self.assertRaises(grpc.RpcError): + exception.result() + self.assertIsInstance(exception.exception(), grpc.RpcError) def testInterceptedStreamRequestStreamResponse(self): requests = tuple( @@ -692,8 +719,15 @@ class InterceptorTest(unittest.TestCase): response_iterator = multi_callable( request_iterator, metadata=(('test', 'InterceptedStreamRequestStreamResponse'),)) - with self.assertRaises(grpc.RpcError): + with self.assertRaises(grpc.RpcError) as exception_context: tuple(response_iterator) + exception = exception_context.exception + self.assertFalse(exception.cancelled()) + self.assertFalse(exception.running()) + self.assertTrue(exception.done()) + with self.assertRaises(grpc.RpcError): + exception.result() + self.assertIsInstance(exception.exception(), grpc.RpcError) if __name__ == '__main__': From 4c8935761d1ab510922f15dd334f523a4d8d1f24 Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Mon, 4 Nov 2019 14:02:30 -0800 Subject: [PATCH 063/133] Add wrapper layer for Blaze --- bazel/custom_exec_properties.bzl | 18 ++++++++++++++++++ test/core/gprpp/BUILD | 2 +- test/core/iomgr/BUILD | 2 +- test/cpp/qps/BUILD | 2 +- 4 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 bazel/custom_exec_properties.bzl diff --git a/bazel/custom_exec_properties.bzl b/bazel/custom_exec_properties.bzl new file mode 100644 index 00000000000..f03ef859a79 --- /dev/null +++ b/bazel/custom_exec_properties.bzl @@ -0,0 +1,18 @@ +# Copyright 2019 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. + + +load("@grpc_custom_exec_properties//:constants.bzl", _LARGE_MACHINE = "LARGE_MACHINE") + +LARGE_MACHINE = _LARGE_MACHINE diff --git a/test/core/gprpp/BUILD b/test/core/gprpp/BUILD index c0d3d0d275e..5f9004f68f2 100644 --- a/test/core/gprpp/BUILD +++ b/test/core/gprpp/BUILD @@ -13,7 +13,7 @@ # limitations under the License. load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") -load("@grpc_custom_exec_properties//:constants.bzl", "LARGE_MACHINE") +load("//bazel:custom_exec_properties.bzl", "LARGE_MACHINE") licenses(["notice"]) # Apache v2 diff --git a/test/core/iomgr/BUILD b/test/core/iomgr/BUILD index 6ebca950988..79abf52df2d 100644 --- a/test/core/iomgr/BUILD +++ b/test/core/iomgr/BUILD @@ -13,7 +13,7 @@ # limitations under the License. load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") -load("@grpc_custom_exec_properties//:constants.bzl", "LARGE_MACHINE") +load("//bazel:custom_exec_properties.bzl", "LARGE_MACHINE") licenses(["notice"]) # Apache v2 diff --git a/test/cpp/qps/BUILD b/test/cpp/qps/BUILD index 1b8fe306a1b..25e15d6e54d 100644 --- a/test/cpp/qps/BUILD +++ b/test/cpp/qps/BUILD @@ -16,7 +16,7 @@ licenses(["notice"]) # Apache v2 load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_cc_library", "grpc_cc_binary", "grpc_package") load("//test/cpp/qps:qps_benchmark_script.bzl", "qps_json_driver_batch", "json_run_localhost_batch") -load("@grpc_custom_exec_properties//:constants.bzl", "LARGE_MACHINE") +load("//bazel:custom_exec_properties.bzl", "LARGE_MACHINE") grpc_package(name = "test/cpp/qps") From 403db61a58f6c08eb6adbdb588050c93ae69f1d7 Mon Sep 17 00:00:00 2001 From: Pau Freixes Date: Mon, 4 Nov 2019 23:04:56 +0100 Subject: [PATCH 064/133] AIO Unified call interface Call interface, implemented by the new `grpc.experimental.aio.Call` object is the unique entry point for handling RPC calls and is the one returned by, for now, the `unary_unary` method. It supports all in one the three interfaces `with_call`, `__call__` and `future` implemented by the synchronous API. --- src/python/grpcio/grpc/_cython/BUILD.bazel | 2 + .../grpc/_cython/_cygrpc/aio/call.pxd.pxi | 5 +- .../grpc/_cython/_cygrpc/aio/call.pyx.pxi | 38 ++- .../_cython/_cygrpc/aio/cancel_status.pxd.pxi | 23 ++ .../_cython/_cygrpc/aio/cancel_status.pyx.pxi | 36 +++ .../grpc/_cython/_cygrpc/aio/channel.pyx.pxi | 4 +- .../_cython/_cygrpc/aio/rpc_error.pyx.pxi | 2 +- .../grpc/_cython/_cygrpc/aio/server.pyx.pxi | 4 +- src/python/grpcio/grpc/_cython/cygrpc.pxd | 1 + src/python/grpcio/grpc/_cython/cygrpc.pyx | 1 + .../grpcio/grpc/experimental/BUILD.bazel | 1 + .../grpcio/grpc/experimental/aio/__init__.py | 42 +-- .../grpcio/grpc/experimental/aio/_call.py | 262 ++++++++++++++++++ .../grpcio/grpc/experimental/aio/_channel.py | 29 +- src/python/grpcio_tests/tests_aio/tests.json | 3 +- .../tests_aio/unit/_test_server.py | 4 - .../grpcio_tests/tests_aio/unit/call_test.py | 196 +++++++++++++ .../tests_aio/unit/channel_test.py | 21 +- .../grpcio_tests/tests_aio/unit/init_test.py | 44 +-- .../tests_aio/unit/server_test.py | 3 - 20 files changed, 594 insertions(+), 127 deletions(-) create mode 100644 src/python/grpcio/grpc/_cython/_cygrpc/aio/cancel_status.pxd.pxi create mode 100644 src/python/grpcio/grpc/_cython/_cygrpc/aio/cancel_status.pyx.pxi create mode 100644 src/python/grpcio/grpc/experimental/aio/_call.py create mode 100644 src/python/grpcio_tests/tests_aio/unit/call_test.py diff --git a/src/python/grpcio/grpc/_cython/BUILD.bazel b/src/python/grpcio/grpc/_cython/BUILD.bazel index 3a355527a00..7212ceec4be 100644 --- a/src/python/grpcio/grpc/_cython/BUILD.bazel +++ b/src/python/grpcio/grpc/_cython/BUILD.bazel @@ -13,6 +13,8 @@ pyx_library( "_cygrpc/aio/rpc_error.pxd.pxi", "_cygrpc/aio/rpc_error.pyx.pxi", "_cygrpc/aio/callbackcontext.pxd.pxi", + "_cygrpc/aio/cancel_status.pxd.pxi", + "_cygrpc/aio/cancel_status.pyx.pxi", "_cygrpc/aio/channel.pxd.pxi", "_cygrpc/aio/channel.pyx.pxi", "_cygrpc/aio/grpc_aio.pxd.pxi", diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/call.pxd.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/call.pxd.pxi index 1166551fd5c..687c5999d0b 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/call.pxd.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/call.pxd.pxi @@ -20,8 +20,9 @@ cdef class _AioCall: grpc_completion_queue * _cq grpc_experimental_completion_queue_functor _functor object _waiter_call + list _references @staticmethod - cdef void functor_run(grpc_experimental_completion_queue_functor* functor, int succeed) + cdef void functor_run(grpc_experimental_completion_queue_functor* functor, int success) with gil @staticmethod - cdef void watcher_call_functor_run(grpc_experimental_completion_queue_functor* functor, int succeed) + cdef void watcher_call_functor_run(grpc_experimental_completion_queue_functor* functor, int success) with gil diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/call.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/call.pyx.pxi index d758c1eedcb..0ce716a9d6e 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/call.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/call.pyx.pxi @@ -34,6 +34,7 @@ cdef class _AioCall: self._watcher_call.functor.functor_run = _AioCall.watcher_call_functor_run self._watcher_call.waiter = self self._waiter_call = None + self._references = [] def __dealloc__(self): grpc_completion_queue_shutdown(self._cq) @@ -45,21 +46,20 @@ cdef class _AioCall: return f"<{class_name} {id_}>" @staticmethod - cdef void functor_run(grpc_experimental_completion_queue_functor* functor, int succeed): + cdef void functor_run(grpc_experimental_completion_queue_functor* functor, int success) with gil: pass @staticmethod - cdef void watcher_call_functor_run(grpc_experimental_completion_queue_functor* functor, int succeed): + cdef void watcher_call_functor_run(grpc_experimental_completion_queue_functor* functor, int success) with gil: call = <_AioCall>(functor).waiter - assert call._waiter_call + if not call._waiter_call.done(): + if success == 0: + call._waiter_call.set_exception(Exception("Some error occurred")) + else: + call._waiter_call.set_result(None) - if succeed == 0: - call._waiter_call.set_exception(Exception("Some error occurred")) - else: - call._waiter_call.set_result(None) - - async def unary_unary(self, method, request, timeout): + async def unary_unary(self, bytes method, bytes request, object timeout, AioCancelStatus cancel_status): cdef grpc_call * call cdef grpc_slice method_slice cdef grpc_op * ops @@ -73,6 +73,7 @@ cdef class _AioCall: cdef grpc_call_error call_status cdef gpr_timespec deadline = _timespec_from_time(timeout) + cdef char *c_details = NULL method_slice = grpc_slice_from_copied_buffer( method, @@ -133,8 +134,21 @@ cdef class _AioCall: self._waiter_call = None raise Exception("Error with grpc_call_start_batch {}".format(call_status)) - await self._waiter_call - + try: + await self._waiter_call + except asyncio.CancelledError: + if cancel_status: + details = str_to_bytes(cancel_status.details()) + self._references.append(details) + c_details = details + call_status = grpc_call_cancel_with_status( + call, cancel_status.code(), c_details, NULL) + else: + call_status = grpc_call_cancel( + call, NULL) + if call_status != GRPC_CALL_OK: + raise Exception("RPC call couldn't be cancelled. Error {}".format(call_status)) + raise finally: initial_metadata_operation.un_c() send_message_operation.un_c() @@ -149,7 +163,7 @@ cdef class _AioCall: if receive_status_on_client_operation.code() == StatusCode.ok: return receive_message_operation.message() - raise grpc.experimental.aio.AioRpcError( + raise AioRpcError( receive_initial_metadata_operation.initial_metadata(), receive_status_on_client_operation.code(), receive_status_on_client_operation.details(), diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/cancel_status.pxd.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/cancel_status.pxd.pxi new file mode 100644 index 00000000000..47670e5deb1 --- /dev/null +++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/cancel_status.pxd.pxi @@ -0,0 +1,23 @@ +# Copyright 2019 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. +"""Desired cancellation status for canceling an ongoing RPC calls.""" + + +cdef class AioCancelStatus: + cdef readonly: + object _code + str _details + + cpdef object code(self) + cpdef str details(self) diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/cancel_status.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/cancel_status.pyx.pxi new file mode 100644 index 00000000000..e2026458e3c --- /dev/null +++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/cancel_status.pyx.pxi @@ -0,0 +1,36 @@ +# Copyright 2019 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. +"""Desired cancellation status for canceling an ongoing RPC call.""" + + +cdef class AioCancelStatus: + + def __cinit__(self): + self._code = None + self._details = None + + def __len__(self): + if self._code is None: + return 0 + return 1 + + def cancel(self, grpc_status_code code, str details=None): + self._code = code + self._details = details + + cpdef object code(self): + return self._code + + cpdef str details(self): + return self._details diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/channel.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/channel.pyx.pxi index cbcd4553864..526dade7f51 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/channel.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/channel.pyx.pxi @@ -25,6 +25,6 @@ cdef class AioChannel: def close(self): grpc_channel_destroy(self.channel) - async def unary_unary(self, method, request, timeout): + async def unary_unary(self, method, request, timeout, cancel_status): call = _AioCall(self) - return await call.unary_unary(method, request, timeout) + return await call.unary_unary(method, request, timeout, cancel_status) diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/rpc_error.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/rpc_error.pyx.pxi index 95b9144eff9..ca8a584d7a7 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/rpc_error.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/rpc_error.pyx.pxi @@ -14,7 +14,7 @@ """Exceptions for the aio version of the RPC calls.""" -cdef class _AioRpcError(Exception): +cdef class AioRpcError(Exception): def __cinit__(self, tuple initial_metadata, int code, str details, tuple trailing_metadata): self._initial_metadata = initial_metadata diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi index 5bab542f467..dd6ff8b29d8 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi @@ -35,9 +35,9 @@ cdef class CallbackWrapper: @staticmethod cdef void functor_run( grpc_experimental_completion_queue_functor* functor, - int succeed): + int success): cdef CallbackContext *context = functor - if succeed == 0: + if success == 0: (context.waiter).set_exception(RuntimeError()) else: (context.waiter).set_result(None) diff --git a/src/python/grpcio/grpc/_cython/cygrpc.pxd b/src/python/grpcio/grpc/_cython/cygrpc.pxd index b0a2033cc40..9ab15528a6b 100644 --- a/src/python/grpcio/grpc/_cython/cygrpc.pxd +++ b/src/python/grpcio/grpc/_cython/cygrpc.pxd @@ -46,5 +46,6 @@ include "_cygrpc/aio/iomgr/resolver.pxd.pxi" include "_cygrpc/aio/grpc_aio.pxd.pxi" include "_cygrpc/aio/callbackcontext.pxd.pxi" include "_cygrpc/aio/call.pxd.pxi" +include "_cygrpc/aio/cancel_status.pxd.pxi" include "_cygrpc/aio/channel.pxd.pxi" include "_cygrpc/aio/server.pxd.pxi" diff --git a/src/python/grpcio/grpc/_cython/cygrpc.pyx b/src/python/grpcio/grpc/_cython/cygrpc.pyx index 5f980bb46f0..7be32661c87 100644 --- a/src/python/grpcio/grpc/_cython/cygrpc.pyx +++ b/src/python/grpcio/grpc/_cython/cygrpc.pyx @@ -62,6 +62,7 @@ include "_cygrpc/aio/iomgr/timer.pyx.pxi" include "_cygrpc/aio/iomgr/resolver.pyx.pxi" include "_cygrpc/aio/grpc_aio.pyx.pxi" include "_cygrpc/aio/call.pyx.pxi" +include "_cygrpc/aio/cancel_status.pyx.pxi" include "_cygrpc/aio/channel.pyx.pxi" include "_cygrpc/aio/rpc_error.pyx.pxi" include "_cygrpc/aio/server.pyx.pxi" diff --git a/src/python/grpcio/grpc/experimental/BUILD.bazel b/src/python/grpcio/grpc/experimental/BUILD.bazel index c9f0484c886..5654d08a45b 100644 --- a/src/python/grpcio/grpc/experimental/BUILD.bazel +++ b/src/python/grpcio/grpc/experimental/BUILD.bazel @@ -4,6 +4,7 @@ py_library( name = "aio", srcs = [ "aio/__init__.py", + "aio/_call.py", "aio/_channel.py", "aio/_server.py", ], diff --git a/src/python/grpcio/grpc/experimental/aio/__init__.py b/src/python/grpcio/grpc/experimental/aio/__init__.py index 5e919f500bd..696db001133 100644 --- a/src/python/grpcio/grpc/experimental/aio/__init__.py +++ b/src/python/grpcio/grpc/experimental/aio/__init__.py @@ -14,16 +14,16 @@ """gRPC's Asynchronous Python API.""" import abc -import types import six import grpc -from grpc._cython import cygrpc from grpc._cython.cygrpc import init_grpc_aio -from ._server import server +from ._call import AioRpcError +from ._call import Call from ._channel import Channel from ._channel import UnaryUnaryMultiCallable +from ._server import server def insecure_channel(target, options=None, compression=None): @@ -39,39 +39,11 @@ def insecure_channel(target, options=None, compression=None): Returns: A Channel. """ - from grpc.experimental.aio import _channel # pylint: disable=cyclic-import - return _channel.Channel(target, () - if options is None else options, None, compression) - - -class _AioRpcError: - """Private implementation of AioRpcError""" - - -class AioRpcError: - """An RpcError to be used by the asynchronous API. - - Parent classes: (cygrpc._AioRpcError, RpcError) - """ - # Dynamically registered as subclass of _AioRpcError and RpcError, because the former one is - # only available after the cython code has been compiled. - _class_built = _AioRpcError - - def __new__(cls, *args, **kwargs): - if cls._class_built is _AioRpcError: - cls._class_built = types.new_class( - "AioRpcError", (cygrpc._AioRpcError, grpc.RpcError)) - cls._class_built.__doc__ = cls.__doc__ - - return cls._class_built(*args, **kwargs) + return Channel(target, () + if options is None else options, None, compression) ################################### __all__ ################################# -__all__ = ( - 'init_grpc_aio', - 'Channel', - 'UnaryUnaryMultiCallable', - 'insecure_channel', - 'AioRpcError', -) +__all__ = ('AioRpcError', 'Call', 'init_grpc_aio', 'Channel', + 'UnaryUnaryMultiCallable', 'insecure_channel', 'server') diff --git a/src/python/grpcio/grpc/experimental/aio/_call.py b/src/python/grpcio/grpc/experimental/aio/_call.py new file mode 100644 index 00000000000..70ac3628971 --- /dev/null +++ b/src/python/grpcio/grpc/experimental/aio/_call.py @@ -0,0 +1,262 @@ +# Copyright 2019 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. +"""Invocation-side implementation of gRPC Asyncio Python.""" +import asyncio +import enum +from typing import Callable, Dict, Optional, ClassVar + +import grpc +from grpc import _common +from grpc._cython import cygrpc + +DeserializingFunction = Callable[[bytes], str] + + +class AioRpcError(grpc.RpcError): + """An RpcError to be used by the asynchronous API.""" + + # TODO(https://github.com/grpc/grpc/issues/20144) Metadata + # type returned by `initial_metadata` and `trailing_metadata` + # and also taken in the constructor needs to be revisit and make + # it more specific. + + _code: grpc.StatusCode + _details: Optional[str] + _initial_metadata: Optional[Dict] + _trailing_metadata: Optional[Dict] + + def __init__(self, + code: grpc.StatusCode, + details: Optional[str] = None, + initial_metadata: Optional[Dict] = None, + trailing_metadata: Optional[Dict] = None): + """Constructor. + + Args: + code: The status code with which the RPC has been finalized. + details: Optional details explaining the reason of the error. + initial_metadata: Optional initial metadata that could be sent by the + Server. + trailing_metadata: Optional metadata that could be sent by the Server. + """ + + super().__init__(self) + self._code = code + self._details = details + self._initial_metadata = initial_metadata + self._trailing_metadata = trailing_metadata + + def code(self) -> grpc.StatusCode: + """ + Returns: + The `grpc.StatusCode` status code. + """ + return self._code + + def details(self) -> Optional[str]: + """ + Returns: + The description of the error. + """ + return self._details + + def initial_metadata(self) -> Optional[Dict]: + """ + Returns: + The inital metadata received. + """ + return self._initial_metadata + + def trailing_metadata(self) -> Optional[Dict]: + """ + Returns: + The trailing metadata received. + """ + return self._trailing_metadata + + +@enum.unique +class _RpcState(enum.Enum): + """Identifies the state of the RPC.""" + ONGOING = 1 + CANCELLED = 2 + FINISHED = 3 + ABORT = 4 + + +class Call: + """Object for managing RPC calls, + returned when an instance of `UnaryUnaryMultiCallable` object is called. + """ + + _cancellation_details: ClassVar[str] = 'Locally cancelled by application!' + + _state: _RpcState + _exception: Optional[Exception] + _response: Optional[bytes] + _code: grpc.StatusCode + _details: Optional[str] + _initial_metadata: Optional[Dict] + _trailing_metadata: Optional[Dict] + _call: asyncio.Task + _call_cancel_status: cygrpc.AioCancelStatus + _response_deserializer: DeserializingFunction + + def __init__(self, call: asyncio.Task, + response_deserializer: DeserializingFunction, + call_cancel_status: cygrpc.AioCancelStatus) -> None: + """Constructor. + + Args: + call: Asyncio Task that holds the RPC execution. + response_deserializer: Deserializer used for parsing the reponse. + call_cancel_status: A cygrpc.AioCancelStatus used for giving a + specific error when the RPC is canceled. + """ + + self._state = _RpcState.ONGOING + self._exception = None + self._response = None + self._code = grpc.StatusCode.UNKNOWN + self._details = None + self._initial_metadata = None + self._trailing_metadata = None + self._call = call + self._call_cancel_status = call_cancel_status + self._response_deserializer = response_deserializer + + def __del__(self): + self.cancel() + + def cancel(self) -> bool: + """Cancels the ongoing RPC request. + + Returns: + True if the RPC can be canceled, False if was already cancelled or terminated. + """ + if self.cancelled() or self.done(): + return False + + code = grpc.StatusCode.CANCELLED + self._call_cancel_status.cancel( + _common.STATUS_CODE_TO_CYGRPC_STATUS_CODE[code], + details=Call._cancellation_details) + self._call.cancel() + self._details = Call._cancellation_details + self._code = code + self._state = _RpcState.CANCELLED + return True + + def cancelled(self) -> bool: + """Returns if the RPC was cancelled. + + Returns: + True if the requests was cancelled, False if not. + """ + return self._state is _RpcState.CANCELLED + + def running(self) -> bool: + """Returns if the RPC is running. + + Returns: + True if the requests is running, False if it already terminated. + """ + return not self.done() + + def done(self) -> bool: + """Returns if the RPC has finished. + + Returns: + True if the requests has finished, False is if still ongoing. + """ + return self._state is not _RpcState.ONGOING + + async def initial_metadata(self): + raise NotImplementedError() + + async def trailing_metadata(self): + raise NotImplementedError() + + async def code(self) -> grpc.StatusCode: + """Returns the `grpc.StatusCode` if the RPC is finished, + otherwise first waits until the RPC finishes. + + Returns: + The `grpc.StatusCode` status code. + """ + if not self.done(): + try: + await self + except (asyncio.CancelledError, AioRpcError): + pass + + return self._code + + async def details(self) -> str: + """Returns the details if the RPC is finished, otherwise first waits till the + RPC finishes. + + Returns: + The details. + """ + if not self.done(): + try: + await self + except (asyncio.CancelledError, AioRpcError): + pass + + return self._details + + def __await__(self): + """Wait till the ongoing RPC request finishes. + + Returns: + Response of the RPC call. + + Raises: + AioRpcError: Indicating that the RPC terminated with non-OK status. + asyncio.CancelledError: Indicating that the RPC was canceled. + """ + # We can not relay on the `done()` method since some exceptions + # might be pending to be catched, like `asyncio.CancelledError`. + if self._response: + return self._response + elif self._exception: + raise self._exception + + try: + buffer_ = yield from self._call.__await__() + except cygrpc.AioRpcError as aio_rpc_error: + self._state = _RpcState.ABORT + self._code = _common.CYGRPC_STATUS_CODE_TO_STATUS_CODE[ + aio_rpc_error.code()] + self._details = aio_rpc_error.details() + self._initial_metadata = aio_rpc_error.initial_metadata() + self._trailing_metadata = aio_rpc_error.trailing_metadata() + + # Propagates the pure Python class + self._exception = AioRpcError(self._code, self._details, + self._initial_metadata, + self._trailing_metadata) + raise self._exception from aio_rpc_error + except asyncio.CancelledError as cancel_error: + # _state, _code, _details are managed in the `cancel` method + self._exception = cancel_error + raise + + self._response = _common.deserialize(buffer_, + self._response_deserializer) + self._code = grpc.StatusCode.OK + self._state = _RpcState.FINISHED + return self._response diff --git a/src/python/grpcio/grpc/experimental/aio/_channel.py b/src/python/grpcio/grpc/experimental/aio/_channel.py index 9bef7cbeaa8..389b952b0b2 100644 --- a/src/python/grpcio/grpc/experimental/aio/_channel.py +++ b/src/python/grpcio/grpc/experimental/aio/_channel.py @@ -18,6 +18,8 @@ from typing import Callable, Optional from grpc import _common from grpc._cython import cygrpc +from ._call import Call + SerializingFunction = Callable[[str], bytes] DeserializingFunction = Callable[[bytes], str] @@ -39,14 +41,14 @@ class UnaryUnaryMultiCallable: return None return self._loop.time() + timeout - async def __call__(self, - request, - *, - timeout=None, - metadata=None, - credentials=None, - wait_for_ready=None, - compression=None): + def __call__(self, + request, + *, + timeout=None, + metadata=None, + credentials=None, + wait_for_ready=None, + compression=None) -> Call: """Asynchronously invokes the underlying RPC. Args: @@ -63,7 +65,7 @@ class UnaryUnaryMultiCallable: grpc.compression.Gzip. This is an EXPERIMENTAL option. Returns: - The response value for the RPC. + A Call object instance which is an awaitable object. Raises: RpcError: Indicating that the RPC terminated with non-OK status. The @@ -87,9 +89,12 @@ class UnaryUnaryMultiCallable: serialized_request = _common.serialize(request, self._request_serializer) timeout = self._timeout_to_deadline(timeout) - response = await self._channel.unary_unary(self._method, - serialized_request, timeout) - return _common.deserialize(response, self._response_deserializer) + aio_cancel_status = cygrpc.AioCancelStatus() + aio_call = asyncio.ensure_future( + self._channel.unary_unary(self._method, serialized_request, timeout, + aio_cancel_status), + loop=self._loop) + return Call(aio_call, self._response_deserializer, aio_cancel_status) class Channel: diff --git a/src/python/grpcio_tests/tests_aio/tests.json b/src/python/grpcio_tests/tests_aio/tests.json index 0fab86e49bc..8d51c9aaf8d 100644 --- a/src/python/grpcio_tests/tests_aio/tests.json +++ b/src/python/grpcio_tests/tests_aio/tests.json @@ -1,7 +1,8 @@ [ "_sanity._sanity_test.AioSanityTest", + "unit.call_test.TestAioRpcError", + "unit.call_test.TestCall", "unit.channel_test.TestChannel", - "unit.init_test.TestAioRpcError", "unit.init_test.TestInsecureChannel", "unit.server_test.TestServer" ] diff --git a/src/python/grpcio_tests/tests_aio/unit/_test_server.py b/src/python/grpcio_tests/tests_aio/unit/_test_server.py index 5f3661f42cf..4b6ceebc816 100644 --- a/src/python/grpcio_tests/tests_aio/unit/_test_server.py +++ b/src/python/grpcio_tests/tests_aio/unit/_test_server.py @@ -12,12 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import argparse - -from concurrent import futures from time import sleep -import grpc from grpc.experimental import aio from src.proto.grpc.testing import messages_pb2 from src.proto.grpc.testing import test_pb2_grpc diff --git a/src/python/grpcio_tests/tests_aio/unit/call_test.py b/src/python/grpcio_tests/tests_aio/unit/call_test.py new file mode 100644 index 00000000000..b1f470a3756 --- /dev/null +++ b/src/python/grpcio_tests/tests_aio/unit/call_test.py @@ -0,0 +1,196 @@ +# Copyright 2019 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. +import asyncio +import logging +import unittest + +import grpc + +from grpc.experimental import aio +from src.proto.grpc.testing import messages_pb2 +from tests.unit.framework.common import test_constants +from tests_aio.unit._test_server import start_test_server +from tests_aio.unit._test_base import AioTestBase + + +class TestAioRpcError(unittest.TestCase): + _TEST_INITIAL_METADATA = ("initial metadata",) + _TEST_TRAILING_METADATA = ("trailing metadata",) + + def test_attributes(self): + aio_rpc_error = aio.AioRpcError( + grpc.StatusCode.CANCELLED, + "details", + initial_metadata=self._TEST_INITIAL_METADATA, + trailing_metadata=self._TEST_TRAILING_METADATA) + self.assertEqual(aio_rpc_error.code(), grpc.StatusCode.CANCELLED) + self.assertEqual(aio_rpc_error.details(), "details") + self.assertEqual(aio_rpc_error.initial_metadata(), + self._TEST_INITIAL_METADATA) + self.assertEqual(aio_rpc_error.trailing_metadata(), + self._TEST_TRAILING_METADATA) + + +class TestCall(AioTestBase): + + def test_call_ok(self): + + async def coro(): + server_target, _ = await start_test_server() # pylint: disable=unused-variable + + async with aio.insecure_channel(server_target) as channel: + hi = channel.unary_unary( + '/grpc.testing.TestService/UnaryCall', + request_serializer=messages_pb2.SimpleRequest. + SerializeToString, + response_deserializer=messages_pb2.SimpleResponse.FromString + ) + call = hi(messages_pb2.SimpleRequest()) + + self.assertFalse(call.done()) + + response = await call + + self.assertTrue(call.done()) + self.assertEqual(type(response), messages_pb2.SimpleResponse) + self.assertEqual(await call.code(), grpc.StatusCode.OK) + + # Response is cached at call object level, reentrance + # returns again the same response + response_retry = await call + self.assertIs(response, response_retry) + + self.loop.run_until_complete(coro()) + + def test_call_rpc_error(self): + + async def coro(): + server_target, _ = await start_test_server() # pylint: disable=unused-variable + + async with aio.insecure_channel(server_target) as channel: + empty_call_with_sleep = channel.unary_unary( + "/grpc.testing.TestService/EmptyCall", + request_serializer=messages_pb2.SimpleRequest. + SerializeToString, + response_deserializer=messages_pb2.SimpleResponse. + FromString, + ) + timeout = test_constants.SHORT_TIMEOUT / 2 + # TODO(https://github.com/grpc/grpc/issues/20869 + # Update once the async server is ready, change the + # synchronization mechanism by removing the sleep() + # as both components (client & server) will be on the same + # process. + call = empty_call_with_sleep( + messages_pb2.SimpleRequest(), timeout=timeout) + + with self.assertRaises(grpc.RpcError) as exception_context: + await call + + self.assertTrue(call.done()) + self.assertEqual(await call.code(), + grpc.StatusCode.DEADLINE_EXCEEDED) + + # Exception is cached at call object level, reentrance + # returns again the same exception + with self.assertRaises( + grpc.RpcError) as exception_context_retry: + await call + + self.assertIs(exception_context.exception, + exception_context_retry.exception) + + self.loop.run_until_complete(coro()) + + def test_call_code_awaitable(self): + + async def coro(): + server_target, _ = await start_test_server() # pylint: disable=unused-variable + + async with aio.insecure_channel(server_target) as channel: + hi = channel.unary_unary( + '/grpc.testing.TestService/UnaryCall', + request_serializer=messages_pb2.SimpleRequest. + SerializeToString, + response_deserializer=messages_pb2.SimpleResponse.FromString + ) + call = hi(messages_pb2.SimpleRequest()) + self.assertEqual(await call.code(), grpc.StatusCode.OK) + + self.loop.run_until_complete(coro()) + + def test_call_details_awaitable(self): + + async def coro(): + server_target, _ = await start_test_server() # pylint: disable=unused-variable + + async with aio.insecure_channel(server_target) as channel: + hi = channel.unary_unary( + '/grpc.testing.TestService/UnaryCall', + request_serializer=messages_pb2.SimpleRequest. + SerializeToString, + response_deserializer=messages_pb2.SimpleResponse.FromString + ) + call = hi(messages_pb2.SimpleRequest()) + self.assertEqual(await call.details(), None) + + self.loop.run_until_complete(coro()) + + def test_cancel(self): + + async def coro(): + server_target, _ = await start_test_server() # pylint: disable=unused-variable + + async with aio.insecure_channel(server_target) as channel: + hi = channel.unary_unary( + '/grpc.testing.TestService/UnaryCall', + request_serializer=messages_pb2.SimpleRequest. + SerializeToString, + response_deserializer=messages_pb2.SimpleResponse.FromString + ) + call = hi(messages_pb2.SimpleRequest()) + + self.assertFalse(call.cancelled()) + + # Force the loop to execute the RPC task, cython + # code is executed. + await asyncio.sleep(0) + + self.assertTrue(call.cancel()) + self.assertTrue(call.cancelled()) + self.assertFalse(call.cancel()) + + with self.assertRaises( + asyncio.CancelledError) as exception_context: + await call + + self.assertEqual(await call.code(), grpc.StatusCode.CANCELLED) + self.assertEqual(await call.details(), + 'Locally cancelled by application!') + + # Exception is cached at call object level, reentrance + # returns again the same exception + with self.assertRaises( + asyncio.CancelledError) as exception_context_retry: + await call + + self.assertIs(exception_context.exception, + exception_context_retry.exception) + + self.loop.run_until_complete(coro()) + + +if __name__ == '__main__': + logging.basicConfig() + unittest.main(verbosity=2) diff --git a/src/python/grpcio_tests/tests_aio/unit/channel_test.py b/src/python/grpcio_tests/tests_aio/unit/channel_test.py index e18b6da6d39..96817c61a6f 100644 --- a/src/python/grpcio_tests/tests_aio/unit/channel_test.py +++ b/src/python/grpcio_tests/tests_aio/unit/channel_test.py @@ -11,8 +11,6 @@ # 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. - -import asyncio import logging import unittest @@ -30,7 +28,7 @@ class TestChannel(AioTestBase): def test_async_context(self): async def coro(): - server_target, unused_server = await start_test_server() + server_target, _ = await start_test_server() # pylint: disable=unused-variable async with aio.insecure_channel(server_target) as channel: hi = channel.unary_unary( @@ -46,7 +44,7 @@ class TestChannel(AioTestBase): def test_unary_unary(self): async def coro(): - server_target, unused_server = await start_test_server() + server_target, _ = await start_test_server() # pylint: disable=unused-variable channel = aio.insecure_channel(server_target) hi = channel.unary_unary( @@ -55,7 +53,7 @@ class TestChannel(AioTestBase): response_deserializer=messages_pb2.SimpleResponse.FromString) response = await hi(messages_pb2.SimpleRequest()) - self.assertEqual(type(response), messages_pb2.SimpleResponse) + self.assertIs(type(response), messages_pb2.SimpleResponse) await channel.close() @@ -64,7 +62,7 @@ class TestChannel(AioTestBase): def test_unary_call_times_out(self): async def coro(): - server_target, unused_server = await start_test_server() + server_target, _ = await start_test_server() # pylint: disable=unused-variable async with aio.insecure_channel(server_target) as channel: empty_call_with_sleep = channel.unary_unary( @@ -75,15 +73,18 @@ class TestChannel(AioTestBase): FromString, ) timeout = test_constants.SHORT_TIMEOUT / 2 - # TODO: Update once the async server is ready, change the synchronization mechanism by removing the - # sleep() as both components (client & server) will be on the same process. + # TODO(https://github.com/grpc/grpc/issues/20869) + # Update once the async server is ready, change the + # synchronization mechanism by removing the sleep() + # as both components (client & server) will be on the same + # process. with self.assertRaises(grpc.RpcError) as exception_context: await empty_call_with_sleep( messages_pb2.SimpleRequest(), timeout=timeout) - status_code, details = grpc.StatusCode.DEADLINE_EXCEEDED.value + _, details = grpc.StatusCode.DEADLINE_EXCEEDED.value # pylint: disable=unused-variable self.assertEqual(exception_context.exception.code(), - status_code) + grpc.StatusCode.DEADLINE_EXCEEDED) self.assertEqual(exception_context.exception.details(), details.title()) self.assertIsNotNone( diff --git a/src/python/grpcio_tests/tests_aio/unit/init_test.py b/src/python/grpcio_tests/tests_aio/unit/init_test.py index 297f178ee44..9f5d8bb0d85 100644 --- a/src/python/grpcio_tests/tests_aio/unit/init_test.py +++ b/src/python/grpcio_tests/tests_aio/unit/init_test.py @@ -11,62 +11,20 @@ # 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. - -import asyncio import logging import unittest -import grpc from grpc.experimental import aio from tests_aio.unit._test_server import start_test_server from tests_aio.unit._test_base import AioTestBase -class TestAioRpcError(unittest.TestCase): - _TEST_INITIAL_METADATA = ("initial metadata",) - _TEST_TRAILING_METADATA = ("trailing metadata",) - - def test_attributes(self): - aio_rpc_error = aio.AioRpcError(self._TEST_INITIAL_METADATA, 0, - "details", self._TEST_TRAILING_METADATA) - self.assertEqual(aio_rpc_error.initial_metadata(), - self._TEST_INITIAL_METADATA) - self.assertEqual(aio_rpc_error.code(), 0) - self.assertEqual(aio_rpc_error.details(), "details") - self.assertEqual(aio_rpc_error.trailing_metadata(), - self._TEST_TRAILING_METADATA) - - def test_class_hierarchy(self): - aio_rpc_error = aio.AioRpcError(self._TEST_INITIAL_METADATA, 0, - "details", self._TEST_TRAILING_METADATA) - - self.assertIsInstance(aio_rpc_error, grpc.RpcError) - - def test_class_attributes(self): - aio_rpc_error = aio.AioRpcError(self._TEST_INITIAL_METADATA, 0, - "details", self._TEST_TRAILING_METADATA) - self.assertEqual(aio_rpc_error.__class__.__name__, "AioRpcError") - self.assertEqual(aio_rpc_error.__class__.__doc__, - aio.AioRpcError.__doc__) - - def test_class_singleton(self): - first_aio_rpc_error = aio.AioRpcError(self._TEST_INITIAL_METADATA, 0, - "details", - self._TEST_TRAILING_METADATA) - second_aio_rpc_error = aio.AioRpcError(self._TEST_INITIAL_METADATA, 0, - "details", - self._TEST_TRAILING_METADATA) - - self.assertIs(first_aio_rpc_error.__class__, - second_aio_rpc_error.__class__) - - class TestInsecureChannel(AioTestBase): def test_insecure_channel(self): async def coro(): - server_target, unused_server = await start_test_server() + server_target, _ = await start_test_server() # pylint: disable=unused-variable channel = aio.insecure_channel(server_target) self.assertIsInstance(channel, aio.Channel) diff --git a/src/python/grpcio_tests/tests_aio/unit/server_test.py b/src/python/grpcio_tests/tests_aio/unit/server_test.py index 15f4ff182d6..937cce9eebb 100644 --- a/src/python/grpcio_tests/tests_aio/unit/server_test.py +++ b/src/python/grpcio_tests/tests_aio/unit/server_test.py @@ -12,14 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -import asyncio import logging import unittest import grpc from grpc.experimental import aio -from src.proto.grpc.testing import messages_pb2 -from src.proto.grpc.testing import benchmark_service_pb2_grpc from tests_aio.unit._test_base import AioTestBase _TEST_METHOD_PATH = '' From 78e443b4f62cce4866a697899f23585931640cbd Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Mon, 4 Nov 2019 14:12:22 -0800 Subject: [PATCH 065/133] Reuse the definition already in the bazel/ directory --- bazel/custom_exec_properties.bzl | 18 ------------------ bazel/grpc_build_system.bzl | 2 ++ test/core/gprpp/BUILD | 3 +-- test/core/iomgr/BUILD | 3 +-- test/cpp/qps/BUILD | 3 +-- 5 files changed, 5 insertions(+), 24 deletions(-) delete mode 100644 bazel/custom_exec_properties.bzl diff --git a/bazel/custom_exec_properties.bzl b/bazel/custom_exec_properties.bzl deleted file mode 100644 index f03ef859a79..00000000000 --- a/bazel/custom_exec_properties.bzl +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2019 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. - - -load("@grpc_custom_exec_properties//:constants.bzl", _LARGE_MACHINE = "LARGE_MACHINE") - -LARGE_MACHINE = _LARGE_MACHINE diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl index 0ca38b0b2b5..75866076a6d 100644 --- a/bazel/grpc_build_system.bzl +++ b/bazel/grpc_build_system.bzl @@ -26,6 +26,7 @@ load("//bazel:cc_grpc_library.bzl", "cc_grpc_library") load("@upb//bazel:upb_proto_library.bzl", "upb_proto_library") load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test") +load("@grpc_custom_exec_properties//:constants.bzl", _LARGE_MACHINE = "LARGE_MACHINE") # The set of pollers to test against if a test exercises polling @@ -342,3 +343,4 @@ def python_config_settings(): flag_values = {"@bazel_tools//tools/python:python_version": "PY3"}, ) +LARGE_MACHINE = _LARGE_MACHINE diff --git a/test/core/gprpp/BUILD b/test/core/gprpp/BUILD index 5f9004f68f2..3e23d78b124 100644 --- a/test/core/gprpp/BUILD +++ b/test/core/gprpp/BUILD @@ -12,8 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") -load("//bazel:custom_exec_properties.bzl", "LARGE_MACHINE") +load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package", "LARGE_MACHINE") licenses(["notice"]) # Apache v2 diff --git a/test/core/iomgr/BUILD b/test/core/iomgr/BUILD index 79abf52df2d..13327db112f 100644 --- a/test/core/iomgr/BUILD +++ b/test/core/iomgr/BUILD @@ -12,8 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") -load("//bazel:custom_exec_properties.bzl", "LARGE_MACHINE") +load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package", "LARGE_MACHINE") licenses(["notice"]) # Apache v2 diff --git a/test/cpp/qps/BUILD b/test/cpp/qps/BUILD index 25e15d6e54d..60596c8e31d 100644 --- a/test/cpp/qps/BUILD +++ b/test/cpp/qps/BUILD @@ -14,9 +14,8 @@ licenses(["notice"]) # Apache v2 -load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_cc_library", "grpc_cc_binary", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_cc_library", "grpc_cc_binary", "grpc_package", "LARGE_MACHINE") load("//test/cpp/qps:qps_benchmark_script.bzl", "qps_json_driver_batch", "json_run_localhost_batch") -load("//bazel:custom_exec_properties.bzl", "LARGE_MACHINE") grpc_package(name = "test/cpp/qps") From 444d5b7760ae4e4d777e8d8bf16e355eb29ef623 Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Mon, 4 Nov 2019 15:34:45 -0800 Subject: [PATCH 066/133] Revert "Reuse the definition already in the bazel/ directory" Turns out that putting this in the main build definition starklark file means that our users will also incur a dependency on the repo rule. That's no bueno. This reverts commit 78e443b4f62cce4866a697899f23585931640cbd. --- bazel/custom_exec_properties.bzl | 18 ++++++++++++++++++ bazel/grpc_build_system.bzl | 2 -- test/core/gprpp/BUILD | 3 ++- test/core/iomgr/BUILD | 3 ++- test/cpp/qps/BUILD | 3 ++- 5 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 bazel/custom_exec_properties.bzl diff --git a/bazel/custom_exec_properties.bzl b/bazel/custom_exec_properties.bzl new file mode 100644 index 00000000000..f03ef859a79 --- /dev/null +++ b/bazel/custom_exec_properties.bzl @@ -0,0 +1,18 @@ +# Copyright 2019 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. + + +load("@grpc_custom_exec_properties//:constants.bzl", _LARGE_MACHINE = "LARGE_MACHINE") + +LARGE_MACHINE = _LARGE_MACHINE diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl index 75866076a6d..0ca38b0b2b5 100644 --- a/bazel/grpc_build_system.bzl +++ b/bazel/grpc_build_system.bzl @@ -26,7 +26,6 @@ load("//bazel:cc_grpc_library.bzl", "cc_grpc_library") load("@upb//bazel:upb_proto_library.bzl", "upb_proto_library") load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test") -load("@grpc_custom_exec_properties//:constants.bzl", _LARGE_MACHINE = "LARGE_MACHINE") # The set of pollers to test against if a test exercises polling @@ -343,4 +342,3 @@ def python_config_settings(): flag_values = {"@bazel_tools//tools/python:python_version": "PY3"}, ) -LARGE_MACHINE = _LARGE_MACHINE diff --git a/test/core/gprpp/BUILD b/test/core/gprpp/BUILD index 3e23d78b124..5f9004f68f2 100644 --- a/test/core/gprpp/BUILD +++ b/test/core/gprpp/BUILD @@ -12,7 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package", "LARGE_MACHINE") +load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") +load("//bazel:custom_exec_properties.bzl", "LARGE_MACHINE") licenses(["notice"]) # Apache v2 diff --git a/test/core/iomgr/BUILD b/test/core/iomgr/BUILD index 13327db112f..79abf52df2d 100644 --- a/test/core/iomgr/BUILD +++ b/test/core/iomgr/BUILD @@ -12,7 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package", "LARGE_MACHINE") +load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") +load("//bazel:custom_exec_properties.bzl", "LARGE_MACHINE") licenses(["notice"]) # Apache v2 diff --git a/test/cpp/qps/BUILD b/test/cpp/qps/BUILD index 60596c8e31d..25e15d6e54d 100644 --- a/test/cpp/qps/BUILD +++ b/test/cpp/qps/BUILD @@ -14,8 +14,9 @@ licenses(["notice"]) # Apache v2 -load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_cc_library", "grpc_cc_binary", "grpc_package", "LARGE_MACHINE") +load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_cc_library", "grpc_cc_binary", "grpc_package") load("//test/cpp/qps:qps_benchmark_script.bzl", "qps_json_driver_batch", "json_run_localhost_batch") +load("//bazel:custom_exec_properties.bzl", "LARGE_MACHINE") grpc_package(name = "test/cpp/qps") From 6bb86298792acd10362c214fb9348bfe62fc2b86 Mon Sep 17 00:00:00 2001 From: Alexander Polcyn Date: Thu, 10 Oct 2019 23:38:44 -0700 Subject: [PATCH 067/133] Add tests that expose a race and lock cycle in alts client, fix TSAN issues --- CMakeLists.txt | 63 +++ Makefile | 91 ++++ build.yaml | 19 + .../credentials/alts/alts_credentials.cc | 8 +- .../alts/alts_security_connector.cc | 21 +- .../alts/alts_security_connector.h | 4 + src/core/lib/surface/channel.cc | 9 +- src/core/lib/surface/channel.h | 4 + .../alts/handshaker/alts_handshaker_client.cc | 26 +- .../alts/handshaker/alts_tsi_handshaker.cc | 164 ++++-- .../fake_handshaker/fake_handshaker_server.h | 6 + test/core/tsi/alts/handshaker/BUILD | 19 + .../alts_concurrent_connectivity_test.cc | 476 ++++++++++++++++++ .../handshaker/alts_tsi_handshaker_test.cc | 36 +- tools/run_tests/generated/tests.json | 18 + 15 files changed, 887 insertions(+), 77 deletions(-) create mode 100644 test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc diff --git a/CMakeLists.txt b/CMakeLists.txt index e29d8f47b97..71626d5a7bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -324,6 +324,12 @@ protobuf_generate_grpc_cpp( protobuf_generate_grpc_cpp( src/proto/grpc/testing/xds/orca_load_report_for_test.proto ) +protobuf_generate_grpc_cpp( + test/core/tsi/alts/fake_handshaker/handshaker.proto +) +protobuf_generate_grpc_cpp( + test/core/tsi/alts/fake_handshaker/transport_security_common.proto +) if(gRPC_BUILD_TESTS) add_custom_target(buildtests_c) @@ -594,6 +600,9 @@ if(gRPC_BUILD_TESTS) add_custom_target(buildtests_cxx) add_dependencies(buildtests_cxx alarm_test) + if(_gRPC_PLATFORM_LINUX) + add_dependencies(buildtests_cxx alts_concurrent_connectivity_test) + endif() add_dependencies(buildtests_cxx alts_counter_test) add_dependencies(buildtests_cxx alts_crypt_test) add_dependencies(buildtests_cxx alts_crypter_test) @@ -10190,6 +10199,60 @@ target_link_libraries(alarm_test ) +endif() +if(gRPC_BUILD_TESTS) +if(_gRPC_PLATFORM_LINUX) + + add_executable(alts_concurrent_connectivity_test + ${_gRPC_PROTO_GENS_DIR}/test/core/tsi/alts/fake_handshaker/handshaker.pb.cc + ${_gRPC_PROTO_GENS_DIR}/test/core/tsi/alts/fake_handshaker/handshaker.grpc.pb.cc + ${_gRPC_PROTO_GENS_DIR}/test/core/tsi/alts/fake_handshaker/handshaker.pb.h + ${_gRPC_PROTO_GENS_DIR}/test/core/tsi/alts/fake_handshaker/handshaker.grpc.pb.h + ${_gRPC_PROTO_GENS_DIR}/test/core/tsi/alts/fake_handshaker/transport_security_common.pb.cc + ${_gRPC_PROTO_GENS_DIR}/test/core/tsi/alts/fake_handshaker/transport_security_common.grpc.pb.cc + ${_gRPC_PROTO_GENS_DIR}/test/core/tsi/alts/fake_handshaker/transport_security_common.pb.h + ${_gRPC_PROTO_GENS_DIR}/test/core/tsi/alts/fake_handshaker/transport_security_common.grpc.pb.h + test/core/tsi/alts/fake_handshaker/fake_handshaker_server.cc + test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) + + target_include_directories(alts_concurrent_connectivity_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_BENCHMARK_INCLUDE_DIR} + ${_gRPC_CARES_INCLUDE_DIR} + ${_gRPC_GFLAGS_INCLUDE_DIR} + ${_gRPC_PROTOBUF_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(alts_concurrent_connectivity_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc++_test_util + grpc_test_util + grpc++ + grpc + gpr + grpc++_test_config + ${_gRPC_GFLAGS_LIBRARIES} + ) + + +endif() endif() if(gRPC_BUILD_TESTS) diff --git a/Makefile b/Makefile index 82f6a32b895..ffde7c586db 100644 --- a/Makefile +++ b/Makefile @@ -1143,6 +1143,7 @@ udp_server_test: $(BINDIR)/$(CONFIG)/udp_server_test uri_fuzzer_test: $(BINDIR)/$(CONFIG)/uri_fuzzer_test uri_parser_test: $(BINDIR)/$(CONFIG)/uri_parser_test alarm_test: $(BINDIR)/$(CONFIG)/alarm_test +alts_concurrent_connectivity_test: $(BINDIR)/$(CONFIG)/alts_concurrent_connectivity_test alts_counter_test: $(BINDIR)/$(CONFIG)/alts_counter_test alts_crypt_test: $(BINDIR)/$(CONFIG)/alts_crypt_test alts_crypter_test: $(BINDIR)/$(CONFIG)/alts_crypter_test @@ -1625,6 +1626,7 @@ buildtests_c: privatelibs_c \ ifeq ($(EMBED_OPENSSL),true) buildtests_cxx: privatelibs_cxx \ $(BINDIR)/$(CONFIG)/alarm_test \ + $(BINDIR)/$(CONFIG)/alts_concurrent_connectivity_test \ $(BINDIR)/$(CONFIG)/alts_counter_test \ $(BINDIR)/$(CONFIG)/alts_crypt_test \ $(BINDIR)/$(CONFIG)/alts_crypter_test \ @@ -1796,6 +1798,7 @@ buildtests_cxx: privatelibs_cxx \ else buildtests_cxx: privatelibs_cxx \ $(BINDIR)/$(CONFIG)/alarm_test \ + $(BINDIR)/$(CONFIG)/alts_concurrent_connectivity_test \ $(BINDIR)/$(CONFIG)/alts_counter_test \ $(BINDIR)/$(CONFIG)/alts_crypt_test \ $(BINDIR)/$(CONFIG)/alts_crypter_test \ @@ -2234,6 +2237,8 @@ flaky_test_c: buildtests_c test_cxx: buildtests_cxx $(E) "[RUN] Testing alarm_test" $(Q) $(BINDIR)/$(CONFIG)/alarm_test || ( echo test alarm_test failed ; exit 1 ) + $(E) "[RUN] Testing alts_concurrent_connectivity_test" + $(Q) $(BINDIR)/$(CONFIG)/alts_concurrent_connectivity_test || ( echo test alts_concurrent_connectivity_test failed ; exit 1 ) $(E) "[RUN] Testing alts_counter_test" $(Q) $(BINDIR)/$(CONFIG)/alts_counter_test || ( echo test alts_counter_test failed ; exit 1 ) $(E) "[RUN] Testing alts_crypt_test" @@ -3053,6 +3058,38 @@ $(GENDIR)/src/proto/grpc/testing/xds/orca_load_report_for_test.grpc.pb.cc: src/p $(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $< endif +ifeq ($(NO_PROTOC),true) +$(GENDIR)/test/core/tsi/alts/fake_handshaker/handshaker.pb.cc: protoc_dep_error +$(GENDIR)/test/core/tsi/alts/fake_handshaker/handshaker.grpc.pb.cc: protoc_dep_error +else + +$(GENDIR)/test/core/tsi/alts/fake_handshaker/handshaker.pb.cc: test/core/tsi/alts/fake_handshaker/handshaker.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) + $(E) "[PROTOC] Generating protobuf CC file from $<" + $(Q) mkdir -p `dirname $@` + $(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $< + +$(GENDIR)/test/core/tsi/alts/fake_handshaker/handshaker.grpc.pb.cc: test/core/tsi/alts/fake_handshaker/handshaker.proto $(GENDIR)/test/core/tsi/alts/fake_handshaker/handshaker.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS) + $(E) "[GRPC] Generating gRPC's protobuf service CC file from $<" + $(Q) mkdir -p `dirname $@` + $(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $< +endif + +ifeq ($(NO_PROTOC),true) +$(GENDIR)/test/core/tsi/alts/fake_handshaker/transport_security_common.pb.cc: protoc_dep_error +$(GENDIR)/test/core/tsi/alts/fake_handshaker/transport_security_common.grpc.pb.cc: protoc_dep_error +else + +$(GENDIR)/test/core/tsi/alts/fake_handshaker/transport_security_common.pb.cc: test/core/tsi/alts/fake_handshaker/transport_security_common.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) + $(E) "[PROTOC] Generating protobuf CC file from $<" + $(Q) mkdir -p `dirname $@` + $(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $< + +$(GENDIR)/test/core/tsi/alts/fake_handshaker/transport_security_common.grpc.pb.cc: test/core/tsi/alts/fake_handshaker/transport_security_common.proto $(GENDIR)/test/core/tsi/alts/fake_handshaker/transport_security_common.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS) + $(E) "[GRPC] Generating gRPC's protobuf service CC file from $<" + $(Q) mkdir -p `dirname $@` + $(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $< +endif + ifeq ($(CONFIG),stapprof) src/core/profiling/stap_timers.c: $(GENDIR)/src/core/profiling/stap_probes.h @@ -13375,6 +13412,60 @@ endif endif +ALTS_CONCURRENT_CONNECTIVITY_TEST_SRC = \ + $(GENDIR)/test/core/tsi/alts/fake_handshaker/handshaker.pb.cc $(GENDIR)/test/core/tsi/alts/fake_handshaker/handshaker.grpc.pb.cc \ + $(GENDIR)/test/core/tsi/alts/fake_handshaker/transport_security_common.pb.cc $(GENDIR)/test/core/tsi/alts/fake_handshaker/transport_security_common.grpc.pb.cc \ + test/core/tsi/alts/fake_handshaker/fake_handshaker_server.cc \ + test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc \ + +ALTS_CONCURRENT_CONNECTIVITY_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(ALTS_CONCURRENT_CONNECTIVITY_TEST_SRC)))) +ifeq ($(NO_SECURE),true) + +# You can't build secure targets if you don't have OpenSSL. + +$(BINDIR)/$(CONFIG)/alts_concurrent_connectivity_test: openssl_dep_error + +else + + + + +ifeq ($(NO_PROTOBUF),true) + +# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.5.0+. + +$(BINDIR)/$(CONFIG)/alts_concurrent_connectivity_test: protobuf_dep_error + +else + +$(BINDIR)/$(CONFIG)/alts_concurrent_connectivity_test: $(PROTOBUF_DEP) $(ALTS_CONCURRENT_CONNECTIVITY_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a + $(E) "[LD] Linking $@" + $(Q) mkdir -p `dirname $@` + $(Q) $(LDXX) $(LDFLAGS) $(ALTS_CONCURRENT_CONNECTIVITY_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/alts_concurrent_connectivity_test + +endif + +endif + +$(OBJDIR)/$(CONFIG)/test/core/tsi/alts/fake_handshaker/handshaker.o: $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a + +$(OBJDIR)/$(CONFIG)/test/core/tsi/alts/fake_handshaker/transport_security_common.o: $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a + +$(OBJDIR)/$(CONFIG)/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.o: $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a + +$(OBJDIR)/$(CONFIG)/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.o: $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a + +deps_alts_concurrent_connectivity_test: $(ALTS_CONCURRENT_CONNECTIVITY_TEST_OBJS:.o=.dep) + +ifneq ($(NO_SECURE),true) +ifneq ($(NO_DEPS),true) +-include $(ALTS_CONCURRENT_CONNECTIVITY_TEST_OBJS:.o=.dep) +endif +endif +$(OBJDIR)/$(CONFIG)/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.o: $(GENDIR)/test/core/tsi/alts/fake_handshaker/handshaker.pb.cc $(GENDIR)/test/core/tsi/alts/fake_handshaker/handshaker.grpc.pb.cc $(GENDIR)/test/core/tsi/alts/fake_handshaker/transport_security_common.pb.cc $(GENDIR)/test/core/tsi/alts/fake_handshaker/transport_security_common.grpc.pb.cc +$(OBJDIR)/$(CONFIG)/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.o: $(GENDIR)/test/core/tsi/alts/fake_handshaker/handshaker.pb.cc $(GENDIR)/test/core/tsi/alts/fake_handshaker/handshaker.grpc.pb.cc $(GENDIR)/test/core/tsi/alts/fake_handshaker/transport_security_common.pb.cc $(GENDIR)/test/core/tsi/alts/fake_handshaker/transport_security_common.grpc.pb.cc + + ALTS_COUNTER_TEST_SRC = \ test/core/tsi/alts/frame_protector/alts_counter_test.cc \ diff --git a/build.yaml b/build.yaml index 78a5d32d76a..a341bc18450 100644 --- a/build.yaml +++ b/build.yaml @@ -3946,6 +3946,25 @@ targets: - grpc++_unsecure - grpc_unsecure - gpr +- name: alts_concurrent_connectivity_test + build: test + language: c++ + headers: + - test/core/tsi/alts/fake_handshaker/fake_handshaker_server.h + src: + - test/core/tsi/alts/fake_handshaker/handshaker.proto + - test/core/tsi/alts/fake_handshaker/transport_security_common.proto + - test/core/tsi/alts/fake_handshaker/fake_handshaker_server.cc + - test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc + deps: + - grpc++_test_util + - grpc_test_util + - grpc++ + - grpc + - gpr + - grpc++_test_config + platforms: + - linux - name: alts_counter_test build: test language: c++ diff --git a/src/core/lib/security/credentials/alts/alts_credentials.cc b/src/core/lib/security/credentials/alts/alts_credentials.cc index 4c3c7e113ee..cbc43d565a4 100644 --- a/src/core/lib/security/credentials/alts/alts_credentials.cc +++ b/src/core/lib/security/credentials/alts/alts_credentials.cc @@ -40,7 +40,9 @@ grpc_alts_credentials::grpc_alts_credentials( options_(grpc_alts_credentials_options_copy(options)), handshaker_service_url_(handshaker_service_url == nullptr ? gpr_strdup(GRPC_ALTS_HANDSHAKER_SERVICE_URL) - : gpr_strdup(handshaker_service_url)) {} + : gpr_strdup(handshaker_service_url)) { + grpc_alts_set_rpc_protocol_versions(&options_->rpc_versions); +} grpc_alts_credentials::~grpc_alts_credentials() { grpc_alts_credentials_options_destroy(options_); @@ -63,7 +65,9 @@ grpc_alts_server_credentials::grpc_alts_server_credentials( options_(grpc_alts_credentials_options_copy(options)), handshaker_service_url_(handshaker_service_url == nullptr ? gpr_strdup(GRPC_ALTS_HANDSHAKER_SERVICE_URL) - : gpr_strdup(handshaker_service_url)) {} + : gpr_strdup(handshaker_service_url)) { + grpc_alts_set_rpc_protocol_versions(&options_->rpc_versions); +} grpc_core::RefCountedPtr grpc_alts_server_credentials::create_security_connector() { diff --git a/src/core/lib/security/security_connector/alts/alts_security_connector.cc b/src/core/lib/security/security_connector/alts/alts_security_connector.cc index a20cf448f8d..5a535110d78 100644 --- a/src/core/lib/security/security_connector/alts/alts_security_connector.cc +++ b/src/core/lib/security/security_connector/alts/alts_security_connector.cc @@ -36,9 +36,7 @@ #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h" #include "src/core/tsi/transport_security.h" -namespace { - -void alts_set_rpc_protocol_versions( +void grpc_alts_set_rpc_protocol_versions( grpc_gcp_rpc_protocol_versions* rpc_versions) { grpc_gcp_rpc_protocol_versions_set_max(rpc_versions, GRPC_PROTOCOL_VERSION_MAX_MAJOR, @@ -48,6 +46,8 @@ void alts_set_rpc_protocol_versions( GRPC_PROTOCOL_VERSION_MIN_MINOR); } +namespace { + void alts_check_peer(tsi_peer peer, grpc_core::RefCountedPtr* auth_context, grpc_closure* on_peer_checked) { @@ -72,11 +72,7 @@ class grpc_alts_channel_security_connector final : grpc_channel_security_connector(/*url_scheme=*/nullptr, std::move(channel_creds), std::move(request_metadata_creds)), - target_name_(gpr_strdup(target_name)) { - grpc_alts_credentials* creds = - static_cast(mutable_channel_creds()); - alts_set_rpc_protocol_versions(&creds->mutable_options()->rpc_versions); - } + target_name_(gpr_strdup(target_name)) {} ~grpc_alts_channel_security_connector() override { gpr_free(target_name_); } @@ -134,11 +130,8 @@ class grpc_alts_server_security_connector final grpc_alts_server_security_connector( grpc_core::RefCountedPtr server_creds) : grpc_server_security_connector(/*url_scheme=*/nullptr, - std::move(server_creds)) { - grpc_alts_server_credentials* creds = - reinterpret_cast(mutable_server_creds()); - alts_set_rpc_protocol_versions(&creds->mutable_options()->rpc_versions); - } + std::move(server_creds)) {} + ~grpc_alts_server_security_connector() override = default; void add_handshakers( @@ -193,7 +186,7 @@ grpc_alts_auth_context_from_tsi_peer(const tsi_peer* peer) { return nullptr; } grpc_gcp_rpc_protocol_versions local_versions, peer_versions; - alts_set_rpc_protocol_versions(&local_versions); + grpc_alts_set_rpc_protocol_versions(&local_versions); grpc_slice slice = grpc_slice_from_copied_buffer( rpc_versions_prop->value.data, rpc_versions_prop->value.length); bool decode_result = diff --git a/src/core/lib/security/security_connector/alts/alts_security_connector.h b/src/core/lib/security/security_connector/alts/alts_security_connector.h index b96dc36b302..b68a4e97781 100644 --- a/src/core/lib/security/security_connector/alts/alts_security_connector.h +++ b/src/core/lib/security/security_connector/alts/alts_security_connector.h @@ -57,6 +57,10 @@ grpc_core::RefCountedPtr grpc_alts_server_security_connector_create( grpc_core::RefCountedPtr server_creds); +/* Initializes rpc_versions. */ +void grpc_alts_set_rpc_protocol_versions( + grpc_gcp_rpc_protocol_versions* rpc_versions); + namespace grpc_core { namespace internal { diff --git a/src/core/lib/surface/channel.cc b/src/core/lib/surface/channel.cc index c6bebf715b2..95f06c6dbab 100644 --- a/src/core/lib/surface/channel.cc +++ b/src/core/lib/surface/channel.cc @@ -500,15 +500,18 @@ static void destroy_channel(void* arg, grpc_error* /*error*/) { grpc_shutdown(); } -void grpc_channel_destroy(grpc_channel* channel) { +void grpc_channel_destroy_internal(grpc_channel* channel) { grpc_transport_op* op = grpc_make_transport_op(nullptr); grpc_channel_element* elem; - grpc_core::ExecCtx exec_ctx; GRPC_API_TRACE("grpc_channel_destroy(channel=%p)", 1, (channel)); op->disconnect_with_error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Channel Destroyed"); elem = grpc_channel_stack_element(CHANNEL_STACK_FROM_CHANNEL(channel), 0); elem->filter->start_transport_op(elem, op); - GRPC_CHANNEL_INTERNAL_UNREF(channel, "channel"); } + +void grpc_channel_destroy(grpc_channel* channel) { + grpc_core::ExecCtx exec_ctx; + grpc_channel_destroy_internal(channel); +} diff --git a/src/core/lib/surface/channel.h b/src/core/lib/surface/channel.h index 5136e93bcd5..280fc96a0bc 100644 --- a/src/core/lib/surface/channel.h +++ b/src/core/lib/surface/channel.h @@ -32,6 +32,10 @@ grpc_channel* grpc_channel_create(const char* target, grpc_transport* optional_transport, grpc_resource_user* resource_user = nullptr); +/** The same as grpc_channel_destroy, but doesn't create an ExecCtx, and so + * is safe to use from within core. */ +void grpc_channel_destroy_internal(grpc_channel* channel); + grpc_channel* grpc_channel_create_with_builder( grpc_channel_stack_builder* builder, grpc_channel_stack_type channel_stack_type); diff --git a/src/core/tsi/alts/handshaker/alts_handshaker_client.cc b/src/core/tsi/alts/handshaker/alts_handshaker_client.cc index 55fd066dba5..7318d6ddeb6 100644 --- a/src/core/tsi/alts/handshaker/alts_handshaker_client.cc +++ b/src/core/tsi/alts/handshaker/alts_handshaker_client.cc @@ -49,12 +49,8 @@ typedef struct alts_grpc_handshaker_client { * that validates the data to be sent to handshaker service in a testing use * case. */ alts_grpc_caller grpc_caller; - /* A callback function provided by gRPC to handle the response returned from - * handshaker service. It also serves to bring the control safely back to - * application when dedicated CQ and thread are used. */ - grpc_iomgr_cb_func grpc_cb; /* A gRPC closure to be scheduled when the response from handshaker service - * is received. It will be initialized with grpc_cb. */ + * is received. It will be initialized with the injected grpc RPC callback. */ grpc_closure on_handshaker_service_resp_recv; /* Buffers containing information to be sent (or received) to (or from) the * handshaker service. */ @@ -415,6 +411,11 @@ static void handshaker_client_shutdown(alts_handshaker_client* c) { } } +static void handshaker_call_unref(void* arg, grpc_error* error) { + grpc_call* call = static_cast(arg); + grpc_call_unref(call); +} + static void handshaker_client_destruct(alts_handshaker_client* c) { if (c == nullptr) { return; @@ -422,7 +423,15 @@ static void handshaker_client_destruct(alts_handshaker_client* c) { alts_grpc_handshaker_client* client = reinterpret_cast(c); if (client->call != nullptr) { - grpc_call_unref(client->call); + // Throw this grpc_call_unref over to the ExecCtx so that + // we invoke it at the bottom of the call stack and + // prevent lock inversion problems due to nested ExecCtx flushing. + // TODO(apolcyn): we could remove this indirection and call + // grpc_call_unref inline if there was an internal variant of + // grpc_call_unref that didn't need to flush an ExecCtx. + GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(handshaker_call_unref, client->call, + grpc_schedule_on_exec_ctx), + GRPC_ERROR_NONE); } } @@ -454,7 +463,6 @@ alts_handshaker_client* alts_grpc_handshaker_client_create( client->target_name = grpc_slice_copy(target_name); client->recv_bytes = grpc_empty_slice(); grpc_metadata_array_init(&client->recv_initial_metadata); - client->grpc_cb = grpc_cb; client->is_client = is_client; client->buffer_size = TSI_ALTS_INITIAL_BUFFER_SIZE; client->buffer = static_cast(gpr_zalloc(client->buffer_size)); @@ -469,8 +477,8 @@ alts_handshaker_client* alts_grpc_handshaker_client_create( GRPC_MILLIS_INF_FUTURE, nullptr); client->base.vtable = vtable_for_testing == nullptr ? &vtable : vtable_for_testing; - GRPC_CLOSURE_INIT(&client->on_handshaker_service_resp_recv, client->grpc_cb, - client, grpc_schedule_on_exec_ctx); + GRPC_CLOSURE_INIT(&client->on_handshaker_service_resp_recv, grpc_cb, client, + grpc_schedule_on_exec_ctx); grpc_slice_unref_internal(slice); return &client->base; } diff --git a/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc b/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc index c6018af533a..e56448d798c 100644 --- a/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc +++ b/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc @@ -30,9 +30,11 @@ #include #include +#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/lib/surface/channel.h" #include "src/core/tsi/alts/frame_protector/alts_frame_protector.h" #include "src/core/tsi/alts/handshaker/alts_handshaker_client.h" #include "src/core/tsi/alts/handshaker/alts_shared_resource.h" @@ -42,7 +44,6 @@ /* Main struct for ALTS TSI handshaker. */ struct alts_tsi_handshaker { tsi_handshaker base; - alts_handshaker_client* client; grpc_slice target_name; bool is_client; bool has_sent_start_message; @@ -52,6 +53,16 @@ struct alts_tsi_handshaker { grpc_alts_credentials_options* options; alts_handshaker_client_vtable* client_vtable_for_testing; grpc_channel* channel; + bool use_dedicated_cq; + // mu synchronizes all fields below. Note these are the + // only fields that can be concurrently accessed (due to + // potential concurrency of tsi_handshaker_shutdown and + // tsi_handshaker_next). + gpr_mu mu; + alts_handshaker_client* client; + // shutdown effectively follows base.handshake_shutdown, + // but is synchronized by the mutex of this object. + bool shutdown; }; /* Main struct for ALTS TSI handshaker result. */ @@ -272,22 +283,11 @@ static void on_handshaker_service_resp_recv_dedicated(void* arg, nullptr, &resource->storage); } -static tsi_result handshaker_next( - tsi_handshaker* self, const unsigned char* received_bytes, - size_t received_bytes_size, const unsigned char** /*bytes_to_send*/, - size_t* /*bytes_to_send_size*/, tsi_handshaker_result** /*result*/, - tsi_handshaker_on_next_done_cb cb, void* user_data) { - if (self == nullptr || cb == nullptr) { - gpr_log(GPR_ERROR, "Invalid arguments to handshaker_next()"); - return TSI_INVALID_ARGUMENT; - } - if (self->handshake_shutdown) { - gpr_log(GPR_ERROR, "TSI handshake shutdown"); - return TSI_HANDSHAKE_SHUTDOWN; - } - alts_tsi_handshaker* handshaker = - reinterpret_cast(self); - tsi_result ok = TSI_OK; +/* Returns TSI_OK if and only if no error is encountered. */ +static tsi_result alts_tsi_handshaker_continue_handshaker_next( + alts_tsi_handshaker* handshaker, const unsigned char* received_bytes, + size_t received_bytes_size, tsi_handshaker_on_next_done_cb cb, + void* user_data) { if (!handshaker->has_created_handshaker_client) { if (handshaker->channel == nullptr) { grpc_alts_shared_resource_dedicated_start( @@ -303,15 +303,24 @@ static tsi_result handshaker_next( handshaker->channel == nullptr ? grpc_alts_get_shared_resource_dedicated()->channel : handshaker->channel; - handshaker->client = alts_grpc_handshaker_client_create( + alts_handshaker_client* client = alts_grpc_handshaker_client_create( handshaker, channel, handshaker->handshaker_service_url, handshaker->interested_parties, handshaker->options, handshaker->target_name, grpc_cb, cb, user_data, handshaker->client_vtable_for_testing, handshaker->is_client); - if (handshaker->client == nullptr) { + if (client == nullptr) { gpr_log(GPR_ERROR, "Failed to create ALTS handshaker client"); return TSI_FAILED_PRECONDITION; } + { + grpc_core::MutexLock lock(&handshaker->mu); + GPR_ASSERT(handshaker->client == nullptr); + handshaker->client = client; + if (handshaker->shutdown) { + gpr_log(GPR_ERROR, "TSI handshake shutdown"); + return TSI_HANDSHAKE_SHUTDOWN; + } + } handshaker->has_created_handshaker_client = true; } if (handshaker->channel == nullptr && @@ -324,18 +333,100 @@ static tsi_result handshaker_next( : grpc_slice_from_copied_buffer( reinterpret_cast(received_bytes), received_bytes_size); + tsi_result ok = TSI_OK; if (!handshaker->has_sent_start_message) { + handshaker->has_sent_start_message = true; ok = handshaker->is_client ? alts_handshaker_client_start_client(handshaker->client) : alts_handshaker_client_start_server(handshaker->client, &slice); - handshaker->has_sent_start_message = true; + // It's unsafe for the current thread to access any state in handshaker + // at this point, since alts_handshaker_client_start_client/server + // have potentially just started an op batch on the handshake call. + // The completion callback for that batch is unsynchronized and so + // can invoke the TSI next API callback from any thread, at which point + // there is nothing taking ownership of this handshaker to prevent it + // from being destroyed. } else { ok = alts_handshaker_client_next(handshaker->client, &slice); } grpc_slice_unref_internal(slice); - if (ok != TSI_OK) { - gpr_log(GPR_ERROR, "Failed to schedule ALTS handshaker requests"); - return ok; + return ok; +} + +struct alts_tsi_handshaker_continue_handshaker_next_args { + alts_tsi_handshaker* handshaker; + grpc_core::UniquePtr received_bytes; + size_t received_bytes_size; + tsi_handshaker_on_next_done_cb cb; + void* user_data; + grpc_closure closure; +}; + +static void alts_tsi_handshaker_create_channel(void* arg, + grpc_error* unused_error) { + alts_tsi_handshaker_continue_handshaker_next_args* next_args = + static_cast(arg); + alts_tsi_handshaker* handshaker = next_args->handshaker; + GPR_ASSERT(handshaker->channel == nullptr); + handshaker->channel = grpc_insecure_channel_create( + next_args->handshaker->handshaker_service_url, nullptr, nullptr); + tsi_result continue_next_result = + alts_tsi_handshaker_continue_handshaker_next( + handshaker, next_args->received_bytes.get(), + next_args->received_bytes_size, next_args->cb, next_args->user_data); + if (continue_next_result != TSI_OK) { + next_args->cb(continue_next_result, next_args->user_data, nullptr, 0, + nullptr); + } + grpc_core::Delete(next_args); +} + +static tsi_result handshaker_next( + tsi_handshaker* self, const unsigned char* received_bytes, + size_t received_bytes_size, const unsigned char** /*bytes_to_send*/, + size_t* /*bytes_to_send_size*/, tsi_handshaker_result** /*result*/, + tsi_handshaker_on_next_done_cb cb, void* user_data) { + if (self == nullptr || cb == nullptr) { + gpr_log(GPR_ERROR, "Invalid arguments to handshaker_next()"); + return TSI_INVALID_ARGUMENT; + } + alts_tsi_handshaker* handshaker = + reinterpret_cast(self); + { + grpc_core::MutexLock lock(&handshaker->mu); + if (handshaker->shutdown) { + gpr_log(GPR_ERROR, "TSI handshake shutdown"); + return TSI_HANDSHAKE_SHUTDOWN; + } + } + if (handshaker->channel == nullptr && !handshaker->use_dedicated_cq) { + alts_tsi_handshaker_continue_handshaker_next_args* args = + grpc_core::New(); + args->handshaker = handshaker; + args->received_bytes = nullptr; + args->received_bytes_size = received_bytes_size; + if (received_bytes_size > 0) { + args->received_bytes = grpc_core::UniquePtr( + static_cast(gpr_zalloc(received_bytes_size))); + memcpy(args->received_bytes.get(), received_bytes, received_bytes_size); + } + args->cb = cb; + args->user_data = user_data; + GRPC_CLOSURE_INIT(&args->closure, alts_tsi_handshaker_create_channel, args, + grpc_schedule_on_exec_ctx); + // We continue this handshaker_next call at the bottom of the ExecCtx just + // so that we can invoke grpc_channel_create at the bottom of the call + // stack. Doing so avoids potential lock cycles between g_init_mu and other + // mutexes within core that might be held on the current call stack + // (note that g_init_mu gets acquired during channel creation). + GRPC_CLOSURE_SCHED(&args->closure, GRPC_ERROR_NONE); + } else { + tsi_result ok = alts_tsi_handshaker_continue_handshaker_next( + handshaker, received_bytes, received_bytes_size, cb, user_data); + if (ok != TSI_OK) { + gpr_log(GPR_ERROR, "Failed to schedule ALTS handshaker requests"); + return ok; + } } return TSI_ASYNC; } @@ -358,12 +449,14 @@ static tsi_result handshaker_next_dedicated( static void handshaker_shutdown(tsi_handshaker* self) { GPR_ASSERT(self != nullptr); - if (self->handshake_shutdown) { - return; - } alts_tsi_handshaker* handshaker = reinterpret_cast(self); + grpc_core::MutexLock lock(&handshaker->mu); + if (handshaker->shutdown) { + return; + } alts_handshaker_client_shutdown(handshaker->client); + handshaker->shutdown = true; } static void handshaker_destroy(tsi_handshaker* self) { @@ -376,9 +469,10 @@ static void handshaker_destroy(tsi_handshaker* self) { grpc_slice_unref_internal(handshaker->target_name); grpc_alts_credentials_options_destroy(handshaker->options); if (handshaker->channel != nullptr) { - grpc_channel_destroy(handshaker->channel); + grpc_channel_destroy_internal(handshaker->channel); } gpr_free(handshaker->handshaker_service_url); + gpr_mu_destroy(&handshaker->mu); gpr_free(handshaker); } @@ -400,7 +494,8 @@ static const tsi_handshaker_vtable handshaker_vtable_dedicated = { bool alts_tsi_handshaker_has_shutdown(alts_tsi_handshaker* handshaker) { GPR_ASSERT(handshaker != nullptr); - return handshaker->base.handshake_shutdown; + grpc_core::MutexLock lock(&handshaker->mu); + return handshaker->shutdown; } tsi_result alts_tsi_handshaker_create( @@ -414,7 +509,8 @@ tsi_result alts_tsi_handshaker_create( } alts_tsi_handshaker* handshaker = static_cast(gpr_zalloc(sizeof(*handshaker))); - bool use_dedicated_cq = interested_parties == nullptr; + gpr_mu_init(&handshaker->mu); + handshaker->use_dedicated_cq = interested_parties == nullptr; handshaker->client = nullptr; handshaker->is_client = is_client; handshaker->has_sent_start_message = false; @@ -425,13 +521,9 @@ tsi_result alts_tsi_handshaker_create( handshaker->has_created_handshaker_client = false; handshaker->handshaker_service_url = gpr_strdup(handshaker_service_url); handshaker->options = grpc_alts_credentials_options_copy(options); - handshaker->base.vtable = - use_dedicated_cq ? &handshaker_vtable_dedicated : &handshaker_vtable; - handshaker->channel = - use_dedicated_cq - ? nullptr - : grpc_insecure_channel_create(handshaker->handshaker_service_url, - nullptr, nullptr); + handshaker->base.vtable = handshaker->use_dedicated_cq + ? &handshaker_vtable_dedicated + : &handshaker_vtable; *self = &handshaker->base; return TSI_OK; } diff --git a/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.h b/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.h index eb4bfdffa12..c6d767b5799 100644 --- a/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.h +++ b/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.h @@ -15,6 +15,10 @@ * limitations under the License. * */ + +#ifndef TEST_CORE_TSI_ALTS_FAKE_HANDSHAKER_FAKE_HANDSHAKER_SERVER_H +#define TEST_CORE_TSI_ALTS_FAKE_HANDSHAKER_FAKE_HANDSHAKER_SERVER_H + #include #include @@ -27,3 +31,5 @@ std::unique_ptr CreateFakeHandshakerService(); } // namespace gcp } // namespace grpc + +#endif // TEST_CORE_TSI_ALTS_FAKE_HANDSHAKER_FAKE_HANDSHAKER_SERVER_H diff --git a/test/core/tsi/alts/handshaker/BUILD b/test/core/tsi/alts/handshaker/BUILD index ed97056c003..42cf3b985f1 100644 --- a/test/core/tsi/alts/handshaker/BUILD +++ b/test/core/tsi/alts/handshaker/BUILD @@ -77,3 +77,22 @@ grpc_cc_test( "//test/core/util:grpc_test_util", ], ) + +grpc_cc_test( + name = "alts_concurrent_connectivity_test", + srcs = [ + "alts_concurrent_connectivity_test.cc", + ], + language = "C++", + deps = [ + "//:alts_util", + "//:grpc", + "//test/core/util:grpc_test_util", + "//test/core/tsi/alts/fake_handshaker:fake_handshaker_lib", + "//test/core/end2end:cq_verifier", + ], + external_deps = ["gtest"], + # TODO(apolcyn): make the fake TCP server used in this + # test portable to Windows. + tags = ["no_windows"], +) diff --git a/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc b/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc new file mode 100644 index 00000000000..204129ad0ba --- /dev/null +++ b/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc @@ -0,0 +1,476 @@ +/* + * + * Copyright 2018 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "src/core/lib/gpr/useful.h" +#include "src/core/lib/gprpp/host_port.h" +#include "src/core/lib/gprpp/thd.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/security/credentials/alts/alts_credentials.h" +#include "src/core/lib/security/credentials/credentials.h" +#include "src/core/lib/security/security_connector/alts/alts_security_connector.h" +#include "src/core/lib/slice/slice_string_helpers.h" + +#include "test/core/tsi/alts/fake_handshaker/fake_handshaker_server.h" +#include "test/core/util/memory_counters.h" +#include "test/core/util/port.h" +#include "test/core/util/test_config.h" + +#include "test/core/end2end/cq_verifier.h" + +namespace { + +void drain_cq(grpc_completion_queue* cq) { + grpc_event ev; + do { + ev = grpc_completion_queue_next( + cq, grpc_timeout_milliseconds_to_deadline(5000), nullptr); + } while (ev.type != GRPC_QUEUE_SHUTDOWN); +} + +grpc_channel* create_secure_channel_for_test( + const char* server_addr, const char* fake_handshake_server_addr) { + grpc_alts_credentials_options* alts_options = + grpc_alts_credentials_client_options_create(); + grpc_channel_credentials* channel_creds = + grpc_alts_credentials_create_customized(alts_options, + fake_handshake_server_addr, + true /* enable_untrusted_alts */); + grpc_alts_credentials_options_destroy(alts_options); + // The main goal of these tests are to stress concurrent ALTS handshakes, + // so we prevent subchnannel sharing. + grpc_arg disable_subchannel_sharing_arg = + grpc_channel_arg_integer_create(GRPC_ARG_USE_LOCAL_SUBCHANNEL_POOL, true); + grpc_channel_args channel_args = {1, &disable_subchannel_sharing_arg}; + grpc_channel* channel = grpc_secure_channel_create(channel_creds, server_addr, + &channel_args, nullptr); + grpc_channel_credentials_release(channel_creds); + return channel; +} + +class FakeHandshakeServer { + public: + FakeHandshakeServer() { + int port = grpc_pick_unused_port_or_die(); + grpc_core::JoinHostPort(&address_, "localhost", port); + service_ = grpc::gcp::CreateFakeHandshakerService(); + grpc::ServerBuilder builder; + builder.AddListeningPort(address_.get(), grpc::InsecureServerCredentials()); + builder.RegisterService(service_.get()); + server_ = builder.BuildAndStart(); + gpr_log(GPR_INFO, "Fake handshaker server listening on %s", address_.get()); + } + + ~FakeHandshakeServer() { + server_->Shutdown(grpc_timeout_milliseconds_to_deadline(0)); + } + + const char* address() { return address_.get(); } + + private: + grpc_core::UniquePtr address_; + std::unique_ptr service_; + std::unique_ptr server_; +}; + +class TestServer { + public: + explicit TestServer(const char* fake_handshake_server_address) { + grpc_alts_credentials_options* alts_options = + grpc_alts_credentials_server_options_create(); + grpc_server_credentials* server_creds = + grpc_alts_server_credentials_create_customized( + alts_options, fake_handshake_server_address, + true /* enable_untrusted_alts */); + grpc_alts_credentials_options_destroy(alts_options); + server_ = grpc_server_create(nullptr, nullptr); + server_cq_ = grpc_completion_queue_create_for_next(nullptr); + grpc_server_register_completion_queue(server_, server_cq_, nullptr); + int port = grpc_pick_unused_port_or_die(); + GPR_ASSERT(grpc_core::JoinHostPort(&server_addr_, "localhost", port)); + GPR_ASSERT(grpc_server_add_secure_http2_port(server_, server_addr_.get(), + server_creds)); + grpc_server_credentials_release(server_creds); + grpc_server_start(server_); + gpr_log(GPR_DEBUG, "Start TestServer %p. listen on %s", this, + server_addr_.get()); + server_thd_ = + std::unique_ptr(new std::thread(PollUntilShutdown, this)); + } + + ~TestServer() { + gpr_log(GPR_DEBUG, "Begin dtor of TestServer %p", this); + grpc_server_shutdown_and_notify(server_, server_cq_, this); + server_thd_->join(); + grpc_server_destroy(server_); + grpc_completion_queue_shutdown(server_cq_); + drain_cq(server_cq_); + grpc_completion_queue_destroy(server_cq_); + } + + const char* address() { return server_addr_.get(); } + + static void PollUntilShutdown(const TestServer* self) { + grpc_event ev = grpc_completion_queue_next( + self->server_cq_, gpr_inf_future(GPR_CLOCK_REALTIME), nullptr); + GPR_ASSERT(ev.type == GRPC_OP_COMPLETE); + GPR_ASSERT(ev.tag == self); + gpr_log(GPR_DEBUG, "TestServer %p stop polling", self); + } + + private: + grpc_server* server_; + grpc_completion_queue* server_cq_; + std::unique_ptr server_thd_; + grpc_core::UniquePtr server_addr_; +}; + +class ConnectLoopRunner { + public: + explicit ConnectLoopRunner( + const char* server_address, const char* fake_handshake_server_addr, + int per_connect_deadline_seconds, size_t loops, + grpc_connectivity_state expected_connectivity_states) + : server_address_(std::unique_ptr(gpr_strdup(server_address))), + fake_handshake_server_addr_( + std::unique_ptr(gpr_strdup(fake_handshake_server_addr))), + per_connect_deadline_seconds_(per_connect_deadline_seconds), + loops_(loops), + expected_connectivity_states_(expected_connectivity_states) { + thd_ = std::unique_ptr(new std::thread(ConnectLoop, this)); + } + + ~ConnectLoopRunner() { thd_->join(); } + + static void ConnectLoop(const ConnectLoopRunner* self) { + for (size_t i = 0; i < self->loops_; i++) { + gpr_log(GPR_DEBUG, "runner:%p connect_loop begin loop %ld", self, i); + grpc_completion_queue* cq = + grpc_completion_queue_create_for_next(nullptr); + grpc_channel* channel = create_secure_channel_for_test( + self->server_address_.get(), self->fake_handshake_server_addr_.get()); + // Connect, forcing an ALTS handshake + gpr_timespec connect_deadline = + grpc_timeout_seconds_to_deadline(self->per_connect_deadline_seconds_); + grpc_connectivity_state state = + grpc_channel_check_connectivity_state(channel, 1); + ASSERT_EQ(state, GRPC_CHANNEL_IDLE); + while (state != self->expected_connectivity_states_) { + if (self->expected_connectivity_states_ == + GRPC_CHANNEL_TRANSIENT_FAILURE) { + ASSERT_NE(state, GRPC_CHANNEL_READY); // sanity check + } else { + ASSERT_EQ(self->expected_connectivity_states_, GRPC_CHANNEL_READY); + } + grpc_channel_watch_connectivity_state( + channel, state, gpr_inf_future(GPR_CLOCK_REALTIME), cq, nullptr); + grpc_event ev = + grpc_completion_queue_next(cq, connect_deadline, nullptr); + ASSERT_EQ(ev.type, GRPC_OP_COMPLETE) + << "connect_loop runner:" << std::hex << self + << " got ev.type:" << ev.type << " i:" << i; + ASSERT_TRUE(ev.success); + state = grpc_channel_check_connectivity_state(channel, 1); + } + grpc_channel_destroy(channel); + grpc_completion_queue_shutdown(cq); + drain_cq(cq); + grpc_completion_queue_destroy(cq); + gpr_log(GPR_DEBUG, "runner:%p connect_loop finished loop %ld", self, i); + } + } + + private: + std::unique_ptr server_address_; + std::unique_ptr fake_handshake_server_addr_; + int per_connect_deadline_seconds_; + size_t loops_; + grpc_connectivity_state expected_connectivity_states_; + std::unique_ptr thd_; +}; + +// Perform a few ALTS handshakes sequentially (using the fake, in-process ALTS +// handshake server). +TEST(AltsConcurrentConnectivityTest, TestBasicClientServerHandshakes) { + FakeHandshakeServer fake_handshake_server; + TestServer test_server(fake_handshake_server.address()); + { + ConnectLoopRunner runner( + test_server.address(), fake_handshake_server.address(), + 5 /* per connect deadline seconds */, 10 /* loops */, + GRPC_CHANNEL_READY /* expected connectivity states */); + } +} + +/* Run a bunch of concurrent ALTS handshakes on concurrent channels + * (using the fake, in-process handshake server). */ +TEST(AltsConcurrentConnectivityTest, TestConcurrentClientServerHandshakes) { + FakeHandshakeServer fake_handshake_server; + // Test + { + TestServer test_server(fake_handshake_server.address()); + gpr_timespec test_deadline = grpc_timeout_seconds_to_deadline(20); + size_t num_concurrent_connects = 50; + std::vector> connect_loop_runners; + gpr_log(GPR_DEBUG, + "start performing concurrent expected-to-succeed connects"); + for (size_t i = 0; i < num_concurrent_connects; i++) { + connect_loop_runners.push_back( + std::unique_ptr(new ConnectLoopRunner( + test_server.address(), fake_handshake_server.address(), + 15 /* per connect deadline seconds */, 5 /* loops */, + GRPC_CHANNEL_READY /* expected connectivity states */))); + } + connect_loop_runners.clear(); + gpr_log(GPR_DEBUG, + "done performing concurrent expected-to-succeed connects"); + if (gpr_time_cmp(gpr_now(GPR_CLOCK_MONOTONIC), test_deadline) > 0) { + gpr_log(GPR_DEBUG, "Test took longer than expected."); + abort(); + } + } +} + +class FakeTcpServer { + public: + enum ProcessReadResult { + CONTINUE_READING, + CLOSE_SOCKET, + }; + + FakeTcpServer( + const std::function& process_read_cb) + : process_read_cb_(process_read_cb) { + port_ = grpc_pick_unused_port_or_die(); + accept_socket_ = socket(AF_INET6, SOCK_STREAM, 0); + char* addr_str; + GPR_ASSERT(gpr_asprintf(&addr_str, "[::]:%d", port_)); + address_ = std::unique_ptr(addr_str); + GPR_ASSERT(accept_socket_ != -1); + if (accept_socket_ == -1) { + gpr_log(GPR_ERROR, "Failed to create socket: %d", errno); + abort(); + } + int val = 1; + if (setsockopt(accept_socket_, SOL_SOCKET, SO_REUSEADDR, &val, + sizeof(val)) != 0) { + gpr_log(GPR_ERROR, + "Failed to set SO_REUSEADDR on socket bound to [::1]:%d : %d", + port_, errno); + abort(); + } + if (fcntl(accept_socket_, F_SETFL, O_NONBLOCK) != 0) { + gpr_log(GPR_ERROR, "Failed to set O_NONBLOCK on socket: %d", errno); + abort(); + } + sockaddr_in6 addr; + memset(&addr, 0, sizeof(addr)); + addr.sin6_family = AF_INET6; + addr.sin6_port = htons(port_); + ((char*)&addr.sin6_addr)[15] = 1; + if (bind(accept_socket_, (const sockaddr*)&addr, sizeof(addr)) != 0) { + gpr_log(GPR_ERROR, "Failed to bind socket to [::1]:%d : %d", port_, + errno); + abort(); + } + if (listen(accept_socket_, 100)) { + gpr_log(GPR_ERROR, "Failed to listen on socket bound to [::1]:%d : %d", + port_, errno); + abort(); + } + gpr_event_init(&stop_ev_); + run_server_loop_thd_ = + std::unique_ptr(new std::thread(RunServerLoop, this)); + } + + ~FakeTcpServer() { + gpr_log(GPR_DEBUG, + "FakeTcpServer stop and " + "join server thread"); + gpr_event_set(&stop_ev_, (void*)1); + run_server_loop_thd_->join(); + gpr_log(GPR_DEBUG, + "FakeTcpServer join server " + "thread complete"); + } + + const char* address() { return address_.get(); } + + static ProcessReadResult CloseSocketUponReceivingBytesFromPeer( + int bytes_received_size, int read_error, int s) { + if (bytes_received_size < 0 && read_error != EAGAIN && + read_error != EWOULDBLOCK) { + gpr_log(GPR_ERROR, "Failed to receive from peer socket: %d. errno: %d", s, + errno); + abort(); + } + if (bytes_received_size >= 0) { + gpr_log(GPR_DEBUG, + "Fake TCP server received %d bytes from peer socket: %d. Close " + "the " + "connection.", + bytes_received_size, s); + return CLOSE_SOCKET; + } + return CONTINUE_READING; + } + + static ProcessReadResult CloseSocketUponCloseFromPeer(int bytes_received_size, + int read_error, int s) { + if (bytes_received_size < 0 && read_error != EAGAIN && + read_error != EWOULDBLOCK) { + gpr_log(GPR_ERROR, "Failed to receive from peer socket: %d. errno: %d", s, + errno); + abort(); + } + if (bytes_received_size == 0) { + // The peer has shut down the connection. + gpr_log(GPR_DEBUG, + "Fake TCP server received 0 bytes from peer socket: %d. Close " + "the " + "connection.", + s); + return CLOSE_SOCKET; + } + return CONTINUE_READING; + } + + // Run a loop that periodically, every 10 ms: + // 1) Checks if there are any new TCP connections to accept. + // 2) Checks if any data has arrived yet on established connections, + // and reads from them if so, processing the sockets as configured. + static void RunServerLoop(FakeTcpServer* self) { + std::set peers; + while (!gpr_event_get(&self->stop_ev_)) { + int p = accept(self->accept_socket_, nullptr, nullptr); + if (p == -1 && errno != EAGAIN && errno != EWOULDBLOCK) { + gpr_log(GPR_ERROR, "Failed to accept connection: %d", errno); + abort(); + } + if (p != -1) { + gpr_log(GPR_DEBUG, "accepted peer socket: %d", p); + if (fcntl(p, F_SETFL, O_NONBLOCK) != 0) { + gpr_log(GPR_ERROR, + "Failed to set O_NONBLOCK on peer socket:%d errno:%d", p, + errno); + abort(); + } + peers.insert(p); + } + auto it = peers.begin(); + while (it != peers.end()) { + int p = *it; + char buf[100]; + int bytes_received_size = recv(p, buf, 100, 0); + ProcessReadResult r = + self->process_read_cb_(bytes_received_size, errno, p); + if (r == CLOSE_SOCKET) { + close(p); + it = peers.erase(it); + } else { + GPR_ASSERT(r == CONTINUE_READING); + it++; + } + } + gpr_sleep_until(gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC), + gpr_time_from_millis(10, GPR_TIMESPAN))); + } + for (auto it = peers.begin(); it != peers.end(); it++) { + close(*it); + } + close(self->accept_socket_); + } + + private: + int accept_socket_; + int port_; + gpr_event stop_ev_; + std::unique_ptr address_; + std::unique_ptr run_server_loop_thd_; + std::function process_read_cb_; +}; + +/* This test is intended to make sure that ALTS handshakes we correctly + * fail fast when the security handshaker gets an error while reading + * from the remote peer, after having earlier sent the first bytes of the + * ALTS handshake to the peer, i.e. after getting into the middle of a + * handshake. */ +TEST(AltsConcurrentConnectivityTest, + TestHandshakeFailsFastWhenPeerEndpointClosesConnectionAfterAccepting) { + FakeHandshakeServer fake_handshake_server; + FakeTcpServer fake_tcp_server( + FakeTcpServer::CloseSocketUponReceivingBytesFromPeer); + { + gpr_timespec test_deadline = grpc_timeout_seconds_to_deadline(20); + std::vector> connect_loop_runners; + size_t num_concurrent_connects = 100; + gpr_log(GPR_DEBUG, "start performing concurrent expected-to-fail connects"); + for (size_t i = 0; i < num_concurrent_connects; i++) { + connect_loop_runners.push_back(std::unique_ptr< + ConnectLoopRunner>(new ConnectLoopRunner( + fake_tcp_server.address(), fake_handshake_server.address(), + 10 /* per connect deadline seconds */, 3 /* loops */, + GRPC_CHANNEL_TRANSIENT_FAILURE /* expected connectivity states */))); + } + connect_loop_runners.clear(); + gpr_log(GPR_DEBUG, "done performing concurrent expected-to-fail connects"); + if (gpr_time_cmp(gpr_now(GPR_CLOCK_MONOTONIC), test_deadline) > 0) { + gpr_log(GPR_ERROR, + "Exceeded test deadline. ALTS handshakes might not be failing " + "fast when the peer endpoint closes the connection abruptly"); + abort(); + } + } +} + +} // namespace + +int main(int argc, char** argv) { + grpc_init(); + grpc::testing::TestEnvironment env(argc, argv); + ::testing::InitGoogleTest(&argc, argv); + auto result = RUN_ALL_TESTS(); + grpc_shutdown(); + return result; +} diff --git a/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc b/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc index 21e9e2c4397..b85f7501027 100644 --- a/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc +++ b/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc @@ -320,8 +320,12 @@ static tsi_result mock_client_start(alts_handshaker_client* client) { if (!should_handshaker_client_api_succeed) { return TSI_INTERNAL_ERROR; } + /* Note that the alts_tsi_handshaker needs to set its + * has_sent_start_message field field to true + * before the call to alts_handshaker_client_start is made because + * because it's unsafe to access it afterwards. */ alts_handshaker_client_check_fields_for_testing( - client, on_client_start_success_cb, nullptr, false, nullptr); + client, on_client_start_success_cb, nullptr, true, nullptr); /* Populate handshaker response for client_start request. */ grpc_byte_buffer** recv_buffer_ptr = alts_handshaker_client_get_recv_buffer_addr_for_testing(client); @@ -339,7 +343,7 @@ static tsi_result mock_server_start(alts_handshaker_client* client, return TSI_INTERNAL_ERROR; } alts_handshaker_client_check_fields_for_testing( - client, on_server_start_success_cb, nullptr, false, nullptr); + client, on_server_start_success_cb, nullptr, true, nullptr); grpc_slice slice = grpc_empty_slice(); GPR_ASSERT(grpc_slice_cmp(*bytes_received, slice) == 0); /* Populate handshaker response for server_start request. */ @@ -404,6 +408,12 @@ static tsi_handshaker* create_test_handshaker(bool is_client) { return handshaker; } +static void run_tsi_handshaker_destroy_with_exec_ctx( + tsi_handshaker* handshaker) { + grpc_core::ExecCtx exec_ctx; + tsi_handshaker_destroy(handshaker); +} + static void check_handshaker_next_invalid_input() { /* Initialization. */ tsi_handshaker* handshaker = create_test_handshaker(true); @@ -416,7 +426,7 @@ static void check_handshaker_next_invalid_input() { nullptr, nullptr, nullptr) == TSI_INVALID_ARGUMENT); /* Cleanup. */ - tsi_handshaker_destroy(handshaker); + run_tsi_handshaker_destroy_with_exec_ctx(handshaker); } static void check_handshaker_shutdown_invalid_input() { @@ -425,7 +435,7 @@ static void check_handshaker_shutdown_invalid_input() { /* Check nullptr handshaker. */ tsi_handshaker_shutdown(nullptr); /* Cleanup. */ - tsi_handshaker_destroy(handshaker); + run_tsi_handshaker_destroy_with_exec_ctx(handshaker); } static void check_handshaker_next_success() { @@ -462,8 +472,8 @@ static void check_handshaker_next_success() { nullptr, on_server_next_success_cb, nullptr) == TSI_ASYNC); wait(&tsi_to_caller_notification); /* Cleanup. */ - tsi_handshaker_destroy(server_handshaker); - tsi_handshaker_destroy(client_handshaker); + run_tsi_handshaker_destroy_with_exec_ctx(server_handshaker); + run_tsi_handshaker_destroy_with_exec_ctx(client_handshaker); } static void check_handshaker_next_with_shutdown() { @@ -481,7 +491,7 @@ static void check_handshaker_next_with_shutdown() { nullptr, on_client_next_success_cb, nullptr) == TSI_HANDSHAKE_SHUTDOWN); /* Cleanup. */ - tsi_handshaker_destroy(handshaker); + run_tsi_handshaker_destroy_with_exec_ctx(handshaker); } static void check_handle_response_with_shutdown(void* /*unused*/) { @@ -520,8 +530,8 @@ static void check_handshaker_next_failure() { nullptr, check_must_not_be_called, nullptr) == TSI_INTERNAL_ERROR); /* Cleanup. */ - tsi_handshaker_destroy(server_handshaker); - tsi_handshaker_destroy(client_handshaker); + run_tsi_handshaker_destroy_with_exec_ctx(server_handshaker); + run_tsi_handshaker_destroy_with_exec_ctx(client_handshaker); } static void on_invalid_input_cb(tsi_result status, void* user_data, @@ -584,7 +594,7 @@ static void check_handle_response_invalid_input() { alts_handshaker_client_handle_response(client, false); /* Cleanup. */ grpc_slice_unref(slice); - tsi_handshaker_destroy(handshaker); + run_tsi_handshaker_destroy_with_exec_ctx(handshaker); notification_destroy(&caller_to_tsi_notification); notification_destroy(&tsi_to_caller_notification); } @@ -622,7 +632,7 @@ static void check_handle_response_invalid_resp() { recv_buffer, GRPC_STATUS_OK); alts_handshaker_client_handle_response(client, true); /* Cleanup. */ - tsi_handshaker_destroy(handshaker); + run_tsi_handshaker_destroy_with_exec_ctx(handshaker); notification_destroy(&caller_to_tsi_notification); notification_destroy(&tsi_to_caller_notification); } @@ -675,7 +685,7 @@ static void check_handle_response_failure() { recv_buffer, GRPC_STATUS_OK); alts_handshaker_client_handle_response(client, true /* is_ok*/); /* Cleanup. */ - tsi_handshaker_destroy(handshaker); + run_tsi_handshaker_destroy_with_exec_ctx(handshaker); notification_destroy(&caller_to_tsi_notification); notification_destroy(&tsi_to_caller_notification); } @@ -714,7 +724,7 @@ static void check_handle_response_after_shutdown() { recv_buffer, GRPC_STATUS_OK); alts_handshaker_client_handle_response(client, true); /* Cleanup. */ - tsi_handshaker_destroy(handshaker); + run_tsi_handshaker_destroy_with_exec_ctx(handshaker); notification_destroy(&caller_to_tsi_notification); notification_destroy(&tsi_to_caller_notification); } diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json index 3c1d60bf699..b504ebbd08e 100644 --- a/tools/run_tests/generated/tests.json +++ b/tools/run_tests/generated/tests.json @@ -3035,6 +3035,24 @@ ], "uses_polling": true }, + { + "args": [], + "benchmark": false, + "ci_platforms": [ + "linux" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": false, + "language": "c++", + "name": "alts_concurrent_connectivity_test", + "platforms": [ + "linux" + ], + "uses_polling": true + }, { "args": [], "benchmark": false, From dcafa22cd32fce7501aade420b1b46a66d6286b4 Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Mon, 4 Nov 2019 15:58:28 -0800 Subject: [PATCH 068/133] Enable Java interop tests for compression and status --- tools/run_tests/run_interop_tests.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py index 28ca7f852d1..720c4fba24b 100755 --- a/tools/run_tests/run_interop_tests.py +++ b/tools/run_tests/run_interop_tests.py @@ -279,7 +279,9 @@ class JavaLanguage: return [] def unimplemented_test_cases_server(self): - return _SKIP_COMPRESSION + # Does not support CompressedRequest feature. + # Only supports CompressedResponse feature for unary. + return _SKIP_CLIENT_COMPRESSION + ['server_compressed_streaming'] def __str__(self): return 'java' @@ -301,7 +303,7 @@ class JavaOkHttpClient: return {} def unimplemented_test_cases(self): - return _SKIP_DATA_FRAME_PADDING + _SKIP_SPECIAL_STATUS_MESSAGE + return _SKIP_DATA_FRAME_PADDING def __str__(self): return 'javaokhttp' From 8c7b77489b4b53a457682e157084632d5bb9e0d7 Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Mon, 4 Nov 2019 16:09:46 -0800 Subject: [PATCH 069/133] Rename to InactiveRpcError --- src/python/grpcio/grpc/_channel.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/python/grpcio/grpc/_channel.py b/src/python/grpcio/grpc/_channel.py index 4044228bbb8..f75db5d2ab6 100644 --- a/src/python/grpcio/grpc/_channel.py +++ b/src/python/grpcio/grpc/_channel.py @@ -264,7 +264,7 @@ def _rpc_state_string(class_name, rpc_state): rpc_state.debug_error_string) -class _RpcError(grpc.RpcError, grpc.Call, grpc.Future): +class _InactiveRpcError(grpc.RpcError, grpc.Call, grpc.Future): """An RPC error not tied to the execution of a particular RPC. The RPC represented by the state object must not be in-progress or @@ -703,7 +703,7 @@ def _start_unary_request(request, timeout, request_serializer): if serialized_request is None: state = _RPCState((), (), (), grpc.StatusCode.INTERNAL, 'Exception serializing request!') - error = _RpcError(state) + error = _InactiveRpcError(state) return deadline, None, error else: return deadline, serialized_request, None @@ -717,7 +717,7 @@ def _end_unary_response_blocking(state, call, with_call, deadline): else: return state.response else: - raise _RpcError(state) + raise _InactiveRpcError(state) def _stream_unary_invocation_operationses(metadata, initial_metadata_flags): @@ -875,7 +875,7 @@ class _SingleThreadedUnaryStreamMultiCallable(grpc.UnaryStreamMultiCallable): if serialized_request is None: state = _RPCState((), (), (), grpc.StatusCode.INTERNAL, 'Exception serializing request!') - raise _RpcError(state) + raise _InactiveRpcError(state) state = _RPCState(_UNARY_STREAM_INITIAL_DUE, None, None, None, None) call_credentials = None if credentials is None else credentials._credentials From 8de389b9400be044107094a870c107756f2aeb65 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Mon, 4 Nov 2019 17:05:51 -0800 Subject: [PATCH 070/133] Update by review --- cmake/ssl.cmake | 4 ++++ cmake/zlib.cmake | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake index a983e98650c..2c6a0adcd50 100644 --- a/cmake/ssl.cmake +++ b/cmake/ssl.cmake @@ -12,6 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. +# The CMakeLists.txt for BoringSSL doesn't propagate include directories +# transitively so `_gRPC_SSL_INCLUDE_DIR` should be set for gRPC +# to find header files. + if(gRPC_SSL_PROVIDER STREQUAL "module") if(NOT BORINGSSL_ROOT_DIR) set(BORINGSSL_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/boringssl) diff --git a/cmake/zlib.cmake b/cmake/zlib.cmake index 794e47f7aa5..858d3b42fee 100644 --- a/cmake/zlib.cmake +++ b/cmake/zlib.cmake @@ -12,6 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. +# The CMakeLists.txt for zlib doesn't propagate include directories +# transitively so `_gRPC_ZLIB_INCLUDE_DIR` should be set for gRPC +# to find header files. + if(gRPC_ZLIB_PROVIDER STREQUAL "module") if(NOT ZLIB_ROOT_DIR) set(ZLIB_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zlib) From 81df105ac89467ba2b9d150e73709f0a7f0ffa05 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Wed, 2 Oct 2019 17:18:41 -0700 Subject: [PATCH 071/133] Deprecate gpr_get/set_allocation_functions --- BUILD | 2 +- CMakeLists.txt | 92 +---- Makefile | 147 ++------ build.yaml | 41 +-- build_config.rb | 2 +- grpc.def | 2 - include/grpc/support/alloc.h | 16 - src/core/lib/gpr/alloc.cc | 33 +- src/core/lib/surface/version.cc | 2 +- src/objective-c/tests/version.h | 2 +- src/ruby/ext/grpc/rb_grpc_imports.generated.c | 4 - src/ruby/ext/grpc/rb_grpc_imports.generated.h | 6 - test/core/end2end/fuzzers/client_fuzzer.cc | 2 - test/core/end2end/fuzzers/server_fuzzer.cc | 2 - test/core/gpr/alloc_test.cc | 31 -- test/core/json/fuzzer.cc | 2 - test/core/memory_usage/BUILD | 59 --- test/core/memory_usage/client.cc | 340 ------------------ test/core/memory_usage/memory_usage_test.cc | 80 ----- test/core/memory_usage/server.cc | 324 ----------------- test/core/security/alts_credentials_fuzzer.cc | 2 - test/core/security/ssl_server_fuzzer.cc | 2 - test/core/slice/percent_decode_fuzzer.cc | 2 - test/core/slice/percent_encode_fuzzer.cc | 2 - .../core/surface/public_headers_must_be_c89.c | 2 - test/core/util/memory_counters.cc | 90 +++-- tools/doxygen/Doxyfile.core | 2 +- tools/doxygen/Doxyfile.core.internal | 2 +- tools/run_tests/generated/configs.json | 3 + tools/run_tests/generated/tests.json | 99 +++-- 30 files changed, 181 insertions(+), 1214 deletions(-) delete mode 100644 test/core/memory_usage/BUILD delete mode 100644 test/core/memory_usage/client.cc delete mode 100644 test/core/memory_usage/memory_usage_test.cc delete mode 100644 test/core/memory_usage/server.cc diff --git a/BUILD b/BUILD index aaa38184cfd..182fa9d54ed 100644 --- a/BUILD +++ b/BUILD @@ -74,7 +74,7 @@ python_config_settings() # This should be updated along with build.yaml g_stands_for = "gon" -core_version = "7.0.0" +core_version = "9.0.0" version = "1.26.0-dev" diff --git a/CMakeLists.txt b/CMakeLists.txt index ce4d55a04ac..1271a218f89 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,8 +26,8 @@ cmake_minimum_required(VERSION 3.5.1) set(PACKAGE_NAME "grpc") set(PACKAGE_VERSION "1.26.0-dev") -set(gRPC_CORE_VERSION "8.0.0") -set(gRPC_CORE_SOVERSION "8") +set(gRPC_CORE_VERSION "9.0.0") +set(gRPC_CORE_SOVERSION "9") set(gRPC_CPP_VERSION "1.26.0-dev") set(gRPC_CPP_SOVERSION "1") set(gRPC_CSHARP_VERSION "2.26.0-dev") @@ -447,11 +447,6 @@ if(gRPC_BUILD_TESTS) add_dependencies(buildtests_c json_test) add_dependencies(buildtests_c lame_client_test) add_dependencies(buildtests_c load_file_test) - add_dependencies(buildtests_c memory_usage_client) - add_dependencies(buildtests_c memory_usage_server) - if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) - add_dependencies(buildtests_c memory_usage_test) - endif() add_dependencies(buildtests_c message_compress_test) add_dependencies(buildtests_c minimal_stack_is_minimal_test) add_dependencies(buildtests_c mpmcqueue_test) @@ -8171,89 +8166,6 @@ target_link_libraries(load_file_test endif() if(gRPC_BUILD_TESTS) -add_executable(memory_usage_client - test/core/memory_usage/client.cc -) - -target_include_directories(memory_usage_client - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_SSL_INCLUDE_DIR} - ${_gRPC_UPB_GENERATED_DIR} - ${_gRPC_UPB_GRPC_GENERATED_DIR} - ${_gRPC_UPB_INCLUDE_DIR} - ${_gRPC_ZLIB_INCLUDE_DIR} -) - -target_link_libraries(memory_usage_client - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - grpc - gpr -) - - -endif() -if(gRPC_BUILD_TESTS) - -add_executable(memory_usage_server - test/core/memory_usage/server.cc -) - -target_include_directories(memory_usage_server - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_SSL_INCLUDE_DIR} - ${_gRPC_UPB_GENERATED_DIR} - ${_gRPC_UPB_GRPC_GENERATED_DIR} - ${_gRPC_UPB_INCLUDE_DIR} - ${_gRPC_ZLIB_INCLUDE_DIR} -) - -target_link_libraries(memory_usage_server - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - grpc - gpr -) - - -endif() -if(gRPC_BUILD_TESTS) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) - - add_executable(memory_usage_test - test/core/memory_usage/memory_usage_test.cc - ) - - target_include_directories(memory_usage_test - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_SSL_INCLUDE_DIR} - ${_gRPC_UPB_GENERATED_DIR} - ${_gRPC_UPB_GRPC_GENERATED_DIR} - ${_gRPC_UPB_INCLUDE_DIR} - ${_gRPC_ZLIB_INCLUDE_DIR} - ) - - target_link_libraries(memory_usage_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - grpc - gpr - ) - - -endif() -endif() -if(gRPC_BUILD_TESTS) - add_executable(message_compress_test test/core/compression/message_compress_test.cc ) diff --git a/Makefile b/Makefile index 82f6a32b895..49a3a204385 100644 --- a/Makefile +++ b/Makefile @@ -171,6 +171,15 @@ CPPFLAGS_tsan = -O0 -fsanitize=thread -fno-omit-frame-pointer -Wno-unused-comman LDFLAGS_tsan = -fsanitize=thread DEFINES_tsan = GRPC_TSAN +VALID_CONFIG_counters_with_memory_counter = 1 +CC_counters_with_memory_counter = $(DEFAULT_CC) +CXX_counters_with_memory_counter = $(DEFAULT_CXX) +LD_counters_with_memory_counter = $(DEFAULT_CC) +LDXX_counters_with_memory_counter = $(DEFAULT_CXX) +CPPFLAGS_counters_with_memory_counter = -O2 -DGPR_LOW_LEVEL_COUNTERS -DGPR_WRAP_MEMORY_COUNTER +LDFLAGS_counters_with_memory_counter = -Wl,--wrap=malloc -Wl,--wrap=calloc -Wl,--wrap=realloc -Wl,--wrap=free +DEFINES_counters_with_memory_counter = NDEBUG + VALID_CONFIG_stapprof = 1 CC_stapprof = $(DEFAULT_CC) CXX_stapprof = $(DEFAULT_CXX) @@ -460,7 +469,7 @@ E = @echo Q = @ endif -CORE_VERSION = 8.0.0 +CORE_VERSION = 9.0.0 CPP_VERSION = 1.26.0-dev CSHARP_VERSION = 2.26.0-dev @@ -510,7 +519,7 @@ SHARED_EXT_CORE = dll SHARED_EXT_CPP = dll SHARED_EXT_CSHARP = dll SHARED_PREFIX = -SHARED_VERSION_CORE = -8 +SHARED_VERSION_CORE = -9 SHARED_VERSION_CPP = -1 SHARED_VERSION_CSHARP = -2 else ifeq ($(SYSTEM),Darwin) @@ -1088,9 +1097,6 @@ json_test: $(BINDIR)/$(CONFIG)/json_test lame_client_test: $(BINDIR)/$(CONFIG)/lame_client_test load_file_test: $(BINDIR)/$(CONFIG)/load_file_test low_level_ping_pong_benchmark: $(BINDIR)/$(CONFIG)/low_level_ping_pong_benchmark -memory_usage_client: $(BINDIR)/$(CONFIG)/memory_usage_client -memory_usage_server: $(BINDIR)/$(CONFIG)/memory_usage_server -memory_usage_test: $(BINDIR)/$(CONFIG)/memory_usage_test message_compress_test: $(BINDIR)/$(CONFIG)/message_compress_test minimal_stack_is_minimal_test: $(BINDIR)/$(CONFIG)/minimal_stack_is_minimal_test mpmcqueue_test: $(BINDIR)/$(CONFIG)/mpmcqueue_test @@ -1520,9 +1526,6 @@ buildtests_c: privatelibs_c \ $(BINDIR)/$(CONFIG)/json_test \ $(BINDIR)/$(CONFIG)/lame_client_test \ $(BINDIR)/$(CONFIG)/load_file_test \ - $(BINDIR)/$(CONFIG)/memory_usage_client \ - $(BINDIR)/$(CONFIG)/memory_usage_server \ - $(BINDIR)/$(CONFIG)/memory_usage_test \ $(BINDIR)/$(CONFIG)/message_compress_test \ $(BINDIR)/$(CONFIG)/minimal_stack_is_minimal_test \ $(BINDIR)/$(CONFIG)/mpmcqueue_test \ @@ -2132,8 +2135,6 @@ test_c: buildtests_c $(Q) $(BINDIR)/$(CONFIG)/lame_client_test || ( echo test lame_client_test failed ; exit 1 ) $(E) "[RUN] Testing load_file_test" $(Q) $(BINDIR)/$(CONFIG)/load_file_test || ( echo test load_file_test failed ; exit 1 ) - $(E) "[RUN] Testing memory_usage_test" - $(Q) $(BINDIR)/$(CONFIG)/memory_usage_test || ( echo test memory_usage_test failed ; exit 1 ) $(E) "[RUN] Testing message_compress_test" $(Q) $(BINDIR)/$(CONFIG)/message_compress_test || ( echo test message_compress_test failed ; exit 1 ) $(E) "[RUN] Testing minimal_stack_is_minimal_test" @@ -3168,7 +3169,7 @@ install-shared_c: shared_c strip-shared_c install-pkg-config_c ifeq ($(SYSTEM),MINGW32) $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE)-dll.a $(prefix)/lib/libaddress_sorting.a else ifneq ($(SYSTEM),Darwin) - $(Q) ln -sf $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libaddress_sorting.so.8 + $(Q) ln -sf $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libaddress_sorting.so.9 $(Q) ln -sf $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libaddress_sorting.so endif $(E) "[INSTALL] Installing $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)" @@ -3177,7 +3178,7 @@ endif ifeq ($(SYSTEM),MINGW32) $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE)-dll.a $(prefix)/lib/libgpr.a else ifneq ($(SYSTEM),Darwin) - $(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgpr.so.8 + $(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgpr.so.9 $(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgpr.so endif $(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)" @@ -3186,7 +3187,7 @@ endif ifeq ($(SYSTEM),MINGW32) $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE)-dll.a $(prefix)/lib/libgrpc.a else ifneq ($(SYSTEM),Darwin) - $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc.so.8 + $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc.so.9 $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc.so endif $(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)" @@ -3195,7 +3196,7 @@ endif ifeq ($(SYSTEM),MINGW32) $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE)-dll.a $(prefix)/lib/libgrpc_cronet.a else ifneq ($(SYSTEM),Darwin) - $(Q) ln -sf $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc_cronet.so.8 + $(Q) ln -sf $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc_cronet.so.9 $(Q) ln -sf $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc_cronet.so endif $(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)" @@ -3204,7 +3205,7 @@ endif ifeq ($(SYSTEM),MINGW32) $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE)-dll.a $(prefix)/lib/libgrpc_unsecure.a else ifneq ($(SYSTEM),Darwin) - $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc_unsecure.so.8 + $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc_unsecure.so.9 $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc_unsecure.so endif ifneq ($(SYSTEM),MINGW32) @@ -3365,8 +3366,8 @@ $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): ifeq ($(SYSTEM),Darwin) $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBADDRESS_SORTING_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS) else - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libaddress_sorting.so.8 -o $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBADDRESS_SORTING_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS) - $(Q) ln -sf $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).so.8 + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libaddress_sorting.so.9 -o $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBADDRESS_SORTING_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS) + $(Q) ln -sf $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).so.9 $(Q) ln -sf $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).so endif endif @@ -3517,8 +3518,8 @@ $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGPR_OB ifeq ($(SYSTEM),Darwin) $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS) else - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgpr.so.8 -o $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS) - $(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).so.8 + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgpr.so.9 -o $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS) + $(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).so.9 $(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).so endif endif @@ -3984,8 +3985,8 @@ $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_ ifeq ($(SYSTEM),Darwin) $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS) else - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.8 -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS) - $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so.8 + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.9 -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS) + $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so.9 $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so endif endif @@ -4383,8 +4384,8 @@ $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(L ifeq ($(SYSTEM),Darwin) $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_CRONET_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS) else - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_cronet.so.8 -o $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_CRONET_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS) - $(Q) ln -sf $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).so.8 + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_cronet.so.9 -o $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_CRONET_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS) + $(Q) ln -sf $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).so.9 $(Q) ln -sf $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).so endif endif @@ -5430,8 +5431,8 @@ $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $ ifeq ($(SYSTEM),Darwin) $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS) else - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_unsecure.so.8 -o $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS) - $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).so.8 + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_unsecure.so.9 -o $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS) + $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).so.9 $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).so endif endif @@ -11601,102 +11602,6 @@ endif endif -MEMORY_USAGE_CLIENT_SRC = \ - test/core/memory_usage/client.cc \ - -MEMORY_USAGE_CLIENT_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(MEMORY_USAGE_CLIENT_SRC)))) -ifeq ($(NO_SECURE),true) - -# You can't build secure targets if you don't have OpenSSL. - -$(BINDIR)/$(CONFIG)/memory_usage_client: openssl_dep_error - -else - - - -$(BINDIR)/$(CONFIG)/memory_usage_client: $(MEMORY_USAGE_CLIENT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a - $(E) "[LD] Linking $@" - $(Q) mkdir -p `dirname $@` - $(Q) $(LDXX) $(LDFLAGS) $(MEMORY_USAGE_CLIENT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/memory_usage_client - -endif - -$(OBJDIR)/$(CONFIG)/test/core/memory_usage/client.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a - -deps_memory_usage_client: $(MEMORY_USAGE_CLIENT_OBJS:.o=.dep) - -ifneq ($(NO_SECURE),true) -ifneq ($(NO_DEPS),true) --include $(MEMORY_USAGE_CLIENT_OBJS:.o=.dep) -endif -endif - - -MEMORY_USAGE_SERVER_SRC = \ - test/core/memory_usage/server.cc \ - -MEMORY_USAGE_SERVER_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(MEMORY_USAGE_SERVER_SRC)))) -ifeq ($(NO_SECURE),true) - -# You can't build secure targets if you don't have OpenSSL. - -$(BINDIR)/$(CONFIG)/memory_usage_server: openssl_dep_error - -else - - - -$(BINDIR)/$(CONFIG)/memory_usage_server: $(MEMORY_USAGE_SERVER_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a - $(E) "[LD] Linking $@" - $(Q) mkdir -p `dirname $@` - $(Q) $(LDXX) $(LDFLAGS) $(MEMORY_USAGE_SERVER_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/memory_usage_server - -endif - -$(OBJDIR)/$(CONFIG)/test/core/memory_usage/server.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a - -deps_memory_usage_server: $(MEMORY_USAGE_SERVER_OBJS:.o=.dep) - -ifneq ($(NO_SECURE),true) -ifneq ($(NO_DEPS),true) --include $(MEMORY_USAGE_SERVER_OBJS:.o=.dep) -endif -endif - - -MEMORY_USAGE_TEST_SRC = \ - test/core/memory_usage/memory_usage_test.cc \ - -MEMORY_USAGE_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(MEMORY_USAGE_TEST_SRC)))) -ifeq ($(NO_SECURE),true) - -# You can't build secure targets if you don't have OpenSSL. - -$(BINDIR)/$(CONFIG)/memory_usage_test: openssl_dep_error - -else - - - -$(BINDIR)/$(CONFIG)/memory_usage_test: $(MEMORY_USAGE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a - $(E) "[LD] Linking $@" - $(Q) mkdir -p `dirname $@` - $(Q) $(LDXX) $(LDFLAGS) $(MEMORY_USAGE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/memory_usage_test - -endif - -$(OBJDIR)/$(CONFIG)/test/core/memory_usage/memory_usage_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a - -deps_memory_usage_test: $(MEMORY_USAGE_TEST_OBJS:.o=.dep) - -ifneq ($(NO_SECURE),true) -ifneq ($(NO_DEPS),true) --include $(MEMORY_USAGE_TEST_OBJS:.o=.dep) -endif -endif - - MESSAGE_COMPRESS_TEST_SRC = \ test/core/compression/message_compress_test.cc \ diff --git a/build.yaml b/build.yaml index 78a5d32d76a..b56ee50c6ec 100644 --- a/build.yaml +++ b/build.yaml @@ -12,7 +12,7 @@ settings: '#08': Use "-preN" suffixes to identify pre-release versions '#09': Per-language overrides are possible with (eg) ruby_version tag here '#10': See the expand_version.py for all the quirks here - core_version: 8.0.0 + core_version: 9.0.0 csharp_major_version: 2 g_stands_for: gon version: 1.26.0-dev @@ -3317,41 +3317,6 @@ targets: - mac - linux - posix -- name: memory_usage_client - build: test - run: false - language: c - src: - - test/core/memory_usage/client.cc - deps: - - grpc_test_util - - grpc - - gpr - uses_polling: false -- name: memory_usage_server - build: test - run: false - language: c - src: - - test/core/memory_usage/server.cc - deps: - - grpc_test_util - - grpc - - gpr -- name: memory_usage_test - cpu_cost: 1.5 - build: test - language: c - src: - - test/core/memory_usage/memory_usage_test.cc - deps: - - grpc_test_util - - grpc - - gpr - platforms: - - mac - - linux - - posix - name: message_compress_test build: test language: c @@ -6146,6 +6111,10 @@ configs: counters: CPPFLAGS: -O2 -DGPR_LOW_LEVEL_COUNTERS DEFINES: NDEBUG + counters_with_memory_counter: + CPPFLAGS: -O2 -DGPR_LOW_LEVEL_COUNTERS -DGPR_WRAP_MEMORY_COUNTER + DEFINES: NDEBUG + LDFLAGS: -Wl,--wrap=malloc -Wl,--wrap=calloc -Wl,--wrap=realloc -Wl,--wrap=free dbg: CPPFLAGS: -O0 DEFINES: _DEBUG DEBUG diff --git a/build_config.rb b/build_config.rb index 7bd312cd2b6..46cb53f4516 100644 --- a/build_config.rb +++ b/build_config.rb @@ -13,5 +13,5 @@ # limitations under the License. module GrpcBuildConfig - CORE_WINDOWS_DLL = '/tmp/libs/opt/grpc-8.dll' + CORE_WINDOWS_DLL = '/tmp/libs/opt/grpc-9.dll' end diff --git a/grpc.def b/grpc.def index fa4d73c9252..ff68b965eb2 100644 --- a/grpc.def +++ b/grpc.def @@ -217,8 +217,6 @@ EXPORTS gpr_realloc gpr_malloc_aligned gpr_free_aligned - gpr_set_allocation_functions - gpr_get_allocation_functions gpr_cpu_num_cores gpr_cpu_current_cpu gpr_format_message diff --git a/include/grpc/support/alloc.h b/include/grpc/support/alloc.h index 8bd940bec47..d440e4be8c2 100644 --- a/include/grpc/support/alloc.h +++ b/include/grpc/support/alloc.h @@ -27,13 +27,6 @@ extern "C" { #endif -typedef struct gpr_allocation_functions { - void* (*malloc_fn)(size_t size); - void* (*zalloc_fn)(size_t size); /** if NULL, uses malloc_fn then memset */ - void* (*realloc_fn)(void* ptr, size_t size); - void (*free_fn)(void* ptr); -} gpr_allocation_functions; - /** malloc. * If size==0, always returns NULL. Otherwise this function never returns NULL. * The pointer returned is suitably aligned for any kind of variable it could @@ -52,15 +45,6 @@ GPRAPI void* gpr_malloc_aligned(size_t size, size_t alignment); /** free memory allocated by gpr_malloc_aligned */ GPRAPI void gpr_free_aligned(void* ptr); -/** Request the family of allocation functions in \a functions be used. NOTE - * that this request will be honored in a *best effort* basis and that no - * guarantees are made about the default functions (eg, malloc) being called. - * The functions.free_fn implementation must be a no-op for NULL input. */ -GPRAPI void gpr_set_allocation_functions(gpr_allocation_functions functions); - -/** Return the family of allocation functions currently in effect. */ -GPRAPI gpr_allocation_functions gpr_get_allocation_functions(void); - #ifdef __cplusplus } #endif diff --git a/src/core/lib/gpr/alloc.cc b/src/core/lib/gpr/alloc.cc index 611e4cceee4..8c7345b7db5 100644 --- a/src/core/lib/gpr/alloc.cc +++ b/src/core/lib/gpr/alloc.cc @@ -25,36 +25,11 @@ #include #include "src/core/lib/profiling/timers.h" -static void* zalloc_with_calloc(size_t sz) { return calloc(sz, 1); } - -static void* zalloc_with_gpr_malloc(size_t sz) { - void* p = gpr_malloc(sz); - memset(p, 0, sz); - return p; -} - -static gpr_allocation_functions g_alloc_functions = {malloc, zalloc_with_calloc, - realloc, free}; - -gpr_allocation_functions gpr_get_allocation_functions() { - return g_alloc_functions; -} - -void gpr_set_allocation_functions(gpr_allocation_functions functions) { - GPR_ASSERT(functions.malloc_fn != nullptr); - GPR_ASSERT(functions.realloc_fn != nullptr); - GPR_ASSERT(functions.free_fn != nullptr); - if (functions.zalloc_fn == nullptr) { - functions.zalloc_fn = zalloc_with_gpr_malloc; - } - g_alloc_functions = functions; -} - void* gpr_malloc(size_t size) { GPR_TIMER_SCOPE("gpr_malloc", 0); void* p; if (size == 0) return nullptr; - p = g_alloc_functions.malloc_fn(size); + p = malloc(size); if (!p) { abort(); } @@ -65,7 +40,7 @@ void* gpr_zalloc(size_t size) { GPR_TIMER_SCOPE("gpr_zalloc", 0); void* p; if (size == 0) return nullptr; - p = g_alloc_functions.zalloc_fn(size); + p = calloc(size, 1); if (!p) { abort(); } @@ -74,13 +49,13 @@ void* gpr_zalloc(size_t size) { void gpr_free(void* p) { GPR_TIMER_SCOPE("gpr_free", 0); - g_alloc_functions.free_fn(p); + free(p); } void* gpr_realloc(void* p, size_t size) { GPR_TIMER_SCOPE("gpr_realloc", 0); if ((size == 0) && (p == nullptr)) return nullptr; - p = g_alloc_functions.realloc_fn(p, size); + p = realloc(p, size); if (!p) { abort(); } diff --git a/src/core/lib/surface/version.cc b/src/core/lib/surface/version.cc index fde716acd3b..8f3fab19775 100644 --- a/src/core/lib/surface/version.cc +++ b/src/core/lib/surface/version.cc @@ -23,6 +23,6 @@ #include -const char* grpc_version_string(void) { return "8.0.0"; } +const char* grpc_version_string(void) { return "9.0.0"; } const char* grpc_g_stands_for(void) { return "gon"; } diff --git a/src/objective-c/tests/version.h b/src/objective-c/tests/version.h index 2e7f5f5216c..20a36e0f6bd 100644 --- a/src/objective-c/tests/version.h +++ b/src/objective-c/tests/version.h @@ -23,4 +23,4 @@ // `tools/buildgen/generate_projects.sh`. #define GRPC_OBJC_VERSION_STRING @"1.26.0-dev" -#define GRPC_C_VERSION_STRING @"8.0.0" +#define GRPC_C_VERSION_STRING @"9.0.0" diff --git a/src/ruby/ext/grpc/rb_grpc_imports.generated.c b/src/ruby/ext/grpc/rb_grpc_imports.generated.c index 6cb10c9126c..e75b83ba17e 100644 --- a/src/ruby/ext/grpc/rb_grpc_imports.generated.c +++ b/src/ruby/ext/grpc/rb_grpc_imports.generated.c @@ -240,8 +240,6 @@ gpr_free_type gpr_free_import; gpr_realloc_type gpr_realloc_import; gpr_malloc_aligned_type gpr_malloc_aligned_import; gpr_free_aligned_type gpr_free_aligned_import; -gpr_set_allocation_functions_type gpr_set_allocation_functions_import; -gpr_get_allocation_functions_type gpr_get_allocation_functions_import; gpr_cpu_num_cores_type gpr_cpu_num_cores_import; gpr_cpu_current_cpu_type gpr_cpu_current_cpu_import; gpr_format_message_type gpr_format_message_import; @@ -513,8 +511,6 @@ void grpc_rb_load_imports(HMODULE library) { gpr_realloc_import = (gpr_realloc_type) GetProcAddress(library, "gpr_realloc"); gpr_malloc_aligned_import = (gpr_malloc_aligned_type) GetProcAddress(library, "gpr_malloc_aligned"); gpr_free_aligned_import = (gpr_free_aligned_type) GetProcAddress(library, "gpr_free_aligned"); - gpr_set_allocation_functions_import = (gpr_set_allocation_functions_type) GetProcAddress(library, "gpr_set_allocation_functions"); - gpr_get_allocation_functions_import = (gpr_get_allocation_functions_type) GetProcAddress(library, "gpr_get_allocation_functions"); gpr_cpu_num_cores_import = (gpr_cpu_num_cores_type) GetProcAddress(library, "gpr_cpu_num_cores"); gpr_cpu_current_cpu_import = (gpr_cpu_current_cpu_type) GetProcAddress(library, "gpr_cpu_current_cpu"); gpr_format_message_import = (gpr_format_message_type) GetProcAddress(library, "gpr_format_message"); diff --git a/src/ruby/ext/grpc/rb_grpc_imports.generated.h b/src/ruby/ext/grpc/rb_grpc_imports.generated.h index 46912af5f5a..0205f60d06f 100644 --- a/src/ruby/ext/grpc/rb_grpc_imports.generated.h +++ b/src/ruby/ext/grpc/rb_grpc_imports.generated.h @@ -695,12 +695,6 @@ extern gpr_malloc_aligned_type gpr_malloc_aligned_import; typedef void(*gpr_free_aligned_type)(void* ptr); extern gpr_free_aligned_type gpr_free_aligned_import; #define gpr_free_aligned gpr_free_aligned_import -typedef void(*gpr_set_allocation_functions_type)(gpr_allocation_functions functions); -extern gpr_set_allocation_functions_type gpr_set_allocation_functions_import; -#define gpr_set_allocation_functions gpr_set_allocation_functions_import -typedef gpr_allocation_functions(*gpr_get_allocation_functions_type)(void); -extern gpr_get_allocation_functions_type gpr_get_allocation_functions_import; -#define gpr_get_allocation_functions gpr_get_allocation_functions_import typedef unsigned(*gpr_cpu_num_cores_type)(void); extern gpr_cpu_num_cores_type gpr_cpu_num_cores_import; #define gpr_cpu_num_cores gpr_cpu_num_cores_import diff --git a/test/core/end2end/fuzzers/client_fuzzer.cc b/test/core/end2end/fuzzers/client_fuzzer.cc index bb97cc0b1cf..420479d3f28 100644 --- a/test/core/end2end/fuzzers/client_fuzzer.cc +++ b/test/core/end2end/fuzzers/client_fuzzer.cc @@ -27,7 +27,6 @@ #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/surface/channel.h" -#include "test/core/util/memory_counters.h" #include "test/core/util/mock_endpoint.h" bool squelch = true; @@ -42,7 +41,6 @@ static void dont_log(gpr_log_func_args* /*args*/) {} extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_test_only_set_slice_hash_seed(0); if (squelch) gpr_set_log_function(dont_log); - grpc_core::testing::LeakDetector leak_detector(leak_check); grpc_init(); grpc_test_only_control_plane_credentials_force_init(); { diff --git a/test/core/end2end/fuzzers/server_fuzzer.cc b/test/core/end2end/fuzzers/server_fuzzer.cc index 7664000dae8..61cbc7d45af 100644 --- a/test/core/end2end/fuzzers/server_fuzzer.cc +++ b/test/core/end2end/fuzzers/server_fuzzer.cc @@ -23,7 +23,6 @@ #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/surface/server.h" -#include "test/core/util/memory_counters.h" #include "test/core/util/mock_endpoint.h" bool squelch = true; @@ -39,7 +38,6 @@ static void dont_log(gpr_log_func_args* /*args*/) {} extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { grpc_test_only_set_slice_hash_seed(0); if (squelch) gpr_set_log_function(dont_log); - grpc_core::testing::LeakDetector leak_detector(leak_check); grpc_init(); grpc_test_only_control_plane_credentials_force_init(); { diff --git a/test/core/gpr/alloc_test.cc b/test/core/gpr/alloc_test.cc index 55fe6d95a8f..afa4dccda38 100644 --- a/test/core/gpr/alloc_test.cc +++ b/test/core/gpr/alloc_test.cc @@ -23,36 +23,6 @@ #include "test/core/util/test_config.h" -static void* fake_malloc(size_t size) { return (void*)size; } - -static void* fake_realloc(void* /*addr*/, size_t size) { return (void*)size; } - -static void fake_free(void* addr) { - *(static_cast(addr)) = static_cast(0xdeadd00d); -} - -static void test_custom_allocs() { - const gpr_allocation_functions default_fns = gpr_get_allocation_functions(); - intptr_t addr_to_free = 0; - char* i; - gpr_allocation_functions fns = {fake_malloc, nullptr, fake_realloc, - fake_free}; - - gpr_set_allocation_functions(fns); - GPR_ASSERT((void*)(size_t)0xdeadbeef == gpr_malloc(0xdeadbeef)); - GPR_ASSERT((void*)(size_t)0xcafed00d == gpr_realloc(nullptr, 0xcafed00d)); - - gpr_free(&addr_to_free); - GPR_ASSERT(addr_to_free == (intptr_t)0xdeadd00d); - - /* Restore and check we don't get funky values and that we don't leak */ - gpr_set_allocation_functions(default_fns); - GPR_ASSERT((void*)sizeof(*i) != - (i = static_cast(gpr_malloc(sizeof(*i))))); - GPR_ASSERT((void*)2 != (i = static_cast(gpr_realloc(i, 2)))); - gpr_free(i); -} - static void test_malloc_aligned() { for (size_t size = 1; size <= 256; ++size) { void* ptr = gpr_malloc_aligned(size, 16); @@ -65,7 +35,6 @@ static void test_malloc_aligned() { int main(int argc, char** argv) { grpc::testing::TestEnvironment env(argc, argv); - test_custom_allocs(); test_malloc_aligned(); return 0; } diff --git a/test/core/json/fuzzer.cc b/test/core/json/fuzzer.cc index 8b3e9792d15..974988ef277 100644 --- a/test/core/json/fuzzer.cc +++ b/test/core/json/fuzzer.cc @@ -24,14 +24,12 @@ #include #include "src/core/lib/json/json.h" -#include "test/core/util/memory_counters.h" bool squelch = true; bool leak_check = true; extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { char* s; - grpc_core::testing::LeakDetector leak_detector(true); s = static_cast(gpr_malloc(size)); memcpy(s, data, size); grpc_json* x; diff --git a/test/core/memory_usage/BUILD b/test/core/memory_usage/BUILD deleted file mode 100644 index 0949c89ed9e..00000000000 --- a/test/core/memory_usage/BUILD +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 2017 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. - -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_package") - -grpc_package(name = "test/core/memory_usage") - -licenses(["notice"]) # Apache v2 - -grpc_cc_library( - name = "memory_usage_client", - testonly = 1, - srcs = ["client.cc"], - deps = [ - "//:gpr", - "//:grpc", - "//test/core/util:grpc_test_util", - ], -) - -grpc_cc_library( - name = "memory_usage_server", - testonly = 1, - srcs = ["server.cc"], - deps = [ - "//:gpr", - "//:grpc", - "//test/core/end2end:ssl_test_data", - "//test/core/util:grpc_test_util", - ], -) - -grpc_cc_test( - name = "memory_usage_test", - srcs = ["memory_usage_test.cc"], - data = [ - ":memory_usage_client", - ":memory_usage_server", - ], - language = "C++", - tags = ["no_windows"], # TODO(jtattermusch): breaks windows RBE build if enabled - deps = [ - "//:gpr", - "//:grpc", - "//test/core/util:grpc_test_util", - ], - uses_polling = False, -) diff --git a/test/core/memory_usage/client.cc b/test/core/memory_usage/client.cc deleted file mode 100644 index 0d7c85009c4..00000000000 --- a/test/core/memory_usage/client.cc +++ /dev/null @@ -1,340 +0,0 @@ -/* - * - * Copyright 2016 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 -#include -#include -#include -#include -#include "src/core/lib/gpr/env.h" -#include "src/core/lib/gpr/string.h" -#include "src/core/lib/gpr/useful.h" - -#include "test/core/util/cmdline.h" -#include "test/core/util/memory_counters.h" -#include "test/core/util/test_config.h" - -static grpc_channel* channel; -static grpc_completion_queue* cq; -static grpc_op metadata_ops[2]; -static grpc_op status_ops[2]; -static grpc_op snapshot_ops[6]; -static grpc_op* op; - -typedef struct { - grpc_call* call; - grpc_metadata_array initial_metadata_recv; - grpc_status_code status; - grpc_slice details; - grpc_metadata_array trailing_metadata_recv; -} fling_call; - -// Statically allocate call data structs. Enough to accommodate 10000 ping-pong -// calls and 1 extra for the snapshot calls. -static fling_call calls[10001]; - -static void* tag(intptr_t t) { return (void*)t; } - -// A call is intentionally divided into two steps. First step is to initiate a -// call (i.e send and recv metadata). A call is outstanding after we initated, -// so we can measure the call memory usage. -static void init_ping_pong_request(int call_idx) { - grpc_metadata_array_init(&calls[call_idx].initial_metadata_recv); - - memset(metadata_ops, 0, sizeof(metadata_ops)); - op = metadata_ops; - op->op = GRPC_OP_SEND_INITIAL_METADATA; - op->data.send_initial_metadata.count = 0; - op->flags = GRPC_INITIAL_METADATA_WAIT_FOR_READY; - op++; - op->op = GRPC_OP_RECV_INITIAL_METADATA; - op->data.recv_initial_metadata.recv_initial_metadata = - &calls[call_idx].initial_metadata_recv; - op++; - - grpc_slice hostname = grpc_slice_from_static_string("localhost"); - calls[call_idx].call = grpc_channel_create_call( - channel, nullptr, GRPC_PROPAGATE_DEFAULTS, cq, - grpc_slice_from_static_string("/Reflector/reflectUnary"), &hostname, - gpr_inf_future(GPR_CLOCK_REALTIME), nullptr); - - GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch(calls[call_idx].call, - metadata_ops, - (size_t)(op - metadata_ops), - tag(call_idx), nullptr)); - grpc_completion_queue_next(cq, gpr_inf_future(GPR_CLOCK_REALTIME), nullptr); -} - -// Second step is to finish the call (i.e recv status) and destroy the call. -static void finish_ping_pong_request(int call_idx) { - grpc_metadata_array_init(&calls[call_idx].trailing_metadata_recv); - - memset(status_ops, 0, sizeof(status_ops)); - op = status_ops; - op->op = GRPC_OP_RECV_STATUS_ON_CLIENT; - op->data.recv_status_on_client.trailing_metadata = - &calls[call_idx].trailing_metadata_recv; - op->data.recv_status_on_client.status = &calls[call_idx].status; - op->data.recv_status_on_client.status_details = &calls[call_idx].details; - op++; - - GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch(calls[call_idx].call, - status_ops, - (size_t)(op - status_ops), - tag(call_idx), nullptr)); - grpc_completion_queue_next(cq, gpr_inf_future(GPR_CLOCK_REALTIME), nullptr); - grpc_metadata_array_destroy(&calls[call_idx].initial_metadata_recv); - grpc_metadata_array_destroy(&calls[call_idx].trailing_metadata_recv); - grpc_slice_unref(calls[call_idx].details); - grpc_call_unref(calls[call_idx].call); - calls[call_idx].call = nullptr; -} - -static struct grpc_memory_counters send_snapshot_request(int call_idx, - grpc_slice call_type) { - grpc_metadata_array_init(&calls[call_idx].initial_metadata_recv); - grpc_metadata_array_init(&calls[call_idx].trailing_metadata_recv); - - grpc_byte_buffer* response_payload_recv = nullptr; - memset(snapshot_ops, 0, sizeof(snapshot_ops)); - op = snapshot_ops; - - op->op = GRPC_OP_SEND_INITIAL_METADATA; - op->data.send_initial_metadata.count = 0; - op->flags = GRPC_INITIAL_METADATA_WAIT_FOR_READY; - op++; - op->op = GRPC_OP_SEND_CLOSE_FROM_CLIENT; - op++; - op->op = GRPC_OP_RECV_INITIAL_METADATA; - op->data.recv_initial_metadata.recv_initial_metadata = - &calls[call_idx].initial_metadata_recv; - op++; - op->op = GRPC_OP_RECV_MESSAGE; - op->data.recv_message.recv_message = &response_payload_recv; - op++; - op->op = GRPC_OP_RECV_STATUS_ON_CLIENT; - op->data.recv_status_on_client.trailing_metadata = - &calls[call_idx].trailing_metadata_recv; - op->data.recv_status_on_client.status = &calls[call_idx].status; - op->data.recv_status_on_client.status_details = &calls[call_idx].details; - op++; - - grpc_slice hostname = grpc_slice_from_static_string("localhost"); - calls[call_idx].call = grpc_channel_create_call( - channel, nullptr, GRPC_PROPAGATE_DEFAULTS, cq, call_type, &hostname, - gpr_inf_future(GPR_CLOCK_REALTIME), nullptr); - GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch(calls[call_idx].call, - snapshot_ops, - (size_t)(op - snapshot_ops), - (void*)nullptr, nullptr)); - grpc_completion_queue_next(cq, gpr_inf_future(GPR_CLOCK_REALTIME), nullptr); - - grpc_byte_buffer_reader reader; - grpc_byte_buffer_reader_init(&reader, response_payload_recv); - grpc_slice response = grpc_byte_buffer_reader_readall(&reader); - - struct grpc_memory_counters snapshot; - snapshot.total_size_absolute = - (reinterpret_cast GRPC_SLICE_START_PTR( - response)) - ->total_size_absolute; - snapshot.total_allocs_absolute = - (reinterpret_cast GRPC_SLICE_START_PTR( - response)) - ->total_allocs_absolute; - snapshot.total_size_relative = - (reinterpret_cast GRPC_SLICE_START_PTR( - response)) - ->total_size_relative; - snapshot.total_allocs_relative = - (reinterpret_cast GRPC_SLICE_START_PTR( - response)) - ->total_allocs_relative; - - grpc_metadata_array_destroy(&calls[call_idx].initial_metadata_recv); - grpc_metadata_array_destroy(&calls[call_idx].trailing_metadata_recv); - grpc_slice_unref(response); - grpc_byte_buffer_reader_destroy(&reader); - grpc_byte_buffer_destroy(response_payload_recv); - grpc_slice_unref(calls[call_idx].details); - calls[call_idx].details = grpc_empty_slice(); - grpc_call_unref(calls[call_idx].call); - calls[call_idx].call = nullptr; - - return snapshot; -} - -int main(int argc, char** argv) { - grpc_memory_counters_init(); - grpc_slice slice = grpc_slice_from_copied_string("x"); - char* fake_argv[1]; - - const char* target = "localhost:443"; - gpr_cmdline* cl; - grpc_event event; - - GPR_ASSERT(argc >= 1); - fake_argv[0] = argv[0]; - grpc::testing::TestEnvironment env(1, fake_argv); - - grpc_init(); - - int warmup_iterations = 100; - int benchmark_iterations = 1000; - - cl = gpr_cmdline_create("memory profiling client"); - gpr_cmdline_add_string(cl, "target", "Target host:port", &target); - gpr_cmdline_add_int(cl, "warmup", "Warmup iterations", &warmup_iterations); - gpr_cmdline_add_int(cl, "benchmark", "Benchmark iterations", - &benchmark_iterations); - gpr_cmdline_parse(cl, argc, argv); - gpr_cmdline_destroy(cl); - - for (size_t k = 0; k < GPR_ARRAY_SIZE(calls); k++) { - calls[k].details = grpc_empty_slice(); - } - - cq = grpc_completion_queue_create_for_next(nullptr); - - struct grpc_memory_counters client_channel_start = - grpc_memory_counters_snapshot(); - channel = grpc_insecure_channel_create(target, nullptr, nullptr); - - int call_idx = 0; - - struct grpc_memory_counters before_server_create = send_snapshot_request( - 0, grpc_slice_from_static_string("Reflector/GetBeforeSvrCreation")); - struct grpc_memory_counters after_server_create = send_snapshot_request( - 0, grpc_slice_from_static_string("Reflector/GetAfterSvrCreation")); - - // warmup period - for (int i = 0; i < warmup_iterations; i++) { - send_snapshot_request( - 0, grpc_slice_from_static_string("Reflector/SimpleSnapshot")); - } - - for (call_idx = 0; call_idx < warmup_iterations; ++call_idx) { - init_ping_pong_request(call_idx + 1); - } - - struct grpc_memory_counters server_benchmark_calls_start = - send_snapshot_request( - 0, grpc_slice_from_static_string("Reflector/SimpleSnapshot")); - - struct grpc_memory_counters client_benchmark_calls_start = - grpc_memory_counters_snapshot(); - - // benchmark period - for (; call_idx < warmup_iterations + benchmark_iterations; ++call_idx) { - init_ping_pong_request(call_idx + 1); - } - - struct grpc_memory_counters client_calls_inflight = - grpc_memory_counters_snapshot(); - - struct grpc_memory_counters server_calls_inflight = send_snapshot_request( - 0, grpc_slice_from_static_string("Reflector/DestroyCalls")); - - do { - event = grpc_completion_queue_next( - cq, - gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), - gpr_time_from_micros(10000, GPR_TIMESPAN)), - nullptr); - } while (event.type != GRPC_QUEUE_TIMEOUT); - - // second step - recv status and destroy call - for (call_idx = 0; call_idx < warmup_iterations + benchmark_iterations; - ++call_idx) { - finish_ping_pong_request(call_idx + 1); - } - - struct grpc_memory_counters server_calls_end = send_snapshot_request( - 0, grpc_slice_from_static_string("Reflector/SimpleSnapshot")); - - struct grpc_memory_counters client_channel_end = - grpc_memory_counters_snapshot(); - - grpc_channel_destroy(channel); - grpc_completion_queue_shutdown(cq); - - do { - event = grpc_completion_queue_next(cq, gpr_inf_future(GPR_CLOCK_REALTIME), - nullptr); - } while (event.type != GRPC_QUEUE_SHUTDOWN); - grpc_slice_unref(slice); - - grpc_completion_queue_destroy(cq); - grpc_shutdown_blocking(); - - gpr_log(GPR_INFO, "---------client stats--------"); - gpr_log( - GPR_INFO, "client call memory usage: %f bytes per call", - static_cast(client_calls_inflight.total_size_relative - - client_benchmark_calls_start.total_size_relative) / - benchmark_iterations); - gpr_log(GPR_INFO, "client channel memory usage %zi bytes", - client_channel_end.total_size_relative - - client_channel_start.total_size_relative); - - gpr_log(GPR_INFO, "---------server stats--------"); - gpr_log(GPR_INFO, "server create: %zi bytes", - after_server_create.total_size_relative - - before_server_create.total_size_relative); - gpr_log( - GPR_INFO, "server call memory usage: %f bytes per call", - static_cast(server_calls_inflight.total_size_relative - - server_benchmark_calls_start.total_size_relative) / - benchmark_iterations); - gpr_log(GPR_INFO, "server channel memory usage %zi bytes", - server_calls_end.total_size_relative - - after_server_create.total_size_relative); - - const char* csv_file = "memory_usage.csv"; - FILE* csv = fopen(csv_file, "w"); - if (csv) { - char* env_build = gpr_getenv("BUILD_NUMBER"); - char* env_job = gpr_getenv("JOB_NAME"); - fprintf( - csv, "%f,%zi,%zi,%f,%zi,%s,%s\n", - static_cast(client_calls_inflight.total_size_relative - - client_benchmark_calls_start.total_size_relative) / - benchmark_iterations, - client_channel_end.total_size_relative - - client_channel_start.total_size_relative, - after_server_create.total_size_relative - - before_server_create.total_size_relative, - static_cast(server_calls_inflight.total_size_relative - - server_benchmark_calls_start.total_size_relative) / - benchmark_iterations, - server_calls_end.total_size_relative - - after_server_create.total_size_relative, - env_build == nullptr ? "" : env_build, - env_job == nullptr ? "" : env_job); - fclose(csv); - gpr_log(GPR_INFO, "Summary written to %s", csv_file); - } - - grpc_memory_counters_destroy(); - return 0; -} diff --git a/test/core/memory_usage/memory_usage_test.cc b/test/core/memory_usage/memory_usage_test.cc deleted file mode 100644 index d971b5bf6ad..00000000000 --- a/test/core/memory_usage/memory_usage_test.cc +++ /dev/null @@ -1,80 +0,0 @@ -/* - * - * 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 - -#include -#include - -#include "src/core/lib/gpr/string.h" -#include "src/core/lib/gprpp/host_port.h" -#include "test/core/util/port.h" -#include "test/core/util/subprocess.h" - -int main(int /*argc*/, char** argv) { - char* me = argv[0]; - char* lslash = strrchr(me, '/'); - char root[1024]; - int port = grpc_pick_unused_port_or_die(); - char* args[10]; - int status; - gpr_subprocess *svr, *cli; - /* figure out where we are */ - if (lslash) { - memcpy(root, me, static_cast(lslash - me)); - root[lslash - me] = 0; - } else { - strcpy(root, "."); - } - /* start the server */ - gpr_asprintf(&args[0], "%s/memory_usage_server%s", root, - gpr_subprocess_binary_extension()); - args[1] = const_cast("--bind"); - grpc_core::UniquePtr joined; - grpc_core::JoinHostPort(&joined, "::", port); - args[2] = joined.get(); - args[3] = const_cast("--no-secure"); - svr = gpr_subprocess_create(4, (const char**)args); - gpr_free(args[0]); - - /* start the client */ - gpr_asprintf(&args[0], "%s/memory_usage_client%s", root, - gpr_subprocess_binary_extension()); - args[1] = const_cast("--target"); - grpc_core::JoinHostPort(&joined, "127.0.0.1", port); - args[2] = joined.get(); - args[3] = const_cast("--warmup=1000"); - args[4] = const_cast("--benchmark=9000"); - cli = gpr_subprocess_create(5, (const char**)args); - gpr_free(args[0]); - - /* wait for completion */ - printf("waiting for client\n"); - if ((status = gpr_subprocess_join(cli))) { - gpr_subprocess_destroy(cli); - gpr_subprocess_destroy(svr); - return status; - } - gpr_subprocess_destroy(cli); - - gpr_subprocess_interrupt(svr); - status = gpr_subprocess_join(svr); - gpr_subprocess_destroy(svr); - return status; -} diff --git a/test/core/memory_usage/server.cc b/test/core/memory_usage/server.cc deleted file mode 100644 index 3c69f648ab9..00000000000 --- a/test/core/memory_usage/server.cc +++ /dev/null @@ -1,324 +0,0 @@ -/* - * - * Copyright 2016 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 -#include -#include -#include -#ifndef _WIN32 -/* This is for _exit() below, which is temporary. */ -#include -#endif - -#include -#include -#include - -#include "src/core/lib/gprpp/host_port.h" -#include "test/core/end2end/data/ssl_test_data.h" -#include "test/core/util/cmdline.h" -#include "test/core/util/memory_counters.h" -#include "test/core/util/port.h" -#include "test/core/util/test_config.h" - -static grpc_completion_queue* cq; -static grpc_server* server; -static grpc_op metadata_ops[2]; -static grpc_op snapshot_ops[5]; -static grpc_op status_op; -static int got_sigint = 0; -static grpc_byte_buffer* payload_buffer = nullptr; -static grpc_byte_buffer* terminal_buffer = nullptr; -static int was_cancelled = 2; - -static void* tag(intptr_t t) { return (void*)t; } - -typedef enum { - FLING_SERVER_NEW_REQUEST = 1, - FLING_SERVER_SEND_INIT_METADATA, - FLING_SERVER_WAIT_FOR_DESTROY, - FLING_SERVER_SEND_STATUS_FLING_CALL, - FLING_SERVER_SEND_STATUS_SNAPSHOT, - FLING_SERVER_BATCH_SEND_STATUS_FLING_CALL -} fling_server_tags; - -typedef struct { - fling_server_tags state; - grpc_call* call; - grpc_call_details call_details; - grpc_metadata_array request_metadata_recv; - grpc_metadata_array initial_metadata_send; -} fling_call; - -// hold up to 10000 calls and 6 snaphost calls -static fling_call calls[100006]; - -static void request_call_unary(int call_idx) { - if (call_idx == static_cast(sizeof(calls) / sizeof(fling_call))) { - gpr_log(GPR_INFO, "Used all call slots (10000) on server. Server exit."); - _exit(0); - } - grpc_metadata_array_init(&calls[call_idx].request_metadata_recv); - grpc_server_request_call( - server, &calls[call_idx].call, &calls[call_idx].call_details, - &calls[call_idx].request_metadata_recv, cq, cq, &calls[call_idx]); -} - -static void send_initial_metadata_unary(void* tag) { - grpc_metadata_array_init( - &(*static_cast(tag)).initial_metadata_send); - metadata_ops[0].op = GRPC_OP_SEND_INITIAL_METADATA; - metadata_ops[0].data.send_initial_metadata.count = 0; - - GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch((*(fling_call*)tag).call, - metadata_ops, 1, tag, - nullptr)); -} - -static void send_status(void* tag) { - status_op.op = GRPC_OP_SEND_STATUS_FROM_SERVER; - status_op.data.send_status_from_server.status = GRPC_STATUS_OK; - status_op.data.send_status_from_server.trailing_metadata_count = 0; - grpc_slice details = grpc_slice_from_static_string(""); - status_op.data.send_status_from_server.status_details = &details; - - GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch((*(fling_call*)tag).call, - &status_op, 1, tag, - nullptr)); -} - -static void send_snapshot(void* tag, struct grpc_memory_counters* snapshot) { - grpc_op* op; - - grpc_slice snapshot_slice = - grpc_slice_new(snapshot, sizeof(*snapshot), gpr_free); - payload_buffer = grpc_raw_byte_buffer_create(&snapshot_slice, 1); - grpc_metadata_array_init( - &(*static_cast(tag)).initial_metadata_send); - - op = snapshot_ops; - op->op = GRPC_OP_SEND_INITIAL_METADATA; - op->data.send_initial_metadata.count = 0; - op++; - op->op = GRPC_OP_RECV_MESSAGE; - op->data.recv_message.recv_message = &terminal_buffer; - op++; - op->op = GRPC_OP_SEND_MESSAGE; - if (payload_buffer == nullptr) { - gpr_log(GPR_INFO, "NULL payload buffer !!!"); - } - op->data.send_message.send_message = payload_buffer; - op++; - op->op = GRPC_OP_SEND_STATUS_FROM_SERVER; - op->data.send_status_from_server.status = GRPC_STATUS_OK; - op->data.send_status_from_server.trailing_metadata_count = 0; - grpc_slice details = grpc_slice_from_static_string(""); - op->data.send_status_from_server.status_details = &details; - op++; - op->op = GRPC_OP_RECV_CLOSE_ON_SERVER; - op->data.recv_close_on_server.cancelled = &was_cancelled; - op++; - - GPR_ASSERT(GRPC_CALL_OK == - grpc_call_start_batch((*(fling_call*)tag).call, snapshot_ops, - (size_t)(op - snapshot_ops), tag, nullptr)); -} -/* We have some sort of deadlock, so let's not exit gracefully for now. - When that is resolved, please remove the #include above. */ -static void sigint_handler(int /*x*/) { _exit(0); } - -int main(int argc, char** argv) { - grpc_memory_counters_init(); - grpc_event ev; - grpc_core::UniquePtr addr_buf; - gpr_cmdline* cl; - grpc_completion_queue* shutdown_cq; - int shutdown_started = 0; - int shutdown_finished = 0; - - int secure = 0; - const char* addr = nullptr; - - char* fake_argv[1]; - - GPR_ASSERT(argc >= 1); - fake_argv[0] = argv[0]; - grpc::testing::TestEnvironment env(1, fake_argv); - - grpc_init(); - srand(static_cast(clock())); - - cl = gpr_cmdline_create("fling server"); - gpr_cmdline_add_string(cl, "bind", "Bind host:port", &addr); - gpr_cmdline_add_flag(cl, "secure", "Run with security?", &secure); - gpr_cmdline_parse(cl, argc, argv); - gpr_cmdline_destroy(cl); - - if (addr == nullptr) { - grpc_core::JoinHostPort(&addr_buf, "::", grpc_pick_unused_port_or_die()); - addr = addr_buf.get(); - } - gpr_log(GPR_INFO, "creating server on: %s", addr); - - cq = grpc_completion_queue_create_for_next(nullptr); - - struct grpc_memory_counters before_server_create = - grpc_memory_counters_snapshot(); - if (secure) { - grpc_ssl_pem_key_cert_pair pem_key_cert_pair = {test_server1_key, - test_server1_cert}; - grpc_server_credentials* ssl_creds = grpc_ssl_server_credentials_create( - nullptr, &pem_key_cert_pair, 1, 0, nullptr); - server = grpc_server_create(nullptr, nullptr); - GPR_ASSERT(grpc_server_add_secure_http2_port(server, addr, ssl_creds)); - grpc_server_credentials_release(ssl_creds); - } else { - server = grpc_server_create(nullptr, nullptr); - GPR_ASSERT(grpc_server_add_insecure_http2_port(server, addr)); - } - - grpc_server_register_completion_queue(server, cq, nullptr); - grpc_server_start(server); - - struct grpc_memory_counters after_server_create = - grpc_memory_counters_snapshot(); - - addr = nullptr; - addr_buf.reset(); - - // initialize call instances - for (int i = 0; i < static_cast(sizeof(calls) / sizeof(fling_call)); - i++) { - grpc_call_details_init(&calls[i].call_details); - calls[i].state = FLING_SERVER_NEW_REQUEST; - } - - int next_call_idx = 0; - struct grpc_memory_counters current_snapshot; - - request_call_unary(next_call_idx); - - signal(SIGINT, sigint_handler); - - while (!shutdown_finished) { - if (got_sigint && !shutdown_started) { - gpr_log(GPR_INFO, "Shutting down due to SIGINT"); - - shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr); - grpc_server_shutdown_and_notify(server, shutdown_cq, tag(1000)); - GPR_ASSERT(grpc_completion_queue_pluck( - shutdown_cq, tag(1000), - grpc_timeout_seconds_to_deadline(5), nullptr) - .type == GRPC_OP_COMPLETE); - grpc_completion_queue_destroy(shutdown_cq); - grpc_completion_queue_shutdown(cq); - shutdown_started = 1; - } - ev = grpc_completion_queue_next( - cq, - gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), - gpr_time_from_micros(1000000, GPR_TIMESPAN)), - nullptr); - fling_call* s = static_cast(ev.tag); - switch (ev.type) { - case GRPC_OP_COMPLETE: - switch (s->state) { - case FLING_SERVER_NEW_REQUEST: - request_call_unary(++next_call_idx); - if (0 == grpc_slice_str_cmp(s->call_details.method, - "/Reflector/reflectUnary")) { - s->state = FLING_SERVER_SEND_INIT_METADATA; - send_initial_metadata_unary(s); - } else if (0 == - grpc_slice_str_cmp(s->call_details.method, - "Reflector/GetBeforeSvrCreation")) { - s->state = FLING_SERVER_SEND_STATUS_SNAPSHOT; - send_snapshot(s, &before_server_create); - } else if (0 == - grpc_slice_str_cmp(s->call_details.method, - "Reflector/GetAfterSvrCreation")) { - s->state = FLING_SERVER_SEND_STATUS_SNAPSHOT; - send_snapshot(s, &after_server_create); - } else if (0 == grpc_slice_str_cmp(s->call_details.method, - "Reflector/SimpleSnapshot")) { - s->state = FLING_SERVER_SEND_STATUS_SNAPSHOT; - current_snapshot = grpc_memory_counters_snapshot(); - send_snapshot(s, ¤t_snapshot); - } else if (0 == grpc_slice_str_cmp(s->call_details.method, - "Reflector/DestroyCalls")) { - s->state = FLING_SERVER_BATCH_SEND_STATUS_FLING_CALL; - current_snapshot = grpc_memory_counters_snapshot(); - send_snapshot(s, ¤t_snapshot); - } else { - gpr_log(GPR_ERROR, "Wrong call method"); - } - break; - case FLING_SERVER_SEND_INIT_METADATA: - s->state = FLING_SERVER_WAIT_FOR_DESTROY; - break; - case FLING_SERVER_WAIT_FOR_DESTROY: - break; - case FLING_SERVER_SEND_STATUS_FLING_CALL: - grpc_call_unref(s->call); - grpc_call_details_destroy(&s->call_details); - grpc_metadata_array_destroy(&s->initial_metadata_send); - grpc_metadata_array_destroy(&s->request_metadata_recv); - break; - case FLING_SERVER_BATCH_SEND_STATUS_FLING_CALL: - for (int k = 0; - k < static_cast(sizeof(calls) / sizeof(fling_call)); - ++k) { - if (calls[k].state == FLING_SERVER_WAIT_FOR_DESTROY) { - calls[k].state = FLING_SERVER_SEND_STATUS_FLING_CALL; - send_status(&calls[k]); - } - } - /* fallthrough */ - // no break here since we want to continue to case - // FLING_SERVER_SEND_STATUS_SNAPSHOT to destroy the snapshot call - case FLING_SERVER_SEND_STATUS_SNAPSHOT: - grpc_byte_buffer_destroy(payload_buffer); - grpc_byte_buffer_destroy(terminal_buffer); - grpc_call_unref(s->call); - grpc_call_details_destroy(&s->call_details); - grpc_metadata_array_destroy(&s->initial_metadata_send); - grpc_metadata_array_destroy(&s->request_metadata_recv); - terminal_buffer = nullptr; - payload_buffer = nullptr; - break; - } - break; - case GRPC_QUEUE_SHUTDOWN: - GPR_ASSERT(shutdown_started); - shutdown_finished = 1; - break; - case GRPC_QUEUE_TIMEOUT: - break; - } - } - - grpc_server_destroy(server); - grpc_completion_queue_destroy(cq); - grpc_shutdown_blocking(); - grpc_memory_counters_destroy(); - return 0; -} diff --git a/test/core/security/alts_credentials_fuzzer.cc b/test/core/security/alts_credentials_fuzzer.cc index e739c2e337c..c772495f63b 100644 --- a/test/core/security/alts_credentials_fuzzer.cc +++ b/test/core/security/alts_credentials_fuzzer.cc @@ -24,7 +24,6 @@ #include #include #include "test/core/util/fuzzer_util.h" -#include "test/core/util/memory_counters.h" #include "src/core/lib/gpr/env.h" #include "src/core/lib/security/credentials/alts/alts_credentials.h" @@ -67,7 +66,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { gpr_set_log_function(dont_log); } gpr_free(grpc_trace_fuzzer); - grpc_core::testing::LeakDetector leak_detector(leak_check); input_stream inp = {data, data + size}; grpc_init(); grpc_test_only_control_plane_credentials_force_init(); diff --git a/test/core/security/ssl_server_fuzzer.cc b/test/core/security/ssl_server_fuzzer.cc index 2dbf894b409..18f1dd7814b 100644 --- a/test/core/security/ssl_server_fuzzer.cc +++ b/test/core/security/ssl_server_fuzzer.cc @@ -24,7 +24,6 @@ #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "test/core/end2end/data/ssl_test_data.h" -#include "test/core/util/memory_counters.h" #include "test/core/util/mock_endpoint.h" bool squelch = true; @@ -53,7 +52,6 @@ static void on_handshake_done(void* arg, grpc_error* error) { extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { if (squelch) gpr_set_log_function(dont_log); - grpc_core::testing::LeakDetector leak_detector(leak_check); grpc_init(); { grpc_core::ExecCtx exec_ctx; diff --git a/test/core/slice/percent_decode_fuzzer.cc b/test/core/slice/percent_decode_fuzzer.cc index bf4ae00be77..5f0de7293fe 100644 --- a/test/core/slice/percent_decode_fuzzer.cc +++ b/test/core/slice/percent_decode_fuzzer.cc @@ -26,13 +26,11 @@ #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/slice/percent_encoding.h" -#include "test/core/util/memory_counters.h" bool squelch = true; bool leak_check = true; extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { - grpc_core::testing::LeakDetector leak_detector(true); grpc_init(); grpc_test_only_control_plane_credentials_force_init(); grpc_slice input = grpc_slice_from_copied_buffer((const char*)data, size); diff --git a/test/core/slice/percent_encode_fuzzer.cc b/test/core/slice/percent_encode_fuzzer.cc index 0fed4b7cce5..a028013f064 100644 --- a/test/core/slice/percent_encode_fuzzer.cc +++ b/test/core/slice/percent_encode_fuzzer.cc @@ -26,13 +26,11 @@ #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/slice/percent_encoding.h" -#include "test/core/util/memory_counters.h" bool squelch = true; bool leak_check = true; static void test(const uint8_t* data, size_t size, const uint8_t* dict) { - grpc_core::testing::LeakDetector leak_detector(true); grpc_init(); grpc_test_only_control_plane_credentials_force_init(); grpc_slice input = diff --git a/test/core/surface/public_headers_must_be_c89.c b/test/core/surface/public_headers_must_be_c89.c index c7656d083d2..58a2d7a4d9f 100644 --- a/test/core/surface/public_headers_must_be_c89.c +++ b/test/core/surface/public_headers_must_be_c89.c @@ -282,8 +282,6 @@ int main(int argc, char **argv) { printf("%lx", (unsigned long) gpr_realloc); printf("%lx", (unsigned long) gpr_malloc_aligned); printf("%lx", (unsigned long) gpr_free_aligned); - printf("%lx", (unsigned long) gpr_set_allocation_functions); - printf("%lx", (unsigned long) gpr_get_allocation_functions); printf("%lx", (unsigned long) gpr_cpu_num_cores); printf("%lx", (unsigned long) gpr_cpu_current_cpu); printf("%lx", (unsigned long) gpr_strdup); diff --git a/test/core/util/memory_counters.cc b/test/core/util/memory_counters.cc index 787fb76e48b..ddd8d2f283f 100644 --- a/test/core/util/memory_counters.cc +++ b/test/core/util/memory_counters.cc @@ -30,12 +30,10 @@ #include "src/core/lib/surface/init.h" #include "test/core/util/memory_counters.h" -static struct grpc_memory_counters g_memory_counters; -static gpr_allocation_functions g_old_allocs; +#include -static void* guard_malloc(size_t size); -static void* guard_realloc(void* vptr, size_t size); -static void guard_free(void* vptr); +static struct grpc_memory_counters g_memory_counters; +static bool g_memory_counter_enabled; #ifdef GPR_LOW_LEVEL_COUNTERS /* hide these from the microbenchmark atomic stats */ @@ -47,61 +45,89 @@ static void guard_free(void* vptr); #define NO_BARRIER_LOAD(x) gpr_atm_no_barrier_load(x) #endif -static void* guard_malloc(size_t size) { +// Memory counter uses --wrap=symbol feature from ld. To use this, +// `GPR_WRAP_MEMORY_COUNTER` needs to be defined. following options should be +// passed to the compiler. +// -Wl,--wrap=malloc -Wl,--wrap=calloc -Wl,--wrap=realloc -Wl,--wrap=free +// * Reference: https://linux.die.net/man/1/ld) +#if GPR_WRAP_MEMORY_COUNTER + +extern "C" { +void* __real_malloc(size_t size); +void* __real_calloc(size_t size); +void* __real_realloc(void* ptr, size_t size); +void __real_free(void* ptr); + +void* __wrap_malloc(size_t size); +void* __wrap_calloc(size_t size); +void* __wrap_realloc(void* ptr, size_t size); +void __wrap_free(void* ptr); +} + +void* __wrap_malloc(size_t size) { + if (!size) return nullptr; + NO_BARRIER_FETCH_ADD(&g_memory_counters.total_size_absolute, (gpr_atm)size); + NO_BARRIER_FETCH_ADD(&g_memory_counters.total_size_relative, (gpr_atm)size); + NO_BARRIER_FETCH_ADD(&g_memory_counters.total_allocs_absolute, (gpr_atm)1); + NO_BARRIER_FETCH_ADD(&g_memory_counters.total_allocs_relative, (gpr_atm)1); + void* ptr = + __real_malloc(GPR_ROUND_UP_TO_ALIGNMENT_SIZE(sizeof(size)) + size); + *static_cast(ptr) = size; + return static_cast(ptr) + GPR_ROUND_UP_TO_ALIGNMENT_SIZE(sizeof(size)); +} + +void* __wrap_calloc(size_t size) { if (!size) return nullptr; NO_BARRIER_FETCH_ADD(&g_memory_counters.total_size_absolute, (gpr_atm)size); NO_BARRIER_FETCH_ADD(&g_memory_counters.total_size_relative, (gpr_atm)size); NO_BARRIER_FETCH_ADD(&g_memory_counters.total_allocs_absolute, (gpr_atm)1); NO_BARRIER_FETCH_ADD(&g_memory_counters.total_allocs_relative, (gpr_atm)1); - void* ptr = g_old_allocs.malloc_fn( - GPR_ROUND_UP_TO_ALIGNMENT_SIZE(sizeof(size)) + size); + void* ptr = + __real_calloc(GPR_ROUND_UP_TO_ALIGNMENT_SIZE(sizeof(size)) + size); *static_cast(ptr) = size; return static_cast(ptr) + GPR_ROUND_UP_TO_ALIGNMENT_SIZE(sizeof(size)); } -static void* guard_realloc(void* vptr, size_t size) { - if (vptr == nullptr) { - return guard_malloc(size); +void* __wrap_realloc(void* ptr, size_t size) { + if (ptr == nullptr) { + return __wrap_malloc(size); } if (size == 0) { - guard_free(vptr); + __wrap_free(ptr); return nullptr; } - void* ptr = - static_cast(vptr) - GPR_ROUND_UP_TO_ALIGNMENT_SIZE(sizeof(size)); + void* rptr = + static_cast(ptr) - GPR_ROUND_UP_TO_ALIGNMENT_SIZE(sizeof(size)); NO_BARRIER_FETCH_ADD(&g_memory_counters.total_size_absolute, (gpr_atm)size); NO_BARRIER_FETCH_ADD(&g_memory_counters.total_size_relative, - -*static_cast(ptr)); + -*static_cast(rptr)); NO_BARRIER_FETCH_ADD(&g_memory_counters.total_size_relative, (gpr_atm)size); NO_BARRIER_FETCH_ADD(&g_memory_counters.total_allocs_absolute, (gpr_atm)1); - ptr = g_old_allocs.realloc_fn( - ptr, GPR_ROUND_UP_TO_ALIGNMENT_SIZE(sizeof(size)) + size); - *static_cast(ptr) = size; - return static_cast(ptr) + GPR_ROUND_UP_TO_ALIGNMENT_SIZE(sizeof(size)); + void* new_ptr = + __real_realloc(rptr, GPR_ROUND_UP_TO_ALIGNMENT_SIZE(sizeof(size)) + size); + *static_cast(new_ptr) = size; + return static_cast(new_ptr) + + GPR_ROUND_UP_TO_ALIGNMENT_SIZE(sizeof(size)); } -static void guard_free(void* vptr) { - if (vptr == nullptr) return; - void* ptr = - static_cast(vptr) - GPR_ROUND_UP_TO_ALIGNMENT_SIZE(sizeof(size_t)); +void __wrap_free(void* ptr) { + if (ptr == nullptr) return; + void* rptr = + static_cast(ptr) - GPR_ROUND_UP_TO_ALIGNMENT_SIZE(sizeof(size_t)); NO_BARRIER_FETCH_ADD(&g_memory_counters.total_size_relative, - -*static_cast(ptr)); + -*static_cast(rptr)); NO_BARRIER_FETCH_ADD(&g_memory_counters.total_allocs_relative, -(gpr_atm)1); - g_old_allocs.free_fn(ptr); + __real_free(rptr); } -struct gpr_allocation_functions g_guard_allocs = {guard_malloc, nullptr, - guard_realloc, guard_free}; +#endif // GPR_WRAP_MEMORY_COUNTER void grpc_memory_counters_init() { memset(&g_memory_counters, 0, sizeof(g_memory_counters)); - g_old_allocs = gpr_get_allocation_functions(); - gpr_set_allocation_functions(g_guard_allocs); + g_memory_counter_enabled = true; } -void grpc_memory_counters_destroy() { - gpr_set_allocation_functions(g_old_allocs); -} +void grpc_memory_counters_destroy() { g_memory_counter_enabled = false; } struct grpc_memory_counters grpc_memory_counters_snapshot() { struct grpc_memory_counters counters; diff --git a/tools/doxygen/Doxyfile.core b/tools/doxygen/Doxyfile.core index 26a9e925e22..df67542e6f2 100644 --- a/tools/doxygen/Doxyfile.core +++ b/tools/doxygen/Doxyfile.core @@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC Core" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 8.0.0 +PROJECT_NUMBER = 9.0.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index feeffaad1d5..d6d9964f8d3 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC Core" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 8.0.0 +PROJECT_NUMBER = 9.0.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/tools/run_tests/generated/configs.json b/tools/run_tests/generated/configs.json index 74c62862408..3ef9cdb7c78 100644 --- a/tools/run_tests/generated/configs.json +++ b/tools/run_tests/generated/configs.json @@ -56,6 +56,9 @@ "TSAN_OPTIONS": "suppressions=test/core/util/tsan_suppressions.txt:halt_on_error=1:second_deadlock_stack=1" } }, + { + "config": "counters_with_memory_counter" + }, { "config": "stapprof" }, diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json index 3c1d60bf699..b84440246cd 100644 --- a/tools/run_tests/generated/tests.json +++ b/tools/run_tests/generated/tests.json @@ -1917,28 +1917,6 @@ ], "uses_polling": false }, - { - "args": [], - "benchmark": false, - "ci_platforms": [ - "linux", - "mac", - "posix" - ], - "cpu_cost": 1.5, - "exclude_configs": [], - "exclude_iomgrs": [], - "flaky": false, - "gtest": false, - "language": "c", - "name": "memory_usage_test", - "platforms": [ - "linux", - "mac", - "posix" - ], - "uses_polling": true - }, { "args": [], "benchmark": false, @@ -65503,6 +65481,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -65543,6 +65522,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -65583,6 +65563,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -65623,6 +65604,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -65663,6 +65645,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -65703,6 +65686,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -65743,6 +65727,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -65783,6 +65768,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -65823,6 +65809,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -65863,6 +65850,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -65903,6 +65891,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -65943,6 +65932,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -65983,6 +65973,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -66023,6 +66014,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -66063,6 +66055,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -66103,6 +66096,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -66143,6 +66137,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -66183,6 +66178,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -66223,6 +66219,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -66263,6 +66260,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -66303,6 +66301,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -66343,6 +66342,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -66383,6 +66383,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -66423,6 +66424,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -66463,6 +66465,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -66503,6 +66506,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -66543,6 +66547,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -66583,6 +66588,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -66623,6 +66629,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -66663,6 +66670,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -66703,6 +66711,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -66743,6 +66752,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -66783,6 +66793,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -66823,6 +66834,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -66863,6 +66875,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -66903,6 +66916,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -66943,6 +66957,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -66983,6 +66998,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -67023,6 +67039,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -67063,6 +67080,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -67103,6 +67121,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -67143,6 +67162,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -67183,6 +67203,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -67223,6 +67244,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -67263,6 +67285,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -67303,6 +67326,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -67343,6 +67367,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -67383,6 +67408,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -67423,6 +67449,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -67463,6 +67490,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -67503,6 +67531,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -67543,6 +67572,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -67583,6 +67613,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -67623,6 +67654,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -67663,6 +67695,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -67703,6 +67736,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -67743,6 +67777,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -67783,6 +67818,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -67823,6 +67859,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -67863,6 +67900,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -67903,6 +67941,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -67943,6 +67982,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -67983,6 +68023,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -68023,6 +68064,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -68063,6 +68105,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -68103,6 +68146,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -68143,6 +68187,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -68183,6 +68228,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -68223,6 +68269,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -68263,6 +68310,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -68303,6 +68351,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -68343,6 +68392,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -68383,6 +68433,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -68423,6 +68474,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -68463,6 +68515,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -68503,6 +68556,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", @@ -68543,6 +68597,7 @@ "basicprof", "c++-compat", "counters", + "counters_with_memory_counter", "dbg", "gcov", "helgrind", From ea73b5cda1576b2543eae8005cfbfbc39b56344a Mon Sep 17 00:00:00 2001 From: Eric Gribkoff Date: Tue, 5 Nov 2019 06:01:20 +0000 Subject: [PATCH 072/133] replace existing factory arg, if any --- .../chttp2/client/insecure/channel_create.cc | 4 +++- .../chttp2/client/secure/secure_channel_create.cc | 12 +++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/core/ext/transport/chttp2/client/insecure/channel_create.cc b/src/core/ext/transport/chttp2/client/insecure/channel_create.cc index cbd522d6e50..aaa978995df 100644 --- a/src/core/ext/transport/chttp2/client/insecure/channel_create.cc +++ b/src/core/ext/transport/chttp2/client/insecure/channel_create.cc @@ -99,7 +99,9 @@ grpc_channel* grpc_insecure_channel_create(const char* target, // Add channel arg containing the client channel factory. gpr_once_init(&g_factory_once, FactoryInit); grpc_arg arg = grpc_core::ClientChannelFactory::CreateChannelArg(g_factory); - grpc_channel_args* new_args = grpc_channel_args_copy_and_add(args, &arg, 1); + const char* arg_to_remove = arg.key; + grpc_channel_args* new_args = grpc_channel_args_copy_and_add_and_remove( + args, &arg_to_remove, 1, &arg, 1); // Create channel. grpc_channel* channel = grpc_core::CreateChannel(target, new_args); // Clean up. diff --git a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc index b18d742ed12..95410cff7b3 100644 --- a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc +++ b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc @@ -205,11 +205,13 @@ grpc_channel* grpc_secure_channel_create(grpc_channel_credentials* creds, // Add channel args containing the client channel factory and channel // credentials. gpr_once_init(&g_factory_once, FactoryInit); - grpc_arg args_to_add[] = { - grpc_core::ClientChannelFactory::CreateChannelArg(g_factory), - grpc_channel_credentials_to_arg(creds)}; - grpc_channel_args* new_args = grpc_channel_args_copy_and_add( - args, args_to_add, GPR_ARRAY_SIZE(args_to_add)); + grpc_arg channel_factory_arg = + grpc_core::ClientChannelFactory::CreateChannelArg(g_factory); + grpc_arg args_to_add[] = {channel_factory_arg, + grpc_channel_credentials_to_arg(creds)}; + const char* arg_to_remove = channel_factory_arg.key; + grpc_channel_args* new_args = grpc_channel_args_copy_and_add_and_remove( + args, &arg_to_remove, 1, args_to_add, GPR_ARRAY_SIZE(args_to_add)); new_args = creds->update_arguments(new_args); // Create channel. channel = grpc_core::CreateChannel(target, new_args); From c2135108f005f35cdfa2d44d50da5299bfbda0e2 Mon Sep 17 00:00:00 2001 From: Eric Gribkoff Date: Tue, 5 Nov 2019 11:10:34 -0800 Subject: [PATCH 073/133] Add self to active maintainers --- MAINTAINERS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS.md b/MAINTAINERS.md index 4357f7028d2..5647eb633f0 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -18,6 +18,7 @@ for general contribution guidelines. - [dfawley](https://github.com/dfawley), Google LLC - [dklempner](https://github.com/dklempner), Google LLC - [ejona86](https://github.com/ejona86), Google LLC +- [ericgribkoff](https://github.com/ericgribkoff), Google LLC - [gnossen](https://github.com/gnossen), Google LLC - [guantaol](https://github.com/guantaol), Google LLC - [hcaseyal](https://github.com/hcaseyal), Google LLC @@ -64,7 +65,6 @@ for general contribution guidelines. - [billfeng327](https://github.com/billfeng327), Google LLC - [ctiller](https://github.com/ctiller), Google LLC - [dgquintas](https://github.com/dgquintas), Google LLC -- [ericgribkoff](https://github.com/ericgribkoff), Google LLC - [fengli79](https://github.com/fengli79), Google LLC - [jcanizales](https://github.com/jcanizales), Google LLC - [jpalmerLinuxFoundation](https://github.com/jpalmerLinuxFoundation), Linux Foundation From 0ca0a6f341eb713fa9aa21289ec4f0ecf3c4e93c Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Tue, 5 Nov 2019 11:24:17 -0800 Subject: [PATCH 074/133] Remove new GRPC_CLOSURE_SCHED occurences --- src/core/tsi/alts/handshaker/alts_handshaker_client.cc | 8 +++++--- src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/core/tsi/alts/handshaker/alts_handshaker_client.cc b/src/core/tsi/alts/handshaker/alts_handshaker_client.cc index 7318d6ddeb6..5d797e51e6d 100644 --- a/src/core/tsi/alts/handshaker/alts_handshaker_client.cc +++ b/src/core/tsi/alts/handshaker/alts_handshaker_client.cc @@ -429,9 +429,11 @@ static void handshaker_client_destruct(alts_handshaker_client* c) { // TODO(apolcyn): we could remove this indirection and call // grpc_call_unref inline if there was an internal variant of // grpc_call_unref that didn't need to flush an ExecCtx. - GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(handshaker_call_unref, client->call, - grpc_schedule_on_exec_ctx), - GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, + GRPC_CLOSURE_CREATE(handshaker_call_unref, client->call, + grpc_schedule_on_exec_ctx), + GRPC_ERROR_NONE); } } diff --git a/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc b/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc index e56448d798c..edd95c38386 100644 --- a/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc +++ b/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc @@ -419,7 +419,7 @@ static tsi_result handshaker_next( // stack. Doing so avoids potential lock cycles between g_init_mu and other // mutexes within core that might be held on the current call stack // (note that g_init_mu gets acquired during channel creation). - GRPC_CLOSURE_SCHED(&args->closure, GRPC_ERROR_NONE); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, &args->closure, GRPC_ERROR_NONE); } else { tsi_result ok = alts_tsi_handshaker_continue_handshaker_next( handshaker, received_bytes, received_bytes_size, cb, user_data); From cc9231150db7e5d8636458b85ff97f250c166bf9 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Tue, 5 Nov 2019 11:45:25 -0800 Subject: [PATCH 075/133] Generate projects --- CMakeLists.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e188a4daf7..9decbb4d85b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9443,10 +9443,6 @@ if(_gRPC_PLATFORM_LINUX) ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_BENCHMARK_INCLUDE_DIR} - ${_gRPC_CARES_INCLUDE_DIR} - ${_gRPC_GFLAGS_INCLUDE_DIR} - ${_gRPC_PROTOBUF_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} ${_gRPC_UPB_GRPC_GENERATED_DIR} From 86cb2f9efcfcb83387ec13682bf29a16166bb938 Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Tue, 5 Nov 2019 11:47:16 -0800 Subject: [PATCH 076/133] Add additional test runner for single-threaded unary-stream code path --- src/python/grpcio/grpc/_channel.py | 8 ++- .../grpcio_tests/tests/unit/BUILD.bazel | 58 +++++++++++-------- ...ingle_threaded_unary_stream_test_runner.sh | 5 ++ 3 files changed, 46 insertions(+), 25 deletions(-) create mode 100755 src/python/grpcio_tests/tests/unit/_single_threaded_unary_stream_test_runner.sh diff --git a/src/python/grpcio/grpc/_channel.py b/src/python/grpcio/grpc/_channel.py index f75db5d2ab6..68471730597 100644 --- a/src/python/grpcio/grpc/_channel.py +++ b/src/python/grpcio/grpc/_channel.py @@ -16,6 +16,7 @@ import copy import functools import logging +import os import sys import threading import time @@ -33,6 +34,11 @@ _USER_AGENT = 'grpc-python/{}'.format(_grpcio_metadata.__version__) _EMPTY_FLAGS = 0 +# NOTE(rbellevi): No guarantees are given about the maintenance of this +# environment variable. +_DEFAULT_SINGLE_THREADED_UNARY_STREAM = os.getenv( + "GRPC_SINGLE_THREADED_UNARY_STREAM") is not None + _UNARY_UNARY_INITIAL_DUE = ( cygrpc.OperationType.send_initial_metadata, cygrpc.OperationType.send_message, @@ -1334,7 +1340,7 @@ class Channel(grpc.Channel): used over the lifetime of the channel. """ python_options, core_options = _separate_channel_options(options) - self._single_threaded_unary_stream = False + self._single_threaded_unary_stream = _DEFAULT_SINGLE_THREADED_UNARY_STREAM self._process_python_options(python_options) self._channel = cygrpc.Channel( _common.encode(target), _augment_options(core_options, compression), diff --git a/src/python/grpcio_tests/tests/unit/BUILD.bazel b/src/python/grpcio_tests/tests/unit/BUILD.bazel index 42da77dbad2..df413a991b7 100644 --- a/src/python/grpcio_tests/tests/unit/BUILD.bazel +++ b/src/python/grpcio_tests/tests/unit/BUILD.bazel @@ -84,29 +84,39 @@ py_library( ) [ - py2and3_test( - name=test_file_name[:-3], - size="small", - srcs=[test_file_name], - main=test_file_name, - deps=[ - "//src/python/grpcio/grpc:grpcio", - ":resources", - ":test_common", - ":thread_pool", - ":_exit_scenarios", - ":_server_shutdown_scenarios", - ":_from_grpc_import_star", - ":_tcp_proxy", - ":_signal_client", - "//src/python/grpcio_tests/tests/unit/framework/common", - "//src/python/grpcio_tests/tests/testing", - "//external:six" - ], - imports=["../../",], - data=[ - "//src/python/grpcio_tests/tests/unit/credentials", - ], - ) for test_file_name in GRPCIO_TESTS_UNIT + [ + py2and3_test( + name=test_file_name[:-3], + size="small", + srcs=[test_file_name], + main=test_file_name, + deps=[ + "//src/python/grpcio/grpc:grpcio", + ":resources", + ":test_common", + ":thread_pool", + ":_exit_scenarios", + ":_server_shutdown_scenarios", + ":_from_grpc_import_star", + ":_tcp_proxy", + ":_signal_client", + "//src/python/grpcio_tests/tests/unit/framework/common", + "//src/python/grpcio_tests/tests/testing", + "//external:six" + ], + imports=["../../",], + data=[ + "//src/python/grpcio_tests/tests/unit/credentials", + ], + ), + sh_test( + name = test_file_name[:-3] + ".single_threaded_unary_stream", + data = ["{}.python3".format(test_file_name[:-3])], + args = ["{}.python3".format(test_file_name[:-3])], + size = "small", + srcs = ["_single_threaded_unary_stream_test_runner.sh"] + ) + ] + for test_file_name in GRPCIO_TESTS_UNIT ] diff --git a/src/python/grpcio_tests/tests/unit/_single_threaded_unary_stream_test_runner.sh b/src/python/grpcio_tests/tests/unit/_single_threaded_unary_stream_test_runner.sh new file mode 100755 index 00000000000..e0490bf22fb --- /dev/null +++ b/src/python/grpcio_tests/tests/unit/_single_threaded_unary_stream_test_runner.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +export GRPC_SINGLE_THREADED_UNARY_STREAM=true + +find . -name "$1" -exec {} \; From a2054cda1431c3cba2854ae8a3eb318b4c5ee438 Mon Sep 17 00:00:00 2001 From: Hope Casey-Allen Date: Tue, 5 Nov 2019 12:46:32 -0800 Subject: [PATCH 077/133] Update triage duty --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- .github/ISSUE_TEMPLATE/cleanup_request.md | 2 +- .github/ISSUE_TEMPLATE/feature_request.md | 2 +- .github/pull_request_template.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index beaa9f1d7a1..67cf25dde46 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -2,7 +2,7 @@ name: Report a bug about: Create a report to help us improve labels: kind/bug, priority/P2 -assignees: sheenaqotj +assignees: hcaseyal --- diff --git a/.github/ISSUE_TEMPLATE/cleanup_request.md b/.github/ISSUE_TEMPLATE/cleanup_request.md index 252262b167e..2d168c570fb 100644 --- a/.github/ISSUE_TEMPLATE/cleanup_request.md +++ b/.github/ISSUE_TEMPLATE/cleanup_request.md @@ -2,7 +2,7 @@ name: Request a cleanup about: Suggest a cleanup in our repository labels: kind/internal cleanup, priority/P2 -assignees: sheenaqotj +assignees: hcaseyal --- diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 3ad1ccbf5ac..9ae2d7715f0 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -2,7 +2,7 @@ name: Request a feature about: Suggest an idea for this project labels: kind/enhancement, priority/P2 -assignees: sheenaqotj +assignees: hcaseyal --- diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index f5e68e74fd2..747829ee040 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -8,4 +8,4 @@ If you know who should review your pull request, please remove the mentioning be --> -@sheenaqotj +@hcaseyal From 0579539b07a11468a894ff8fffed1595d9647035 Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Tue, 5 Nov 2019 10:27:16 -0800 Subject: [PATCH 078/133] PHP: update dockerfiles --- src/php/docker/alpine/Dockerfile | 5 +---- src/php/docker/grpc-ext/Dockerfile | 5 +---- src/php/docker/grpc-src/Dockerfile | 10 +++------- src/php/docker/php-future/Dockerfile | 5 +---- src/php/docker/php-src/Dockerfile | 5 +---- src/php/docker/php-zts/Dockerfile | 5 +---- src/php/docker/php5/Dockerfile | 5 +---- templates/src/php/docker/grpc-src/Dockerfile.template | 10 +++------- templates/src/php/docker/pecl_ext_build_src.include | 5 +---- 9 files changed, 13 insertions(+), 42 deletions(-) diff --git a/src/php/docker/alpine/Dockerfile b/src/php/docker/alpine/Dockerfile index 3750e76416a..e5b977c4aa6 100644 --- a/src/php/docker/alpine/Dockerfile +++ b/src/php/docker/alpine/Dockerfile @@ -28,10 +28,7 @@ RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && \ WORKDIR /github/grpc -RUN git clone https://github.com/grpc/grpc . && \ - git submodule update --init - -COPY src/ ./src +COPY . . RUN pear package && \ find . -name grpc-*.tgz | xargs -I{} pecl install {} diff --git a/src/php/docker/grpc-ext/Dockerfile b/src/php/docker/grpc-ext/Dockerfile index 3e794da4f60..93d0307c4a0 100644 --- a/src/php/docker/grpc-ext/Dockerfile +++ b/src/php/docker/grpc-ext/Dockerfile @@ -30,10 +30,7 @@ RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && \ WORKDIR /github/grpc -RUN git clone https://github.com/grpc/grpc . && \ - git submodule update --init - -COPY src/ ./src +COPY . . RUN pear package && \ find . -name grpc-*.tgz | xargs -I{} pecl install {} diff --git a/src/php/docker/grpc-src/Dockerfile b/src/php/docker/grpc-src/Dockerfile index d8a1099017a..4998ab7dd1d 100644 --- a/src/php/docker/grpc-src/Dockerfile +++ b/src/php/docker/grpc-src/Dockerfile @@ -30,16 +30,12 @@ RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && \ WORKDIR /github/grpc -RUN git clone https://github.com/grpc/grpc . && \ - git submodule update --init && \ - make && make install +COPY . . +RUN make && make install -WORKDIR /github/grpc/src/php/ext/grpc -COPY src/php/ext/grpc/*.c ./ -COPY src/php/ext/grpc/*.h ./ -COPY src/php/ext/grpc/config.m4 ./ +WORKDIR /github/grpc/src/php/ext/grpc RUN phpize && \ ./configure --enable-tests && \ diff --git a/src/php/docker/php-future/Dockerfile b/src/php/docker/php-future/Dockerfile index 8e887644a44..b0f6c886902 100644 --- a/src/php/docker/php-future/Dockerfile +++ b/src/php/docker/php-future/Dockerfile @@ -30,10 +30,7 @@ RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && \ WORKDIR /github/grpc -RUN git clone https://github.com/grpc/grpc . && \ - git submodule update --init - -COPY src/ ./src +COPY . . RUN pear package && \ find . -name grpc-*.tgz | xargs -I{} pecl install {} diff --git a/src/php/docker/php-src/Dockerfile b/src/php/docker/php-src/Dockerfile index 443560fc091..972a297aafe 100644 --- a/src/php/docker/php-src/Dockerfile +++ b/src/php/docker/php-src/Dockerfile @@ -52,10 +52,7 @@ RUN git checkout php-7.2.22 && \ WORKDIR /github/grpc -RUN git clone https://github.com/grpc/grpc . && \ - git submodule update --init - -COPY src/ ./src +COPY . . RUN pear package && \ find . -name grpc-*.tgz | xargs -I{} pecl install {} diff --git a/src/php/docker/php-zts/Dockerfile b/src/php/docker/php-zts/Dockerfile index 1b8bf7d11ba..9bc9d37152d 100644 --- a/src/php/docker/php-zts/Dockerfile +++ b/src/php/docker/php-zts/Dockerfile @@ -30,10 +30,7 @@ RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && \ WORKDIR /github/grpc -RUN git clone https://github.com/grpc/grpc . && \ - git submodule update --init - -COPY src/ ./src +COPY . . RUN pear package && \ find . -name grpc-*.tgz | xargs -I{} pecl install {} diff --git a/src/php/docker/php5/Dockerfile b/src/php/docker/php5/Dockerfile index 06b0e19e850..a350e7c9b63 100644 --- a/src/php/docker/php5/Dockerfile +++ b/src/php/docker/php5/Dockerfile @@ -30,10 +30,7 @@ RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && \ WORKDIR /github/grpc -RUN git clone https://github.com/grpc/grpc . && \ - git submodule update --init - -COPY src/ ./src +COPY . . RUN pear package && \ find . -name grpc-*.tgz | xargs -I{} pecl install {} diff --git a/templates/src/php/docker/grpc-src/Dockerfile.template b/templates/src/php/docker/grpc-src/Dockerfile.template index b04c77c2b63..57db1039318 100644 --- a/templates/src/php/docker/grpc-src/Dockerfile.template +++ b/templates/src/php/docker/grpc-src/Dockerfile.template @@ -29,16 +29,12 @@ WORKDIR /github/grpc - RUN git clone https://github.com/grpc/grpc . && ${'\\'} - git submodule update --init && ${'\\'} - make && make install + COPY . . + RUN make && make install - WORKDIR /github/grpc/src/php/ext/grpc - COPY src/php/ext/grpc/*.c ./ - COPY src/php/ext/grpc/*.h ./ - COPY src/php/ext/grpc/config.m4 ./ + WORKDIR /github/grpc/src/php/ext/grpc RUN phpize && ${'\\'} ./configure --enable-tests && ${'\\'} diff --git a/templates/src/php/docker/pecl_ext_build_src.include b/templates/src/php/docker/pecl_ext_build_src.include index 45d2f426163..0f9300c4dda 100644 --- a/templates/src/php/docker/pecl_ext_build_src.include +++ b/templates/src/php/docker/pecl_ext_build_src.include @@ -1,9 +1,6 @@ WORKDIR /github/grpc -RUN git clone https://github.com/grpc/grpc . && ${'\\'} - git submodule update --init - -COPY src/ ./src +COPY . . RUN pear package && ${'\\'} find . -name grpc-*.tgz | xargs -I{} pecl install {} From 744c34e8cad63100787725f509b4f28091c54d04 Mon Sep 17 00:00:00 2001 From: Menghan Li Date: Tue, 5 Nov 2019 14:01:25 -0800 Subject: [PATCH 079/133] Add v1.25.0 release of grpc-go to interop matrix --- tools/interop_matrix/client_matrix.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/interop_matrix/client_matrix.py b/tools/interop_matrix/client_matrix.py index aef372f0513..745b356537d 100644 --- a/tools/interop_matrix/client_matrix.py +++ b/tools/interop_matrix/client_matrix.py @@ -149,6 +149,7 @@ LANG_RELEASE_MATRIX = { ('v1.22.3', ReleaseInfo(runtimes=['go1.11'])), ('v1.23.1', ReleaseInfo(runtimes=['go1.11'])), ('v1.24.0', ReleaseInfo(runtimes=['go1.11'])), + ('v1.25.0', ReleaseInfo(runtimes=['go1.11'])), ]), 'java': OrderedDict([ From 9f5dbf70dcf089fe1bdd7a246e64e217f8f29ec0 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Thu, 24 Oct 2019 18:38:20 -0700 Subject: [PATCH 080/133] Add shutdown test --- .../grpc/_cython/_cygrpc/aio/server.pxd.pxi | 2 + .../grpc/_cython/_cygrpc/aio/server.pyx.pxi | 82 +++++++++++++++---- .../grpc/_cython/_cygrpc/server.pyx.pxi | 32 +++++--- .../grpcio/grpc/experimental/aio/_server.py | 64 ++++++++------- .../tests_aio/unit/server_test.py | 10 +++ 5 files changed, 137 insertions(+), 53 deletions(-) diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pxd.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pxd.pxi index 1906463d088..99a1af09792 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pxd.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pxd.pxi @@ -30,6 +30,7 @@ cdef enum AioServerStatus: AIO_SERVER_STATUS_READY AIO_SERVER_STATUS_RUNNING AIO_SERVER_STATUS_STOPPED + AIO_SERVER_STATUS_STOPPING cdef class _CallbackCompletionQueue: @@ -42,3 +43,4 @@ cdef class AioServer: cdef _CallbackCompletionQueue _cq cdef list _generic_handlers cdef AioServerStatus _status + cdef object _loop diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi index dd6ff8b29d8..4a1c5aec48c 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +_LOGGER = logging.getLogger(__name__) + cdef class _HandlerCallDetails: def __cinit__(self, str method, tuple invocation_metadata): self.method = method @@ -186,10 +188,10 @@ async def _server_call_request_call(Server server, return rpc_state -async def _server_main_loop(Server server, +async def _server_main_loop(object loop, + Server server, _CallbackCompletionQueue cq, list generic_handlers): - cdef object loop = asyncio.get_event_loop() cdef RPCState rpc_state while True: @@ -201,11 +203,12 @@ async def _server_main_loop(Server server, loop.create_task(_handle_rpc(generic_handlers, rpc_state, loop)) -async def _server_start(Server server, +async def _server_start(object loop, + Server server, _CallbackCompletionQueue cq, list generic_handlers): - server.start() - await _server_main_loop(server, cq, generic_handlers) + server.start(backup_queue=False) + await _server_main_loop(loop, server, cq, generic_handlers) cdef class _CallbackCompletionQueue: @@ -222,17 +225,18 @@ cdef class _CallbackCompletionQueue: cdef class AioServer: - def __init__(self, thread_pool, generic_handlers, interceptors, options, - maximum_concurrent_rpcs, compression): + def __init__(self, loop, thread_pool, generic_handlers, interceptors, + options, maximum_concurrent_rpcs, compression): + self._loop = loop self._server = Server(options) self._cq = _CallbackCompletionQueue() - self._status = AIO_SERVER_STATUS_READY - self._generic_handlers = [] grpc_server_register_completion_queue( self._server.c_server, self._cq.c_ptr(), NULL ) + self._status = AIO_SERVER_STATUS_READY + self._generic_handlers = [] self.add_generic_rpc_handlers(generic_handlers) if interceptors: @@ -262,14 +266,62 @@ cdef class AioServer: raise RuntimeError('Server not in ready state') self._status = AIO_SERVER_STATUS_RUNNING - loop = asyncio.get_event_loop() - loop.create_task(_server_start( + self._loop.create_task(_server_start( + self._loop, self._server, self._cq, self._generic_handlers, )) - # TODO(https://github.com/grpc/grpc/issues/20668) - # Implement Destruction Methods for AsyncIO Server - def stop(self, unused_grace): - pass + async def shutdown(self, grace): + """Gracefully shutdown the C-Core server. + + Application should only call shutdown once. + + Args: + grace: An optional float indicates the length of grace period in + seconds. + """ + if self._status != AIO_SERVER_STATUS_RUNNING: + # The server either is shutting down, or not started. + return + cdef object shutdown_completed = self._loop.create_future() + cdef CallbackWrapper wrapper = CallbackWrapper(shutdown_completed) + # NOTE(lidiz) Without Py_INCREF, the wrapper object will be destructed + # when calling "await". This is an over-optimization by Cython. + cpython.Py_INCREF(wrapper) + + # Starts the shutdown process. + # The shutdown callback won't be called unless there is no live RPC. + grpc_server_shutdown_and_notify( + self._server.c_server, + self._cq._cq, + wrapper.c_functor()) + self._server.is_shutting_down = True + self._status = AIO_SERVER_STATUS_STOPPING + + if grace is None: + # Directly cancels all calls + grpc_server_cancel_all_calls(self._server.c_server) + await shutdown_completed + else: + try: + await asyncio.wait_for(shutdown_completed, grace) + except asyncio.TimeoutError: + # Cancels all ongoing calls by the end of grace period. + grpc_server_cancel_all_calls(self._server.c_server) + await shutdown_completed + + # Keeps wrapper object alive until now. + cpython.Py_DECREF(wrapper) + grpc_server_destroy(self._server.c_server) + self._server.c_server = NULL + self._server.is_shutdown = True + self._status = AIO_SERVER_STATUS_STOPPED + + def __dealloc__(self): + if self._status == AIO_SERVER_STATUS_STOPPED: + grpc_completion_queue_shutdown(self._cq._cq) + grpc_completion_queue_destroy(self._cq._cq) + else: + _LOGGER.error('Server is not stopped while deallocation: %d', self._status) diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/server.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/server.pyx.pxi index 67b2e9d4e88..7ca332050b5 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/server.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/server.pyx.pxi @@ -61,16 +61,25 @@ cdef class Server: self.c_server, queue.c_completion_queue, NULL) self.registered_completion_queues.append(queue) - def start(self): + def start(self, backup_queue=True): + """Start the Cython gRPC Server. + + Args: + backup_queue: a bool indicates whether to spawn a backup completion + queue. In case of no CQ is bound to the server, and the shutdown + process of server becomes un-observable. + """ if self.is_started: raise ValueError("the server has already started") - self.backup_shutdown_queue = CompletionQueue(shutdown_cq=True) - self.register_completion_queue(self.backup_shutdown_queue) + if backup_queue: + self.backup_shutdown_queue = CompletionQueue(shutdown_cq=True) + self.register_completion_queue(self.backup_shutdown_queue) self.is_started = True with nogil: grpc_server_start(self.c_server) - # Ensure the core has gotten a chance to do the start-up work - self.backup_shutdown_queue.poll(deadline=time.time()) + if backup_queue: + # Ensure the core has gotten a chance to do the start-up work + self.backup_shutdown_queue.poll(deadline=time.time()) def add_http2_port(self, bytes address, ServerCredentials server_credentials=None): @@ -134,11 +143,14 @@ cdef class Server: elif self.is_shutdown: pass elif not self.is_shutting_down: - # the user didn't call shutdown - use our backup queue - self._c_shutdown(self.backup_shutdown_queue, None) - # and now we wait - while not self.is_shutdown: - self.backup_shutdown_queue.poll() + if self.backup_shutdown_queue is None: + raise RuntimeError('Server shutdown failed: no completion queue.') + else: + # the user didn't call shutdown - use our backup queue + self._c_shutdown(self.backup_shutdown_queue, None) + # and now we wait + while not self.is_shutdown: + self.backup_shutdown_queue.poll() else: # We're in the process of shutting down, but have not shutdown; can't do # much but repeatedly release the GIL and wait diff --git a/src/python/grpcio/grpc/experimental/aio/_server.py b/src/python/grpcio/grpc/experimental/aio/_server.py index 6bc3d210aed..ca39cef905f 100644 --- a/src/python/grpcio/grpc/experimental/aio/_server.py +++ b/src/python/grpcio/grpc/experimental/aio/_server.py @@ -25,9 +25,17 @@ class Server: def __init__(self, thread_pool, generic_handlers, interceptors, options, maximum_concurrent_rpcs, compression): - self._server = cygrpc.AioServer(thread_pool, generic_handlers, - interceptors, options, - maximum_concurrent_rpcs, compression) + self._loop = asyncio.get_event_loop() + self._server = cygrpc.AioServer( + self._loop, + thread_pool, + generic_handlers, + interceptors, + options, + maximum_concurrent_rpcs, + compression) + self._shutdown_started = False + self._shutdown_future = self._loop.create_future() def add_generic_rpc_handlers( self, @@ -83,35 +91,32 @@ class Server: """ await self._server.start() - def stop(self, grace: Optional[float]) -> asyncio.Event: + async def stop(self, grace: Optional[float]) -> None: """Stops this Server. - "This method immediately stops the server from servicing new RPCs in + This method immediately stops the server from servicing new RPCs in all cases. - If a grace period is specified, this method returns immediately - and all RPCs active at the end of the grace period are aborted. - If a grace period is not specified (by passing None for `grace`), - all existing RPCs are aborted immediately and this method - blocks until the last RPC handler terminates. + If a grace period is specified, all RPCs active at the end of the grace + period are aborted. + + If a grace period is not specified (by passing None for `grace`), all + existing RPCs are aborted immediately and this method blocks until the + last RPC handler terminates. - This method is idempotent and may be called at any time. - Passing a smaller grace value in a subsequent call will have - the effect of stopping the Server sooner (passing None will - have the effect of stopping the server immediately). Passing - a larger grace value in a subsequent call *will not* have the - effect of stopping the server later (i.e. the most restrictive - grace value is used). + Only the first call to "stop" sets the length of grace period. + Additional calls is allowed and will block until the termination of + the server. Args: grace: A duration of time in seconds or None. - - Returns: - A threading.Event that will be set when this Server has completely - stopped, i.e. when running RPCs either complete or are aborted and - all handlers have terminated. """ - raise NotImplementedError() + if self._shutdown_started: + await self._shutdown_future + else: + self._shutdown_started = True + await self._server.shutdown(grace) + self._shutdown_future.set_result(None) async def wait_for_termination(self, timeout: Optional[float] = None) -> bool: @@ -135,11 +140,14 @@ class Server: Returns: A bool indicates if the operation times out. """ - if timeout: - raise NotImplementedError() - # TODO(lidiz) replace this wait forever logic - future = asyncio.get_event_loop().create_future() - await future + if timeout == None: + await self._shutdown_future + else: + try: + await asyncio.wait_for(self._shutdown_future, timeout) + except asyncio.TimeoutError: + return False + return True def server(migration_thread_pool=None, diff --git a/src/python/grpcio_tests/tests_aio/unit/server_test.py b/src/python/grpcio_tests/tests_aio/unit/server_test.py index 937cce9eebb..924dff836f4 100644 --- a/src/python/grpcio_tests/tests_aio/unit/server_test.py +++ b/src/python/grpcio_tests/tests_aio/unit/server_test.py @@ -51,6 +51,16 @@ class TestServer(AioTestBase): self.assertEqual(response, _RESPONSE) self.loop.run_until_complete(test_unary_unary_body()) + + def test_shutdown(self): + + async def test_shutdown_body(): + server = aio.server() + port = server.add_insecure_port('[::]:0') + server.add_generic_rpc_handlers((GenericHandler(),)) + await server.start() + await server.stop(None) + asyncio.get_event_loop().run_until_complete(test_shutdown_body()) if __name__ == '__main__': From 3c43e6330f2044b09224c4c8756fc8c39b71e9aa Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Thu, 24 Oct 2019 19:03:42 -0700 Subject: [PATCH 081/133] Add shutdown process for completion queue --- .../grpc/_cython/_cygrpc/aio/server.pxd.pxi | 15 +++++++++++ .../grpc/_cython/_cygrpc/aio/server.pyx.pxi | 27 ++++++++++++------- 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pxd.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pxd.pxi index 99a1af09792..c1d5bd8c387 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pxd.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pxd.pxi @@ -25,6 +25,18 @@ cdef class RPCState: cdef bytes method(self) +cdef class CallbackWrapper: + cdef CallbackContext context + cdef object _reference + + @staticmethod + cdef void functor_run( + grpc_experimental_completion_queue_functor* functor, + int succeed) + + cdef grpc_experimental_completion_queue_functor *c_functor(self) + + cdef enum AioServerStatus: AIO_SERVER_STATUS_UNKNOWN AIO_SERVER_STATUS_READY @@ -36,6 +48,9 @@ cdef enum AioServerStatus: cdef class _CallbackCompletionQueue: cdef grpc_completion_queue *_cq cdef grpc_completion_queue* c_ptr(self) + cdef object _shutdown_completed + cdef CallbackWrapper _wrapper + cdef object _loop cdef class AioServer: diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi index 4a1c5aec48c..1ade4fadaf8 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi @@ -26,8 +26,6 @@ class _ServicerContextPlaceHolder(object): pass # TODO(https://github.com/grpc/grpc/issues/20669) # Apply this to the client-side cdef class CallbackWrapper: - cdef CallbackContext context - cdef object _reference def __cinit__(self, object future): self.context.functor.functor_run = self.functor_run @@ -213,14 +211,22 @@ async def _server_start(object loop, cdef class _CallbackCompletionQueue: - def __cinit__(self): + def __cinit__(self, object loop): + self._loop = loop + self._shutdown_completed = loop.create_future() + self._wrapper = CallbackWrapper(self._shutdown_completed) self._cq = grpc_completion_queue_create_for_callback( - NULL, + self._wrapper.c_functor(), NULL ) cdef grpc_completion_queue* c_ptr(self): return self._cq + + async def shutdown(self): + grpc_completion_queue_shutdown(self._cq) + await self._shutdown_completed + grpc_completion_queue_destroy(self._cq) cdef class AioServer: @@ -228,13 +234,16 @@ cdef class AioServer: def __init__(self, loop, thread_pool, generic_handlers, interceptors, options, maximum_concurrent_rpcs, compression): self._loop = loop + + # C-Core objects won't be deallocated automatically. self._server = Server(options) - self._cq = _CallbackCompletionQueue() + self._cq = _CallbackCompletionQueue(loop) grpc_server_register_completion_queue( self._server.c_server, self._cq.c_ptr(), NULL ) + self._status = AIO_SERVER_STATUS_READY self._generic_handlers = [] self.add_generic_rpc_handlers(generic_handlers) @@ -319,9 +328,9 @@ cdef class AioServer: self._server.is_shutdown = True self._status = AIO_SERVER_STATUS_STOPPED + # Shuts down the completion queue + await self._cq.shutdown() + def __dealloc__(self): - if self._status == AIO_SERVER_STATUS_STOPPED: - grpc_completion_queue_shutdown(self._cq._cq) - grpc_completion_queue_destroy(self._cq._cq) - else: + if self._status != AIO_SERVER_STATUS_STOPPED: _LOGGER.error('Server is not stopped while deallocation: %d', self._status) From 980bcaf07609a0798eecea6865725c9f66339b42 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Fri, 25 Oct 2019 14:43:55 -0700 Subject: [PATCH 082/133] Add failure handling mechanism to CallbackWrapper --- .../_cygrpc/aio/callbackcontext.pxd.pxi | 4 +- .../grpc/_cython/_cygrpc/aio/server.pxd.pxi | 10 +- .../grpc/_cython/_cygrpc/aio/server.pyx.pxi | 135 +++++++++++++----- 3 files changed, 105 insertions(+), 44 deletions(-) diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callbackcontext.pxd.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callbackcontext.pxd.pxi index 8e52c856dd2..38b7e9b3aed 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callbackcontext.pxd.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callbackcontext.pxd.pxi @@ -16,5 +16,5 @@ cimport cpython cdef struct CallbackContext: grpc_experimental_completion_queue_functor functor - cpython.PyObject *waiter - + cpython.PyObject *waiter # asyncio.Future + cpython.PyObject *failure_handler # cygrpc.CallbackFailureHandler diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pxd.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pxd.pxi index c1d5bd8c387..0a3c2e4d9af 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pxd.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pxd.pxi @@ -27,7 +27,8 @@ cdef class RPCState: cdef class CallbackWrapper: cdef CallbackContext context - cdef object _reference + cdef object _reference_of_future + cdef object _reference_of_failure_handler @staticmethod cdef void functor_run( @@ -48,9 +49,9 @@ cdef enum AioServerStatus: cdef class _CallbackCompletionQueue: cdef grpc_completion_queue *_cq cdef grpc_completion_queue* c_ptr(self) - cdef object _shutdown_completed + cdef object _shutdown_completed # asyncio.Future cdef CallbackWrapper _wrapper - cdef object _loop + cdef object _loop # asyncio.EventLoop cdef class AioServer: @@ -58,4 +59,5 @@ cdef class AioServer: cdef _CallbackCompletionQueue _cq cdef list _generic_handlers cdef AioServerStatus _status - cdef object _loop + cdef object _loop # asyncio.EventLoop + cdef object _serving_task # asyncio.Task diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi index 1ade4fadaf8..f198dbee9f3 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi @@ -14,6 +14,7 @@ _LOGGER = logging.getLogger(__name__) + cdef class _HandlerCallDetails: def __cinit__(self, str method, tuple invocation_metadata): self.method = method @@ -23,22 +24,60 @@ cdef class _HandlerCallDetails: class _ServicerContextPlaceHolder(object): pass +cdef class CallbackFailureHandler: + cdef str _c_core_api + cdef object _error_details + cdef object _exception_type + cdef object _callback # Callable[[Future], None] + + def __cinit__(self, + str c_core_api="", + object error_details="UNKNOWN", + object exception_type=RuntimeError, + object callback=None): + """Handles failure by raising exception or execute a callbcak. + + The callback accepts a future, returns nothing. The callback is + expected to finish the future either "set_result" or "set_exception". + """ + if callback is None: + self._c_core_api = c_core_api + self._error_details = error_details + self._exception_type = exception_type + self._callback = self._raise_exception + else: + self._callback = callback + + def _raise_exception(self, object future): + future.set_exception(self._exception_type( + 'Failed "%s": %s' % (self._c_core_api, self._error_details) + )) + + cdef handle(self, object future): + self._callback(future) + + # TODO(https://github.com/grpc/grpc/issues/20669) # Apply this to the client-side cdef class CallbackWrapper: - def __cinit__(self, object future): + def __cinit__(self, object future, CallbackFailureHandler failure_handler): self.context.functor.functor_run = self.functor_run - self.context.waiter = (future) - self._reference = future + self.context.waiter = future + self.context.failure_handler = failure_handler + # NOTE(lidiz) Not using a list here, because this class is critical in + # data path. We should make it as efficient as possible. + self._reference_of_future = future + self._reference_of_failure_handler = failure_handler @staticmethod cdef void functor_run( grpc_experimental_completion_queue_functor* functor, int success): cdef CallbackContext *context = functor - if success == 0: - (context.waiter).set_exception(RuntimeError()) + if succeed == 0: + (context.failure_handler).handle( + context.waiter) else: (context.waiter).set_result(None) @@ -85,7 +124,9 @@ async def callback_start_batch(RPCState rpc_state, batch_operation_tag.prepare() cdef object future = loop.create_future() - cdef CallbackWrapper wrapper = CallbackWrapper(future) + cdef CallbackWrapper wrapper = CallbackWrapper( + future, + CallbackFailureHandler('callback_start_batch', operations)) # NOTE(lidiz) Without Py_INCREF, the wrapper object will be destructed # when calling "await". This is an over-optimization by Cython. cpython.Py_INCREF(wrapper) @@ -162,13 +203,21 @@ async def _handle_rpc(list generic_handlers, RPCState rpc_state, object loop): ) +def _FINISH_FUTURE(future): + future.set_result(None) + +cdef CallbackFailureHandler IGNORE_FAILURE = CallbackFailureHandler(callback=_FINISH_FUTURE) + + async def _server_call_request_call(Server server, _CallbackCompletionQueue cq, object loop): cdef grpc_call_error error cdef RPCState rpc_state = RPCState() cdef object future = loop.create_future() - cdef CallbackWrapper wrapper = CallbackWrapper(future) + cdef CallbackWrapper wrapper = CallbackWrapper( + future, + IGNORE_FAILURE) # NOTE(lidiz) Without Py_INCREF, the wrapper object will be destructed # when calling "await". This is an over-optimization by Cython. cpython.Py_INCREF(wrapper) @@ -186,27 +235,7 @@ async def _server_call_request_call(Server server, return rpc_state -async def _server_main_loop(object loop, - Server server, - _CallbackCompletionQueue cq, - list generic_handlers): - cdef RPCState rpc_state - - while True: - rpc_state = await _server_call_request_call( - server, - cq, - loop) - - loop.create_task(_handle_rpc(generic_handlers, rpc_state, loop)) - - -async def _server_start(object loop, - Server server, - _CallbackCompletionQueue cq, - list generic_handlers): - server.start(backup_queue=False) - await _server_main_loop(loop, server, cq, generic_handlers) +cdef CallbackFailureHandler CQ_SHUTDOWN_FAILURE_HANDLER = CallbackFailureHandler('grpc_completion_queue_shutdown') cdef class _CallbackCompletionQueue: @@ -214,7 +243,9 @@ cdef class _CallbackCompletionQueue: def __cinit__(self, object loop): self._loop = loop self._shutdown_completed = loop.create_future() - self._wrapper = CallbackWrapper(self._shutdown_completed) + self._wrapper = CallbackWrapper( + self._shutdown_completed, + CQ_SHUTDOWN_FAILURE_HANDLER) self._cq = grpc_completion_queue_create_for_callback( self._wrapper.c_functor(), NULL @@ -229,12 +260,13 @@ cdef class _CallbackCompletionQueue: grpc_completion_queue_destroy(self._cq) +cdef CallbackFailureHandler SERVER_SHUTDOWN_FAILURE_HANDLER = CallbackFailureHandler('grpc_server_shutdown_and_notify') + + cdef class AioServer: def __init__(self, loop, thread_pool, generic_handlers, interceptors, options, maximum_concurrent_rpcs, compression): - self._loop = loop - # C-Core objects won't be deallocated automatically. self._server = Server(options) self._cq = _CallbackCompletionQueue(loop) @@ -244,9 +276,11 @@ cdef class AioServer: NULL ) + self._loop = loop self._status = AIO_SERVER_STATUS_READY self._generic_handlers = [] self.add_generic_rpc_handlers(generic_handlers) + self._serving_task = None if interceptors: raise NotImplementedError() @@ -268,6 +302,27 @@ cdef class AioServer: return self._server.add_http2_port(address, server_credentials._credentials) + async def _server_main_loop(self, + object server_started): + self._server.start(backup_queue=False) + server_started.set_result(True) + cdef RPCState rpc_state + + while True: + # When shutdown process starts, no more new connections. + if self._status != AIO_SERVER_STATUS_RUNNING: + break + + rpc_state = await _server_call_request_call( + self._server, + self._cq, + self._loop) + + self._loop.create_task(_handle_rpc( + self._generic_handlers, + rpc_state, + self._loop)) + async def start(self): if self._status == AIO_SERVER_STATUS_RUNNING: return @@ -275,12 +330,11 @@ cdef class AioServer: raise RuntimeError('Server not in ready state') self._status = AIO_SERVER_STATUS_RUNNING - self._loop.create_task(_server_start( - self._loop, - self._server, - self._cq, - self._generic_handlers, - )) + cdef object server_started = self._loop.create_future() + self._serving_task = self._loop.create_task(self._server_main_loop(server_started)) + # Needs to explicitly wait for the server to start up. + # Otherwise, the actual start time of the server is un-controllable. + await server_started async def shutdown(self, grace): """Gracefully shutdown the C-Core server. @@ -295,7 +349,9 @@ cdef class AioServer: # The server either is shutting down, or not started. return cdef object shutdown_completed = self._loop.create_future() - cdef CallbackWrapper wrapper = CallbackWrapper(shutdown_completed) + cdef CallbackWrapper wrapper = CallbackWrapper( + shutdown_completed, + SERVER_SHUTDOWN_FAILURE_HANDLER) # NOTE(lidiz) Without Py_INCREF, the wrapper object will be destructed # when calling "await". This is an over-optimization by Cython. cpython.Py_INCREF(wrapper) @@ -309,6 +365,9 @@ cdef class AioServer: self._server.is_shutting_down = True self._status = AIO_SERVER_STATUS_STOPPING + # Ensures the serving task (coroutine) exits normally + await self._serving_task + if grace is None: # Directly cancels all calls grpc_server_cancel_all_calls(self._server.c_server) From a978449c3ff43e1c2b5b97d558e1e783022ba01f Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Fri, 25 Oct 2019 15:23:01 -0700 Subject: [PATCH 083/133] Correctly propagate and catch request_call failure --- .../grpc/_cython/_cygrpc/aio/server.pyx.pxi | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi index f198dbee9f3..7f17a695017 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi @@ -203,10 +203,10 @@ async def _handle_rpc(list generic_handlers, RPCState rpc_state, object loop): ) -def _FINISH_FUTURE(future): - future.set_result(None) +class _RequestCallError(Exception): pass -cdef CallbackFailureHandler IGNORE_FAILURE = CallbackFailureHandler(callback=_FINISH_FUTURE) +cdef CallbackFailureHandler REQUEST_CALL_FAILURE_HANDLER = CallbackFailureHandler( + 'grpc_server_request_call', 'server shutdown', _RequestCallError) async def _server_call_request_call(Server server, @@ -217,7 +217,7 @@ async def _server_call_request_call(Server server, cdef object future = loop.create_future() cdef CallbackWrapper wrapper = CallbackWrapper( future, - IGNORE_FAILURE) + REQUEST_CALL_FAILURE_HANDLER) # NOTE(lidiz) Without Py_INCREF, the wrapper object will be destructed # when calling "await". This is an over-optimization by Cython. cpython.Py_INCREF(wrapper) @@ -365,8 +365,11 @@ cdef class AioServer: self._server.is_shutting_down = True self._status = AIO_SERVER_STATUS_STOPPING - # Ensures the serving task (coroutine) exits normally - await self._serving_task + # Ensures the serving task (coroutine) exits. + try: + await self._serving_task + except _RequestCallError: + pass if grace is None: # Directly cancels all calls From cfea8c7d2563fdead7bf1403527b95e3a0281caf Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Fri, 25 Oct 2019 16:03:15 -0700 Subject: [PATCH 084/133] Add 3 more shutdown test cases --- .../tests_aio/unit/server_test.py | 68 ++++++++++++++++--- 1 file changed, 59 insertions(+), 9 deletions(-) diff --git a/src/python/grpcio_tests/tests_aio/unit/server_test.py b/src/python/grpcio_tests/tests_aio/unit/server_test.py index 924dff836f4..c1e6eddc81e 100644 --- a/src/python/grpcio_tests/tests_aio/unit/server_test.py +++ b/src/python/grpcio_tests/tests_aio/unit/server_test.py @@ -19,20 +19,28 @@ import grpc from grpc.experimental import aio from tests_aio.unit._test_base import AioTestBase -_TEST_METHOD_PATH = '' +_SIMPLE_UNARY_UNARY = '/test/SimpleUnaryUnary' +_BLOCK_FOREVER = '/test/BlockForever' _REQUEST = b'\x00\x00\x00' _RESPONSE = b'\x01\x01\x01' -async def unary_unary(unused_request, unused_context): +async def _unary_unary(unused_request, unused_context): return _RESPONSE -class GenericHandler(grpc.GenericRpcHandler): +async def _block_forever(unused_request, unused_context): + await asyncio.get_event_loop().create_future() - def service(self, unused_handler_details): - return grpc.unary_unary_rpc_method_handler(unary_unary) + +class _GenericHandler(grpc.GenericRpcHandler): + + def service(self, handler_details): + if handler_details.method == _SIMPLE_UNARY_UNARY: + return grpc.unary_unary_rpc_method_handler(_unary_unary) + if handler_details.method == _BLOCK_FOREVER: + return grpc.unary_unary_rpc_method_handler(_block_forever) class TestServer(AioTestBase): @@ -42,11 +50,11 @@ class TestServer(AioTestBase): async def test_unary_unary_body(): server = aio.server() port = server.add_insecure_port('[::]:0') - server.add_generic_rpc_handlers((GenericHandler(),)) + server.add_generic_rpc_handlers((_GenericHandler(),)) await server.start() async with aio.insecure_channel('localhost:%d' % port) as channel: - unary_call = channel.unary_unary(_TEST_METHOD_PATH) + unary_call = channel.unary_unary(_SIMPLE_UNARY_UNARY) response = await unary_call(_REQUEST) self.assertEqual(response, _RESPONSE) @@ -57,10 +65,52 @@ class TestServer(AioTestBase): async def test_shutdown_body(): server = aio.server() port = server.add_insecure_port('[::]:0') - server.add_generic_rpc_handlers((GenericHandler(),)) await server.start() await server.stop(None) - asyncio.get_event_loop().run_until_complete(test_shutdown_body()) + self.loop.run_until_complete(test_shutdown_body()) + + def test_shutdown_after_call(self): + + async def test_shutdown_body(): + server = aio.server() + port = server.add_insecure_port('[::]:0') + server.add_generic_rpc_handlers((_GenericHandler(),)) + await server.start() + + async with aio.insecure_channel('localhost:%d' % port) as channel: + await channel.unary_unary(_SIMPLE_UNARY_UNARY)(_REQUEST) + + await server.stop(None) + self.loop.run_until_complete(test_shutdown_body()) + + def test_shutdown_during_call(self): + + async def test_shutdown_body(): + server = aio.server() + port = server.add_insecure_port('[::]:0') + server.add_generic_rpc_handlers((_GenericHandler(),)) + await server.start() + + async with aio.insecure_channel('localhost:%d' % port) as channel: + self.loop.create_task(channel.unary_unary(_BLOCK_FOREVER)(_REQUEST)) + await asyncio.sleep(0) + + await server.stop(None) + self.loop.run_until_complete(test_shutdown_body()) + + def test_shutdown_before_call(self): + + async def test_shutdown_body(): + server = aio.server() + port = server.add_insecure_port('[::]:0') + server.add_generic_rpc_handlers((_GenericHandler(),)) + await server.start() + await server.stop(None) + + async with aio.insecure_channel('localhost:%d' % port) as channel: + await channel.unary_unary(_SIMPLE_UNARY_UNARY)(_REQUEST) + + self.loop.run_until_complete(test_shutdown_body()) if __name__ == '__main__': From 0a423d05ca03fd8f787e2c441f80e1408ba6a9c6 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Fri, 25 Oct 2019 17:31:58 -0700 Subject: [PATCH 085/133] Add 4 server tests and 1 channel tests * Improve the shutdown process * Refactor the AioRpcError --- .../_cython/_cygrpc/aio/iomgr/socket.pyx.pxi | 2 + .../grpc/_cython/_cygrpc/aio/server.pyx.pxi | 4 +- .../grpcio/grpc/experimental/aio/__init__.py | 5 + .../tests_aio/unit/channel_test.py | 27 ++++- .../grpcio_tests/tests_aio/unit/init_test.py | 39 +++++++ .../tests_aio/unit/server_test.py | 106 +++++++++++------- 6 files changed, 139 insertions(+), 44 deletions(-) diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/iomgr/socket.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/iomgr/socket.pyx.pxi index 2d56a568348..7c5c3fa2e9a 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/iomgr/socket.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/iomgr/socket.pyx.pxi @@ -152,6 +152,8 @@ cdef class _AsyncioSocket: cdef void close(self): if self.is_connected(): self._writer.close() + if self._server: + self._server.close() def _new_connection_callback(self, object reader, object writer): client_socket = _AsyncioSocket.create( diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi index 7f17a695017..413abc24b56 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi @@ -305,8 +305,8 @@ cdef class AioServer: async def _server_main_loop(self, object server_started): self._server.start(backup_queue=False) - server_started.set_result(True) cdef RPCState rpc_state + server_started.set_result(True) while True: # When shutdown process starts, no more new connections. @@ -377,7 +377,7 @@ cdef class AioServer: await shutdown_completed else: try: - await asyncio.wait_for(shutdown_completed, grace) + await asyncio.wait_for(asyncio.shield(shutdown_completed), grace) except asyncio.TimeoutError: # Cancels all ongoing calls by the end of grace period. grpc_server_cancel_all_calls(self._server.c_server) diff --git a/src/python/grpcio/grpc/experimental/aio/__init__.py b/src/python/grpcio/grpc/experimental/aio/__init__.py index 696db001133..3a736197d65 100644 --- a/src/python/grpcio/grpc/experimental/aio/__init__.py +++ b/src/python/grpcio/grpc/experimental/aio/__init__.py @@ -17,6 +17,11 @@ import abc import six import grpc +<<<<<<< HEAD +======= +from grpc import _common +from grpc._cython import cygrpc +>>>>>>> Add 4 server tests and 1 channel tests from grpc._cython.cygrpc import init_grpc_aio from ._call import AioRpcError diff --git a/src/python/grpcio_tests/tests_aio/unit/channel_test.py b/src/python/grpcio_tests/tests_aio/unit/channel_test.py index 96817c61a6f..a9069d4a5f0 100644 --- a/src/python/grpcio_tests/tests_aio/unit/channel_test.py +++ b/src/python/grpcio_tests/tests_aio/unit/channel_test.py @@ -22,6 +22,9 @@ from tests.unit.framework.common import test_constants from tests_aio.unit._test_server import start_test_server from tests_aio.unit._test_base import AioTestBase +_UNARY_CALL_METHOD = '/grpc.testing.TestService/UnaryCall' +_EMPTY_CALL_METHOD = '/grpc.testing.TestService/EmptyCall' + class TestChannel(AioTestBase): @@ -32,7 +35,7 @@ class TestChannel(AioTestBase): async with aio.insecure_channel(server_target) as channel: hi = channel.unary_unary( - '/grpc.testing.TestService/UnaryCall', + _UNARY_CALL_METHOD, request_serializer=messages_pb2.SimpleRequest. SerializeToString, response_deserializer=messages_pb2.SimpleResponse.FromString @@ -48,7 +51,7 @@ class TestChannel(AioTestBase): channel = aio.insecure_channel(server_target) hi = channel.unary_unary( - '/grpc.testing.TestService/UnaryCall', + _UNARY_CALL_METHOD, request_serializer=messages_pb2.SimpleRequest.SerializeToString, response_deserializer=messages_pb2.SimpleResponse.FromString) response = await hi(messages_pb2.SimpleRequest()) @@ -66,7 +69,7 @@ class TestChannel(AioTestBase): async with aio.insecure_channel(server_target) as channel: empty_call_with_sleep = channel.unary_unary( - "/grpc.testing.TestService/EmptyCall", + _EMPTY_CALL_METHOD, request_serializer=messages_pb2.SimpleRequest. SerializeToString, response_deserializer=messages_pb2.SimpleResponse. @@ -95,6 +98,24 @@ class TestChannel(AioTestBase): self.loop.run_until_complete(coro()) + @unittest.skip('https://github.com/grpc/grpc/issues/20818') + def test_call_to_the_void(self): + + async def coro(): + channel = aio.insecure_channel('0.1.1.1:1111') + hi = channel.unary_unary( + _UNARY_CALL_METHOD, + request_serializer=messages_pb2.SimpleRequest.SerializeToString, + response_deserializer=messages_pb2.SimpleResponse.FromString) + response = await hi(messages_pb2.SimpleRequest()) + + self.assertEqual(type(response), messages_pb2.SimpleResponse) + + await channel.close() + + self.loop.run_until_complete(coro()) + + if __name__ == '__main__': logging.basicConfig() unittest.main(verbosity=2) diff --git a/src/python/grpcio_tests/tests_aio/unit/init_test.py b/src/python/grpcio_tests/tests_aio/unit/init_test.py index 9f5d8bb0d85..300e2d92766 100644 --- a/src/python/grpcio_tests/tests_aio/unit/init_test.py +++ b/src/python/grpcio_tests/tests_aio/unit/init_test.py @@ -19,6 +19,45 @@ from tests_aio.unit._test_server import start_test_server from tests_aio.unit._test_base import AioTestBase +class TestAioRpcError(unittest.TestCase): + _TEST_INITIAL_METADATA = ("initial metadata",) + _TEST_TRAILING_METADATA = ("trailing metadata",) + + def test_attributes(self): + aio_rpc_error = aio.AioRpcError(self._TEST_INITIAL_METADATA, 0, + "details", self._TEST_TRAILING_METADATA) + self.assertEqual(aio_rpc_error.initial_metadata(), + self._TEST_INITIAL_METADATA) + self.assertEqual(aio_rpc_error.code(), grpc.StatusCode.OK) + self.assertEqual(aio_rpc_error.details(), "details") + self.assertEqual(aio_rpc_error.trailing_metadata(), + self._TEST_TRAILING_METADATA) + + def test_class_hierarchy(self): + aio_rpc_error = aio.AioRpcError(self._TEST_INITIAL_METADATA, 0, + "details", self._TEST_TRAILING_METADATA) + + self.assertIsInstance(aio_rpc_error, grpc.RpcError) + + def test_class_attributes(self): + aio_rpc_error = aio.AioRpcError(self._TEST_INITIAL_METADATA, 0, + "details", self._TEST_TRAILING_METADATA) + self.assertEqual(aio_rpc_error.__class__.__name__, "AioRpcError") + self.assertEqual(aio_rpc_error.__class__.__doc__, + aio.AioRpcError.__doc__) + + def test_class_singleton(self): + first_aio_rpc_error = aio.AioRpcError(self._TEST_INITIAL_METADATA, 0, + "details", + self._TEST_TRAILING_METADATA) + second_aio_rpc_error = aio.AioRpcError(self._TEST_INITIAL_METADATA, 0, + "details", + self._TEST_TRAILING_METADATA) + + self.assertIs(first_aio_rpc_error.__class__, + second_aio_rpc_error.__class__) + + class TestInsecureChannel(AioTestBase): def test_insecure_channel(self): diff --git a/src/python/grpcio_tests/tests_aio/unit/server_test.py b/src/python/grpcio_tests/tests_aio/unit/server_test.py index c1e6eddc81e..f6eabc20529 100644 --- a/src/python/grpcio_tests/tests_aio/unit/server_test.py +++ b/src/python/grpcio_tests/tests_aio/unit/server_test.py @@ -18,42 +18,62 @@ import unittest import grpc from grpc.experimental import aio from tests_aio.unit._test_base import AioTestBase +from tests.unit.framework.common import test_constants + _SIMPLE_UNARY_UNARY = '/test/SimpleUnaryUnary' _BLOCK_FOREVER = '/test/BlockForever' +_BLOCK_SHORTLY = '/test/BlockShortly' _REQUEST = b'\x00\x00\x00' _RESPONSE = b'\x01\x01\x01' -async def _unary_unary(unused_request, unused_context): - return _RESPONSE +class _GenericHandler(grpc.GenericRpcHandler): + def __init__(self): + self._called = asyncio.get_event_loop().create_future() + @staticmethod + async def _unary_unary(unused_request, unused_context): + return _RESPONSE -async def _block_forever(unused_request, unused_context): - await asyncio.get_event_loop().create_future() + async def _block_forever(self, unused_request, unused_context): + await asyncio.get_event_loop().create_future() -class _GenericHandler(grpc.GenericRpcHandler): + async def _block_shortly(self, unused_request, unused_context): + await asyncio.sleep(test_constants.SHORT_TIMEOUT/2) + return _RESPONSE def service(self, handler_details): + self._called.set_result(None) if handler_details.method == _SIMPLE_UNARY_UNARY: - return grpc.unary_unary_rpc_method_handler(_unary_unary) + return grpc.unary_unary_rpc_method_handler(self._unary_unary) if handler_details.method == _BLOCK_FOREVER: - return grpc.unary_unary_rpc_method_handler(_block_forever) + return grpc.unary_unary_rpc_method_handler(self._block_forever) + if handler_details.method == _BLOCK_SHORTLY: + return grpc.unary_unary_rpc_method_handler(self._block_shortly) + + async def wait_for_call(self): + await self._called + + +async def _start_test_server(): + server = aio.server() + port = server.add_insecure_port('[::]:0') + generic_handler = _GenericHandler() + server.add_generic_rpc_handlers((generic_handler,)) + await server.start() + return 'localhost:%d' % port, server, generic_handler class TestServer(AioTestBase): def test_unary_unary(self): - async def test_unary_unary_body(): - server = aio.server() - port = server.add_insecure_port('[::]:0') - server.add_generic_rpc_handlers((_GenericHandler(),)) - await server.start() + server_target, _, _ = await _start_test_server() - async with aio.insecure_channel('localhost:%d' % port) as channel: + async with aio.insecure_channel(server_target) as channel: unary_call = channel.unary_unary(_SIMPLE_UNARY_UNARY) response = await unary_call(_REQUEST) self.assertEqual(response, _RESPONSE) @@ -61,55 +81,63 @@ class TestServer(AioTestBase): self.loop.run_until_complete(test_unary_unary_body()) def test_shutdown(self): - async def test_shutdown_body(): - server = aio.server() - port = server.add_insecure_port('[::]:0') - await server.start() + _, server, _ = await _start_test_server() await server.stop(None) self.loop.run_until_complete(test_shutdown_body()) def test_shutdown_after_call(self): - async def test_shutdown_body(): - server = aio.server() - port = server.add_insecure_port('[::]:0') - server.add_generic_rpc_handlers((_GenericHandler(),)) - await server.start() + server_target, server, _ = await _start_test_server() - async with aio.insecure_channel('localhost:%d' % port) as channel: + async with aio.insecure_channel(server_target) as channel: await channel.unary_unary(_SIMPLE_UNARY_UNARY)(_REQUEST) await server.stop(None) self.loop.run_until_complete(test_shutdown_body()) - def test_shutdown_during_call(self): + def test_graceful_shutdown_success(self): + async def test_graceful_shutdown_success_body(): + server_target, server, generic_handler = await _start_test_server() - async def test_shutdown_body(): - server = aio.server() - port = server.add_insecure_port('[::]:0') - server.add_generic_rpc_handlers((_GenericHandler(),)) - await server.start() + channel = aio.insecure_channel(server_target) + call_task = self.loop.create_task(channel.unary_unary(_BLOCK_SHORTLY)(_REQUEST)) + await generic_handler.wait_for_call() - async with aio.insecure_channel('localhost:%d' % port) as channel: - self.loop.create_task(channel.unary_unary(_BLOCK_FOREVER)(_REQUEST)) - await asyncio.sleep(0) + await server.stop(test_constants.SHORT_TIMEOUT) + await channel.close() + self.assertEqual(await call_task, _RESPONSE) + self.assertTrue(call_task.done()) + self.loop.run_until_complete(test_graceful_shutdown_success_body()) - await server.stop(None) - self.loop.run_until_complete(test_shutdown_body()) + def test_graceful_shutdown_failed(self): + async def test_graceful_shutdown_failed_body(): + server_target, server, generic_handler = await _start_test_server() + channel = aio.insecure_channel(server_target) + call_task = self.loop.create_task(channel.unary_unary(_BLOCK_FOREVER)(_REQUEST)) + await generic_handler.wait_for_call() + + await server.stop(test_constants.SHORT_TIMEOUT) + + with self.assertRaises(aio.AioRpcError) as exception_context: + await call_task + self.assertEqual(exception_context.exception.code(), grpc.StatusCode.UNAVAILABLE) + self.assertIn('GOAWAY', exception_context.exception.details()) + await channel.close() + self.loop.run_until_complete(test_graceful_shutdown_failed_body()) + + @unittest.skip('https://github.com/grpc/grpc/issues/20818') def test_shutdown_before_call(self): async def test_shutdown_body(): - server = aio.server() - port = server.add_insecure_port('[::]:0') - server.add_generic_rpc_handlers((_GenericHandler(),)) - await server.start() + server_target, server, _ =_start_test_server() await server.stop(None) + # Ensures the server is cleaned up at this point. + # Some proper exception should be raised. async with aio.insecure_channel('localhost:%d' % port) as channel: await channel.unary_unary(_SIMPLE_UNARY_UNARY)(_REQUEST) - self.loop.run_until_complete(test_shutdown_body()) From 983e36d5a3299fe6e7b2dd5e4b714441d072f7b0 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Sun, 27 Oct 2019 19:23:05 -0700 Subject: [PATCH 086/133] Make YAPF and PyLint happy --- .../grpcio/grpc/experimental/aio/_server.py | 15 ++++------ .../tests_aio/unit/channel_test.py | 1 - .../tests_aio/unit/server_test.py | 28 +++++++++++++------ 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/src/python/grpcio/grpc/experimental/aio/_server.py b/src/python/grpcio/grpc/experimental/aio/_server.py index ca39cef905f..d49fe6644c3 100644 --- a/src/python/grpcio/grpc/experimental/aio/_server.py +++ b/src/python/grpcio/grpc/experimental/aio/_server.py @@ -26,14 +26,9 @@ class Server: def __init__(self, thread_pool, generic_handlers, interceptors, options, maximum_concurrent_rpcs, compression): self._loop = asyncio.get_event_loop() - self._server = cygrpc.AioServer( - self._loop, - thread_pool, - generic_handlers, - interceptors, - options, - maximum_concurrent_rpcs, - compression) + self._server = cygrpc.AioServer(self._loop, thread_pool, + generic_handlers, interceptors, options, + maximum_concurrent_rpcs, compression) self._shutdown_started = False self._shutdown_future = self._loop.create_future() @@ -99,7 +94,7 @@ class Server: If a grace period is specified, all RPCs active at the end of the grace period are aborted. - + If a grace period is not specified (by passing None for `grace`), all existing RPCs are aborted immediately and this method blocks until the last RPC handler terminates. @@ -140,7 +135,7 @@ class Server: Returns: A bool indicates if the operation times out. """ - if timeout == None: + if timeout is None: await self._shutdown_future else: try: diff --git a/src/python/grpcio_tests/tests_aio/unit/channel_test.py b/src/python/grpcio_tests/tests_aio/unit/channel_test.py index a9069d4a5f0..2809f3b4b37 100644 --- a/src/python/grpcio_tests/tests_aio/unit/channel_test.py +++ b/src/python/grpcio_tests/tests_aio/unit/channel_test.py @@ -97,7 +97,6 @@ class TestChannel(AioTestBase): self.loop.run_until_complete(coro()) - @unittest.skip('https://github.com/grpc/grpc/issues/20818') def test_call_to_the_void(self): diff --git a/src/python/grpcio_tests/tests_aio/unit/server_test.py b/src/python/grpcio_tests/tests_aio/unit/server_test.py index f6eabc20529..d8f1c384043 100644 --- a/src/python/grpcio_tests/tests_aio/unit/server_test.py +++ b/src/python/grpcio_tests/tests_aio/unit/server_test.py @@ -20,7 +20,6 @@ from grpc.experimental import aio from tests_aio.unit._test_base import AioTestBase from tests.unit.framework.common import test_constants - _SIMPLE_UNARY_UNARY = '/test/SimpleUnaryUnary' _BLOCK_FOREVER = '/test/BlockForever' _BLOCK_SHORTLY = '/test/BlockShortly' @@ -30,6 +29,7 @@ _RESPONSE = b'\x01\x01\x01' class _GenericHandler(grpc.GenericRpcHandler): + def __init__(self): self._called = asyncio.get_event_loop().create_future() @@ -40,9 +40,8 @@ class _GenericHandler(grpc.GenericRpcHandler): async def _block_forever(self, unused_request, unused_context): await asyncio.get_event_loop().create_future() - async def _block_shortly(self, unused_request, unused_context): - await asyncio.sleep(test_constants.SHORT_TIMEOUT/2) + await asyncio.sleep(test_constants.SHORT_TIMEOUT / 2) return _RESPONSE def service(self, handler_details): @@ -70,6 +69,7 @@ async def _start_test_server(): class TestServer(AioTestBase): def test_unary_unary(self): + async def test_unary_unary_body(): server_target, _, _ = await _start_test_server() @@ -79,14 +79,17 @@ class TestServer(AioTestBase): self.assertEqual(response, _RESPONSE) self.loop.run_until_complete(test_unary_unary_body()) - + def test_shutdown(self): + async def test_shutdown_body(): _, server, _ = await _start_test_server() await server.stop(None) + self.loop.run_until_complete(test_shutdown_body()) def test_shutdown_after_call(self): + async def test_shutdown_body(): server_target, server, _ = await _start_test_server() @@ -94,50 +97,59 @@ class TestServer(AioTestBase): await channel.unary_unary(_SIMPLE_UNARY_UNARY)(_REQUEST) await server.stop(None) + self.loop.run_until_complete(test_shutdown_body()) def test_graceful_shutdown_success(self): + async def test_graceful_shutdown_success_body(): server_target, server, generic_handler = await _start_test_server() channel = aio.insecure_channel(server_target) - call_task = self.loop.create_task(channel.unary_unary(_BLOCK_SHORTLY)(_REQUEST)) + call_task = self.loop.create_task( + channel.unary_unary(_BLOCK_SHORTLY)(_REQUEST)) await generic_handler.wait_for_call() await server.stop(test_constants.SHORT_TIMEOUT) await channel.close() self.assertEqual(await call_task, _RESPONSE) self.assertTrue(call_task.done()) + self.loop.run_until_complete(test_graceful_shutdown_success_body()) def test_graceful_shutdown_failed(self): + async def test_graceful_shutdown_failed_body(): server_target, server, generic_handler = await _start_test_server() channel = aio.insecure_channel(server_target) - call_task = self.loop.create_task(channel.unary_unary(_BLOCK_FOREVER)(_REQUEST)) + call_task = self.loop.create_task( + channel.unary_unary(_BLOCK_FOREVER)(_REQUEST)) await generic_handler.wait_for_call() await server.stop(test_constants.SHORT_TIMEOUT) with self.assertRaises(aio.AioRpcError) as exception_context: await call_task - self.assertEqual(exception_context.exception.code(), grpc.StatusCode.UNAVAILABLE) + self.assertEqual(exception_context.exception.code(), + grpc.StatusCode.UNAVAILABLE) self.assertIn('GOAWAY', exception_context.exception.details()) await channel.close() + self.loop.run_until_complete(test_graceful_shutdown_failed_body()) @unittest.skip('https://github.com/grpc/grpc/issues/20818') def test_shutdown_before_call(self): async def test_shutdown_body(): - server_target, server, _ =_start_test_server() + server_target, server, _ = _start_test_server() await server.stop(None) # Ensures the server is cleaned up at this point. # Some proper exception should be raised. async with aio.insecure_channel('localhost:%d' % port) as channel: await channel.unary_unary(_SIMPLE_UNARY_UNARY)(_REQUEST) + self.loop.run_until_complete(test_shutdown_body()) From 8168b9e1c95c6c8260442a68561a5e45f645959b Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Tue, 29 Oct 2019 15:11:03 -0700 Subject: [PATCH 087/133] Adopt reviewer's advice * Make graceful shutdown support calls from multi-coroutine * Added comments * Make graceful shutdown success test case more strict * Add 2 more concurrent graceful shutdown tests --- .../_cygrpc/aio/callbackcontext.pxd.pxi | 13 ++- .../grpc/_cython/_cygrpc/aio/server.pxd.pxi | 3 + .../grpc/_cython/_cygrpc/aio/server.pyx.pxi | 89 +++++++++++-------- .../grpc/_cython/_cygrpc/server.pyx.pxi | 4 +- .../grpcio/grpc/experimental/aio/_server.py | 38 +++----- .../tests_aio/unit/channel_test.py | 2 +- .../tests_aio/unit/server_test.py | 79 ++++++++++++++-- 7 files changed, 153 insertions(+), 75 deletions(-) diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callbackcontext.pxd.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callbackcontext.pxd.pxi index 38b7e9b3aed..beada919f4d 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callbackcontext.pxd.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callbackcontext.pxd.pxi @@ -15,6 +15,15 @@ cimport cpython cdef struct CallbackContext: + # C struct to store callback context in the form of pointers. + # + # Attributes: + # functor: A grpc_experimental_completion_queue_functor represents the + # callback function in the only way C-Core understands. + # waiter: An asyncio.Future object that fulfills when the callback is + # invoked by C-Core. + # failure_handler: A CallbackFailureHandler object that called when C-Core + # returns 'success == 0' state. grpc_experimental_completion_queue_functor functor - cpython.PyObject *waiter # asyncio.Future - cpython.PyObject *failure_handler # cygrpc.CallbackFailureHandler + cpython.PyObject *waiter + cpython.PyObject *failure_handler diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pxd.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pxd.pxi index 0a3c2e4d9af..fdd9541f0eb 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pxd.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pxd.pxi @@ -61,3 +61,6 @@ cdef class AioServer: cdef AioServerStatus _status cdef object _loop # asyncio.EventLoop cdef object _serving_task # asyncio.Task + cdef object _shutdown_lock # asyncio.Lock + cdef object _shutdown_completed # asyncio.Future + cdef CallbackWrapper _shutdown_callback_wrapper diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi index 413abc24b56..6f3098d619f 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +# TODO(https://github.com/grpc/grpc/issues/20850) refactor this. _LOGGER = logging.getLogger(__name__) @@ -282,6 +283,12 @@ cdef class AioServer: self.add_generic_rpc_handlers(generic_handlers) self._serving_task = None + self._shutdown_lock = asyncio.Lock() + self._shutdown_completed = self._loop.create_future() + self._shutdown_callback_wrapper = CallbackWrapper( + self._shutdown_completed, + SERVER_SHUTDOWN_FAILURE_HANDLER) + if interceptors: raise NotImplementedError() if maximum_concurrent_rpcs: @@ -309,7 +316,7 @@ cdef class AioServer: server_started.set_result(True) while True: - # When shutdown process starts, no more new connections. + # When shutdown begins, no more new connections. if self._status != AIO_SERVER_STATUS_RUNNING: break @@ -336,34 +343,14 @@ cdef class AioServer: # Otherwise, the actual start time of the server is un-controllable. await server_started - async def shutdown(self, grace): - """Gracefully shutdown the C-Core server. - - Application should only call shutdown once. - - Args: - grace: An optional float indicates the length of grace period in - seconds. - """ - if self._status != AIO_SERVER_STATUS_RUNNING: - # The server either is shutting down, or not started. - return - cdef object shutdown_completed = self._loop.create_future() - cdef CallbackWrapper wrapper = CallbackWrapper( - shutdown_completed, - SERVER_SHUTDOWN_FAILURE_HANDLER) - # NOTE(lidiz) Without Py_INCREF, the wrapper object will be destructed - # when calling "await". This is an over-optimization by Cython. - cpython.Py_INCREF(wrapper) - + async def _start_shutting_down(self): + """Prepares the server to shutting down (NOT coroutine-safe).""" # Starts the shutdown process. - # The shutdown callback won't be called unless there is no live RPC. + # The shutdown callback won't be called until there is no live RPC. grpc_server_shutdown_and_notify( self._server.c_server, self._cq._cq, - wrapper.c_functor()) - self._server.is_shutting_down = True - self._status = AIO_SERVER_STATUS_STOPPING + self._shutdown_callback_wrapper.c_functor()) # Ensures the serving task (coroutine) exits. try: @@ -371,28 +358,56 @@ cdef class AioServer: except _RequestCallError: pass + async def shutdown(self, grace): + """Gracefully shutdown the C-Core server. + + Application should only call shutdown once. + + Args: + grace: An optional float indicating the length of grace period in + seconds. + """ + if self._status == AIO_SERVER_STATUS_READY or self._status == AIO_SERVER_STATUS_STOPPED: + return + + async with self._shutdown_lock: + if self._status == AIO_SERVER_STATUS_RUNNING: + await self._start_shutting_down() + self._server.is_shutting_down = True + self._status = AIO_SERVER_STATUS_STOPPING + if grace is None: # Directly cancels all calls grpc_server_cancel_all_calls(self._server.c_server) - await shutdown_completed + await self._shutdown_completed else: try: - await asyncio.wait_for(asyncio.shield(shutdown_completed), grace) + await asyncio.wait_for(asyncio.shield(self._shutdown_completed), grace) except asyncio.TimeoutError: # Cancels all ongoing calls by the end of grace period. grpc_server_cancel_all_calls(self._server.c_server) - await shutdown_completed + await self._shutdown_completed - # Keeps wrapper object alive until now. - cpython.Py_DECREF(wrapper) - grpc_server_destroy(self._server.c_server) - self._server.c_server = NULL - self._server.is_shutdown = True - self._status = AIO_SERVER_STATUS_STOPPED + async with self._shutdown_lock: + if self._status == AIO_SERVER_STATUS_STOPPING: + grpc_server_destroy(self._server.c_server) + self._server.c_server = NULL + self._server.is_shutdown = True + self._status = AIO_SERVER_STATUS_STOPPED - # Shuts down the completion queue - await self._cq.shutdown() + # Shuts down the completion queue + await self._cq.shutdown() + + async def wait_for_termination(self, float timeout): + if timeout is None: + await self._shutdown_completed + else: + try: + await asyncio.wait_for(self._shutdown_completed, timeout) + except asyncio.TimeoutError: + return False + return True def __dealloc__(self): if self._status != AIO_SERVER_STATUS_STOPPED: - _LOGGER.error('Server is not stopped while deallocation: %d', self._status) + _LOGGER.error('__dealloc__ called on running server: %d', self._status) diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/server.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/server.pyx.pxi index 7ca332050b5..4ce554d078f 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/server.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/server.pyx.pxi @@ -66,8 +66,8 @@ cdef class Server: Args: backup_queue: a bool indicates whether to spawn a backup completion - queue. In case of no CQ is bound to the server, and the shutdown - process of server becomes un-observable. + queue. In the case that no CQ is bound to the server, and the shutdown + of server becomes un-observable. """ if self.is_started: raise ValueError("the server has already started") diff --git a/src/python/grpcio/grpc/experimental/aio/_server.py b/src/python/grpcio/grpc/experimental/aio/_server.py index d49fe6644c3..86d38e6525d 100644 --- a/src/python/grpcio/grpc/experimental/aio/_server.py +++ b/src/python/grpcio/grpc/experimental/aio/_server.py @@ -29,8 +29,6 @@ class Server: self._server = cygrpc.AioServer(self._loop, thread_pool, generic_handlers, interceptors, options, maximum_concurrent_rpcs, compression) - self._shutdown_started = False - self._shutdown_future = self._loop.create_future() def add_generic_rpc_handlers( self, @@ -92,26 +90,23 @@ class Server: This method immediately stops the server from servicing new RPCs in all cases. - If a grace period is specified, all RPCs active at the end of the grace - period are aborted. + If a grace period is specified, this method returns immediately and all + RPCs active at the end of the grace period are aborted. If a grace + period is not specified (by passing None for grace), all existing RPCs + are aborted immediately and this method blocks until the last RPC + handler terminates. - If a grace period is not specified (by passing None for `grace`), all - existing RPCs are aborted immediately and this method blocks until the - last RPC handler terminates. - - Only the first call to "stop" sets the length of grace period. - Additional calls is allowed and will block until the termination of - the server. + This method is idempotent and may be called at any time. Passing a + smaller grace value in a subsequent call will have the effect of + stopping the Server sooner (passing None will have the effect of + stopping the server immediately). Passing a larger grace value in a + subsequent call will not have the effect of stopping the server later + (i.e. the most restrictive grace value is used). Args: grace: A duration of time in seconds or None. """ - if self._shutdown_started: - await self._shutdown_future - else: - self._shutdown_started = True - await self._server.shutdown(grace) - self._shutdown_future.set_result(None) + await self._server.shutdown(grace) async def wait_for_termination(self, timeout: Optional[float] = None) -> bool: @@ -135,14 +130,7 @@ class Server: Returns: A bool indicates if the operation times out. """ - if timeout is None: - await self._shutdown_future - else: - try: - await asyncio.wait_for(self._shutdown_future, timeout) - except asyncio.TimeoutError: - return False - return True + return await self._server.wait_for_termination(timeout) def server(migration_thread_pool=None, diff --git a/src/python/grpcio_tests/tests_aio/unit/channel_test.py b/src/python/grpcio_tests/tests_aio/unit/channel_test.py index 2809f3b4b37..076300786fb 100644 --- a/src/python/grpcio_tests/tests_aio/unit/channel_test.py +++ b/src/python/grpcio_tests/tests_aio/unit/channel_test.py @@ -108,7 +108,7 @@ class TestChannel(AioTestBase): response_deserializer=messages_pb2.SimpleResponse.FromString) response = await hi(messages_pb2.SimpleRequest()) - self.assertEqual(type(response), messages_pb2.SimpleResponse) + self.assertIs(type(response), messages_pb2.SimpleResponse) await channel.close() diff --git a/src/python/grpcio_tests/tests_aio/unit/server_test.py b/src/python/grpcio_tests/tests_aio/unit/server_test.py index d8f1c384043..6c96d478c64 100644 --- a/src/python/grpcio_tests/tests_aio/unit/server_test.py +++ b/src/python/grpcio_tests/tests_aio/unit/server_test.py @@ -14,6 +14,7 @@ import logging import unittest +import time import grpc from grpc.experimental import aio @@ -22,7 +23,7 @@ from tests.unit.framework.common import test_constants _SIMPLE_UNARY_UNARY = '/test/SimpleUnaryUnary' _BLOCK_FOREVER = '/test/BlockForever' -_BLOCK_SHORTLY = '/test/BlockShortly' +_BLOCK_BRIEFLY = '/test/BlockBriefly' _REQUEST = b'\x00\x00\x00' _RESPONSE = b'\x01\x01\x01' @@ -40,7 +41,7 @@ class _GenericHandler(grpc.GenericRpcHandler): async def _block_forever(self, unused_request, unused_context): await asyncio.get_event_loop().create_future() - async def _block_shortly(self, unused_request, unused_context): + async def _BLOCK_BRIEFLY(self, unused_request, unused_context): await asyncio.sleep(test_constants.SHORT_TIMEOUT / 2) return _RESPONSE @@ -50,8 +51,8 @@ class _GenericHandler(grpc.GenericRpcHandler): return grpc.unary_unary_rpc_method_handler(self._unary_unary) if handler_details.method == _BLOCK_FOREVER: return grpc.unary_unary_rpc_method_handler(self._block_forever) - if handler_details.method == _BLOCK_SHORTLY: - return grpc.unary_unary_rpc_method_handler(self._block_shortly) + if handler_details.method == _BLOCK_BRIEFLY: + return grpc.unary_unary_rpc_method_handler(self._BLOCK_BRIEFLY) async def wait_for_call(self): await self._called @@ -87,6 +88,7 @@ class TestServer(AioTestBase): await server.stop(None) self.loop.run_until_complete(test_shutdown_body()) + # Ensures no SIGSEGV triggered, and ends within timeout. def test_shutdown_after_call(self): @@ -107,12 +109,18 @@ class TestServer(AioTestBase): channel = aio.insecure_channel(server_target) call_task = self.loop.create_task( - channel.unary_unary(_BLOCK_SHORTLY)(_REQUEST)) + channel.unary_unary(_BLOCK_BRIEFLY)(_REQUEST)) await generic_handler.wait_for_call() + shutdown_start_time = time.time() await server.stop(test_constants.SHORT_TIMEOUT) + grace_period_length = time.time() - shutdown_start_time + self.assertGreater(grace_period_length, + test_constants.SHORT_TIMEOUT / 3) + + # Validates the states. await channel.close() - self.assertEqual(await call_task, _RESPONSE) + self.assertEqual(_RESPONSE, await call_task) self.assertTrue(call_task.done()) self.loop.run_until_complete(test_graceful_shutdown_success_body()) @@ -131,13 +139,68 @@ class TestServer(AioTestBase): with self.assertRaises(aio.AioRpcError) as exception_context: await call_task - self.assertEqual(exception_context.exception.code(), - grpc.StatusCode.UNAVAILABLE) + self.assertEqual(grpc.StatusCode.UNAVAILABLE, + exception_context.exception.code()) self.assertIn('GOAWAY', exception_context.exception.details()) await channel.close() self.loop.run_until_complete(test_graceful_shutdown_failed_body()) + def test_concurrent_graceful_shutdown(self): + + async def test_concurrent_graceful_shutdown_body(): + server_target, server, generic_handler = await _start_test_server() + + channel = aio.insecure_channel(server_target) + call_task = self.loop.create_task( + channel.unary_unary(_BLOCK_BRIEFLY)(_REQUEST)) + await generic_handler.wait_for_call() + + # Expects the shortest grace period to be effective. + shutdown_start_time = time.time() + await asyncio.gather( + server.stop(test_constants.LONG_TIMEOUT), + server.stop(test_constants.SHORT_TIMEOUT), + server.stop(test_constants.LONG_TIMEOUT), + ) + grace_period_length = time.time() - shutdown_start_time + self.assertGreater(grace_period_length, + test_constants.SHORT_TIMEOUT / 3) + + await channel.close() + self.assertEqual(_RESPONSE, await call_task) + self.assertTrue(call_task.done()) + + self.loop.run_until_complete(test_concurrent_graceful_shutdown_body()) + + def test_concurrent_graceful_shutdown_immediate(self): + + async def test_concurrent_graceful_shutdown_immediate_body(): + server_target, server, generic_handler = await _start_test_server() + + channel = aio.insecure_channel(server_target) + call_task = self.loop.create_task( + channel.unary_unary(_BLOCK_FOREVER)(_REQUEST)) + await generic_handler.wait_for_call() + + # Expects no grace period, due to the "server.stop(None)". + await asyncio.gather( + server.stop(test_constants.LONG_TIMEOUT), + server.stop(None), + server.stop(test_constants.SHORT_TIMEOUT), + server.stop(test_constants.LONG_TIMEOUT), + ) + + with self.assertRaises(aio.AioRpcError) as exception_context: + await call_task + self.assertEqual(grpc.StatusCode.UNAVAILABLE, + exception_context.exception.code()) + self.assertIn('GOAWAY', exception_context.exception.details()) + await channel.close() + + self.loop.run_until_complete( + test_concurrent_graceful_shutdown_immediate_body()) + @unittest.skip('https://github.com/grpc/grpc/issues/20818') def test_shutdown_before_call(self): From 8af510e1dfc0b2c7ba06c535208d9e892936e143 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Tue, 29 Oct 2019 18:01:22 -0700 Subject: [PATCH 088/133] Adopt reviewer's advice: 1. Refactor (simplify) the failure handler; 2. Fix a memory leak for badly written application code. --- .../_cython/_cygrpc/aio/iomgr/socket.pyx.pxi | 5 ++ .../grpc/_cython/_cygrpc/aio/server.pyx.pxi | 71 ++++++++++--------- .../grpcio/grpc/experimental/aio/_server.py | 8 +++ .../tests_aio/unit/server_test.py | 4 +- 4 files changed, 52 insertions(+), 36 deletions(-) diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/iomgr/socket.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/iomgr/socket.pyx.pxi index 7c5c3fa2e9a..eed496df7c6 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/iomgr/socket.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/iomgr/socket.pyx.pxi @@ -154,6 +154,11 @@ cdef class _AsyncioSocket: self._writer.close() if self._server: self._server.close() + # NOTE(lidiz) If the asyncio.Server is created from a Python socket, + # the server.close() won't release the fd until the close() is called + # for the Python socket. + if self._py_socket: + self._py_socket.close() def _new_connection_callback(self, object reader, object writer): client_socket = _AsyncioSocket.create( diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi index 6f3098d619f..8b0a4e0a4b3 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi @@ -25,44 +25,31 @@ cdef class _HandlerCallDetails: class _ServicerContextPlaceHolder(object): pass -cdef class CallbackFailureHandler: - cdef str _c_core_api +cdef class _CallbackFailureHandler: + cdef str _core_function_name cdef object _error_details cdef object _exception_type - cdef object _callback # Callable[[Future], None] def __cinit__(self, - str c_core_api="", - object error_details="UNKNOWN", - object exception_type=RuntimeError, - object callback=None): - """Handles failure by raising exception or execute a callbcak. - - The callback accepts a future, returns nothing. The callback is - expected to finish the future either "set_result" or "set_exception". - """ - if callback is None: - self._c_core_api = c_core_api - self._error_details = error_details - self._exception_type = exception_type - self._callback = self._raise_exception - else: - self._callback = callback + str core_function_name, + object error_details, + object exception_type): + """Handles failure by raising exception.""" + self._core_function_name = core_function_name + self._error_details = error_details + self._exception_type = exception_type - def _raise_exception(self, object future): + cdef handle(self, object future): future.set_exception(self._exception_type( - 'Failed "%s": %s' % (self._c_core_api, self._error_details) + 'Failed "%s": %s' % (self._core_function_name, self._error_details) )) - cdef handle(self, object future): - self._callback(future) - # TODO(https://github.com/grpc/grpc/issues/20669) # Apply this to the client-side cdef class CallbackWrapper: - def __cinit__(self, object future, CallbackFailureHandler failure_handler): + def __cinit__(self, object future, _CallbackFailureHandler failure_handler): self.context.functor.functor_run = self.functor_run self.context.waiter = future self.context.failure_handler = failure_handler @@ -77,7 +64,7 @@ cdef class CallbackWrapper: int success): cdef CallbackContext *context = functor if succeed == 0: - (context.failure_handler).handle( + (<_CallbackFailureHandler>context.failure_handler).handle( context.waiter) else: (context.waiter).set_result(None) @@ -127,7 +114,7 @@ async def callback_start_batch(RPCState rpc_state, cdef object future = loop.create_future() cdef CallbackWrapper wrapper = CallbackWrapper( future, - CallbackFailureHandler('callback_start_batch', operations)) + _CallbackFailureHandler('callback_start_batch', operations, RuntimeError)) # NOTE(lidiz) Without Py_INCREF, the wrapper object will be destructed # when calling "await". This is an over-optimization by Cython. cpython.Py_INCREF(wrapper) @@ -206,7 +193,7 @@ async def _handle_rpc(list generic_handlers, RPCState rpc_state, object loop): class _RequestCallError(Exception): pass -cdef CallbackFailureHandler REQUEST_CALL_FAILURE_HANDLER = CallbackFailureHandler( +cdef _CallbackFailureHandler REQUEST_CALL_FAILURE_HANDLER = _CallbackFailureHandler( 'grpc_server_request_call', 'server shutdown', _RequestCallError) @@ -236,7 +223,10 @@ async def _server_call_request_call(Server server, return rpc_state -cdef CallbackFailureHandler CQ_SHUTDOWN_FAILURE_HANDLER = CallbackFailureHandler('grpc_completion_queue_shutdown') +cdef _CallbackFailureHandler CQ_SHUTDOWN_FAILURE_HANDLER = _CallbackFailureHandler( + 'grpc_completion_queue_shutdown', + 'Unknown', + RuntimeError) cdef class _CallbackCompletionQueue: @@ -261,14 +251,18 @@ cdef class _CallbackCompletionQueue: grpc_completion_queue_destroy(self._cq) -cdef CallbackFailureHandler SERVER_SHUTDOWN_FAILURE_HANDLER = CallbackFailureHandler('grpc_server_shutdown_and_notify') +cdef _CallbackFailureHandler SERVER_SHUTDOWN_FAILURE_HANDLER = _CallbackFailureHandler( + 'grpc_server_shutdown_and_notify', + 'Unknown', + RuntimeError) cdef class AioServer: def __init__(self, loop, thread_pool, generic_handlers, interceptors, options, maximum_concurrent_rpcs, compression): - # C-Core objects won't be deallocated automatically. + # NOTE(lidiz) Core objects won't be deallocated automatically. + # If AioServer.shutdown is not called, those objects will leak. self._server = Server(options) self._cq = _CallbackCompletionQueue(loop) grpc_server_register_completion_queue( @@ -311,7 +305,7 @@ cdef class AioServer: async def _server_main_loop(self, object server_started): - self._server.start(backup_queue=False) + self._server.start() cdef RPCState rpc_state server_started.set_result(True) @@ -344,8 +338,10 @@ cdef class AioServer: await server_started async def _start_shutting_down(self): - """Prepares the server to shutting down (NOT coroutine-safe).""" - # Starts the shutdown process. + """Prepares the server to shutting down. + + This coroutine function is NOT coroutine-safe. + """ # The shutdown callback won't be called until there is no live RPC. grpc_server_shutdown_and_notify( self._server.c_server, @@ -409,5 +405,10 @@ cdef class AioServer: return True def __dealloc__(self): + """Deallocation of Core objects are ensured by Python grpc.aio.Server. + + If the Cython representation is deallocated without underlying objects + freed, raise an RuntimeError. + """ if self._status != AIO_SERVER_STATUS_STOPPED: - _LOGGER.error('__dealloc__ called on running server: %d', self._status) + raise RuntimeError('__dealloc__ called on running server: %d', self._status) diff --git a/src/python/grpcio/grpc/experimental/aio/_server.py b/src/python/grpcio/grpc/experimental/aio/_server.py index 86d38e6525d..479951b1ceb 100644 --- a/src/python/grpcio/grpc/experimental/aio/_server.py +++ b/src/python/grpcio/grpc/experimental/aio/_server.py @@ -132,6 +132,14 @@ class Server: """ return await self._server.wait_for_termination(timeout) + def __del__(self): + """Schedules a graceful shutdown in current event loop. + + The Cython AioServer doesn't hold a ref-count to this class. It should + be safe to slightly extend the underlying Cython object's life span. + """ + self._loop.create_task(self._server.shutdown(None)) + def server(migration_thread_pool=None, handlers=None, diff --git a/src/python/grpcio_tests/tests_aio/unit/server_test.py b/src/python/grpcio_tests/tests_aio/unit/server_test.py index 6c96d478c64..776d432bffc 100644 --- a/src/python/grpcio_tests/tests_aio/unit/server_test.py +++ b/src/python/grpcio_tests/tests_aio/unit/server_test.py @@ -15,6 +15,7 @@ import logging import unittest import time +import gc import grpc from grpc.experimental import aio @@ -72,7 +73,8 @@ class TestServer(AioTestBase): def test_unary_unary(self): async def test_unary_unary_body(): - server_target, _, _ = await _start_test_server() + result = await _start_test_server() + server_target = result[0] async with aio.insecure_channel(server_target) as channel: unary_call = channel.unary_unary(_SIMPLE_UNARY_UNARY) From f8dc1d9a8e7b93a05dbc812f3a3f2c3b21747d87 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Wed, 30 Oct 2019 10:58:25 -0700 Subject: [PATCH 089/133] Make PyLint happy --- src/python/grpcio/grpc/experimental/aio/_server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python/grpcio/grpc/experimental/aio/_server.py b/src/python/grpcio/grpc/experimental/aio/_server.py index 479951b1ceb..8b53fdd0d03 100644 --- a/src/python/grpcio/grpc/experimental/aio/_server.py +++ b/src/python/grpcio/grpc/experimental/aio/_server.py @@ -134,7 +134,7 @@ class Server: def __del__(self): """Schedules a graceful shutdown in current event loop. - + The Cython AioServer doesn't hold a ref-count to this class. It should be safe to slightly extend the underlying Cython object's life span. """ From 9289d34df0fdcfed239899e0ebc840be18383015 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Thu, 31 Oct 2019 13:21:44 -0700 Subject: [PATCH 090/133] Propagate unexpected error to application --- .../grpc/_cython/_cygrpc/aio/server.pxd.pxi | 1 + .../grpc/_cython/_cygrpc/aio/server.pyx.pxi | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pxd.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pxd.pxi index fdd9541f0eb..ca4a6a837ea 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pxd.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pxd.pxi @@ -64,3 +64,4 @@ cdef class AioServer: cdef object _shutdown_lock # asyncio.Lock cdef object _shutdown_completed # asyncio.Future cdef CallbackWrapper _shutdown_callback_wrapper + cdef object _crash_exception # Exception diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi index 8b0a4e0a4b3..0dca070e933 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi @@ -282,6 +282,7 @@ cdef class AioServer: self._shutdown_callback_wrapper = CallbackWrapper( self._shutdown_completed, SERVER_SHUTDOWN_FAILURE_HANDLER) + self._crash_exception = None if interceptors: raise NotImplementedError() @@ -324,6 +325,15 @@ cdef class AioServer: rpc_state, self._loop)) + def _serving_task_crash_handler(self, object task): + """Shutdown the server immediately if unexpectedly exited.""" + if task.exception() is None: + return + if self._status != AIO_SERVER_STATUS_STOPPING: + self._crash_exception = task.exception() + _LOGGER.exception(self._crash_exception) + self._loop.create_task(self.shutdown(None)) + async def start(self): if self._status == AIO_SERVER_STATUS_RUNNING: return @@ -333,6 +343,7 @@ cdef class AioServer: self._status = AIO_SERVER_STATUS_RUNNING cdef object server_started = self._loop.create_future() self._serving_task = self._loop.create_task(self._server_main_loop(server_started)) + self._serving_task.add_done_callback(self._serving_task_crash_handler) # Needs to explicitly wait for the server to start up. # Otherwise, the actual start time of the server is un-controllable. await server_started @@ -368,9 +379,9 @@ cdef class AioServer: async with self._shutdown_lock: if self._status == AIO_SERVER_STATUS_RUNNING: - await self._start_shutting_down() self._server.is_shutting_down = True self._status = AIO_SERVER_STATUS_STOPPING + await self._start_shutting_down() if grace is None: # Directly cancels all calls @@ -401,7 +412,11 @@ cdef class AioServer: try: await asyncio.wait_for(self._shutdown_completed, timeout) except asyncio.TimeoutError: + if self._crash_exception is not None: + raise self._crash_exception return False + if self._crash_exception is not None: + raise self._crash_exception return True def __dealloc__(self): From 9aeefc3691642d744123e579eb038338a3eea5f8 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Thu, 31 Oct 2019 13:36:38 -0700 Subject: [PATCH 091/133] Fix missing shielding --- src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi index 0dca070e933..ef7160a3059 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi @@ -410,7 +410,7 @@ cdef class AioServer: await self._shutdown_completed else: try: - await asyncio.wait_for(self._shutdown_completed, timeout) + await asyncio.wait_for(asyncio.shield(self._shutdown_completed), timeout) except asyncio.TimeoutError: if self._crash_exception is not None: raise self._crash_exception From ae59fc3b7ae76f53a94ffe8741dbf100403dfc36 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Mon, 4 Nov 2019 11:55:48 -0800 Subject: [PATCH 092/133] Adopt reviewers' advice * Add cancellation handler * Use loop= --- .../grpc/_cython/_cygrpc/aio/server.pyx.pxi | 53 ++++++++++++++++--- 1 file changed, 46 insertions(+), 7 deletions(-) diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi index ef7160a3059..ef4b7f8c51d 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi @@ -14,6 +14,7 @@ # TODO(https://github.com/grpc/grpc/issues/20850) refactor this. _LOGGER = logging.getLogger(__name__) +cdef int _EMPTY_FLAG = 0 cdef class _HandlerCallDetails: @@ -171,6 +172,9 @@ async def _handle_unary_unary_rpc(object method_handler, await callback_start_batch(rpc_state, send_ops, loop) + + + async def _handle_rpc(list generic_handlers, RPCState rpc_state, object loop): # Finds the method handler (application logic) cdef object method_handler = _find_method_handler( @@ -180,6 +184,7 @@ async def _handle_rpc(list generic_handlers, RPCState rpc_state, object loop): if method_handler is None: # TODO(lidiz) return unimplemented error to client side raise NotImplementedError() + # TODO(lidiz) extend to all 4 types of RPC if method_handler.request_streaming or method_handler.response_streaming: raise NotImplementedError() @@ -223,6 +228,16 @@ async def _server_call_request_call(Server server, return rpc_state +async def _handle_cancellation_from_core(object rpc_task, + RPCState rpc_state, + object loop): + cdef ReceiveCloseOnServerOperation op = ReceiveCloseOnServerOperation(_EMPTY_FLAG) + cdef tuple ops = (op,) + await callback_start_batch(rpc_state, ops, loop) + if op.cancelled() and not rpc_task.done(): + rpc_task.cancel() + + cdef _CallbackFailureHandler CQ_SHUTDOWN_FAILURE_HANDLER = _CallbackFailureHandler( 'grpc_completion_queue_shutdown', 'Unknown', @@ -277,7 +292,7 @@ cdef class AioServer: self.add_generic_rpc_handlers(generic_handlers) self._serving_task = None - self._shutdown_lock = asyncio.Lock() + self._shutdown_lock = asyncio.Lock(loop=self._loop) self._shutdown_completed = self._loop.create_future() self._shutdown_callback_wrapper = CallbackWrapper( self._shutdown_completed, @@ -320,10 +335,20 @@ cdef class AioServer: self._cq, self._loop) - self._loop.create_task(_handle_rpc( - self._generic_handlers, - rpc_state, - self._loop)) + rpc_task = self._loop.create_task( + _handle_rpc( + self._generic_handlers, + rpc_state, + self._loop + ) + ) + self._loop.create_task( + _handle_cancellation_from_core( + rpc_task, + rpc_state, + self._loop + ) + ) def _serving_task_crash_handler(self, object task): """Shutdown the server immediately if unexpectedly exited.""" @@ -389,7 +414,14 @@ cdef class AioServer: await self._shutdown_completed else: try: - await asyncio.wait_for(asyncio.shield(self._shutdown_completed), grace) + await asyncio.wait_for( + asyncio.shield( + self._shutdown_completed, + loop=self._loop + ), + grace, + loop=self._loop, + ) except asyncio.TimeoutError: # Cancels all ongoing calls by the end of grace period. grpc_server_cancel_all_calls(self._server.c_server) @@ -410,7 +442,14 @@ cdef class AioServer: await self._shutdown_completed else: try: - await asyncio.wait_for(asyncio.shield(self._shutdown_completed), timeout) + await asyncio.wait_for( + asyncio.shield( + self._shutdown_completed, + loop=self._loop, + ), + timeout, + loop=self._loop, + ) except asyncio.TimeoutError: if self._crash_exception is not None: raise self._crash_exception From 4373d88caf62587682b7fe09d1d2f3b64961b44e Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Tue, 5 Nov 2019 11:27:34 -0800 Subject: [PATCH 093/133] Fix the tests after merging with Unified Stub Call --- .../grpc/_cython/_cygrpc/aio/server.pyx.pxi | 2 +- .../grpcio/grpc/experimental/aio/__init__.py | 3 -- .../grpcio_tests/tests_aio/unit/init_test.py | 39 ------------------- .../tests_aio/unit/server_test.py | 25 ++++++------ 4 files changed, 12 insertions(+), 57 deletions(-) diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi index ef4b7f8c51d..61335ca9e60 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi @@ -64,7 +64,7 @@ cdef class CallbackWrapper: grpc_experimental_completion_queue_functor* functor, int success): cdef CallbackContext *context = functor - if succeed == 0: + if success == 0: (<_CallbackFailureHandler>context.failure_handler).handle( context.waiter) else: diff --git a/src/python/grpcio/grpc/experimental/aio/__init__.py b/src/python/grpcio/grpc/experimental/aio/__init__.py index 3a736197d65..3f6b96eaa54 100644 --- a/src/python/grpcio/grpc/experimental/aio/__init__.py +++ b/src/python/grpcio/grpc/experimental/aio/__init__.py @@ -17,11 +17,8 @@ import abc import six import grpc -<<<<<<< HEAD -======= from grpc import _common from grpc._cython import cygrpc ->>>>>>> Add 4 server tests and 1 channel tests from grpc._cython.cygrpc import init_grpc_aio from ._call import AioRpcError diff --git a/src/python/grpcio_tests/tests_aio/unit/init_test.py b/src/python/grpcio_tests/tests_aio/unit/init_test.py index 300e2d92766..9f5d8bb0d85 100644 --- a/src/python/grpcio_tests/tests_aio/unit/init_test.py +++ b/src/python/grpcio_tests/tests_aio/unit/init_test.py @@ -19,45 +19,6 @@ from tests_aio.unit._test_server import start_test_server from tests_aio.unit._test_base import AioTestBase -class TestAioRpcError(unittest.TestCase): - _TEST_INITIAL_METADATA = ("initial metadata",) - _TEST_TRAILING_METADATA = ("trailing metadata",) - - def test_attributes(self): - aio_rpc_error = aio.AioRpcError(self._TEST_INITIAL_METADATA, 0, - "details", self._TEST_TRAILING_METADATA) - self.assertEqual(aio_rpc_error.initial_metadata(), - self._TEST_INITIAL_METADATA) - self.assertEqual(aio_rpc_error.code(), grpc.StatusCode.OK) - self.assertEqual(aio_rpc_error.details(), "details") - self.assertEqual(aio_rpc_error.trailing_metadata(), - self._TEST_TRAILING_METADATA) - - def test_class_hierarchy(self): - aio_rpc_error = aio.AioRpcError(self._TEST_INITIAL_METADATA, 0, - "details", self._TEST_TRAILING_METADATA) - - self.assertIsInstance(aio_rpc_error, grpc.RpcError) - - def test_class_attributes(self): - aio_rpc_error = aio.AioRpcError(self._TEST_INITIAL_METADATA, 0, - "details", self._TEST_TRAILING_METADATA) - self.assertEqual(aio_rpc_error.__class__.__name__, "AioRpcError") - self.assertEqual(aio_rpc_error.__class__.__doc__, - aio.AioRpcError.__doc__) - - def test_class_singleton(self): - first_aio_rpc_error = aio.AioRpcError(self._TEST_INITIAL_METADATA, 0, - "details", - self._TEST_TRAILING_METADATA) - second_aio_rpc_error = aio.AioRpcError(self._TEST_INITIAL_METADATA, 0, - "details", - self._TEST_TRAILING_METADATA) - - self.assertIs(first_aio_rpc_error.__class__, - second_aio_rpc_error.__class__) - - class TestInsecureChannel(AioTestBase): def test_insecure_channel(self): diff --git a/src/python/grpcio_tests/tests_aio/unit/server_test.py b/src/python/grpcio_tests/tests_aio/unit/server_test.py index 776d432bffc..1e86de65404 100644 --- a/src/python/grpcio_tests/tests_aio/unit/server_test.py +++ b/src/python/grpcio_tests/tests_aio/unit/server_test.py @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import asyncio import logging import unittest import time @@ -110,8 +111,7 @@ class TestServer(AioTestBase): server_target, server, generic_handler = await _start_test_server() channel = aio.insecure_channel(server_target) - call_task = self.loop.create_task( - channel.unary_unary(_BLOCK_BRIEFLY)(_REQUEST)) + call = channel.unary_unary(_BLOCK_BRIEFLY)(_REQUEST) await generic_handler.wait_for_call() shutdown_start_time = time.time() @@ -122,8 +122,8 @@ class TestServer(AioTestBase): # Validates the states. await channel.close() - self.assertEqual(_RESPONSE, await call_task) - self.assertTrue(call_task.done()) + self.assertEqual(_RESPONSE, await call) + self.assertTrue(call.done()) self.loop.run_until_complete(test_graceful_shutdown_success_body()) @@ -133,14 +133,13 @@ class TestServer(AioTestBase): server_target, server, generic_handler = await _start_test_server() channel = aio.insecure_channel(server_target) - call_task = self.loop.create_task( - channel.unary_unary(_BLOCK_FOREVER)(_REQUEST)) + call = channel.unary_unary(_BLOCK_FOREVER)(_REQUEST) await generic_handler.wait_for_call() await server.stop(test_constants.SHORT_TIMEOUT) with self.assertRaises(aio.AioRpcError) as exception_context: - await call_task + await call self.assertEqual(grpc.StatusCode.UNAVAILABLE, exception_context.exception.code()) self.assertIn('GOAWAY', exception_context.exception.details()) @@ -154,8 +153,7 @@ class TestServer(AioTestBase): server_target, server, generic_handler = await _start_test_server() channel = aio.insecure_channel(server_target) - call_task = self.loop.create_task( - channel.unary_unary(_BLOCK_BRIEFLY)(_REQUEST)) + call = channel.unary_unary(_BLOCK_BRIEFLY)(_REQUEST) await generic_handler.wait_for_call() # Expects the shortest grace period to be effective. @@ -170,8 +168,8 @@ class TestServer(AioTestBase): test_constants.SHORT_TIMEOUT / 3) await channel.close() - self.assertEqual(_RESPONSE, await call_task) - self.assertTrue(call_task.done()) + self.assertEqual(_RESPONSE, await call) + self.assertTrue(call.done()) self.loop.run_until_complete(test_concurrent_graceful_shutdown_body()) @@ -181,8 +179,7 @@ class TestServer(AioTestBase): server_target, server, generic_handler = await _start_test_server() channel = aio.insecure_channel(server_target) - call_task = self.loop.create_task( - channel.unary_unary(_BLOCK_FOREVER)(_REQUEST)) + call = channel.unary_unary(_BLOCK_FOREVER)(_REQUEST) await generic_handler.wait_for_call() # Expects no grace period, due to the "server.stop(None)". @@ -194,7 +191,7 @@ class TestServer(AioTestBase): ) with self.assertRaises(aio.AioRpcError) as exception_context: - await call_task + await call self.assertEqual(grpc.StatusCode.UNAVAILABLE, exception_context.exception.code()) self.assertIn('GOAWAY', exception_context.exception.details()) From 9a05fb3573209b6b439178936e7af6f4e9d0e0e6 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Wed, 30 Oct 2019 17:58:35 -0700 Subject: [PATCH 094/133] Add buildifier sanity check --- templates/tools/dockerfile/buildifier.include | 4 ++++ templates/tools/dockerfile/test/sanity/Dockerfile.template | 1 + tools/dockerfile/test/sanity/Dockerfile | 5 +++++ tools/run_tests/sanity/check_buildifier.sh | 3 +++ 4 files changed, 13 insertions(+) create mode 100644 templates/tools/dockerfile/buildifier.include create mode 100755 tools/run_tests/sanity/check_buildifier.sh diff --git a/templates/tools/dockerfile/buildifier.include b/templates/tools/dockerfile/buildifier.include new file mode 100644 index 00000000000..032afc8f7d6 --- /dev/null +++ b/templates/tools/dockerfile/buildifier.include @@ -0,0 +1,4 @@ +# Install buildifier v0.29.0 +RUN wget https://github.com/bazelbuild/buildtools/releases/download/0.29.0/buildifier +RUN chmod +x buildifier +RUN mv buildifier /usr/local/bin diff --git a/templates/tools/dockerfile/test/sanity/Dockerfile.template b/templates/tools/dockerfile/test/sanity/Dockerfile.template index 84a4049be0e..47d0288e751 100644 --- a/templates/tools/dockerfile/test/sanity/Dockerfile.template +++ b/templates/tools/dockerfile/test/sanity/Dockerfile.template @@ -33,6 +33,7 @@ <%include file="../../clang5.include"/> <%include file="../../bazel.include"/> + <%include file="../../buildifier.include"/> # Define the default command. CMD ["bash"] diff --git a/tools/dockerfile/test/sanity/Dockerfile b/tools/dockerfile/test/sanity/Dockerfile index c6a346c99c4..aa03520f8a4 100644 --- a/tools/dockerfile/test/sanity/Dockerfile +++ b/tools/dockerfile/test/sanity/Dockerfile @@ -105,6 +105,11 @@ RUN wget "https://github.com/bazelbuild/bazel/releases/download/$BAZEL_VERSION/b bash ./bazel-$BAZEL_VERSION-installer-linux-x86_64.sh && \ rm bazel-$BAZEL_VERSION-installer-linux-x86_64.sh +# Install buildifier v0.29.0 +RUN wget https://github.com/bazelbuild/buildtools/releases/download/0.29.0/buildifier +RUN chmod +x buildifier +RUN mv buildifier /usr/local/bin + # Define the default command. CMD ["bash"] diff --git a/tools/run_tests/sanity/check_buildifier.sh b/tools/run_tests/sanity/check_buildifier.sh new file mode 100755 index 00000000000..4b9c8284630 --- /dev/null +++ b/tools/run_tests/sanity/check_buildifier.sh @@ -0,0 +1,3 @@ +#! /bin/bash -ex + +buildifier -r -v "$(dirname "$0")/../../.." From 9ff34b2f4667a610559dfd7b58c6eca3ef85a210 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Wed, 30 Oct 2019 18:14:03 -0700 Subject: [PATCH 095/133] Make check_buildifier.sh smarter --- tools/run_tests/sanity/check_buildifier.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/run_tests/sanity/check_buildifier.sh b/tools/run_tests/sanity/check_buildifier.sh index 4b9c8284630..15b4ff956bd 100755 --- a/tools/run_tests/sanity/check_buildifier.sh +++ b/tools/run_tests/sanity/check_buildifier.sh @@ -1,3 +1,6 @@ #! /bin/bash -ex -buildifier -r -v "$(dirname "$0")/../../.." +GIT_ROOT="$(dirname "$0")/../../.." +TMP_ROOT="/tmp/buildifier_grpc" +git clone -- "$GIT_ROOT" "$TMP_ROOT" +buildifier -r -v -mode=diff $TMP_ROOT From 97624cba21bc6c0e837a23741d7023d9cb4f86ca Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Thu, 31 Oct 2019 10:27:42 -0700 Subject: [PATCH 096/133] How can I forget the copyright header... --- tools/run_tests/sanity/check_buildifier.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tools/run_tests/sanity/check_buildifier.sh b/tools/run_tests/sanity/check_buildifier.sh index 15b4ff956bd..c8f15c1c838 100755 --- a/tools/run_tests/sanity/check_buildifier.sh +++ b/tools/run_tests/sanity/check_buildifier.sh @@ -1,4 +1,19 @@ #! /bin/bash -ex +# Copyright 2019 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. +# +# The script to sanitize Bazel files GIT_ROOT="$(dirname "$0")/../../.." TMP_ROOT="/tmp/buildifier_grpc" From 2990b484fe10bb9f935391baf59184d9f104dbad Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Thu, 31 Oct 2019 13:41:19 -0700 Subject: [PATCH 097/133] Add buildifier to sanity_tests.yaml --- tools/run_tests/sanity/sanity_tests.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/run_tests/sanity/sanity_tests.yaml b/tools/run_tests/sanity/sanity_tests.yaml index 222e63a46dc..a994aae1330 100644 --- a/tools/run_tests/sanity/sanity_tests.yaml +++ b/tools/run_tests/sanity/sanity_tests.yaml @@ -1,6 +1,7 @@ # a set of tests that are run in parallel for sanity tests - script: tools/run_tests/sanity/check_bad_dependencies.sh - script: tools/run_tests/sanity/check_bazel_workspace.py +- script: tools/run_tests/sanity/check_buildifier.sh - script: tools/run_tests/sanity/check_cache_mk.sh - script: tools/run_tests/sanity/check_deprecated_grpc++.py - script: tools/run_tests/sanity/check_owners.sh From c34bef4ca454decaeb348ed57cfbd2ad2fe1969b Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Thu, 31 Oct 2019 14:14:30 -0700 Subject: [PATCH 098/133] Format all Bazel files with buildifier --- BUILD | 4 +- WORKSPACE | 4 +- bazel/cython_library.bzl | 38 +-- bazel/generate_cc.bzl | 1 + bazel/generate_objc.bzl | 30 +- bazel/grpc_build_system.bzl | 37 ++- bazel/grpc_python_deps.bzl | 1 - bazel/objc_grpc_library.bzl | 3 +- bazel/protobuf.bzl | 2 +- bazel/python_rules.bzl | 35 ++- bazel/test/python_test_repo/BUILD | 18 +- examples/BUILD | 2 +- examples/objective-c/BUILD | 28 +- examples/python/auth/BUILD.bazel | 18 +- examples/python/cancellation/BUILD.bazel | 18 +- examples/python/compression/BUILD.bazel | 20 +- examples/python/debug/BUILD.bazel | 22 +- examples/python/errors/BUILD.bazel | 18 +- examples/python/multiprocessing/BUILD | 18 +- examples/python/wait_for_ready/BUILD.bazel | 6 +- grpc.bzl | 154 +++++----- src/compiler/BUILD | 2 +- src/core/tsi/test_creds/BUILD | 26 +- src/objective-c/BUILD | 70 ++--- src/objective-c/examples/BUILD | 26 +- .../grpc_objc_internal_library.bzl | 10 +- src/objective-c/tests/BUILD | 44 +-- src/proto/grpc/channelz/BUILD | 7 +- src/proto/grpc/core/BUILD | 7 +- src/proto/grpc/health/v1/BUILD | 7 +- src/proto/grpc/reflection/v1alpha/BUILD | 8 +- src/proto/grpc/status/BUILD | 7 +- src/proto/grpc/testing/BUILD | 5 +- src/proto/grpc/testing/duplicate/BUILD | 7 +- src/proto/grpc/testing/proto2/BUILD.bazel | 4 +- src/python/grpcio/grpc/BUILD.bazel | 15 +- src/python/grpcio/grpc/_cython/BUILD.bazel | 4 +- .../grpcio/grpc/experimental/BUILD.bazel | 2 +- src/python/grpcio/grpc/framework/BUILD.bazel | 2 +- .../grpcio/grpc/framework/common/BUILD.bazel | 6 +- .../grpc/framework/foundation/BUILD.bazel | 8 +- .../grpc/framework/interfaces/BUILD.bazel | 2 +- .../framework/interfaces/base/BUILD.bazel | 6 +- .../framework/interfaces/face/BUILD.bazel | 6 +- .../grpc_channelz/v1/BUILD.bazel | 9 +- .../grpc_health/v1/BUILD.bazel | 14 +- .../grpc_reflection/v1alpha/BUILD.bazel | 13 +- .../grpcio_status/grpc_status/BUILD.bazel | 6 +- src/python/grpcio_tests/tests/BUILD.bazel | 4 +- .../grpcio_tests/tests/channelz/BUILD.bazel | 6 +- .../tests/health_check/BUILD.bazel | 8 +- .../tests/interop/credentials/BUILD.bazel | 5 +- .../grpcio_tests/tests/reflection/BUILD.bazel | 23 +- .../grpcio_tests/tests/status/BUILD.bazel | 12 +- .../grpcio_tests/tests/stress/BUILD.bazel | 20 +- .../grpcio_tests/tests/testing/BUILD.bazel | 9 +- .../grpcio_tests/tests/unit/BUILD.bazel | 40 +-- .../tests/unit/_cython/BUILD.bazel | 29 +- .../tests/unit/credentials/BUILD.bazel | 6 +- .../tests/unit/framework/common/BUILD.bazel | 1 - .../unit/framework/foundation/BUILD.bazel | 4 +- .../grpcio_tests/tests_aio/unit/BUILD.bazel | 44 +-- test/build_test/BUILD | 2 +- test/core/avl/BUILD | 4 +- test/core/backoff/BUILD | 4 +- test/core/bad_client/BUILD | 2 +- test/core/bad_client/generate_tests.bzl | 63 ++-- test/core/bad_connection/BUILD | 4 +- test/core/bad_ssl/BUILD | 2 +- test/core/bad_ssl/generate_tests.bzl | 61 ++-- test/core/channel/BUILD | 12 +- test/core/client_channel/BUILD | 10 +- test/core/client_channel/resolvers/BUILD | 6 +- test/core/compression/BUILD | 10 +- test/core/debug/BUILD | 4 +- test/core/end2end/BUILD | 16 +- test/core/end2end/fuzzers/BUILD | 18 +- test/core/end2end/generate_tests.bzl | 26 +- test/core/fling/BUILD | 6 +- test/core/gpr/BUILD | 26 +- test/core/gprpp/BUILD | 18 +- test/core/handshake/BUILD | 12 +- test/core/http/BUILD | 12 +- test/core/iomgr/BUILD | 36 +-- test/core/json/BUILD | 10 +- test/core/nanopb/BUILD | 10 +- test/core/network_benchmarks/BUILD | 4 +- test/core/security/BUILD | 18 +- test/core/security/etc/BUILD | 8 +- test/core/slice/BUILD | 20 +- test/core/surface/BUILD | 6 +- test/core/transport/BUILD | 14 +- test/core/transport/chttp2/BUILD | 18 +- test/core/tsi/BUILD | 8 +- test/core/tsi/alts/crypt/BUILD | 14 +- test/core/tsi/alts/fake_handshaker/BUILD | 2 +- test/core/util/BUILD | 8 +- test/core/util/grpc_fuzzer.bzl | 26 +- test/cpp/client/BUILD | 6 +- test/cpp/codegen/BUILD | 8 +- test/cpp/common/BUILD | 6 +- test/cpp/end2end/BUILD | 51 +++- test/cpp/ext/filters/census/BUILD | 2 +- test/cpp/grpclb/BUILD | 2 +- test/cpp/interop/BUILD | 4 +- test/cpp/microbenchmarks/BUILD | 2 +- test/cpp/naming/BUILD | 4 +- .../generate_resolver_component_tests.bzl | 137 ++++----- test/cpp/naming/utils/BUILD | 32 +- test/cpp/performance/BUILD | 2 +- test/cpp/qps/BUILD | 6 +- test/cpp/qps/json_run_localhost_scenarios.bzl | 2 +- test/cpp/qps/qps_json_driver_scenarios.bzl | 2 +- test/cpp/server/BUILD | 8 +- test/cpp/server/load_reporter/BUILD | 2 +- test/cpp/test/BUILD | 2 +- test/cpp/thread_manager/BUILD | 2 +- test/cpp/util/BUILD | 17 +- third_party/address_sorting/BUILD | 2 +- .../address_sorting/address_sorting.bzl | 14 +- third_party/objective_c/Cronet/BUILD | 2 +- .../objective_c/google_toolbox_for_mac/BUILD | 5 +- third_party/py/python_configure.bzl | 218 ++++++++------ third_party/toolchains/BUILD | 34 +-- .../toolchains/bazel_0.26.0_rbe_windows/BUILD | 25 +- .../cc_toolchain_config.bzl | 282 +++++++++--------- third_party/upb/BUILD | 38 +-- third_party/upb/WORKSPACE | 12 +- third_party/upb/bazel/upb_proto_library.bzl | 2 +- third_party/upb/bazel/workspace_deps.bzl | 1 - third_party/upb/examples/bazel/BUILD | 1 - third_party/upb/examples/bazel/WORKSPACE | 3 +- 132 files changed, 1263 insertions(+), 1204 deletions(-) diff --git a/BUILD b/BUILD index 182fa9d54ed..97dd57830be 100644 --- a/BUILD +++ b/BUILD @@ -318,9 +318,9 @@ grpc_cc_library( standalone = True, deps = [ "grpc_common", + "grpc_lb_policy_cds", "grpc_lb_policy_grpclb", "grpc_lb_policy_xds", - "grpc_lb_policy_cds", "grpc_resolver_xds", ], ) @@ -336,9 +336,9 @@ grpc_cc_library( standalone = True, deps = [ "grpc_common", + "grpc_lb_policy_cds_secure", "grpc_lb_policy_grpclb_secure", "grpc_lb_policy_xds_secure", - "grpc_lb_policy_cds_secure", "grpc_resolver_xds_secure", "grpc_secure", "grpc_transport_chttp2_client_secure", diff --git a/WORKSPACE b/WORKSPACE index b8cec9ef593..ad730049e43 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -43,7 +43,7 @@ rbe_autoconfig( ), ) -load("@io_bazel_rules_python//python:pip.bzl", "pip_repositories", "pip_import") +load("@io_bazel_rules_python//python:pip.bzl", "pip_import", "pip_repositories") pip_import( name = "grpc_python_dependencies", @@ -51,5 +51,7 @@ pip_import( ) load("@grpc_python_dependencies//:requirements.bzl", "pip_install") + pip_repositories() + pip_install() diff --git a/bazel/cython_library.bzl b/bazel/cython_library.bzl index 48b41d74e8c..3f34e185380 100644 --- a/bazel/cython_library.bzl +++ b/bazel/cython_library.bzl @@ -1,13 +1,12 @@ """Custom rules for gRPC Python""" - # Adapted with modifications from # tensorflow/tensorflow/core/platform/default/build_config.bzl # Native Bazel rules don't exist yet to compile Cython code, but rules have # been written at cython/cython and tensorflow/tensorflow. We branch from # Tensorflow's version as it is more actively maintained and works for gRPC # Python's needs. -def pyx_library(name, deps=[], py_deps=[], srcs=[], **kwargs): +def pyx_library(name, deps = [], py_deps = [], srcs = [], **kwargs): """Compiles a group of .pyx / .pxd / .py files. First runs Cython to create .cpp files for each input .pyx or .py + .pxd @@ -23,6 +22,7 @@ def pyx_library(name, deps=[], py_deps=[], srcs=[], **kwargs): srcs: .py, .pyx, or .pxd files to either compile or pass through. **kwargs: Extra keyword arguments passed to the py_library. """ + # First filter out files that should be run compiled vs. passed through. py_srcs = [] pyx_srcs = [] @@ -41,14 +41,14 @@ def pyx_library(name, deps=[], py_deps=[], srcs=[], **kwargs): # Invoke cython to produce the shared object libraries. for filename in pyx_srcs: native.genrule( - name=filename + "_cython_translation", - srcs=[filename], - outs=[filename.split(".")[0] + ".cpp"], + name = filename + "_cython_translation", + srcs = [filename], + outs = [filename.split(".")[0] + ".cpp"], # Optionally use PYTHON_BIN_PATH on Linux platforms so that python 3 # works. Windows has issues with cython_binary so skip PYTHON_BIN_PATH. - cmd= - "PYTHONHASHSEED=0 $(location @cython//:cython_binary) --cplus $(SRCS) --output-file $(OUTS)", - tools=["@cython//:cython_binary"] + pxd_srcs, + cmd = + "PYTHONHASHSEED=0 $(location @cython//:cython_binary) --cplus $(SRCS) --output-file $(OUTS)", + tools = ["@cython//:cython_binary"] + pxd_srcs, ) shared_objects = [] @@ -56,19 +56,19 @@ def pyx_library(name, deps=[], py_deps=[], srcs=[], **kwargs): stem = src.split(".")[0] shared_object_name = stem + ".so" native.cc_binary( - name=shared_object_name, - srcs=[stem + ".cpp"], - deps=deps + ["@local_config_python//:python_headers"], - linkshared=1, + name = shared_object_name, + srcs = [stem + ".cpp"], + deps = deps + ["@local_config_python//:python_headers"], + linkshared = 1, ) shared_objects.append(shared_object_name) # Now create a py_library with these shared objects as data. native.py_library( - name=name, - srcs=py_srcs, - deps=py_deps, - srcs_version="PY2AND3", - data=shared_objects, - **kwargs) - + name = name, + srcs = py_srcs, + deps = py_deps, + srcs_version = "PY2AND3", + data = shared_objects, + **kwargs + ) diff --git a/bazel/generate_cc.bzl b/bazel/generate_cc.bzl index 7c5b2f60edc..484959ebb70 100644 --- a/bazel/generate_cc.bzl +++ b/bazel/generate_cc.bzl @@ -111,6 +111,7 @@ def generate_cc_impl(ctx): "--proto_path={}".format(get_include_directory(i)) for i in includes ] + # Include the output directory so that protoc puts the generated code in the # right directory. arguments += ["--proto_path={0}{1}".format(dir_out, proto_root)] diff --git a/bazel/generate_objc.bzl b/bazel/generate_objc.bzl index 75923cdb5f2..3bf5aa39243 100644 --- a/bazel/generate_objc.bzl +++ b/bazel/generate_objc.bzl @@ -4,7 +4,7 @@ load( "get_plugin_args", "proto_path_to_generated_filename", ) -load(":grpc_util.bzl", "to_upper_camel_with_extension",) +load(":grpc_util.bzl", "to_upper_camel_with_extension") _GRPC_PROTO_HEADER_FMT = "{}.pbrpc.h" _GRPC_PROTO_SRC_FMT = "{}.pbrpc.m" @@ -40,7 +40,9 @@ def _generate_objc_impl(ctx): out_files = [ctx.actions.declare_file(out) for out in outs] dir_out = _join_directories([ - str(ctx.genfiles_dir.path), target_package, _GENERATED_PROTOS_DIR + str(ctx.genfiles_dir.path), + target_package, + _GENERATED_PROTOS_DIR, ]) arguments = [] @@ -70,6 +72,7 @@ def _generate_objc_impl(ctx): well_known_proto_files = [] if ctx.attr.use_well_known_protos: f = ctx.attr.well_known_protos.files.to_list()[0].dirname + # go two levels up so that #import "google/protobuf/..." is correct arguments += ["-I{0}".format(f + "/../..")] well_known_proto_files = ctx.attr.well_known_protos.files.to_list() @@ -90,6 +93,7 @@ def _label_to_full_file_path(src, package): # "a.proto" -> ":a.proto" src = ":" + src src = "//" + package + src + # Converts //path/to/package:File.ext to path/to/package/File.ext. src = src.replace("//", "") src = src.replace(":", "/") @@ -119,6 +123,7 @@ def _get_directory_from_proto(proto): def _get_full_path_from_file(file): gen_dir_length = 0 + # if file is generated, then prepare to remote its root # (including CPU architecture...) if not file.is_source: @@ -130,7 +135,6 @@ def _join_directories(directories): massaged_directories = [directory for directory in directories if len(directory) != 0] return "/".join(massaged_directories) - generate_objc = rule( attrs = { "deps": attr.label_list( @@ -146,14 +150,14 @@ generate_objc = rule( ), "srcs": attr.string_list( mandatory = False, - allow_empty = True + allow_empty = True, ), "use_well_known_protos": attr.bool( mandatory = False, - default = False + default = False, ), "well_known_protos": attr.label( - default = "@com_google_protobuf//:well_known_protos" + default = "@com_google_protobuf//:well_known_protos", ), "_protoc": attr.label( default = Label("//external:protocol_compiler"), @@ -162,7 +166,7 @@ generate_objc = rule( ), }, output_to_genfiles = True, - implementation = _generate_objc_impl + implementation = _generate_objc_impl, ) def _group_objc_files_impl(ctx): @@ -189,9 +193,9 @@ generate_objc_hdrs = rule( ), "gen_mode": attr.int( default = _GENERATE_HDRS, - ) + ), }, - implementation = _group_objc_files_impl + implementation = _group_objc_files_impl, ) generate_objc_srcs = rule( @@ -201,9 +205,9 @@ generate_objc_srcs = rule( ), "gen_mode": attr.int( default = _GENERATE_SRCS, - ) + ), }, - implementation = _group_objc_files_impl + implementation = _group_objc_files_impl, ) generate_objc_non_arc_srcs = rule( @@ -213,7 +217,7 @@ generate_objc_non_arc_srcs = rule( ), "gen_mode": attr.int( default = _GENERATE_NON_ARC_SRCS, - ) + ), }, - implementation = _group_objc_files_impl + implementation = _group_objc_files_impl, ) diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl index 3450b791bbd..c6e6b0b9e0e 100644 --- a/bazel/grpc_build_system.bzl +++ b/bazel/grpc_build_system.bzl @@ -27,13 +27,12 @@ load("//bazel:cc_grpc_library.bzl", "cc_grpc_library") load("@upb//bazel:upb_proto_library.bzl", "upb_proto_library") load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test") - # The set of pollers to test against if a test exercises polling POLLERS = ["epollex", "epoll1", "poll"] # set exec_properties = LARGE_MACHINE, to run the test on a large machine # see //third_party/toolchains/machine_size for details -LARGE_MACHINE = { "gceMachineType" : "n1-standard-8"} +LARGE_MACHINE = {"gceMachineType": "n1-standard-8"} def if_not_windows(a): return select({ @@ -110,8 +109,8 @@ def grpc_cc_library( testonly = testonly, linkopts = linkopts, includes = [ - "include", - "src/core/ext/upb-generated", # Once upb code-gen issue is resolved, remove this. + "include", + "src/core/ext/upb-generated", # Once upb code-gen issue is resolved, remove this. ], alwayslink = alwayslink, data = data, @@ -142,11 +141,12 @@ def grpc_proto_library( use_external = use_external, generate_mocks = generate_mocks, ) + def ios_cc_test( name, tags = [], **kwargs): - ios_test_adapter = "//third_party/objective_c/google_toolbox_for_mac:GTM_GoogleTestRunner_GTM_USING_XCTEST"; + ios_test_adapter = "//third_party/objective_c/google_toolbox_for_mac:GTM_GoogleTestRunner_GTM_USING_XCTEST" test_lib_ios = name + "_test_lib_ios" ios_tags = tags + ["manual", "ios_cc_test"] @@ -186,7 +186,7 @@ def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data "exec_properties": exec_properties, } if uses_polling: - # the vanilla version of the test should run on platforms that only + # the vanilla version of the test should run on platforms that only # support a single poller native.cc_test( name = name, @@ -196,6 +196,7 @@ def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data ]), **args ) + # on linux we run the same test multiple times, once for each poller for poller in POLLERS: native.sh_test( @@ -223,7 +224,6 @@ def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data **args ) - def grpc_cc_binary(name, srcs = [], deps = [], external_deps = [], args = [], data = [], language = "C++", testonly = False, linkshared = False, linkopts = [], tags = []): copts = [] if language.upper() == "C": @@ -266,14 +266,15 @@ def grpc_sh_binary(name, srcs, data = []): data = data, ) -def grpc_py_binary(name, - srcs, - data = [], - deps = [], - external_deps = [], - testonly = False, - python_version = "PY2", - **kwargs): +def grpc_py_binary( + name, + srcs, + data = [], + deps = [], + external_deps = [], + testonly = False, + python_version = "PY2", + **kwargs): native.py_binary( name = name, srcs = srcs, @@ -323,7 +324,7 @@ def grpc_objc_library( deps: dependencies visibility: visibility, default to public """ - + native.objc_library( name = name, hdrs = hdrs, @@ -335,14 +336,12 @@ def grpc_objc_library( includes = includes, visibility = visibility, ) - + def grpc_upb_proto_library(name, deps): upb_proto_library(name = name, deps = deps) - def python_config_settings(): native.config_setting( name = "python3", flag_values = {"@bazel_tools//tools/python:python_version": "PY3"}, ) - diff --git a/bazel/grpc_python_deps.bzl b/bazel/grpc_python_deps.bzl index 8f00e560c4e..8096121e877 100644 --- a/bazel/grpc_python_deps.bzl +++ b/bazel/grpc_python_deps.bzl @@ -71,4 +71,3 @@ def grpc_python_deps(): "https://github.com/cython/cython/archive/c2b80d87658a8525ce091cbe146cb7eaa29fed5c.tar.gz", ], ) - diff --git a/bazel/objc_grpc_library.bzl b/bazel/objc_grpc_library.bzl index 71538843589..5b7125686af 100644 --- a/bazel/objc_grpc_library.bzl +++ b/bazel/objc_grpc_library.bzl @@ -2,8 +2,8 @@ load( "//bazel:generate_objc.bzl", "generate_objc", "generate_objc_hdrs", + "generate_objc_non_arc_srcs", "generate_objc_srcs", - "generate_objc_non_arc_srcs" ) load("//bazel:protobuf.bzl", "well_known_proto_libs") @@ -66,4 +66,3 @@ def objc_grpc_library(name, deps, srcs = [], use_well_known_protos = False, **kw ], **kwargs ) - diff --git a/bazel/protobuf.bzl b/bazel/protobuf.bzl index 5aa0444fb8c..7af27a8b308 100644 --- a/bazel/protobuf.bzl +++ b/bazel/protobuf.bzl @@ -123,7 +123,7 @@ def get_plugin_args( "--{plugin_name}_out={dir_out}".format( plugin_name = plugin_name, dir_out = augmented_dir_out, - ) + ), ] def _get_staged_proto_file(context, source_file): diff --git a/bazel/python_rules.bzl b/bazel/python_rules.bzl index b330a937094..e8ada92f15f 100644 --- a/bazel/python_rules.bzl +++ b/bazel/python_rules.bzl @@ -2,13 +2,13 @@ load( "//bazel:protobuf.bzl", + "declare_out_files", "get_include_directory", + "get_out_dir", "get_plugin_args", - "protos_from_context", - "includes_from_deps", "get_proto_arguments", - "declare_out_files", - "get_out_dir", + "includes_from_deps", + "protos_from_context", ) _GENERATED_PROTO_FORMAT = "{}_pb2.py" @@ -35,7 +35,7 @@ def _generate_py_impl(context): [], out_dir.path, False, - context.attr.plugin.label.name + context.attr.plugin.label.name, ) tools.append(context.executable.plugin) @@ -104,7 +104,6 @@ def py_proto_library( if len(deps) != 1: fail("Can only compile a single proto at a time.") - _generate_pb2_src( name = codegen_target, deps = deps, @@ -144,7 +143,7 @@ def _generate_pb2_grpc_src_impl(context): [], out_dir.path, False, - context.attr.plugin.label.name + context.attr.plugin.label.name, ) tools.append(context.executable.plugin) @@ -207,12 +206,12 @@ _generate_pb2_grpc_src = rule( ) def py_grpc_library( - name, - srcs, - deps, - plugin = None, - strip_prefixes = [], - **kwargs): + name, + srcs, + deps, + plugin = None, + strip_prefixes = [], + **kwargs): """Generate python code for gRPC services defined in a protobuf. Args: @@ -253,15 +252,15 @@ def py_grpc_library( deps = [ Label("//src/python/grpcio/grpc:grpcio"), ] + deps + [ - ":{}".format(codegen_grpc_target) + ":{}".format(codegen_grpc_target), ], **kwargs ) - -def py2and3_test(name, - py_test = native.py_test, - **kwargs): +def py2and3_test( + name, + py_test = native.py_test, + **kwargs): """Runs a Python test under both Python 2 and Python 3. Args: diff --git a/bazel/test/python_test_repo/BUILD b/bazel/test/python_test_repo/BUILD index b548d89a55e..da6d135d8e7 100644 --- a/bazel/test/python_test_repo/BUILD +++ b/bazel/test/python_test_repo/BUILD @@ -16,9 +16,9 @@ load( "@com_github_grpc_grpc//bazel:python_rules.bzl", - "py_proto_library", - "py_grpc_library", "py2and3_test", + "py_grpc_library", + "py_proto_library", ) package(default_testonly = 1) @@ -55,12 +55,12 @@ py_proto_library( py2and3_test( name = "import_test", - main = "helloworld.py", srcs = ["helloworld.py"], + main = "helloworld.py", deps = [ + ":duration_py_pb2", ":helloworld_py_pb2", ":helloworld_py_pb2_grpc", - ":duration_py_pb2", ":timestamp_py_pb2", ], ) @@ -71,19 +71,19 @@ py2and3_test( proto_library( name = "helloworld_moved_proto", srcs = ["helloworld.proto"], + import_prefix = "google/cloud", + strip_import_prefix = "", deps = [ "@com_google_protobuf//:duration_proto", "@com_google_protobuf//:timestamp_proto", ], - import_prefix = "google/cloud", - strip_import_prefix = "" ) # Also test the custom plugin execution parameter py_proto_library( name = "helloworld_moved_py_pb2", + plugin = ":dummy_plugin", deps = [":helloworld_moved_proto"], - plugin = ":dummy_plugin" ) py_grpc_library( @@ -94,12 +94,12 @@ py_grpc_library( py2and3_test( name = "import_moved_test", - main = "helloworld_moved.py", srcs = ["helloworld_moved.py"], + main = "helloworld_moved.py", deps = [ + ":duration_py_pb2", ":helloworld_moved_py_pb2", ":helloworld_moved_py_pb2_grpc", - ":duration_py_pb2", ":timestamp_py_pb2", ], ) diff --git a/examples/BUILD b/examples/BUILD index 1455d25dc76..f6dae42ca4c 100644 --- a/examples/BUILD +++ b/examples/BUILD @@ -18,7 +18,7 @@ package(default_visibility = ["//visibility:public"]) load("//bazel:grpc_build_system.bzl", "grpc_proto_library") load("//bazel:cc_grpc_library.bzl", "cc_grpc_library") -load("//bazel:python_rules.bzl", "py_proto_library", "py_grpc_library") +load("//bazel:python_rules.bzl", "py_grpc_library", "py_proto_library") load("@grpc_python_dependencies//:requirements.bzl", "requirement") grpc_proto_library( diff --git a/examples/objective-c/BUILD b/examples/objective-c/BUILD index 4a5eafdf3fb..e8d2184a0e1 100644 --- a/examples/objective-c/BUILD +++ b/examples/objective-c/BUILD @@ -23,29 +23,29 @@ load("@build_bazel_rules_apple//apple:macos.bzl", "macos_application") objc_grpc_library( name = "HelloWorld_grpc_proto", srcs = ["//examples:protos/helloworld.proto"], - deps = ["//examples:helloworld_proto"], tags = ["manual"], + deps = ["//examples:helloworld_proto"], ) # This one works with import "external/com_github_grpc_grpc/examples/protos/Helloworld.pbrpc.h" objc_grpc_library( name = "HelloWorld_grpc_proto_external", srcs = ["//external/com_github_grpc_grpc/examples:protos/helloworld.proto"], - deps = ["@com_github_grpc_grpc//examples:helloworld_proto"], tags = ["manual"], + deps = ["@com_github_grpc_grpc//examples:helloworld_proto"], ) objc_library( name = "HelloWorld-lib", - srcs = glob(["helloworld/**/*.m",]), + srcs = glob(["helloworld/**/*.m"]), hdrs = glob(["helloworld/**/*.h"]), data = glob([ "helloworld/HelloWorld/Base.lproj/**", "helloworld/HelloWorld/Images.xcassets/**", ]), includes = ["helloworld/HelloWorld"], - deps = [":HelloWorld_grpc_proto"], tags = ["manual"], + deps = [":HelloWorld_grpc_proto"], ) ios_application( @@ -55,40 +55,40 @@ ios_application( "iphone", "ipad", ], - minimum_os_version = "8.0", infoplists = ["helloworld/HelloWorld/Info.plist"], - deps = [":HelloWorld-lib"], + minimum_os_version = "8.0", tags = ["manual"], + deps = [":HelloWorld-lib"], ) objc_library( name = "HelloWorldMacos-lib", - srcs = glob(["helloworld_macos/**/*.m",]), + srcs = glob(["helloworld_macos/**/*.m"]), hdrs = glob(["helloworld_macos/**/*.h"]), data = glob([ "helloworld_macos/HelloWorld/Base.lproj/**", "helloworld_macos/HelloWorld/Images.xcassets/**", ]), includes = ["helloworld_macos/HelloWorld"], - deps = [":HelloWorld_grpc_proto"], tags = ["manual"], + deps = [":HelloWorld_grpc_proto"], ) macos_application( name = "HelloWorldMacos", bundle_id = "io.grpc.HelloWorld", - minimum_os_version = "10.13", entitlements = "helloworld_macos/HelloWorld/Helloworld.entitlements", infoplists = ["helloworld_macos/HelloWorld/Info.plist"], - deps = [":HelloWorldMacos-lib"], + minimum_os_version = "10.13", tags = ["manual"], + deps = [":HelloWorldMacos-lib"], ) objc_grpc_library( name = "RouteGuide", srcs = ["//examples:protos/route_guide.proto"], - deps = ["//examples:route_guide_proto"], tags = ["manual"], + deps = ["//examples:route_guide_proto"], ) objc_library( @@ -101,8 +101,8 @@ objc_library( "route_guide/route_guide_db.json", ]), includes = ["route_guide/Misc"], - deps = [":RouteGuide"], tags = ["manual"], + deps = [":RouteGuide"], ) ios_application( @@ -112,8 +112,8 @@ ios_application( "iphone", "ipad", ], - minimum_os_version = "8.0", infoplists = ["route_guide/Misc/Info.plist"], - deps = [":RouteGuideClient-lib"], + minimum_os_version = "8.0", tags = ["manual"], + deps = [":RouteGuideClient-lib"], ) diff --git a/examples/python/auth/BUILD.bazel b/examples/python/auth/BUILD.bazel index 72620ee46c5..3838b39edab 100644 --- a/examples/python/auth/BUILD.bazel +++ b/examples/python/auth/BUILD.bazel @@ -16,8 +16,8 @@ filegroup( name = "_credentials_files", testonly = 1, srcs = [ - "credentials/localhost.key", "credentials/localhost.crt", + "credentials/localhost.key", "credentials/root.crt", ], ) @@ -33,37 +33,37 @@ py_binary( name = "customized_auth_client", testonly = 1, srcs = ["customized_auth_client.py"], + python_version = "PY3", deps = [ ":_credentials", - "//src/python/grpcio/grpc:grpcio", "//examples:helloworld_py_pb2", "//examples:helloworld_py_pb2_grpc", + "//src/python/grpcio/grpc:grpcio", ], - python_version = "PY3", ) py_binary( name = "customized_auth_server", testonly = 1, srcs = ["customized_auth_server.py"], + python_version = "PY3", deps = [ ":_credentials", - "//src/python/grpcio/grpc:grpcio", "//examples:helloworld_py_pb2", "//examples:helloworld_py_pb2_grpc", + "//src/python/grpcio/grpc:grpcio", ], - python_version = "PY3", ) py_test( name = "_auth_example_test", srcs = ["test/_auth_example_test.py"], + python_version = "PY3", deps = [ - "//src/python/grpcio/grpc:grpcio", - "//examples:helloworld_py_pb2", + ":_credentials", ":customized_auth_client", ":customized_auth_server", - ":_credentials", + "//examples:helloworld_py_pb2", + "//src/python/grpcio/grpc:grpcio", ], - python_version = "PY3", ) diff --git a/examples/python/cancellation/BUILD.bazel b/examples/python/cancellation/BUILD.bazel index b4451f60711..56f5e8f0629 100644 --- a/examples/python/cancellation/BUILD.bazel +++ b/examples/python/cancellation/BUILD.bazel @@ -15,7 +15,7 @@ # limitations under the License. load("@grpc_python_dependencies//:requirements.bzl", "requirement") -load("//bazel:python_rules.bzl", "py_proto_library", "py_grpc_library") +load("//bazel:python_rules.bzl", "py_grpc_library", "py_proto_library") package(default_testonly = 1) @@ -38,14 +38,14 @@ py_grpc_library( py_binary( name = "client", srcs = ["client.py"], + python_version = "PY3", + srcs_version = "PY2AND3", deps = [ - "//src/python/grpcio/grpc:grpcio", ":hash_name_py_pb2", ":hash_name_py_pb2_grpc", - "//external:six" + "//external:six", + "//src/python/grpcio/grpc:grpcio", ], - srcs_version = "PY2AND3", - python_version = "PY3", ) py_library( @@ -60,6 +60,8 @@ py_library( py_binary( name = "server", srcs = ["server.py"], + python_version = "PY3", + srcs_version = "PY2AND3", deps = [ "//src/python/grpcio/grpc:grpcio", ":hash_name_py_pb2", @@ -68,17 +70,15 @@ py_binary( "//conditions:default": ["@futures//:futures"], "//:python3": [], }), - srcs_version = "PY2AND3", - python_version = "PY3", ) py_test( name = "test/_cancellation_example_test", + size = "small", srcs = ["test/_cancellation_example_test.py"], data = [ ":client", - ":server" + ":server", ], - size = "small", python_version = "PY3", ) diff --git a/examples/python/compression/BUILD.bazel b/examples/python/compression/BUILD.bazel index 4141eda2ffd..1ab1d5a2a37 100644 --- a/examples/python/compression/BUILD.bazel +++ b/examples/python/compression/BUILD.bazel @@ -15,35 +15,35 @@ py_binary( name = "server", srcs = ["server.py"], + python_version = "PY3", + srcs_version = "PY2AND3", deps = [ - "//src/python/grpcio/grpc:grpcio", "//examples:helloworld_py_pb2", "//examples:helloworld_py_pb2_grpc", + "//src/python/grpcio/grpc:grpcio", ], - srcs_version = "PY2AND3", - python_version = "PY3", ) py_binary( name = "client", srcs = ["client.py"], + python_version = "PY3", + srcs_version = "PY2AND3", deps = [ - "//src/python/grpcio/grpc:grpcio", "//examples:helloworld_py_pb2", "//examples:helloworld_py_pb2_grpc", + "//src/python/grpcio/grpc:grpcio", ], - srcs_version = "PY2AND3", - python_version = "PY3", ) py_test( name = "test/compression_example_test", + size = "small", srcs = ["test/compression_example_test.py"], - srcs_version = "PY2AND3", data = [ - ":client", - ":server", + ":client", + ":server", ], - size = "small", python_version = "PY3", + srcs_version = "PY2AND3", ) diff --git a/examples/python/debug/BUILD.bazel b/examples/python/debug/BUILD.bazel index 332991332f8..029f78d551a 100644 --- a/examples/python/debug/BUILD.bazel +++ b/examples/python/debug/BUILD.bazel @@ -19,10 +19,10 @@ py_binary( testonly = 1, srcs = ["debug_server.py"], deps = [ - "//src/python/grpcio/grpc:grpcio", - "//src/python/grpcio_channelz/grpc_channelz/v1:grpc_channelz", "//examples:helloworld_py_pb2", "//examples:helloworld_py_pb2_grpc", + "//src/python/grpcio/grpc:grpcio", + "//src/python/grpcio_channelz/grpc_channelz/v1:grpc_channelz", ], ) @@ -30,36 +30,36 @@ py_binary( name = "send_message", testonly = 1, srcs = ["send_message.py"], + python_version = "PY3", deps = [ - "//src/python/grpcio/grpc:grpcio", "//examples:helloworld_py_pb2", "//examples:helloworld_py_pb2_grpc", + "//src/python/grpcio/grpc:grpcio", ], - python_version = "PY3", ) py_binary( name = "get_stats", testonly = 1, srcs = ["get_stats.py"], + python_version = "PY3", deps = [ "//src/python/grpcio/grpc:grpcio", "//src/python/grpcio_channelz/grpc_channelz/v1:grpc_channelz", ], - python_version = "PY3", ) py_test( name = "_debug_example_test", srcs = ["test/_debug_example_test.py"], + python_version = "PY3", deps = [ - "//src/python/grpcio/grpc:grpcio", - "//src/python/grpcio_channelz/grpc_channelz/v1:grpc_channelz", - "//examples:helloworld_py_pb2", - "//examples:helloworld_py_pb2_grpc", ":debug_server", - ":send_message", ":get_stats", + ":send_message", + "//examples:helloworld_py_pb2", + "//examples:helloworld_py_pb2_grpc", + "//src/python/grpcio/grpc:grpcio", + "//src/python/grpcio_channelz/grpc_channelz/v1:grpc_channelz", ], - python_version = "PY3", ) diff --git a/examples/python/errors/BUILD.bazel b/examples/python/errors/BUILD.bazel index 367bd81925f..a6aacd75a8f 100644 --- a/examples/python/errors/BUILD.bazel +++ b/examples/python/errors/BUILD.bazel @@ -19,11 +19,11 @@ py_library( testonly = 1, srcs = ["client.py"], deps = [ - "//src/python/grpcio/grpc:grpcio", - "//src/python/grpcio_status/grpc_status:grpc_status", "//examples:helloworld_py_pb2", "//examples:helloworld_py_pb2_grpc", - requirement('googleapis-common-protos'), + "//src/python/grpcio/grpc:grpcio", + "//src/python/grpcio_status/grpc_status", + requirement("googleapis-common-protos"), ], ) @@ -44,16 +44,16 @@ py_library( py_test( name = "test/_error_handling_example_test", - srcs = ["test/_error_handling_example_test.py"], - deps = [ - ":client", - ":server", - "//src/python/grpcio_tests/tests:bazel_namespace_package_hack", - ], size = "small", + srcs = ["test/_error_handling_example_test.py"], imports = [ "../../../src/python/grpcio_status", "../../../src/python/grpcio_tests", ], python_version = "PY3", + deps = [ + ":client", + ":server", + "//src/python/grpcio_tests/tests:bazel_namespace_package_hack", + ], ) diff --git a/examples/python/multiprocessing/BUILD b/examples/python/multiprocessing/BUILD index 2503970bc80..f51e235caaa 100644 --- a/examples/python/multiprocessing/BUILD +++ b/examples/python/multiprocessing/BUILD @@ -14,11 +14,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:python_rules.bzl", "py_proto_library", "py_grpc_library") +load("//bazel:python_rules.bzl", "py_grpc_library", "py_proto_library") proto_library( name = "prime_proto", - srcs = ["prime.proto"] + srcs = ["prime.proto"], ) py_proto_library( @@ -36,19 +36,21 @@ py_binary( name = "client", testonly = 1, srcs = ["client.py"], + python_version = "PY3", + srcs_version = "PY3", deps = [ - "//src/python/grpcio/grpc:grpcio", ":prime_proto_pb2", ":prime_proto_pb2_grpc", + "//src/python/grpcio/grpc:grpcio", ], - srcs_version = "PY3", - python_version = "PY3", ) py_binary( name = "server", testonly = 1, srcs = ["server.py"], + python_version = "PY3", + srcs_version = "PY3", deps = [ "//src/python/grpcio/grpc:grpcio", ":prime_proto_pb2", @@ -57,17 +59,15 @@ py_binary( "//conditions:default": ["@futures//:futures"], "//:python3": [], }), - srcs_version = "PY3", - python_version = "PY3", ) py_test( name = "test/_multiprocessing_example_test", + size = "small", srcs = ["test/_multiprocessing_example_test.py"], data = [ ":client", - ":server" + ":server", ], - size = "small", python_version = "PY3", ) diff --git a/examples/python/wait_for_ready/BUILD.bazel b/examples/python/wait_for_ready/BUILD.bazel index 9cbddd1a6e3..0892b36790e 100644 --- a/examples/python/wait_for_ready/BUILD.bazel +++ b/examples/python/wait_for_ready/BUILD.bazel @@ -19,16 +19,16 @@ py_library( testonly = 1, srcs = ["wait_for_ready_example.py"], deps = [ - "//src/python/grpcio/grpc:grpcio", "//examples:helloworld_py_pb2", "//examples:helloworld_py_pb2_grpc", + "//src/python/grpcio/grpc:grpcio", ], ) py_test( name = "test/_wait_for_ready_example_test", - srcs = ["test/_wait_for_ready_example_test.py"], - deps = [":wait_for_ready_example",], size = "small", + srcs = ["test/_wait_for_ready_example_test.py"], python_version = "PY3", + deps = [":wait_for_ready_example"], ) diff --git a/grpc.bzl b/grpc.bzl index 34099ad9097..06de3bca99e 100644 --- a/grpc.bzl +++ b/grpc.bzl @@ -21,93 +21,93 @@ This file declares two macros: """ def _lower_underscore_to_upper_camel(str): - humps = [] - for hump in str.split('_'): - humps += [hump[0].upper() + hump[1:]] - return "".join(humps) + humps = [] + for hump in str.split("_"): + humps += [hump[0].upper() + hump[1:]] + return "".join(humps) def _file_to_upper_camel(src): - elements = src.rpartition('/') - upper_camel = _lower_underscore_to_upper_camel(elements[-1]) - return "".join(elements[:-1] + [upper_camel]) + elements = src.rpartition("/") + upper_camel = _lower_underscore_to_upper_camel(elements[-1]) + return "".join(elements[:-1] + [upper_camel]) def _file_with_extension(src, ext): - elements = src.rpartition('/') - basename = elements[-1].partition('.')[0] - return "".join(elements[:-1] + [basename, ext]) + elements = src.rpartition("/") + basename = elements[-1].partition(".")[0] + return "".join(elements[:-1] + [basename, ext]) def _protoc_invocation(srcs, flags): - """Returns a command line to invoke protoc from a genrule, on the given - sources, using the given flags. - """ - protoc_command = "$(location //external:protoc) -I . " - srcs_params = "" - for src in srcs: - srcs_params += " $(location %s)" % (src) - return protoc_command + flags + srcs_params + """Returns a command line to invoke protoc from a genrule, on the given + sources, using the given flags. + """ + protoc_command = "$(location //external:protoc) -I . " + srcs_params = "" + for src in srcs: + srcs_params += " $(location %s)" % (src) + return protoc_command + flags + srcs_params -def objc_proto_library(name, srcs, visibility=None): - """Declares an objc_library for the code generated by protoc from the given - proto sources. This generated code doesn't include proto services. - """ - h_files = [] - m_files = [] - for src in srcs: - src = _file_to_upper_camel(src) - h_files += [_file_with_extension(src, ".pbobjc.h")] - m_files += [_file_with_extension(src, ".pbobjc.m")] +def objc_proto_library(name, srcs, visibility = None): + """Declares an objc_library for the code generated by protoc from the given + proto sources. This generated code doesn't include proto services. + """ + h_files = [] + m_files = [] + for src in srcs: + src = _file_to_upper_camel(src) + h_files += [_file_with_extension(src, ".pbobjc.h")] + m_files += [_file_with_extension(src, ".pbobjc.m")] - protoc_flags = "--objc_out=$(GENDIR)" + protoc_flags = "--objc_out=$(GENDIR)" - native.genrule( - name = name + "_codegen", - srcs = srcs + ["//external:protoc"], - outs = h_files + m_files, - cmd = _protoc_invocation(srcs, protoc_flags), - ) - native.objc_library( - name = name, - hdrs = h_files, - includes = ["."], - non_arc_srcs = m_files, - deps = ["//external:protobuf_objc"], - visibility = visibility, - ) + native.genrule( + name = name + "_codegen", + srcs = srcs + ["//external:protoc"], + outs = h_files + m_files, + cmd = _protoc_invocation(srcs, protoc_flags), + ) + native.objc_library( + name = name, + hdrs = h_files, + includes = ["."], + non_arc_srcs = m_files, + deps = ["//external:protobuf_objc"], + visibility = visibility, + ) -def objc_grpc_library(name, services, other_messages, visibility=None): - """Declares an objc_library for the code generated by gRPC and protoc from the - given proto sources (services and other_messages). The generated code doesn't - include proto services of the files passed as other_messages. - """ - objc_proto_library(name + "_messages", services + other_messages) +def objc_grpc_library(name, services, other_messages, visibility = None): + """Declares an objc_library for the code generated by gRPC and protoc from the + given proto sources (services and other_messages). The generated code doesn't + include proto services of the files passed as other_messages. + """ + objc_proto_library(name + "_messages", services + other_messages) - h_files = [] - m_files = [] - for src in services: - src = _file_to_upper_camel(src) - h_files += [_file_with_extension(src, ".pbrpc.h")] - m_files += [_file_with_extension(src, ".pbrpc.m")] + h_files = [] + m_files = [] + for src in services: + src = _file_to_upper_camel(src) + h_files += [_file_with_extension(src, ".pbrpc.h")] + m_files += [_file_with_extension(src, ".pbrpc.m")] - protoc_flags = ("--grpc_out=$(GENDIR) --plugin=" + - "protoc-gen-grpc=$(location //external:grpc_protoc_plugin_objc)") + protoc_flags = ("--grpc_out=$(GENDIR) --plugin=" + + "protoc-gen-grpc=$(location //external:grpc_protoc_plugin_objc)") - native.genrule( - name = name + "_codegen", - srcs = services + [ - "//external:grpc_protoc_plugin_objc", - "//external:protoc", - ], - outs = h_files + m_files, - cmd = _protoc_invocation(services, protoc_flags), - ) - native.objc_library( - name = name, - hdrs = h_files, - includes = ["."], - srcs = m_files, - deps = [ - ":" + name + "_messages", - "//external:proto_objc_rpc", - ], - visibility = visibility, - ) + native.genrule( + name = name + "_codegen", + srcs = services + [ + "//external:grpc_protoc_plugin_objc", + "//external:protoc", + ], + outs = h_files + m_files, + cmd = _protoc_invocation(services, protoc_flags), + ) + native.objc_library( + name = name, + hdrs = h_files, + includes = ["."], + srcs = m_files, + deps = [ + ":" + name + "_messages", + "//external:proto_objc_rpc", + ], + visibility = visibility, + ) diff --git a/src/compiler/BUILD b/src/compiler/BUILD index 9a38f942939..e1b7fbebbca 100644 --- a/src/compiler/BUILD +++ b/src/compiler/BUILD @@ -44,8 +44,8 @@ grpc_cc_library( "ruby_generator.cc", ], hdrs = [ - "config_protobuf.h", "config.h", + "config_protobuf.h", "cpp_generator.h", "cpp_generator_helpers.h", "cpp_plugin.h", diff --git a/src/core/tsi/test_creds/BUILD b/src/core/tsi/test_creds/BUILD index b83c87de723..94bb5d4bdef 100644 --- a/src/core/tsi/test_creds/BUILD +++ b/src/core/tsi/test_creds/BUILD @@ -15,17 +15,17 @@ licenses(["notice"]) # Apache v2 exports_files([ - "ca.pem", - "server1.key", - "server1.pem", - "server0.key", - "server0.pem", - "client.key", - "client.pem", - "badserver.key", - "badserver.pem", - "badclient.key", - "badclient.pem", - "multi-domain.key", - "multi-domain.pem", + "ca.pem", + "server1.key", + "server1.pem", + "server0.key", + "server0.pem", + "client.key", + "client.pem", + "badserver.key", + "badserver.pem", + "badclient.key", + "badclient.pem", + "multi-domain.key", + "multi-domain.pem", ]) diff --git a/src/objective-c/BUILD b/src/objective-c/BUILD index be1cd09d0fa..fed3fb3f63b 100644 --- a/src/objective-c/BUILD +++ b/src/objective-c/BUILD @@ -18,7 +18,7 @@ licenses(["notice"]) # Apache v2 package(default_visibility = ["//visibility:public"]) -load("//bazel:grpc_build_system.bzl", "grpc_objc_library", "grpc_generate_objc_one_off_targets") +load("//bazel:grpc_build_system.bzl", "grpc_generate_objc_one_off_targets", "grpc_objc_library") exports_files(["LICENSE"]) @@ -73,24 +73,24 @@ grpc_objc_library( grpc_objc_library( name = "grpc_objc_interface", + srcs = [ + "GRPCClient/GRPCCall.m", + "GRPCClient/GRPCCall+Interceptor.m", + "GRPCClient/GRPCCallOptions.m", + "GRPCClient/GRPCInterceptor.m", + "GRPCClient/GRPCTransport.m", + "GRPCClient/private/GRPCTransport+Private.m", + ], hdrs = [ "GRPCClient/GRPCCall.h", "GRPCClient/GRPCCall+Interceptor.h", "GRPCClient/GRPCCallOptions.h", + "GRPCClient/GRPCDispatchable.h", "GRPCClient/GRPCInterceptor.h", "GRPCClient/GRPCTransport.h", - "GRPCClient/GRPCDispatchable.h", "GRPCClient/internal/GRPCCallOptions+Internal.h", "GRPCClient/version.h", ], - srcs = [ - "GRPCClient/GRPCCall.m", - "GRPCClient/GRPCCall+Interceptor.m", - "GRPCClient/GRPCCallOptions.m", - "GRPCClient/GRPCInterceptor.m", - "GRPCClient/GRPCTransport.m", - "GRPCClient/private/GRPCTransport+Private.m", - ], includes = ["."], textual_hdrs = [ "GRPCClient/private/GRPCTransport+Private.h", @@ -102,14 +102,6 @@ grpc_objc_library( grpc_objc_library( name = "grpc_objc_client", - hdrs = [ - "GRPCClient/GRPCCall+ChannelCredentials.h", - "GRPCClient/GRPCCall+Cronet.h", - "GRPCClient/GRPCCall+OAuth2.h", - "GRPCClient/GRPCCall+Tests.h", - "GRPCClient/GRPCCall+ChannelArg.h", - ], - textual_hdrs = glob(["GRPCClient/private/GRPCCore/*.h"]), srcs = [ "GRPCClient/GRPCCall+ChannelArg.m", "GRPCClient/GRPCCall+ChannelCredentials.m", @@ -118,8 +110,16 @@ grpc_objc_library( "GRPCClient/GRPCCall+Tests.m", "GRPCClient/GRPCCallLegacy.m", ] + glob(["GRPCClient/private/GRPCCore/*.m"]), + hdrs = [ + "GRPCClient/GRPCCall+ChannelArg.h", + "GRPCClient/GRPCCall+ChannelCredentials.h", + "GRPCClient/GRPCCall+Cronet.h", + "GRPCClient/GRPCCall+OAuth2.h", + "GRPCClient/GRPCCall+Tests.h", + ], data = [":gRPCCertificates"], includes = ["."], + textual_hdrs = glob(["GRPCClient/private/GRPCCore/*.h"]), deps = [ ":grpc_objc_interface", ":grpc_objc_interface_legacy", @@ -155,8 +155,8 @@ grpc_objc_library( "ProtoRPC/ProtoRPC.h", "ProtoRPC/ProtoService.h", ], - includes = ["."], defines = ["GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=0"], + includes = ["."], deps = [ ":grpc_objc_interface", ":proto_objc_rpc_legacy_header", @@ -177,10 +177,10 @@ grpc_objc_library( "ProtoRPC/ProtoService.h", ], deps = [ - ":rx_library", - ":proto_objc_rpc_v2", - ":proto_objc_rpc_legacy_header", ":grpc_objc_client_core", + ":proto_objc_rpc_legacy_header", + ":proto_objc_rpc_v2", + ":rx_library", "@com_google_protobuf//:protobuf_objc", ], ) @@ -196,15 +196,6 @@ apple_resource_bundle( # Internal target combining grpc_objc_client_core and proto_objc_rpc for testing grpc_objc_library( name = "grpc_objc_client_core_internal_testing", - hdrs = [ - "GRPCClient/GRPCCall+ChannelCredentials.h", - "GRPCClient/GRPCCall+Cronet.h", - "GRPCClient/GRPCCall+OAuth2.h", - "GRPCClient/GRPCCall+Tests.h", - "GRPCClient/GRPCCall+ChannelArg.h", - "GRPCClient/internal_testing/GRPCCall+InternalTests.h", - ], - textual_hdrs = glob(["GRPCClient/private/GRPCCore/*.h"]), srcs = [ "GRPCClient/GRPCCall+ChannelArg.m", "GRPCClient/GRPCCall+ChannelCredentials.m", @@ -214,11 +205,20 @@ grpc_objc_library( "GRPCClient/GRPCCallLegacy.m", "GRPCClient/internal_testing/GRPCCall+InternalTests.m", ] + glob(["GRPCClient/private/GRPCCore/*.m"]), + hdrs = [ + "GRPCClient/GRPCCall+ChannelArg.h", + "GRPCClient/GRPCCall+ChannelCredentials.h", + "GRPCClient/GRPCCall+Cronet.h", + "GRPCClient/GRPCCall+OAuth2.h", + "GRPCClient/GRPCCall+Tests.h", + "GRPCClient/internal_testing/GRPCCall+InternalTests.h", + ], data = [":gRPCCertificates"], - includes = ["."], defines = [ "GRPC_TEST_OBJC=1", ], + includes = ["."], + textual_hdrs = glob(["GRPCClient/private/GRPCCore/*.h"]), deps = [ ":grpc_objc_interface", ":grpc_objc_interface_legacy", @@ -240,10 +240,10 @@ grpc_objc_library( "ProtoRPC/ProtoService.h", ], deps = [ - ":rx_library", - ":proto_objc_rpc_v2", - ":proto_objc_rpc_legacy_header", ":grpc_objc_client_core_internal_testing", + ":proto_objc_rpc_legacy_header", + ":proto_objc_rpc_v2", + ":rx_library", "@com_google_protobuf//:protobuf_objc", ], ) diff --git a/src/objective-c/examples/BUILD b/src/objective-c/examples/BUILD index 4d838b17ba0..9f5003ed2d5 100644 --- a/src/objective-c/examples/BUILD +++ b/src/objective-c/examples/BUILD @@ -19,7 +19,7 @@ licenses(["notice"]) # 3-clause BSD package(default_visibility = ["//visibility:public"]) load( - "//src/objective-c:grpc_objc_internal_library.bzl", + "//src/objective-c:grpc_objc_internal_library.bzl", "grpc_objc_examples_library", "local_objc_grpc_library", "proto_library_objc_wrapper", @@ -36,8 +36,8 @@ proto_library_objc_wrapper( proto_library_objc_wrapper( name = "test_proto", srcs = ["RemoteTestClient/test.proto"], - deps = [":messages_proto"], use_well_known_protos = True, + deps = [":messages_proto"], ) # use objc_grpc_library in bazel:objc_grpc_library.bzl when developing outside the repo @@ -72,14 +72,14 @@ grpc_objc_examples_library( ios_application( name = "Sample", bundle_id = "io.grpc.Sample", - minimum_os_version = "8.0", - infoplists = ["Sample/Sample/Info.plist"], families = [ "iphone", "ipad", ], - deps = ["Sample-lib"], + infoplists = ["Sample/Sample/Info.plist"], + minimum_os_version = "8.0", visibility = ["//visibility:public"], + deps = ["Sample-lib"], ) grpc_objc_examples_library( @@ -95,12 +95,12 @@ grpc_objc_examples_library( ios_application( name = "InterceptorSample", bundle_id = "io.grpc.InterceptorSample", - minimum_os_version = "9.0", # Safe Area Layout Guide used - infoplists = ["InterceptorSample/InterceptorSample/Info.plist"], families = [ "iphone", "ipad", ], + infoplists = ["InterceptorSample/InterceptorSample/Info.plist"], + minimum_os_version = "9.0", # Safe Area Layout Guide used deps = ["InterceptorSample-lib"], ) @@ -118,8 +118,8 @@ grpc_objc_examples_library( tvos_application( name = "tvOS-sample", bundle_id = "io.grpc.tvOS-sample", - minimum_os_version = "10.0", infoplists = ["tvOS-sample/tvOS-sample/Info.plist"], + minimum_os_version = "10.0", deps = [":tvOS-sample-lib"], ) @@ -146,27 +146,27 @@ grpc_objc_examples_library( ios_application( name = "watchOS-sample", bundle_id = "io.grpc.watchOS-sample", - minimum_os_version = "9.0", # Safe Area Layout Guide used families = ["iphone"], infoplists = ["watchOS-sample/watchOS-sample/Info.plist"], - deps = [":watchOS-sample-iOS-lib"], + minimum_os_version = "9.0", # Safe Area Layout Guide used watch_application = "watchOS-sample-watchApp", + deps = [":watchOS-sample-iOS-lib"], ) # c-ares does not support watchOS CPU architecture with Bazel yet watchos_application( name = "watchOS-sample-watchApp", bundle_id = "io.grpc.watchOS-sample.watchkitapp", + extension = ":watchOS-sample-extension", + infoplists = ["watchOS-sample/WatchKit-App/Info.plist"], minimum_os_version = "4.0", storyboards = ["watchOS-sample/WatchKit-App/Base.lproj/Interface.storyboard"], - infoplists = ["watchOS-sample/WatchKit-App/Info.plist"], - extension = ":watchOS-sample-extension", ) watchos_extension( name = "watchOS-sample-extension", bundle_id = "io.grpc.watchOS-sample.watchkitapp.watchkitextension", - minimum_os_version = "4.0", infoplists = ["watchOS-sample/WatchKit-Extension/Info.plist"], + minimum_os_version = "4.0", deps = [":watchOS-sample-extension-lib"], ) diff --git a/src/objective-c/grpc_objc_internal_library.bzl b/src/objective-c/grpc_objc_internal_library.bzl index c90293d827d..5e355e0cb26 100644 --- a/src/objective-c/grpc_objc_internal_library.bzl +++ b/src/objective-c/grpc_objc_internal_library.bzl @@ -27,15 +27,15 @@ load( "//bazel:generate_objc.bzl", "generate_objc", "generate_objc_hdrs", + "generate_objc_non_arc_srcs", "generate_objc_srcs", - "generate_objc_non_arc_srcs" ) def proto_library_objc_wrapper( - name, - srcs, - deps = [], - use_well_known_protos = False): + name, + srcs, + deps = [], + use_well_known_protos = False): """proto_library for adding dependencies to google/protobuf protos use_well_known_protos - ignored in open source version """ diff --git a/src/objective-c/tests/BUILD b/src/objective-c/tests/BUILD index 65a32d742a9..888aab6714b 100644 --- a/src/objective-c/tests/BUILD +++ b/src/objective-c/tests/BUILD @@ -39,15 +39,15 @@ proto_library_objc_wrapper( proto_library_objc_wrapper( name = "test_proto", srcs = ["RemoteTestClient/test.proto"], - deps = [":messages_proto"], use_well_known_protos = True, + deps = [":messages_proto"], ) local_objc_grpc_library( name = "RemoteTest", srcs = ["RemoteTestClient/test.proto"], - use_well_known_protos = True, testing = True, + use_well_known_protos = True, deps = [":test_proto"], ) @@ -78,12 +78,12 @@ objc_library( ios_application( name = "ios-host", bundle_id = "grpc.objc.tests.ios-host", - infoplists = ["Hosts/ios-host/Info.plist"], - minimum_os_version = "9.0", families = [ "iphone", "ipad", ], + infoplists = ["Hosts/ios-host/Info.plist"], + minimum_os_version = "9.0", deps = ["host-lib"], ) @@ -97,8 +97,8 @@ tvos_application( grpc_objc_testing_library( name = "InteropTests-lib", - hdrs = ["InteropTests/InteropTests.h"], srcs = ["InteropTests/InteropTests.m"], + hdrs = ["InteropTests/InteropTests.h"], deps = [ ":InteropTestsBlockCallbacks-lib", ], @@ -112,8 +112,8 @@ grpc_objc_testing_library( grpc_objc_testing_library( name = "InteropTestsBlockCallbacks-lib", - hdrs = ["InteropTests/InteropTestsBlockCallbacks.h"], srcs = ["InteropTests/InteropTestsBlockCallbacks.m"], + hdrs = ["InteropTests/InteropTestsBlockCallbacks.h"], ) grpc_objc_testing_library( @@ -175,26 +175,26 @@ grpc_objc_testing_library( ios_unit_test( name = "UnitTests", minimum_os_version = "8.0", + test_host = ":ios-host", deps = [ - ":RxLibraryUnitTests-lib", - ":GRPCClientTests-lib", ":APIv2Tests-lib", ":ChannelPoolTest-lib", ":ChannelTests-lib", + ":GRPCClientTests-lib", ":NSErrorUnitTests-lib", + ":RxLibraryUnitTests-lib", ], - test_host = ":ios-host", ) ios_unit_test( name = "InteropTests", minimum_os_version = "8.0", + test_host = ":ios-host", deps = [ - ":InteropTestsRemote-lib", - ":InteropTestsLocalSSL-lib", ":InteropTestsLocalCleartext-lib", + ":InteropTestsLocalSSL-lib", + ":InteropTestsRemote-lib", ], - test_host = ":ios-host", ) macos_unit_test( @@ -202,26 +202,26 @@ macos_unit_test( minimum_os_version = "10.9", deps = [ ":APIv2Tests-lib", - ":RxLibraryUnitTests-lib", - ":NSErrorUnitTests-lib", - ":InteropTestsRemote-lib", - ":InteropTestsLocalSSL-lib", ":InteropTestsLocalCleartext-lib", + ":InteropTestsLocalSSL-lib", + ":InteropTestsRemote-lib", ":MacStressTests-lib", - ] + ":NSErrorUnitTests-lib", + ":RxLibraryUnitTests-lib", + ], ) # bazel run tvos_unit_test is not yet supported by xctestrunner tvos_unit_test( name = "TvTests", minimum_os_version = "10.0", + test_host = ":tvos-host", deps = [ ":APIv2Tests-lib", - ":RxLibraryUnitTests-lib", - ":NSErrorUnitTests-lib", - ":InteropTestsRemote-lib", - ":InteropTestsLocalSSL-lib", ":InteropTestsLocalCleartext-lib", + ":InteropTestsLocalSSL-lib", + ":InteropTestsRemote-lib", + ":NSErrorUnitTests-lib", + ":RxLibraryUnitTests-lib", ], - test_host = ":tvos-host", ) diff --git a/src/proto/grpc/channelz/BUILD b/src/proto/grpc/channelz/BUILD index cfc8531de1b..d105ddb261d 100644 --- a/src/proto/grpc/channelz/BUILD +++ b/src/proto/grpc/channelz/BUILD @@ -14,9 +14,12 @@ licenses(["notice"]) # Apache v2 -load("//bazel:grpc_build_system.bzl", "grpc_proto_library", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_package", "grpc_proto_library") -grpc_package(name = "channelz", visibility = "public") +grpc_package( + name = "channelz", + visibility = "public", +) grpc_proto_library( name = "channelz_proto", diff --git a/src/proto/grpc/core/BUILD b/src/proto/grpc/core/BUILD index 46de9fae187..051ff2fb073 100644 --- a/src/proto/grpc/core/BUILD +++ b/src/proto/grpc/core/BUILD @@ -14,9 +14,12 @@ licenses(["notice"]) # Apache v2 -load("//bazel:grpc_build_system.bzl", "grpc_proto_library", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_package", "grpc_proto_library") -grpc_package(name = "core", visibility = "public") +grpc_package( + name = "core", + visibility = "public", +) grpc_proto_library( name = "stats_proto", diff --git a/src/proto/grpc/health/v1/BUILD b/src/proto/grpc/health/v1/BUILD index fc58e8a1770..8acc1328aba 100644 --- a/src/proto/grpc/health/v1/BUILD +++ b/src/proto/grpc/health/v1/BUILD @@ -14,9 +14,12 @@ licenses(["notice"]) # Apache v2 -load("//bazel:grpc_build_system.bzl", "grpc_proto_library", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_package", "grpc_proto_library") -grpc_package(name = "health", visibility = "public") +grpc_package( + name = "health", + visibility = "public", +) grpc_proto_library( name = "health_proto", diff --git a/src/proto/grpc/reflection/v1alpha/BUILD b/src/proto/grpc/reflection/v1alpha/BUILD index 5424c0d867e..96f2a8ec598 100644 --- a/src/proto/grpc/reflection/v1alpha/BUILD +++ b/src/proto/grpc/reflection/v1alpha/BUILD @@ -14,9 +14,12 @@ licenses(["notice"]) # Apache v2 -load("//bazel:grpc_build_system.bzl", "grpc_proto_library", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_package", "grpc_proto_library") -grpc_package(name = "reflection", visibility = "public") +grpc_package( + name = "reflection", + visibility = "public", +) grpc_proto_library( name = "reflection_proto", @@ -34,4 +37,3 @@ filegroup( "reflection.proto", ], ) - diff --git a/src/proto/grpc/status/BUILD b/src/proto/grpc/status/BUILD index 14315d36e36..ed8c29caaf7 100644 --- a/src/proto/grpc/status/BUILD +++ b/src/proto/grpc/status/BUILD @@ -14,9 +14,12 @@ licenses(["notice"]) # Apache v2 -load("//bazel:grpc_build_system.bzl", "grpc_proto_library", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_package", "grpc_proto_library") -grpc_package(name = "status", visibility = "public") +grpc_package( + name = "status", + visibility = "public", +) grpc_proto_library( name = "status_proto", diff --git a/src/proto/grpc/testing/BUILD b/src/proto/grpc/testing/BUILD index 308d4b6ed99..7aad46a6976 100644 --- a/src/proto/grpc/testing/BUILD +++ b/src/proto/grpc/testing/BUILD @@ -14,9 +14,9 @@ licenses(["notice"]) # Apache v2 -load("//bazel:grpc_build_system.bzl", "grpc_proto_library", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_package", "grpc_proto_library") load("@grpc_python_dependencies//:requirements.bzl", "requirement") -load("//bazel:python_rules.bzl", "py_proto_library", "py_grpc_library") +load("//bazel:python_rules.bzl", "py_grpc_library", "py_proto_library") grpc_package( name = "testing", @@ -231,4 +231,3 @@ py_grpc_library( srcs = [":test_proto_descriptor"], deps = [":py_test_proto"], ) - diff --git a/src/proto/grpc/testing/duplicate/BUILD b/src/proto/grpc/testing/duplicate/BUILD index 714c9a75185..d7902c1c36b 100644 --- a/src/proto/grpc/testing/duplicate/BUILD +++ b/src/proto/grpc/testing/duplicate/BUILD @@ -14,9 +14,12 @@ licenses(["notice"]) # Apache v2 -load("//bazel:grpc_build_system.bzl", "grpc_proto_library", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_package", "grpc_proto_library") -grpc_package(name = "duplicate", visibility = "public") +grpc_package( + name = "duplicate", + visibility = "public", +) grpc_proto_library( name = "echo_duplicate_proto", diff --git a/src/proto/grpc/testing/proto2/BUILD.bazel b/src/proto/grpc/testing/proto2/BUILD.bazel index 8acb233302a..05a4b55f5a6 100644 --- a/src/proto/grpc/testing/proto2/BUILD.bazel +++ b/src/proto/grpc/testing/proto2/BUILD.bazel @@ -1,6 +1,7 @@ load("@grpc_python_dependencies//:requirements.bzl", "requirement") package(default_visibility = ["//visibility:public"]) + load("//bazel:python_rules.bzl", "py_proto_library") proto_library( @@ -18,11 +19,10 @@ proto_library( srcs = ["empty2_extensions.proto"], deps = [ ":empty2_proto_descriptor", - ] + ], ) py_proto_library( name = "empty2_extensions_proto", deps = [":empty2_extensions_proto_descriptor"], ) - diff --git a/src/python/grpcio/grpc/BUILD.bazel b/src/python/grpcio/grpc/BUILD.bazel index 1b5a018249a..786455ad3ec 100644 --- a/src/python/grpcio/grpc/BUILD.bazel +++ b/src/python/grpcio/grpc/BUILD.bazel @@ -3,6 +3,10 @@ package(default_visibility = ["//visibility:public"]) py_library( name = "grpcio", srcs = ["__init__.py"], + data = [ + "//:grpc", + ], + imports = ["../"], deps = [ ":utilities", ":auth", @@ -16,13 +20,9 @@ py_library( "//src/python/grpcio/grpc/framework", "@six_archive//:six", ] + select({ - "//conditions:default": ["@enum34//:enum34",], + "//conditions:default": ["@enum34//:enum34"], "//:python3": [], }), - data = [ - "//:grpc", - ], - imports = ["../",], ) py_library( @@ -40,8 +40,8 @@ py_library( srcs = ["_channel.py"], deps = [ ":common", - ":grpcio_metadata", ":compression", + ":grpcio_metadata", ], ) @@ -65,7 +65,7 @@ py_library( srcs = ["_plugin_wrapping.py"], deps = [ ":common", - ] + ], ) py_library( @@ -85,4 +85,3 @@ py_library( ":common", ], ) - diff --git a/src/python/grpcio/grpc/_cython/BUILD.bazel b/src/python/grpcio/grpc/_cython/BUILD.bazel index 7212ceec4be..0ed004bb690 100644 --- a/src/python/grpcio/grpc/_cython/BUILD.bazel +++ b/src/python/grpcio/grpc/_cython/BUILD.bazel @@ -10,8 +10,6 @@ pyx_library( "_cygrpc/_hooks.pyx.pxi", "_cygrpc/aio/call.pxd.pxi", "_cygrpc/aio/call.pyx.pxi", - "_cygrpc/aio/rpc_error.pxd.pxi", - "_cygrpc/aio/rpc_error.pyx.pxi", "_cygrpc/aio/callbackcontext.pxd.pxi", "_cygrpc/aio/cancel_status.pxd.pxi", "_cygrpc/aio/cancel_status.pyx.pxi", @@ -26,6 +24,8 @@ pyx_library( "_cygrpc/aio/iomgr/socket.pyx.pxi", "_cygrpc/aio/iomgr/timer.pxd.pxi", "_cygrpc/aio/iomgr/timer.pyx.pxi", + "_cygrpc/aio/rpc_error.pxd.pxi", + "_cygrpc/aio/rpc_error.pyx.pxi", "_cygrpc/aio/server.pxd.pxi", "_cygrpc/aio/server.pyx.pxi", "_cygrpc/arguments.pxd.pxi", diff --git a/src/python/grpcio/grpc/experimental/BUILD.bazel b/src/python/grpcio/grpc/experimental/BUILD.bazel index 5654d08a45b..36340079e56 100644 --- a/src/python/grpcio/grpc/experimental/BUILD.bazel +++ b/src/python/grpcio/grpc/experimental/BUILD.bazel @@ -15,7 +15,7 @@ py_library( py_library( name = "experimental", - srcs = ["__init__.py",], + srcs = ["__init__.py"], deps = [ ":aio", ":gevent", diff --git a/src/python/grpcio/grpc/framework/BUILD.bazel b/src/python/grpcio/grpc/framework/BUILD.bazel index 55b4f4d2dfe..c7880baeb0a 100644 --- a/src/python/grpcio/grpc/framework/BUILD.bazel +++ b/src/python/grpcio/grpc/framework/BUILD.bazel @@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"]) py_library( name = "framework", - srcs = ["__init__.py",], + srcs = ["__init__.py"], deps = [ "//src/python/grpcio/grpc/framework/common", "//src/python/grpcio/grpc/framework/foundation", diff --git a/src/python/grpcio/grpc/framework/common/BUILD.bazel b/src/python/grpcio/grpc/framework/common/BUILD.bazel index c0d1486d537..1b9d3a257e1 100644 --- a/src/python/grpcio/grpc/framework/common/BUILD.bazel +++ b/src/python/grpcio/grpc/framework/common/BUILD.bazel @@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"]) py_library( name = "common", - srcs = ["__init__.py",], + srcs = ["__init__.py"], deps = [ ":cardinality", ":style", @@ -13,7 +13,7 @@ py_library( name = "cardinality", srcs = ["cardinality.py"], deps = select({ - "//conditions:default": ["@enum34//:enum34",], + "//conditions:default": ["@enum34//:enum34"], "//:python3": [], }), ) @@ -22,7 +22,7 @@ py_library( name = "style", srcs = ["style.py"], deps = select({ - "//conditions:default": ["@enum34//:enum34",], + "//conditions:default": ["@enum34//:enum34"], "//:python3": [], }), ) diff --git a/src/python/grpcio/grpc/framework/foundation/BUILD.bazel b/src/python/grpcio/grpc/framework/foundation/BUILD.bazel index b539fa46da7..e5cf13ae4ce 100644 --- a/src/python/grpcio/grpc/framework/foundation/BUILD.bazel +++ b/src/python/grpcio/grpc/framework/foundation/BUILD.bazel @@ -2,14 +2,14 @@ package(default_visibility = ["//visibility:public"]) py_library( name = "foundation", - srcs = ["__init__.py",], + srcs = ["__init__.py"], deps = [ ":abandonment", ":callable_util", ":future", ":logging_pool", - ":stream_util", ":stream", + ":stream_util", ], ) @@ -24,7 +24,7 @@ py_library( deps = [ "//external:six", ] + select({ - "//conditions:default": ["@enum34//:enum34",], + "//conditions:default": ["@enum34//:enum34"], "//:python3": [], }), ) @@ -41,7 +41,7 @@ py_library( name = "logging_pool", srcs = ["logging_pool.py"], deps = select({ - "//conditions:default": ["@futures//:futures",], + "//conditions:default": ["@futures//:futures"], "//:python3": [], }), ) diff --git a/src/python/grpcio/grpc/framework/interfaces/BUILD.bazel b/src/python/grpcio/grpc/framework/interfaces/BUILD.bazel index b81e196cc3c..0cb21f59782 100644 --- a/src/python/grpcio/grpc/framework/interfaces/BUILD.bazel +++ b/src/python/grpcio/grpc/framework/interfaces/BUILD.bazel @@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"]) py_library( name = "interfaces", - srcs = ["__init__.py",], + srcs = ["__init__.py"], deps = [ "//src/python/grpcio/grpc/framework/interfaces/base", "//src/python/grpcio/grpc/framework/interfaces/face", diff --git a/src/python/grpcio/grpc/framework/interfaces/base/BUILD.bazel b/src/python/grpcio/grpc/framework/interfaces/base/BUILD.bazel index 5d0c06950a8..b3b4e8dfdd2 100644 --- a/src/python/grpcio/grpc/framework/interfaces/base/BUILD.bazel +++ b/src/python/grpcio/grpc/framework/interfaces/base/BUILD.bazel @@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"]) py_library( name = "base_lib", - srcs = ["__init__.py",], + srcs = ["__init__.py"], deps = [ ":base", ":utilities", @@ -16,7 +16,7 @@ py_library( "//src/python/grpcio/grpc/framework/foundation:abandonment", "//external:six", ] + select({ - "//conditions:default": ["@enum34//:enum34",], + "//conditions:default": ["@enum34//:enum34"], "//:python3": [], }), ) @@ -25,7 +25,7 @@ py_library( name = "utilities", srcs = ["utilities.py"], deps = select({ - "//conditions:default": ["@enum34//:enum34",], + "//conditions:default": ["@enum34//:enum34"], "//:python3": [], }), ) diff --git a/src/python/grpcio/grpc/framework/interfaces/face/BUILD.bazel b/src/python/grpcio/grpc/framework/interfaces/face/BUILD.bazel index 3af1404eade..0df15b02fcf 100644 --- a/src/python/grpcio/grpc/framework/interfaces/face/BUILD.bazel +++ b/src/python/grpcio/grpc/framework/interfaces/face/BUILD.bazel @@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"]) py_library( name = "face", - srcs = ["__init__.py",], + srcs = ["__init__.py"], deps = [ ":face_lib", ":utilities", @@ -17,7 +17,7 @@ py_library( "//src/python/grpcio/grpc/framework/common", "//external:six", ] + select({ - "//conditions:default": ["@enum34//:enum34",], + "//conditions:default": ["@enum34//:enum34"], "//:python3": [], }), ) @@ -26,8 +26,8 @@ py_library( name = "utilities", srcs = ["utilities.py"], deps = [ + ":face_lib", "//src/python/grpcio/grpc/framework/common", "//src/python/grpcio/grpc/framework/foundation:stream", - ":face_lib", ], ) diff --git a/src/python/grpcio_channelz/grpc_channelz/v1/BUILD.bazel b/src/python/grpcio_channelz/grpc_channelz/v1/BUILD.bazel index c034297ff2d..942d861b158 100644 --- a/src/python/grpcio_channelz/grpc_channelz/v1/BUILD.bazel +++ b/src/python/grpcio_channelz/grpc_channelz/v1/BUILD.bazel @@ -1,4 +1,5 @@ -load("//bazel:python_rules.bzl", "py_proto_library", "py_grpc_library") +load("//bazel:python_rules.bzl", "py_grpc_library", "py_proto_library") + package(default_visibility = ["//visibility:public"]) py_proto_library( @@ -9,17 +10,17 @@ py_proto_library( py_grpc_library( name = "channelz_py_pb2_grpc", srcs = ["//src/proto/grpc/channelz:channelz_proto_descriptors"], - deps = [":channelz_py_pb2"], strip_prefixes = ["src.python.grpcio_channelz."], + deps = [":channelz_py_pb2"], ) py_library( name = "grpc_channelz", - srcs = ["channelz.py",], + srcs = ["channelz.py"], + imports = ["../../"], deps = [ ":channelz_py_pb2", ":channelz_py_pb2_grpc", "//src/python/grpcio/grpc:grpcio", ], - imports=["../../",], ) diff --git a/src/python/grpcio_health_checking/grpc_health/v1/BUILD.bazel b/src/python/grpcio_health_checking/grpc_health/v1/BUILD.bazel index a3e2c7dfe3d..78a55a7f2db 100644 --- a/src/python/grpcio_health_checking/grpc_health/v1/BUILD.bazel +++ b/src/python/grpcio_health_checking/grpc_health/v1/BUILD.bazel @@ -1,26 +1,26 @@ -load("//bazel:python_rules.bzl", "py_proto_library", "py_grpc_library") +load("//bazel:python_rules.bzl", "py_grpc_library", "py_proto_library") + package(default_visibility = ["//visibility:public"]) py_proto_library( name = "health_py_pb2", - deps = ["//src/proto/grpc/health/v1:health_proto_descriptor",], + deps = ["//src/proto/grpc/health/v1:health_proto_descriptor"], ) py_grpc_library( name = "health_py_pb2_grpc", - srcs = ["//src/proto/grpc/health/v1:health_proto_descriptor",], - deps = [":health_py_pb2"], + srcs = ["//src/proto/grpc/health/v1:health_proto_descriptor"], strip_prefixes = ["src.python.grpcio_health_checking."], + deps = [":health_py_pb2"], ) py_library( name = "grpc_health", - srcs = ["health.py",], + srcs = ["health.py"], + imports = ["../../"], deps = [ ":health_py_pb2", ":health_py_pb2_grpc", "//src/python/grpcio/grpc:grpcio", ], - imports=["../../",], ) - diff --git a/src/python/grpcio_reflection/grpc_reflection/v1alpha/BUILD.bazel b/src/python/grpcio_reflection/grpc_reflection/v1alpha/BUILD.bazel index bad54d06c63..cf30c395c68 100644 --- a/src/python/grpcio_reflection/grpc_reflection/v1alpha/BUILD.bazel +++ b/src/python/grpcio_reflection/grpc_reflection/v1alpha/BUILD.bazel @@ -1,29 +1,28 @@ -load("//bazel:python_rules.bzl", "py_proto_library", "py_grpc_library") +load("//bazel:python_rules.bzl", "py_grpc_library", "py_proto_library") load("@grpc_python_dependencies//:requirements.bzl", "requirement") package(default_visibility = ["//visibility:public"]) py_proto_library( name = "reflection_py_pb2", - deps = ["//src/proto/grpc/reflection/v1alpha:reflection_proto_descriptor",], + deps = ["//src/proto/grpc/reflection/v1alpha:reflection_proto_descriptor"], ) py_grpc_library( name = "reflection_py_pb2_grpc", - srcs = ["//src/proto/grpc/reflection/v1alpha:reflection_proto_descriptor",], - deps = ["reflection_py_pb2"], + srcs = ["//src/proto/grpc/reflection/v1alpha:reflection_proto_descriptor"], strip_prefixes = ["src.python.grpcio_reflection."], + deps = ["reflection_py_pb2"], ) py_library( name = "grpc_reflection", - srcs = ["reflection.py",], + srcs = ["reflection.py"], + imports = ["../../"], deps = [ ":reflection_py_pb2", ":reflection_py_pb2_grpc", "//src/python/grpcio/grpc:grpcio", "@com_google_protobuf//:protobuf_python", ], - imports=["../../",], ) - diff --git a/src/python/grpcio_status/grpc_status/BUILD.bazel b/src/python/grpcio_status/grpc_status/BUILD.bazel index a7d47c9f34e..122a94f411a 100644 --- a/src/python/grpcio_status/grpc_status/BUILD.bazel +++ b/src/python/grpcio_status/grpc_status/BUILD.bazel @@ -4,11 +4,11 @@ package(default_visibility = ["//visibility:public"]) py_library( name = "grpc_status", - srcs = ["rpc_status.py",], + srcs = ["rpc_status.py"], + imports = ["../"], deps = [ "//src/python/grpcio/grpc:grpcio", "@com_google_protobuf//:protobuf_python", - requirement('googleapis-common-protos'), + requirement("googleapis-common-protos"), ], - imports=["../",], ) diff --git a/src/python/grpcio_tests/tests/BUILD.bazel b/src/python/grpcio_tests/tests/BUILD.bazel index b2b36ad10f3..c177c772b53 100644 --- a/src/python/grpcio_tests/tests/BUILD.bazel +++ b/src/python/grpcio_tests/tests/BUILD.bazel @@ -2,8 +2,8 @@ py_library( name = "bazel_namespace_package_hack", srcs = ["bazel_namespace_package_hack.py"], visibility = [ - "//src/python/grpcio_tests/tests/status:__subpackages__", - "//src/python/grpcio_tests/tests/interop:__subpackages__", "//examples/python/errors:__subpackages__", + "//src/python/grpcio_tests/tests/interop:__subpackages__", + "//src/python/grpcio_tests/tests/status:__subpackages__", ], ) diff --git a/src/python/grpcio_tests/tests/channelz/BUILD.bazel b/src/python/grpcio_tests/tests/channelz/BUILD.bazel index f4d246847f7..6f80c1a99dc 100644 --- a/src/python/grpcio_tests/tests/channelz/BUILD.bazel +++ b/src/python/grpcio_tests/tests/channelz/BUILD.bazel @@ -4,14 +4,14 @@ load("//bazel:python_rules.bzl", "py2and3_test") py2and3_test( name = "channelz_servicer_test", + size = "small", srcs = ["_channelz_servicer_test.py"], + imports = ["../../"], main = "_channelz_servicer_test.py", - size = "small", deps = [ "//src/python/grpcio/grpc:grpcio", "//src/python/grpcio_channelz/grpc_channelz/v1:grpc_channelz", "//src/python/grpcio_tests/tests/unit:test_common", - "//src/python/grpcio_tests/tests/unit/framework/common:common", + "//src/python/grpcio_tests/tests/unit/framework/common", ], - imports = ["../../",], ) diff --git a/src/python/grpcio_tests/tests/health_check/BUILD.bazel b/src/python/grpcio_tests/tests/health_check/BUILD.bazel index 797b6a48e91..03380d325ea 100644 --- a/src/python/grpcio_tests/tests/health_check/BUILD.bazel +++ b/src/python/grpcio_tests/tests/health_check/BUILD.bazel @@ -1,18 +1,18 @@ package(default_visibility = ["//visibility:public"]) + load("//bazel:python_rules.bzl", "py2and3_test") py2and3_test( name = "health_servicer_test", + size = "small", srcs = ["_health_servicer_test.py"], + imports = ["../../"], main = "_health_servicer_test.py", - size = "small", deps = [ "//src/python/grpcio/grpc:grpcio", "//src/python/grpcio_health_checking/grpc_health/v1:grpc_health", "//src/python/grpcio_tests/tests/unit:test_common", "//src/python/grpcio_tests/tests/unit:thread_pool", - "//src/python/grpcio_tests/tests/unit/framework/common:common", + "//src/python/grpcio_tests/tests/unit/framework/common", ], - imports = ["../../",], ) - diff --git a/src/python/grpcio_tests/tests/interop/credentials/BUILD.bazel b/src/python/grpcio_tests/tests/interop/credentials/BUILD.bazel index bc2b9972927..91858cd63b0 100644 --- a/src/python/grpcio_tests/tests/interop/credentials/BUILD.bazel +++ b/src/python/grpcio_tests/tests/interop/credentials/BUILD.bazel @@ -1,9 +1,8 @@ package(default_visibility = ["//visibility:public"]) filegroup( - name="credentials", - srcs=glob([ + name = "credentials", + srcs = glob([ "**", ]), ) - diff --git a/src/python/grpcio_tests/tests/reflection/BUILD.bazel b/src/python/grpcio_tests/tests/reflection/BUILD.bazel index 65a08c2a435..c2e9443384b 100644 --- a/src/python/grpcio_tests/tests/reflection/BUILD.bazel +++ b/src/python/grpcio_tests/tests/reflection/BUILD.bazel @@ -4,20 +4,19 @@ load("//bazel:python_rules.bzl", "py2and3_test") package(default_visibility = ["//visibility:public"]) py2and3_test( - name="_reflection_servicer_test", - size="small", - timeout="moderate", - srcs=["_reflection_servicer_test.py",], - main="_reflection_servicer_test.py", - deps=[ - "//src/python/grpcio/grpc:grpcio", - "//src/python/grpcio_reflection/grpc_reflection/v1alpha:grpc_reflection", - "//src/python/grpcio_tests/tests/unit:test_common", + name = "_reflection_servicer_test", + size = "small", + timeout = "moderate", + srcs = ["_reflection_servicer_test.py"], + imports = ["../../"], + main = "_reflection_servicer_test.py", + deps = [ "//src/proto/grpc/testing:empty_py_pb2", "//src/proto/grpc/testing/proto2:empty2_extensions_proto", "//src/proto/grpc/testing/proto2:empty2_proto", - requirement('protobuf'), + "//src/python/grpcio/grpc:grpcio", + "//src/python/grpcio_reflection/grpc_reflection/v1alpha:grpc_reflection", + "//src/python/grpcio_tests/tests/unit:test_common", + requirement("protobuf"), ], - imports=["../../",], ) - diff --git a/src/python/grpcio_tests/tests/status/BUILD.bazel b/src/python/grpcio_tests/tests/status/BUILD.bazel index 0868de01acf..798032d5788 100644 --- a/src/python/grpcio_tests/tests/status/BUILD.bazel +++ b/src/python/grpcio_tests/tests/status/BUILD.bazel @@ -5,17 +5,17 @@ package(default_visibility = ["//visibility:public"]) py2and3_test( name = "grpc_status_test", + size = "small", srcs = ["_grpc_status_test.py"], + imports = ["../../"], main = "_grpc_status_test.py", - size = "small", deps = [ "//src/python/grpcio/grpc:grpcio", - "//src/python/grpcio_status/grpc_status:grpc_status", + "//src/python/grpcio_status/grpc_status", "//src/python/grpcio_tests/tests:bazel_namespace_package_hack", "//src/python/grpcio_tests/tests/unit:test_common", - "//src/python/grpcio_tests/tests/unit/framework/common:common", - requirement('protobuf'), - requirement('googleapis-common-protos'), + "//src/python/grpcio_tests/tests/unit/framework/common", + requirement("protobuf"), + requirement("googleapis-common-protos"), ], - imports = ["../../",], ) diff --git a/src/python/grpcio_tests/tests/stress/BUILD.bazel b/src/python/grpcio_tests/tests/stress/BUILD.bazel index 922805d6619..b8af844373a 100644 --- a/src/python/grpcio_tests/tests/stress/BUILD.bazel +++ b/src/python/grpcio_tests/tests/stress/BUILD.bazel @@ -1,4 +1,4 @@ -load("@com_github_grpc_grpc//bazel:python_rules.bzl", "py_proto_library", "py_grpc_library") +load("@com_github_grpc_grpc//bazel:python_rules.bzl", "py_grpc_library", "py_proto_library") proto_library( name = "unary_stream_benchmark_proto", @@ -7,24 +7,24 @@ proto_library( ) py_proto_library( - name = "unary_stream_benchmark_py_pb2", - deps = [":unary_stream_benchmark_proto"], + name = "unary_stream_benchmark_py_pb2", + deps = [":unary_stream_benchmark_proto"], ) py_grpc_library( - name = "unary_stream_benchmark_py_pb2_grpc", - srcs = [":unary_stream_benchmark_proto"], - deps = [":unary_stream_benchmark_py_pb2"], + name = "unary_stream_benchmark_py_pb2_grpc", + srcs = [":unary_stream_benchmark_proto"], + deps = [":unary_stream_benchmark_py_pb2"], ) py_binary( name = "unary_stream_benchmark", - srcs_version = "PY3", - python_version = "PY3", srcs = ["unary_stream_benchmark.py"], + python_version = "PY3", + srcs_version = "PY3", deps = [ - "//src/python/grpcio/grpc:grpcio", ":unary_stream_benchmark_py_pb2", ":unary_stream_benchmark_py_pb2_grpc", - ] + "//src/python/grpcio/grpc:grpcio", + ], ) diff --git a/src/python/grpcio_tests/tests/testing/BUILD.bazel b/src/python/grpcio_tests/tests/testing/BUILD.bazel index 9bdd616c569..78a072b9183 100644 --- a/src/python/grpcio_tests/tests/testing/BUILD.bazel +++ b/src/python/grpcio_tests/tests/testing/BUILD.bazel @@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"]) py_library( name = "testing", - srcs = ["__init__.py",], + srcs = ["__init__.py"], deps = [ # ":_application_common", ":_server_application", @@ -22,9 +22,6 @@ py_library( py_library( name = "_server_application", - srcs = ["_server_application.py",], - imports = ["../../",], + srcs = ["_server_application.py"], + imports = ["../../"], ) - - - diff --git a/src/python/grpcio_tests/tests/unit/BUILD.bazel b/src/python/grpcio_tests/tests/unit/BUILD.bazel index 42da77dbad2..639205a0d43 100644 --- a/src/python/grpcio_tests/tests/unit/BUILD.bazel +++ b/src/python/grpcio_tests/tests/unit/BUILD.bazel @@ -53,7 +53,7 @@ py_library( py_library( name = "resources", srcs = ["resources.py"], - data=[ + data = [ "//src/python/grpcio_tests/tests/unit/credentials", ], ) @@ -85,28 +85,28 @@ py_library( [ py2and3_test( - name=test_file_name[:-3], - size="small", - srcs=[test_file_name], - main=test_file_name, - deps=[ - "//src/python/grpcio/grpc:grpcio", - ":resources", - ":test_common", - ":thread_pool", + name = test_file_name[:-3], + size = "small", + srcs = [test_file_name], + data = [ + "//src/python/grpcio_tests/tests/unit/credentials", + ], + imports = ["../../"], + main = test_file_name, + deps = [ ":_exit_scenarios", - ":_server_shutdown_scenarios", ":_from_grpc_import_star", - ":_tcp_proxy", + ":_server_shutdown_scenarios", ":_signal_client", - "//src/python/grpcio_tests/tests/unit/framework/common", + ":_tcp_proxy", + ":resources", + ":test_common", + ":thread_pool", + "//external:six", + "//src/python/grpcio/grpc:grpcio", "//src/python/grpcio_tests/tests/testing", - "//external:six" - ], - imports=["../../",], - data=[ - "//src/python/grpcio_tests/tests/unit/credentials", + "//src/python/grpcio_tests/tests/unit/framework/common", ], - ) for test_file_name in GRPCIO_TESTS_UNIT + ) + for test_file_name in GRPCIO_TESTS_UNIT ] - diff --git a/src/python/grpcio_tests/tests/unit/_cython/BUILD.bazel b/src/python/grpcio_tests/tests/unit/_cython/BUILD.bazel index 867649a6a50..33376b8afa8 100644 --- a/src/python/grpcio_tests/tests/unit/_cython/BUILD.bazel +++ b/src/python/grpcio_tests/tests/unit/_cython/BUILD.bazel @@ -25,23 +25,22 @@ py_library( [ py2and3_test( - name=test_file_name[:-3], - size="small", - srcs=[test_file_name], - main=test_file_name, - deps=[ - "//src/python/grpcio/grpc:grpcio", + name = test_file_name[:-3], + size = "small", + srcs = [test_file_name], + data = [ + "//src/python/grpcio_tests/tests/unit/credentials", + ], + imports = ["../../../"], + main = test_file_name, + deps = [ ":common", ":test_utilities", - "//src/python/grpcio_tests/tests/unit/framework/common", - "//src/python/grpcio_tests/tests/unit:test_common", + "//src/python/grpcio/grpc:grpcio", "//src/python/grpcio_tests/tests/unit:resources", + "//src/python/grpcio_tests/tests/unit:test_common", + "//src/python/grpcio_tests/tests/unit/framework/common", ], - imports=["../../../",], - data=[ - "//src/python/grpcio_tests/tests/unit/credentials", - ], - ) for test_file_name in GRPCIO_TESTS_UNIT_CYTHON + ) + for test_file_name in GRPCIO_TESTS_UNIT_CYTHON ] - - diff --git a/src/python/grpcio_tests/tests/unit/credentials/BUILD.bazel b/src/python/grpcio_tests/tests/unit/credentials/BUILD.bazel index 358216db580..91858cd63b0 100644 --- a/src/python/grpcio_tests/tests/unit/credentials/BUILD.bazel +++ b/src/python/grpcio_tests/tests/unit/credentials/BUILD.bazel @@ -1,10 +1,8 @@ package(default_visibility = ["//visibility:public"]) filegroup( - name="credentials", - srcs=glob([ + name = "credentials", + srcs = glob([ "**", ]), ) - - diff --git a/src/python/grpcio_tests/tests/unit/framework/common/BUILD.bazel b/src/python/grpcio_tests/tests/unit/framework/common/BUILD.bazel index c206a04fadf..cd5d99cfa83 100644 --- a/src/python/grpcio_tests/tests/unit/framework/common/BUILD.bazel +++ b/src/python/grpcio_tests/tests/unit/framework/common/BUILD.bazel @@ -8,4 +8,3 @@ py_library( "test_coverage.py", ], ) - diff --git a/src/python/grpcio_tests/tests/unit/framework/foundation/BUILD.bazel b/src/python/grpcio_tests/tests/unit/framework/foundation/BUILD.bazel index a93249301c4..4584a86ae3b 100644 --- a/src/python/grpcio_tests/tests/unit/framework/foundation/BUILD.bazel +++ b/src/python/grpcio_tests/tests/unit/framework/foundation/BUILD.bazel @@ -1,4 +1,5 @@ package(default_visibility = ["//visibility:public"]) + load("//bazel:python_rules.bzl", "py2and3_test") py_library( @@ -8,11 +9,10 @@ py_library( py2and3_test( name = "logging_pool_test", + size = "small", srcs = ["_logging_pool_test.py"], main = "_logging_pool_test.py", - size = "small", deps = [ "//src/python/grpcio/grpc:grpcio", ], ) - diff --git a/src/python/grpcio_tests/tests_aio/unit/BUILD.bazel b/src/python/grpcio_tests/tests_aio/unit/BUILD.bazel index 82a12f9b7e4..41aa33034cc 100644 --- a/src/python/grpcio_tests/tests_aio/unit/BUILD.bazel +++ b/src/python/grpcio_tests/tests_aio/unit/BUILD.bazel @@ -19,45 +19,45 @@ package( GRPC_ASYNC_TESTS = glob(["*_test.py"]) - py_library( name = "_test_base", - srcs_version = "PY3", srcs = ["_test_base.py"], + srcs_version = "PY3", ) py_library( name = "_test_server", - srcs_version = "PY3", srcs = ["_test_server.py"], + srcs_version = "PY3", deps = [ - "//src/python/grpcio/grpc:grpcio", + "//src/proto/grpc/testing:empty_py_pb2", "//src/proto/grpc/testing:py_messages_proto", "//src/proto/grpc/testing:test_py_pb2_grpc", - "//src/proto/grpc/testing:empty_py_pb2", - ] + "//src/python/grpcio/grpc:grpcio", + ], ) [ py_test( - name=test_file_name[:-3], - size="small", - srcs=[test_file_name], - main=test_file_name, - python_version="PY3", - deps=[ - ":_test_server", + name = test_file_name[:-3], + size = "small", + srcs = [test_file_name], + data = [ + "//src/python/grpcio_tests/tests/unit/credentials", + ], + imports = ["../../"], + main = test_file_name, + python_version = "PY3", + deps = [ ":_test_base", - "//src/python/grpcio/grpc:grpcio", - "//src/proto/grpc/testing:py_messages_proto", - "//src/proto/grpc/testing:benchmark_service_py_pb2_grpc", + ":_test_server", + "//external:six", "//src/proto/grpc/testing:benchmark_service_py_pb2", + "//src/proto/grpc/testing:benchmark_service_py_pb2_grpc", + "//src/proto/grpc/testing:py_messages_proto", + "//src/python/grpcio/grpc:grpcio", "//src/python/grpcio_tests/tests/unit/framework/common", - "//external:six" - ], - imports=["../../",], - data=[ - "//src/python/grpcio_tests/tests/unit/credentials", ], - ) for test_file_name in GRPC_ASYNC_TESTS + ) + for test_file_name in GRPC_ASYNC_TESTS ] diff --git a/test/build_test/BUILD b/test/build_test/BUILD index dd2030ccda6..3a419fb5784 100644 --- a/test/build_test/BUILD +++ b/test/build_test/BUILD @@ -21,8 +21,8 @@ load("@bazel_skylib//rules:build_test.bzl", "build_test") # build test //test/build_test:objective_c_examples_test build_test( name = "objective_c_examples_test", + tags = ["manual"], targets = [ "//examples/objective-c:HelloWorld", ], - tags = ["manual"], ) diff --git a/test/core/avl/BUILD b/test/core/avl/BUILD index 861b96a9a62..d47cbdae511 100644 --- a/test/core/avl/BUILD +++ b/test/core/avl/BUILD @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") licenses(["notice"]) # Apache v2 @@ -22,10 +22,10 @@ grpc_cc_test( name = "avl_test", srcs = ["avl_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) diff --git a/test/core/backoff/BUILD b/test/core/backoff/BUILD index 5c62ee8dadf..38020cc9bbe 100644 --- a/test/core/backoff/BUILD +++ b/test/core/backoff/BUILD @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test") licenses(["notice"]) # Apache v2 @@ -30,10 +30,10 @@ grpc_cc_test( "gtest", ], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) diff --git a/test/core/bad_client/BUILD b/test/core/bad_client/BUILD index 99593dc5f33..22879c0efc6 100644 --- a/test/core/bad_client/BUILD +++ b/test/core/bad_client/BUILD @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") grpc_package(name = "test/core/bad_client") diff --git a/test/core/bad_client/generate_tests.bzl b/test/core/bad_client/generate_tests.bzl index 6fb53eeffe1..272c2bb86a4 100755 --- a/test/core/bad_client/generate_tests.bzl +++ b/test/core/bad_client/generate_tests.bzl @@ -13,47 +13,44 @@ # See the License for the specific language governing permissions and # limitations under the License. - """Generates the appropriate build.json data for all the bad_client tests.""" -load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_cc_library") +load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test") def test_options(): - return struct() - + return struct() # maps test names to options BAD_CLIENT_TESTS = { - 'badreq': test_options(), - 'bad_streaming_id': test_options(), - 'connection_prefix': test_options(), - 'duplicate_header': test_options(), - 'headers': test_options(), - 'initial_settings_frame': test_options(), - 'head_of_line_blocking': test_options(), - 'large_metadata': test_options(), - 'out_of_bounds': test_options(), - 'server_registered_method': test_options(), - 'simple_request': test_options(), - 'window_overflow': test_options(), - 'unknown_frame': test_options(), + "badreq": test_options(), + "bad_streaming_id": test_options(), + "connection_prefix": test_options(), + "duplicate_header": test_options(), + "headers": test_options(), + "initial_settings_frame": test_options(), + "head_of_line_blocking": test_options(), + "large_metadata": test_options(), + "out_of_bounds": test_options(), + "server_registered_method": test_options(), + "simple_request": test_options(), + "window_overflow": test_options(), + "unknown_frame": test_options(), } def grpc_bad_client_tests(): - grpc_cc_library( - name = 'bad_client_test', - srcs = ['bad_client.cc'], - hdrs = ['bad_client.h'], - language = "C++", - deps = ['//test/core/util:grpc_test_util', '//:grpc', '//:gpr', '//test/core/end2end:cq_verifier'] - ) - for t, topt in BAD_CLIENT_TESTS.items(): - grpc_cc_test( - name = '%s_bad_client_test' % t, - srcs = ['tests/%s.cc' % t], - deps = [':bad_client_test'], - external_deps = [ - "gtest", - ], + grpc_cc_library( + name = "bad_client_test", + srcs = ["bad_client.cc"], + hdrs = ["bad_client.h"], + language = "C++", + deps = ["//test/core/util:grpc_test_util", "//:grpc", "//:gpr", "//test/core/end2end:cq_verifier"], ) - + for t, topt in BAD_CLIENT_TESTS.items(): + grpc_cc_test( + name = "%s_bad_client_test" % t, + srcs = ["tests/%s.cc" % t], + deps = [":bad_client_test"], + external_deps = [ + "gtest", + ], + ) diff --git a/test/core/bad_connection/BUILD b/test/core/bad_connection/BUILD index 82b38ccc469..8111c7e2cac 100644 --- a/test/core/bad_connection/BUILD +++ b/test/core/bad_connection/BUILD @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") licenses(["notice"]) # Apache v2 @@ -24,10 +24,10 @@ grpc_cc_binary( "close_fd_test.cc", ], language = "C++", + tags = ["no_windows"], deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) diff --git a/test/core/bad_ssl/BUILD b/test/core/bad_ssl/BUILD index 0ea15202135..757d86c8357 100644 --- a/test/core/bad_ssl/BUILD +++ b/test/core/bad_ssl/BUILD @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") grpc_package(name = "test/core/bad_ssl") diff --git a/test/core/bad_ssl/generate_tests.bzl b/test/core/bad_ssl/generate_tests.bzl index f2060125326..6f9698ef5f3 100755 --- a/test/core/bad_ssl/generate_tests.bzl +++ b/test/core/bad_ssl/generate_tests.bzl @@ -13,38 +13,43 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_cc_library", "grpc_cc_binary") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test") def test_options(): - return struct() - + return struct() # maps test names to options -BAD_SSL_TESTS = ['cert', 'alpn'] +BAD_SSL_TESTS = ["cert", "alpn"] def grpc_bad_ssl_tests(): - grpc_cc_library( - name = 'bad_ssl_test_server', - srcs = ['server_common.cc'], - hdrs = ['server_common.h'], - deps = ['//test/core/util:grpc_test_util', - '//:grpc', - '//test/core/end2end:ssl_test_data'] - ) - for t in BAD_SSL_TESTS: - grpc_cc_binary( - name = 'bad_ssl_%s_server' % t, - srcs = ['servers/%s.cc' % t], - deps = [':bad_ssl_test_server'], - ) - grpc_cc_test( - name = 'bad_ssl_%s_test' % t, - srcs = ['bad_ssl_test.cc'], - data = [':bad_ssl_%s_server' % t, - '//src/core/tsi/test_creds:badserver.key', - '//src/core/tsi/test_creds:badserver.pem',], - deps = ['//test/core/util:grpc_test_util', - '//:gpr', - '//test/core/end2end:cq_verifier'], - tags = ["no_windows"], + grpc_cc_library( + name = "bad_ssl_test_server", + srcs = ["server_common.cc"], + hdrs = ["server_common.h"], + deps = [ + "//test/core/util:grpc_test_util", + "//:grpc", + "//test/core/end2end:ssl_test_data", + ], ) + for t in BAD_SSL_TESTS: + grpc_cc_binary( + name = "bad_ssl_%s_server" % t, + srcs = ["servers/%s.cc" % t], + deps = [":bad_ssl_test_server"], + ) + grpc_cc_test( + name = "bad_ssl_%s_test" % t, + srcs = ["bad_ssl_test.cc"], + data = [ + ":bad_ssl_%s_server" % t, + "//src/core/tsi/test_creds:badserver.key", + "//src/core/tsi/test_creds:badserver.pem", + ], + deps = [ + "//test/core/util:grpc_test_util", + "//:gpr", + "//test/core/end2end:cq_verifier", + ], + tags = ["no_windows"], + ) diff --git a/test/core/channel/BUILD b/test/core/channel/BUILD index e38c4c9c194..88ddea93436 100644 --- a/test/core/channel/BUILD +++ b/test/core/channel/BUILD @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") grpc_package(name = "test/core/channel") @@ -22,24 +22,24 @@ grpc_cc_test( name = "channel_args_test", srcs = ["channel_args_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "channel_stack_test", srcs = ["channel_stack_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( @@ -57,12 +57,12 @@ grpc_cc_test( name = "minimal_stack_is_minimal_test", srcs = ["minimal_stack_is_minimal_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( @@ -104,13 +104,13 @@ grpc_cc_test( "gtest", ], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//:grpc++", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( @@ -120,9 +120,9 @@ grpc_cc_test( "gtest", ], language = "C++", + uses_polling = False, deps = [ "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) diff --git a/test/core/client_channel/BUILD b/test/core/client_channel/BUILD index 645517744b2..dff7ce96aeb 100644 --- a/test/core/client_channel/BUILD +++ b/test/core/client_channel/BUILD @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") grpc_package(name = "test/core/client_channel") @@ -25,12 +25,12 @@ grpc_fuzzer( srcs = ["uri_fuzzer_test.cc"], corpus = "uri_corpus", language = "C++", + tags = ["no_windows"], deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) grpc_cc_test( @@ -48,13 +48,13 @@ grpc_cc_test( name = "parse_address_with_named_scope_id_test", srcs = ["parse_address_with_named_scope_id_test.cc"], language = "C++", + tags = ["no_windows"], + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], - uses_polling = False, ) grpc_cc_test( @@ -75,12 +75,12 @@ grpc_cc_test( "gtest", ], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( diff --git a/test/core/client_channel/resolvers/BUILD b/test/core/client_channel/resolvers/BUILD index e5882069cd4..2f965df76f6 100644 --- a/test/core/client_channel/resolvers/BUILD +++ b/test/core/client_channel/resolvers/BUILD @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") grpc_package(name = "test/core/client_channel_resolvers") @@ -21,10 +21,10 @@ licenses(["notice"]) # Apache v2 grpc_cc_test( name = "dns_resolver_connectivity_using_ares_resolver_test", srcs = ["dns_resolver_connectivity_test.cc"], - language = "C++", args = [ "--resolver=ares", ], + language = "C++", deps = [ "//:gpr", "//:grpc", @@ -35,10 +35,10 @@ grpc_cc_test( grpc_cc_test( name = "dns_resolver_connectivity_using_native_resolver_test", srcs = ["dns_resolver_connectivity_test.cc"], - language = "C++", args = [ "--resolver=native", ], + language = "C++", deps = [ "//:gpr", "//:grpc", diff --git a/test/core/compression/BUILD b/test/core/compression/BUILD index 9faeeef5078..5fb097519a7 100644 --- a/test/core/compression/BUILD +++ b/test/core/compression/BUILD @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") grpc_package(name = "test/core/compression") @@ -22,46 +22,46 @@ grpc_cc_test( name = "algorithm_test", srcs = ["algorithm_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "compression_test", srcs = ["compression_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "message_compress_test", srcs = ["message_compress_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "stream_compression_test", srcs = ["stream_compression_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) diff --git a/test/core/debug/BUILD b/test/core/debug/BUILD index 2038d8d677a..0274bcb7c4a 100644 --- a/test/core/debug/BUILD +++ b/test/core/debug/BUILD @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") grpc_package(name = "test/core/debug") @@ -25,10 +25,10 @@ grpc_cc_test( "gtest", ], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) diff --git a/test/core/end2end/BUILD b/test/core/end2end/BUILD index a810f35cd20..f5ef0bac994 100644 --- a/test/core/end2end/BUILD +++ b/test/core/end2end/BUILD @@ -12,13 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") licenses(["notice"]) # Apache v2 grpc_package(name = "test/core/end2end") -load(":generate_tests.bzl", "grpc_end2end_tests", "grpc_end2end_nosec_tests") +load(":generate_tests.bzl", "grpc_end2end_nosec_tests", "grpc_end2end_tests") grpc_cc_library( name = "cq_verifier", @@ -73,14 +73,16 @@ grpc_cc_library( grpc_cc_library( name = "local_util", srcs = ["fixtures/local_util.cc"], - hdrs = ["fixtures/local_util.h", - "end2end_tests.h"], + hdrs = [ + "end2end_tests.h", + "fixtures/local_util.h", + ], language = "C++", deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", - ], + ], ) grpc_cc_test( @@ -111,13 +113,13 @@ grpc_cc_test( name = "dualstack_socket_test", srcs = ["dualstack_socket_test.cc"], language = "C++", + tags = ["no_windows"], deps = [ ":cq_verifier", "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) grpc_cc_test( @@ -136,13 +138,13 @@ grpc_cc_test( name = "inproc_callback_test", srcs = ["inproc_callback_test.cc"], language = "C++", + uses_polling = False, deps = [ ":end2end_tests", "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( diff --git a/test/core/end2end/fuzzers/BUILD b/test/core/end2end/fuzzers/BUILD index 70aec59b10a..d031452a57e 100644 --- a/test/core/end2end/fuzzers/BUILD +++ b/test/core/end2end/fuzzers/BUILD @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") grpc_package(name = "test/core/end2end/fuzzers") @@ -22,42 +22,42 @@ load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer") grpc_fuzzer( name = "api_fuzzer", - srcs = ["api_fuzzer.cc"], - language = "C++", - corpus = "api_fuzzer_corpus", size = "enormous", timeout = "eternal", + srcs = ["api_fuzzer.cc"], + corpus = "api_fuzzer_corpus", + language = "C++", + tags = ["no_windows"], deps = [ "//:gpr", "//:grpc", "//test/core/end2end:ssl_test_data", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) grpc_fuzzer( name = "client_fuzzer", srcs = ["client_fuzzer.cc"], - language = "C++", corpus = "client_fuzzer_corpus", + language = "C++", + tags = ["no_windows"], deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) grpc_fuzzer( name = "server_fuzzer", srcs = ["server_fuzzer.cc"], - language = "C++", corpus = "server_fuzzer_corpus", + language = "C++", + tags = ["no_windows"], deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) diff --git a/test/core/end2end/generate_tests.bzl b/test/core/end2end/generate_tests.bzl index 218689343f9..3aa40ca4f88 100755 --- a/test/core/end2end/generate_tests.bzl +++ b/test/core/end2end/generate_tests.bzl @@ -46,7 +46,7 @@ def _fixture_options( supports_write_buffering = supports_write_buffering, client_channel = client_channel, supports_msvc = supports_msvc, - _platforms=_platforms, + _platforms = _platforms, ) # maps fixture name to whether it requires the security library @@ -369,14 +369,14 @@ def _compatible(fopt, topt): return True def _platform_support_tags(fopt): - result = [] - if not "windows" in fopt._platforms: - result += ["no_windows"] - if not "mac" in fopt._platforms: - result += ["no_mac"] - if not "linux" in fopt._platforms: - result += ["no_linux"] - return result + result = [] + if not "windows" in fopt._platforms: + result += ["no_windows"] + if not "mac" in fopt._platforms: + result += ["no_mac"] + if not "linux" in fopt._platforms: + result += ["no_linux"] + return result def grpc_end2end_tests(): grpc_cc_library( @@ -396,7 +396,7 @@ def grpc_end2end_tests(): ":http_proxy", ":proxy", ":local_util", - ] + ], ) for f, fopt in END2END_FIXTURES.items(): @@ -424,7 +424,7 @@ def grpc_end2end_tests(): srcs = ["end2end_test.sh"], args = [ "$(location %s_test)" % f, - t + t, ], tags = ["no_linux"] + _platform_support_tags(fopt), ) @@ -461,7 +461,7 @@ def grpc_end2end_nosec_tests(): ":http_proxy", ":proxy", ":local_util", - ] + ], ) for f, fopt in END2END_NOSEC_FIXTURES.items(): @@ -492,7 +492,7 @@ def grpc_end2end_nosec_tests(): srcs = ["end2end_test.sh"], args = [ "$(location %s_nosec_test)" % f, - t + t, ], tags = ["no_linux"] + _platform_support_tags(fopt), ) diff --git a/test/core/fling/BUILD b/test/core/fling/BUILD index 816a9091787..d1871e99648 100644 --- a/test/core/fling/BUILD +++ b/test/core/fling/BUILD @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") grpc_package(name = "test/core/fling") @@ -53,13 +53,13 @@ grpc_cc_test( ":fling_client", ":fling_server", ], + tags = ["no_windows"], deps = [ "//:gpr", "//:grpc", "//test/core/end2end:ssl_test_data", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) grpc_cc_test( @@ -69,11 +69,11 @@ grpc_cc_test( ":fling_client", ":fling_server", ], + tags = ["no_windows"], deps = [ "//:gpr", "//:grpc", "//test/core/end2end:ssl_test_data", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) diff --git a/test/core/gpr/BUILD b/test/core/gpr/BUILD index 04fd72ab486..b38b17f382d 100644 --- a/test/core/gpr/BUILD +++ b/test/core/gpr/BUILD @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") licenses(["notice"]) # Apache v2 @@ -22,130 +22,130 @@ grpc_cc_test( name = "alloc_test", srcs = ["alloc_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "arena_test", srcs = ["arena_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "cpu_test", srcs = ["cpu_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "env_test", srcs = ["env_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "log_test", srcs = ["log_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "murmur_hash_test", srcs = ["murmur_hash_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "string_test", srcs = ["string_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "spinlock_test", srcs = ["spinlock_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "sync_test", srcs = ["sync_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "time_test", srcs = ["time_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "tls_test", srcs = ["tls_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "useful_test", srcs = ["useful_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) diff --git a/test/core/gprpp/BUILD b/test/core/gprpp/BUILD index 3e23d78b124..8b6c00d868f 100644 --- a/test/core/gprpp/BUILD +++ b/test/core/gprpp/BUILD @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package", "LARGE_MACHINE") +load("//bazel:grpc_build_system.bzl", "LARGE_MACHINE", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") licenses(["notice"]) # Apache v2 @@ -23,11 +23,11 @@ grpc_cc_test( srcs = ["fork_test.cc"], language = "C++", tags = ["no_windows"], + uses_polling = False, deps = [ "//:gpr", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( @@ -37,11 +37,11 @@ grpc_cc_test( "gtest", ], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( @@ -52,33 +52,33 @@ grpc_cc_test( ], language = "C++", tags = ["no_windows"], # TODO(jtattermusch): fix the failure on windows + uses_polling = False, deps = [ "//:gpr", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "manual_constructor_test", srcs = ["manual_constructor_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "host_port_test", srcs = ["host_port_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( @@ -88,11 +88,11 @@ grpc_cc_test( "gtest", ], language = "C++", + uses_polling = False, deps = [ "//:gpr_base", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( @@ -114,11 +114,11 @@ grpc_cc_test( exec_properties = LARGE_MACHINE, language = "C++", tags = ["no_windows"], # LARGE_MACHINE is not configured for windows RBE + uses_polling = False, deps = [ "//:gpr", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( @@ -191,9 +191,9 @@ grpc_cc_test( name = "thd_test", srcs = ["thd_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) diff --git a/test/core/handshake/BUILD b/test/core/handshake/BUILD index 96a71ca6440..77ffc066ad9 100644 --- a/test/core/handshake/BUILD +++ b/test/core/handshake/BUILD @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") grpc_package(name = "test/core/handshake") @@ -27,24 +27,24 @@ grpc_cc_test( "//src/core/tsi/test_creds:server1.pem", ], language = "C++", + tags = ["no_windows"], deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) grpc_cc_library( name = "server_ssl_common", srcs = ["server_ssl_common.cc"], hdrs = ["server_ssl_common.h"], + tags = ["no_windows"], deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) grpc_cc_test( @@ -56,13 +56,13 @@ grpc_cc_test( "//src/core/tsi/test_creds:server1.pem", ], language = "C++", + tags = ["no_windows"], deps = [ ":server_ssl_common", "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) grpc_cc_test( @@ -74,13 +74,13 @@ grpc_cc_test( "//src/core/tsi/test_creds:server1.pem", ], language = "C++", + tags = ["no_windows"], deps = [ ":server_ssl_common", "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) grpc_cc_test( @@ -92,10 +92,10 @@ grpc_cc_test( "//src/core/tsi/test_creds:server1.pem", ], language = "C++", + tags = ["no_windows"], deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) diff --git a/test/core/http/BUILD b/test/core/http/BUILD index 73b9ff0573e..219eaf40222 100644 --- a/test/core/http/BUILD +++ b/test/core/http/BUILD @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") grpc_package(name = "test/core/http") @@ -25,12 +25,12 @@ grpc_fuzzer( srcs = ["response_fuzzer.cc"], corpus = "response_corpus", language = "C++", + tags = ["no_windows"], deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) grpc_fuzzer( @@ -38,12 +38,12 @@ grpc_fuzzer( srcs = ["request_fuzzer.cc"], corpus = "request_corpus", language = "C++", + tags = ["no_windows"], deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) # Copyright 2017 gRPC authors. @@ -74,13 +74,13 @@ grpc_cc_test( "//src/core/tsi/test_creds:server1.pem", ], language = "C++", + tags = ["no_windows"], deps = [ "//:gpr", "//:grpc", "//test/core/end2end:ssl_test_data", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) grpc_cc_test( @@ -94,26 +94,26 @@ grpc_cc_test( "//src/core/tsi/test_creds:server1.pem", ], language = "C++", + tags = ["no_windows"], deps = [ "//:gpr", "//:grpc", "//test/core/end2end:ssl_test_data", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) grpc_cc_test( name = "parser_test", srcs = ["parser_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/end2end:ssl_test_data", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( diff --git a/test/core/iomgr/BUILD b/test/core/iomgr/BUILD index 13327db112f..683494540cf 100644 --- a/test/core/iomgr/BUILD +++ b/test/core/iomgr/BUILD @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package", "LARGE_MACHINE") +load("//bazel:grpc_build_system.bzl", "LARGE_MACHINE", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") licenses(["notice"]) # Apache v2 @@ -65,49 +65,49 @@ grpc_cc_test( name = "error_test", srcs = ["error_test.cc"], language = "C++", + uses_polling = False, deps = [ ":endpoint_tests", "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "ev_epollex_linux_test", srcs = ["ev_epollex_linux_test.cc"], language = "C++", + tags = ["no_windows"], deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) grpc_cc_test( name = "fd_conservation_posix_test", srcs = ["fd_conservation_posix_test.cc"], language = "C++", + tags = ["no_windows"], deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) grpc_cc_test( name = "fd_posix_test", srcs = ["fd_posix_test.cc"], language = "C++", + tags = ["no_windows"], deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) grpc_cc_test( @@ -125,24 +125,24 @@ grpc_cc_test( name = "load_file_test", srcs = ["load_file_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "mpmcqueue_test", srcs = ["mpmcqueue_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( @@ -152,12 +152,12 @@ grpc_cc_test( "--resolver=ares", ], language = "C++", + tags = ["no_windows"], deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) grpc_cc_test( @@ -167,12 +167,12 @@ grpc_cc_test( "--resolver=native", ], language = "C++", + tags = ["no_windows"], deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) grpc_cc_test( @@ -229,37 +229,37 @@ grpc_cc_test( name = "socket_utils_test", srcs = ["socket_utils_test.cc"], language = "C++", + tags = ["no_windows"], deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) grpc_cc_test( name = "tcp_client_posix_test", srcs = ["tcp_client_posix_test.cc"], language = "C++", + tags = ["no_windows"], deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) grpc_cc_test( name = "tcp_posix_test", srcs = ["tcp_posix_test.cc"], language = "C++", + tags = ["no_windows"], deps = [ ":endpoint_tests", "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) grpc_cc_test( @@ -277,70 +277,70 @@ grpc_cc_test( name = "tcp_server_posix_test", srcs = ["tcp_server_posix_test.cc"], language = "C++", + tags = ["no_windows"], deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) grpc_cc_test( name = "threadpool_test", srcs = ["threadpool_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "time_averaged_stats_test", srcs = ["time_averaged_stats_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "timer_heap_test", srcs = ["timer_heap_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "timer_list_test", srcs = ["timer_list_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "udp_server_test", srcs = ["udp_server_test.cc"], language = "C++", + tags = ["no_windows"], deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) diff --git a/test/core/json/BUILD b/test/core/json/BUILD index 198a24c6301..0bc75b5a13a 100644 --- a/test/core/json/BUILD +++ b/test/core/json/BUILD @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") grpc_package(name = "test/core/json") @@ -25,12 +25,12 @@ grpc_fuzzer( srcs = ["fuzzer.cc"], corpus = "corpus", language = "C++", + tags = ["no_windows"], deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) grpc_cc_binary( @@ -55,34 +55,34 @@ grpc_cc_test( ":json_stream_error_test", ], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "json_stream_error_test", srcs = ["json_stream_error_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "json_test", srcs = ["json_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) diff --git a/test/core/nanopb/BUILD b/test/core/nanopb/BUILD index 6836e56ce31..a7c2c1784cf 100644 --- a/test/core/nanopb/BUILD +++ b/test/core/nanopb/BUILD @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") grpc_package(name = "test/core/nanopb") @@ -23,25 +23,25 @@ load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer") grpc_fuzzer( name = "fuzzer_response", srcs = ["fuzzer_response.cc"], - language = "C++", corpus = "corpus_response", + language = "C++", + tags = ["no_windows"], deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) grpc_fuzzer( name = "fuzzer_serverlist", srcs = ["fuzzer_serverlist.cc"], - language = "C++", corpus = "corpus_serverlist", + language = "C++", + tags = ["no_windows"], deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) diff --git a/test/core/network_benchmarks/BUILD b/test/core/network_benchmarks/BUILD index 1194e4ad7bb..04dcd1107a1 100644 --- a/test/core/network_benchmarks/BUILD +++ b/test/core/network_benchmarks/BUILD @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") grpc_package( name = "test/core/network_benchmarks", @@ -28,10 +28,10 @@ grpc_cc_binary( name = "low_level_ping_pong", srcs = ["low_level_ping_pong.cc"], language = "C++", + tags = ["no_windows"], deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) diff --git a/test/core/security/BUILD b/test/core/security/BUILD index f755cde9407..7d07157478d 100644 --- a/test/core/security/BUILD +++ b/test/core/security/BUILD @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") licenses(["notice"]) # Apache v2 @@ -25,12 +25,12 @@ grpc_fuzzer( srcs = ["alts_credentials_fuzzer.cc"], corpus = "corpus/alts_credentials_corpus", language = "C++", + tags = ["no_windows"], deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) grpc_fuzzer( @@ -38,13 +38,13 @@ grpc_fuzzer( srcs = ["ssl_server_fuzzer.cc"], corpus = "corpus/ssl_server_corpus", language = "C++", + tags = ["no_windows"], deps = [ "//:gpr", "//:grpc", "//test/core/end2end:ssl_test_data", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) grpc_cc_library( @@ -60,12 +60,12 @@ grpc_cc_test( name = "auth_context_test", srcs = ["auth_context_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( @@ -96,24 +96,24 @@ grpc_cc_test( name = "json_token_test", srcs = ["json_token_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "jwt_verifier_test", srcs = ["jwt_verifier_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( @@ -261,15 +261,15 @@ grpc_cc_test( grpc_cc_test( name = "spiffe_security_connector_test", srcs = ["spiffe_security_connector_test.cc"], - language = "C++", external_deps = [ - "gtest", + "gtest", ], + language = "C++", deps = [ "//:gpr", "//:grpc", "//:grpc_secure", - "//test/core/util:grpc_test_util", "//test/core/end2end:ssl_test_data", + "//test/core/util:grpc_test_util", ], ) diff --git a/test/core/security/etc/BUILD b/test/core/security/etc/BUILD index 2c6ab64a3b8..480b3fe22e9 100644 --- a/test/core/security/etc/BUILD +++ b/test/core/security/etc/BUILD @@ -15,8 +15,8 @@ licenses(["notice"]) # Apache v2 exports_files([ - "bundle.pem", - "test_roots/cert1.pem", - "test_roots/cert2.pem", - "test_roots/cert3.pem", + "bundle.pem", + "test_roots/cert1.pem", + "test_roots/cert2.pem", + "test_roots/cert3.pem", ]) diff --git a/test/core/slice/BUILD b/test/core/slice/BUILD index e02267276d1..b9a796f257a 100644 --- a/test/core/slice/BUILD +++ b/test/core/slice/BUILD @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") grpc_package(name = "test/core/slice") @@ -25,12 +25,12 @@ grpc_fuzzer( srcs = ["percent_encode_fuzzer.cc"], corpus = "percent_encode_corpus", language = "C++", + tags = ["no_windows"], deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) grpc_fuzzer( @@ -38,60 +38,60 @@ grpc_fuzzer( srcs = ["percent_decode_fuzzer.cc"], corpus = "percent_decode_corpus", language = "C++", + tags = ["no_windows"], deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) grpc_cc_test( name = "percent_encoding_test", srcs = ["percent_encoding_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "slice_test", srcs = ["slice_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "slice_string_helpers_test", srcs = ["slice_string_helpers_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "slice_buffer_test", srcs = ["slice_buffer_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( @@ -101,12 +101,12 @@ grpc_cc_test( "gtest", ], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( @@ -116,22 +116,22 @@ grpc_cc_test( "gtest", ], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "b64_test", srcs = ["b64_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) diff --git a/test/core/surface/BUILD b/test/core/surface/BUILD index fe6320babcf..3d2c51e887b 100644 --- a/test/core/surface/BUILD +++ b/test/core/surface/BUILD @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") licenses(["notice"]) # Apache v2 @@ -22,12 +22,12 @@ grpc_cc_test( name = "grpc_byte_buffer_reader_test", srcs = ["byte_buffer_reader_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( @@ -78,12 +78,12 @@ grpc_cc_test( name = "init_test", srcs = ["init_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( diff --git a/test/core/transport/BUILD b/test/core/transport/BUILD index 078d573b86d..1bec5af5dbf 100644 --- a/test/core/transport/BUILD +++ b/test/core/transport/BUILD @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") licenses(["notice"]) # Apache v2 @@ -26,12 +26,12 @@ grpc_cc_test( ], language = "C++", tags = ["no_windows"], # TODO(jtattermusch): investigate the timeout on windows + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( @@ -41,12 +41,12 @@ grpc_cc_test( "gtest", ], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( @@ -106,36 +106,36 @@ grpc_cc_test( name = "status_conversion_test", srcs = ["status_conversion_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "stream_owned_slice_test", srcs = ["stream_owned_slice_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "timeout_encoding_test", srcs = ["timeout_encoding_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( @@ -145,9 +145,9 @@ grpc_cc_test( "gtest", ], language = "C++", + uses_polling = False, deps = [ "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) diff --git a/test/core/transport/chttp2/BUILD b/test/core/transport/chttp2/BUILD index c80aadb6ed6..a50cf84b0c6 100644 --- a/test/core/transport/chttp2/BUILD +++ b/test/core/transport/chttp2/BUILD @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") licenses(["notice"]) # Apache v2 @@ -24,11 +24,11 @@ grpc_fuzzer( name = "hpack_parser_fuzzer", srcs = ["hpack_parser_fuzzer_test.cc"], corpus = "hpack_parser_corpus", + tags = ["no_windows"], deps = [ "//:grpc", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) grpc_cc_test( @@ -46,24 +46,24 @@ grpc_cc_test( name = "bin_decoder_test", srcs = ["bin_decoder_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "bin_encoder_test", srcs = ["bin_encoder_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( @@ -73,48 +73,48 @@ grpc_cc_test( "gtest", ], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "hpack_encoder_test", srcs = ["hpack_encoder_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "hpack_parser_test", srcs = ["hpack_parser_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( name = "hpack_table_test", srcs = ["hpack_table_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( @@ -146,10 +146,10 @@ grpc_cc_test( name = "varint_test", srcs = ["varint_test.cc"], language = "C++", + uses_polling = False, deps = [ "//:gpr", "//:grpc", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) diff --git a/test/core/tsi/BUILD b/test/core/tsi/BUILD index 223452df1ed..6ac2d40cbfc 100644 --- a/test/core/tsi/BUILD +++ b/test/core/tsi/BUILD @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") licenses(["notice"]) # Apache v2 @@ -70,14 +70,15 @@ grpc_cc_test( "//src/core/tsi/test_creds:ca.pem", "//src/core/tsi/test_creds:client.key", "//src/core/tsi/test_creds:client.pem", + "//src/core/tsi/test_creds:multi-domain.key", + "//src/core/tsi/test_creds:multi-domain.pem", "//src/core/tsi/test_creds:server0.key", "//src/core/tsi/test_creds:server0.pem", "//src/core/tsi/test_creds:server1.key", "//src/core/tsi/test_creds:server1.pem", - "//src/core/tsi/test_creds:multi-domain.key", - "//src/core/tsi/test_creds:multi-domain.pem", ], language = "C++", + tags = ["no_windows"], deps = [ ":transport_security_test_lib", "//:gpr", @@ -85,7 +86,6 @@ grpc_cc_test( "//:tsi", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) grpc_cc_test( diff --git a/test/core/tsi/alts/crypt/BUILD b/test/core/tsi/alts/crypt/BUILD index 767368a2f80..f1c7d435be2 100644 --- a/test/core/tsi/alts/crypt/BUILD +++ b/test/core/tsi/alts/crypt/BUILD @@ -34,10 +34,16 @@ grpc_cc_test( ], ) -grpc_cc_library( - name = "alts_crypt_test_util", - srcs = ["gsec_test_util.cc"], - hdrs = ["gsec_test_util.h"], +grpc_cc_test( + name = "memory_usage_test", + srcs = ["memory_usage_test.cc"], + data = [ + ":memory_usage_client", + ":memory_usage_server", + ], + language = "C++", + tags = ["no_windows"], # TODO(jtattermusch): breaks windows RBE build if enabled + uses_polling = False, deps = [ "//:gpr", "//:grpc", diff --git a/test/core/tsi/alts/fake_handshaker/BUILD b/test/core/tsi/alts/fake_handshaker/BUILD index 8bf9c654d42..48e6e4ad00d 100644 --- a/test/core/tsi/alts/fake_handshaker/BUILD +++ b/test/core/tsi/alts/fake_handshaker/BUILD @@ -14,7 +14,7 @@ licenses(["notice"]) # Apache v2 -load("//bazel:grpc_build_system.bzl", "grpc_proto_library", "grpc_cc_library", "grpc_cc_binary", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_package", "grpc_proto_library") grpc_package( name = "test/core/tsi/alts/fake_handshaker", diff --git a/test/core/util/BUILD b/test/core/util/BUILD index 3cf1fa3ecff..86811da9215 100644 --- a/test/core/util/BUILD +++ b/test/core/util/BUILD @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") licenses(["notice"]) # Apache v2 @@ -115,11 +115,11 @@ grpc_cc_test( name = "cmdline_test", srcs = ["cmdline_test.cc"], language = "C++", + uses_polling = False, deps = [ ":grpc_test_util", "//:gpr", ], - uses_polling = False, ) grpc_cc_library( @@ -130,23 +130,23 @@ grpc_cc_library( "gtest", "gflags", ], + tags = ["no_windows"], deps = [ ":grpc_test_util", "//:grpc", "//test/cpp/util:test_config", ], - tags = ["no_windows"], ) grpc_cc_test( name = "histogram_test", srcs = ["histogram_test.cc"], language = "C++", + uses_polling = False, deps = [ ":grpc_test_util", "//:gpr", ], - uses_polling = False, ) sh_library( diff --git a/test/core/util/grpc_fuzzer.bzl b/test/core/util/grpc_fuzzer.bzl index a6a60b0311e..7f4737a218b 100644 --- a/test/core/util/grpc_fuzzer.bzl +++ b/test/core/util/grpc_fuzzer.bzl @@ -15,16 +15,16 @@ load("//bazel:grpc_build_system.bzl", "grpc_cc_test") def grpc_fuzzer(name, corpus, srcs = [], deps = [], size = "large", timeout = "long", **kwargs): - grpc_cc_test( - name = name, - srcs = srcs, - deps = deps + ["//test/core/util:fuzzer_corpus_test"], - data = native.glob([corpus + "/**"]), - external_deps = [ - 'gtest', - ], - size = size, - timeout = timeout, - args = ["--directory=" + native.package_name() + "/" + corpus,], - **kwargs - ) + grpc_cc_test( + name = name, + srcs = srcs, + deps = deps + ["//test/core/util:fuzzer_corpus_test"], + data = native.glob([corpus + "/**"]), + external_deps = [ + "gtest", + ], + size = size, + timeout = timeout, + args = ["--directory=" + native.package_name() + "/" + corpus], + **kwargs + ) diff --git a/test/cpp/client/BUILD b/test/cpp/client/BUILD index 6ea21232419..47c8c0d9f90 100644 --- a/test/cpp/client/BUILD +++ b/test/cpp/client/BUILD @@ -35,6 +35,9 @@ grpc_cc_test( grpc_cc_test( name = "client_channel_stress_test", srcs = ["client_channel_stress_test.cc"], + # TODO(jtattermusch): test fails frequently on Win RBE, but passes locally + # reenable the tests once it works reliably on Win RBE. + tags = ["no_windows"], deps = [ "//:gpr", "//:grpc", @@ -48,7 +51,4 @@ grpc_cc_test( "//test/cpp/end2end:test_service_impl", "//test/cpp/util:test_util", ], - # TODO(jtattermusch): test fails frequently on Win RBE, but passes locally - # reenable the tests once it works reliably on Win RBE. - tags = ["no_windows"], ) diff --git a/test/cpp/codegen/BUILD b/test/cpp/codegen/BUILD index 69d5859489f..5ee231e8fc9 100644 --- a/test/cpp/codegen/BUILD +++ b/test/cpp/codegen/BUILD @@ -14,7 +14,7 @@ licenses(["notice"]) # Apache v2 -load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_package", "grpc_cc_binary", "grpc_sh_test") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_test", "grpc_package", "grpc_sh_test") grpc_package(name = "test/cpp/codegen") @@ -24,11 +24,11 @@ grpc_cc_test( external_deps = [ "gtest", ], + uses_polling = False, deps = [ "//:grpc++", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( @@ -37,11 +37,11 @@ grpc_cc_test( external_deps = [ "gtest", ], + uses_polling = False, deps = [ "//:grpc++", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( @@ -51,11 +51,11 @@ grpc_cc_test( "gtest", "protobuf", ], + uses_polling = False, deps = [ "//:grpc++", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_binary( diff --git a/test/cpp/common/BUILD b/test/cpp/common/BUILD index d8128d76173..05e7bda330a 100644 --- a/test/cpp/common/BUILD +++ b/test/cpp/common/BUILD @@ -62,12 +62,12 @@ grpc_cc_test( external_deps = [ "gtest", ], + uses_polling = False, deps = [ "//:grpc++", "//test/core/util:grpc_test_util", "//test/cpp/util:test_util", ], - uses_polling = False, ) grpc_cc_test( @@ -76,11 +76,11 @@ grpc_cc_test( external_deps = [ "gtest", ], + uses_polling = False, deps = [ "//:grpc++", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( @@ -89,11 +89,11 @@ grpc_cc_test( external_deps = [ "gtest", ], + uses_polling = False, deps = [ "//:grpc++", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( diff --git a/test/cpp/end2end/BUILD b/test/cpp/end2end/BUILD index 98679361579..962f91b8119 100644 --- a/test/cpp/end2end/BUILD +++ b/test/cpp/end2end/BUILD @@ -67,6 +67,7 @@ grpc_cc_test( external_deps = [ "gtest", ], + tags = ["no_test_ios"], deps = [ "//:gpr", "//:grpc", @@ -78,7 +79,6 @@ grpc_cc_test( "//test/core/util:grpc_test_util", "//test/cpp/util:test_util", ], - tags = ["no_test_ios"], ) grpc_cc_test( @@ -90,7 +90,10 @@ grpc_cc_test( external_deps = [ "gtest", ], - tags = ["no_windows", "no_test_ios"], + tags = [ + "no_test_ios", + "no_windows", + ], deps = [ ":test_service_impl", "//:gpr", @@ -112,6 +115,10 @@ grpc_cc_test( external_deps = [ "gtest", ], + tags = [ + "no_test_ios", + "no_windows", + ], deps = [ "//:gpr", "//:grpc", @@ -122,7 +129,6 @@ grpc_cc_test( "//test/core/util:grpc_test_util", "//test/cpp/util:test_util", ], - tags = ["no_test_ios", "no_windows"], ) grpc_cc_binary( @@ -266,13 +272,13 @@ grpc_cc_test( grpc_cc_test( name = "end2end_test", size = "large", + tags = ["no_test_ios"], deps = [ ":end2end_test_lib", # DO NOT REMOVE THE grpc++ dependence below since the internal build # system uses it to specialize targets "//:grpc++", ], - tags = ["no_test_ios"], ) grpc_cc_test( @@ -429,20 +435,20 @@ grpc_cc_test( external_deps = [ "gtest", ], + tags = ["no_windows"], # TODO(jtattermusch): fix test on windows deps = [ ":test_service_impl", "//:gpr", "//:grpc", "//:grpc++", - "//src/proto/grpc/testing/xds:orca_load_report_for_test_proto", "//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing/duplicate:echo_duplicate_proto", + "//src/proto/grpc/testing/xds:orca_load_report_for_test_proto", "//test/core/util:grpc_test_util", "//test/core/util:test_lb_policies", "//test/cpp/util:test_util", ], - tags = ["no_windows"], # TODO(jtattermusch): fix test on windows ) grpc_cc_test( @@ -470,6 +476,7 @@ grpc_cc_test( external_deps = [ "gtest", ], + tags = ["no_windows"], # TODO(jtattermusch): fix test on windows deps = [ ":test_service_impl", "//:gpr", @@ -483,7 +490,6 @@ grpc_cc_test( "//test/core/util:grpc_test_util", "//test/cpp/util:test_util", ], - tags = ["no_windows"], # TODO(jtattermusch): fix test on windows ) grpc_cc_test( @@ -493,22 +499,25 @@ grpc_cc_test( external_deps = [ "gtest", ], + tags = [ + "no_test_ios", + "no_windows", + ], # TODO(jtattermusch): fix test on windows deps = [ ":test_service_impl", "//:gpr", "//:grpc", "//:grpc++", "//:grpc_resolver_fake", - "//src/proto/grpc/testing/xds:ads_for_test_proto", - "//src/proto/grpc/testing/xds:eds_for_test_proto", - "//src/proto/grpc/testing/xds:lrs_for_test_proto", "//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_proto", "//src/proto/grpc/testing/duplicate:echo_duplicate_proto", + "//src/proto/grpc/testing/xds:ads_for_test_proto", + "//src/proto/grpc/testing/xds:eds_for_test_proto", + "//src/proto/grpc/testing/xds:lrs_for_test_proto", "//test/core/util:grpc_test_util", "//test/cpp/util:test_util", ], - tags = ["no_windows", "no_test_ios"], # TODO(jtattermusch): fix test on windows ) grpc_cc_test( @@ -561,6 +570,10 @@ grpc_cc_test( external_deps = [ "gtest", ], + tags = [ + "no_test_ios", + "no_windows", + ], deps = [ "//:gpr", "//:grpc", @@ -571,7 +584,6 @@ grpc_cc_test( "//test/core/util:grpc_test_util", "//test/cpp/util:test_util", ], - tags = ["no_test_ios", "no_windows"], ) grpc_cc_binary( @@ -620,12 +632,15 @@ grpc_cc_test( external_deps = [ "gtest", ], + tags = [ + "no_test_ios", + "no_windows", + ], deps = [ "//:grpcpp_server_load_reporting", "//src/proto/grpc/testing:echo_proto", "//test/cpp/util:test_util", ], - tags = ["no_test_ios", "no_windows"], ) grpc_cc_test( @@ -634,7 +649,10 @@ grpc_cc_test( external_deps = [ "gtest", ], - tags = ["manual", "no_test_ios"], + tags = [ + "manual", + "no_test_ios", + ], deps = [ ":test_service_impl", "//:gpr", @@ -710,7 +728,10 @@ grpc_cc_test( external_deps = [ "gtest", ], - tags = ["manual", "no_test_ios"], # test requires root, won't work with bazel RBE + tags = [ + "manual", + "no_test_ios", + ], # test requires root, won't work with bazel RBE deps = [ ":test_service_impl", "//:gpr", diff --git a/test/cpp/ext/filters/census/BUILD b/test/cpp/ext/filters/census/BUILD index 08f702fa502..01e4e91d9c7 100644 --- a/test/cpp/ext/filters/census/BUILD +++ b/test/cpp/ext/filters/census/BUILD @@ -29,6 +29,7 @@ grpc_cc_test( "opencensus-stats-test", ], language = "C++", + tags = ["no_windows"], # TODO(jtattermusch): fix test on windows deps = [ "//:grpc++", "//:grpc_opencensus_plugin", @@ -37,5 +38,4 @@ grpc_cc_test( "//test/cpp/util:test_config", "//test/cpp/util:test_util", ], - tags = ["no_windows"], # TODO(jtattermusch): fix test on windows ) diff --git a/test/cpp/grpclb/BUILD b/test/cpp/grpclb/BUILD index 2f74a9bab0e..f9384e11236 100644 --- a/test/cpp/grpclb/BUILD +++ b/test/cpp/grpclb/BUILD @@ -14,7 +14,7 @@ licenses(["notice"]) # Apache v2 -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_package", "grpc_cc_binary") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") grpc_package( name = "test/cpp/grpclb", diff --git a/test/cpp/interop/BUILD b/test/cpp/interop/BUILD index 1b72a1a6dd7..d5141734fd0 100644 --- a/test/cpp/interop/BUILD +++ b/test/cpp/interop/BUILD @@ -14,7 +14,7 @@ licenses(["notice"]) # Apache v2 -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") grpc_package( name = "test/cpp/interop", @@ -46,12 +46,12 @@ grpc_cc_binary( language = "C++", tags = ["no_windows"], deps = [ + "//:grpc++", "//src/proto/grpc/testing:empty_proto", "//src/proto/grpc/testing:messages_proto", "//src/proto/grpc/testing:test_proto", "//test/cpp/util:test_config", "//test/cpp/util:test_util", - "//:grpc++", ], ) diff --git a/test/cpp/microbenchmarks/BUILD b/test/cpp/microbenchmarks/BUILD index b8e9b14d4b4..fd5aff15063 100644 --- a/test/cpp/microbenchmarks/BUILD +++ b/test/cpp/microbenchmarks/BUILD @@ -14,7 +14,7 @@ licenses(["notice"]) # Apache v2 -load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_cc_library", "grpc_cc_binary", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") grpc_package(name = "test/cpp/microbenchmarks") diff --git a/test/cpp/naming/BUILD b/test/cpp/naming/BUILD index b91c0b83c9b..b35c37c0349 100644 --- a/test/cpp/naming/BUILD +++ b/test/cpp/naming/BUILD @@ -22,7 +22,7 @@ package( licenses(["notice"]) # Apache v2 -load("//bazel:grpc_build_system.bzl", "grpc_py_binary", "grpc_cc_test", "grpc_cc_library") +load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_py_binary") load(":generate_resolver_component_tests.bzl", "generate_resolver_component_tests") # Meant to be invoked only through the top-level shell script driver. @@ -52,8 +52,8 @@ grpc_cc_test( grpc_cc_library( name = "dns_test_util", - hdrs = ["dns_test_util.h"], srcs = ["dns_test_util.cc"], + hdrs = ["dns_test_util.h"], deps = [ "//:gpr", "//:grpc", diff --git a/test/cpp/naming/generate_resolver_component_tests.bzl b/test/cpp/naming/generate_resolver_component_tests.bzl index 2ce61d05446..45243183d0a 100755 --- a/test/cpp/naming/generate_resolver_component_tests.bzl +++ b/test/cpp/naming/generate_resolver_component_tests.bzl @@ -13,73 +13,74 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_cc_binary") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_test") def generate_resolver_component_tests(): - for unsecure_build_config_suffix in ['_unsecure', '']: - grpc_cc_test( - name = "address_sorting_test%s" % unsecure_build_config_suffix, - srcs = [ - "address_sorting_test.cc", - ], - external_deps = [ - "gtest", - ], - deps = [ - "//test/cpp/util:test_util%s" % unsecure_build_config_suffix, - "//test/core/util:grpc_test_util%s" % unsecure_build_config_suffix, - "//:grpc++%s" % unsecure_build_config_suffix, - "//:grpc%s" % unsecure_build_config_suffix, - "//:gpr", - "//test/cpp/util:test_config", - ], - tags = ["no_windows"], - ) - # meant to be invoked only through the top-level shell script driver - grpc_cc_binary( - name = "resolver_component_test%s" % unsecure_build_config_suffix, - testonly = 1, - srcs = [ - "resolver_component_test.cc", - ], - external_deps = [ - "gtest", - ], - deps = [ - ":dns_test_util", - "//test/cpp/util:test_util%s" % unsecure_build_config_suffix, - "//test/core/util:grpc_test_util%s" % unsecure_build_config_suffix, - "//:grpc++%s" % unsecure_build_config_suffix, - "//:grpc%s" % unsecure_build_config_suffix, - "//:gpr", - "//test/cpp/util:test_config", - ], - tags = ["no_windows"], - ) - grpc_cc_test( - name = "resolver_component_tests_runner_invoker%s" % unsecure_build_config_suffix, - srcs = [ - "resolver_component_tests_runner_invoker.cc", - ], - deps = [ - "//test/cpp/util:test_util", - "//test/core/util:grpc_test_util", - "//:grpc++", - "//:grpc", - "//:gpr", - "//test/cpp/util:test_config", - ], - data = [ - ":resolver_component_tests_runner", - ":resolver_component_test%s" % unsecure_build_config_suffix, - "//test/cpp/naming/utils:dns_server", - "//test/cpp/naming/utils:dns_resolver", - "//test/cpp/naming/utils:tcp_connect", - "resolver_test_record_groups.yaml", # include the transitive dependency so that the dns sever py binary can locate this - ], - args = [ - "--test_bin_name=resolver_component_test%s" % unsecure_build_config_suffix, - "--running_under_bazel=true", - ], - tags = ["no_windows"], - ) + for unsecure_build_config_suffix in ["_unsecure", ""]: + grpc_cc_test( + name = "address_sorting_test%s" % unsecure_build_config_suffix, + srcs = [ + "address_sorting_test.cc", + ], + external_deps = [ + "gtest", + ], + deps = [ + "//test/cpp/util:test_util%s" % unsecure_build_config_suffix, + "//test/core/util:grpc_test_util%s" % unsecure_build_config_suffix, + "//:grpc++%s" % unsecure_build_config_suffix, + "//:grpc%s" % unsecure_build_config_suffix, + "//:gpr", + "//test/cpp/util:test_config", + ], + tags = ["no_windows"], + ) + + # meant to be invoked only through the top-level shell script driver + grpc_cc_binary( + name = "resolver_component_test%s" % unsecure_build_config_suffix, + testonly = 1, + srcs = [ + "resolver_component_test.cc", + ], + external_deps = [ + "gtest", + ], + deps = [ + ":dns_test_util", + "//test/cpp/util:test_util%s" % unsecure_build_config_suffix, + "//test/core/util:grpc_test_util%s" % unsecure_build_config_suffix, + "//:grpc++%s" % unsecure_build_config_suffix, + "//:grpc%s" % unsecure_build_config_suffix, + "//:gpr", + "//test/cpp/util:test_config", + ], + tags = ["no_windows"], + ) + grpc_cc_test( + name = "resolver_component_tests_runner_invoker%s" % unsecure_build_config_suffix, + srcs = [ + "resolver_component_tests_runner_invoker.cc", + ], + deps = [ + "//test/cpp/util:test_util", + "//test/core/util:grpc_test_util", + "//:grpc++", + "//:grpc", + "//:gpr", + "//test/cpp/util:test_config", + ], + data = [ + ":resolver_component_tests_runner", + ":resolver_component_test%s" % unsecure_build_config_suffix, + "//test/cpp/naming/utils:dns_server", + "//test/cpp/naming/utils:dns_resolver", + "//test/cpp/naming/utils:tcp_connect", + "resolver_test_record_groups.yaml", # include the transitive dependency so that the dns sever py binary can locate this + ], + args = [ + "--test_bin_name=resolver_component_test%s" % unsecure_build_config_suffix, + "--running_under_bazel=true", + ], + tags = ["no_windows"], + ) diff --git a/test/cpp/naming/utils/BUILD b/test/cpp/naming/utils/BUILD index e7b6bc5fe75..8781177fc34 100644 --- a/test/cpp/naming/utils/BUILD +++ b/test/cpp/naming/utils/BUILD @@ -25,26 +25,26 @@ licenses(["notice"]) # Apache v2 load("//bazel:grpc_build_system.bzl", "grpc_py_binary") grpc_py_binary( - name = "dns_server", - srcs = ["dns_server.py"], - testonly = True, - external_deps = [ - "twisted", - "yaml", - ] + name = "dns_server", + testonly = True, + srcs = ["dns_server.py"], + external_deps = [ + "twisted", + "yaml", + ], ) grpc_py_binary( - name = "dns_resolver", - srcs = ["dns_resolver.py"], - testonly = True, - external_deps = [ - "twisted", - ] + name = "dns_resolver", + testonly = True, + srcs = ["dns_resolver.py"], + external_deps = [ + "twisted", + ], ) grpc_py_binary( - name = "tcp_connect", - srcs = ["tcp_connect.py"], - testonly = True, + name = "tcp_connect", + testonly = True, + srcs = ["tcp_connect.py"], ) diff --git a/test/cpp/performance/BUILD b/test/cpp/performance/BUILD index 6068c33f95f..9d22564dc50 100644 --- a/test/cpp/performance/BUILD +++ b/test/cpp/performance/BUILD @@ -24,6 +24,7 @@ grpc_cc_test( external_deps = [ "gtest", ], + tags = ["no_windows"], deps = [ "//:gpr", "//:grpc", @@ -31,5 +32,4 @@ grpc_cc_test( "//src/proto/grpc/testing:echo_proto", "//test/core/util:grpc_test_util_base", ], - tags = ["no_windows"], ) diff --git a/test/cpp/qps/BUILD b/test/cpp/qps/BUILD index 60596c8e31d..a6a3673cce9 100644 --- a/test/cpp/qps/BUILD +++ b/test/cpp/qps/BUILD @@ -14,8 +14,8 @@ licenses(["notice"]) # Apache v2 -load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_cc_library", "grpc_cc_binary", "grpc_package", "LARGE_MACHINE") -load("//test/cpp/qps:qps_benchmark_script.bzl", "qps_json_driver_batch", "json_run_localhost_batch") +load("//bazel:grpc_build_system.bzl", "LARGE_MACHINE", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") +load("//test/cpp/qps:qps_benchmark_script.bzl", "json_run_localhost_batch", "qps_json_driver_batch") grpc_package(name = "test/cpp/qps") @@ -158,12 +158,12 @@ json_run_localhost_batch() grpc_cc_test( name = "qps_interarrival_test", srcs = ["qps_interarrival_test.cc"], + uses_polling = False, deps = [ ":histogram", ":interarrival", "//test/cpp/util:test_config", ], - uses_polling = False, ) grpc_cc_test( diff --git a/test/cpp/qps/json_run_localhost_scenarios.bzl b/test/cpp/qps/json_run_localhost_scenarios.bzl index 5bfb0bca766..51202ca4b46 100644 --- a/test/cpp/qps/json_run_localhost_scenarios.bzl +++ b/test/cpp/qps/json_run_localhost_scenarios.bzl @@ -1,3 +1,3 @@ """Scenarios run on localhost.""" -JSON_RUN_LOCALHOST_SCENARIOS = {'cpp_protobuf_async_unary_75Kqps_600channel_60Krpcs_300Breq_50Bresp': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_75Kqps_600channel_60Krpcs_300Breq_50Bresp", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 16, "threads_per_cq": 1, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"poisson": {"offered_load": 37500}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 50, "req_size": 300}}, "client_channels": 300, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_from_client_qps_unconstrained_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_client_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_unary_qps_unconstrained_1cq_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_from_client_ping_pong_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_generic_async_streaming_qps_1channel_1MBmsg_secure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_1channel_1MBmsg_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_from_server_ping_pong_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_server_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_1mps_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_64KBmsg_secure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_64KBmsg_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_ping_pong_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_1mps_secure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_1cq_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1cq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_10mps_secure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_10mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_unary_ping_pong_insecure_1MB': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_ping_pong_insecure_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_generic_async_streaming_qps_one_server_core_secure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_one_server_core_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 1, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_qps_unconstrained_10mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_from_server_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_server_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_secure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 2}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_ping_pong_secure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 1, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_sync_streaming_from_server_qps_unconstrained_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_server_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_qps_unconstrained_10mps_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_10mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_unary_qps_unconstrained_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_unary_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_from_client_ping_pong_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_client_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_sync_streaming_from_client_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_client_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_from_client_ping_pong_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_client_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_1cq_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 1000000}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_10mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_64KBmsg_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_64KBmsg_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_qps_unconstrained_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_from_server_qps_unconstrained_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_server_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 8388608, "req_size": 128}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_streaming_ping_pong_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_sync_streaming_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_from_client_ping_pong_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_streaming_from_client_1channel_1MB': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_1channel_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_unary_1channel_100rpcs_1MB': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_1channel_100rpcs_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_secure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_1channel_1MBmsg_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_1channel_1MBmsg_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_1mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_ping_pong_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_sync_streaming_from_server_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_server_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 10, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_unary_ping_pong_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 8388608, "req_size": 128}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_generic_async_streaming_ping_pong_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 1, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_sync_streaming_from_server_ping_pong_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_server_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_unary_qps_unconstrained_1cq_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_1cq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_unary_ping_pong_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_unary_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 10, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_one_server_core_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_one_server_core_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 1, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 10, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_from_server_ping_pong_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_server_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 2}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_qps_unconstrained_1mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_unary_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_unary_ping_pong_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_from_client_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_unary_ping_pong_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_unary_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_unary_qps_unconstrained_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_from_server_ping_pong_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_server_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 10, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_unary_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_1cq_secure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1cq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 1000000}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_10mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_10mps_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_10mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_ping_pong_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_streaming_from_client_qps_unconstrained_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_1cq_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_qps_unconstrained_1mps_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_1mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_1mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_unary_ping_pong_secure_1MB': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_ping_pong_secure_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\''} +JSON_RUN_LOCALHOST_SCENARIOS = {"cpp_protobuf_async_unary_75Kqps_600channel_60Krpcs_300Breq_50Bresp": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_75Kqps_600channel_60Krpcs_300Breq_50Bresp", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 16, "threads_per_cq": 1, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"poisson": {"offered_load": 37500}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 50, "req_size": 300}}, "client_channels": 300, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_from_client_qps_unconstrained_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_client_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_unary_qps_unconstrained_1cq_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_from_client_ping_pong_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_generic_async_streaming_qps_1channel_1MBmsg_secure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_1channel_1MBmsg_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_from_server_ping_pong_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_server_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_1mps_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_64KBmsg_secure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_64KBmsg_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_ping_pong_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_generic_async_streaming_qps_unconstrained_1mps_secure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_1cq_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1cq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_10mps_secure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_10mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_unary_ping_pong_insecure_1MB": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_ping_pong_insecure_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_generic_async_streaming_qps_one_server_core_secure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_one_server_core_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 1, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_qps_unconstrained_10mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_from_server_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_server_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_secure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 2}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_ping_pong_secure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 1, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_sync_streaming_from_server_qps_unconstrained_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_server_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_qps_unconstrained_10mps_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_10mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_sync_unary_qps_unconstrained_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_unary_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_from_client_ping_pong_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_client_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_sync_streaming_from_client_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_client_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_from_client_ping_pong_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_client_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_1cq_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 1000000}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_10mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_64KBmsg_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_64KBmsg_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_qps_unconstrained_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_from_server_qps_unconstrained_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_server_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 8388608, "req_size": 128}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_streaming_ping_pong_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_sync_streaming_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_from_client_ping_pong_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_streaming_from_client_1channel_1MB": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_1channel_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_unary_1channel_100rpcs_1MB": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_1channel_100rpcs_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_generic_async_streaming_qps_unconstrained_secure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_1channel_1MBmsg_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_1channel_1MBmsg_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_1mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_ping_pong_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_sync_streaming_from_server_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_server_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 10, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_unary_ping_pong_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 8388608, "req_size": 128}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_generic_async_streaming_ping_pong_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 1, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_sync_streaming_from_server_ping_pong_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_server_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_unary_qps_unconstrained_1cq_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_1cq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', "cpp_protobuf_sync_unary_ping_pong_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_unary_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 10, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_one_server_core_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_one_server_core_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 1, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 10, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_from_server_ping_pong_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_server_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 2}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_qps_unconstrained_1mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_sync_unary_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_unary_ping_pong_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_from_client_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_sync_unary_ping_pong_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_unary_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_unary_qps_unconstrained_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_from_server_ping_pong_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_server_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 10, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_unary_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_1cq_secure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1cq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 1000000}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_10mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_10mps_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_10mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_ping_pong_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_streaming_from_client_qps_unconstrained_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_1cq_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_qps_unconstrained_1mps_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_1mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_1mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_unary_ping_pong_secure_1MB": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_ping_pong_secure_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\''} diff --git a/test/cpp/qps/qps_json_driver_scenarios.bzl b/test/cpp/qps/qps_json_driver_scenarios.bzl index 95b49113257..03aefa0d84a 100644 --- a/test/cpp/qps/qps_json_driver_scenarios.bzl +++ b/test/cpp/qps/qps_json_driver_scenarios.bzl @@ -1,3 +1,3 @@ """Scenarios of qps driver.""" -QPS_JSON_DRIVER_SCENARIOS = {'cpp_protobuf_sync_streaming_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_qps_unconstrained_1mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_unary_ping_pong_insecure_1MB': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_ping_pong_insecure_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_sync_streaming_qps_unconstrained_10mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', 'cpp_protobuf_async_unary_qps_unconstrained_1cq_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_1cq_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 1000000}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_10mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_64KBmsg_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_64KBmsg_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_1cq_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_from_server_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_server_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_from_client_1channel_1MB': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_1channel_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_unary_1channel_100rpcs_1MB': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_1channel_100rpcs_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_generic_async_streaming_qps_1channel_1MBmsg_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_1channel_1MBmsg_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_1mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 8388608, "req_size": 128}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_sync_streaming_from_client_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_client_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_from_client_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 2}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_unary_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_from_server_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_server_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_unary_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_10mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_ping_pong_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 1, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_1mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\''} +QPS_JSON_DRIVER_SCENARIOS = {"cpp_protobuf_sync_streaming_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_qps_unconstrained_1mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_unary_ping_pong_insecure_1MB": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_ping_pong_insecure_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_sync_streaming_qps_unconstrained_10mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', "cpp_protobuf_async_unary_qps_unconstrained_1cq_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_1cq_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 1000000}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_10mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_64KBmsg_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_64KBmsg_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_1cq_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_from_server_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_server_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_from_client_1channel_1MB": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_1channel_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_unary_1channel_100rpcs_1MB": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_1channel_100rpcs_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_generic_async_streaming_qps_1channel_1MBmsg_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_1channel_1MBmsg_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_1mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 8388608, "req_size": 128}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_sync_streaming_from_client_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_client_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_from_client_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 2}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', "cpp_protobuf_sync_unary_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_from_server_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_server_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_unary_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_10mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_ping_pong_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 1, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_1mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\''} diff --git a/test/cpp/server/BUILD b/test/cpp/server/BUILD index a4811031691..5c9d99d3deb 100644 --- a/test/cpp/server/BUILD +++ b/test/cpp/server/BUILD @@ -14,7 +14,7 @@ licenses(["notice"]) # Apache v2 -load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_cc_library", "grpc_cc_binary", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") grpc_package(name = "test/cpp/server") @@ -24,12 +24,12 @@ grpc_cc_test( external_deps = [ "gtest", ], + tags = ["no_windows"], deps = [ "//:grpc++_unsecure", "//src/proto/grpc/testing:echo_proto", "//test/core/util:grpc_test_util_unsecure", ], - tags = ["no_windows"], ) grpc_cc_test( @@ -38,12 +38,12 @@ grpc_cc_test( external_deps = [ "gtest", ], + tags = ["no_windows"], deps = [ "//:grpc++_unsecure", "//src/proto/grpc/testing:echo_proto", "//test/core/util:grpc_test_util_unsecure", ], - tags = ["no_windows"], ) grpc_cc_test( @@ -52,10 +52,10 @@ grpc_cc_test( external_deps = [ "gtest", ], + tags = ["no_windows"], deps = [ "//:grpc++_unsecure", "//src/proto/grpc/testing:echo_proto", "//test/core/util:grpc_test_util_unsecure", ], - tags = ["no_windows"], ) diff --git a/test/cpp/server/load_reporter/BUILD b/test/cpp/server/load_reporter/BUILD index 633b6d8c0d9..846475a7b66 100644 --- a/test/cpp/server/load_reporter/BUILD +++ b/test/cpp/server/load_reporter/BUILD @@ -37,6 +37,7 @@ grpc_cc_test( "gtest", "opencensus-stats-test", ], + tags = ["no_windows"], deps = [ "//:gpr", "//:grpc", @@ -44,7 +45,6 @@ grpc_cc_test( "//:lb_server_load_reporting_filter", "//test/core/util:grpc_test_util", ], - tags = ["no_windows"], ) grpc_cc_test( diff --git a/test/cpp/test/BUILD b/test/cpp/test/BUILD index cd980dee84d..e970c6b752c 100644 --- a/test/cpp/test/BUILD +++ b/test/cpp/test/BUILD @@ -14,7 +14,7 @@ licenses(["notice"]) # Apache v2 -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_package", "grpc_cc_binary") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") grpc_package( name = "test/cpp/test", diff --git a/test/cpp/thread_manager/BUILD b/test/cpp/thread_manager/BUILD index 30488774e4e..03ecd2b1661 100644 --- a/test/cpp/thread_manager/BUILD +++ b/test/cpp/thread_manager/BUILD @@ -14,7 +14,7 @@ licenses(["notice"]) # Apache v2 -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_package", "grpc_cc_binary") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") grpc_package( name = "test/cpp/thread_manager", diff --git a/test/cpp/util/BUILD b/test/cpp/util/BUILD index a3074c42e5c..3f6d7db15e0 100644 --- a/test/cpp/util/BUILD +++ b/test/cpp/util/BUILD @@ -14,7 +14,7 @@ licenses(["notice"]) # Apache v2 -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_binary", "grpc_cc_test", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") grpc_package( name = "test/cpp/util", @@ -187,9 +187,10 @@ grpc_cc_test( external_deps = [ "gtest", ], - tags = ["nomsan", # death tests seem to be incompatible with msan - "no_test_ios", - "no_windows", + tags = [ + "no_test_ios", + "no_windows", + "nomsan", # death tests seem to be incompatible with msan ], deps = [ ":grpc_cli_libs", @@ -211,10 +212,10 @@ grpc_cc_test( external_deps = [ "gtest", ], + uses_polling = False, deps = [ ":test_util", ], - uses_polling = False, ) grpc_cc_test( @@ -225,10 +226,10 @@ grpc_cc_test( external_deps = [ "gtest", ], + uses_polling = False, deps = [ ":test_util", ], - uses_polling = False, ) grpc_cc_test( @@ -239,11 +240,11 @@ grpc_cc_test( external_deps = [ "gtest", ], + uses_polling = False, deps = [ "//:grpc++", "//test/core/util:grpc_test_util", ], - uses_polling = False, ) grpc_cc_test( @@ -254,10 +255,10 @@ grpc_cc_test( external_deps = [ "gtest", ], + uses_polling = False, deps = [ ":test_util", ], - uses_polling = False, ) grpc_cc_test( diff --git a/third_party/address_sorting/BUILD b/third_party/address_sorting/BUILD index 7d5fb9d7ed8..a8357391eca 100644 --- a/third_party/address_sorting/BUILD +++ b/third_party/address_sorting/BUILD @@ -50,8 +50,8 @@ address_sorting_cc_library( "address_sorting_windows.c", ], hdrs = [ - "include/address_sorting/address_sorting.h", "address_sorting_internal.h", + "include/address_sorting/address_sorting.h", ], copts = ["-std=c99"], includes = [ diff --git a/third_party/address_sorting/address_sorting.bzl b/third_party/address_sorting/address_sorting.bzl index 25d008442b2..8010025ecd3 100644 --- a/third_party/address_sorting/address_sorting.bzl +++ b/third_party/address_sorting/address_sorting.bzl @@ -29,10 +29,10 @@ # SUCH DAMAGE. def address_sorting_cc_library(name, srcs, hdrs, copts, includes): - native.cc_library( - name = name, - srcs = srcs, - hdrs = hdrs, - copts = copts, - includes = includes, - ) + native.cc_library( + name = name, + srcs = srcs, + hdrs = hdrs, + copts = copts, + includes = includes, + ) diff --git a/third_party/objective_c/Cronet/BUILD b/third_party/objective_c/Cronet/BUILD index 8d8a1d55d48..e8eb4828dcd 100644 --- a/third_party/objective_c/Cronet/BUILD +++ b/third_party/objective_c/Cronet/BUILD @@ -23,5 +23,5 @@ cc_library( name = "cronet_c_for_grpc", hdrs = [ "bidirectional_stream_c.h", - ] + ], ) diff --git a/third_party/objective_c/google_toolbox_for_mac/BUILD b/third_party/objective_c/google_toolbox_for_mac/BUILD index 49f110e485f..f1c74346211 100644 --- a/third_party/objective_c/google_toolbox_for_mac/BUILD +++ b/third_party/objective_c/google_toolbox_for_mac/BUILD @@ -15,7 +15,8 @@ # limitations under the License. licenses(["notice"]) -objc_library( + +native.objc_library( name = "GTM_GoogleTestRunner_GTM_USING_XCTEST", testonly = 1, srcs = [ @@ -24,5 +25,5 @@ objc_library( deps = [ "//external:gtest", ], - visibility = ["//visibility:public"] + visibility = ["//visibility:public"], ) diff --git a/third_party/py/python_configure.bzl b/third_party/py/python_configure.bzl index c87a2289f25..3cd8301935d 100644 --- a/third_party/py/python_configure.bzl +++ b/third_party/py/python_configure.bzl @@ -13,13 +13,14 @@ _PYTHON2_LIB_PATH = "PYTHON2_LIB_PATH" _PYTHON3_BIN_PATH = "PYTHON3_BIN_PATH" _PYTHON3_LIB_PATH = "PYTHON3_LIB_PATH" - -def _tpl(repository_ctx, tpl, substitutions={}, out=None): +def _tpl(repository_ctx, tpl, substitutions = {}, out = None): if not out: out = tpl - repository_ctx.template(out, Label("//third_party/py:%s.tpl" % tpl), - substitutions) - + repository_ctx.template( + out, + Label("//third_party/py:%s.tpl" % tpl), + substitutions, + ) def _fail(msg): """Output failure message when auto configuration fails.""" @@ -27,18 +28,17 @@ def _fail(msg): no_color = "\033[0m" fail("%sPython Configuration Error:%s %s\n" % (red, no_color, msg)) - def _is_windows(repository_ctx): """Returns true if the host operating system is windows.""" os_name = repository_ctx.os.name.lower() return os_name.find("windows") != -1 - -def _execute(repository_ctx, - cmdline, - error_msg=None, - error_details=None, - empty_stdout_fine=False): +def _execute( + repository_ctx, + cmdline, + error_msg = None, + error_details = None, + empty_stdout_fine = False): """Executes an arbitrary shell command. Args: @@ -55,12 +55,12 @@ def _execute(repository_ctx, if result.stderr or not (empty_stdout_fine or result.stdout): _fail("\n".join([ error_msg.strip() if error_msg else "Repository command failed", - result.stderr.strip(), error_details if error_details else "" + result.stderr.strip(), + error_details if error_details else "", ])) else: return result - def _read_dir(repository_ctx, src_dir): """Returns a string with all files in a directory. @@ -73,26 +73,28 @@ def _read_dir(repository_ctx, src_dir): find_result = _execute( repository_ctx, ["cmd.exe", "/c", "dir", src_dir, "/b", "/s", "/a-d"], - empty_stdout_fine=True) + empty_stdout_fine = True, + ) + # src_files will be used in genrule.outs where the paths must # use forward slashes. return find_result.stdout.replace("\\", "/") else: find_result = _execute( - repository_ctx, ["find", src_dir, "-follow", "-type", "f"], - empty_stdout_fine=True) + repository_ctx, + ["find", src_dir, "-follow", "-type", "f"], + empty_stdout_fine = True, + ) return find_result.stdout - def _genrule(src_dir, genrule_name, command, outs): """Returns a string with a genrule. Genrule executes the given command and produces the given outputs. """ - return ('genrule(\n' + ' name = "' + genrule_name + '",\n' + - ' outs = [\n' + outs + '\n ],\n' + ' cmd = """\n' + - command + '\n """,\n' + ')\n') - + return ("genrule(\n" + ' name = "' + genrule_name + '",\n' + + " outs = [\n" + outs + "\n ],\n" + ' cmd = """\n' + + command + '\n """,\n' + ")\n") def _normalize_path(path): """Returns a path with '/' and remove the trailing slash.""" @@ -101,13 +103,13 @@ def _normalize_path(path): path = path[:-1] return path - -def _symlink_genrule_for_dir(repository_ctx, - src_dir, - dest_dir, - genrule_name, - src_files=[], - dest_files=[]): +def _symlink_genrule_for_dir( + repository_ctx, + src_dir, + dest_dir, + genrule_name, + src_files = [], + dest_files = []): """Returns a genrule to symlink(or copy if on Windows) a set of files. If src_dir is passed, files will be read from the given directory; otherwise @@ -116,10 +118,12 @@ def _symlink_genrule_for_dir(repository_ctx, if src_dir != None: src_dir = _normalize_path(src_dir) dest_dir = _normalize_path(dest_dir) - files = '\n'.join( - sorted(_read_dir(repository_ctx, src_dir).splitlines())) + files = "\n".join( + sorted(_read_dir(repository_ctx, src_dir).splitlines()), + ) + # Create a list with the src_dir stripped to use for outputs. - dest_files = files.replace(src_dir, '').splitlines() + dest_files = files.replace(src_dir, "").splitlines() src_files = files.splitlines() command = [] outs = [] @@ -127,15 +131,20 @@ def _symlink_genrule_for_dir(repository_ctx, if dest_files[i] != "": # If we have only one file to link we do not want to use the dest_dir, as # $(@D) will include the full path to the file. - dest = '$(@D)/' + dest_dir + dest_files[i] if len( - dest_files) != 1 else '$(@D)/' + dest_files[i] + dest = "$(@D)/" + dest_dir + dest_files[i] if len( + dest_files, + ) != 1 else "$(@D)/" + dest_files[i] + # On Windows, symlink is not supported, so we just copy all the files. - cmd = 'cp -f' if _is_windows(repository_ctx) else 'ln -s' + cmd = "cp -f" if _is_windows(repository_ctx) else "ln -s" command.append(cmd + ' "%s" "%s"' % (src_files[i], dest)) outs.append(' "' + dest_dir + dest_files[i] + '",') - return _genrule(src_dir, genrule_name, " && ".join(command), - "\n".join(outs)) - + return _genrule( + src_dir, + genrule_name, + " && ".join(command), + "\n".join(outs), + ) def _get_python_bin(repository_ctx, bin_path_key, default_bin_path): """Gets the python bin path.""" @@ -153,7 +162,6 @@ def _get_python_bin(repository_ctx, bin_path_key, default_bin_path): "%s='/something/else'.\nPATH=%s" % (bin_path_key, repository_ctx.os.environ.get("PATH", ""))) - def _get_bash_bin(repository_ctx): """Gets the bash bin path.""" bash_bin = repository_ctx.os.environ.get(_BAZEL_SH) @@ -166,10 +174,10 @@ def _get_bash_bin(repository_ctx): else: _fail( "Cannot find bash in PATH, please make sure " + - "bash is installed and add its directory in PATH, or --define " - + "%s='/path/to/bash'.\nPATH=%s" % - (_BAZEL_SH, repository_ctx.os.environ.get("PATH", ""))) - + "bash is installed and add its directory in PATH, or --define " + + "%s='/path/to/bash'.\nPATH=%s" % + (_BAZEL_SH, repository_ctx.os.environ.get("PATH", "")), + ) def _get_python_lib(repository_ctx, python_bin, lib_path_key): """Gets the python lib path.""" @@ -189,11 +197,11 @@ def _get_python_lib(repository_ctx, python_bin, lib_path_key): "all_paths = set(python_paths + library_paths)\n" + "paths = []\n" + "for path in all_paths:\n" + " if os.path.isdir(path):\n" + " paths.append(path)\n" + "if len(paths) >=1:\n" + - " print(paths[0])\n" + "END") - cmd = '%s - %s' % (python_bin, print_lib) + " print(paths[0])\n" + "END" + ) + cmd = "%s - %s" % (python_bin, print_lib) result = repository_ctx.execute([_get_bash_bin(repository_ctx), "-c", cmd]) - return result.stdout.strip('\n') - + return result.stdout.strip("\n") def _check_python_lib(repository_ctx, python_lib): """Checks the python lib path.""" @@ -202,7 +210,6 @@ def _check_python_lib(repository_ctx, python_lib): if result.return_code == 1: _fail("Invalid python library path: %s" % python_lib) - def _check_python_bin(repository_ctx, python_bin, bin_path_key): """Checks the python bin path.""" cmd = '[[ -x "%s" ]] && [[ ! -d "%s" ]]' % (python_bin, python_bin) @@ -211,41 +218,47 @@ def _check_python_bin(repository_ctx, python_bin, bin_path_key): _fail("--define %s='%s' is not executable. Is it the python binary?" % (bin_path_key, python_bin)) - def _get_python_include(repository_ctx, python_bin): """Gets the python include path.""" result = _execute( - repository_ctx, [ - python_bin, "-c", 'from __future__ import print_function;' + - 'from distutils import sysconfig;' + - 'print(sysconfig.get_python_inc())' + repository_ctx, + [ + python_bin, + "-c", + "from __future__ import print_function;" + + "from distutils import sysconfig;" + + "print(sysconfig.get_python_inc())", ], - error_msg="Problem getting python include path.", - error_details=( - "Is the Python binary path set up right? " + "(See ./configure or " - + _PYTHON2_BIN_PATH + ".) " + "Is distutils installed?")) + error_msg = "Problem getting python include path.", + error_details = ( + "Is the Python binary path set up right? " + "(See ./configure or " + + _PYTHON2_BIN_PATH + ".) " + "Is distutils installed?" + ), + ) return result.stdout.splitlines()[0] - def _get_python_import_lib_name(repository_ctx, python_bin, bin_path_key): """Get Python import library name (pythonXY.lib) on Windows.""" result = _execute( - repository_ctx, [ - python_bin, "-c", - 'import sys;' + 'print("python" + str(sys.version_info[0]) + ' + - ' str(sys.version_info[1]) + ".lib")' + repository_ctx, + [ + python_bin, + "-c", + "import sys;" + 'print("python" + str(sys.version_info[0]) + ' + + ' str(sys.version_info[1]) + ".lib")', ], - error_msg="Problem getting python import library.", - error_details=("Is the Python binary path set up right? " + - "(See ./configure or " + bin_path_key + ".) ")) + error_msg = "Problem getting python import library.", + error_details = ("Is the Python binary path set up right? " + + "(See ./configure or " + bin_path_key + ".) "), + ) return result.stdout.splitlines()[0] - -def _create_single_version_package(repository_ctx, - variety_name, - bin_path_key, - default_bin_path, - lib_path_key): +def _create_single_version_package( + repository_ctx, + variety_name, + bin_path_key, + default_bin_path, + lib_path_key): """Creates the repository containing files set up to build with Python.""" python_bin = _get_python_bin(repository_ctx, bin_path_key, default_bin_path) _check_python_bin(repository_ctx, python_bin, bin_path_key) @@ -253,44 +266,62 @@ def _create_single_version_package(repository_ctx, _check_python_lib(repository_ctx, python_lib) python_include = _get_python_include(repository_ctx, python_bin) python_include_rule = _symlink_genrule_for_dir( - repository_ctx, python_include, '{}_include'.format(variety_name), - '{}_include'.format(variety_name)) + repository_ctx, + python_include, + "{}_include".format(variety_name), + "{}_include".format(variety_name), + ) python_import_lib_genrule = "" + # To build Python C/C++ extension on Windows, we need to link to python import library pythonXY.lib # See https://docs.python.org/3/extending/windows.html if _is_windows(repository_ctx): python_include = _normalize_path(python_include) - python_import_lib_name = _get_python_import_lib_name( - repository_ctx, python_bin, bin_path_key) + python_import_lib_name = _get_python_import_lib_name, bin_path_key( + repository_ctx, + python_bin, + ) python_import_lib_src = python_include.rsplit( - '/', 1)[0] + "/libs/" + python_import_lib_name + "/", + 1, + )[0] + "/libs/" + python_import_lib_name python_import_lib_genrule = _symlink_genrule_for_dir( - repository_ctx, None, '', '{}_import_lib'.format(variety_name), - [python_import_lib_src], [python_import_lib_name]) + repository_ctx, + None, + "", + "{}_import_lib".format(variety_name), + [python_import_lib_src], + [python_import_lib_name], + ) _tpl( - repository_ctx, "variety", { + repository_ctx, + "variety", + { "%{PYTHON_INCLUDE_GENRULE}": python_include_rule, "%{PYTHON_IMPORT_LIB_GENRULE}": python_import_lib_genrule, "%{VARIETY_NAME}": variety_name, }, - out="{}/BUILD".format(variety_name)) - + out = "{}/BUILD".format(variety_name), + ) def _python_autoconf_impl(repository_ctx): """Implementation of the python_autoconf repository rule.""" - _create_single_version_package(repository_ctx, - "_python2", - _PYTHON2_BIN_PATH, - "python", - _PYTHON2_LIB_PATH) - _create_single_version_package(repository_ctx, - "_python3", - _PYTHON3_BIN_PATH, - "python3", - _PYTHON3_LIB_PATH) + _create_single_version_package( + repository_ctx, + "_python2", + _PYTHON2_BIN_PATH, + "python", + _PYTHON2_LIB_PATH, + ) + _create_single_version_package( + repository_ctx, + "_python3", + _PYTHON3_BIN_PATH, + "python3", + _PYTHON3_LIB_PATH, + ) _tpl(repository_ctx, "BUILD") - python_configure = repository_rule( implementation = _python_autoconf_impl, environ = [ @@ -300,7 +331,7 @@ python_configure = repository_rule( _PYTHON3_BIN_PATH, _PYTHON3_LIB_PATH, ], - attrs={ + attrs = { "_build_tpl": attr.label( default = Label("//third_party/py:BUILD.tpl"), allow_single_file = True, @@ -325,4 +356,3 @@ python_configure(name = "local_config_python") Args: name: A unique name for this workspace rule. """ - diff --git a/third_party/toolchains/BUILD b/third_party/toolchains/BUILD index 93b8bead777..fc0eac672c8 100644 --- a/third_party/toolchains/BUILD +++ b/third_party/toolchains/BUILD @@ -30,55 +30,55 @@ platform( "@bazel_tools//tools/cpp:msvc", ], exec_properties = { - "container-image" : "docker://gcr.io/grpc-testing/rbe_windows_toolchain@sha256:75728e7d6d804090f71095e5fec627b18cfa1f47adc52096c209f2a687e06b2e", - "gceMachineType" : "n1-highmem-2", - "OSFamily" : "Windows", + "container-image": "docker://gcr.io/grpc-testing/rbe_windows_toolchain@sha256:75728e7d6d804090f71095e5fec627b18cfa1f47adc52096c209f2a687e06b2e", + "gceMachineType": "n1-highmem-2", + "OSFamily": "Windows", }, ) # RBE Ubuntu16_04 r346485 platform( name = "rbe_ubuntu1604", - parents = ["@rbe_default//config:platform"], constraint_values = [ "//third_party/toolchains/machine_size:standard", ], exec_properties = { - "gceMachineType" : "n1-highmem-2", # Small machines for majority of tests - "dockerSiblingContainers" : "false", - "dockerNetwork" : "off", - "dockerAddCapabilities" : "SYS_PTRACE", - "dockerPrivileged" : "true" + "gceMachineType": "n1-highmem-2", # Small machines for majority of tests + "dockerSiblingContainers": "false", + "dockerNetwork": "off", + "dockerAddCapabilities": "SYS_PTRACE", + "dockerPrivileged": "true", }, + parents = ["@rbe_default//config:platform"], ) platform( name = "rbe_ubuntu1604_large", - parents = ["@rbe_default//config:platform"], constraint_values = [ "//third_party/toolchains/machine_size:large", ], exec_properties = { - "gceMachineType" : "n1-standard-8", # Large machines for some resource demanding tests (TSAN). - "dockerSiblingContainers" : "false", - "dockerNetwork" : "off", - "dockerAddCapabilities" : "SYS_PTRACE", - "dockerPrivileged" : "true" + "gceMachineType": "n1-standard-8", # Large machines for some resource demanding tests (TSAN). + "dockerSiblingContainers": "false", + "dockerNetwork": "off", + "dockerAddCapabilities": "SYS_PTRACE", + "dockerPrivileged": "true", }, + parents = ["@rbe_default//config:platform"], ) platform( name = "local", - parents = ["@bazel_tools//platforms:target_platform"], constraint_values = [ "//third_party/toolchains/machine_size:standard", ], + parents = ["@bazel_tools//platforms:target_platform"], ) platform( name = "local_large", - parents = ["@bazel_tools//platforms:target_platform"], constraint_values = [ "//third_party/toolchains/machine_size:large", ], + parents = ["@bazel_tools//platforms:target_platform"], ) diff --git a/third_party/toolchains/bazel_0.26.0_rbe_windows/BUILD b/third_party/toolchains/bazel_0.26.0_rbe_windows/BUILD index 5a74a06ddbd..73da9d3defc 100644 --- a/third_party/toolchains/bazel_0.26.0_rbe_windows/BUILD +++ b/third_party/toolchains/bazel_0.26.0_rbe_windows/BUILD @@ -43,8 +43,6 @@ cc_toolchain_suite( cc_toolchain( name = "cc-compiler-x64_windows_msys", - toolchain_identifier = "msys_x64", - toolchain_config = ":msys_x64", all_files = ":empty", ar_files = ":empty", as_files = ":empty", @@ -54,12 +52,14 @@ cc_toolchain( objcopy_files = ":empty", strip_files = ":empty", supports_param_files = 1, + toolchain_config = ":msys_x64", + toolchain_identifier = "msys_x64", ) cc_toolchain_config( name = "msys_x64", - cpu = "x64_windows", compiler = "msys-gcc", + cpu = "x64_windows", ) toolchain( @@ -79,8 +79,6 @@ toolchain( cc_toolchain( name = "cc-compiler-x64_windows_mingw", - toolchain_identifier = "msys_x64_mingw", - toolchain_config = ":msys_x64_mingw", all_files = ":empty", ar_files = ":empty", as_files = ":empty", @@ -90,12 +88,14 @@ cc_toolchain( objcopy_files = ":empty", strip_files = ":empty", supports_param_files = 0, + toolchain_config = ":msys_x64_mingw", + toolchain_identifier = "msys_x64_mingw", ) cc_toolchain_config( name = "msys_x64_mingw", - cpu = "x64_windows", compiler = "mingw-gcc", + cpu = "x64_windows", ) toolchain( @@ -115,8 +115,6 @@ toolchain( cc_toolchain( name = "cc-compiler-x64_windows", - toolchain_identifier = "msvc_x64", - toolchain_config = ":msvc_x64", all_files = ":empty", ar_files = ":empty", as_files = ":empty", @@ -126,12 +124,14 @@ cc_toolchain( objcopy_files = ":empty", strip_files = ":empty", supports_param_files = 1, + toolchain_config = ":msvc_x64", + toolchain_identifier = "msvc_x64", ) cc_toolchain_config( name = "msvc_x64", - cpu = "x64_windows", compiler = "msvc-cl", + cpu = "x64_windows", ) toolchain( @@ -150,8 +150,6 @@ toolchain( cc_toolchain( name = "cc-compiler-armeabi-v7a", - toolchain_identifier = "stub_armeabi-v7a", - toolchain_config = ":stub_armeabi-v7a", all_files = ":empty", ar_files = ":empty", as_files = ":empty", @@ -161,12 +159,14 @@ cc_toolchain( objcopy_files = ":empty", strip_files = ":empty", supports_param_files = 1, + toolchain_config = ":stub_armeabi-v7a", + toolchain_identifier = "stub_armeabi-v7a", ) cc_toolchain_config( name = "stub_armeabi-v7a", - cpu = "armeabi-v7a", compiler = "compiler", + cpu = "armeabi-v7a", ) toolchain( @@ -185,4 +185,3 @@ filegroup( name = "link_dynamic_library", srcs = ["link_dynamic_library.sh"], ) - diff --git a/third_party/toolchains/bazel_0.26.0_rbe_windows/cc_toolchain_config.bzl b/third_party/toolchains/bazel_0.26.0_rbe_windows/cc_toolchain_config.bzl index 20b4316c591..3b1c6a41f38 100644 --- a/third_party/toolchains/bazel_0.26.0_rbe_windows/cc_toolchain_config.bzl +++ b/third_party/toolchains/bazel_0.26.0_rbe_windows/cc_toolchain_config.bzl @@ -13,23 +13,24 @@ # limitations under the License. """A Starlark cc_toolchain configuration rule""" -load("@bazel_tools//tools/cpp:cc_toolchain_config_lib.bzl", - "action_config", - "artifact_name_pattern", - "env_entry", - "env_set", - "feature", - "feature_set", - "flag_group", - "flag_set", - "make_variable", - "tool", - "tool_path", - "variable_with_value", - "with_feature_set", - ) -load("@bazel_tools//tools/build_defs/cc:action_names.bzl", "ACTION_NAMES") +load( + "@bazel_tools//tools/cpp:cc_toolchain_config_lib.bzl", + "action_config", + "artifact_name_pattern", + "env_entry", + "env_set", + "feature", + "feature_set", + "flag_group", + "flag_set", + "make_variable", + "tool", + "tool_path", + "variable_with_value", + "with_feature_set", +) +load("@bazel_tools//tools/build_defs/cc:action_names.bzl", "ACTION_NAMES") all_compile_actions = [ ACTION_NAMES.c_compile, @@ -98,7 +99,7 @@ def _windows_msvc_impl(ctx): "C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.10240.0\\ucrt", "C:\\Program Files (x86)\\Windows Kits\\8.1\\include\\shared", "C:\\Program Files (x86)\\Windows Kits\\8.1\\include\\um", - "C:\\Program Files (x86)\\Windows Kits\\8.1\\include\\winrt" + "C:\\Program Files (x86)\\Windows Kits\\8.1\\include\\winrt", ] cpp_link_nodeps_dynamic_library_action = action_config( @@ -393,14 +394,14 @@ def _windows_msvc_impl(ctx): ), flag_group( flag_groups = [ - flag_group( - flags = ["%{libraries_to_link.name}"], - expand_if_false = "libraries_to_link.is_whole_archive", - ), - flag_group( - flags = ["/WHOLEARCHIVE:%{libraries_to_link.name}"], - expand_if_true = "libraries_to_link.is_whole_archive", - ), + flag_group( + flags = ["%{libraries_to_link.name}"], + expand_if_false = "libraries_to_link.is_whole_archive", + ), + flag_group( + flags = ["/WHOLEARCHIVE:%{libraries_to_link.name}"], + expand_if_true = "libraries_to_link.is_whole_archive", + ), ], expand_if_equal = variable_with_value( name = "libraries_to_link.type", @@ -468,7 +469,7 @@ def _windows_msvc_impl(ctx): expand_if_available = "output_execpath", ), flag_group( - flags = ["/MACHINE:X64"] + flags = ["/MACHINE:X64"], ), ], ), @@ -483,7 +484,7 @@ def _windows_msvc_impl(ctx): actions = all_link_actions, flag_groups = [flag_group(flags = ["/MACHINE:X64"])], ), - ], + ], ) static_link_msvcrt_feature = feature(name = "static_link_msvcrt") @@ -513,9 +514,9 @@ def _windows_msvc_impl(ctx): flag_set( actions = all_link_actions, flag_groups = [ - flag_group( - flags = ["/DEBUG:FULL", "/INCREMENTAL:NO"], - ), + flag_group( + flags = ["/DEBUG:FULL", "/INCREMENTAL:NO"], + ), ], ), ], @@ -668,11 +669,11 @@ def _windows_msvc_impl(ctx): actions = all_link_actions, flag_groups = [flag_group(flags = ["/DEFAULTLIB:msvcrt.lib"])], ), - ], - requires = [ - feature_set(features = ["fastbuild"]), - feature_set(features = ["opt"]), - ], + ], + requires = [ + feature_set(features = ["fastbuild"]), + feature_set(features = ["opt"]), + ], ) disable_assertions_feature = feature( @@ -864,16 +865,16 @@ def _windows_msvc_impl(ctx): flag_set( actions = [ACTION_NAMES.assemble], flag_groups = [ - flag_group( - flag_groups = [ - flag_group( - flags = ["/Fo%{output_file}", "/Zi"], - expand_if_available = "output_file", - expand_if_not_available = "output_assembly_file", - ), - ], - expand_if_not_available = "output_preprocess_file", - ), + flag_group( + flag_groups = [ + flag_group( + flags = ["/Fo%{output_file}", "/Zi"], + expand_if_available = "output_file", + expand_if_not_available = "output_assembly_file", + ), + ], + expand_if_not_available = "output_preprocess_file", + ), ], ), flag_set( @@ -1170,13 +1171,13 @@ def _windows_msys_mingw_impl(ctx): enabled = True, ) - copy_dynamic_libraries_to_binary_feature = feature(name= "copy_dynamic_libraries_to_binary") + copy_dynamic_libraries_to_binary_feature = feature(name = "copy_dynamic_libraries_to_binary") gcc_env_feature = feature( name = "gcc_env", enabled = True, env_sets = [ - env_set ( + env_set( actions = [ ACTION_NAMES.c_compile, ACTION_NAMES.cpp_compile, @@ -1191,17 +1192,17 @@ def _windows_msys_mingw_impl(ctx): ACTION_NAMES.cpp_link_static_library, ], env_entries = [ - env_entry(key = "PATH", value = "c:/tools/msys64/mingw64/bin") + env_entry(key = "PATH", value = "c:/tools/msys64/mingw64/bin"), ], ), ], ) msys_mingw_flags = [ - "-std=gnu++0x" + "-std=gnu++0x", ] msys_mingw_link_flags = [ - "-lstdc++" + "-lstdc++", ] default_compile_flags_feature = feature( @@ -1272,7 +1273,7 @@ def _windows_msys_mingw_impl(ctx): "C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.10240.0\\ucrt", "C:\\Program Files (x86)\\Windows Kits\\8.1\\include\\shared", "C:\\Program Files (x86)\\Windows Kits\\8.1\\include\\um", - "C:\\Program Files (x86)\\Windows Kits\\8.1\\include\\winrt" + "C:\\Program Files (x86)\\Windows Kits\\8.1\\include\\winrt", ] artifact_name_patterns = [ @@ -1285,18 +1286,17 @@ def _windows_msys_mingw_impl(ctx): make_variables = [] tool_paths = [ - tool_path (name= "ar", path= "c:/tools/msys64/mingw64/bin/ar"), - tool_path (name= "compat-ld", path= "c:/tools/msys64/mingw64/bin/ld"), - tool_path (name= "cpp", path= "c:/tools/msys64/mingw64/bin/cpp"), - tool_path (name= "dwp", path= "c:/tools/msys64/mingw64/bin/dwp"), - tool_path (name= "gcc", path= "c:/tools/msys64/mingw64/bin/gcc"), - tool_path (name= "gcov", path= "c:/tools/msys64/mingw64/bin/gcov"), - tool_path (name= "ld", path= "c:/tools/msys64/mingw64/bin/ld"), - tool_path (name= "nm", path= "c:/tools/msys64/mingw64/bin/nm"), - tool_path (name= "objcopy", path= "c:/tools/msys64/mingw64/bin/objcopy"), - tool_path (name= "objdump", path= "c:/tools/msys64/mingw64/bin/objdump"), - tool_path (name= "strip", path= "c:/tools/msys64/mingw64/bin/strip"), - + tool_path(name = "ar", path = "c:/tools/msys64/mingw64/bin/ar"), + tool_path(name = "compat-ld", path = "c:/tools/msys64/mingw64/bin/ld"), + tool_path(name = "cpp", path = "c:/tools/msys64/mingw64/bin/cpp"), + tool_path(name = "dwp", path = "c:/tools/msys64/mingw64/bin/dwp"), + tool_path(name = "gcc", path = "c:/tools/msys64/mingw64/bin/gcc"), + tool_path(name = "gcov", path = "c:/tools/msys64/mingw64/bin/gcov"), + tool_path(name = "ld", path = "c:/tools/msys64/mingw64/bin/ld"), + tool_path(name = "nm", path = "c:/tools/msys64/mingw64/bin/nm"), + tool_path(name = "objcopy", path = "c:/tools/msys64/mingw64/bin/objcopy"), + tool_path(name = "objdump", path = "c:/tools/msys64/mingw64/bin/objdump"), + tool_path(name = "strip", path = "c:/tools/msys64/mingw64/bin/strip"), ] return cc_common.create_cc_toolchain_config_info( @@ -1316,8 +1316,8 @@ def _windows_msys_mingw_impl(ctx): tool_paths = tool_paths, make_variables = make_variables, builtin_sysroot = builtin_sysroot, - cc_target_os = cc_target_os) - + cc_target_os = cc_target_os, + ) def _armeabi_impl(ctx): toolchain_identifier = "stub_armeabi-v7a" @@ -1338,7 +1338,8 @@ def _armeabi_impl(ctx): cxx_builtin_include_directories = [ # This is a workaround for https://github.com/bazelbuild/bazel/issues/5087. - "C:\\botcode\\w",] + "C:\\botcode\\w", + ] artifact_name_patterns = [] make_variables = [] @@ -1373,7 +1374,7 @@ def _armeabi_impl(ctx): tool_paths = tool_paths, make_variables = make_variables, builtin_sysroot = builtin_sysroot, - cc_target_os = cc_target_os + cc_target_os = cc_target_os, ) def _impl(ctx): @@ -1385,18 +1386,17 @@ def _impl(ctx): return _windows_msys_mingw_impl(ctx) tool_paths = [ - tool_path (name= "ar", path= "c:/tools/msys64/usr/bin/ar"), - tool_path (name= "compat-ld", path= "c:/tools/msys64/usr/bin/ld"), - tool_path (name= "cpp", path= "c:/tools/msys64/usr/bin/cpp"), - tool_path (name= "dwp", path= "c:/tools/msys64/usr/bin/dwp"), - tool_path (name= "gcc", path= "c:/tools/msys64/usr/bin/gcc"), - tool_path (name= "gcov", path= "c:/tools/msys64/usr/bin/gcov"), - tool_path (name= "ld", path= "c:/tools/msys64/usr/bin/ld"), - tool_path (name= "nm", path= "c:/tools/msys64/usr/bin/nm"), - tool_path (name= "objcopy", path= "c:/tools/msys64/usr/bin/objcopy"), - tool_path (name= "objdump", path= "c:/tools/msys64/usr/bin/objdump"), - tool_path (name= "strip", path= "c:/tools/msys64/usr/bin/strip"), - + tool_path(name = "ar", path = "c:/tools/msys64/usr/bin/ar"), + tool_path(name = "compat-ld", path = "c:/tools/msys64/usr/bin/ld"), + tool_path(name = "cpp", path = "c:/tools/msys64/usr/bin/cpp"), + tool_path(name = "dwp", path = "c:/tools/msys64/usr/bin/dwp"), + tool_path(name = "gcc", path = "c:/tools/msys64/usr/bin/gcc"), + tool_path(name = "gcov", path = "c:/tools/msys64/usr/bin/gcov"), + tool_path(name = "ld", path = "c:/tools/msys64/usr/bin/ld"), + tool_path(name = "nm", path = "c:/tools/msys64/usr/bin/nm"), + tool_path(name = "objcopy", path = "c:/tools/msys64/usr/bin/objcopy"), + tool_path(name = "objdump", path = "c:/tools/msys64/usr/bin/objdump"), + tool_path(name = "strip", path = "c:/tools/msys64/usr/bin/strip"), ] cxx_builtin_include_directories = [ @@ -1407,37 +1407,32 @@ def _impl(ctx): "C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.10240.0\\ucrt", "C:\\Program Files (x86)\\Windows Kits\\8.1\\include\\shared", "C:\\Program Files (x86)\\Windows Kits\\8.1\\include\\um", - "C:\\Program Files (x86)\\Windows Kits\\8.1\\include\\winrt" + "C:\\Program Files (x86)\\Windows Kits\\8.1\\include\\winrt", ] action_configs = [] compile_flags = [ - ] dbg_compile_flags = [ - ] opt_compile_flags = [ - ] cxx_flags = [ - "-std=gnu++0x" + "-std=gnu++0x", ] link_flags = [ - "-lstdc++" + "-lstdc++", ] opt_link_flags = [ - ] unfiltered_compile_flags = [ - ] targets_windows_feature = feature( @@ -1446,13 +1441,13 @@ def _impl(ctx): enabled = True, ) - copy_dynamic_libraries_to_binary_feature = feature(name= "copy_dynamic_libraries_to_binary") + copy_dynamic_libraries_to_binary_feature = feature(name = "copy_dynamic_libraries_to_binary") gcc_env_feature = feature( name = "gcc_env", enabled = True, env_sets = [ - env_set ( + env_set( actions = [ ACTION_NAMES.c_compile, ACTION_NAMES.cpp_compile, @@ -1467,7 +1462,7 @@ def _impl(ctx): ACTION_NAMES.cpp_link_static_library, ], env_entries = [ - env_entry(key = "PATH", value = "c:/tools/msys64/usr/bin") + env_entry(key = "PATH", value = "c:/tools/msys64/usr/bin"), ], ), ], @@ -1479,8 +1474,6 @@ def _impl(ctx): gcc_env_feature, ] - - supports_pic_feature = feature( name = "supports_pic", enabled = True, @@ -1582,24 +1575,24 @@ def _impl(ctx): flag_sets = [ flag_set( actions = [ - ACTION_NAMES.preprocess_assemble, - ACTION_NAMES.linkstamp_compile, - ACTION_NAMES.c_compile, - ACTION_NAMES.cpp_compile, - ACTION_NAMES.cpp_header_parsing, - ACTION_NAMES.cpp_module_compile, - ACTION_NAMES.cpp_module_codegen, - ACTION_NAMES.lto_backend, - ACTION_NAMES.clif_match, - ACTION_NAMES.cpp_link_executable, - ACTION_NAMES.cpp_link_dynamic_library, - ACTION_NAMES.cpp_link_nodeps_dynamic_library, + ACTION_NAMES.preprocess_assemble, + ACTION_NAMES.linkstamp_compile, + ACTION_NAMES.c_compile, + ACTION_NAMES.cpp_compile, + ACTION_NAMES.cpp_header_parsing, + ACTION_NAMES.cpp_module_compile, + ACTION_NAMES.cpp_module_codegen, + ACTION_NAMES.lto_backend, + ACTION_NAMES.clif_match, + ACTION_NAMES.cpp_link_executable, + ACTION_NAMES.cpp_link_dynamic_library, + ACTION_NAMES.cpp_link_nodeps_dynamic_library, ], flag_groups = [ - flag_group( - flags = ["--sysroot=%{sysroot}"], - expand_if_available = "sysroot", - ), + flag_group( + flags = ["--sysroot=%{sysroot}"], + expand_if_available = "sysroot", + ), ], ), ], @@ -1611,13 +1604,13 @@ def _impl(ctx): flag_set( actions = [ACTION_NAMES.c_compile, ACTION_NAMES.cpp_compile], flag_groups = [ - flag_group( - flags = [ - "-fprofile-use=%{fdo_profile_path}", - "-fprofile-correction", - ], - expand_if_available = "fdo_profile_path", - ), + flag_group( + flags = [ + "-fprofile-use=%{fdo_profile_path}", + "-fprofile-correction", + ], + expand_if_available = "fdo_profile_path", + ), ], ), ], @@ -1632,26 +1625,26 @@ def _impl(ctx): flag_sets = [ flag_set( actions = [ - ACTION_NAMES.assemble, - ACTION_NAMES.preprocess_assemble, - ACTION_NAMES.linkstamp_compile, - ACTION_NAMES.c_compile, - ACTION_NAMES.cpp_compile, - ACTION_NAMES.cpp_header_parsing, - ACTION_NAMES.cpp_module_compile, - ACTION_NAMES.cpp_module_codegen, - ACTION_NAMES.lto_backend, - ACTION_NAMES.clif_match, + ACTION_NAMES.assemble, + ACTION_NAMES.preprocess_assemble, + ACTION_NAMES.linkstamp_compile, + ACTION_NAMES.c_compile, + ACTION_NAMES.cpp_compile, + ACTION_NAMES.cpp_header_parsing, + ACTION_NAMES.cpp_module_compile, + ACTION_NAMES.cpp_module_codegen, + ACTION_NAMES.lto_backend, + ACTION_NAMES.clif_match, ], flag_groups = [ - flag_group( - flags = ["%{user_compile_flags}"], - iterate_over = "user_compile_flags", - expand_if_available = "user_compile_flags", - ), + flag_group( + flags = ["%{user_compile_flags}"], + iterate_over = "user_compile_flags", + expand_if_available = "user_compile_flags", + ), ], ), - ], + ], ) unfiltered_compile_flags_feature = feature( @@ -1660,16 +1653,16 @@ def _impl(ctx): flag_sets = [ flag_set( actions = [ - ACTION_NAMES.assemble, - ACTION_NAMES.preprocess_assemble, - ACTION_NAMES.linkstamp_compile, - ACTION_NAMES.c_compile, - ACTION_NAMES.cpp_compile, - ACTION_NAMES.cpp_header_parsing, - ACTION_NAMES.cpp_module_compile, - ACTION_NAMES.cpp_module_codegen, - ACTION_NAMES.lto_backend, - ACTION_NAMES.clif_match, + ACTION_NAMES.assemble, + ACTION_NAMES.preprocess_assemble, + ACTION_NAMES.linkstamp_compile, + ACTION_NAMES.c_compile, + ACTION_NAMES.cpp_compile, + ACTION_NAMES.cpp_header_parsing, + ACTION_NAMES.cpp_module_compile, + ACTION_NAMES.cpp_module_codegen, + ACTION_NAMES.lto_backend, + ACTION_NAMES.clif_match, ], flag_groups = ([flag_group(flags = unfiltered_compile_flags)] if unfiltered_compile_flags else []), ), @@ -1678,8 +1671,6 @@ def _impl(ctx): features = windows_features + [ supports_pic_feature, - - default_compile_flags_feature, default_link_flags_feature, fdo_optimize_feature, @@ -1692,7 +1683,7 @@ def _impl(ctx): ] artifact_name_patterns = [ - artifact_name_pattern(category_name="executable", prefix="", extension=".exe"), + artifact_name_pattern(category_name = "executable", prefix = "", extension = ".exe"), ] make_variables = [] @@ -1720,9 +1711,8 @@ def _impl(ctx): cc_toolchain_config = rule( implementation = _impl, attrs = { - "cpu" : attr.string(mandatory = True), + "cpu": attr.string(mandatory = True), "compiler": attr.string(), }, provides = [CcToolchainConfigInfo], ) - diff --git a/third_party/upb/BUILD b/third_party/upb/BUILD index ad85b202a9a..040d97c79c9 100644 --- a/third_party/upb/BUILD +++ b/third_party/upb/BUILD @@ -76,7 +76,7 @@ cc_library( ], copts = select({ ":windows": [], - "//conditions:default": COPTS + "//conditions:default": COPTS, }), visibility = ["//visibility:public"], ) @@ -95,7 +95,7 @@ cc_library( ], copts = select({ ":windows": [], - "//conditions:default": COPTS + "//conditions:default": COPTS, }), textual_hdrs = [ "upb/port_def.inc", @@ -123,7 +123,7 @@ cc_library( ], copts = select({ ":windows": [], - "//conditions:default": COPTS + "//conditions:default": COPTS, }), visibility = ["//visibility:public"], deps = [ @@ -151,7 +151,7 @@ cc_library( hdrs = ["upb/legacy_msg_reflection.h"], copts = select({ ":windows": [], - "//conditions:default": COPTS + "//conditions:default": COPTS, }), deps = [ ":table", @@ -172,7 +172,7 @@ cc_library( ], copts = select({ ":windows": [], - "//conditions:default": COPTS + "//conditions:default": COPTS, }), deps = [ ":reflection", @@ -199,7 +199,7 @@ cc_library( ], copts = select({ ":windows": [], - "//conditions:default": COPTS + "//conditions:default": COPTS, }), deps = [ ":descriptor_upbproto", @@ -223,7 +223,7 @@ cc_library( ], copts = select({ ":windows": [], - "//conditions:default": COPTS + "//conditions:default": COPTS, }), deps = [ ":upb", @@ -256,7 +256,7 @@ cc_library( hdrs = ["upbc/generator.h"], copts = select({ ":windows": [], - "//conditions:default": CPPOPTS + "//conditions:default": CPPOPTS, }), deps = [ "@absl//absl/base:core_headers", @@ -272,7 +272,7 @@ cc_binary( srcs = ["upbc/main.cc"], copts = select({ ":windows": [], - "//conditions:default": CPPOPTS + "//conditions:default": CPPOPTS, }), visibility = ["//visibility:public"], deps = [ @@ -309,7 +309,7 @@ cc_library( ], copts = select({ ":windows": [], - "//conditions:default": CPPOPTS + "//conditions:default": CPPOPTS, }), deps = [ ":handlers", @@ -325,7 +325,7 @@ cc_test( ], copts = select({ ":windows": [], - "//conditions:default": COPTS + "//conditions:default": COPTS, }), deps = [ ":upb", @@ -354,7 +354,7 @@ cc_test( ], copts = select({ ":windows": [], - "//conditions:default": CPPOPTS + "//conditions:default": CPPOPTS, }), deps = [ ":handlers", @@ -382,7 +382,7 @@ cc_test( srcs = ["tests/test_cpp.cc"], copts = select({ ":windows": [], - "//conditions:default": CPPOPTS + "//conditions:default": CPPOPTS, }), deps = [ ":handlers", @@ -399,7 +399,7 @@ cc_test( srcs = ["tests/test_table.cc"], copts = select({ ":windows": [], - "//conditions:default": CPPOPTS + "//conditions:default": CPPOPTS, }), deps = [ ":table", @@ -415,7 +415,7 @@ cc_binary( srcs = ["tests/file_descriptor_parsenew_fuzzer.cc"], copts = select({ ":windows": [], - "//conditions:default": CPPOPTS + "//conditions:default": CPPOPTS, }) + select({ "//conditions:default": [], ":fuzz": ["-fsanitize=fuzzer,address"], @@ -441,7 +441,7 @@ cc_test( srcs = ["tests/pb/test_encoder.cc"], copts = select({ ":windows": [], - "//conditions:default": CPPOPTS + "//conditions:default": CPPOPTS, }), deps = [ ":descriptor_upbproto", @@ -486,7 +486,7 @@ cc_test( ], copts = select({ ":windows": [], - "//conditions:default": CPPOPTS + "//conditions:default": CPPOPTS, }), deps = [ ":test_json_upbproto", @@ -517,7 +517,7 @@ cc_binary( ], copts = select({ ":windows": [], - "//conditions:default": COPTS + "//conditions:default": COPTS, }) + ["-Ibazel-out/k8-fastbuild/bin"], deps = [ ":conformance_proto_upb", @@ -574,7 +574,7 @@ cc_library( hdrs = ["upb.h"], copts = select({ ":windows": [], - "//conditions:default": COPTS + "//conditions:default": COPTS, }), ) diff --git a/third_party/upb/WORKSPACE b/third_party/upb/WORKSPACE index c1c8c3be9b7..8e365a1d316 100644 --- a/third_party/upb/WORKSPACE +++ b/third_party/upb/WORKSPACE @@ -25,15 +25,15 @@ http_archive( ) http_archive( - name = "com_google_googletest", - urls = ["https://github.com/google/googletest/archive/b6cd405286ed8635ece71c72f118e659f4ade3fb.zip"], # 2019-01-07 - strip_prefix = "googletest-b6cd405286ed8635ece71c72f118e659f4ade3fb", - sha256 = "ff7a82736e158c077e76188232eac77913a15dac0b22508c390ab3f88e6d6d86", + name = "com_google_googletest", + sha256 = "ff7a82736e158c077e76188232eac77913a15dac0b22508c390ab3f88e6d6d86", + strip_prefix = "googletest-b6cd405286ed8635ece71c72f118e659f4ade3fb", + urls = ["https://github.com/google/googletest/archive/b6cd405286ed8635ece71c72f118e659f4ade3fb.zip"], # 2019-01-07 ) http_archive( name = "com_github_google_benchmark", - urls = ["https://github.com/google/benchmark/archive/16703ff83c1ae6d53e5155df3bb3ab0bc96083be.zip"], - strip_prefix = "benchmark-16703ff83c1ae6d53e5155df3bb3ab0bc96083be", sha256 = "59f918c8ccd4d74b6ac43484467b500f1d64b40cc1010daa055375b322a43ba3", + strip_prefix = "benchmark-16703ff83c1ae6d53e5155df3bb3ab0bc96083be", + urls = ["https://github.com/google/benchmark/archive/16703ff83c1ae6d53e5155df3bb3ab0bc96083be.zip"], ) diff --git a/third_party/upb/bazel/upb_proto_library.bzl b/third_party/upb/bazel/upb_proto_library.bzl index cc6bcffaede..09145d396a7 100644 --- a/third_party/upb/bazel/upb_proto_library.bzl +++ b/third_party/upb/bazel/upb_proto_library.bzl @@ -233,7 +233,7 @@ _upb_proto_library_aspect = aspect( ), "_upb": attr.label_list(default = [ "//:generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me", - "//:upb" + "//:upb", ]), "_ext": attr.string(default = ".upb"), }), diff --git a/third_party/upb/bazel/workspace_deps.bzl b/third_party/upb/bazel/workspace_deps.bzl index 39bf524a7a1..3d5404c13bb 100644 --- a/third_party/upb/bazel/workspace_deps.bzl +++ b/third_party/upb/bazel/workspace_deps.bzl @@ -1,4 +1,3 @@ - load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") load("//bazel:repository_defs.bzl", "bazel_version_repository") diff --git a/third_party/upb/examples/bazel/BUILD b/third_party/upb/examples/bazel/BUILD index 94bcfe64d4f..b1c60db0469 100644 --- a/third_party/upb/examples/bazel/BUILD +++ b/third_party/upb/examples/bazel/BUILD @@ -1,4 +1,3 @@ - load("@upb//bazel:upb_proto_library.bzl", "upb_proto_library") proto_library( diff --git a/third_party/upb/examples/bazel/WORKSPACE b/third_party/upb/examples/bazel/WORKSPACE index 5dfe68ac25a..1be5cb844e5 100644 --- a/third_party/upb/examples/bazel/WORKSPACE +++ b/third_party/upb/examples/bazel/WORKSPACE @@ -1,12 +1,11 @@ - workspace(name = "upb_example") load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") git_repository( name = "upb", - remote = "https://github.com/protocolbuffers/upb.git", commit = "d16bf99ac4658793748cda3251226059892b3b7b", + remote = "https://github.com/protocolbuffers/upb.git", ) load("@upb//bazel:workspace_deps.bzl", "upb_deps") From 202a02341f60744cd700ec5944a0fe70f22ec04c Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Thu, 31 Oct 2019 17:30:03 -0700 Subject: [PATCH 099/133] Regenerate qps scenarios --- test/cpp/qps/json_run_localhost_scenarios.bzl | 2 +- test/cpp/qps/qps_json_driver_scenarios.bzl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/cpp/qps/json_run_localhost_scenarios.bzl b/test/cpp/qps/json_run_localhost_scenarios.bzl index 51202ca4b46..5bfb0bca766 100644 --- a/test/cpp/qps/json_run_localhost_scenarios.bzl +++ b/test/cpp/qps/json_run_localhost_scenarios.bzl @@ -1,3 +1,3 @@ """Scenarios run on localhost.""" -JSON_RUN_LOCALHOST_SCENARIOS = {"cpp_protobuf_async_unary_75Kqps_600channel_60Krpcs_300Breq_50Bresp": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_75Kqps_600channel_60Krpcs_300Breq_50Bresp", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 16, "threads_per_cq": 1, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"poisson": {"offered_load": 37500}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 50, "req_size": 300}}, "client_channels": 300, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_from_client_qps_unconstrained_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_client_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_unary_qps_unconstrained_1cq_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_from_client_ping_pong_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_generic_async_streaming_qps_1channel_1MBmsg_secure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_1channel_1MBmsg_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_from_server_ping_pong_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_server_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_1mps_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_64KBmsg_secure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_64KBmsg_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_ping_pong_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_generic_async_streaming_qps_unconstrained_1mps_secure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_1cq_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1cq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_10mps_secure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_10mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_unary_ping_pong_insecure_1MB": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_ping_pong_insecure_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_generic_async_streaming_qps_one_server_core_secure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_one_server_core_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 1, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_qps_unconstrained_10mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_from_server_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_server_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_secure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 2}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_ping_pong_secure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 1, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_sync_streaming_from_server_qps_unconstrained_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_server_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_qps_unconstrained_10mps_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_10mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_sync_unary_qps_unconstrained_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_unary_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_from_client_ping_pong_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_client_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_sync_streaming_from_client_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_client_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_from_client_ping_pong_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_client_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_1cq_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 1000000}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_10mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_64KBmsg_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_64KBmsg_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_qps_unconstrained_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_from_server_qps_unconstrained_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_server_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 8388608, "req_size": 128}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_streaming_ping_pong_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_sync_streaming_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_from_client_ping_pong_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_streaming_from_client_1channel_1MB": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_1channel_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_unary_1channel_100rpcs_1MB": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_1channel_100rpcs_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_generic_async_streaming_qps_unconstrained_secure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_1channel_1MBmsg_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_1channel_1MBmsg_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_1mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_ping_pong_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_sync_streaming_from_server_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_server_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 10, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_unary_ping_pong_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 8388608, "req_size": 128}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_generic_async_streaming_ping_pong_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 1, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_sync_streaming_from_server_ping_pong_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_server_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_unary_qps_unconstrained_1cq_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_1cq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', "cpp_protobuf_sync_unary_ping_pong_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_unary_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 10, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_one_server_core_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_one_server_core_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 1, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 10, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_from_server_ping_pong_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_server_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 2}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_qps_unconstrained_1mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_sync_unary_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_unary_ping_pong_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_from_client_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_sync_unary_ping_pong_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_unary_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_unary_qps_unconstrained_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_from_server_ping_pong_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_server_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 10, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_unary_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_1cq_secure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1cq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 1000000}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_10mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_10mps_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_10mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_ping_pong_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_streaming_from_client_qps_unconstrained_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_1cq_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_qps_unconstrained_1mps_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_1mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_1mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_unary_ping_pong_secure_1MB": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_ping_pong_secure_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\''} +JSON_RUN_LOCALHOST_SCENARIOS = {'cpp_protobuf_async_unary_75Kqps_600channel_60Krpcs_300Breq_50Bresp': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_75Kqps_600channel_60Krpcs_300Breq_50Bresp", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 16, "threads_per_cq": 1, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"poisson": {"offered_load": 37500}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 50, "req_size": 300}}, "client_channels": 300, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_from_client_qps_unconstrained_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_client_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_unary_qps_unconstrained_1cq_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_from_client_ping_pong_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_generic_async_streaming_qps_1channel_1MBmsg_secure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_1channel_1MBmsg_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_from_server_ping_pong_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_server_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_1mps_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_64KBmsg_secure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_64KBmsg_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_ping_pong_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_1mps_secure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_1cq_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1cq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_10mps_secure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_10mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_unary_ping_pong_insecure_1MB': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_ping_pong_insecure_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_generic_async_streaming_qps_one_server_core_secure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_one_server_core_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 1, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_qps_unconstrained_10mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_from_server_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_server_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_secure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 2}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_ping_pong_secure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 1, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_sync_streaming_from_server_qps_unconstrained_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_server_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_qps_unconstrained_10mps_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_10mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_unary_qps_unconstrained_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_unary_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_from_client_ping_pong_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_client_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_sync_streaming_from_client_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_client_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_from_client_ping_pong_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_client_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_1cq_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 1000000}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_10mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_64KBmsg_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_64KBmsg_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_qps_unconstrained_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_from_server_qps_unconstrained_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_server_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 8388608, "req_size": 128}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_streaming_ping_pong_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_sync_streaming_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_from_client_ping_pong_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_streaming_from_client_1channel_1MB': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_1channel_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_unary_1channel_100rpcs_1MB': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_1channel_100rpcs_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_secure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_1channel_1MBmsg_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_1channel_1MBmsg_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_1mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_ping_pong_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_sync_streaming_from_server_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_server_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 10, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_unary_ping_pong_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 8388608, "req_size": 128}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_generic_async_streaming_ping_pong_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 1, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_sync_streaming_from_server_ping_pong_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_server_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_unary_qps_unconstrained_1cq_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_1cq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_unary_ping_pong_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_unary_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 10, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_one_server_core_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_one_server_core_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 1, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 10, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_from_server_ping_pong_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_server_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 2}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_qps_unconstrained_1mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_unary_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_unary_ping_pong_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_from_client_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_unary_ping_pong_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_unary_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_unary_qps_unconstrained_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_from_server_ping_pong_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_server_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 10, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_unary_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_1cq_secure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1cq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 1000000}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_10mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_10mps_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_10mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_ping_pong_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_streaming_from_client_qps_unconstrained_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_1cq_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_qps_unconstrained_1mps_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_1mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_1mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_unary_ping_pong_secure_1MB': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_ping_pong_secure_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\''} diff --git a/test/cpp/qps/qps_json_driver_scenarios.bzl b/test/cpp/qps/qps_json_driver_scenarios.bzl index 03aefa0d84a..95b49113257 100644 --- a/test/cpp/qps/qps_json_driver_scenarios.bzl +++ b/test/cpp/qps/qps_json_driver_scenarios.bzl @@ -1,3 +1,3 @@ """Scenarios of qps driver.""" -QPS_JSON_DRIVER_SCENARIOS = {"cpp_protobuf_sync_streaming_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_qps_unconstrained_1mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_unary_ping_pong_insecure_1MB": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_ping_pong_insecure_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_sync_streaming_qps_unconstrained_10mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', "cpp_protobuf_async_unary_qps_unconstrained_1cq_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_1cq_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 1000000}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_10mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_64KBmsg_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_64KBmsg_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_1cq_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_from_server_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_server_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_from_client_1channel_1MB": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_1channel_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_unary_1channel_100rpcs_1MB": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_1channel_100rpcs_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_generic_async_streaming_qps_1channel_1MBmsg_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_1channel_1MBmsg_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_1mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 8388608, "req_size": 128}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_sync_streaming_from_client_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_client_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_from_client_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 2}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', "cpp_protobuf_sync_unary_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_from_server_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_server_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_unary_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_10mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_ping_pong_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 1, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_1mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\''} +QPS_JSON_DRIVER_SCENARIOS = {'cpp_protobuf_sync_streaming_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_qps_unconstrained_1mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_unary_ping_pong_insecure_1MB': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_ping_pong_insecure_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_sync_streaming_qps_unconstrained_10mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', 'cpp_protobuf_async_unary_qps_unconstrained_1cq_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_1cq_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 1000000}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_10mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_64KBmsg_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_64KBmsg_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_1cq_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_from_server_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_server_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_from_client_1channel_1MB': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_1channel_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_unary_1channel_100rpcs_1MB': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_1channel_100rpcs_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_generic_async_streaming_qps_1channel_1MBmsg_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_1channel_1MBmsg_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_1mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 8388608, "req_size": 128}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_sync_streaming_from_client_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_client_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_from_client_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 2}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_unary_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_from_server_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_server_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_unary_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_10mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_ping_pong_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 1, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_1mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\''} From 02f558e57a80f195463d360f5f1ab2bb5f7fe944 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Fri, 1 Nov 2019 14:00:40 -0700 Subject: [PATCH 100/133] Make the generated file buildifier format compatible --- test/cpp/qps/json_run_localhost_scenarios.bzl | 2 +- test/cpp/qps/qps_json_driver_scenarios.bzl | 2 +- tools/run_tests/sanity/check_qps_scenario_changes.py | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/cpp/qps/json_run_localhost_scenarios.bzl b/test/cpp/qps/json_run_localhost_scenarios.bzl index 5bfb0bca766..51202ca4b46 100644 --- a/test/cpp/qps/json_run_localhost_scenarios.bzl +++ b/test/cpp/qps/json_run_localhost_scenarios.bzl @@ -1,3 +1,3 @@ """Scenarios run on localhost.""" -JSON_RUN_LOCALHOST_SCENARIOS = {'cpp_protobuf_async_unary_75Kqps_600channel_60Krpcs_300Breq_50Bresp': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_75Kqps_600channel_60Krpcs_300Breq_50Bresp", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 16, "threads_per_cq": 1, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"poisson": {"offered_load": 37500}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 50, "req_size": 300}}, "client_channels": 300, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_from_client_qps_unconstrained_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_client_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_unary_qps_unconstrained_1cq_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_from_client_ping_pong_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_generic_async_streaming_qps_1channel_1MBmsg_secure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_1channel_1MBmsg_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_from_server_ping_pong_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_server_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_1mps_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_64KBmsg_secure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_64KBmsg_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_ping_pong_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_1mps_secure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_1cq_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1cq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_10mps_secure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_10mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_unary_ping_pong_insecure_1MB': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_ping_pong_insecure_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_generic_async_streaming_qps_one_server_core_secure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_one_server_core_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 1, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_qps_unconstrained_10mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_from_server_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_server_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_secure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 2}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_ping_pong_secure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 1, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_sync_streaming_from_server_qps_unconstrained_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_server_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_qps_unconstrained_10mps_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_10mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_unary_qps_unconstrained_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_unary_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_from_client_ping_pong_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_client_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_sync_streaming_from_client_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_client_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_from_client_ping_pong_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_client_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_1cq_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 1000000}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_10mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_64KBmsg_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_64KBmsg_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_qps_unconstrained_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_from_server_qps_unconstrained_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_server_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 8388608, "req_size": 128}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_streaming_ping_pong_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_sync_streaming_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_from_client_ping_pong_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_streaming_from_client_1channel_1MB': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_1channel_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_unary_1channel_100rpcs_1MB': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_1channel_100rpcs_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_secure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_1channel_1MBmsg_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_1channel_1MBmsg_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_1mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_ping_pong_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_sync_streaming_from_server_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_server_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 10, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_unary_ping_pong_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 8388608, "req_size": 128}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_generic_async_streaming_ping_pong_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 1, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_sync_streaming_from_server_ping_pong_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_server_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_unary_qps_unconstrained_1cq_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_1cq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_unary_ping_pong_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_unary_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 10, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_one_server_core_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_one_server_core_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 1, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 10, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_from_server_ping_pong_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_server_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 2}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_qps_unconstrained_1mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_unary_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_unary_ping_pong_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_from_client_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_unary_ping_pong_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_unary_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_unary_qps_unconstrained_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_from_server_ping_pong_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_server_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 10, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_unary_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_1cq_secure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1cq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 1000000}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_10mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_10mps_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_10mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_ping_pong_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_streaming_from_client_qps_unconstrained_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_1cq_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_qps_unconstrained_1mps_secure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_1mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_1mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_unary_ping_pong_secure_1MB': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_ping_pong_secure_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\''} +JSON_RUN_LOCALHOST_SCENARIOS = {"cpp_protobuf_async_unary_75Kqps_600channel_60Krpcs_300Breq_50Bresp": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_75Kqps_600channel_60Krpcs_300Breq_50Bresp", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 16, "threads_per_cq": 1, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"poisson": {"offered_load": 37500}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 50, "req_size": 300}}, "client_channels": 300, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_from_client_qps_unconstrained_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_client_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_unary_qps_unconstrained_1cq_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_from_client_ping_pong_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_generic_async_streaming_qps_1channel_1MBmsg_secure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_1channel_1MBmsg_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_from_server_ping_pong_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_server_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_1mps_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_64KBmsg_secure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_64KBmsg_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_ping_pong_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_generic_async_streaming_qps_unconstrained_1mps_secure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_1cq_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1cq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_10mps_secure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_10mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_unary_ping_pong_insecure_1MB": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_ping_pong_insecure_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_generic_async_streaming_qps_one_server_core_secure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_one_server_core_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 1, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_qps_unconstrained_10mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_from_server_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_server_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_secure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 2}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_ping_pong_secure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 1, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_sync_streaming_from_server_qps_unconstrained_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_server_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_qps_unconstrained_10mps_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_10mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_sync_unary_qps_unconstrained_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_unary_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_from_client_ping_pong_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_client_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_sync_streaming_from_client_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_client_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_from_client_ping_pong_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_client_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_1cq_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 1000000}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_10mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_64KBmsg_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_64KBmsg_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_qps_unconstrained_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_from_server_qps_unconstrained_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_server_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 8388608, "req_size": 128}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_streaming_ping_pong_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_sync_streaming_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_from_client_ping_pong_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_streaming_from_client_1channel_1MB": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_1channel_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_unary_1channel_100rpcs_1MB": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_1channel_100rpcs_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_generic_async_streaming_qps_unconstrained_secure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_1channel_1MBmsg_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_1channel_1MBmsg_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_1mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_ping_pong_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_sync_streaming_from_server_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_server_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 10, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_unary_ping_pong_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 8388608, "req_size": 128}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_generic_async_streaming_ping_pong_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 1, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_sync_streaming_from_server_ping_pong_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_server_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_unary_qps_unconstrained_1cq_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_1cq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', "cpp_protobuf_sync_unary_ping_pong_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_unary_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 10, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_one_server_core_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_one_server_core_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 1, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 10, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_from_server_ping_pong_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_server_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 2}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_qps_unconstrained_1mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_sync_unary_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_unary_ping_pong_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_from_client_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_sync_unary_ping_pong_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_unary_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_unary_qps_unconstrained_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_from_server_ping_pong_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_server_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 10, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_unary_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_1cq_secure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1cq_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 1000000}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_10mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_10mps_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_10mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_ping_pong_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_ping_pong_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 1, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_streaming_from_client_qps_unconstrained_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_qps_unconstrained_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_1cq_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_qps_unconstrained_1mps_secure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_1mps_secure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_1mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_unary_ping_pong_secure_1MB": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_ping_pong_secure_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": {"use_test_ca": true, "server_host_override": "foo.test.google.fr"}, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\''} diff --git a/test/cpp/qps/qps_json_driver_scenarios.bzl b/test/cpp/qps/qps_json_driver_scenarios.bzl index 95b49113257..03aefa0d84a 100644 --- a/test/cpp/qps/qps_json_driver_scenarios.bzl +++ b/test/cpp/qps/qps_json_driver_scenarios.bzl @@ -1,3 +1,3 @@ """Scenarios of qps driver.""" -QPS_JSON_DRIVER_SCENARIOS = {'cpp_protobuf_sync_streaming_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_qps_unconstrained_1mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_unary_ping_pong_insecure_1MB': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_ping_pong_insecure_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_sync_streaming_qps_unconstrained_10mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', 'cpp_protobuf_async_unary_qps_unconstrained_1cq_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_1cq_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 1000000}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_10mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_64KBmsg_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_64KBmsg_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_1cq_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_from_server_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_server_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_from_client_1channel_1MB': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_1channel_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_unary_1channel_100rpcs_1MB': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_1channel_100rpcs_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_generic_async_streaming_qps_1channel_1MBmsg_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_1channel_1MBmsg_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_1mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 8388608, "req_size": 128}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_sync_streaming_from_client_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_client_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_protobuf_async_streaming_from_client_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 2}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_unary_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_sync_streaming_from_server_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_server_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_protobuf_async_unary_qps_unconstrained_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_qps_unconstrained_10mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', 'cpp_generic_async_streaming_ping_pong_insecure': '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 1, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', 'cpp_protobuf_async_streaming_qps_unconstrained_1mps_insecure': '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\''} +QPS_JSON_DRIVER_SCENARIOS = {"cpp_protobuf_sync_streaming_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_qps_unconstrained_1mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_unary_ping_pong_insecure_1MB": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_ping_pong_insecure_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_sync_streaming_qps_unconstrained_10mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', "cpp_protobuf_async_unary_qps_unconstrained_1cq_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 2, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_1cq_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 1000000}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_10mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_64KBmsg_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_64KBmsg_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 65536, "req_size": 65536}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_1cq_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1cq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 1000000, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 13, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 1000000}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_from_server_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_server_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_from_client_1channel_1MB": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_1channel_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_unary_1channel_100rpcs_1MB": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_1channel_100rpcs_1MB", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_generic_async_streaming_qps_1channel_1MBmsg_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_1channel_1MBmsg_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 1048576, "req_size": 1048576}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_1mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_unary_1channel_64wide_128Breq_8MBresp_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 8388608, "req_size": 128}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_sync_streaming_from_client_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_client_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_client_sync_server_streaming_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_protobuf_async_streaming_from_client_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_from_client_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING_FROM_CLIENT", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_2waysharedcq_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 2}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 2}, "num_clients": 0}]}\'', "cpp_protobuf_sync_unary_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_sync_streaming_from_server_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_sync_streaming_from_server_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "SYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 16, "rpc_type": "STREAMING_FROM_SERVER", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "SYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_protobuf_async_unary_qps_unconstrained_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_unary_qps_unconstrained_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 3, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "UNARY", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 3}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_qps_unconstrained_10mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_qps_unconstrained_10mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 0, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 10, "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\'', "cpp_generic_async_streaming_ping_pong_insecure": '\'{\'scenarios\' : [{"name": "cpp_generic_async_streaming_ping_pong_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"async_server_threads": 1, "security_params": null, "server_type": "ASYNC_GENERIC_SERVER", "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "threads_per_cq": 0}, "client_config": {"security_params": null, "channel_args": [{"str_value": "latency", "name": "grpc.optimization_target"}], "async_client_threads": 1, "outstanding_rpcs_per_channel": 1, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "payload_config": {"bytebuf_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 1, "threads_per_cq": 0}, "num_clients": 1}]}\'', "cpp_protobuf_async_streaming_qps_unconstrained_1mps_insecure": '\'{\'scenarios\' : [{"name": "cpp_protobuf_async_streaming_qps_unconstrained_1mps_insecure", "warmup_seconds": 0, "benchmark_seconds": 1, "num_servers": 1, "server_config": {"security_params": null, "server_type": "ASYNC_SERVER", "async_server_threads": 0, "threads_per_cq": 0, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}]}, "client_config": {"security_params": null, "channel_args": [{"str_value": "throughput", "name": "grpc.optimization_target"}, {"int_value": 1, "name": "grpc.minimal_stack"}], "async_client_threads": 0, "outstanding_rpcs_per_channel": 100, "rpc_type": "STREAMING", "load_params": {"closed_loop": {}}, "histogram_params": {"resolution": 0.01, "max_possible": 60000000000.0}, "client_type": "ASYNC_CLIENT", "messages_per_stream": 1, "payload_config": {"simple_params": {"resp_size": 0, "req_size": 0}}, "client_channels": 64, "threads_per_cq": 0}, "num_clients": 0}]}\''} diff --git a/tools/run_tests/sanity/check_qps_scenario_changes.py b/tools/run_tests/sanity/check_qps_scenario_changes.py index 635fee6a608..fffa813c0c2 100755 --- a/tools/run_tests/sanity/check_qps_scenario_changes.py +++ b/tools/run_tests/sanity/check_qps_scenario_changes.py @@ -21,6 +21,7 @@ import subprocess os.chdir(os.path.join(os.path.dirname(sys.argv[0]), '../../../test/cpp/qps')) subprocess.call(['./json_run_localhost_scenario_gen.py']) subprocess.call(['./qps_json_driver_scenario_gen.py']) +subprocess.call(['buildifier', '-v', '-r', '.']) output = subprocess.check_output(['git', 'status', '--porcelain']) qps_json_driver_bzl = 'test/cpp/qps/qps_json_driver_scenarios.bzl' From 921094f7384046418e96183c7b15b67f7ceb2a2b Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Tue, 5 Nov 2019 11:03:53 -0800 Subject: [PATCH 101/133] Buildify test/core/tsi/alts/handshaker/BUILD --- test/core/tsi/alts/handshaker/BUILD | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/core/tsi/alts/handshaker/BUILD b/test/core/tsi/alts/handshaker/BUILD index 42cf3b985f1..a0dcb13a915 100644 --- a/test/core/tsi/alts/handshaker/BUILD +++ b/test/core/tsi/alts/handshaker/BUILD @@ -83,16 +83,16 @@ grpc_cc_test( srcs = [ "alts_concurrent_connectivity_test.cc", ], + external_deps = ["gtest"], language = "C++", + # TODO(apolcyn): make the fake TCP server used in this + # test portable to Windows. + tags = ["no_windows"], deps = [ "//:alts_util", "//:grpc", - "//test/core/util:grpc_test_util", - "//test/core/tsi/alts/fake_handshaker:fake_handshaker_lib", "//test/core/end2end:cq_verifier", + "//test/core/tsi/alts/fake_handshaker:fake_handshaker_lib", + "//test/core/util:grpc_test_util", ], - external_deps = ["gtest"], - # TODO(apolcyn): make the fake TCP server used in this - # test portable to Windows. - tags = ["no_windows"], ) From 947c7b7216d638ba5f7435c64500ede9b2690003 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Tue, 5 Nov 2019 11:10:16 -0800 Subject: [PATCH 102/133] Resolve conflict with master branch --- test/core/tsi/alts/crypt/BUILD | 14 ++++---------- .../objective_c/google_toolbox_for_mac/BUILD | 4 ++-- third_party/py/python_configure.bzl | 3 ++- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/test/core/tsi/alts/crypt/BUILD b/test/core/tsi/alts/crypt/BUILD index f1c7d435be2..767368a2f80 100644 --- a/test/core/tsi/alts/crypt/BUILD +++ b/test/core/tsi/alts/crypt/BUILD @@ -34,16 +34,10 @@ grpc_cc_test( ], ) -grpc_cc_test( - name = "memory_usage_test", - srcs = ["memory_usage_test.cc"], - data = [ - ":memory_usage_client", - ":memory_usage_server", - ], - language = "C++", - tags = ["no_windows"], # TODO(jtattermusch): breaks windows RBE build if enabled - uses_polling = False, +grpc_cc_library( + name = "alts_crypt_test_util", + srcs = ["gsec_test_util.cc"], + hdrs = ["gsec_test_util.h"], deps = [ "//:gpr", "//:grpc", diff --git a/third_party/objective_c/google_toolbox_for_mac/BUILD b/third_party/objective_c/google_toolbox_for_mac/BUILD index f1c74346211..b801cbc6b85 100644 --- a/third_party/objective_c/google_toolbox_for_mac/BUILD +++ b/third_party/objective_c/google_toolbox_for_mac/BUILD @@ -16,14 +16,14 @@ licenses(["notice"]) -native.objc_library( +objc_library( name = "GTM_GoogleTestRunner_GTM_USING_XCTEST", testonly = 1, srcs = [ "UnitTesting/GTMGoogleTestRunner.mm", ], + visibility = ["//visibility:public"], deps = [ "//external:gtest", ], - visibility = ["//visibility:public"], ) diff --git a/third_party/py/python_configure.bzl b/third_party/py/python_configure.bzl index 3cd8301935d..e68220f470f 100644 --- a/third_party/py/python_configure.bzl +++ b/third_party/py/python_configure.bzl @@ -277,9 +277,10 @@ def _create_single_version_package( # See https://docs.python.org/3/extending/windows.html if _is_windows(repository_ctx): python_include = _normalize_path(python_include) - python_import_lib_name = _get_python_import_lib_name, bin_path_key( + python_import_lib_name = _get_python_import_lib_name( repository_ctx, python_bin, + bin_path_key, ) python_import_lib_src = python_include.rsplit( "/", From aaf48c66fc379c6337642f3dcc74f19f1bd5e019 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Fri, 1 Nov 2019 17:40:34 -0700 Subject: [PATCH 103/133] Change upb from filegroup to library --- BUILD.gn | 30 +- CMakeLists.txt | 105 +++--- Makefile | 334 +++++++++++--------- build.yaml | 27 +- cmake/upb.cmake | 2 + config.m4 | 12 +- config.w32 | 12 +- gRPC-C++.podspec | 10 +- grpc.gemspec | 28 +- grpc.gyp | 56 ++-- package.xml | 28 +- src/python/grpcio/grpc_core_dependencies.py | 12 +- src/upb/gen_build_yaml.py | 52 ++- templates/CMakeLists.txt.template | 5 +- templates/Makefile.template | 17 +- templates/gRPC-C++.podspec.template | 8 +- templates/gRPC-Core.podspec.template | 8 +- tools/doxygen/Doxyfile.c++.internal | 16 +- tools/doxygen/Doxyfile.core.internal | 16 +- 19 files changed, 392 insertions(+), 386 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index b34da1db3d9..cbcc78156af 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -904,25 +904,12 @@ config("grpc_config") { "src/core/tsi/transport_security_grpc.cc", "src/core/tsi/transport_security_grpc.h", "src/core/tsi/transport_security_interface.h", - "third_party/upb/upb/decode.c", - "third_party/upb/upb/decode.h", - "third_party/upb/upb/encode.c", - "third_party/upb/upb/encode.h", - "third_party/upb/upb/generated_util.h", - "third_party/upb/upb/msg.c", - "third_party/upb/upb/msg.h", - "third_party/upb/upb/port.c", - "third_party/upb/upb/port_def.inc", - "third_party/upb/upb/port_undef.inc", - "third_party/upb/upb/table.c", - "third_party/upb/upb/table.int.h", - "third_party/upb/upb/upb.c", - "third_party/upb/upb/upb.h", ] deps = [ "//third_party/boringssl", "//third_party/zlib", ":gpr", + ":upb", "//third_party/cares", ":address_sorting", ] @@ -1438,26 +1425,13 @@ config("grpc_config") { "src/cpp/util/status.cc", "src/cpp/util/string_ref.cc", "src/cpp/util/time_cc.cc", - "third_party/upb/upb/decode.c", - "third_party/upb/upb/decode.h", - "third_party/upb/upb/encode.c", - "third_party/upb/upb/encode.h", - "third_party/upb/upb/generated_util.h", - "third_party/upb/upb/msg.c", - "third_party/upb/upb/msg.h", - "third_party/upb/upb/port.c", - "third_party/upb/upb/port_def.inc", - "third_party/upb/upb/port_undef.inc", - "third_party/upb/upb/table.c", - "third_party/upb/upb/table.int.h", - "third_party/upb/upb/upb.c", - "third_party/upb/upb/upb.h", ] deps = [ "//third_party/boringssl", "//third_party/protobuf:protobuf_lite", ":grpc", ":gpr", + ":upb", ] public_configs = [ diff --git a/CMakeLists.txt b/CMakeLists.txt index 9decbb4d85b..0b8fe560e75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1323,12 +1323,6 @@ add_library(grpc 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 - third_party/upb/upb/decode.c - third_party/upb/upb/encode.c - third_party/upb/upb/msg.c - third_party/upb/upb/port.c - third_party/upb/upb/table.c - third_party/upb/upb/upb.c src/core/tsi/transport_security.cc src/core/ext/transport/chttp2/client/insecure/channel_create.cc src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc @@ -1483,8 +1477,10 @@ target_link_libraries(grpc ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_CARES_LIBRARIES} ${_gRPC_ADDRESS_SORTING_LIBRARIES} + ${_gRPC_UPB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} gpr + upb ) if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) target_link_libraries(grpc "-framework CoreFoundation") @@ -1767,12 +1763,6 @@ add_library(grpc_cronet src/core/ext/filters/client_channel/subchannel_pool_interface.cc src/core/ext/filters/deadline/deadline_filter.cc src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c - third_party/upb/upb/decode.c - third_party/upb/upb/encode.c - third_party/upb/upb/msg.c - third_party/upb/upb/port.c - third_party/upb/upb/table.c - third_party/upb/upb/upb.c src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c src/core/ext/upb-generated/gogoproto/gogo.upb.c src/core/ext/upb-generated/validate/validate.upb.c @@ -1899,8 +1889,10 @@ target_link_libraries(grpc_cronet ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_CARES_LIBRARIES} ${_gRPC_ADDRESS_SORTING_LIBRARIES} + ${_gRPC_UPB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} gpr + upb ) if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) target_link_libraries(grpc_cronet "-framework CoreFoundation") @@ -2169,12 +2161,6 @@ add_library(grpc_test_util src/core/ext/filters/client_channel/subchannel_pool_interface.cc src/core/ext/filters/deadline/deadline_filter.cc src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c - third_party/upb/upb/decode.c - third_party/upb/upb/encode.c - third_party/upb/upb/msg.c - third_party/upb/upb/port.c - third_party/upb/upb/table.c - third_party/upb/upb/upb.c src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c src/core/ext/upb-generated/gogoproto/gogo.upb.c src/core/ext/upb-generated/validate/validate.upb.c @@ -2249,6 +2235,7 @@ target_link_libraries(grpc_test_util ${_gRPC_ALLTARGETS_LIBRARIES} gpr grpc + upb ) if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) target_link_libraries(grpc_test_util "-framework CoreFoundation") @@ -2518,12 +2505,6 @@ add_library(grpc_test_util_unsecure src/core/ext/filters/client_channel/subchannel_pool_interface.cc src/core/ext/filters/deadline/deadline_filter.cc src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c - third_party/upb/upb/decode.c - third_party/upb/upb/encode.c - third_party/upb/upb/msg.c - third_party/upb/upb/port.c - third_party/upb/upb/table.c - third_party/upb/upb/upb.c src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c src/core/ext/upb-generated/gogoproto/gogo.upb.c src/core/ext/upb-generated/validate/validate.upb.c @@ -2598,6 +2579,7 @@ target_link_libraries(grpc_test_util_unsecure ${_gRPC_ALLTARGETS_LIBRARIES} gpr grpc_unsecure + upb ) if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) target_link_libraries(grpc_test_util_unsecure "-framework CoreFoundation") @@ -2878,12 +2860,6 @@ add_library(grpc_unsecure src/core/ext/filters/client_channel/subchannel_pool_interface.cc src/core/ext/filters/deadline/deadline_filter.cc src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c - third_party/upb/upb/decode.c - third_party/upb/upb/encode.c - third_party/upb/upb/msg.c - third_party/upb/upb/port.c - third_party/upb/upb/table.c - third_party/upb/upb/upb.c src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c src/core/ext/upb-generated/gogoproto/gogo.upb.c src/core/ext/upb-generated/validate/validate.upb.c @@ -2992,8 +2968,10 @@ target_link_libraries(grpc_unsecure ${_gRPC_ZLIB_LIBRARIES} ${_gRPC_CARES_LIBRARIES} ${_gRPC_ADDRESS_SORTING_LIBRARIES} + ${_gRPC_UPB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} gpr + upb ) if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) target_link_libraries(grpc_unsecure "-framework CoreFoundation") @@ -3292,12 +3270,6 @@ add_library(grpc++ src/cpp/util/string_ref.cc src/cpp/util/time_cc.cc src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c - third_party/upb/upb/decode.c - third_party/upb/upb/encode.c - third_party/upb/upb/msg.c - third_party/upb/upb/port.c - third_party/upb/upb/table.c - third_party/upb/upb/upb.c src/cpp/codegen/codegen_init.cc ) @@ -3336,6 +3308,7 @@ target_link_libraries(grpc++ ${_gRPC_ALLTARGETS_LIBRARIES} grpc gpr + upb ) foreach(_hdr @@ -4360,12 +4333,6 @@ add_library(grpc++_unsecure src/cpp/util/string_ref.cc src/cpp/util/time_cc.cc src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c - third_party/upb/upb/decode.c - third_party/upb/upb/encode.c - third_party/upb/upb/msg.c - third_party/upb/upb/port.c - third_party/upb/upb/table.c - third_party/upb/upb/upb.c src/cpp/codegen/codegen_init.cc ) @@ -4403,6 +4370,7 @@ target_link_libraries(grpc++_unsecure ${_gRPC_ALLTARGETS_LIBRARIES} gpr grpc_unsecure + upb ) foreach(_hdr @@ -5430,6 +5398,57 @@ if(gRPC_INSTALL) endif() endif() + +add_library(upb + third_party/upb/upb/decode.c + third_party/upb/upb/encode.c + third_party/upb/upb/msg.c + third_party/upb/upb/port.c + third_party/upb/upb/table.c + third_party/upb/upb/upb.c +) + +set_target_properties(upb PROPERTIES + VERSION ${gRPC_CORE_VERSION} + SOVERSION ${gRPC_CORE_SOVERSION} +) + +if(WIN32 AND MSVC) + set_target_properties(upb PROPERTIES COMPILE_PDB_NAME "upb" + COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" + ) + if(gRPC_INSTALL) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/upb.pdb + DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL + ) + endif() +endif() + +target_include_directories(upb + PUBLIC $ $ + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} +) +target_link_libraries(upb + ${_gRPC_ALLTARGETS_LIBRARIES} +) + + + +if(gRPC_INSTALL) + install(TARGETS upb EXPORT gRPCTargets + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} + ) +endif() + if(gRPC_BUILD_TESTS) add_library(bad_client_test @@ -17909,7 +17928,7 @@ generate_pkgconfig( "high performance general RPC framework" "${gRPC_CORE_VERSION}" "gpr openssl" - "-lgrpc -laddress_sorting -lcares -lz" + "-lgrpc -laddress_sorting -lupb -lcares -lz" "" "grpc.pc") diff --git a/Makefile b/Makefile index a809f63cdc4..9f5a4c68e2b 100644 --- a/Makefile +++ b/Makefile @@ -722,6 +722,10 @@ ADDRESS_SORTING_MERGE_OBJS = $(LIBADDRESS_SORTING_OBJS) ADDRESS_SORTING_MERGE_LIBS = $(LIBDIR)/$(CONFIG)/libaddress_sorting.a CPPFLAGS := -Ithird_party/address_sorting/include $(CPPFLAGS) +UPB_DEP = $(LIBDIR)/$(CONFIG)/libupb.a +UPB_MERGE_OBJS = $(LIBUPB_OBJS) +UPB_MERGE_LIBS = $(LIBDIR)/$(CONFIG)/libupb.a + ifeq ($(EMBED_CARES),true) CARES_DEP = $(LIBDIR)/$(CONFIG)/libares.a CARES_MERGE_OBJS = $(LIBARES_OBJS) @@ -1406,7 +1410,7 @@ $(LIBDIR)/$(CONFIG)/protobuf/libprotobuf.a: third_party/protobuf/configure static: static_c static_cxx -static_c: pc_c pc_c_unsecure cache.mk $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgrpc_cronet.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a +static_c: pc_c pc_c_unsecure cache.mk $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgrpc_cronet.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libupb.a static_cxx: pc_cxx pc_cxx_unsecure cache.mk $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a $(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz.a @@ -1414,7 +1418,7 @@ static_csharp: static_c $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext.a shared: shared_c shared_cxx -shared_c: pc_c pc_c_unsecure cache.mk $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) +shared_c: pc_c pc_c_unsecure cache.mk $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) shared_cxx: pc_cxx pc_cxx_unsecure cache.mk $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) shared_csharp: shared_c $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) @@ -2578,6 +2582,8 @@ ifeq ($(CONFIG),opt) $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libgrpc_cronet.a $(E) "[STRIP] Stripping libgrpc_unsecure.a" $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a + $(E) "[STRIP] Stripping libupb.a" + $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libupb.a endif strip-static_cxx: static_cxx @@ -2606,6 +2612,8 @@ ifeq ($(CONFIG),opt) $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(E) "[STRIP] Stripping $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)" $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) + $(E) "[STRIP] Stripping $(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)" + $(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) endif strip-shared_cxx: shared_cxx @@ -3179,6 +3187,9 @@ install-static_c: static_c strip-static_c install-pkg-config_c $(E) "[INSTALL] Installing libgrpc_unsecure.a" $(Q) $(INSTALL) -d $(prefix)/lib $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(prefix)/lib/libgrpc_unsecure.a + $(E) "[INSTALL] Installing libupb.a" + $(Q) $(INSTALL) -d $(prefix)/lib + $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libupb.a $(prefix)/lib/libupb.a install-static_cxx: static_cxx strip-static_cxx install-pkg-config_cxx $(E) "[INSTALL] Installing libgrpc++.a" @@ -3244,6 +3255,15 @@ ifeq ($(SYSTEM),MINGW32) else ifneq ($(SYSTEM),Darwin) $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc_unsecure.so.9 $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc_unsecure.so +endif + $(E) "[INSTALL] Installing $(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)" + $(Q) $(INSTALL) -d $(prefix)/lib + $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/$(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) +ifeq ($(SYSTEM),MINGW32) + $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE)-dll.a $(prefix)/lib/libupb.a +else ifneq ($(SYSTEM),Darwin) + $(Q) ln -sf $(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libupb.so.9 + $(Q) ln -sf $(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libupb.so endif ifneq ($(SYSTEM),MINGW32) ifneq ($(SYSTEM),Darwin) @@ -3392,18 +3412,18 @@ endif ifeq ($(SYSTEM),MINGW32) -$(LIBDIR)/$(CONFIG)/address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBADDRESS_SORTING_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) +$(LIBDIR)/$(CONFIG)/address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBADDRESS_SORTING_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/address_sorting$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBADDRESS_SORTING_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/address_sorting$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBADDRESS_SORTING_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS) else -$(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBADDRESS_SORTING_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) +$(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBADDRESS_SORTING_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` ifeq ($(SYSTEM),Darwin) - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBADDRESS_SORTING_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBADDRESS_SORTING_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS) else - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libaddress_sorting.so.9 -o $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBADDRESS_SORTING_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libaddress_sorting.so.9 -o $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBADDRESS_SORTING_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS) $(Q) ln -sf $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).so.9 $(Q) ln -sf $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).so endif @@ -3433,7 +3453,7 @@ $(LIBDIR)/$(CONFIG)/libalts_test_util.a: openssl_dep_error else -$(LIBDIR)/$(CONFIG)/libalts_test_util.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBALTS_TEST_UTIL_OBJS) +$(LIBDIR)/$(CONFIG)/libalts_test_util.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBALTS_TEST_UTIL_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libalts_test_util.a @@ -3532,7 +3552,7 @@ PUBLIC_HEADERS_C += \ LIBGPR_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGPR_SRC)))) -$(LIBDIR)/$(CONFIG)/libgpr.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBGPR_OBJS) +$(LIBDIR)/$(CONFIG)/libgpr.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGPR_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgpr.a @@ -3544,18 +3564,18 @@ endif ifeq ($(SYSTEM),MINGW32) -$(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGPR_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) +$(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGPR_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS) else -$(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGPR_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) +$(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGPR_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` ifeq ($(SYSTEM),Darwin) - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS) else - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgpr.so.9 -o $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgpr.so.9 -o $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS) $(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).so.9 $(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).so endif @@ -3821,12 +3841,6 @@ LIBGRPC_SRC = \ 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 \ - third_party/upb/upb/decode.c \ - third_party/upb/upb/encode.c \ - third_party/upb/upb/msg.c \ - third_party/upb/upb/port.c \ - third_party/upb/upb/table.c \ - third_party/upb/upb/upb.c \ src/core/tsi/transport_security.cc \ src/core/ext/transport/chttp2/client/insecure/channel_create.cc \ src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc \ @@ -3999,11 +4013,11 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE else -$(LIBDIR)/$(CONFIG)/libgrpc.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBGRPC_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(OPENSSL_MERGE_OBJS) +$(LIBDIR)/$(CONFIG)/libgrpc.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGRPC_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS) $(OPENSSL_MERGE_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc.a - $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBGRPC_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(OPENSSL_MERGE_OBJS) + $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBGRPC_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS) $(OPENSSL_MERGE_OBJS) ifeq ($(SYSTEM),Darwin) $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc.a endif @@ -4011,18 +4025,18 @@ endif ifeq ($(SYSTEM),MINGW32) -$(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_DEP) +$(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_DEP) $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS) else -$(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_DEP) +$(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_DEP) $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` ifeq ($(SYSTEM),Darwin) - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS) else - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.9 -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.9 -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS) $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so.9 $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so endif @@ -4259,12 +4273,6 @@ LIBGRPC_CRONET_SRC = \ src/core/ext/filters/client_channel/subchannel_pool_interface.cc \ src/core/ext/filters/deadline/deadline_filter.cc \ src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \ - third_party/upb/upb/decode.c \ - third_party/upb/upb/encode.c \ - third_party/upb/upb/msg.c \ - third_party/upb/upb/port.c \ - third_party/upb/upb/table.c \ - third_party/upb/upb/upb.c \ src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \ src/core/ext/upb-generated/gogoproto/gogo.upb.c \ src/core/ext/upb-generated/validate/validate.upb.c \ @@ -4398,11 +4406,11 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_E else -$(LIBDIR)/$(CONFIG)/libgrpc_cronet.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBGRPC_CRONET_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(OPENSSL_MERGE_OBJS) +$(LIBDIR)/$(CONFIG)/libgrpc_cronet.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGRPC_CRONET_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS) $(OPENSSL_MERGE_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_cronet.a - $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_cronet.a $(LIBGRPC_CRONET_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(OPENSSL_MERGE_OBJS) + $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_cronet.a $(LIBGRPC_CRONET_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS) $(OPENSSL_MERGE_OBJS) ifeq ($(SYSTEM),Darwin) $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_cronet.a endif @@ -4410,18 +4418,18 @@ endif ifeq ($(SYSTEM),MINGW32) -$(LIBDIR)/$(CONFIG)/grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_CRONET_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_DEP) +$(LIBDIR)/$(CONFIG)/grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_CRONET_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_DEP) $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc_cronet$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_CRONET_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc_cronet$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_CRONET_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS) else -$(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_CRONET_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_DEP) +$(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_CRONET_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_DEP) $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` ifeq ($(SYSTEM),Darwin) - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_CRONET_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_CRONET_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS) else - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_cronet.so.9 -o $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_CRONET_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_cronet.so.9 -o $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_CRONET_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libupb.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS) $(Q) ln -sf $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).so.9 $(Q) ln -sf $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).so endif @@ -4654,12 +4662,6 @@ LIBGRPC_TEST_UTIL_SRC = \ src/core/ext/filters/client_channel/subchannel_pool_interface.cc \ src/core/ext/filters/deadline/deadline_filter.cc \ src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \ - third_party/upb/upb/decode.c \ - third_party/upb/upb/encode.c \ - third_party/upb/upb/msg.c \ - third_party/upb/upb/port.c \ - third_party/upb/upb/table.c \ - third_party/upb/upb/upb.c \ src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \ src/core/ext/upb-generated/gogoproto/gogo.upb.c \ src/core/ext/upb-generated/validate/validate.upb.c \ @@ -4756,7 +4758,7 @@ $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a: openssl_dep_error else -$(LIBDIR)/$(CONFIG)/libgrpc_test_util.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBGRPC_TEST_UTIL_OBJS) +$(LIBDIR)/$(CONFIG)/libgrpc_test_util.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGRPC_TEST_UTIL_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a @@ -4990,12 +4992,6 @@ LIBGRPC_TEST_UTIL_UNSECURE_SRC = \ src/core/ext/filters/client_channel/subchannel_pool_interface.cc \ src/core/ext/filters/deadline/deadline_filter.cc \ src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \ - third_party/upb/upb/decode.c \ - third_party/upb/upb/encode.c \ - third_party/upb/upb/msg.c \ - third_party/upb/upb/port.c \ - third_party/upb/upb/table.c \ - third_party/upb/upb/upb.c \ src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \ src/core/ext/upb-generated/gogoproto/gogo.upb.c \ src/core/ext/upb-generated/validate/validate.upb.c \ @@ -5082,7 +5078,7 @@ PUBLIC_HEADERS_C += \ LIBGRPC_TEST_UTIL_UNSECURE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_TEST_UTIL_UNSECURE_SRC)))) -$(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBGRPC_TEST_UTIL_UNSECURE_OBJS) +$(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGRPC_TEST_UTIL_UNSECURE_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a @@ -5324,12 +5320,6 @@ LIBGRPC_UNSECURE_SRC = \ src/core/ext/filters/client_channel/subchannel_pool_interface.cc \ src/core/ext/filters/deadline/deadline_filter.cc \ src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \ - third_party/upb/upb/decode.c \ - third_party/upb/upb/encode.c \ - third_party/upb/upb/msg.c \ - third_party/upb/upb/port.c \ - third_party/upb/upb/table.c \ - third_party/upb/upb/upb.c \ src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \ src/core/ext/upb-generated/gogoproto/gogo.upb.c \ src/core/ext/upb-generated/validate/validate.upb.c \ @@ -5445,11 +5435,11 @@ PUBLIC_HEADERS_C += \ LIBGRPC_UNSECURE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_UNSECURE_SRC)))) -$(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBGRPC_UNSECURE_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) +$(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGRPC_UNSECURE_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a - $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBGRPC_UNSECURE_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) + $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBGRPC_UNSECURE_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS) ifeq ($(SYSTEM),Darwin) $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a endif @@ -5457,18 +5447,18 @@ endif ifeq ($(SYSTEM),MINGW32) -$(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_UNSECURE_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a +$(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_UNSECURE_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libupb.a $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libupb.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS) else -$(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_UNSECURE_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a +$(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_UNSECURE_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libupb.a $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` ifeq ($(SYSTEM),Darwin) - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libupb.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS) else - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_unsecure.so.9 -o $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_unsecure.so.9 -o $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libupb.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS) $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).so.9 $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).so endif @@ -5497,7 +5487,7 @@ $(LIBDIR)/$(CONFIG)/libreconnect_server.a: openssl_dep_error else -$(LIBDIR)/$(CONFIG)/libreconnect_server.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBRECONNECT_SERVER_OBJS) +$(LIBDIR)/$(CONFIG)/libreconnect_server.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBRECONNECT_SERVER_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libreconnect_server.a @@ -5536,7 +5526,7 @@ $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a: openssl_dep_error else -$(LIBDIR)/$(CONFIG)/libtest_tcp_server.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBTEST_TCP_SERVER_OBJS) +$(LIBDIR)/$(CONFIG)/libtest_tcp_server.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBTEST_TCP_SERVER_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a @@ -5585,7 +5575,7 @@ $(LIBDIR)/$(CONFIG)/libbm_callback_test_service_impl.a: protobuf_dep_error else -$(LIBDIR)/$(CONFIG)/libbm_callback_test_service_impl.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBBM_CALLBACK_TEST_SERVICE_IMPL_OBJS) +$(LIBDIR)/$(CONFIG)/libbm_callback_test_service_impl.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBBM_CALLBACK_TEST_SERVICE_IMPL_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libbm_callback_test_service_impl.a @@ -5635,7 +5625,7 @@ $(LIBDIR)/$(CONFIG)/libdns_test_util.a: protobuf_dep_error else -$(LIBDIR)/$(CONFIG)/libdns_test_util.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBDNS_TEST_UTIL_OBJS) +$(LIBDIR)/$(CONFIG)/libdns_test_util.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBDNS_TEST_UTIL_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libdns_test_util.a @@ -5705,12 +5695,6 @@ LIBGRPC++_SRC = \ src/cpp/util/string_ref.cc \ src/cpp/util/time_cc.cc \ src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \ - third_party/upb/upb/decode.c \ - third_party/upb/upb/encode.c \ - third_party/upb/upb/msg.c \ - third_party/upb/upb/port.c \ - third_party/upb/upb/table.c \ - third_party/upb/upb/upb.c \ src/cpp/codegen/codegen_init.cc \ PUBLIC_HEADERS_CXX += \ @@ -6000,11 +5984,11 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP else -$(LIBDIR)/$(CONFIG)/libgrpc++.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) +$(LIBDIR)/$(CONFIG)/libgrpc++.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++.a - $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBGRPC++_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) + $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBGRPC++_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS) ifeq ($(SYSTEM),Darwin) $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc++.a endif @@ -6012,18 +5996,18 @@ endif ifeq ($(SYSTEM),MINGW32) -$(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(OPENSSL_DEP) +$(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(OPENSSL_DEP) $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION_CPP).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc$(SHARED_VERSION_CORE)-dll -lgpr$(SHARED_VERSION_CORE)-dll + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION_CPP).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc$(SHARED_VERSION_CORE)-dll -lgpr$(SHARED_VERSION_CORE)-dll -lupb$(SHARED_VERSION_CORE)-dll else -$(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/libgrpc.$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr.$(SHARED_EXT_CORE) $(OPENSSL_DEP) +$(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/libgrpc.$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr.$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb.$(SHARED_EXT_CORE) $(OPENSSL_DEP) $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` ifeq ($(SYSTEM),Darwin) - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc -lgpr + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc -lgpr -lupb else - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc++.so.1 -o $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc -lgpr + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc++.so.1 -o $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc -lgpr -lupb $(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP).so.1 $(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP).so endif @@ -6067,7 +6051,7 @@ $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a: protobuf_dep_error else -$(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_CORE_STATS_OBJS) +$(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_CORE_STATS_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a @@ -6123,11 +6107,11 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$( else -$(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_ERROR_DETAILS_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) +$(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_ERROR_DETAILS_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a - $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a $(LIBGRPC++_ERROR_DETAILS_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) + $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a $(LIBGRPC++_ERROR_DETAILS_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS) ifeq ($(SYSTEM),Darwin) $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a endif @@ -6135,18 +6119,18 @@ endif ifeq ($(SYSTEM),MINGW32) -$(LIBDIR)/$(CONFIG)/grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_ERROR_DETAILS_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(OPENSSL_DEP) +$(LIBDIR)/$(CONFIG)/grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_ERROR_DETAILS_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(OPENSSL_DEP) $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc++_error_details$(SHARED_VERSION_CPP).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_ERROR_DETAILS_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++$(SHARED_VERSION_CPP)-dll + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc++_error_details$(SHARED_VERSION_CPP).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_ERROR_DETAILS_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++$(SHARED_VERSION_CPP)-dll else -$(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_ERROR_DETAILS_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/libgrpc++.$(SHARED_EXT_CPP) $(OPENSSL_DEP) +$(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_ERROR_DETAILS_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/libgrpc++.$(SHARED_EXT_CPP) $(OPENSSL_DEP) $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` ifeq ($(SYSTEM),Darwin) - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_ERROR_DETAILS_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++ + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_ERROR_DETAILS_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++ else - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc++_error_details.so.1 -o $(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_ERROR_DETAILS_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++ + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc++_error_details.so.1 -o $(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_ERROR_DETAILS_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++ $(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP).so.1 $(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP).so endif @@ -6193,7 +6177,7 @@ $(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a: protobuf_dep_error else -$(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_PROTO_REFLECTION_DESC_DB_OBJS) +$(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_PROTO_REFLECTION_DESC_DB_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a @@ -6250,7 +6234,7 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHA else -$(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_REFLECTION_OBJS) +$(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_REFLECTION_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a @@ -6262,18 +6246,18 @@ endif ifeq ($(SYSTEM),MINGW32) -$(LIBDIR)/$(CONFIG)/grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_REFLECTION_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(OPENSSL_DEP) +$(LIBDIR)/$(CONFIG)/grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_REFLECTION_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(OPENSSL_DEP) $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc++_reflection$(SHARED_VERSION_CPP).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_REFLECTION_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++$(SHARED_VERSION_CPP)-dll -lgrpc$(SHARED_VERSION_CORE)-dll + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc++_reflection$(SHARED_VERSION_CPP).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_REFLECTION_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++$(SHARED_VERSION_CPP)-dll -lgrpc$(SHARED_VERSION_CORE)-dll else -$(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_REFLECTION_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/libgrpc++.$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc.$(SHARED_EXT_CORE) $(OPENSSL_DEP) +$(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_REFLECTION_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/libgrpc++.$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc.$(SHARED_EXT_CORE) $(OPENSSL_DEP) $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` ifeq ($(SYSTEM),Darwin) - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_REFLECTION_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++ -lgrpc + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_REFLECTION_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++ -lgrpc else - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc++_reflection.so.1 -o $(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_REFLECTION_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++ -lgrpc + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc++_reflection.so.1 -o $(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_REFLECTION_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++ -lgrpc $(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP).so.1 $(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP).so endif @@ -6318,7 +6302,7 @@ $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a: protobuf_dep_error else -$(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_TEST_CONFIG_OBJS) +$(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_TEST_CONFIG_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a @@ -6492,7 +6476,7 @@ $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a: protobuf_dep_error else -$(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_TEST_UTIL_OBJS) +$(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_TEST_UTIL_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a @@ -6671,7 +6655,7 @@ $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a: protobuf_dep_error else -$(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_TEST_UTIL_UNSECURE_OBJS) +$(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_TEST_UTIL_UNSECURE_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a @@ -6740,12 +6724,6 @@ LIBGRPC++_UNSECURE_SRC = \ src/cpp/util/string_ref.cc \ src/cpp/util/time_cc.cc \ src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \ - third_party/upb/upb/decode.c \ - third_party/upb/upb/encode.c \ - third_party/upb/upb/msg.c \ - third_party/upb/upb/port.c \ - third_party/upb/upb/table.c \ - third_party/upb/upb/upb.c \ src/cpp/codegen/codegen_init.cc \ PUBLIC_HEADERS_CXX += \ @@ -7019,11 +6997,11 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARE else -$(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_UNSECURE_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) +$(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_UNSECURE_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a - $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBGRPC++_UNSECURE_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) + $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBGRPC++_UNSECURE_OBJS) $(LIBGPR_OBJS) $(ZLIB_MERGE_OBJS) $(CARES_MERGE_OBJS) $(ADDRESS_SORTING_MERGE_OBJS) $(UPB_MERGE_OBJS) ifeq ($(SYSTEM),Darwin) $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a endif @@ -7031,18 +7009,18 @@ endif ifeq ($(SYSTEM),MINGW32) -$(LIBDIR)/$(CONFIG)/grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_UNSECURE_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) +$(LIBDIR)/$(CONFIG)/grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_UNSECURE_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc++_unsecure$(SHARED_VERSION_CPP).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_UNSECURE_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgpr$(SHARED_VERSION_CORE)-dll -lgrpc_unsecure$(SHARED_VERSION_CORE)-dll + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc++_unsecure$(SHARED_VERSION_CPP).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_UNSECURE_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgpr$(SHARED_VERSION_CORE)-dll -lgrpc_unsecure$(SHARED_VERSION_CORE)-dll -lupb$(SHARED_VERSION_CORE)-dll else -$(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_UNSECURE_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/libgpr.$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.$(SHARED_EXT_CORE) +$(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_UNSECURE_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/libgpr.$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb.$(SHARED_EXT_CORE) $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` ifeq ($(SYSTEM),Darwin) - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_UNSECURE_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgpr -lgrpc_unsecure + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_UNSECURE_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgpr -lgrpc_unsecure -lupb else - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc++_unsecure.so.1 -o $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_UNSECURE_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgpr -lgrpc_unsecure + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc++_unsecure.so.1 -o $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_UNSECURE_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgpr -lgrpc_unsecure -lupb $(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP).so.1 $(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP).so endif @@ -7082,7 +7060,7 @@ $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a: protobuf_dep_error else -$(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC_BENCHMARK_OBJS) +$(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBGRPC_BENCHMARK_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a @@ -7138,7 +7116,7 @@ $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a: protobuf_dep_error else -$(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC_CLI_LIBS_OBJS) +$(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBGRPC_CLI_LIBS_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a @@ -7191,7 +7169,7 @@ $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: protobuf_dep_error else -$(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC_PLUGIN_SUPPORT_OBJS) +$(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBGRPC_PLUGIN_SUPPORT_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a @@ -7242,7 +7220,7 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARE else -$(LIBDIR)/$(CONFIG)/libgrpcpp_channelz.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPCPP_CHANNELZ_OBJS) +$(LIBDIR)/$(CONFIG)/libgrpcpp_channelz.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBGRPCPP_CHANNELZ_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz.a @@ -7254,18 +7232,18 @@ endif ifeq ($(SYSTEM),MINGW32) -$(LIBDIR)/$(CONFIG)/grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPCPP_CHANNELZ_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(OPENSSL_DEP) +$(LIBDIR)/$(CONFIG)/grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPCPP_CHANNELZ_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(OPENSSL_DEP) $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpcpp_channelz$(SHARED_VERSION_CPP).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpcpp_channelz$(SHARED_VERSION_CPP)-dll.a -o $(LIBDIR)/$(CONFIG)/grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPCPP_CHANNELZ_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++$(SHARED_VERSION_CPP)-dll -lgrpc$(SHARED_VERSION_CORE)-dll + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpcpp_channelz$(SHARED_VERSION_CPP).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpcpp_channelz$(SHARED_VERSION_CPP)-dll.a -o $(LIBDIR)/$(CONFIG)/grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPCPP_CHANNELZ_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++$(SHARED_VERSION_CPP)-dll -lgrpc$(SHARED_VERSION_CORE)-dll else -$(LIBDIR)/$(CONFIG)/libgrpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPCPP_CHANNELZ_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/libgrpc++.$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc.$(SHARED_EXT_CORE) $(OPENSSL_DEP) +$(LIBDIR)/$(CONFIG)/libgrpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPCPP_CHANNELZ_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/libgrpc++.$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc.$(SHARED_EXT_CORE) $(OPENSSL_DEP) $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` ifeq ($(SYSTEM),Darwin) - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPCPP_CHANNELZ_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++ -lgrpc + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPCPP_CHANNELZ_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++ -lgrpc else - $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpcpp_channelz.so.1 -o $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPCPP_CHANNELZ_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++ -lgrpc + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpcpp_channelz.so.1 -o $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPCPP_CHANNELZ_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++ -lgrpc $(Q) ln -sf $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz$(SHARED_VERSION_CPP).so.1 $(Q) ln -sf $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz$(SHARED_VERSION_CPP).so endif @@ -7313,7 +7291,7 @@ $(LIBDIR)/$(CONFIG)/libhttp2_client_main.a: protobuf_dep_error else -$(LIBDIR)/$(CONFIG)/libhttp2_client_main.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBHTTP2_CLIENT_MAIN_OBJS) +$(LIBDIR)/$(CONFIG)/libhttp2_client_main.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBHTTP2_CLIENT_MAIN_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libhttp2_client_main.a @@ -7364,7 +7342,7 @@ $(LIBDIR)/$(CONFIG)/libinterop_client_helper.a: protobuf_dep_error else -$(LIBDIR)/$(CONFIG)/libinterop_client_helper.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_CLIENT_HELPER_OBJS) +$(LIBDIR)/$(CONFIG)/libinterop_client_helper.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_CLIENT_HELPER_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libinterop_client_helper.a @@ -7418,7 +7396,7 @@ $(LIBDIR)/$(CONFIG)/libinterop_client_main.a: protobuf_dep_error else -$(LIBDIR)/$(CONFIG)/libinterop_client_main.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_CLIENT_MAIN_OBJS) +$(LIBDIR)/$(CONFIG)/libinterop_client_main.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_CLIENT_MAIN_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libinterop_client_main.a @@ -7469,7 +7447,7 @@ $(LIBDIR)/$(CONFIG)/libinterop_server_helper.a: protobuf_dep_error else -$(LIBDIR)/$(CONFIG)/libinterop_server_helper.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_SERVER_HELPER_OBJS) +$(LIBDIR)/$(CONFIG)/libinterop_server_helper.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_SERVER_HELPER_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libinterop_server_helper.a @@ -7521,7 +7499,7 @@ $(LIBDIR)/$(CONFIG)/libinterop_server_lib.a: protobuf_dep_error else -$(LIBDIR)/$(CONFIG)/libinterop_server_lib.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_SERVER_LIB_OBJS) +$(LIBDIR)/$(CONFIG)/libinterop_server_lib.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_SERVER_LIB_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libinterop_server_lib.a @@ -7571,7 +7549,7 @@ $(LIBDIR)/$(CONFIG)/libinterop_server_main.a: protobuf_dep_error else -$(LIBDIR)/$(CONFIG)/libinterop_server_main.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_SERVER_MAIN_OBJS) +$(LIBDIR)/$(CONFIG)/libinterop_server_main.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_SERVER_MAIN_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libinterop_server_main.a @@ -7639,7 +7617,7 @@ $(LIBDIR)/$(CONFIG)/libqps.a: protobuf_dep_error else -$(LIBDIR)/$(CONFIG)/libqps.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBQPS_OBJS) +$(LIBDIR)/$(CONFIG)/libqps.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBQPS_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libqps.a @@ -7694,7 +7672,7 @@ $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SH else -$(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBGRPC_CSHARP_EXT_OBJS) +$(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBGRPC_CSHARP_EXT_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext.a @@ -7706,18 +7684,18 @@ endif ifeq ($(SYSTEM),MINGW32) -$(LIBDIR)/$(CONFIG)/grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP): $(LIBGRPC_CSHARP_EXT_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_DEP) +$(LIBDIR)/$(CONFIG)/grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP): $(LIBGRPC_CSHARP_EXT_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_DEP) $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` - $(Q) $(LDXX) $(LDFLAGS) $(if $(subst Linux,,$(SYSTEM)),,-Wl$(comma)-wrap$(comma)memcpy) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc_csharp_ext$(SHARED_VERSION_CSHARP).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CSHARP)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(LIBGRPC_CSHARP_EXT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) $(if $(subst Linux,,$(SYSTEM)),,-Wl$(comma)-wrap$(comma)memcpy) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc_csharp_ext$(SHARED_VERSION_CSHARP).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CSHARP)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(LIBGRPC_CSHARP_EXT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS) else -$(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP): $(LIBGRPC_CSHARP_EXT_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_DEP) +$(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP): $(LIBGRPC_CSHARP_EXT_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_DEP) $(E) "[LD] Linking $@" $(Q) mkdir -p `dirname $@` ifeq ($(SYSTEM),Darwin) - $(Q) $(LDXX) $(LDFLAGS) $(if $(subst Linux,,$(SYSTEM)),,-Wl$(comma)-wrap$(comma)memcpy) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(LIBGRPC_CSHARP_EXT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) $(if $(subst Linux,,$(SYSTEM)),,-Wl$(comma)-wrap$(comma)memcpy) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(LIBGRPC_CSHARP_EXT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS) else - $(Q) $(LDXX) $(LDFLAGS) $(if $(subst Linux,,$(SYSTEM)),,-Wl$(comma)-wrap$(comma)memcpy) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_csharp_ext.so.2 -o $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(LIBGRPC_CSHARP_EXT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS) + $(Q) $(LDXX) $(LDFLAGS) $(if $(subst Linux,,$(SYSTEM)),,-Wl$(comma)-wrap$(comma)memcpy) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_csharp_ext.so.2 -o $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(LIBGRPC_CSHARP_EXT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS) $(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CSHARP).so.2 $(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CSHARP).so endif @@ -8006,7 +7984,7 @@ $(LIBBORINGSSL_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=h $(LIBBORINGSSL_OBJS): CXXFLAGS += -fno-exceptions $(LIBBORINGSSL_OBJS): CFLAGS += -g -$(LIBDIR)/$(CONFIG)/libboringssl.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBBORINGSSL_OBJS) +$(LIBDIR)/$(CONFIG)/libboringssl.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBBORINGSSL_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl.a @@ -8046,7 +8024,7 @@ $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a: protobuf_dep_error else -$(LIBDIR)/$(CONFIG)/libboringssl_test_util.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBBORINGSSL_TEST_UTIL_OBJS) +$(LIBDIR)/$(CONFIG)/libboringssl_test_util.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBBORINGSSL_TEST_UTIL_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a @@ -8101,7 +8079,7 @@ $(LIBDIR)/$(CONFIG)/libbenchmark.a: protobuf_dep_error else -$(LIBDIR)/$(CONFIG)/libbenchmark.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBBENCHMARK_OBJS) +$(LIBDIR)/$(CONFIG)/libbenchmark.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBBENCHMARK_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libbenchmark.a @@ -8120,6 +8098,68 @@ ifneq ($(NO_DEPS),true) endif +LIBUPB_SRC = \ + third_party/upb/upb/decode.c \ + third_party/upb/upb/encode.c \ + third_party/upb/upb/msg.c \ + third_party/upb/upb/port.c \ + third_party/upb/upb/table.c \ + third_party/upb/upb/upb.c \ + +PUBLIC_HEADERS_C += \ + +LIBUPB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBUPB_SRC)))) + + +ifeq ($(NO_SECURE),true) + +# You can't build secure libraries if you don't have OpenSSL. + +$(LIBDIR)/$(CONFIG)/libupb.a: openssl_dep_error + +$(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): openssl_dep_error + +else + + +$(LIBDIR)/$(CONFIG)/libupb.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBUPB_OBJS) + $(E) "[AR] Creating $@" + $(Q) mkdir -p `dirname $@` + $(Q) rm -f $(LIBDIR)/$(CONFIG)/libupb.a + $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libupb.a $(LIBUPB_OBJS) +ifeq ($(SYSTEM),Darwin) + $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libupb.a +endif + + + +ifeq ($(SYSTEM),MINGW32) +$(LIBDIR)/$(CONFIG)/upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(OPENSSL_DEP) + $(E) "[LD] Linking $@" + $(Q) mkdir -p `dirname $@` + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/upb$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS) +else +$(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBUPB_OBJS) $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(OPENSSL_DEP) + $(E) "[LD] Linking $@" + $(Q) mkdir -p `dirname $@` +ifeq ($(SYSTEM),Darwin) + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS) +else + $(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libupb.so.9 -o $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBUPB_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS) $(LDLIBS) + $(Q) ln -sf $(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).so.9 + $(Q) ln -sf $(SHARED_PREFIX)upb$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libupb$(SHARED_VERSION_CORE).so +endif +endif + +endif + +ifneq ($(NO_SECURE),true) +ifneq ($(NO_DEPS),true) +-include $(LIBUPB_OBJS:.o=.dep) +endif +endif + + LIBZ_SRC = \ third_party/zlib/adler32.c \ third_party/zlib/compress.c \ @@ -8262,7 +8302,7 @@ $(LIBDIR)/$(CONFIG)/libbad_client_test.a: protobuf_dep_error else -$(LIBDIR)/$(CONFIG)/libbad_client_test.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBBAD_CLIENT_TEST_OBJS) +$(LIBDIR)/$(CONFIG)/libbad_client_test.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(PROTOBUF_DEP) $(LIBBAD_CLIENT_TEST_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libbad_client_test.a @@ -8303,7 +8343,7 @@ $(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a: openssl_dep_error else -$(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBBAD_SSL_TEST_SERVER_OBJS) +$(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBBAD_SSL_TEST_SERVER_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a @@ -8421,7 +8461,7 @@ $(LIBDIR)/$(CONFIG)/libend2end_tests.a: openssl_dep_error else -$(LIBDIR)/$(CONFIG)/libend2end_tests.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBEND2END_TESTS_OBJS) +$(LIBDIR)/$(CONFIG)/libend2end_tests.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBEND2END_TESTS_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libend2end_tests.a @@ -8528,7 +8568,7 @@ PUBLIC_HEADERS_C += \ LIBEND2END_NOSEC_TESTS_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBEND2END_NOSEC_TESTS_SRC)))) -$(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBEND2END_NOSEC_TESTS_OBJS) +$(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) $(LIBEND2END_NOSEC_TESTS_OBJS) $(E) "[AR] Creating $@" $(Q) mkdir -p `dirname $@` $(Q) rm -f $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a @@ -22853,6 +22893,12 @@ test/cpp/util/string_ref_helper.cc: $(OPENSSL_DEP) test/cpp/util/subprocess.cc: $(OPENSSL_DEP) test/cpp/util/test_config_cc.cc: $(OPENSSL_DEP) test/cpp/util/test_credentials_provider.cc: $(OPENSSL_DEP) +third_party/upb/upb/decode.c: $(OPENSSL_DEP) +third_party/upb/upb/encode.c: $(OPENSSL_DEP) +third_party/upb/upb/msg.c: $(OPENSSL_DEP) +third_party/upb/upb/port.c: $(OPENSSL_DEP) +third_party/upb/upb/table.c: $(OPENSSL_DEP) +third_party/upb/upb/upb.c: $(OPENSSL_DEP) endif .PHONY: all strip tools dep_error openssl_dep_error openssl_dep_message git_update stop buildtests buildtests_c buildtests_cxx test test_c test_cxx install install_c install_cxx install-headers install-headers_c install-headers_cxx install-shared install-shared_c install-shared_cxx install-static install-static_c install-static_cxx strip strip-shared strip-static strip_c strip-shared_c strip-static_c strip_cxx strip-shared_cxx strip-static_cxx dep_c dep_cxx bins_dep_c bins_dep_cxx clean diff --git a/build.yaml b/build.yaml index a8c4bfe4e87..c33716e88ae 100644 --- a/build.yaml +++ b/build.yaml @@ -69,7 +69,7 @@ filegroups: - 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 - uses: + deps: - upb - name: alts_util public_headers: @@ -89,11 +89,12 @@ filegroups: - src/core/lib/security/credentials/alts/grpc_alts_credentials_server_options.cc - src/core/tsi/alts/handshaker/alts_tsi_utils.cc - src/core/tsi/alts/handshaker/transport_security_common_api.cc + deps: + - upb uses: - alts_upb - grpc_base - tsi_interface - - upb - name: census public_headers: - include/grpc/census.h @@ -201,7 +202,7 @@ filegroups: - 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 - uses: + deps: - upb - name: gpr_base src: @@ -1052,7 +1053,7 @@ filegroups: - src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.h src: - src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c - uses: + deps: - upb - name: grpc_http_filters headers: @@ -1096,13 +1097,14 @@ filegroups: - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc - src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc + deps: + - upb plugin: grpc_lb_policy_grpclb uses: - grpc_base - grpc_client_channel - grpc_lb_upb - grpc_resolver_fake - - upb - name: grpc_lb_policy_grpclb_secure headers: - src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h @@ -1116,6 +1118,8 @@ filegroups: - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc - src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc + deps: + - upb plugin: grpc_lb_policy_grpclb uses: - grpc_base @@ -1123,7 +1127,6 @@ filegroups: - grpc_lb_upb - grpc_resolver_fake - grpc_secure - - upb - name: grpc_lb_policy_pick_first src: - src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc @@ -1171,9 +1174,10 @@ filegroups: - src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.h src: - src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c + deps: + - upb uses: - google_api_upb - - upb - name: grpc_max_age_filter headers: - src/core/ext/filters/max_age/max_age_filter.h @@ -6241,9 +6245,10 @@ php_config_m4: deps: - grpc - gpr + - address_sorting - boringssl + - upb - z - - address_sorting headers: - src/php/ext/grpc/byte_buffer.h - src/php/ext/grpc/call.h @@ -6272,15 +6277,17 @@ python_dependencies: deps: - grpc - gpr + - address_sorting - ares - boringssl + - upb - z - - address_sorting ruby_gem: deps: - grpc - gpr + - address_sorting - ares - boringssl + - upb - z - - address_sorting diff --git a/cmake/upb.cmake b/cmake/upb.cmake index 3affa25d382..2c0ab84e677 100644 --- a/cmake/upb.cmake +++ b/cmake/upb.cmake @@ -16,3 +16,5 @@ set(UPB_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/upb) set(_gRPC_UPB_INCLUDE_DIR "${UPB_ROOT_DIR}") set(_gRPC_UPB_GRPC_GENERATED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated") + +set(_gRPC_UPB_LIBRARIES upb) diff --git a/config.m4 b/config.m4 index a27f3dac28c..02a59541c18 100644 --- a/config.m4 +++ b/config.m4 @@ -343,12 +343,6 @@ if test "$PHP_GRPC" != "no"; then 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 \ - third_party/upb/upb/decode.c \ - third_party/upb/upb/encode.c \ - third_party/upb/upb/msg.c \ - third_party/upb/upb/port.c \ - third_party/upb/upb/table.c \ - third_party/upb/upb/upb.c \ src/core/tsi/transport_security.cc \ src/core/ext/transport/chttp2/client/insecure/channel_create.cc \ src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc \ @@ -732,6 +726,12 @@ if test "$PHP_GRPC" != "no"; then third_party/boringssl/ssl/tls_method.cc \ third_party/boringssl/ssl/tls_record.cc \ third_party/boringssl/third_party/fiat/curve25519.c \ + third_party/upb/upb/decode.c \ + third_party/upb/upb/encode.c \ + third_party/upb/upb/msg.c \ + third_party/upb/upb/port.c \ + third_party/upb/upb/table.c \ + third_party/upb/upb/upb.c \ , $ext_shared, , -fvisibility=hidden \ -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN \ -D_HAS_EXCEPTIONS=0 -DNOMINMAX -DGRPC_ARES=0 \ diff --git a/config.w32 b/config.w32 index 577cee82202..0062eafa8b6 100644 --- a/config.w32 +++ b/config.w32 @@ -313,12 +313,6 @@ if (PHP_GRPC != "no") { "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 " + - "third_party\\upb\\upb\\decode.c " + - "third_party\\upb\\upb\\encode.c " + - "third_party\\upb\\upb\\msg.c " + - "third_party\\upb\\upb\\port.c " + - "third_party\\upb\\upb\\table.c " + - "third_party\\upb\\upb\\upb.c " + "src\\core\\tsi\\transport_security.cc " + "src\\core\\ext\\transport\\chttp2\\client\\insecure\\channel_create.cc " + "src\\core\\ext\\transport\\chttp2\\client\\insecure\\channel_create_posix.cc " + @@ -702,6 +696,12 @@ if (PHP_GRPC != "no") { "third_party\\boringssl\\ssl\\tls_method.cc " + "third_party\\boringssl\\ssl\\tls_record.cc " + "third_party\\boringssl\\third_party\\fiat\\curve25519.c " + + "third_party\\upb\\upb\\decode.c " + + "third_party\\upb\\upb\\encode.c " + + "third_party\\upb\\upb\\msg.c " + + "third_party\\upb\\upb\\port.c " + + "third_party\\upb\\upb\\table.c " + + "third_party\\upb\\upb\\upb.c " + "third_party\\zlib\\adler32.c " + "third_party\\zlib\\compress.c " + "third_party\\zlib\\crc32.c " + diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 6ca0742a6b2..6d7059d238d 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -465,15 +465,7 @@ Pod::Spec.new do |s| 'src/cpp/server/health/default_health_check_service.h', 'src/cpp/server/secure_server_credentials.h', 'src/cpp/server/thread_pool_interface.h', - 'src/cpp/thread_manager/thread_manager.h', - 'third_party/upb/upb/decode.h', - 'third_party/upb/upb/encode.h', - 'third_party/upb/upb/generated_util.h', - 'third_party/upb/upb/msg.h', - 'third_party/upb/upb/port_def.inc', - 'third_party/upb/upb/port_undef.inc', - 'third_party/upb/upb/table.int.h', - 'third_party/upb/upb/upb.h' + 'src/cpp/thread_manager/thread_manager.h' end s.subspec 'Protobuf' do |ss| diff --git a/grpc.gemspec b/grpc.gemspec index d095a9a2372..bcc49452099 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -270,14 +270,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.h ) s.files += %w( src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.h ) s.files += %w( src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.h ) - s.files += %w( third_party/upb/upb/decode.h ) - s.files += %w( third_party/upb/upb/encode.h ) - s.files += %w( third_party/upb/upb/generated_util.h ) - s.files += %w( third_party/upb/upb/msg.h ) - s.files += %w( third_party/upb/upb/port_def.inc ) - s.files += %w( third_party/upb/upb/port_undef.inc ) - s.files += %w( third_party/upb/upb/table.int.h ) - s.files += %w( third_party/upb/upb/upb.h ) s.files += %w( src/core/tsi/transport_security.h ) s.files += %w( src/core/tsi/transport_security_interface.h ) s.files += %w( src/core/ext/transport/chttp2/client/authority.h ) @@ -775,12 +767,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c ) s.files += %w( src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c ) s.files += %w( src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c ) - s.files += %w( third_party/upb/upb/decode.c ) - s.files += %w( third_party/upb/upb/encode.c ) - s.files += %w( third_party/upb/upb/msg.c ) - s.files += %w( third_party/upb/upb/port.c ) - s.files += %w( third_party/upb/upb/table.c ) - s.files += %w( third_party/upb/upb/upb.c ) s.files += %w( src/core/tsi/transport_security.cc ) s.files += %w( src/core/ext/transport/chttp2/client/insecure/channel_create.cc ) s.files += %w( src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc ) @@ -1354,6 +1340,20 @@ Gem::Specification.new do |s| s.files += %w( third_party/boringssl/ssl/tls_method.cc ) s.files += %w( third_party/boringssl/ssl/tls_record.cc ) s.files += %w( third_party/boringssl/third_party/fiat/curve25519.c ) + s.files += %w( third_party/upb/upb/decode.h ) + s.files += %w( third_party/upb/upb/encode.h ) + s.files += %w( third_party/upb/upb/generated_util.h ) + s.files += %w( third_party/upb/upb/msg.h ) + s.files += %w( third_party/upb/upb/port_def.inc ) + s.files += %w( third_party/upb/upb/port_undef.inc ) + s.files += %w( third_party/upb/upb/table.int.h ) + s.files += %w( third_party/upb/upb/upb.h ) + s.files += %w( third_party/upb/upb/decode.c ) + s.files += %w( third_party/upb/upb/encode.c ) + s.files += %w( third_party/upb/upb/msg.c ) + s.files += %w( third_party/upb/upb/port.c ) + s.files += %w( third_party/upb/upb/table.c ) + s.files += %w( third_party/upb/upb/upb.c ) s.files += %w( third_party/zlib/crc32.h ) s.files += %w( third_party/zlib/deflate.h ) s.files += %w( third_party/zlib/gzguts.h ) diff --git a/grpc.gyp b/grpc.gyp index 422672ab37c..c9eb7fd1789 100644 --- a/grpc.gyp +++ b/grpc.gyp @@ -225,6 +225,7 @@ 'type': 'static_library', 'dependencies': [ 'gpr', + 'upb', ], 'sources': [ 'src/core/lib/surface/init.cc', @@ -481,12 +482,6 @@ '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', - 'third_party/upb/upb/decode.c', - 'third_party/upb/upb/encode.c', - 'third_party/upb/upb/msg.c', - 'third_party/upb/upb/port.c', - 'third_party/upb/upb/table.c', - 'third_party/upb/upb/upb.c', 'src/core/tsi/transport_security.cc', 'src/core/ext/transport/chttp2/client/insecure/channel_create.cc', 'src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc', @@ -614,6 +609,7 @@ 'dependencies': [ 'gpr', 'grpc', + 'upb', ], 'sources': [ 'test/core/end2end/data/client_certs.cc', @@ -833,12 +829,6 @@ 'src/core/ext/filters/client_channel/subchannel_pool_interface.cc', 'src/core/ext/filters/deadline/deadline_filter.cc', 'src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c', - 'third_party/upb/upb/decode.c', - 'third_party/upb/upb/encode.c', - 'third_party/upb/upb/msg.c', - 'third_party/upb/upb/port.c', - 'third_party/upb/upb/table.c', - 'third_party/upb/upb/upb.c', 'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c', 'src/core/ext/upb-generated/gogoproto/gogo.upb.c', 'src/core/ext/upb-generated/validate/validate.upb.c', @@ -888,6 +878,7 @@ 'dependencies': [ 'gpr', 'grpc_unsecure', + 'upb', ], 'sources': [ 'src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc', @@ -1102,12 +1093,6 @@ 'src/core/ext/filters/client_channel/subchannel_pool_interface.cc', 'src/core/ext/filters/deadline/deadline_filter.cc', 'src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c', - 'third_party/upb/upb/decode.c', - 'third_party/upb/upb/encode.c', - 'third_party/upb/upb/msg.c', - 'third_party/upb/upb/port.c', - 'third_party/upb/upb/table.c', - 'third_party/upb/upb/upb.c', 'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c', 'src/core/ext/upb-generated/gogoproto/gogo.upb.c', 'src/core/ext/upb-generated/validate/validate.upb.c', @@ -1156,6 +1141,7 @@ 'type': 'static_library', 'dependencies': [ 'gpr', + 'upb', ], 'sources': [ 'src/core/lib/surface/init.cc', @@ -1382,12 +1368,6 @@ 'src/core/ext/filters/client_channel/subchannel_pool_interface.cc', 'src/core/ext/filters/deadline/deadline_filter.cc', 'src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c', - 'third_party/upb/upb/decode.c', - 'third_party/upb/upb/encode.c', - 'third_party/upb/upb/msg.c', - 'third_party/upb/upb/port.c', - 'third_party/upb/upb/table.c', - 'third_party/upb/upb/upb.c', 'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c', 'src/core/ext/upb-generated/gogoproto/gogo.upb.c', 'src/core/ext/upb-generated/validate/validate.upb.c', @@ -1522,6 +1502,7 @@ 'dependencies': [ 'grpc', 'gpr', + 'upb', ], 'sources': [ 'src/cpp/client/insecure_credentials.cc', @@ -1570,12 +1551,6 @@ 'src/cpp/util/string_ref.cc', 'src/cpp/util/time_cc.cc', 'src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c', - 'third_party/upb/upb/decode.c', - 'third_party/upb/upb/encode.c', - 'third_party/upb/upb/msg.c', - 'third_party/upb/upb/port.c', - 'third_party/upb/upb/table.c', - 'third_party/upb/upb/upb.c', 'src/cpp/codegen/codegen_init.cc', ], }, @@ -1689,6 +1664,7 @@ 'dependencies': [ 'gpr', 'grpc_unsecure', + 'upb', ], 'sources': [ 'src/cpp/client/insecure_credentials.cc', @@ -1730,12 +1706,6 @@ 'src/cpp/util/string_ref.cc', 'src/cpp/util/time_cc.cc', 'src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c', - 'third_party/upb/upb/decode.c', - 'third_party/upb/upb/encode.c', - 'third_party/upb/upb/msg.c', - 'third_party/upb/upb/port.c', - 'third_party/upb/upb/table.c', - 'third_party/upb/upb/upb.c', 'src/cpp/codegen/codegen_init.cc', ], }, @@ -2247,6 +2217,20 @@ 'third_party/benchmark/src/timers.cc', ], }, + { + 'target_name': 'upb', + 'type': 'static_library', + 'dependencies': [ + ], + 'sources': [ + 'third_party/upb/upb/decode.c', + 'third_party/upb/upb/encode.c', + 'third_party/upb/upb/msg.c', + 'third_party/upb/upb/port.c', + 'third_party/upb/upb/table.c', + 'third_party/upb/upb/upb.c', + ], + }, { 'target_name': 'z', 'type': 'static_library', diff --git a/package.xml b/package.xml index 1f6d4bc53b9..fb76344b987 100644 --- a/package.xml +++ b/package.xml @@ -275,14 +275,6 @@ - - - - - - - - @@ -780,12 +772,6 @@ - - - - - - @@ -1359,6 +1345,20 @@ + + + + + + + + + + + + + + diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index d750439eda6..26af38c350d 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -312,12 +312,6 @@ CORE_SOURCE_FILES = [ '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', - 'third_party/upb/upb/decode.c', - 'third_party/upb/upb/encode.c', - 'third_party/upb/upb/msg.c', - 'third_party/upb/upb/port.c', - 'third_party/upb/upb/table.c', - 'third_party/upb/upb/upb.c', 'src/core/tsi/transport_security.cc', 'src/core/ext/transport/chttp2/client/insecure/channel_create.cc', 'src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc', @@ -701,6 +695,12 @@ CORE_SOURCE_FILES = [ 'third_party/boringssl/ssl/tls_method.cc', 'third_party/boringssl/ssl/tls_record.cc', 'third_party/boringssl/third_party/fiat/curve25519.c', + 'third_party/upb/upb/decode.c', + 'third_party/upb/upb/encode.c', + 'third_party/upb/upb/msg.c', + 'third_party/upb/upb/port.c', + 'third_party/upb/upb/table.c', + 'third_party/upb/upb/upb.c', 'third_party/zlib/adler32.c', 'third_party/zlib/compress.c', 'third_party/zlib/crc32.c', diff --git a/src/upb/gen_build_yaml.py b/src/upb/gen_build_yaml.py index ba11ebd846c..eb904a512a3 100755 --- a/src/upb/gen_build_yaml.py +++ b/src/upb/gen_build_yaml.py @@ -21,36 +21,34 @@ import os import sys import yaml -hdrs = [ - "third_party/upb/upb/decode.h", - "third_party/upb/upb/encode.h", - "third_party/upb/upb/generated_util.h", - "third_party/upb/upb/msg.h", - "third_party/upb/upb/port_def.inc", - "third_party/upb/upb/port_undef.inc", - "third_party/upb/upb/table.int.h", - "third_party/upb/upb/upb.h", -] - -srcs = [ - "third_party/upb/upb/decode.c", - "third_party/upb/upb/encode.c", - "third_party/upb/upb/msg.c", - "third_party/upb/upb/port.c", - "third_party/upb/upb/table.c", - "third_party/upb/upb/upb.c", -] - out = {} try: - out['filegroups'] = [{ - 'name': 'upb', - 'src': srcs, - 'uses': [ 'upb_headers' ], - }, { - 'name': 'upb_headers', - 'headers': hdrs, + out['libs'] = [{ + 'name': + 'upb', + 'build': + 'all', + 'language': + 'c', + 'src': [ + "third_party/upb/upb/decode.c", + "third_party/upb/upb/encode.c", + "third_party/upb/upb/msg.c", + "third_party/upb/upb/port.c", + "third_party/upb/upb/table.c", + "third_party/upb/upb/upb.c", + ], + 'headers': [ + "third_party/upb/upb/decode.h", + "third_party/upb/upb/encode.h", + "third_party/upb/upb/generated_util.h", + "third_party/upb/upb/msg.h", + "third_party/upb/upb/port_def.inc", + "third_party/upb/upb/port_undef.inc", + "third_party/upb/upb/table.int.h", + "third_party/upb/upb/upb.h", + ], }] except: pass diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template index 2a1160faaee..923cda9b34c 100644 --- a/templates/CMakeLists.txt.template +++ b/templates/CMakeLists.txt.template @@ -47,6 +47,7 @@ deps.append("${_gRPC_ZLIB_LIBRARIES}") deps.append("${_gRPC_CARES_LIBRARIES}") deps.append("${_gRPC_ADDRESS_SORTING_LIBRARIES}") + deps.append("${_gRPC_UPB_LIBRARIES}") deps.append("${_gRPC_ALLTARGETS_LIBRARIES}") for d in target_dict.get('deps', []): if d == 'benchmark': @@ -376,7 +377,7 @@ % for lib in libs: % if lib.build in ["all", "protoc", "tool", "test", "private"] and not lib.boringssl: % if not lib.get('build_system', []) or 'cmake' in lib.get('build_system', []): - % if not lib.name in ['ares', 'benchmark', 'upb', 'z']: # we build these using CMake instead + % if not lib.name in ['ares', 'benchmark', 'z']: # we build these using CMake instead % if lib.build in ["test", "private"]: if(gRPC_BUILD_TESTS) ${cc_library(lib)} @@ -656,7 +657,7 @@ "high performance general RPC framework" "<%text>${gRPC_CORE_VERSION}" "gpr openssl" - "-lgrpc -laddress_sorting -lcares -lz" + "-lgrpc -laddress_sorting -lupb -lcares -lz" "" "grpc.pc") diff --git a/templates/Makefile.template b/templates/Makefile.template index d925305031d..8063bd47710 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -613,6 +613,10 @@ ADDRESS_SORTING_MERGE_LIBS = $(LIBDIR)/$(CONFIG)/libaddress_sorting.a CPPFLAGS := -Ithird_party/address_sorting/include $(CPPFLAGS) + UPB_DEP = $(LIBDIR)/$(CONFIG)/libupb.a + UPB_MERGE_OBJS = $(LIBUPB_OBJS) + UPB_MERGE_LIBS = $(LIBDIR)/$(CONFIG)/libupb.a + ifeq ($(EMBED_CARES),true) CARES_DEP = $(LIBDIR)/$(CONFIG)/libares.a CARES_MERGE_OBJS = $(LIBARES_OBJS) @@ -1527,7 +1531,7 @@ else % endif - $(LIBDIR)/$(CONFIG)/lib${lib.name}.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)\ + $(LIBDIR)/$(CONFIG)/lib${lib.name}.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP) \ ## The else here corresponds to the if secure earlier. % else: % if lib.language == 'c++': @@ -1545,10 +1549,11 @@ % endif $(LIBDIR)/$(CONFIG)/lib${lib.name}.a: \ - % if lib.name not in ['z', 'ares', 'address_sorting']: + % if lib.name not in ['z', 'ares', 'address_sorting', 'upb']: $(ZLIB_DEP) \ $(CARES_DEP) \ $(ADDRESS_SORTING_DEP) \ + $(UPB_DEP) \ % endif % endif % if lib.language == 'c++': @@ -1560,6 +1565,7 @@ $(ZLIB_MERGE_OBJS) \ $(CARES_MERGE_OBJS) \ $(ADDRESS_SORTING_MERGE_OBJS) \ + $(UPB_MERGE_OBJS) \ % if lib.get('secure', 'check') == True: $(OPENSSL_MERGE_OBJS) \ % endif @@ -1574,6 +1580,7 @@ $(ZLIB_MERGE_OBJS) \ $(CARES_MERGE_OBJS) \ $(ADDRESS_SORTING_MERGE_OBJS) \ + $(UPB_MERGE_OBJS) \ % if lib.get('secure', 'check') == True: $(OPENSSL_MERGE_OBJS) \ % endif @@ -1596,9 +1603,9 @@ common = '$(LIB' + lib.name.upper() + '_OBJS)' link_libs = '' - lib_deps = ' $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)' + lib_deps = ' $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP)' mingw_libs = '' - mingw_lib_deps = ' $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)' + mingw_lib_deps = ' $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(UPB_DEP)' if lib.language == 'c++': lib_deps += ' $(PROTOBUF_DEP)' mingw_lib_deps += ' $(PROTOBUF_DEP)' @@ -1623,7 +1630,7 @@ security = lib.get('secure', 'check') if security == True: common = common + ' $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE)' - common = common + ' $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS)' + common = common + ' $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(UPB_MERGE_LIBS)' if security in [True, 'check']: for src in lib.src: diff --git a/templates/gRPC-C++.podspec.template b/templates/gRPC-C++.podspec.template index 06b75144fdd..d53e6266f41 100644 --- a/templates/gRPC-C++.podspec.template +++ b/templates/gRPC-C++.podspec.template @@ -40,16 +40,18 @@ def filter_grpcpp(files): return [file for file in files if not file.startswith("include/grpc++")] + grpc_libs = ("grpc", "gpr", "upb") + def grpc_private_files(libs): - out = grpc_lib_files(libs, ("grpc", "gpr"), ("headers", "src")) + out = grpc_lib_files(libs, grpc_libs, ("headers", "src")) return out def grpc_private_headers(libs): - out = grpc_lib_files(libs, ("grpc", "gpr"), ("headers",)) + out = grpc_lib_files(libs, grpc_libs, ("headers",)) return out def grpc_public_headers(libs): - out = grpc_lib_files(libs, ("grpc", "gpr"), ("public_headers",)) + out = grpc_lib_files(libs, grpc_libs, ("public_headers",)) return out def grpcpp_proto_files(filegroups): diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template index 32e97872bab..e60d843e83f 100644 --- a/templates/gRPC-Core.podspec.template +++ b/templates/gRPC-Core.podspec.template @@ -30,16 +30,18 @@ out += lib.get(group, []) return sorted(out) + grpc_libs = ("grpc", "gpr", "upb") + def grpc_private_files(libs): - out = grpc_lib_files(libs, ("grpc", "gpr"), ("headers", "src")) + out = grpc_lib_files(libs, grpc_libs, ("headers", "src")) return out def grpc_public_headers(libs): - out = grpc_lib_files(libs, ("grpc", "gpr"), ("public_headers",)) + out = grpc_lib_files(libs, grpc_libs, ("public_headers",)) return out def grpc_private_headers(libs): - out = grpc_lib_files(libs, ("grpc", "gpr"), ("headers",)) + out = grpc_lib_files(libs, grpc_libs, ("headers",)) return out def grpc_cronet_files(libs): diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index 542258159bd..64476e2979e 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -1296,21 +1296,7 @@ src/cpp/thread_manager/thread_manager.h \ src/cpp/util/byte_buffer_cc.cc \ src/cpp/util/status.cc \ src/cpp/util/string_ref.cc \ -src/cpp/util/time_cc.cc \ -third_party/upb/upb/decode.c \ -third_party/upb/upb/decode.h \ -third_party/upb/upb/encode.c \ -third_party/upb/upb/encode.h \ -third_party/upb/upb/generated_util.h \ -third_party/upb/upb/msg.c \ -third_party/upb/upb/msg.h \ -third_party/upb/upb/port.c \ -third_party/upb/upb/port_def.inc \ -third_party/upb/upb/port_undef.inc \ -third_party/upb/upb/table.c \ -third_party/upb/upb/table.int.h \ -third_party/upb/upb/upb.c \ -third_party/upb/upb/upb.h +src/cpp/util/time_cc.cc # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index d6d9964f8d3..f65a17c328a 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -1660,21 +1660,7 @@ src/core/tsi/transport_security.cc \ src/core/tsi/transport_security.h \ src/core/tsi/transport_security_grpc.cc \ src/core/tsi/transport_security_grpc.h \ -src/core/tsi/transport_security_interface.h \ -third_party/upb/upb/decode.c \ -third_party/upb/upb/decode.h \ -third_party/upb/upb/encode.c \ -third_party/upb/upb/encode.h \ -third_party/upb/upb/generated_util.h \ -third_party/upb/upb/msg.c \ -third_party/upb/upb/msg.h \ -third_party/upb/upb/port.c \ -third_party/upb/upb/port_def.inc \ -third_party/upb/upb/port_undef.inc \ -third_party/upb/upb/table.c \ -third_party/upb/upb/table.int.h \ -third_party/upb/upb/upb.c \ -third_party/upb/upb/upb.h +src/core/tsi/transport_security_interface.h # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses From b479a57492963b9707bb711350e69eeb4c279b8f Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Mon, 4 Nov 2019 13:58:46 -0800 Subject: [PATCH 104/133] Update by review --- CMakeLists.txt | 2 +- templates/CMakeLists.txt.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b8fe560e75..291022b04f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17928,7 +17928,7 @@ generate_pkgconfig( "high performance general RPC framework" "${gRPC_CORE_VERSION}" "gpr openssl" - "-lgrpc -laddress_sorting -lupb -lcares -lz" + "-lgrpc -laddress_sorting -lcares -lz" "" "grpc.pc") diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template index 923cda9b34c..87b9d38e61f 100644 --- a/templates/CMakeLists.txt.template +++ b/templates/CMakeLists.txt.template @@ -657,7 +657,7 @@ "high performance general RPC framework" "<%text>${gRPC_CORE_VERSION}" "gpr openssl" - "-lgrpc -laddress_sorting -lupb -lcares -lz" + "-lgrpc -laddress_sorting -lcares -lz" "" "grpc.pc") From 402e07a6267bf130baa5493f818372a67193a232 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Tue, 5 Nov 2019 10:17:49 -0800 Subject: [PATCH 105/133] Remove memory_usage test from CI --- tools/internal_ci/linux/grpc_performance_profile_daily.sh | 4 ---- tools/internal_ci/linux/run_performance_profile_hourly.sh | 4 ---- 2 files changed, 8 deletions(-) diff --git a/tools/internal_ci/linux/grpc_performance_profile_daily.sh b/tools/internal_ci/linux/grpc_performance_profile_daily.sh index 0e086999238..5fe47ff6c37 100755 --- a/tools/internal_ci/linux/grpc_performance_profile_daily.sh +++ b/tools/internal_ci/linux/grpc_performance_profile_daily.sh @@ -24,10 +24,6 @@ CPUS=`python -c 'import multiprocessing; print multiprocessing.cpu_count()'` ./tools/run_tests/start_port_server.py || true -make CONFIG=opt memory_usage_test memory_usage_client memory_usage_server -j $CPUS -bins/opt/memory_usage_test -bq load microbenchmarks.memory memory_usage.csv - tools/run_tests/run_microbenchmark.py --collect summary --bigquery_upload || FAILED="true" # kill port_server.py to prevent the build from hanging diff --git a/tools/internal_ci/linux/run_performance_profile_hourly.sh b/tools/internal_ci/linux/run_performance_profile_hourly.sh index 2be9edf756b..bcb4ea239d2 100755 --- a/tools/internal_ci/linux/run_performance_profile_hourly.sh +++ b/tools/internal_ci/linux/run_performance_profile_hourly.sh @@ -21,8 +21,4 @@ cd $(dirname $0)/../../.. CPUS=`python -c 'import multiprocessing; print multiprocessing.cpu_count()'` -make CONFIG=opt memory_usage_test memory_usage_client memory_usage_server -j $CPUS -bins/opt/memory_usage_test -bq load microbenchmarks.memory memory_usage.csv - tools/run_tests/run_microbenchmark.py --collect summary --bigquery_upload From 4530d49f2117bb192cc7646cc60306a094209e75 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Tue, 5 Nov 2019 10:11:31 -0800 Subject: [PATCH 106/133] Update by review --- CMakeLists.txt | 2 +- templates/CMakeLists.txt.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 291022b04f2..0b8fe560e75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17928,7 +17928,7 @@ generate_pkgconfig( "high performance general RPC framework" "${gRPC_CORE_VERSION}" "gpr openssl" - "-lgrpc -laddress_sorting -lcares -lz" + "-lgrpc -laddress_sorting -lupb -lcares -lz" "" "grpc.pc") diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template index 87b9d38e61f..923cda9b34c 100644 --- a/templates/CMakeLists.txt.template +++ b/templates/CMakeLists.txt.template @@ -657,7 +657,7 @@ "high performance general RPC framework" "<%text>${gRPC_CORE_VERSION}" "gpr openssl" - "-lgrpc -laddress_sorting -lcares -lz" + "-lgrpc -laddress_sorting -lupb -lcares -lz" "" "grpc.pc") From a08da012d2924b835a2c5ddb5c8f01fb85cfb83b Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Tue, 5 Nov 2019 15:17:06 -0800 Subject: [PATCH 107/133] Switch to config-driven style --- .../grpcio_tests/tests/unit/BUILD.bazel | 58 ++++++++----------- ...ingle_threaded_unary_stream_test_runner.sh | 5 -- tools/bazel.rc | 2 + .../linux/grpc_python_bazel_test_in_docker.sh | 7 ++- 4 files changed, 31 insertions(+), 41 deletions(-) delete mode 100755 src/python/grpcio_tests/tests/unit/_single_threaded_unary_stream_test_runner.sh diff --git a/src/python/grpcio_tests/tests/unit/BUILD.bazel b/src/python/grpcio_tests/tests/unit/BUILD.bazel index df413a991b7..42da77dbad2 100644 --- a/src/python/grpcio_tests/tests/unit/BUILD.bazel +++ b/src/python/grpcio_tests/tests/unit/BUILD.bazel @@ -84,39 +84,29 @@ py_library( ) [ - [ - py2and3_test( - name=test_file_name[:-3], - size="small", - srcs=[test_file_name], - main=test_file_name, - deps=[ - "//src/python/grpcio/grpc:grpcio", - ":resources", - ":test_common", - ":thread_pool", - ":_exit_scenarios", - ":_server_shutdown_scenarios", - ":_from_grpc_import_star", - ":_tcp_proxy", - ":_signal_client", - "//src/python/grpcio_tests/tests/unit/framework/common", - "//src/python/grpcio_tests/tests/testing", - "//external:six" - ], - imports=["../../",], - data=[ - "//src/python/grpcio_tests/tests/unit/credentials", - ], - ), - sh_test( - name = test_file_name[:-3] + ".single_threaded_unary_stream", - data = ["{}.python3".format(test_file_name[:-3])], - args = ["{}.python3".format(test_file_name[:-3])], - size = "small", - srcs = ["_single_threaded_unary_stream_test_runner.sh"] - ) - ] - for test_file_name in GRPCIO_TESTS_UNIT + py2and3_test( + name=test_file_name[:-3], + size="small", + srcs=[test_file_name], + main=test_file_name, + deps=[ + "//src/python/grpcio/grpc:grpcio", + ":resources", + ":test_common", + ":thread_pool", + ":_exit_scenarios", + ":_server_shutdown_scenarios", + ":_from_grpc_import_star", + ":_tcp_proxy", + ":_signal_client", + "//src/python/grpcio_tests/tests/unit/framework/common", + "//src/python/grpcio_tests/tests/testing", + "//external:six" + ], + imports=["../../",], + data=[ + "//src/python/grpcio_tests/tests/unit/credentials", + ], + ) for test_file_name in GRPCIO_TESTS_UNIT ] diff --git a/src/python/grpcio_tests/tests/unit/_single_threaded_unary_stream_test_runner.sh b/src/python/grpcio_tests/tests/unit/_single_threaded_unary_stream_test_runner.sh deleted file mode 100755 index e0490bf22fb..00000000000 --- a/src/python/grpcio_tests/tests/unit/_single_threaded_unary_stream_test_runner.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -export GRPC_SINGLE_THREADED_UNARY_STREAM=true - -find . -name "$1" -exec {} \; diff --git a/tools/bazel.rc b/tools/bazel.rc index 4bc5b0fb21b..9645608efd8 100644 --- a/tools/bazel.rc +++ b/tools/bazel.rc @@ -86,3 +86,5 @@ build:basicprof --copt=-DNDEBUG build:basicprof --copt=-O2 build:basicprof --copt=-DGRPC_BASIC_PROFILER build:basicprof --copt=-DGRPC_TIMERS_RDTSC + +build:python_single_threaded_unary_stream --test_env="GRPC_SINGLE_THREADED_UNARY_STREAM=true" diff --git a/tools/internal_ci/linux/grpc_python_bazel_test_in_docker.sh b/tools/internal_ci/linux/grpc_python_bazel_test_in_docker.sh index 4a48760aab1..fef8c8fa9f4 100755 --- a/tools/internal_ci/linux/grpc_python_bazel_test_in_docker.sh +++ b/tools/internal_ci/linux/grpc_python_bazel_test_in_docker.sh @@ -24,8 +24,11 @@ git clone /var/local/jenkins/grpc /var/local/git/grpc && git submodule update --init --reference /var/local/jenkins/grpc/${name} \ ${name}') cd /var/local/git/grpc/test -bazel test --spawn_strategy=standalone --genrule_strategy=standalone --test_output=errors //src/python/... -bazel test --spawn_strategy=standalone --genrule_strategy=standalone --test_output=errors //examples/python/... +TEST_TARGETS="//src/python/... //examples/python/..." +BAZEL_FLAGS="--spawn_strategy=standalone --genrule_strategy=standalone --test_output=errors" +bazel test ${BAZEL_FLAGS} ${TEST_TARGETS} +bazel test --config=python_single_threaded_unary_stream ${BAZEL_FLAGS} ${TEST_TARGETS} + # TODO(https://github.com/grpc/grpc/issues/19854): Move this to a new Kokoro # job. From 8a3dd8a245cd797e36308a739467a40b93b3066f Mon Sep 17 00:00:00 2001 From: Kun Zhang Date: Tue, 5 Nov 2019 15:21:51 -0800 Subject: [PATCH 108/133] Add grpc-java 1.25.0 to test matrix --- tools/interop_matrix/client_matrix.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/interop_matrix/client_matrix.py b/tools/interop_matrix/client_matrix.py index aef372f0513..fac32c917ed 100644 --- a/tools/interop_matrix/client_matrix.py +++ b/tools/interop_matrix/client_matrix.py @@ -192,6 +192,7 @@ LANG_RELEASE_MATRIX = { ('v1.22.2', ReleaseInfo()), ('v1.23.0', ReleaseInfo()), ('v1.24.0', ReleaseInfo()), + ('v1.25.0', ReleaseInfo()), ]), 'python': OrderedDict([ From e72e72bc49438fa0005c5201d56b87744c302bb1 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Tue, 5 Nov 2019 15:40:37 -0800 Subject: [PATCH 109/133] Add const cast --- .../tsi/alts/handshaker/alts_concurrent_connectivity_test.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc b/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc index 204129ad0ba..87f817ba2c9 100644 --- a/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc +++ b/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc @@ -80,8 +80,8 @@ grpc_channel* create_secure_channel_for_test( grpc_alts_credentials_options_destroy(alts_options); // The main goal of these tests are to stress concurrent ALTS handshakes, // so we prevent subchnannel sharing. - grpc_arg disable_subchannel_sharing_arg = - grpc_channel_arg_integer_create(GRPC_ARG_USE_LOCAL_SUBCHANNEL_POOL, true); + grpc_arg disable_subchannel_sharing_arg = grpc_channel_arg_integer_create( + const_cast(GRPC_ARG_USE_LOCAL_SUBCHANNEL_POOL), true); grpc_channel_args channel_args = {1, &disable_subchannel_sharing_arg}; grpc_channel* channel = grpc_secure_channel_create(channel_creds, server_addr, &channel_args, nullptr); From aa7cb6a3350e4961ac603e47f7ed61fd99802bf1 Mon Sep 17 00:00:00 2001 From: Samuel Lijin Date: Fri, 25 Oct 2019 00:48:14 -0700 Subject: [PATCH 110/133] Fuzz message/stream compression and decompression Google had a company-wide FuzzIt hackathon recently, so I went digging in gRPC and found this, which means I probably don't know what I'm doing :) --- test/core/compression/BUILD | 45 ++++++++++++++ .../compression/message_compress_fuzzer.cc | 58 +++++++++++++++++++ .../compression/message_decompress_fuzzer.cc | 58 +++++++++++++++++++ .../compression/stream_compression_fuzzer.cc | 54 +++++++++++++++++ .../stream_decompression_fuzzer.cc | 55 ++++++++++++++++++ 5 files changed, 270 insertions(+) create mode 100644 test/core/compression/message_compress_fuzzer.cc create mode 100644 test/core/compression/message_decompress_fuzzer.cc create mode 100644 test/core/compression/stream_compression_fuzzer.cc create mode 100644 test/core/compression/stream_decompression_fuzzer.cc diff --git a/test/core/compression/BUILD b/test/core/compression/BUILD index 5fb097519a7..81666f8e556 100644 --- a/test/core/compression/BUILD +++ b/test/core/compression/BUILD @@ -13,6 +13,7 @@ # limitations under the License. load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") +load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer") grpc_package(name = "test/core/compression") @@ -42,6 +43,28 @@ grpc_cc_test( ], ) +grpc_fuzzer( + name = "message_compress_fuzzer", + srcs = ["message_compress_fuzzer.cc"], + corpus = "message_compress_corpus", + tags = ["no_windows"], + deps = [ + "//:grpc", + "//test/core/util:grpc_test_util", + ], +) + +grpc_fuzzer( + name = "message_decompress_fuzzer", + srcs = ["message_decompress_fuzzer.cc"], + corpus = "message_decompress_corpus", + tags = ["no_windows"], + deps = [ + "//:grpc", + "//test/core/util:grpc_test_util", + ], +) + grpc_cc_test( name = "message_compress_test", srcs = ["message_compress_test.cc"], @@ -54,6 +77,28 @@ grpc_cc_test( ], ) +grpc_fuzzer( + name = "stream_compression_fuzzer", + srcs = ["stream_compression_fuzzer.cc"], + corpus = "stream_compression_corpus", + tags = ["no_windows"], + deps = [ + "//:grpc", + "//test/core/util:grpc_test_util", + ], +) + +grpc_fuzzer( + name = "stream_decompression_fuzzer", + srcs = ["stream_decompression_fuzzer.cc"], + corpus = "stream_decompression_corpus", + tags = ["no_windows"], + deps = [ + "//:grpc", + "//test/core/util:grpc_test_util", + ], +) + grpc_cc_test( name = "stream_compression_test", srcs = ["stream_compression_test.cc"], diff --git a/test/core/compression/message_compress_fuzzer.cc b/test/core/compression/message_compress_fuzzer.cc new file mode 100644 index 00000000000..1ea0853d2a3 --- /dev/null +++ b/test/core/compression/message_compress_fuzzer.cc @@ -0,0 +1,58 @@ +/* + * + * Copyright 2019 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 + +#include "src/core/lib/compression/message_compress.h" +#include "src/core/lib/security/credentials/credentials.h" +#include "test/core/util/memory_counters.h" + +bool squelch = true; +bool leak_check = true; + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { + if (size < 1) return 0; + + // Instead of rolling something complicated to convert a uint8_t to the enum, + // just bail out if it isn't trivially convertible. + if (data[0] >= GRPC_MESSAGE_COMPRESS_ALGORITHMS_COUNT) return 0; + const auto compression_algorithm = + static_cast(data[0]); + + grpc_core::testing::LeakDetector leak_detector(true); + grpc_init(); + grpc_test_only_control_plane_credentials_force_init(); + grpc_slice_buffer input_buffer; + grpc_slice_buffer_init(&input_buffer); + grpc_slice_buffer_add(&input_buffer, + grpc_slice_from_copied_buffer( + reinterpret_cast(data + 1), size - 1)); + grpc_slice_buffer output_buffer; + grpc_slice_buffer_init(&output_buffer); + + grpc_msg_compress(compression_algorithm, &input_buffer, &output_buffer); + + grpc_slice_buffer_destroy(&input_buffer); + grpc_slice_buffer_destroy(&output_buffer); + grpc_test_only_control_plane_credentials_destroy(); + grpc_shutdown_blocking(); + return 0; +} diff --git a/test/core/compression/message_decompress_fuzzer.cc b/test/core/compression/message_decompress_fuzzer.cc new file mode 100644 index 00000000000..c600a740782 --- /dev/null +++ b/test/core/compression/message_decompress_fuzzer.cc @@ -0,0 +1,58 @@ +/* + * + * Copyright 2019 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 + +#include "src/core/lib/compression/message_compress.h" +#include "src/core/lib/security/credentials/credentials.h" +#include "test/core/util/memory_counters.h" + +bool squelch = true; +bool leak_check = true; + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { + if (size < 1) return 0; + + // Instead of rolling something complicated to convert a uint8_t to the enum, + // just bail out if it isn't trivially convertible. + if (data[0] >= GRPC_MESSAGE_COMPRESS_ALGORITHMS_COUNT) return 0; + const auto compression_algorithm = + static_cast(data[0]); + + grpc_core::testing::LeakDetector leak_detector(true); + grpc_init(); + grpc_test_only_control_plane_credentials_force_init(); + grpc_slice_buffer input_buffer; + grpc_slice_buffer_init(&input_buffer); + grpc_slice_buffer_add(&input_buffer, + grpc_slice_from_copied_buffer( + reinterpret_cast(data + 1), size - 1)); + grpc_slice_buffer output_buffer; + grpc_slice_buffer_init(&output_buffer); + + grpc_msg_decompress(compression_algorithm, &input_buffer, &output_buffer); + + grpc_slice_buffer_destroy(&input_buffer); + grpc_slice_buffer_destroy(&output_buffer); + grpc_test_only_control_plane_credentials_destroy(); + grpc_shutdown_blocking(); + return 0; +} diff --git a/test/core/compression/stream_compression_fuzzer.cc b/test/core/compression/stream_compression_fuzzer.cc new file mode 100644 index 00000000000..c147aa5bfd6 --- /dev/null +++ b/test/core/compression/stream_compression_fuzzer.cc @@ -0,0 +1,54 @@ +/* + * + * Copyright 2019 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 + +#include "src/core/lib/compression/stream_compression.h" +#include "src/core/lib/security/credentials/credentials.h" +#include "test/core/util/memory_counters.h" + +bool squelch = true; +bool leak_check = true; + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { + grpc_core::testing::LeakDetector leak_detector(true); + grpc_init(); + grpc_test_only_control_plane_credentials_force_init(); + auto* context = grpc_stream_compression_context_create( + GRPC_STREAM_COMPRESSION_GZIP_COMPRESS); + grpc_slice_buffer input_buffer; + grpc_slice_buffer_init(&input_buffer); + grpc_slice_buffer_add( + &input_buffer, + grpc_slice_from_copied_buffer(reinterpret_cast(data), size)); + grpc_slice_buffer output_buffer; + grpc_slice_buffer_init(&output_buffer); + + grpc_stream_compress(context, &input_buffer, &output_buffer, nullptr, + SIZE_MAX, GRPC_STREAM_COMPRESSION_FLUSH_SYNC); + + grpc_stream_compression_context_destroy(context); + grpc_slice_buffer_destroy(&input_buffer); + grpc_slice_buffer_destroy(&output_buffer); + grpc_test_only_control_plane_credentials_destroy(); + grpc_shutdown_blocking(); + return 0; +} diff --git a/test/core/compression/stream_decompression_fuzzer.cc b/test/core/compression/stream_decompression_fuzzer.cc new file mode 100644 index 00000000000..e460e6db25f --- /dev/null +++ b/test/core/compression/stream_decompression_fuzzer.cc @@ -0,0 +1,55 @@ +/* + * + * Copyright 2019 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 + +#include "src/core/lib/compression/stream_compression.h" +#include "src/core/lib/security/credentials/credentials.h" +#include "test/core/util/memory_counters.h" + +bool squelch = true; +bool leak_check = true; + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { + grpc_core::testing::LeakDetector leak_detector(true); + grpc_init(); + grpc_test_only_control_plane_credentials_force_init(); + auto* context = grpc_stream_compression_context_create( + GRPC_STREAM_COMPRESSION_GZIP_DECOMPRESS); + grpc_slice_buffer input_buffer; + grpc_slice_buffer_init(&input_buffer); + grpc_slice_buffer_add( + &input_buffer, + grpc_slice_from_copied_buffer(reinterpret_cast(data), size)); + grpc_slice_buffer output_buffer; + grpc_slice_buffer_init(&output_buffer); + bool end_of_context; + + grpc_stream_decompress(context, &input_buffer, &output_buffer, nullptr, + SIZE_MAX, &end_of_context); + + grpc_stream_compression_context_destroy(context); + grpc_slice_buffer_destroy(&input_buffer); + grpc_slice_buffer_destroy(&output_buffer); + grpc_test_only_control_plane_credentials_destroy(); + grpc_shutdown_blocking(); + return 0; +} From 2b98a9bbc86dc8a9dd7067fe0dab06bd89872c23 Mon Sep 17 00:00:00 2001 From: Samuel Lijin Date: Fri, 25 Oct 2019 00:52:54 -0700 Subject: [PATCH 111/133] Fuzz base64 encoding and decoding Google had a company-wide FuzzIt hackathon recently, so I went digging in gRPC and found this, which means I probably don't know what I'm doing :) The initial corpus files I'm checking in were generated via local runs and appear to consistently cause leaks. Please let me know if these are actual bugs, or if they're a false positive. --- test/core/slice/BUILD | 22 ++++++++++++++++++ test/core/slice/b64_decode_fuzzer.cc | 33 +++++++++++++++++++++++++++ test/core/slice/b64_encode_fuzzer.cc | 34 ++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+) create mode 100644 test/core/slice/b64_decode_fuzzer.cc create mode 100644 test/core/slice/b64_encode_fuzzer.cc diff --git a/test/core/slice/BUILD b/test/core/slice/BUILD index b9a796f257a..8018505e3be 100644 --- a/test/core/slice/BUILD +++ b/test/core/slice/BUILD @@ -20,6 +20,28 @@ licenses(["notice"]) # Apache v2 load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer") +grpc_fuzzer( + name = "b64_encode_fuzzer", + srcs = ["b64_encode_fuzzer.cc"], + corpus = "b64_encode_corpus", + language = "C++", + tags = ["no_windows"], + deps = [ + "//:grpc", + ], +) + +grpc_fuzzer( + name = "b64_decode_fuzzer", + srcs = ["b64_decode_fuzzer.cc"], + corpus = "b64_decode_corpus", + language = "C++", + tags = ["no_windows"], + deps = [ + "//:grpc", + ], +) + grpc_fuzzer( name = "percent_encode_fuzzer", srcs = ["percent_encode_fuzzer.cc"], diff --git a/test/core/slice/b64_decode_fuzzer.cc b/test/core/slice/b64_decode_fuzzer.cc new file mode 100644 index 00000000000..0ef50895f95 --- /dev/null +++ b/test/core/slice/b64_decode_fuzzer.cc @@ -0,0 +1,33 @@ +/* + * + * Copyright 2019 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 "src/core/lib/slice/b64.h" + +bool squelch = true; +bool leak_check = true; + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { + if (size < 1) return 0; + const bool url_safe = static_cast(0x100) < data[0]; + grpc_base64_decode_with_len(reinterpret_cast(data + 1), size - 1, + url_safe); + return 0; +} diff --git a/test/core/slice/b64_encode_fuzzer.cc b/test/core/slice/b64_encode_fuzzer.cc new file mode 100644 index 00000000000..bc4f4a9bf55 --- /dev/null +++ b/test/core/slice/b64_encode_fuzzer.cc @@ -0,0 +1,34 @@ +/* + * + * Copyright 2019 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 "src/core/lib/slice/b64.h" + +bool squelch = true; +bool leak_check = true; + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { + if (size < 2) return 0; + const bool url_safe = static_cast(0x100) < data[0]; + const bool multiline = static_cast(0x100) < data[1]; + grpc_base64_encode(reinterpret_cast(data + 2), size - 2, + url_safe, multiline); + return 0; +} From 302c9e97cccf4534933be134b141e044bf1758af Mon Sep 17 00:00:00 2001 From: Alexander Polcyn Date: Tue, 5 Nov 2019 18:21:56 -0800 Subject: [PATCH 112/133] Fix alloc/dealloc mismatch in alts_concurrent_connectivity_test --- .../handshaker/alts_concurrent_connectivity_test.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc b/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc index 204129ad0ba..f6f1c3d9673 100644 --- a/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc +++ b/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc @@ -172,9 +172,9 @@ class ConnectLoopRunner { const char* server_address, const char* fake_handshake_server_addr, int per_connect_deadline_seconds, size_t loops, grpc_connectivity_state expected_connectivity_states) - : server_address_(std::unique_ptr(gpr_strdup(server_address))), + : server_address_(grpc_core::UniquePtr(gpr_strdup(server_address))), fake_handshake_server_addr_( - std::unique_ptr(gpr_strdup(fake_handshake_server_addr))), + grpc_core::UniquePtr(gpr_strdup(fake_handshake_server_addr))), per_connect_deadline_seconds_(per_connect_deadline_seconds), loops_(loops), expected_connectivity_states_(expected_connectivity_states) { @@ -222,8 +222,8 @@ class ConnectLoopRunner { } private: - std::unique_ptr server_address_; - std::unique_ptr fake_handshake_server_addr_; + grpc_core::UniquePtr server_address_; + grpc_core::UniquePtr fake_handshake_server_addr_; int per_connect_deadline_seconds_; size_t loops_; grpc_connectivity_state expected_connectivity_states_; @@ -286,7 +286,7 @@ class FakeTcpServer { accept_socket_ = socket(AF_INET6, SOCK_STREAM, 0); char* addr_str; GPR_ASSERT(gpr_asprintf(&addr_str, "[::]:%d", port_)); - address_ = std::unique_ptr(addr_str); + address_ = grpc_core::UniquePtr(addr_str); GPR_ASSERT(accept_socket_ != -1); if (accept_socket_ == -1) { gpr_log(GPR_ERROR, "Failed to create socket: %d", errno); @@ -426,7 +426,7 @@ class FakeTcpServer { int accept_socket_; int port_; gpr_event stop_ev_; - std::unique_ptr address_; + grpc_core::UniquePtr address_; std::unique_ptr run_server_loop_thd_; std::function process_read_cb_; }; From 1e74c102cd11ebd16002a37e82d38110179a596c Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Sun, 3 Nov 2019 21:39:32 -0800 Subject: [PATCH 113/133] Add GRPC_USE_ABSL flag --- BUILD | 5 +++++ bazel/grpc_build_system.bzl | 13 +++++++++++- include/grpc/impl/codegen/port_platform.h | 7 +++++++ src/core/lib/gprpp/inlined_vector.h | 20 +++++++++++++++++++ .../linux/grpc_bazel_build_in_docker.sh | 1 + 5 files changed, 45 insertions(+), 1 deletion(-) diff --git a/BUILD b/BUILD index 97dd57830be..1bd3b6b9ca9 100644 --- a/BUILD +++ b/BUILD @@ -69,6 +69,11 @@ config_setting( values = {"cpu": "darwin"}, ) +config_setting( + name = "grpc_use_absl", + values = {"define": "GRPC_USE_ABSL=1"}, +) + python_config_settings() # This should be updated along with build.yaml diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl index c6e6b0b9e0e..878218e42f7 100644 --- a/bazel/grpc_build_system.bzl +++ b/bazel/grpc_build_system.bzl @@ -59,6 +59,8 @@ def _get_external_deps(external_deps): }) elif dep == "cronet_c_for_grpc": ret += ["//third_party/objective_c/Cronet:cronet_c_for_grpc"] + elif dep.startswith("absl/"): + ret += ["@com_google_absl//" + dep] else: ret += ["//external:" + dep] return ret @@ -86,6 +88,11 @@ def grpc_cc_library( linkopts = if_not_windows(["-pthread"]) if use_cfstream: linkopts = linkopts + if_mac(["-framework CoreFoundation"]) + # Temporary hack for GRPC_USE_ABSL { + more_external_deps = [] + if name == "inlined_vector": + more_external_deps += ["absl/container:inlined_vector"] + # Temporary hack for GRPC_USE_ABSL } native.cc_library( name = name, srcs = srcs, @@ -101,9 +108,13 @@ def grpc_cc_library( "//:grpc_allow_exceptions": ["GRPC_ALLOW_EXCEPTIONS=1"], "//:grpc_disallow_exceptions": ["GRPC_ALLOW_EXCEPTIONS=0"], "//conditions:default": [], + }) + + select({ + "//:grpc_use_absl": ["GRPC_USE_ABSL=1"], + "//conditions:default": [], }), hdrs = hdrs + public_hdrs, - deps = deps + _get_external_deps(external_deps), + deps = deps + _get_external_deps(external_deps + more_external_deps), copts = copts, visibility = visibility, testonly = testonly, diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h index 9276ac4e7a9..2973b94f9ef 100644 --- a/include/grpc/impl/codegen/port_platform.h +++ b/include/grpc/impl/codegen/port_platform.h @@ -27,6 +27,13 @@ * - some syscalls to be made directly */ +/* + * Defines GRPC_USE_ABSL to use Abseil Common Libraries (C++) + */ +#ifndef GRPC_USE_ABSL +#define GRPC_USE_ABSL 0 +#endif + /* 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/src/core/lib/gprpp/inlined_vector.h b/src/core/lib/gprpp/inlined_vector.h index bfbc6edddd7..6e637de76fd 100644 --- a/src/core/lib/gprpp/inlined_vector.h +++ b/src/core/lib/gprpp/inlined_vector.h @@ -26,8 +26,19 @@ #include "src/core/lib/gprpp/memory.h" +#if GRPC_USE_ABSL +#include "absl/container/inlined_vector.h" +#endif + namespace grpc_core { +#if GRPC_USE_ABSL + +template > +using InlinedVector = absl::InlinedVector; + +#else + // NOTE: We eventually want to use absl::InlinedVector here. However, // there are currently build problems that prevent us from using absl. // In the interim, we define a custom implementation as a place-holder, @@ -222,12 +233,21 @@ class InlinedVector { } } +#if 1 typename std::aligned_storage::type inline_[N]; +#else + // Alignment attribute should be used like this but it has a problem + // with current gRPC source. It has to be disabled until other gRPC part + // goes well with this. + typename std::aligned_storage::type inline_[N]; +#endif T* dynamic_; size_t size_; size_t capacity_; }; +#endif + } // namespace grpc_core #endif /* GRPC_CORE_LIB_GPRPP_INLINED_VECTOR_H */ diff --git a/tools/internal_ci/linux/grpc_bazel_build_in_docker.sh b/tools/internal_ci/linux/grpc_bazel_build_in_docker.sh index 24598f43f02..59c54edb009 100755 --- a/tools/internal_ci/linux/grpc_bazel_build_in_docker.sh +++ b/tools/internal_ci/linux/grpc_bazel_build_in_docker.sh @@ -25,3 +25,4 @@ git clone /var/local/jenkins/grpc /var/local/git/grpc ${name}') cd /var/local/git/grpc bazel build --spawn_strategy=standalone --genrule_strategy=standalone :all test/... examples/... +bazel build --spawn_strategy=standalone --genrule_strategy=standalone --define=GRPC_USE_ABSL=1 :grpc From 4e396883d4b3cb3a563538bcb84e3007f5c4634c Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Mon, 4 Nov 2019 15:25:21 -0800 Subject: [PATCH 114/133] Update by review --- bazel/grpc_build_system.bzl | 22 +++++++++++++------ src/core/lib/gprpp/inlined_vector.h | 7 ------ .../linux/grpc_bazel_build_in_docker.sh | 3 +++ 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl index 878218e42f7..c944d8f177b 100644 --- a/bazel/grpc_build_system.bzl +++ b/bazel/grpc_build_system.bzl @@ -88,11 +88,19 @@ def grpc_cc_library( linkopts = if_not_windows(["-pthread"]) if use_cfstream: linkopts = linkopts + if_mac(["-framework CoreFoundation"]) - # Temporary hack for GRPC_USE_ABSL { + + # This is a temporary solution to enable absl dependency only for + # Bazel-build with grpc_use_absl enabled to abseilfy in-house classes + # such as inlined_vector before absl is fully supported. + # When https://github.com/grpc/grpc/pull/20184 is merged, it will + # be removed. more_external_deps = [] if name == "inlined_vector": - more_external_deps += ["absl/container:inlined_vector"] - # Temporary hack for GRPC_USE_ABSL } + more_external_deps += select({ + "//:grpc_use_absl": ["@com_google_absl//absl/container:inlined_vector"], + "//conditions:default": [], + }) + native.cc_library( name = name, srcs = srcs, @@ -109,12 +117,12 @@ def grpc_cc_library( "//:grpc_disallow_exceptions": ["GRPC_ALLOW_EXCEPTIONS=0"], "//conditions:default": [], }) + - select({ - "//:grpc_use_absl": ["GRPC_USE_ABSL=1"], - "//conditions:default": [], + select({ + "//:grpc_use_absl": ["GRPC_USE_ABSL=1"], + "//conditions:default": [], }), hdrs = hdrs + public_hdrs, - deps = deps + _get_external_deps(external_deps + more_external_deps), + deps = deps + _get_external_deps(external_deps) + more_external_deps, copts = copts, visibility = visibility, testonly = testonly, diff --git a/src/core/lib/gprpp/inlined_vector.h b/src/core/lib/gprpp/inlined_vector.h index 6e637de76fd..e05a0a855f9 100644 --- a/src/core/lib/gprpp/inlined_vector.h +++ b/src/core/lib/gprpp/inlined_vector.h @@ -233,14 +233,7 @@ class InlinedVector { } } -#if 1 typename std::aligned_storage::type inline_[N]; -#else - // Alignment attribute should be used like this but it has a problem - // with current gRPC source. It has to be disabled until other gRPC part - // goes well with this. - typename std::aligned_storage::type inline_[N]; -#endif T* dynamic_; size_t size_; size_t capacity_; diff --git a/tools/internal_ci/linux/grpc_bazel_build_in_docker.sh b/tools/internal_ci/linux/grpc_bazel_build_in_docker.sh index 59c54edb009..b7e47920653 100755 --- a/tools/internal_ci/linux/grpc_bazel_build_in_docker.sh +++ b/tools/internal_ci/linux/grpc_bazel_build_in_docker.sh @@ -25,4 +25,7 @@ git clone /var/local/jenkins/grpc /var/local/git/grpc ${name}') cd /var/local/git/grpc bazel build --spawn_strategy=standalone --genrule_strategy=standalone :all test/... examples/... + +# This is a temporary build test before full absl support is done +# with https://github.com/grpc/grpc/pull/20918. bazel build --spawn_strategy=standalone --genrule_strategy=standalone --define=GRPC_USE_ABSL=1 :grpc From df8bd10b960073208a715451df6ce57a64bcefc2 Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Wed, 6 Nov 2019 10:21:01 -0800 Subject: [PATCH 115/133] Skip test not applicable to unary-stream case --- src/python/grpcio_tests/tests/unit/_interceptor_test.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/python/grpcio_tests/tests/unit/_interceptor_test.py b/src/python/grpcio_tests/tests/unit/_interceptor_test.py index 6da3d53816a..a5b2ad2b47c 100644 --- a/src/python/grpcio_tests/tests/unit/_interceptor_test.py +++ b/src/python/grpcio_tests/tests/unit/_interceptor_test.py @@ -560,6 +560,9 @@ class InterceptorTest(unittest.TestCase): 's1:intercept_service', 's2:intercept_service' ]) + # NOTE: The single-threaded unary-stream path does not support the + # grpc.Future interface, so this test does not apply. + @unittest.skipIf(os.getenv("GRPC_SINGLE_THREADED_UNARY_STREAM")) def testInterceptedUnaryRequestStreamResponseWithError(self): request = _EXCEPTION_REQUEST From de81f120b20193496ffd28a02bf028b007b196a0 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Mon, 4 Nov 2019 15:55:18 -0800 Subject: [PATCH 116/133] Abseilify StringView --- bazel/grpc_build_system.bzl | 5 ++ .../filters/client_channel/client_channel.cc | 5 +- .../filters/client_channel/xds/xds_client.cc | 4 +- src/core/lib/gprpp/host_port.cc | 10 +-- src/core/lib/gprpp/string_view.h | 62 +++++++++++-------- .../ssl/ssl_security_connector.cc | 2 +- .../security/security_connector/ssl_utils.cc | 5 +- .../tls/spiffe_security_connector.cc | 2 +- .../security/transport/client_auth_filter.cc | 3 +- src/core/tsi/ssl_transport_security.cc | 3 +- test/core/gprpp/string_view_test.cc | 35 ++++++----- test/core/security/credentials_test.cc | 4 +- test/cpp/end2end/client_lb_end2end_test.cc | 6 +- 13 files changed, 87 insertions(+), 59 deletions(-) diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl index c944d8f177b..557f1559919 100644 --- a/bazel/grpc_build_system.bzl +++ b/bazel/grpc_build_system.bzl @@ -100,6 +100,11 @@ def grpc_cc_library( "//:grpc_use_absl": ["@com_google_absl//absl/container:inlined_vector"], "//conditions:default": [], }) + if name == "gpr_base": + more_external_deps += select({ + "//:grpc_use_absl": ["@com_google_absl//absl/strings:strings"], + "//conditions:default": [], + }) native.cc_library( name = name, diff --git a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc index ed61537cb03..41f1ab7a8e5 100644 --- a/src/core/ext/filters/client_channel/client_channel.cc +++ b/src/core/ext/filters/client_channel/client_channel.cc @@ -403,8 +403,9 @@ class CallData { intptr_t handle) const override { grpc_linked_mdelem* linked_mdelem = reinterpret_cast(handle); - return std::make_pair(StringView(GRPC_MDKEY(linked_mdelem->md)), - StringView(GRPC_MDVALUE(linked_mdelem->md))); + return std::make_pair( + StringViewFromSlice(GRPC_MDKEY(linked_mdelem->md)), + StringViewFromSlice(GRPC_MDVALUE(linked_mdelem->md))); } CallData* calld_; diff --git a/src/core/ext/filters/client_channel/xds/xds_client.cc b/src/core/ext/filters/client_channel/xds/xds_client.cc index 9b2b13d28db..3b1e535426b 100644 --- a/src/core/ext/filters/client_channel/xds/xds_client.cc +++ b/src/core/ext/filters/client_channel/xds/xds_client.cc @@ -1257,7 +1257,7 @@ XdsClient::XdsClient(Combiner* combiner, grpc_pollset_set* interested_parties, combiner_(GRPC_COMBINER_REF(combiner, "xds_client")), interested_parties_(interested_parties), bootstrap_(XdsBootstrap::ReadFromFile(error)), - server_name_(server_name.dup()), + server_name_(StringViewToCString(server_name)), service_config_watcher_(std::move(watcher)) { if (*error != GRPC_ERROR_NONE) { if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) { @@ -1296,7 +1296,7 @@ void XdsClient::WatchClusterData(StringView cluster, // TODO(juanlishen): Start CDS call if not already started and return // real data via watcher. CdsUpdate update; - update.eds_service_name = cluster.dup(); + update.eds_service_name = StringViewToCString(cluster); update.lrs_load_reporting_server_name.reset(gpr_strdup("")); w->OnClusterChanged(std::move(update)); } diff --git a/src/core/lib/gprpp/host_port.cc b/src/core/lib/gprpp/host_port.cc index e7f0e4461e9..d69dd9c447f 100644 --- a/src/core/lib/gprpp/host_port.cc +++ b/src/core/lib/gprpp/host_port.cc @@ -57,7 +57,7 @@ bool DoSplitHostPort(StringView name, StringView* host, StringView* port, } if (rbracket == name.size() - 1) { /* ] */ - port->clear(); + *port = StringView(); } else if (name[rbracket + 1] == ':') { /* ]: */ *port = name.substr(rbracket + 2, name.size() - rbracket - 2); @@ -70,7 +70,7 @@ bool DoSplitHostPort(StringView name, StringView* host, StringView* port, if (host->find(':') == grpc_core::StringView::npos) { /* Require all bracketed hosts to contain a colon, because a hostname or IPv4 address should never use brackets. */ - host->clear(); + *host = StringView(); return false; } } else { @@ -84,7 +84,7 @@ bool DoSplitHostPort(StringView name, StringView* host, StringView* port, } else { /* 0 or 2+ colons. Bare hostname or IPv6 litearal. */ *host = name; - port->clear(); + *port = StringView(); } } return true; @@ -108,9 +108,9 @@ bool SplitHostPort(StringView name, UniquePtr* host, // We always set the host, but port is set only when DoSplitHostPort find a // port in the string, to remain backward compatible with the old // gpr_split_host_port API. - *host = host_view.dup(); + *host = StringViewToCString(host_view); if (has_port) { - *port = port_view.dup(); + *port = StringViewToCString(port_view); } } return ret; diff --git a/src/core/lib/gprpp/string_view.h b/src/core/lib/gprpp/string_view.h index 05a81066d48..7823b930709 100644 --- a/src/core/lib/gprpp/string_view.h +++ b/src/core/lib/gprpp/string_view.h @@ -33,8 +33,18 @@ #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/memory.h" +#if GRPC_USE_ABSL +#include "absl/strings/string_view.h" +#endif + namespace grpc_core { +#if GRPC_USE_ABSL + +using StringView = absl::string_view; + +#else + // Provides a light-weight view over a char array or a slice, similar but not // identical to absl::string_view. // @@ -62,10 +72,6 @@ class StringView final { constexpr StringView(const char* ptr, size_t size) : ptr_(ptr), size_(size) {} constexpr StringView(const char* ptr) : StringView(ptr, ptr == nullptr ? 0 : strlen(ptr)) {} - // Not part of absl::string_view API. - StringView(const grpc_slice& slice) - : StringView(reinterpret_cast(GRPC_SLICE_START_PTR(slice)), - GRPC_SLICE_LENGTH(slice)) {} constexpr StringView() : StringView(nullptr, 0) {} constexpr const char* data() const { return ptr_; } @@ -105,27 +111,6 @@ class StringView final { size_ = 0; } - // Creates a dup of the string viewed by this class. - // Return value is null-terminated and never nullptr. - // - // Not part of absl::string_view API. - grpc_core::UniquePtr dup() const { - char* str = static_cast(gpr_malloc(size_ + 1)); - if (size_ > 0) memcpy(str, ptr_, size_); - str[size_] = '\0'; - return grpc_core::UniquePtr(str); - } - - // Not part of absl::string_view API. - int cmp(StringView other) const { - const size_t len = GPR_MIN(size(), other.size()); - const int ret = strncmp(data(), other.data(), len); - if (ret != 0) return ret; - if (size() == other.size()) return 0; - if (size() < other.size()) return -1; - return 1; - } - private: const char* ptr_; size_t size_; @@ -138,6 +123,33 @@ inline bool operator==(StringView lhs, StringView rhs) { inline bool operator!=(StringView lhs, StringView rhs) { return !(lhs == rhs); } +#endif // GRPC_USE_ABSL + +// Converts grpc_slice to StringView. +inline StringView StringViewFromSlice(const grpc_slice& slice) { + return StringView(reinterpret_cast(GRPC_SLICE_START_PTR(slice)), + GRPC_SLICE_LENGTH(slice)); +} + +// Creates a dup of the string viewed by this class. +// Return value is null-terminated and never nullptr. +inline grpc_core::UniquePtr StringViewToCString(const StringView sv) { + char* str = static_cast(gpr_malloc(sv.size() + 1)); + if (sv.size() > 0) memcpy(str, sv.data(), sv.size()); + str[sv.size()] = '\0'; + return grpc_core::UniquePtr(str); +} + +// Compares lhs and rhs. +inline int StringViewCmp(const StringView lhs, const StringView rhs) { + const size_t len = GPR_MIN(lhs.size(), rhs.size()); + const int ret = strncmp(lhs.data(), rhs.data(), len); + if (ret != 0) return ret; + if (lhs.size() == rhs.size()) return 0; + if (lhs.size() < rhs.size()) return -1; + return 1; +} + } // namespace grpc_core #endif /* GRPC_CORE_LIB_GPRPP_STRING_VIEW_H */ diff --git a/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc b/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc index b28cee3c13b..13b0dd59a00 100644 --- a/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc +++ b/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc @@ -79,7 +79,7 @@ class grpc_ssl_channel_security_connector final grpc_core::StringView host; grpc_core::StringView port; grpc_core::SplitHostPort(target_name, &host, &port); - target_name_ = host.dup(); + target_name_ = grpc_core::StringViewToCString(host); } ~grpc_ssl_channel_security_connector() override { diff --git a/src/core/lib/security/security_connector/ssl_utils.cc b/src/core/lib/security/security_connector/ssl_utils.cc index 66fe80c3c54..570b650eeb6 100644 --- a/src/core/lib/security/security_connector/ssl_utils.cc +++ b/src/core/lib/security/security_connector/ssl_utils.cc @@ -189,9 +189,10 @@ int grpc_ssl_cmp_target_name( grpc_core::StringView target_name, grpc_core::StringView other_target_name, grpc_core::StringView overridden_target_name, grpc_core::StringView other_overridden_target_name) { - int c = target_name.cmp(other_target_name); + int c = grpc_core::StringViewCmp(target_name, other_target_name); if (c != 0) return c; - return overridden_target_name.cmp(other_overridden_target_name); + return grpc_core::StringViewCmp(overridden_target_name, + other_overridden_target_name); } grpc_core::RefCountedPtr grpc_ssl_peer_to_auth_context( diff --git a/src/core/lib/security/security_connector/tls/spiffe_security_connector.cc b/src/core/lib/security/security_connector/tls/spiffe_security_connector.cc index 8dc2937c152..12fd15f6a58 100644 --- a/src/core/lib/security/security_connector/tls/spiffe_security_connector.cc +++ b/src/core/lib/security/security_connector/tls/spiffe_security_connector.cc @@ -127,7 +127,7 @@ SpiffeChannelSecurityConnector::SpiffeChannelSecurityConnector( grpc_core::StringView host; grpc_core::StringView port; grpc_core::SplitHostPort(target_name, &host, &port); - target_name_ = host.dup(); + target_name_ = grpc_core::StringViewToCString(host); } SpiffeChannelSecurityConnector::~SpiffeChannelSecurityConnector() { diff --git a/src/core/lib/security/transport/client_auth_filter.cc b/src/core/lib/security/transport/client_auth_filter.cc index 191f38cac75..2ac73375c75 100644 --- a/src/core/lib/security/transport/client_auth_filter.cc +++ b/src/core/lib/security/transport/client_auth_filter.cc @@ -346,7 +346,8 @@ static void client_auth_start_transport_stream_op_batch( GRPC_CALL_STACK_REF(calld->owning_call, "check_call_host"); GRPC_CLOSURE_INIT(&calld->async_result_closure, on_host_checked, batch, grpc_schedule_on_exec_ctx); - grpc_core::StringView call_host(calld->host); + grpc_core::StringView call_host( + grpc_core::StringViewFromSlice(calld->host)); grpc_error* error = GRPC_ERROR_NONE; if (chand->security_connector->check_call_host( call_host, chand->auth_context.get(), diff --git a/src/core/tsi/ssl_transport_security.cc b/src/core/tsi/ssl_transport_security.cc index f062c458ae8..8b6d9f39dd4 100644 --- a/src/core/tsi/ssl_transport_security.cc +++ b/src/core/tsi/ssl_transport_security.cc @@ -1543,7 +1543,8 @@ static int does_entry_match_name(grpc_core::StringView entry, entry.remove_prefix(2); /* Remove *. */ size_t dot = name_subdomain.find('.'); if (dot == grpc_core::StringView::npos || dot == name_subdomain.size() - 1) { - grpc_core::UniquePtr name_subdomain_cstr(name_subdomain.dup()); + grpc_core::UniquePtr name_subdomain_cstr( + grpc_core::StringViewToCString(name_subdomain)); gpr_log(GPR_ERROR, "Invalid toplevel subdomain: %s", name_subdomain_cstr.get()); return 0; diff --git a/test/core/gprpp/string_view_test.cc b/test/core/gprpp/string_view_test.cc index 1c8adb1db14..d0a1d3cb724 100644 --- a/test/core/gprpp/string_view_test.cc +++ b/test/core/gprpp/string_view_test.cc @@ -40,7 +40,8 @@ TEST(StringViewTest, Empty) { EXPECT_TRUE(empty_trimmed.empty()); EXPECT_EQ(empty_trimmed.size(), 0lu); - grpc_core::StringView empty_slice(grpc_empty_slice()); + grpc_core::StringView empty_slice( + grpc_core::StringViewFromSlice(grpc_empty_slice())); EXPECT_TRUE(empty_slice.empty()); EXPECT_EQ(empty_slice.size(), 0lu); } @@ -64,14 +65,16 @@ TEST(StringViewTest, Data) { TEST(StringViewTest, Slice) { constexpr char kStr[] = "foo"; - grpc_core::StringView slice(grpc_slice_from_static_string(kStr)); + grpc_core::StringView slice( + grpc_core::StringViewFromSlice(grpc_slice_from_static_string(kStr))); EXPECT_EQ(slice.size(), strlen(kStr)); } TEST(StringViewTest, Dup) { constexpr char kStr[] = "foo"; - grpc_core::StringView slice(grpc_slice_from_static_string(kStr)); - grpc_core::UniquePtr dup = slice.dup(); + grpc_core::StringView slice( + grpc_core::StringViewFromSlice(grpc_slice_from_static_string(kStr))); + grpc_core::UniquePtr dup = grpc_core::StringViewToCString(slice); EXPECT_EQ(0, strcmp(kStr, dup.get())); EXPECT_EQ(slice.size(), strlen(kStr)); } @@ -82,12 +85,14 @@ TEST(StringViewTest, Eq) { grpc_core::StringView str1(kStr1); EXPECT_EQ(kStr1, str1); EXPECT_EQ(str1, kStr1); - grpc_core::StringView slice1(grpc_slice_from_static_string(kStr1)); + grpc_core::StringView slice1( + grpc_core::StringViewFromSlice(grpc_slice_from_static_string(kStr1))); EXPECT_EQ(slice1, str1); EXPECT_EQ(str1, slice1); EXPECT_NE(slice1, kStr2); EXPECT_NE(kStr2, slice1); - grpc_core::StringView slice2(grpc_slice_from_static_string(kStr2)); + grpc_core::StringView slice2( + grpc_core::StringViewFromSlice(grpc_slice_from_static_string(kStr2))); EXPECT_NE(slice2, str1); EXPECT_NE(str1, slice2); } @@ -99,15 +104,15 @@ TEST(StringViewTest, Cmp) { grpc_core::StringView str1(kStr1); grpc_core::StringView str2(kStr2); grpc_core::StringView str3(kStr3); - EXPECT_EQ(str1.cmp(str1), 0); - EXPECT_LT(str1.cmp(str2), 0); - EXPECT_LT(str1.cmp(str3), 0); - EXPECT_EQ(str2.cmp(str2), 0); - EXPECT_GT(str2.cmp(str1), 0); - EXPECT_GT(str2.cmp(str3), 0); - EXPECT_EQ(str3.cmp(str3), 0); - EXPECT_GT(str3.cmp(str1), 0); - EXPECT_LT(str3.cmp(str2), 0); + EXPECT_EQ(grpc_core::StringViewCmp(str1, str1), 0); + EXPECT_LT(grpc_core::StringViewCmp(str1, str2), 0); + EXPECT_LT(grpc_core::StringViewCmp(str1, str3), 0); + EXPECT_EQ(grpc_core::StringViewCmp(str2, str2), 0); + EXPECT_GT(grpc_core::StringViewCmp(str2, str1), 0); + EXPECT_GT(grpc_core::StringViewCmp(str2, str3), 0); + EXPECT_EQ(grpc_core::StringViewCmp(str3, str3), 0); + EXPECT_GT(grpc_core::StringViewCmp(str3, str1), 0); + EXPECT_LT(grpc_core::StringViewCmp(str3, str2), 0); } TEST(StringViewTest, RemovePrefix) { diff --git a/test/core/security/credentials_test.cc b/test/core/security/credentials_test.cc index 955afb3b071..884f93fb255 100644 --- a/test/core/security/credentials_test.cc +++ b/test/core/security/credentials_test.cc @@ -748,8 +748,8 @@ static void test_valid_sts_creds_options(void) { grpc_core::StringView host; grpc_core::StringView port; GPR_ASSERT(grpc_core::SplitHostPort(sts_url->authority, &host, &port)); - GPR_ASSERT(host.cmp("foo.com") == 0); - GPR_ASSERT(port.cmp("5555") == 0); + GPR_ASSERT(grpc_core::StringViewCmp(host, "foo.com") == 0); + GPR_ASSERT(grpc_core::StringViewCmp(port, "5555") == 0); grpc_uri_destroy(sts_url); } diff --git a/test/cpp/end2end/client_lb_end2end_test.cc b/test/cpp/end2end/client_lb_end2end_test.cc index 8c3ef368d58..2b62a866740 100644 --- a/test/cpp/end2end/client_lb_end2end_test.cc +++ b/test/cpp/end2end/client_lb_end2end_test.cc @@ -1669,11 +1669,13 @@ class ClientLbInterceptTrailingMetadataTest : public ClientLbEnd2endTest { backend_metric_data->mem_utilization); self->load_report_->set_rps(backend_metric_data->requests_per_second); for (const auto& p : backend_metric_data->request_cost) { - grpc_core::UniquePtr name = p.first.dup(); + grpc_core::UniquePtr name = + grpc_core::StringViewToCString(p.first); (*self->load_report_->mutable_request_cost())[name.get()] = p.second; } for (const auto& p : backend_metric_data->utilization) { - grpc_core::UniquePtr name = p.first.dup(); + grpc_core::UniquePtr name = + grpc_core::StringViewToCString(p.first); (*self->load_report_->mutable_utilization())[name.get()] = p.second; } } From 7bf58e82fdf395c1151e88c65e2a345d5b1e0233 Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Wed, 6 Nov 2019 11:16:50 -0800 Subject: [PATCH 117/133] (hopefully) fix Windows --- src/python/grpcio_tests/tests/unit/_reconnect_test.py | 2 +- .../tests/unit/framework/common/__init__.py | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/python/grpcio_tests/tests/unit/_reconnect_test.py b/src/python/grpcio_tests/tests/unit/_reconnect_test.py index b19a5b5d76f..0d97f9d735b 100644 --- a/src/python/grpcio_tests/tests/unit/_reconnect_test.py +++ b/src/python/grpcio_tests/tests/unit/_reconnect_test.py @@ -42,7 +42,7 @@ class ReconnectTest(unittest.TestCase): 'UnaryUnary': grpc.unary_unary_rpc_method_handler(_handle_unary_unary) }) - options=(('grpc.so_reuseport', 1),) + options = (('grpc.so_reuseport', 1),) with bound_socket() as (host, port): addr = '{}:{}'.format(host, port) server = grpc.server(server_pool, (handler,), options=options) diff --git a/src/python/grpcio_tests/tests/unit/framework/common/__init__.py b/src/python/grpcio_tests/tests/unit/framework/common/__init__.py index 488c712c704..c1ac76248ed 100644 --- a/src/python/grpcio_tests/tests/unit/framework/common/__init__.py +++ b/src/python/grpcio_tests/tests/unit/framework/common/__init__.py @@ -13,11 +13,15 @@ # limitations under the License. import contextlib +import os import socket +_DEFAULT_SOCK_OPTION = socket.SO_REUSEADDR if os.name == 'nt' else socket.SO_REUSEPORT + + def get_socket(bind_address='localhost', listen=True, - sock_options=(socket.SO_REUSEPORT,)): + sock_options=(_DEFAULT_SOCK_OPTION,)): """Opens a socket bound to an arbitrary port. Useful for reserving a port for a system-under-test. @@ -37,7 +41,7 @@ def get_socket(bind_address='localhost', if socket.has_ipv6: address_families = (socket.AF_INET6, socket.AF_INET) else: - address_families = (socket.AF_INET) + address_families = (socket.AF_INET) for address_family in address_families: try: sock = socket.socket(address_family, socket.SOCK_STREAM) @@ -57,7 +61,7 @@ def get_socket(bind_address='localhost', @contextlib.contextmanager def bound_socket(bind_address='localhost', listen=True, - sock_options=(socket.SO_REUSEPORT,)): + sock_options=(_DEFAULT_SOCK_OPTION,)): """Opens a socket bound to an arbitrary port. Useful for reserving a port for a system-under-test. From 3f1b5fe2aa77845e2d2d0806a474c8e0e0d89e35 Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Wed, 6 Nov 2019 11:19:12 -0800 Subject: [PATCH 118/133] Whoops --- src/python/grpcio_tests/tests/unit/_interceptor_test.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/python/grpcio_tests/tests/unit/_interceptor_test.py b/src/python/grpcio_tests/tests/unit/_interceptor_test.py index a5b2ad2b47c..fcc2e1c2b69 100644 --- a/src/python/grpcio_tests/tests/unit/_interceptor_test.py +++ b/src/python/grpcio_tests/tests/unit/_interceptor_test.py @@ -18,6 +18,7 @@ import itertools import threading import unittest import logging +import os from concurrent import futures import grpc From 44e1da88699a644489a498479ac6c26de8512ea7 Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Wed, 6 Nov 2019 11:21:40 -0800 Subject: [PATCH 119/133] Re-add load --- test/core/gprpp/BUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/test/core/gprpp/BUILD b/test/core/gprpp/BUILD index 1c258d74bc5..773406e85cd 100644 --- a/test/core/gprpp/BUILD +++ b/test/core/gprpp/BUILD @@ -13,6 +13,7 @@ # limitations under the License. load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") +load("//bazel:custom_exec_properties.bzl", "LARGE_MACHINE") licenses(["notice"]) # Apache v2 From 10e7befbf49fcc7efc226857ef6f41de536c2c1d Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Wed, 6 Nov 2019 11:51:17 -0800 Subject: [PATCH 120/133] Appease pylint --- src/python/grpcio_tests/tests/unit/_interceptor_test.py | 2 +- src/python/grpcio_tests/tests/unit/thread_pool.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/python/grpcio_tests/tests/unit/_interceptor_test.py b/src/python/grpcio_tests/tests/unit/_interceptor_test.py index fcc2e1c2b69..45a9fa30833 100644 --- a/src/python/grpcio_tests/tests/unit/_interceptor_test.py +++ b/src/python/grpcio_tests/tests/unit/_interceptor_test.py @@ -563,7 +563,7 @@ class InterceptorTest(unittest.TestCase): # NOTE: The single-threaded unary-stream path does not support the # grpc.Future interface, so this test does not apply. - @unittest.skipIf(os.getenv("GRPC_SINGLE_THREADED_UNARY_STREAM")) + @unittest.skipIf(os.getenv("GRPC_SINGLE_THREADED_UNARY_STREAM"), "Not supported.") def testInterceptedUnaryRequestStreamResponseWithError(self): request = _EXCEPTION_REQUEST diff --git a/src/python/grpcio_tests/tests/unit/thread_pool.py b/src/python/grpcio_tests/tests/unit/thread_pool.py index bc0f0e523bc..094e203cd95 100644 --- a/src/python/grpcio_tests/tests/unit/thread_pool.py +++ b/src/python/grpcio_tests/tests/unit/thread_pool.py @@ -24,7 +24,7 @@ class RecordingThreadPool(futures.ThreadPoolExecutor): self._lock = threading.Lock() self._was_used = False - def submit(self, fn, *args, **kwargs): + def submit(self, fn, *args, **kwargs): # pylint: disable=arguments-differ with self._lock: self._was_used = True self._tp_executor.submit(fn, *args, **kwargs) From 0bf979910748a5d45491e9feac4b4fa3b87f4de5 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Wed, 6 Nov 2019 12:06:32 -0800 Subject: [PATCH 121/133] Replaced grpc_core::Set with std::set --- BUILD | 1 - BUILD.gn | 2 -- build.yaml | 1 - gRPC-C++.podspec | 1 - gRPC-Core.podspec | 2 -- grpc.gemspec | 1 - package.xml | 1 - .../filters/client_channel/client_channel.cc | 5 +-- .../filters/client_channel/xds/xds_client.h | 5 +-- src/core/lib/gprpp/set.h | 33 ------------------- tools/doxygen/Doxyfile.c++.internal | 1 - tools/doxygen/Doxyfile.core.internal | 1 - 12 files changed, 6 insertions(+), 48 deletions(-) delete mode 100644 src/core/lib/gprpp/set.h diff --git a/BUILD b/BUILD index 1bd3b6b9ca9..7cc070e4ba0 100644 --- a/BUILD +++ b/BUILD @@ -535,7 +535,6 @@ grpc_cc_library( "src/core/lib/gprpp/map.h", "src/core/lib/gprpp/memory.h", "src/core/lib/gprpp/mpscq.h", - "src/core/lib/gprpp/set.h", "src/core/lib/gprpp/string_view.h", "src/core/lib/gprpp/sync.h", "src/core/lib/gprpp/thd.h", diff --git a/BUILD.gn b/BUILD.gn index cbcc78156af..80f84b06e18 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -149,7 +149,6 @@ config("grpc_config") { "src/core/lib/gprpp/memory.h", "src/core/lib/gprpp/mpscq.cc", "src/core/lib/gprpp/mpscq.h", - "src/core/lib/gprpp/set.h", "src/core/lib/gprpp/sync.h", "src/core/lib/gprpp/thd.h", "src/core/lib/gprpp/thd_posix.cc", @@ -1250,7 +1249,6 @@ config("grpc_config") { "src/core/lib/gprpp/orphanable.h", "src/core/lib/gprpp/ref_counted.h", "src/core/lib/gprpp/ref_counted_ptr.h", - "src/core/lib/gprpp/set.h", "src/core/lib/gprpp/string_view.h", "src/core/lib/gprpp/sync.h", "src/core/lib/gprpp/thd.h", diff --git a/build.yaml b/build.yaml index c33716e88ae..5a6b6c6398c 100644 --- a/build.yaml +++ b/build.yaml @@ -294,7 +294,6 @@ filegroups: - src/core/lib/gprpp/map.h - src/core/lib/gprpp/memory.h - src/core/lib/gprpp/mpscq.h - - src/core/lib/gprpp/set.h - src/core/lib/gprpp/sync.h - src/core/lib/gprpp/thd.h - src/core/lib/profiling/timers.h diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 6d7059d238d..d0b506e2988 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -337,7 +337,6 @@ Pod::Spec.new do |s| 'src/core/lib/gprpp/orphanable.h', 'src/core/lib/gprpp/ref_counted.h', 'src/core/lib/gprpp/ref_counted_ptr.h', - 'src/core/lib/gprpp/set.h', 'src/core/lib/gprpp/string_view.h', 'src/core/lib/gprpp/sync.h', 'src/core/lib/gprpp/thd.h', diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index eeb6beff9f9..33e4c64d674 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -563,7 +563,6 @@ Pod::Spec.new do |s| 'src/core/lib/gprpp/orphanable.h', 'src/core/lib/gprpp/ref_counted.h', 'src/core/lib/gprpp/ref_counted_ptr.h', - 'src/core/lib/gprpp/set.h', 'src/core/lib/gprpp/string_view.h', 'src/core/lib/gprpp/sync.h', 'src/core/lib/gprpp/thd.h', @@ -1146,7 +1145,6 @@ Pod::Spec.new do |s| 'src/core/lib/gprpp/orphanable.h', 'src/core/lib/gprpp/ref_counted.h', 'src/core/lib/gprpp/ref_counted_ptr.h', - 'src/core/lib/gprpp/set.h', 'src/core/lib/gprpp/string_view.h', 'src/core/lib/gprpp/sync.h', 'src/core/lib/gprpp/thd.h', diff --git a/grpc.gemspec b/grpc.gemspec index bcc49452099..328cb0ca86d 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -108,7 +108,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/gprpp/map.h ) s.files += %w( src/core/lib/gprpp/memory.h ) s.files += %w( src/core/lib/gprpp/mpscq.h ) - s.files += %w( src/core/lib/gprpp/set.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/profiling/timers.h ) diff --git a/package.xml b/package.xml index fb76344b987..44307eebd03 100644 --- a/package.xml +++ b/package.xml @@ -113,7 +113,6 @@ - diff --git a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc index ed61537cb03..d5a38d1d3ab 100644 --- a/src/core/ext/filters/client_channel/client_channel.cc +++ b/src/core/ext/filters/client_channel/client_channel.cc @@ -26,6 +26,8 @@ #include #include +#include + #include #include #include @@ -53,7 +55,6 @@ #include "src/core/lib/gprpp/inlined_vector.h" #include "src/core/lib/gprpp/manual_constructor.h" #include "src/core/lib/gprpp/map.h" -#include "src/core/lib/gprpp/set.h" #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/iomgr/iomgr.h" @@ -295,7 +296,7 @@ class ChannelData { // The set of SubchannelWrappers that currently exist. // No need to hold a ref, since the map is updated in the control-plane // combiner when the SubchannelWrappers are created and destroyed. - Set subchannel_wrappers_; + std::set subchannel_wrappers_; // Pending ConnectedSubchannel updates for each SubchannelWrapper. // Updates are queued here in the control plane combiner and then applied // in the data plane mutex when the picker is updated. diff --git a/src/core/ext/filters/client_channel/xds/xds_client.h b/src/core/ext/filters/client_channel/xds/xds_client.h index c5fc08cf0c2..e5c9573ecf6 100644 --- a/src/core/ext/filters/client_channel/xds/xds_client.h +++ b/src/core/ext/filters/client_channel/xds/xds_client.h @@ -19,6 +19,8 @@ #include +#include + #include "src/core/ext/filters/client_channel/service_config.h" #include "src/core/ext/filters/client_channel/xds/xds_api.h" #include "src/core/ext/filters/client_channel/xds/xds_bootstrap.h" @@ -28,7 +30,6 @@ #include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/set.h" #include "src/core/lib/gprpp/string_view.h" #include "src/core/lib/iomgr/combiner.h" @@ -175,7 +176,7 @@ class XdsClient : public InternallyRefCounted { cluster_watchers; Map> endpoint_watchers; - Set client_stats; + std::set client_stats; // The latest data seen from EDS. EdsUpdate eds_update; }; diff --git a/src/core/lib/gprpp/set.h b/src/core/lib/gprpp/set.h deleted file mode 100644 index 89535929c3c..00000000000 --- a/src/core/lib/gprpp/set.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// Copyright 2017 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_CORE_LIB_GPRPP_SET_H -#define GRPC_CORE_LIB_GPRPP_SET_H - -#include - -#include - -#include "src/core/lib/gprpp/memory.h" - -namespace grpc_core { - -template > -using Set = std::set>; - -} // namespace grpc_core - -#endif /* GRPC_CORE_LIB_GPRPP_SET_H */ diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index 64476e2979e..a06856c8fbe 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -1121,7 +1121,6 @@ src/core/lib/gprpp/optional.h \ src/core/lib/gprpp/orphanable.h \ src/core/lib/gprpp/ref_counted.h \ src/core/lib/gprpp/ref_counted_ptr.h \ -src/core/lib/gprpp/set.h \ src/core/lib/gprpp/string_view.h \ src/core/lib/gprpp/sync.h \ src/core/lib/gprpp/thd.h \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index f65a17c328a..1b0ff5c5698 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -1264,7 +1264,6 @@ src/core/lib/gprpp/optional.h \ src/core/lib/gprpp/orphanable.h \ src/core/lib/gprpp/ref_counted.h \ src/core/lib/gprpp/ref_counted_ptr.h \ -src/core/lib/gprpp/set.h \ src/core/lib/gprpp/string_view.h \ src/core/lib/gprpp/sync.h \ src/core/lib/gprpp/thd.h \ From 3de8f0b849fcfc1206451e0840c9e1ec9041510f Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Wed, 6 Nov 2019 11:58:54 -0800 Subject: [PATCH 122/133] Replaced grpc_core::Map with std::map --- .../ext/filters/client_channel/backend_metric.cc | 4 ++-- .../ext/filters/client_channel/client_channel.cc | 10 +++++----- src/core/ext/filters/client_channel/lb_policy.h | 5 +++-- .../client_channel/lb_policy/grpclb/grpclb.cc | 3 +-- .../filters/client_channel/lb_policy/xds/xds.cc | 4 ++-- src/core/ext/filters/client_channel/subchannel.h | 6 +++--- src/core/ext/filters/client_channel/xds/xds_api.cc | 6 +++--- src/core/ext/filters/client_channel/xds/xds_api.h | 2 +- .../filters/client_channel/xds/xds_bootstrap.cc | 2 +- .../ext/filters/client_channel/xds/xds_bootstrap.h | 7 ++++--- .../ext/filters/client_channel/xds/xds_client.h | 4 ++-- .../filters/client_channel/xds/xds_client_stats.h | 14 +++++++------- src/core/lib/channel/channelz.h | 8 ++++---- src/core/lib/channel/channelz_registry.h | 2 +- src/core/lib/gprpp/map.h | 8 -------- src/core/lib/security/credentials/credentials.cc | 12 ++++++------ src/core/lib/security/credentials/credentials.h | 6 +++--- src/core/lib/transport/connectivity_state.h | 4 ++-- 18 files changed, 50 insertions(+), 57 deletions(-) diff --git a/src/core/ext/filters/client_channel/backend_metric.cc b/src/core/ext/filters/client_channel/backend_metric.cc index 0d6aa2f6e2c..b36614f5b80 100644 --- a/src/core/ext/filters/client_channel/backend_metric.cc +++ b/src/core/ext/filters/client_channel/backend_metric.cc @@ -26,12 +26,12 @@ namespace grpc_core { namespace { template -Map ParseMap( +std::map ParseMap( udpa_data_orca_v1_OrcaLoadReport* msg, EntryType** (*entry_func)(udpa_data_orca_v1_OrcaLoadReport*, size_t*), upb_strview (*key_func)(const EntryType*), double (*value_func)(const EntryType*), Arena* arena) { - Map result; + std::map result; size_t size; const auto* const* entries = entry_func(msg, &size); for (size_t i = 0; i < size; ++i) { diff --git a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc index ed61537cb03..211f7ba39a5 100644 --- a/src/core/ext/filters/client_channel/client_channel.cc +++ b/src/core/ext/filters/client_channel/client_channel.cc @@ -291,7 +291,7 @@ class ChannelData { RefCountedPtr saved_service_config_; bool received_first_resolver_result_ = false; // The number of SubchannelWrapper instances referencing a given Subchannel. - Map subchannel_refcount_map_; + 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 // combiner when the SubchannelWrappers are created and destroyed. @@ -299,8 +299,8 @@ class ChannelData { // Pending ConnectedSubchannel updates for each SubchannelWrapper. // Updates are queued here in the control plane combiner and then applied // in the data plane mutex when the picker is updated. - Map, RefCountedPtr, - RefCountedPtrLess> + std::map, RefCountedPtr, + RefCountedPtrLess> pending_subchannel_updates_; // @@ -321,7 +321,7 @@ class ChannelData { // synchronously via grpc_channel_num_external_connectivity_watchers(). // mutable Mutex external_watchers_mu_; - Map external_watchers_; + std::map external_watchers_; }; // @@ -1116,7 +1116,7 @@ class ChannelData::SubchannelWrapper : public SubchannelInterface { // subchannel. This is needed so that when the LB policy calls // CancelConnectivityStateWatch() with its watcher, we know the // corresponding WrapperWatcher to cancel on the underlying subchannel. - Map watcher_map_; + std::map watcher_map_; // To be accessed only in the control plane combiner. RefCountedPtr connected_subchannel_; // To be accessed only in the data plane mutex. diff --git a/src/core/ext/filters/client_channel/lb_policy.h b/src/core/ext/filters/client_channel/lb_policy.h index a037a5070c2..ad10316f8dd 100644 --- a/src/core/ext/filters/client_channel/lb_policy.h +++ b/src/core/ext/filters/client_channel/lb_policy.h @@ -21,6 +21,7 @@ #include +#include #include #include "src/core/ext/filters/client_channel/server_address.h" @@ -92,11 +93,11 @@ class LoadBalancingPolicy : public InternallyRefCounted { /// Application-specific requests cost metrics. Metric names are /// determined by the application. Each value is an absolute cost /// (e.g. 3487 bytes of storage) associated with the request. - Map request_cost; + std::map request_cost; /// Application-specific resource utilization metrics. Metric names /// are determined by the application. Each value is expressed as a /// fraction of total resources available. - Map utilization; + std::map utilization; }; /// Interface for accessing per-call state. diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc index 49267128959..26238ff2b7c 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc @@ -479,8 +479,7 @@ int equal_cmp(void* /*p1*/, void* /*p2*/) { // token or client stats. A better approach might be to find somewhere // other than the subchannel args to store the LB token and client // stats. They could be stored in a map and then looked up for each - // call (although we'd need to make sure our Map<> implementation is - // performant enough). Or we could do something more complicated whereby + // call. Or we could do something more complicated whereby // we create our own subchannel wrapper to store them, although that would // involve a lot of refcounting overhead. // Given that we're trying to move from grpclb to xds at this point, diff --git a/src/core/ext/filters/client_channel/lb_policy/xds/xds.cc b/src/core/ext/filters/client_channel/lb_policy/xds/xds.cc index f2378b36f02..fe77d6294c0 100644 --- a/src/core/ext/filters/client_channel/lb_policy/xds/xds.cc +++ b/src/core/ext/filters/client_channel/lb_policy/xds/xds.cc @@ -327,8 +327,8 @@ class XdsLb : public LoadBalancingPolicy { RefCountedPtr xds_policy_; - Map, OrphanablePtr, - XdsLocalityName::Less> + std::map, OrphanablePtr, + XdsLocalityName::Less> localities_; const uint32_t priority_; grpc_connectivity_state connectivity_state_ = GRPC_CHANNEL_IDLE; diff --git a/src/core/ext/filters/client_channel/subchannel.h b/src/core/ext/filters/client_channel/subchannel.h index d2b822b8397..be17de53373 100644 --- a/src/core/ext/filters/client_channel/subchannel.h +++ b/src/core/ext/filters/client_channel/subchannel.h @@ -293,8 +293,8 @@ class Subchannel { private: // TODO(roth): Once we can use C++-14 heterogeneous lookups, this can // be a set instead of a map. - Map> + std::map> watchers_; }; @@ -327,7 +327,7 @@ class Subchannel { private: class HealthWatcher; - Map, StringLess> map_; + std::map, StringLess> map_; }; class ConnectedSubchannelStateWatcher; diff --git a/src/core/ext/filters/client_channel/xds/xds_api.cc b/src/core/ext/filters/client_channel/xds/xds_api.cc index eeb6145c8f2..01874823b9c 100644 --- a/src/core/ext/filters/client_channel/xds/xds_api.cc +++ b/src/core/ext/filters/client_channel/xds/xds_api.cc @@ -114,9 +114,9 @@ void PopulateListValue(upb_arena* arena, google_protobuf_ListValue* list_value, } } -void PopulateMetadata( - upb_arena* arena, google_protobuf_Struct* metadata_pb, - const Map& metadata) { +void PopulateMetadata(upb_arena* arena, google_protobuf_Struct* metadata_pb, + const std::map& metadata) { for (const auto& p : metadata) { google_protobuf_Struct_FieldsEntry* field = google_protobuf_Struct_add_fields(metadata_pb, arena); diff --git a/src/core/ext/filters/client_channel/xds/xds_api.h b/src/core/ext/filters/client_channel/xds/xds_api.h index af176e23bca..70241334a9d 100644 --- a/src/core/ext/filters/client_channel/xds/xds_api.h +++ b/src/core/ext/filters/client_channel/xds/xds_api.h @@ -59,7 +59,7 @@ class XdsPriorityListUpdate { size_t size() const { return localities.size(); } - Map, Locality, XdsLocalityName::Less> + std::map, Locality, XdsLocalityName::Less> localities; }; diff --git a/src/core/ext/filters/client_channel/xds/xds_bootstrap.cc b/src/core/ext/filters/client_channel/xds/xds_bootstrap.cc index b71b4486a43..f2bba8faf96 100644 --- a/src/core/ext/filters/client_channel/xds/xds_bootstrap.cc +++ b/src/core/ext/filters/client_channel/xds/xds_bootstrap.cc @@ -320,7 +320,7 @@ grpc_error* XdsBootstrap::ParseLocality(grpc_json* json) { InlinedVector XdsBootstrap::ParseMetadataStruct( grpc_json* json, - Map* result) { + std::map* result) { InlinedVector error_list; for (grpc_json* child = json->child; child != nullptr; child = child->next) { if (child->key == nullptr) { diff --git a/src/core/ext/filters/client_channel/xds/xds_bootstrap.h b/src/core/ext/filters/client_channel/xds/xds_bootstrap.h index 404cb6ab239..c0712ec24ed 100644 --- a/src/core/ext/filters/client_channel/xds/xds_bootstrap.h +++ b/src/core/ext/filters/client_channel/xds/xds_bootstrap.h @@ -40,7 +40,7 @@ class XdsBootstrap { double double_value; const char* string_value; bool bool_value; - Map struct_value; + std::map struct_value; std::vector list_value; }; @@ -50,7 +50,7 @@ class XdsBootstrap { const char* locality_region = nullptr; const char* locality_zone = nullptr; const char* locality_subzone = nullptr; - Map metadata; + std::map metadata; }; struct ChannelCreds { @@ -80,7 +80,8 @@ class XdsBootstrap { grpc_error* ParseLocality(grpc_json* json); InlinedVector ParseMetadataStruct( - grpc_json* json, Map* result); + grpc_json* json, + std::map* result); InlinedVector ParseMetadataList( grpc_json* json, std::vector* result); grpc_error* ParseMetadataValue(grpc_json* json, size_t idx, diff --git a/src/core/ext/filters/client_channel/xds/xds_client.h b/src/core/ext/filters/client_channel/xds/xds_client.h index c5fc08cf0c2..e3377ef52bc 100644 --- a/src/core/ext/filters/client_channel/xds/xds_client.h +++ b/src/core/ext/filters/client_channel/xds/xds_client.h @@ -171,9 +171,9 @@ class XdsClient : public InternallyRefCounted { }; struct ClusterState { - Map> + std::map> cluster_watchers; - Map> + std::map> endpoint_watchers; Set client_stats; // The latest data seen from EDS. diff --git a/src/core/ext/filters/client_channel/xds/xds_client_stats.h b/src/core/ext/filters/client_channel/xds/xds_client_stats.h index 9bbd3e44e8f..07b457a0bf4 100644 --- a/src/core/ext/filters/client_channel/xds/xds_client_stats.h +++ b/src/core/ext/filters/client_channel/xds/xds_client_stats.h @@ -111,9 +111,9 @@ class XdsClientStats { double total_metric_value_{0}; }; - using LoadMetricMap = Map, LoadMetric, StringLess>; + using LoadMetricMap = std::map, LoadMetric, StringLess>; using LoadMetricSnapshotMap = - Map, LoadMetric::Snapshot, StringLess>; + std::map, LoadMetric::Snapshot, StringLess>; struct Snapshot { // TODO(juanlishen): Change this to const method when const_iterator is @@ -180,12 +180,12 @@ class XdsClientStats { // UniquePtr<>. We should remove this wrapper if the value type of Map<> // doesn't have to be movable. using LocalityStatsMap = - Map, RefCountedPtr, - XdsLocalityName::Less>; + std::map, RefCountedPtr, + XdsLocalityName::Less>; using LocalityStatsSnapshotMap = - Map, LocalityStats::Snapshot, - XdsLocalityName::Less>; - using DroppedRequestsMap = Map, uint64_t, StringLess>; + std::map, LocalityStats::Snapshot, + XdsLocalityName::Less>; + using DroppedRequestsMap = std::map, uint64_t, StringLess>; using DroppedRequestsSnapshotMap = DroppedRequestsMap; struct Snapshot { diff --git a/src/core/lib/channel/channelz.h b/src/core/lib/channel/channelz.h index 545b9ebeb88..5a063b4df96 100644 --- a/src/core/lib/channel/channelz.h +++ b/src/core/lib/channel/channelz.h @@ -221,8 +221,8 @@ class ChannelNode : public BaseNode { // TODO(roth): We don't actually use the values here, only the keys, so // these should be sets instead of maps, but we don't currently have a set // implementation. Change this if/when we have one. - Map child_channels_; - Map child_subchannels_; + std::map child_channels_; + std::map child_subchannels_; }; // Handles channelz bookkeeping for servers @@ -262,8 +262,8 @@ class ServerNode : public BaseNode { CallCountingHelper call_counter_; ChannelTrace trace_; Mutex child_mu_; // Guards child maps below. - Map> child_sockets_; - Map> child_listen_sockets_; + std::map> child_sockets_; + std::map> child_listen_sockets_; }; // Handles channelz bookkeeping for sockets diff --git a/src/core/lib/channel/channelz_registry.h b/src/core/lib/channel/channelz_registry.h index e04d7c44888..c60a5554fb9 100644 --- a/src/core/lib/channel/channelz_registry.h +++ b/src/core/lib/channel/channelz_registry.h @@ -87,7 +87,7 @@ class ChannelzRegistry { // protects members Mutex mu_; - Map node_map_; + std::map node_map_; intptr_t uuid_generator_ = 0; }; diff --git a/src/core/lib/gprpp/map.h b/src/core/lib/gprpp/map.h index fc44cd2cb8e..0ad92d0bfc8 100644 --- a/src/core/lib/gprpp/map.h +++ b/src/core/lib/gprpp/map.h @@ -23,21 +23,13 @@ #include -#include -#include -#include #include -#include "src/core/lib/gpr/useful.h" -#include "src/core/lib/gprpp/memory.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/string_view.h" namespace grpc_core { -template > -using Map = std::map>>; - struct StringLess { bool operator()(const char* a, const char* b) const { return strcmp(a, b) < 0; diff --git a/src/core/lib/security/credentials/credentials.cc b/src/core/lib/security/credentials/credentials.cc index f2ec9b7f2f2..37678715704 100644 --- a/src/core/lib/security/credentials/credentials.cc +++ b/src/core/lib/security/credentials/credentials.cc @@ -45,18 +45,18 @@ void grpc_channel_credentials_release(grpc_channel_credentials* creds) { if (creds) creds->Unref(); } -static grpc_core::Map, - grpc_core::RefCountedPtr, - grpc_core::StringLess>* g_grpc_control_plane_creds; +static std::map, + grpc_core::RefCountedPtr, + grpc_core::StringLess>* g_grpc_control_plane_creds; static gpr_mu g_control_plane_creds_mu; static void do_control_plane_creds_init() { gpr_mu_init(&g_control_plane_creds_mu); GPR_ASSERT(g_grpc_control_plane_creds == nullptr); g_grpc_control_plane_creds = grpc_core::New< - grpc_core::Map, - grpc_core::RefCountedPtr, - grpc_core::StringLess>>(); + std::map, + grpc_core::RefCountedPtr, + grpc_core::StringLess>>(); } void grpc_control_plane_credentials_init() { diff --git a/src/core/lib/security/credentials/credentials.h b/src/core/lib/security/credentials/credentials.h index 16f0454907b..e0700c41a92 100644 --- a/src/core/lib/security/credentials/credentials.h +++ b/src/core/lib/security/credentials/credentials.h @@ -148,9 +148,9 @@ struct grpc_channel_credentials private: const char* type_; - grpc_core::Map, - grpc_core::RefCountedPtr, - grpc_core::StringLess> + std::map, + grpc_core::RefCountedPtr, + grpc_core::StringLess> local_control_plane_creds_; }; diff --git a/src/core/lib/transport/connectivity_state.h b/src/core/lib/transport/connectivity_state.h index 06817340739..b2add5d7df5 100644 --- a/src/core/lib/transport/connectivity_state.h +++ b/src/core/lib/transport/connectivity_state.h @@ -119,8 +119,8 @@ class ConnectivityStateTracker { Atomic state_; // TODO(roth): Once we can use C++-14 heterogeneous lookups, this can // be a set instead of a map. - Map> + std::map> watchers_; }; From 40510efdc10bda145d2d039be1ce90fc9680ece0 Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Wed, 6 Nov 2019 13:02:55 -0800 Subject: [PATCH 123/133] Yapf --- src/python/grpcio_tests/tests/unit/_interceptor_test.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/python/grpcio_tests/tests/unit/_interceptor_test.py b/src/python/grpcio_tests/tests/unit/_interceptor_test.py index 45a9fa30833..20e546bf0de 100644 --- a/src/python/grpcio_tests/tests/unit/_interceptor_test.py +++ b/src/python/grpcio_tests/tests/unit/_interceptor_test.py @@ -563,7 +563,8 @@ class InterceptorTest(unittest.TestCase): # NOTE: The single-threaded unary-stream path does not support the # grpc.Future interface, so this test does not apply. - @unittest.skipIf(os.getenv("GRPC_SINGLE_THREADED_UNARY_STREAM"), "Not supported.") + @unittest.skipIf( + os.getenv("GRPC_SINGLE_THREADED_UNARY_STREAM"), "Not supported.") def testInterceptedUnaryRequestStreamResponseWithError(self): request = _EXCEPTION_REQUEST From 3d876a656f4bc145ab56bb2f21e6a5bee9ccb2cf Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Wed, 6 Nov 2019 13:24:59 -0800 Subject: [PATCH 124/133] Buildifier --- WORKSPACE | 8 ++++---- bazel/custom_exec_properties.bzl | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index fadfbfb5a7a..f1eeb514149 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -32,16 +32,16 @@ load("@bazel_toolchains//rules:rbe_repo.bzl", "rbe_autoconfig") # Create toolchain configuration for remote execution. rbe_autoconfig( name = "rbe_default", - # use exec_properties instead of deprecated remote_execution_properties - use_legacy_platform_definition = False, exec_properties = create_exec_properties_dict( + docker_add_capabilities = "SYS_PTRACE", + docker_privileged = True, # n1-highmem-2 is the default (small machine) machine type. Targets # that want to use other machines (such as LARGE_MACHINE) will override # this value. gce_machine_type = "n1-highmem-2", - docker_add_capabilities = "SYS_PTRACE", - docker_privileged = True, ), + # use exec_properties instead of deprecated remote_execution_properties + use_legacy_platform_definition = False, ) load("@bazel_toolchains//rules:environments.bzl", "clang_env") diff --git a/bazel/custom_exec_properties.bzl b/bazel/custom_exec_properties.bzl index f03ef859a79..6605f5cc403 100644 --- a/bazel/custom_exec_properties.bzl +++ b/bazel/custom_exec_properties.bzl @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. - load("@grpc_custom_exec_properties//:constants.bzl", _LARGE_MACHINE = "LARGE_MACHINE") LARGE_MACHINE = _LARGE_MACHINE From 57e40c87e9ea093caef72f34555715e3019b1bd0 Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Wed, 6 Nov 2019 13:57:04 -0800 Subject: [PATCH 125/133] Buildifier again --- test/core/iomgr/BUILD | 2 +- test/cpp/qps/BUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/core/iomgr/BUILD b/test/core/iomgr/BUILD index b93d6812682..7550d277aef 100644 --- a/test/core/iomgr/BUILD +++ b/test/core/iomgr/BUILD @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_cc_binary", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") load("//bazel:custom_exec_properties.bzl", "LARGE_MACHINE") licenses(["notice"]) # Apache v2 diff --git a/test/cpp/qps/BUILD b/test/cpp/qps/BUILD index 8aaafe7780d..1a9d4a9bd04 100644 --- a/test/cpp/qps/BUILD +++ b/test/cpp/qps/BUILD @@ -14,7 +14,7 @@ licenses(["notice"]) # Apache v2 -load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_cc_library", "grpc_cc_binary", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_test", "grpc_cc_library", "grpc_package") load("//test/cpp/qps:qps_benchmark_script.bzl", "json_run_localhost_batch", "qps_json_driver_batch") load("//bazel:custom_exec_properties.bzl", "LARGE_MACHINE") From 9918329bb51a1c40e9f4821de2f886e81664b086 Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Wed, 6 Nov 2019 14:54:31 -0800 Subject: [PATCH 126/133] Groundhog day --- test/cpp/qps/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/cpp/qps/BUILD b/test/cpp/qps/BUILD index 1a9d4a9bd04..ff4ee9836c0 100644 --- a/test/cpp/qps/BUILD +++ b/test/cpp/qps/BUILD @@ -14,7 +14,7 @@ licenses(["notice"]) # Apache v2 -load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_test", "grpc_cc_library", "grpc_package") +load("//bazel:grpc_build_system.bzl", "grpc_cc_binary", "grpc_cc_library", "grpc_cc_test", "grpc_package") load("//test/cpp/qps:qps_benchmark_script.bzl", "json_run_localhost_batch", "qps_json_driver_batch") load("//bazel:custom_exec_properties.bzl", "LARGE_MACHINE") From 3a519a0b64038073540c83722256ba57c20e728d Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Wed, 6 Nov 2019 13:30:09 -0800 Subject: [PATCH 127/133] Replaced grpc_core New & Delete with C++ new & delete --- CMakeLists.txt | 38 -------- Makefile | 48 ---------- build.yaml | 12 --- .../filters/client_channel/client_channel.cc | 28 +++--- .../client_channel/global_subchannel_pool.cc | 10 +- .../health/health_check_client.cc | 2 +- .../client_channel/lb_policy/grpclb/grpclb.cc | 6 +- .../lb_policy/grpclb/grpclb_client_stats.cc | 2 +- .../lb_policy/pick_first/pick_first.cc | 2 +- .../lb_policy/round_robin/round_robin.cc | 2 +- .../lb_policy/subchannel_list.h | 6 +- .../client_channel/lb_policy/xds/xds.cc | 6 +- .../client_channel/lb_policy_registry.cc | 4 +- .../client_channel/local_subchannel_pool.cc | 6 +- .../dns/c_ares/grpc_ares_ev_driver.cc | 6 +- .../dns/c_ares/grpc_ares_ev_driver_libuv.cc | 8 +- .../dns/c_ares/grpc_ares_ev_driver_posix.cc | 2 +- .../dns/c_ares/grpc_ares_ev_driver_windows.cc | 10 +- .../resolver/dns/c_ares/grpc_ares_wrapper.cc | 4 +- .../resolver/fake/fake_resolver.cc | 18 ++-- .../client_channel/resolver_registry.cc | 4 +- .../client_channel/resolving_lb_policy.cc | 2 +- .../filters/client_channel/service_config.cc | 4 +- .../filters/client_channel/service_config.h | 13 +-- .../ext/filters/client_channel/subchannel.cc | 12 +-- .../filters/client_channel/xds/xds_client.cc | 10 +- .../ext/filters/deadline/deadline_filter.cc | 4 +- .../ext/filters/max_age/max_age_filter.cc | 3 +- .../chttp2/client/insecure/channel_create.cc | 2 +- .../client/secure/secure_channel_create.cc | 2 +- .../chttp2/transport/chttp2_transport.cc | 4 +- .../chttp2/transport/context_list.cc | 4 +- .../transport/chttp2/transport/frame_data.cc | 2 +- .../ext/transport/chttp2/transport/internal.h | 6 +- .../cronet/transport/cronet_transport.cc | 6 +- src/core/lib/channel/channel_trace.cc | 8 +- src/core/lib/channel/channelz_registry.cc | 4 +- src/core/lib/gprpp/fork.cc | 8 +- src/core/lib/gprpp/memory.h | 35 +------ src/core/lib/gprpp/orphanable.h | 6 +- src/core/lib/gprpp/ref_counted.h | 6 +- src/core/lib/gprpp/ref_counted_ptr.h | 2 +- src/core/lib/gprpp/thd.h | 2 +- src/core/lib/gprpp/thd_posix.cc | 6 +- src/core/lib/gprpp/thd_windows.cc | 6 +- .../lib/http/httpcli_security_connector.cc | 4 +- src/core/lib/iomgr/buffer_list.cc | 6 +- src/core/lib/iomgr/cfstream_handle.cc | 4 +- src/core/lib/iomgr/combiner.cc | 4 +- src/core/lib/iomgr/executor.cc | 12 +-- src/core/lib/iomgr/executor/threadpool.cc | 8 +- src/core/lib/iomgr/resolve_address_custom.cc | 2 +- src/core/lib/iomgr/tcp_server_posix.cc | 4 +- src/core/lib/iomgr/udp_server.cc | 4 +- .../credentials/alts/alts_credentials.cc | 5 +- .../composite/composite_credentials.cc | 8 +- .../lib/security/credentials/credentials.cc | 10 +- .../lib/security/credentials/credentials.h | 4 +- .../credentials/fake/fake_credentials.cc | 7 +- .../credentials/local/local_credentials.cc | 4 +- .../credentials/oauth2/oauth2_credentials.cc | 2 +- .../credentials/plugin/plugin_credentials.cc | 2 +- .../credentials/ssl/ssl_credentials.cc | 8 +- .../tls/grpc_tls_credentials_options.cc | 10 +- .../credentials/tls/spiffe_credentials.cc | 4 +- .../tls/spiffe_security_connector.cc | 9 +- .../lib/security/transport/secure_endpoint.cc | 8 +- src/core/lib/slice/slice.cc | 21 ++-- src/core/lib/surface/server.cc | 3 +- src/core/lib/transport/connectivity_state.cc | 4 +- src/core/lib/transport/metadata.cc | 18 ++-- src/core/lib/transport/metadata.h | 6 +- src/core/lib/transport/static_metadata.cc | 6 +- src/core/lib/transport/transport.cc | 4 +- .../alts/handshaker/alts_tsi_handshaker.cc | 4 +- .../ssl/session_cache/ssl_session_cache.cc | 6 +- .../CronetTests/CoreCronetEnd2EndTests.mm | 2 +- .../dns_resolver_connectivity_test.cc | 2 +- .../resolvers/dns_resolver_cooldown_test.cc | 7 +- .../resolvers/fake_resolver_test.cc | 2 +- test/core/end2end/bad_server_response_test.cc | 4 +- test/core/end2end/fixtures/h2_census.cc | 4 +- test/core/end2end/fixtures/h2_compress.cc | 4 +- test/core/end2end/fixtures/h2_fakesec.cc | 5 +- test/core/end2end/fixtures/h2_full+pipe.cc | 4 +- test/core/end2end/fixtures/h2_full+trace.cc | 4 +- .../end2end/fixtures/h2_full+workarounds.cc | 4 +- test/core/end2end/fixtures/h2_full.cc | 4 +- test/core/end2end/fixtures/h2_http_proxy.cc | 4 +- test/core/end2end/fixtures/h2_oauth2.cc | 5 +- test/core/end2end/fixtures/h2_spiffe.cc | 5 +- test/core/end2end/fixtures/h2_ssl.cc | 5 +- .../end2end/fixtures/h2_ssl_cred_reload.cc | 5 +- .../end2end/fixtures/http_proxy_fixture.cc | 4 +- test/core/end2end/fixtures/local_util.cc | 4 +- test/core/end2end/fixtures/proxy.cc | 4 +- test/core/end2end/fuzzers/api_fuzzer.cc | 4 +- test/core/end2end/h2_ssl_cert_test.cc | 5 +- test/core/end2end/inproc_callback_test.cc | 8 +- test/core/gprpp/BUILD | 14 --- test/core/gprpp/inlined_vector_test.cc | 2 +- test/core/gprpp/memory_test.cc | 95 ------------------- test/core/gprpp/mpscq_test.cc | 2 +- test/core/gprpp/orphanable_test.cc | 6 +- test/core/gprpp/ref_counted_ptr_test.cc | 38 ++++---- test/core/gprpp/ref_counted_test.cc | 12 +-- test/core/iomgr/mpmcqueue_test.cc | 30 +++--- test/core/iomgr/threadpool_test.cc | 42 ++++---- test/core/iomgr/udp_server_test.cc | 4 +- test/core/security/credentials_test.cc | 5 +- test/core/surface/completion_queue_test.cc | 4 +- .../core/transport/connectivity_state_test.cc | 6 +- test/core/util/test_lb_policies.cc | 6 +- test/cpp/client/credentials_test.cc | 15 ++- test/cpp/microbenchmarks/bm_chttp2_hpack.cc | 2 +- test/cpp/microbenchmarks/bm_threadpool.cc | 4 +- test/cpp/naming/cancel_ares_query_test.cc | 2 +- test/cpp/naming/resolver_component_test.cc | 6 +- tools/codegen/core/gen_static_metadata.py | 5 +- tools/run_tests/generated/tests.json | 24 ----- 120 files changed, 353 insertions(+), 652 deletions(-) delete mode 100644 test/core/gprpp/memory_test.cc diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b8fe560e75..d6da566a87a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -748,7 +748,6 @@ if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_dependencies(buildtests_cxx json_run_localhost) endif() - add_dependencies(buildtests_cxx memory_test) add_dependencies(buildtests_cxx message_allocator_end2end_test) add_dependencies(buildtests_cxx metrics_client) add_dependencies(buildtests_cxx mock_test) @@ -13501,43 +13500,6 @@ endif() endif() if(gRPC_BUILD_TESTS) -add_executable(memory_test - test/core/gprpp/memory_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) - -target_include_directories(memory_test - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_SSL_INCLUDE_DIR} - ${_gRPC_UPB_GENERATED_DIR} - ${_gRPC_UPB_GRPC_GENERATED_DIR} - ${_gRPC_UPB_INCLUDE_DIR} - ${_gRPC_ZLIB_INCLUDE_DIR} - third_party/googletest/googletest/include - third_party/googletest/googletest - third_party/googletest/googlemock/include - third_party/googletest/googlemock - ${_gRPC_PROTO_GENS_DIR} -) - -target_link_libraries(memory_test - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - grpc++ - grpc - gpr - ${_gRPC_GFLAGS_LIBRARIES} -) - - -endif() -if(gRPC_BUILD_TESTS) - add_executable(message_allocator_end2end_test test/cpp/end2end/message_allocator_end2end_test.cc third_party/googletest/googletest/src/gtest-all.cc diff --git a/Makefile b/Makefile index 9f5a4c68e2b..b4e3fc05012 100644 --- a/Makefile +++ b/Makefile @@ -1256,7 +1256,6 @@ interop_client: $(BINDIR)/$(CONFIG)/interop_client interop_server: $(BINDIR)/$(CONFIG)/interop_server interop_test: $(BINDIR)/$(CONFIG)/interop_test json_run_localhost: $(BINDIR)/$(CONFIG)/json_run_localhost -memory_test: $(BINDIR)/$(CONFIG)/memory_test message_allocator_end2end_test: $(BINDIR)/$(CONFIG)/message_allocator_end2end_test metrics_client: $(BINDIR)/$(CONFIG)/metrics_client mock_test: $(BINDIR)/$(CONFIG)/mock_test @@ -1726,7 +1725,6 @@ buildtests_cxx: privatelibs_cxx \ $(BINDIR)/$(CONFIG)/interop_server \ $(BINDIR)/$(CONFIG)/interop_test \ $(BINDIR)/$(CONFIG)/json_run_localhost \ - $(BINDIR)/$(CONFIG)/memory_test \ $(BINDIR)/$(CONFIG)/message_allocator_end2end_test \ $(BINDIR)/$(CONFIG)/metrics_client \ $(BINDIR)/$(CONFIG)/mock_test \ @@ -1898,7 +1896,6 @@ buildtests_cxx: privatelibs_cxx \ $(BINDIR)/$(CONFIG)/interop_server \ $(BINDIR)/$(CONFIG)/interop_test \ $(BINDIR)/$(CONFIG)/json_run_localhost \ - $(BINDIR)/$(CONFIG)/memory_test \ $(BINDIR)/$(CONFIG)/message_allocator_end2end_test \ $(BINDIR)/$(CONFIG)/metrics_client \ $(BINDIR)/$(CONFIG)/mock_test \ @@ -2410,8 +2407,6 @@ test_cxx: buildtests_cxx $(Q) $(BINDIR)/$(CONFIG)/inproc_sync_unary_ping_pong_test || ( echo test inproc_sync_unary_ping_pong_test failed ; exit 1 ) $(E) "[RUN] Testing interop_test" $(Q) $(BINDIR)/$(CONFIG)/interop_test || ( echo test interop_test failed ; exit 1 ) - $(E) "[RUN] Testing memory_test" - $(Q) $(BINDIR)/$(CONFIG)/memory_test || ( echo test memory_test failed ; exit 1 ) $(E) "[RUN] Testing message_allocator_end2end_test" $(Q) $(BINDIR)/$(CONFIG)/message_allocator_end2end_test || ( echo test message_allocator_end2end_test failed ; exit 1 ) $(E) "[RUN] Testing mock_test" @@ -17811,49 +17806,6 @@ endif endif -MEMORY_TEST_SRC = \ - test/core/gprpp/memory_test.cc \ - -MEMORY_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(MEMORY_TEST_SRC)))) -ifeq ($(NO_SECURE),true) - -# You can't build secure targets if you don't have OpenSSL. - -$(BINDIR)/$(CONFIG)/memory_test: openssl_dep_error - -else - - - - -ifeq ($(NO_PROTOBUF),true) - -# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.5.0+. - -$(BINDIR)/$(CONFIG)/memory_test: protobuf_dep_error - -else - -$(BINDIR)/$(CONFIG)/memory_test: $(PROTOBUF_DEP) $(MEMORY_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a - $(E) "[LD] Linking $@" - $(Q) mkdir -p `dirname $@` - $(Q) $(LDXX) $(LDFLAGS) $(MEMORY_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/memory_test - -endif - -endif - -$(OBJDIR)/$(CONFIG)/test/core/gprpp/memory_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a - -deps_memory_test: $(MEMORY_TEST_OBJS:.o=.dep) - -ifneq ($(NO_SECURE),true) -ifneq ($(NO_DEPS),true) --include $(MEMORY_TEST_OBJS:.o=.dep) -endif -endif - - MESSAGE_ALLOCATOR_END2END_TEST_SRC = \ test/cpp/end2end/message_allocator_end2end_test.cc \ diff --git a/build.yaml b/build.yaml index 5a6b6c6398c..229d222b820 100644 --- a/build.yaml +++ b/build.yaml @@ -5347,18 +5347,6 @@ targets: - mac - linux - posix -- name: memory_test - gtest: true - build: test - language: c++ - src: - - test/core/gprpp/memory_test.cc - deps: - - grpc_test_util - - grpc++ - - grpc - - gpr - uses_polling: false - name: message_allocator_end2end_test gtest: true cpu_cost: 0.5 diff --git a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc index ada3f8bb4f7..a3e46ca0825 100644 --- a/src/core/ext/filters/client_channel/client_channel.cc +++ b/src/core/ext/filters/client_channel/client_channel.cc @@ -162,7 +162,7 @@ class ChannelData { MutexLock lock(&external_watchers_mu_); // Will be deleted when the watch is complete. GPR_ASSERT(external_watchers_[on_complete] == nullptr); - external_watchers_[on_complete] = New( + external_watchers_[on_complete] = new ExternalConnectivityWatcher( this, pollent, state, on_complete, watcher_timer_init); } @@ -901,9 +901,9 @@ class ChannelData::SubchannelWrapper : public SubchannelInterface { UniquePtr watcher) override { auto& watcher_wrapper = watcher_map_[watcher.get()]; GPR_ASSERT(watcher_wrapper == nullptr); - watcher_wrapper = New(std::move(watcher), - Ref(DEBUG_LOCATION, "WatcherWrapper"), - initial_state); + watcher_wrapper = new WatcherWrapper(std::move(watcher), + Ref(DEBUG_LOCATION, "WatcherWrapper"), + initial_state); subchannel_->WatchConnectivityState( initial_state, UniquePtr(gpr_strdup(health_check_service_name_.get())), @@ -1018,7 +1018,7 @@ class ChannelData::SubchannelWrapper : public SubchannelInterface { connected_subchannel.get(), ConnectivityStateName(new_state)); } // Will delete itself. - New(Ref(), new_state, std::move(connected_subchannel)); + new Updater(Ref(), new_state, std::move(connected_subchannel)); } grpc_pollset_set* interested_parties() override { @@ -1030,7 +1030,7 @@ class ChannelData::SubchannelWrapper : public SubchannelInterface { WatcherWrapper* MakeReplacement() { auto* replacement = - New(std::move(watcher_), parent_, last_seen_state_); + new WatcherWrapper(std::move(watcher_), parent_, last_seen_state_); replacement_ = replacement; return replacement; } @@ -1074,7 +1074,7 @@ class ChannelData::SubchannelWrapper : public SubchannelInterface { self->parent_->parent_->MaybeUpdateConnectedSubchannel( std::move(self->connected_subchannel_)); self->parent_->watcher_->OnConnectivityStateChange(self->state_); - Delete(self); + delete self; } RefCountedPtr parent_; @@ -1237,7 +1237,7 @@ class ChannelData::ConnectivityWatcherAdder { std::move(self->watcher_)); GRPC_CHANNEL_STACK_UNREF(self->chand_->owning_stack_, "ConnectivityWatcherAdder"); - Delete(self); + delete self; } ChannelData* chand_; @@ -1270,7 +1270,7 @@ class ChannelData::ConnectivityWatcherRemover { self->chand_->state_tracker_.RemoveWatcher(self->watcher_); GRPC_CHANNEL_STACK_UNREF(self->chand_->owning_stack_, "ConnectivityWatcherRemover"); - Delete(self); + delete self; } ChannelData* chand_; @@ -1595,7 +1595,7 @@ void ChannelData::CreateResolvingLoadBalancingPolicyLocked() { lb_args.channel_control_helper = MakeUnique(this); lb_args.args = channel_args_; UniquePtr target_uri(gpr_strdup(target_uri_.get())); - resolving_lb_policy_.reset(New( + resolving_lb_policy_.reset(new ResolvingLoadBalancingPolicy( std::move(lb_args), &grpc_client_channel_routing_trace, std::move(target_uri), ProcessResolverResultLocked, this)); grpc_pollset_set_add_pollset_set(resolving_lb_policy_->interested_parties(), @@ -1964,12 +1964,12 @@ grpc_connectivity_state ChannelData::CheckConnectivityState( void ChannelData::AddConnectivityWatcher( grpc_connectivity_state initial_state, OrphanablePtr watcher) { - New(this, initial_state, std::move(watcher)); + new ConnectivityWatcherAdder(this, initial_state, std::move(watcher)); } void ChannelData::RemoveConnectivityWatcher( AsyncConnectivityStateWatcherInterface* watcher) { - New(this, watcher); + new ConnectivityWatcherRemover(this, watcher); } // @@ -3735,7 +3735,7 @@ class CallData::QueuedPickCanceller { YieldCallCombinerIfPendingBatchesFound); } GRPC_CALL_STACK_UNREF(calld->owning_call_, "QueuedPickCanceller"); - Delete(self); + delete self; } grpc_call_element* elem_; @@ -3764,7 +3764,7 @@ void CallData::AddCallToQueuedPicksLocked(grpc_call_element* elem) { pick_.elem = elem; chand->AddQueuedPick(&pick_, pollent_); // Register call combiner cancellation callback. - pick_canceller_ = New(elem); + pick_canceller_ = new QueuedPickCanceller(elem); } void CallData::ApplyServiceConfigToCallLocked(grpc_call_element* elem) { diff --git a/src/core/ext/filters/client_channel/global_subchannel_pool.cc b/src/core/ext/filters/client_channel/global_subchannel_pool.cc index b5e1feb149a..339a47728f6 100644 --- a/src/core/ext/filters/client_channel/global_subchannel_pool.cc +++ b/src/core/ext/filters/client_channel/global_subchannel_pool.cc @@ -35,7 +35,7 @@ GlobalSubchannelPool::~GlobalSubchannelPool() { } void GlobalSubchannelPool::Init() { - instance_ = New>( + instance_ = new RefCountedPtr( MakeRefCounted()); } @@ -45,7 +45,7 @@ void GlobalSubchannelPool::Shutdown() { // To ensure Shutdown() was not called before. GPR_ASSERT(*instance_ != nullptr); instance_->reset(); - Delete(instance_); + delete instance_; } RefCountedPtr GlobalSubchannelPool::instance() { @@ -78,7 +78,7 @@ Subchannel* GlobalSubchannelPool::RegisterSubchannel(SubchannelKey* key, // Note that we should ref the old map first because grpc_avl_add() will // unref it while we still need to access it later. grpc_avl new_map = grpc_avl_add( - grpc_avl_ref(old_map, nullptr), New(*key), + grpc_avl_ref(old_map, nullptr), new SubchannelKey(*key), GRPC_SUBCHANNEL_WEAK_REF(constructed, "subchannel_register+new"), nullptr); // Try to publish the change to the shared map. It may happen (but @@ -142,12 +142,12 @@ namespace { void sck_avl_destroy(void* p, void* /*user_data*/) { SubchannelKey* key = static_cast(p); - Delete(key); + delete key; } void* sck_avl_copy(void* p, void* /*unused*/) { const SubchannelKey* key = static_cast(p); - auto* new_key = New(*key); + auto* new_key = new SubchannelKey(*key); return static_cast(new_key); } diff --git a/src/core/ext/filters/client_channel/health/health_check_client.cc b/src/core/ext/filters/client_channel/health/health_check_client.cc index aa90c3dd2a5..2826dfe9685 100644 --- a/src/core/ext/filters/client_channel/health/health_check_client.cc +++ b/src/core/ext/filters/client_channel/health/health_check_client.cc @@ -400,7 +400,7 @@ void HealthCheckClient::CallState::AfterCallStackDestruction( void* arg, grpc_error* /*error*/) { HealthCheckClient::CallState* self = static_cast(arg); - Delete(self); + delete self; } void HealthCheckClient::CallState::OnCancelComplete(void* arg, diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc index 26238ff2b7c..caace9a015b 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc @@ -1724,7 +1724,7 @@ grpc_channel_args* GrpcLb::CreateChildPolicyArgsLocked( OrphanablePtr GrpcLb::CreateChildPolicyLocked( const char* name, const grpc_channel_args* args) { - Helper* helper = New(Ref()); + Helper* helper = new Helper(Ref()); LoadBalancingPolicy::Args lb_policy_args; lb_policy_args.combiner = combiner(); lb_policy_args.args = args; @@ -1883,7 +1883,7 @@ class GrpcLbFactory : public LoadBalancingPolicyFactory { GPR_DEBUG_ASSERT(error != nullptr && *error == GRPC_ERROR_NONE); if (json == nullptr) { return RefCountedPtr( - New(nullptr)); + new ParsedGrpcLbConfig(nullptr)); } InlinedVector error_list; RefCountedPtr child_policy; @@ -1905,7 +1905,7 @@ class GrpcLbFactory : public LoadBalancingPolicyFactory { } if (error_list.empty()) { return RefCountedPtr( - New(std::move(child_policy))); + new ParsedGrpcLbConfig(std::move(child_policy))); } else { *error = GRPC_ERROR_CREATE_FROM_VECTOR("GrpcLb Parser", &error_list); return nullptr; diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc index 35123633feb..b6c1b03e48b 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc @@ -52,7 +52,7 @@ void GrpcLbClientStats::AddCallDropped(const char* token) { // Record the drop. MutexLock lock(&drop_count_mu_); if (drop_token_counts_ == nullptr) { - drop_token_counts_.reset(New()); + drop_token_counts_.reset(new DroppedCallCounts()); } for (size_t i = 0; i < drop_token_counts_->size(); ++i) { if (strcmp((*drop_token_counts_)[i].token.get(), token) == 0) { diff --git a/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc b/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc index 1063167ec00..bc00d31f442 100644 --- a/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc +++ b/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc @@ -495,7 +495,7 @@ class PickFirstFactory : public LoadBalancingPolicyFactory { GPR_DEBUG_ASSERT(strcmp(json->key, name()) == 0); } return RefCountedPtr( - New()); + new ParsedPickFirstConfig()); } }; diff --git a/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc b/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc index b567a6ba4bf..67fbf17fda2 100644 --- a/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc +++ b/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc @@ -491,7 +491,7 @@ class RoundRobinFactory : public LoadBalancingPolicyFactory { GPR_DEBUG_ASSERT(strcmp(json->key, name()) == 0); } return RefCountedPtr( - New()); + new ParsedRoundRobinConfig()); } }; diff --git a/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h b/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h index 70acb50cf45..2e0b5e2ace5 100644 --- a/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h +++ b/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h @@ -206,10 +206,6 @@ class SubchannelList : public InternallyRefCounted { virtual ~SubchannelList(); private: - // So New() can call our private ctor. - template - friend T* New(Args&&... args); - // For accessing Ref() and Unref(). friend class SubchannelData; @@ -317,7 +313,7 @@ void SubchannelData(this, subchannel_list()->Ref(DEBUG_LOCATION, "Watcher")); + new Watcher(this, subchannel_list()->Ref(DEBUG_LOCATION, "Watcher")); subchannel_->WatchConnectivityState( connectivity_state_, UniquePtr( diff --git a/src/core/ext/filters/client_channel/lb_policy/xds/xds.cc b/src/core/ext/filters/client_channel/lb_policy/xds/xds.cc index fe77d6294c0..57cdec10487 100644 --- a/src/core/ext/filters/client_channel/lb_policy/xds/xds.cc +++ b/src/core/ext/filters/client_channel/lb_policy/xds/xds.cc @@ -992,7 +992,7 @@ void XdsLb::UpdateFallbackPolicyLocked() { OrphanablePtr XdsLb::CreateFallbackPolicyLocked( const char* name, const grpc_channel_args* args) { FallbackHelper* helper = - New(Ref(DEBUG_LOCATION, "FallbackHelper")); + new FallbackHelper(Ref(DEBUG_LOCATION, "FallbackHelper")); LoadBalancingPolicy::Args lb_policy_args; lb_policy_args.combiner = combiner(); lb_policy_args.args = args; @@ -1081,7 +1081,7 @@ void XdsLb::PriorityList::UpdateXdsPickerLocked() { void XdsLb::PriorityList::MaybeCreateLocalityMapLocked(uint32_t priority) { // Exhausted priorities in the update. if (!priority_list_update().Contains(priority)) return; - auto new_locality_map = New( + auto new_locality_map = new LocalityMap( xds_policy_->Ref(DEBUG_LOCATION, "XdsLb+LocalityMap"), priority); priorities_.emplace_back(OrphanablePtr(new_locality_map)); new_locality_map->UpdateLocked(*priority_list_update().Find(priority)); @@ -1500,7 +1500,7 @@ XdsLb::PriorityList::LocalityMap::Locality::CreateChildPolicyArgsLocked( OrphanablePtr XdsLb::PriorityList::LocalityMap::Locality::CreateChildPolicyLocked( const char* name, const grpc_channel_args* args) { - Helper* helper = New(this->Ref(DEBUG_LOCATION, "Helper")); + Helper* helper = new Helper(this->Ref(DEBUG_LOCATION, "Helper")); LoadBalancingPolicy::Args lb_policy_args; lb_policy_args.combiner = xds_policy()->combiner(); lb_policy_args.args = args; diff --git a/src/core/ext/filters/client_channel/lb_policy_registry.cc b/src/core/ext/filters/client_channel/lb_policy_registry.cc index c0788955419..21fcca5cd09 100644 --- a/src/core/ext/filters/client_channel/lb_policy_registry.cc +++ b/src/core/ext/filters/client_channel/lb_policy_registry.cc @@ -64,11 +64,11 @@ RegistryState* g_state = nullptr; // void LoadBalancingPolicyRegistry::Builder::InitRegistry() { - if (g_state == nullptr) g_state = New(); + if (g_state == nullptr) g_state = new RegistryState(); } void LoadBalancingPolicyRegistry::Builder::ShutdownRegistry() { - Delete(g_state); + delete g_state; g_state = nullptr; } diff --git a/src/core/ext/filters/client_channel/local_subchannel_pool.cc b/src/core/ext/filters/client_channel/local_subchannel_pool.cc index e94ede0b9cb..e57599962ad 100644 --- a/src/core/ext/filters/client_channel/local_subchannel_pool.cc +++ b/src/core/ext/filters/client_channel/local_subchannel_pool.cc @@ -43,7 +43,7 @@ Subchannel* LocalSubchannelPool::RegisterSubchannel(SubchannelKey* key, GRPC_SUBCHANNEL_UNREF(constructed, "subchannel_register+found_existing"); } else { // There hasn't been such subchannel. Add one. - subchannel_map_ = grpc_avl_add(subchannel_map_, New(*key), + subchannel_map_ = grpc_avl_add(subchannel_map_, new SubchannelKey(*key), constructed, nullptr); c = constructed; } @@ -64,12 +64,12 @@ namespace { void sck_avl_destroy(void* p, void* /*user_data*/) { SubchannelKey* key = static_cast(p); - Delete(key); + delete key; } void* sck_avl_copy(void* p, void* /*unused*/) { const SubchannelKey* key = static_cast(p); - auto new_key = New(*key); + auto new_key = new SubchannelKey(*key); return static_cast(new_key); } diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc index 621db723dc7..1d69eefdf3d 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc @@ -110,7 +110,7 @@ static void grpc_ares_ev_driver_unref(grpc_ares_ev_driver* ev_driver) { GRPC_COMBINER_UNREF(ev_driver->combiner, "free ares event driver"); ares_destroy(ev_driver->channel); grpc_ares_complete_request_locked(ev_driver->request); - grpc_core::Delete(ev_driver); + delete ev_driver; } } @@ -120,7 +120,7 @@ static void fd_node_destroy_locked(fd_node* fdn) { GPR_ASSERT(!fdn->readable_registered); GPR_ASSERT(!fdn->writable_registered); GPR_ASSERT(fdn->already_shutdown); - grpc_core::Delete(fdn->grpc_polled_fd); + delete fdn->grpc_polled_fd; gpr_free(fdn); } @@ -148,7 +148,7 @@ grpc_error* grpc_ares_ev_driver_create_locked(grpc_ares_ev_driver** ev_driver, int query_timeout_ms, grpc_core::Combiner* combiner, grpc_ares_request* request) { - *ev_driver = grpc_core::New(); + *ev_driver = new grpc_ares_ev_driver(); ares_options opts; memset(&opts, 0, sizeof(opts)); opts.flags |= ARES_FLAG_STAYOPEN; diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc index 3d7140cb4b8..f43192f778b 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc @@ -37,14 +37,14 @@ namespace grpc_core { void ares_uv_poll_cb(uv_poll_t* handle, int status, int events); -void ares_uv_poll_close_cb(uv_handle_t* handle) { Delete(handle); } +void ares_uv_poll_close_cb(uv_handle_t* handle) { delete handle; } class GrpcPolledFdLibuv : public GrpcPolledFd { public: GrpcPolledFdLibuv(ares_socket_t as, Combiner* combiner) : as_(as), combiner_(combiner) { gpr_asprintf(&name_, "c-ares socket: %" PRIdPTR, (intptr_t)as); - handle_ = New(); + handle_ = new uv_poll_t(); uv_poll_init_socket(uv_default_loop(), handle_, as); handle_->data = this; GRPC_COMBINER_REF(combiner_, "libuv ares event driver"); @@ -154,7 +154,7 @@ void ares_uv_poll_cb(uv_poll_t* handle, int status, int events) { grpc_core::ExecCtx exec_ctx; GrpcPolledFdLibuv* polled_fd = reinterpret_cast(handle->data); - AresUvPollCbArg* arg = New(handle, status, events); + AresUvPollCbArg* arg = new AresUvPollCbArg(handle, status, events); polled_fd->combiner_->Run( GRPC_CLOSURE_CREATE(ares_uv_poll_cb_locked, arg, nullptr), GRPC_ERROR_NONE); @@ -165,7 +165,7 @@ class GrpcPolledFdFactoryLibuv : public GrpcPolledFdFactory { GrpcPolledFd* NewGrpcPolledFdLocked(ares_socket_t as, grpc_pollset_set* driver_pollset_set, Combiner* combiner) override { - return New(as, combiner); + return new GrpcPolledFdLibuv(as, combiner); } void ConfigureAresChannelLocked(ares_channel channel) override {} diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc index e185116e222..eb48b6feac4 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc @@ -91,7 +91,7 @@ class GrpcPolledFdFactoryPosix : public GrpcPolledFdFactory { GrpcPolledFd* NewGrpcPolledFdLocked(ares_socket_t as, grpc_pollset_set* driver_pollset_set, Combiner* /*combiner*/) override { - return New(as, driver_pollset_set); + return new GrpcPolledFdPosix(as, driver_pollset_set); } void ConfigureAresChannelLocked(ares_channel /*channel*/) override {} diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc index 9151bee22e6..08429f6e8d4 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc @@ -752,7 +752,7 @@ class SockToPolledFdMap { } void AddNewSocket(SOCKET s, GrpcPolledFdWindows* polled_fd) { - SockToPolledFdEntry* new_node = New(s, polled_fd); + SockToPolledFdEntry* new_node = new SockToPolledFdEntry(s, polled_fd); new_node->next = head_; head_ = new_node; } @@ -775,7 +775,7 @@ class SockToPolledFdMap { node = node->next) { if (node->socket == s) { *prev = node->next; - Delete(node); + delete node; return; } prev = &node->next; @@ -805,7 +805,7 @@ class SockToPolledFdMap { } grpc_tcp_set_non_block(s); GrpcPolledFdWindows* polled_fd = - New(s, map->combiner_, af, type); + new GrpcPolledFdWindows(s, map->combiner_, af, type); GRPC_CARES_TRACE_LOG( "fd:|%s| created with params af:%d type:%d protocol:%d", polled_fd->GetName(), af, type, protocol); @@ -855,7 +855,7 @@ class SockToPolledFdMap { "Shut down c-ares fd before without it ever having made it into the " "driver's list")); } - grpc_core::Delete(polled_fd); + delete polled_fd; return 0; } @@ -920,7 +920,7 @@ class GrpcPolledFdFactoryWindows : public GrpcPolledFdFactory { // Set a flag so that the virtual socket "close" method knows it // doesn't need to call ShutdownLocked, since now the driver will. polled_fd->set_gotten_into_driver_list(); - return grpc_core::New(polled_fd); + return new GrpcPolledFdWindowsWrapper(polled_fd); } void ConfigureAresChannelLocked(ares_channel channel) override { diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc index 69257bd60cc..a1fdac1cd88 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc @@ -717,7 +717,7 @@ static void on_dns_lookup_done_locked(void* arg, grpc_error* error) { grpc_core::ExecCtx::Run(DEBUG_LOCATION, r->on_resolve_address_done, GRPC_ERROR_REF(error)); GRPC_COMBINER_UNREF(r->combiner, "on_dns_lookup_done_cb"); - grpc_core::Delete(r); + delete r; } static void on_dns_lookup_done(void* arg, grpc_error* error) { @@ -747,7 +747,7 @@ static void grpc_resolve_address_ares_impl(const char* name, grpc_closure* on_done, grpc_resolved_addresses** addrs) { grpc_resolve_address_ares_request* r = - grpc_core::New(); + new grpc_resolve_address_ares_request(); r->combiner = grpc_combiner_create(); r->addrs_out = addrs; r->on_resolve_address_done = on_done; diff --git a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc index bba9bb749c7..906dad2b6aa 100644 --- a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc @@ -191,7 +191,7 @@ void FakeResolverResponseGenerator::SetResponseLocked(void* arg, resolver->has_next_result_ = true; resolver->MaybeSendResultLocked(); } - Delete(closure_arg); + delete closure_arg; } void FakeResolverResponseGenerator::SetResponse(Resolver::Result result) { @@ -205,7 +205,7 @@ void FakeResolverResponseGenerator::SetResponse(Resolver::Result result) { } resolver = resolver_->Ref(); } - SetResponseClosureArg* closure_arg = New(); + SetResponseClosureArg* closure_arg = new SetResponseClosureArg(); closure_arg->resolver = std::move(resolver); closure_arg->result = std::move(result); closure_arg->resolver->combiner()->Run( @@ -222,7 +222,7 @@ void FakeResolverResponseGenerator::SetReresolutionResponseLocked( resolver->reresolution_result_ = std::move(closure_arg->result); resolver->has_reresolution_result_ = closure_arg->has_result; } - Delete(closure_arg); + delete closure_arg; } void FakeResolverResponseGenerator::SetReresolutionResponse( @@ -233,7 +233,7 @@ void FakeResolverResponseGenerator::SetReresolutionResponse( GPR_ASSERT(resolver_ != nullptr); resolver = resolver_->Ref(); } - SetResponseClosureArg* closure_arg = New(); + SetResponseClosureArg* closure_arg = new SetResponseClosureArg(); closure_arg->resolver = std::move(resolver); closure_arg->result = std::move(result); closure_arg->has_result = true; @@ -250,7 +250,7 @@ void FakeResolverResponseGenerator::UnsetReresolutionResponse() { GPR_ASSERT(resolver_ != nullptr); resolver = resolver_->Ref(); } - SetResponseClosureArg* closure_arg = New(); + SetResponseClosureArg* closure_arg = new SetResponseClosureArg(); closure_arg->resolver = std::move(resolver); closure_arg->resolver->combiner()->Run( GRPC_CLOSURE_INIT(&closure_arg->set_response_closure, @@ -266,7 +266,7 @@ void FakeResolverResponseGenerator::SetFailureLocked(void* arg, resolver->return_failure_ = true; if (closure_arg->immediate) resolver->MaybeSendResultLocked(); } - Delete(closure_arg); + delete closure_arg; } void FakeResolverResponseGenerator::SetFailure() { @@ -276,7 +276,7 @@ void FakeResolverResponseGenerator::SetFailure() { GPR_ASSERT(resolver_ != nullptr); resolver = resolver_->Ref(); } - SetResponseClosureArg* closure_arg = New(); + SetResponseClosureArg* closure_arg = new SetResponseClosureArg(); closure_arg->resolver = std::move(resolver); closure_arg->resolver->combiner()->Run( GRPC_CLOSURE_INIT(&closure_arg->set_response_closure, SetFailureLocked, @@ -291,7 +291,7 @@ void FakeResolverResponseGenerator::SetFailureOnReresolution() { GPR_ASSERT(resolver_ != nullptr); resolver = resolver_->Ref(); } - SetResponseClosureArg* closure_arg = New(); + SetResponseClosureArg* closure_arg = new SetResponseClosureArg(); closure_arg->resolver = std::move(resolver); closure_arg->immediate = false; closure_arg->resolver->combiner()->Run( @@ -306,7 +306,7 @@ void FakeResolverResponseGenerator::SetFakeResolver( resolver_ = std::move(resolver); if (resolver_ == nullptr) return; if (has_result_) { - SetResponseClosureArg* closure_arg = New(); + SetResponseClosureArg* closure_arg = new SetResponseClosureArg(); closure_arg->resolver = resolver_->Ref(); closure_arg->result = std::move(result_); resolver_->combiner()->Run( diff --git a/src/core/ext/filters/client_channel/resolver_registry.cc b/src/core/ext/filters/client_channel/resolver_registry.cc index 0776551a9b6..fd34b9c856c 100644 --- a/src/core/ext/filters/client_channel/resolver_registry.cc +++ b/src/core/ext/filters/client_channel/resolver_registry.cc @@ -103,11 +103,11 @@ static RegistryState* g_state = nullptr; // void ResolverRegistry::Builder::InitRegistry() { - if (g_state == nullptr) g_state = New(); + if (g_state == nullptr) g_state = new RegistryState(); } void ResolverRegistry::Builder::ShutdownRegistry() { - Delete(g_state); + delete g_state; g_state = nullptr; } diff --git a/src/core/ext/filters/client_channel/resolving_lb_policy.cc b/src/core/ext/filters/client_channel/resolving_lb_policy.cc index 9cac0ed702c..15182000dc5 100644 --- a/src/core/ext/filters/client_channel/resolving_lb_policy.cc +++ b/src/core/ext/filters/client_channel/resolving_lb_policy.cc @@ -371,7 +371,7 @@ OrphanablePtr ResolvingLoadBalancingPolicy::CreateLbPolicyLocked( const char* lb_policy_name, const grpc_channel_args& args, TraceStringVector* trace_strings) { - ResolvingControlHelper* helper = New(Ref()); + ResolvingControlHelper* helper = new ResolvingControlHelper(Ref()); LoadBalancingPolicy::Args lb_policy_args; lb_policy_args.combiner = combiner(); lb_policy_args.channel_control_helper = diff --git a/src/core/ext/filters/client_channel/service_config.cc b/src/core/ext/filters/client_channel/service_config.cc index d41859bf45a..3a089f5b442 100644 --- a/src/core/ext/filters/client_channel/service_config.cc +++ b/src/core/ext/filters/client_channel/service_config.cc @@ -318,11 +318,11 @@ size_t ServiceConfig::RegisterParser(UniquePtr parser) { void ServiceConfig::Init() { GPR_ASSERT(g_registered_parsers == nullptr); - g_registered_parsers = New(); + g_registered_parsers = new ServiceConfigParserList(); } void ServiceConfig::Shutdown() { - Delete(g_registered_parsers); + delete g_registered_parsers; g_registered_parsers = nullptr; } diff --git a/src/core/ext/filters/client_channel/service_config.h b/src/core/ext/filters/client_channel/service_config.h index 1eac424d628..e510c599e0c 100644 --- a/src/core/ext/filters/client_channel/service_config.h +++ b/src/core/ext/filters/client_channel/service_config.h @@ -128,6 +128,10 @@ class ServiceConfig : public RefCounted { static RefCountedPtr Create(const char* json, grpc_error** error); + // Takes ownership of \a json_tree. + ServiceConfig(UniquePtr service_config_json, + UniquePtr json_string, grpc_json* json_tree, + grpc_error** error); ~ServiceConfig(); const char* service_config_json() const { return service_config_json_.get(); } @@ -158,15 +162,6 @@ class ServiceConfig : public RefCounted { static void Shutdown(); private: - // So New() can call our private ctor. - template - friend T* New(Args&&... args); - - // Takes ownership of \a json_tree. - ServiceConfig(UniquePtr service_config_json, - UniquePtr json_string, grpc_json* json_tree, - grpc_error** error); - // Helper functions to parse the service config grpc_error* ParseGlobalParams(const grpc_json* json_tree); grpc_error* ParsePerMethodParams(const grpc_json* json_tree); diff --git a/src/core/ext/filters/client_channel/subchannel.cc b/src/core/ext/filters/client_channel/subchannel.cc index c61616aafda..d7a7f1be1b0 100644 --- a/src/core/ext/filters/client_channel/subchannel.cc +++ b/src/core/ext/filters/client_channel/subchannel.cc @@ -669,21 +669,21 @@ Subchannel::~Subchannel() { grpc_channel_args_destroy(args_); grpc_connector_unref(connector_); grpc_pollset_set_destroy(pollset_set_); - Delete(key_); + delete key_; } Subchannel* Subchannel::Create(grpc_connector* connector, const grpc_channel_args* args) { - SubchannelKey* key = New(args); + SubchannelKey* key = new SubchannelKey(args); SubchannelPoolInterface* subchannel_pool = SubchannelPoolInterface::GetSubchannelPoolFromChannelArgs(args); GPR_ASSERT(subchannel_pool != nullptr); Subchannel* c = subchannel_pool->FindSubchannel(key); if (c != nullptr) { - Delete(key); + delete key; return c; } - c = New(key, connector, args); + c = new Subchannel(key, connector, args); // Try to register the subchannel before setting the subchannel pool. // Otherwise, in case of a registration race, unreffing c in // RegisterSubchannel() will cause c to be tried to be unregistered, while @@ -724,7 +724,7 @@ namespace { void subchannel_destroy(void* arg, grpc_error* /*error*/) { Subchannel* self = static_cast(arg); - Delete(self); + delete self; } } // namespace @@ -1050,7 +1050,7 @@ bool Subchannel::PublishTransportLocked() { } // Publish. connected_subchannel_.reset( - New(stk, args_, channelz_node_)); + new ConnectedSubchannel(stk, args_, channelz_node_)); gpr_log(GPR_INFO, "New connected subchannel at %p for subchannel %p", connected_subchannel_.get(), this); if (channelz_node_ != nullptr) { diff --git a/src/core/ext/filters/client_channel/xds/xds_client.cc b/src/core/ext/filters/client_channel/xds/xds_client.cc index 3b1e535426b..2f9ef9e2a61 100644 --- a/src/core/ext/filters/client_channel/xds/xds_client.cc +++ b/src/core/ext/filters/client_channel/xds/xds_client.cc @@ -378,16 +378,16 @@ bool XdsClient::ChannelState::HasActiveAdsCall() const { void XdsClient::ChannelState::MaybeStartAdsCall() { if (ads_calld_ != nullptr) return; - ads_calld_.reset(New>( - Ref(DEBUG_LOCATION, "ChannelState+ads"))); + ads_calld_.reset( + new RetryableCall(Ref(DEBUG_LOCATION, "ChannelState+ads"))); } void XdsClient::ChannelState::StopAdsCall() { ads_calld_.reset(); } void XdsClient::ChannelState::MaybeStartLrsCall() { if (lrs_calld_ != nullptr) return; - lrs_calld_.reset(New>( - Ref(DEBUG_LOCATION, "ChannelState+lrs"))); + lrs_calld_.reset( + new RetryableCall(Ref(DEBUG_LOCATION, "ChannelState+lrs"))); } void XdsClient::ChannelState::StopLrsCall() { lrs_calld_.reset(); } @@ -396,7 +396,7 @@ void XdsClient::ChannelState::StartConnectivityWatchLocked() { grpc_channel_element* client_channel_elem = grpc_channel_stack_last_element(grpc_channel_get_channel_stack(channel_)); GPR_ASSERT(client_channel_elem->filter == &grpc_client_channel_filter); - watcher_ = New(Ref()); + watcher_ = new StateWatcher(Ref()); grpc_client_channel_start_connectivity_watch( client_channel_elem, GRPC_CHANNEL_IDLE, OrphanablePtr(watcher_)); diff --git a/src/core/ext/filters/deadline/deadline_filter.cc b/src/core/ext/filters/deadline/deadline_filter.cc index 1ea170ec595..f6f55d795de 100644 --- a/src/core/ext/filters/deadline/deadline_filter.cc +++ b/src/core/ext/filters/deadline/deadline_filter.cc @@ -175,7 +175,7 @@ static void start_timer_after_init(void* arg, grpc_error* error) { "scheduling deadline timer"); return; } - grpc_core::Delete(state); + delete state; GRPC_CALL_COMBINER_STOP(deadline_state->call_combiner, "done scheduling deadline timer"); } @@ -196,7 +196,7 @@ grpc_deadline_state::grpc_deadline_state(grpc_call_element* elem, // create a closure to start the timer, and we schedule that closure // to be run after call stack initialization is done. struct start_timer_after_init_state* state = - grpc_core::New(elem, deadline); + new start_timer_after_init_state(elem, deadline); GRPC_CLOSURE_INIT(&state->closure, start_timer_after_init, state, grpc_schedule_on_exec_ctx); grpc_core::ExecCtx::Run(DEBUG_LOCATION, &state->closure, GRPC_ERROR_NONE); diff --git a/src/core/ext/filters/max_age/max_age_filter.cc b/src/core/ext/filters/max_age/max_age_filter.cc index b926be7018c..0cf6f542414 100644 --- a/src/core/ext/filters/max_age/max_age_filter.cc +++ b/src/core/ext/filters/max_age/max_age_filter.cc @@ -267,8 +267,7 @@ static void start_max_age_timer_after_init(void* arg, grpc_error* /*error*/) { &chand->close_max_age_channel); gpr_mu_unlock(&chand->max_age_timer_mu); grpc_transport_op* op = grpc_make_transport_op(nullptr); - op->start_connectivity_watch.reset( - grpc_core::New(chand)); + op->start_connectivity_watch.reset(new grpc_core::ConnectivityWatcher(chand)); op->start_connectivity_watch_state = GRPC_CHANNEL_IDLE; grpc_channel_next_op(grpc_channel_stack_element(chand->channel_stack, 0), op); GRPC_CHANNEL_STACK_UNREF(chand->channel_stack, diff --git a/src/core/ext/transport/chttp2/client/insecure/channel_create.cc b/src/core/ext/transport/chttp2/client/insecure/channel_create.cc index aaa978995df..9bf975e8796 100644 --- a/src/core/ext/transport/chttp2/client/insecure/channel_create.cc +++ b/src/core/ext/transport/chttp2/client/insecure/channel_create.cc @@ -79,7 +79,7 @@ grpc_core::Chttp2InsecureClientChannelFactory* g_factory; gpr_once g_factory_once = GPR_ONCE_INIT; void FactoryInit() { - g_factory = grpc_core::New(); + g_factory = new grpc_core::Chttp2InsecureClientChannelFactory(); } } // namespace diff --git a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc index 95410cff7b3..49389844e00 100644 --- a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc +++ b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc @@ -181,7 +181,7 @@ grpc_core::Chttp2SecureClientChannelFactory* g_factory; gpr_once g_factory_once = GPR_ONCE_INIT; void FactoryInit() { - g_factory = grpc_core::New(); + g_factory = new grpc_core::Chttp2SecureClientChannelFactory(); } } // namespace diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc index e6f37b89ef0..e0aa8e5d9c8 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc @@ -3322,8 +3322,8 @@ grpc_chttp2_transport_get_socket_node(grpc_transport* transport) { grpc_transport* grpc_create_chttp2_transport( const grpc_channel_args* channel_args, grpc_endpoint* ep, bool is_client, grpc_resource_user* resource_user) { - auto t = grpc_core::New(channel_args, ep, is_client, - resource_user); + auto t = + new grpc_chttp2_transport(channel_args, ep, is_client, resource_user); return &t->base; } diff --git a/src/core/ext/transport/chttp2/transport/context_list.cc b/src/core/ext/transport/chttp2/transport/context_list.cc index 245e8135833..a0473ea822a 100644 --- a/src/core/ext/transport/chttp2/transport/context_list.cc +++ b/src/core/ext/transport/chttp2/transport/context_list.cc @@ -33,7 +33,7 @@ void ContextList::Append(ContextList** head, grpc_chttp2_stream* s) { return; } /* Create a new element in the list and add it at the front */ - ContextList* elem = grpc_core::New(); + ContextList* elem = new ContextList(); elem->trace_context_ = get_copied_context_fn_g(s->context); elem->byte_offset_ = s->byte_counter; elem->next_ = *head; @@ -53,7 +53,7 @@ void ContextList::Execute(void* arg, grpc_core::Timestamps* ts, } to_be_freed = head; head = head->next_; - grpc_core::Delete(to_be_freed); + delete to_be_freed; } } diff --git a/src/core/ext/transport/chttp2/transport/frame_data.cc b/src/core/ext/transport/chttp2/transport/frame_data.cc index f2ff4d37b77..d815654c31c 100644 --- a/src/core/ext/transport/chttp2/transport/frame_data.cc +++ b/src/core/ext/transport/chttp2/transport/frame_data.cc @@ -193,7 +193,7 @@ grpc_error* grpc_deframe_unprocessed_incoming_frames( if (p->is_frame_compressed) { message_flags |= GRPC_WRITE_INTERNAL_COMPRESS; } - p->parsing_frame = grpc_core::New( + p->parsing_frame = new grpc_core::Chttp2IncomingByteStream( t, s, p->frame_size, message_flags); stream_out->reset(p->parsing_frame); if (p->parsing_frame->remaining_bytes() == 0) { diff --git a/src/core/ext/transport/chttp2/transport/internal.h b/src/core/ext/transport/chttp2/transport/internal.h index 845a94e919c..fa3d882c715 100644 --- a/src/core/ext/transport/chttp2/transport/internal.h +++ b/src/core/ext/transport/chttp2/transport/internal.h @@ -239,7 +239,7 @@ class Chttp2IncomingByteStream : public ByteStream { void Ref() { refs_.Ref(); } void Unref() { if (GPR_UNLIKELY(refs_.Unref())) { - grpc_core::Delete(this); + delete this; } } @@ -814,7 +814,7 @@ inline void grpc_chttp2_unref_transport(grpc_chttp2_transport* t, const char* reason, const char* file, int line) { if (t->refs.Unref(grpc_core::DebugLocation(file, line), reason)) { - grpc_core::Delete(t); + delete t; } } inline void grpc_chttp2_ref_transport(grpc_chttp2_transport* t, @@ -827,7 +827,7 @@ inline void grpc_chttp2_ref_transport(grpc_chttp2_transport* t, #define GRPC_CHTTP2_UNREF_TRANSPORT(t, r) grpc_chttp2_unref_transport(t) inline void grpc_chttp2_unref_transport(grpc_chttp2_transport* t) { if (t->refs.Unref()) { - grpc_core::Delete(t); + delete t; } } inline void grpc_chttp2_ref_transport(grpc_chttp2_transport* t) { diff --git a/src/core/ext/transport/cronet/transport/cronet_transport.cc b/src/core/ext/transport/cronet/transport/cronet_transport.cc index 8cc4becfff9..acdc3fc1ff1 100644 --- a/src/core/ext/transport/cronet/transport/cronet_transport.cc +++ b/src/core/ext/transport/cronet/transport/cronet_transport.cc @@ -335,7 +335,7 @@ static void add_to_storage(struct stream_obj* s, struct op_storage* storage = &s->storage; /* add new op at the beginning of the linked list. The memory is freed in remove_from_storage */ - op_and_state* new_op = grpc_core::New(s, *op); + op_and_state* new_op = new op_and_state(s, *op); gpr_mu_lock(&s->mu); new_op->next = storage->head; storage->head = new_op; @@ -363,7 +363,7 @@ static void remove_from_storage(struct stream_obj* s, } if (s->storage.head == oas) { s->storage.head = oas->next; - grpc_core::Delete(oas); + delete oas; s->storage.num_pending_ops--; CRONET_LOG(GPR_DEBUG, "Freed %p. Now %d in the queue", oas, s->storage.num_pending_ops); @@ -374,7 +374,7 @@ static void remove_from_storage(struct stream_obj* s, s->storage.num_pending_ops--; CRONET_LOG(GPR_DEBUG, "Freed %p. Now %d in the queue", oas, s->storage.num_pending_ops); - grpc_core::Delete(oas); + delete oas; break; } else if (GPR_UNLIKELY(curr->next == nullptr)) { CRONET_LOG(GPR_ERROR, "Reached end of LL and did not find op to free"); diff --git a/src/core/lib/channel/channel_trace.cc b/src/core/lib/channel/channel_trace.cc index d329ccc98de..b6fcd0f87bf 100644 --- a/src/core/lib/channel/channel_trace.cc +++ b/src/core/lib/channel/channel_trace.cc @@ -81,7 +81,7 @@ ChannelTrace::~ChannelTrace() { while (it != nullptr) { TraceEvent* to_free = it; it = it->next(); - Delete(to_free); + delete to_free; } gpr_mu_destroy(&tracer_mu_); } @@ -103,7 +103,7 @@ void ChannelTrace::AddTraceEventHelper(TraceEvent* new_trace_event) { TraceEvent* to_free = head_trace_; event_list_memory_usage_ -= to_free->memory_usage(); head_trace_ = head_trace_->next(); - Delete(to_free); + delete to_free; } } @@ -112,7 +112,7 @@ void ChannelTrace::AddTraceEvent(Severity severity, const grpc_slice& data) { grpc_slice_unref_internal(data); return; // tracing is disabled if max_event_memory_ == 0 } - AddTraceEventHelper(New(severity, data)); + AddTraceEventHelper(new TraceEvent(severity, data)); } void ChannelTrace::AddTraceEventWithReference( @@ -124,7 +124,7 @@ void ChannelTrace::AddTraceEventWithReference( } // create and fill up the new event AddTraceEventHelper( - New(severity, data, std::move(referenced_entity))); + new TraceEvent(severity, data, std::move(referenced_entity))); } namespace { diff --git a/src/core/lib/channel/channelz_registry.cc b/src/core/lib/channel/channelz_registry.cc index 553e1fe97b5..e0c9c8e67f3 100644 --- a/src/core/lib/channel/channelz_registry.cc +++ b/src/core/lib/channel/channelz_registry.cc @@ -43,9 +43,9 @@ const int kPaginationLimit = 100; } // anonymous namespace -void ChannelzRegistry::Init() { g_channelz_registry = New(); } +void ChannelzRegistry::Init() { g_channelz_registry = new ChannelzRegistry(); } -void ChannelzRegistry::Shutdown() { Delete(g_channelz_registry); } +void ChannelzRegistry::Shutdown() { delete g_channelz_registry; } ChannelzRegistry* ChannelzRegistry::Default() { GPR_DEBUG_ASSERT(g_channelz_registry != nullptr); diff --git a/src/core/lib/gprpp/fork.cc b/src/core/lib/gprpp/fork.cc index 51836d52cf4..92377a0e881 100644 --- a/src/core/lib/gprpp/fork.cc +++ b/src/core/lib/gprpp/fork.cc @@ -172,15 +172,15 @@ void Fork::GlobalInit() { MemoryOrder::RELAXED); } if (support_enabled_.Load(MemoryOrder::RELAXED)) { - exec_ctx_state_ = grpc_core::New(); - thread_state_ = grpc_core::New(); + exec_ctx_state_ = new internal::ExecCtxState(); + thread_state_ = new internal::ThreadState(); } } void Fork::GlobalShutdown() { if (support_enabled_.Load(MemoryOrder::RELAXED)) { - grpc_core::Delete(exec_ctx_state_); - grpc_core::Delete(thread_state_); + delete exec_ctx_state_; + delete thread_state_; } } diff --git a/src/core/lib/gprpp/memory.h b/src/core/lib/gprpp/memory.h index 9a1628b6ec0..adbd0035bc4 100644 --- a/src/core/lib/gprpp/memory.h +++ b/src/core/lib/gprpp/memory.h @@ -30,13 +30,6 @@ namespace grpc_core { -// Alternative to new, to ensure memory allocation being wrapped to gpr_malloc -template -inline T* New(Args&&... args) { - void* p = gpr_malloc(sizeof(T)); - return new (p) T(std::forward(args)...); -} - // Gets the base pointer of any class, in case of multiple inheritance. // Used by Delete and friends. template @@ -49,36 +42,12 @@ struct BasePointerGetter { static void* get(T* p) { return dynamic_cast(p); } }; -// Alternative to delete, to ensure memory allocation being wrapped to gpr_free template -inline void Delete(T* p) { - if (p == nullptr) return; - void* basePtr = BasePointerGetter::value>::get(p); - p->~T(); - gpr_free(basePtr); -} - -class DefaultDelete { - public: - template - void operator()(T* p) { - // Delete() checks whether the value is null, but std::unique_ptr<> is - // guaranteed not to call the deleter if the pointer is nullptr - // (i.e., it already does this check for us), and we don't want to - // do the check twice. So, instead of calling Delete() here, we - // manually call the object's dtor and free it. - void* basePtr = BasePointerGetter::value>::get(p); - p->~T(); - gpr_free(basePtr); - } -}; - -template -using UniquePtr = std::unique_ptr; +using UniquePtr = std::unique_ptr; template inline UniquePtr MakeUnique(Args&&... args) { - return UniquePtr(New(std::forward(args)...)); + return UniquePtr(new T(std::forward(args)...)); } // an allocator that uses gpr_malloc/gpr_free diff --git a/src/core/lib/gprpp/orphanable.h b/src/core/lib/gprpp/orphanable.h index db9547d2224..c3bd9e1eb71 100644 --- a/src/core/lib/gprpp/orphanable.h +++ b/src/core/lib/gprpp/orphanable.h @@ -69,7 +69,7 @@ using OrphanablePtr = std::unique_ptr; template inline OrphanablePtr MakeOrphanable(Args&&... args) { - return OrphanablePtr(New(std::forward(args)...)); + return OrphanablePtr(new T(std::forward(args)...)); } // A type of Orphanable with internal ref-counting. @@ -106,12 +106,12 @@ class InternallyRefCounted : public Orphanable { void Unref() { if (GPR_UNLIKELY(refs_.Unref())) { - Delete(static_cast(this)); + delete static_cast(this); } } void Unref(const DebugLocation& location, const char* reason) { if (GPR_UNLIKELY(refs_.Unref(location, reason))) { - Delete(static_cast(this)); + delete static_cast(this); } } diff --git a/src/core/lib/gprpp/ref_counted.h b/src/core/lib/gprpp/ref_counted.h index e8288a34286..44070e58bf1 100644 --- a/src/core/lib/gprpp/ref_counted.h +++ b/src/core/lib/gprpp/ref_counted.h @@ -220,7 +220,7 @@ class RefCount { // A base class for reference-counted objects. // New objects should be created via New() and start with a refcount of 1. -// When the refcount reaches 0, the object will be deleted via Delete(). +// When the refcount reaches 0, the object will be deleted via delete . // // This will commonly be used by CRTP (curiously-recurring template pattern) // e.g., class MyClass : public RefCounted @@ -267,12 +267,12 @@ class RefCounted : public Impl { // friend of this class. void Unref() { if (GPR_UNLIKELY(refs_.Unref())) { - Delete(static_cast(this)); + delete static_cast(this); } } void Unref(const DebugLocation& location, const char* reason) { if (GPR_UNLIKELY(refs_.Unref(location, reason))) { - Delete(static_cast(this)); + delete static_cast(this); } } diff --git a/src/core/lib/gprpp/ref_counted_ptr.h b/src/core/lib/gprpp/ref_counted_ptr.h index 2e3f4671581..4c5b46538a8 100644 --- a/src/core/lib/gprpp/ref_counted_ptr.h +++ b/src/core/lib/gprpp/ref_counted_ptr.h @@ -179,7 +179,7 @@ class RefCountedPtr { template inline RefCountedPtr MakeRefCounted(Args&&... args) { - return RefCountedPtr(New(std::forward(args)...)); + return RefCountedPtr(new T(std::forward(args)...)); } } // namespace grpc_core diff --git a/src/core/lib/gprpp/thd.h b/src/core/lib/gprpp/thd.h index 223e4115b87..8e50f545e25 100644 --- a/src/core/lib/gprpp/thd.h +++ b/src/core/lib/gprpp/thd.h @@ -144,7 +144,7 @@ class Thread { void Join() { if (impl_ != nullptr) { impl_->Join(); - grpc_core::Delete(impl_); + delete impl_; state_ = DONE; impl_ = nullptr; } else { diff --git a/src/core/lib/gprpp/thd_posix.cc b/src/core/lib/gprpp/thd_posix.cc index 2c3ae34ed44..788b47b99b1 100644 --- a/src/core/lib/gprpp/thd_posix.cc +++ b/src/core/lib/gprpp/thd_posix.cc @@ -133,7 +133,7 @@ class ThreadInternalsPosix : public internal::ThreadInternalsInterface { gpr_mu_unlock(&arg.thread->mu_); if (!arg.joinable) { - Delete(arg.thread); + delete arg.thread; } (*arg.body)(arg.arg); @@ -182,12 +182,12 @@ Thread::Thread(const char* thd_name, void (*thd_body)(void* arg), void* arg, bool* success, const Options& options) : options_(options) { bool outcome = false; - impl_ = New(thd_name, thd_body, arg, &outcome, options); + impl_ = new ThreadInternalsPosix(thd_name, thd_body, arg, &outcome, options); if (outcome) { state_ = ALIVE; } else { state_ = FAILED; - Delete(impl_); + delete impl_; impl_ = nullptr; } diff --git a/src/core/lib/gprpp/thd_windows.cc b/src/core/lib/gprpp/thd_windows.cc index 5014444dcfd..bd3b7a36ebb 100644 --- a/src/core/lib/gprpp/thd_windows.cc +++ b/src/core/lib/gprpp/thd_windows.cc @@ -121,7 +121,7 @@ class ThreadInternalsWindows } gpr_mu_unlock(&g_thd_info->thread->mu_); if (!g_thd_info->joinable) { - grpc_core::Delete(g_thd_info->thread); + delete g_thd_info->thread; g_thd_info->thread = nullptr; } g_thd_info->body(g_thd_info->arg); @@ -155,12 +155,12 @@ Thread::Thread(const char* thd_name, void (*thd_body)(void* arg), void* arg, bool* success, const Options& options) : options_(options) { bool outcome = false; - impl_ = New(thd_body, arg, &outcome, options); + impl_ = new ThreadInternalsWindows(thd_body, arg, &outcome, options); if (outcome) { state_ = ALIVE; } else { state_ = FAILED; - Delete(impl_); + delete impl_; impl_ = nullptr; } diff --git a/src/core/lib/http/httpcli_security_connector.cc b/src/core/lib/http/httpcli_security_connector.cc index 5d8d177fe67..3d95cdfea9a 100644 --- a/src/core/lib/http/httpcli_security_connector.cc +++ b/src/core/lib/http/httpcli_security_connector.cc @@ -174,13 +174,13 @@ static void on_handshake_done(void* arg, grpc_error* error) { gpr_free(args->read_buffer); c->func(c->arg, args->endpoint); } - grpc_core::Delete(c); + delete c; } static void ssl_handshake(void* arg, grpc_endpoint* tcp, const char* host, grpc_millis deadline, void (*on_done)(void* arg, grpc_endpoint* endpoint)) { - auto* c = grpc_core::New(); + auto* c = new on_done_closure(); const char* pem_root_certs = grpc_core::DefaultSslRootStore::GetPemRootCerts(); const tsi_ssl_root_certs_store* root_store = diff --git a/src/core/lib/iomgr/buffer_list.cc b/src/core/lib/iomgr/buffer_list.cc index 722e9036b32..9123cd3aa6d 100644 --- a/src/core/lib/iomgr/buffer_list.cc +++ b/src/core/lib/iomgr/buffer_list.cc @@ -197,7 +197,7 @@ static int get_socket_tcp_info(grpc_core::tcp_info* info, int fd) { void TracedBuffer::AddNewEntry(TracedBuffer** head, uint32_t seq_no, int fd, void* arg) { GPR_DEBUG_ASSERT(head != nullptr); - TracedBuffer* new_elem = New(seq_no, arg); + TracedBuffer* new_elem = new TracedBuffer(seq_no, arg); /* Store the current time as the sendmsg time. */ new_elem->ts_.sendmsg_time.time = gpr_now(GPR_CLOCK_REALTIME); new_elem->ts_.scheduled_time.time = gpr_inf_past(GPR_CLOCK_REALTIME); @@ -254,7 +254,7 @@ void TracedBuffer::ProcessTimestamp(TracedBuffer** head, * restriction on the lifetime. */ timestamps_callback(elem->arg_, &(elem->ts_), GRPC_ERROR_NONE); next = elem->next_; - Delete(elem); + delete static_cast(elem); *head = elem = next; break; default: @@ -273,7 +273,7 @@ void TracedBuffer::Shutdown(TracedBuffer** head, void* remaining, while (elem != nullptr) { timestamps_callback(elem->arg_, &(elem->ts_), shutdown_err); auto* next = elem->next_; - Delete(elem); + delete elem; elem = next; } *head = nullptr; diff --git a/src/core/lib/iomgr/cfstream_handle.cc b/src/core/lib/iomgr/cfstream_handle.cc index c1e7d67e568..40fb3779651 100644 --- a/src/core/lib/iomgr/cfstream_handle.cc +++ b/src/core/lib/iomgr/cfstream_handle.cc @@ -53,7 +53,7 @@ void CFStreamHandle::Release(void* info) { CFStreamHandle* CFStreamHandle::CreateStreamHandle( CFReadStreamRef read_stream, CFWriteStreamRef write_stream) { - return grpc_core::New(read_stream, write_stream); + return new CFStreamHandle(read_stream, write_stream); } void CFStreamHandle::ReadCallback(CFReadStreamRef stream, @@ -194,7 +194,7 @@ void CFStreamHandle::Unref(const char* file, int line, const char* reason) { reason, val, val - 1); } if (gpr_unref(&refcount_)) { - grpc_core::Delete(this); + delete this; } } diff --git a/src/core/lib/iomgr/combiner.cc b/src/core/lib/iomgr/combiner.cc index bc41393a6cd..884c7f211f3 100644 --- a/src/core/lib/iomgr/combiner.cc +++ b/src/core/lib/iomgr/combiner.cc @@ -53,7 +53,7 @@ static void combiner_finally_exec(grpc_core::Combiner* lock, static void offload(void* arg, grpc_error* error); grpc_core::Combiner* grpc_combiner_create(void) { - grpc_core::Combiner* lock = grpc_core::New(); + grpc_core::Combiner* lock = new grpc_core::Combiner(); gpr_ref_init(&lock->refs, 1); gpr_atm_no_barrier_store(&lock->state, STATE_UNORPHANED); grpc_closure_list_init(&lock->final_list); @@ -65,7 +65,7 @@ grpc_core::Combiner* grpc_combiner_create(void) { static void really_destroy(grpc_core::Combiner* lock) { GRPC_COMBINER_TRACE(gpr_log(GPR_INFO, "C:%p really_destroy", lock)); GPR_ASSERT(gpr_atm_no_barrier_load(&lock->state) == 0); - grpc_core::Delete(lock); + delete lock; } static void start_destroy(grpc_core::Combiner* lock) { diff --git a/src/core/lib/iomgr/executor.cc b/src/core/lib/iomgr/executor.cc index 5028b8597fa..63d946c2479 100644 --- a/src/core/lib/iomgr/executor.cc +++ b/src/core/lib/iomgr/executor.cc @@ -393,9 +393,9 @@ void Executor::InitAll() { } executors[static_cast(ExecutorType::DEFAULT)] = - grpc_core::New("default-executor"); + new Executor("default-executor"); executors[static_cast(ExecutorType::RESOLVER)] = - grpc_core::New("resolver-executor"); + new Executor("resolver-executor"); executors[static_cast(ExecutorType::DEFAULT)]->Init(); executors[static_cast(ExecutorType::RESOLVER)]->Init(); @@ -425,7 +425,7 @@ void Executor::ShutdownAll() { // Delete the executor objects. // // NOTE: It is important to call Shutdown() on all executors first before - // calling Delete() because it is possible for one executor (that is not + // calling delete because it is possible for one executor (that is not // shutdown yet) to call Enqueue() on a different executor which is already // shutdown. This is legal and in such cases, the Enqueue() operation // effectively "fails" and enqueues that closure on the calling thread's @@ -434,10 +434,8 @@ void Executor::ShutdownAll() { // By ensuring that all executors are shutdown first, we are also ensuring // that no thread is active across all executors. - grpc_core::Delete( - executors[static_cast(ExecutorType::DEFAULT)]); - grpc_core::Delete( - executors[static_cast(ExecutorType::RESOLVER)]); + delete executors[static_cast(ExecutorType::DEFAULT)]; + delete executors[static_cast(ExecutorType::RESOLVER)]; executors[static_cast(ExecutorType::DEFAULT)] = nullptr; executors[static_cast(ExecutorType::RESOLVER)] = nullptr; diff --git a/src/core/lib/iomgr/executor/threadpool.cc b/src/core/lib/iomgr/executor/threadpool.cc index 8c9fd18380e..859c49a3eab 100644 --- a/src/core/lib/iomgr/executor/threadpool.cc +++ b/src/core/lib/iomgr/executor/threadpool.cc @@ -54,11 +54,11 @@ void ThreadPool::SharedThreadPoolConstructor() { // Create at least 1 worker thread. if (num_threads_ <= 0) num_threads_ = 1; - queue_ = New(); + queue_ = new InfLenFIFOQueue(); threads_ = static_cast( gpr_zalloc(num_threads_ * sizeof(ThreadPoolWorker*))); for (int i = 0; i < num_threads_; ++i) { - threads_[i] = New(thd_name_, queue_, thread_options_, i); + threads_[i] = new ThreadPoolWorker(thd_name_, queue_, thread_options_, i); threads_[i]->Start(); } } @@ -114,10 +114,10 @@ ThreadPool::~ThreadPool() { } for (int i = 0; i < num_threads_; ++i) { - Delete(threads_[i]); + delete threads_[i]; } gpr_free(threads_); - Delete(queue_); + delete queue_; } void ThreadPool::Add(grpc_experimental_completion_queue_functor* closure) { diff --git a/src/core/lib/iomgr/resolve_address_custom.cc b/src/core/lib/iomgr/resolve_address_custom.cc index 5c081309c7d..1d5230d74d0 100644 --- a/src/core/lib/iomgr/resolve_address_custom.cc +++ b/src/core/lib/iomgr/resolve_address_custom.cc @@ -92,7 +92,7 @@ static grpc_error* try_split_host_port(const char* name, grpc_core::UniquePtr* port) { /* parse name, splitting it into host and port parts */ grpc_error* error; - SplitHostPort(name, host, port); + grpc_core::SplitHostPort(name, host, port); if (*host == nullptr) { char* msg; gpr_asprintf(&msg, "unparseable host:port: '%s'", name); diff --git a/src/core/lib/iomgr/tcp_server_posix.cc b/src/core/lib/iomgr/tcp_server_posix.cc index eb4d3cbdef6..a9bf800e362 100644 --- a/src/core/lib/iomgr/tcp_server_posix.cc +++ b/src/core/lib/iomgr/tcp_server_posix.cc @@ -120,7 +120,7 @@ static void finish_shutdown(grpc_tcp_server* s) { gpr_free(sp); } grpc_channel_args_destroy(s->channel_args); - grpc_core::Delete(s->fd_handler); + delete s->fd_handler; gpr_free(s); } @@ -623,7 +623,7 @@ class ExternalConnectionHandler : public grpc_core::TcpServerFdHandler { static grpc_core::TcpServerFdHandler* tcp_server_create_fd_handler( grpc_tcp_server* s) { - s->fd_handler = grpc_core::New(s); + s->fd_handler = new ExternalConnectionHandler(s); return s->fd_handler; } diff --git a/src/core/lib/iomgr/udp_server.cc b/src/core/lib/iomgr/udp_server.cc index 8bac6dd6a2d..2afef07907b 100644 --- a/src/core/lib/iomgr/udp_server.cc +++ b/src/core/lib/iomgr/udp_server.cc @@ -208,7 +208,7 @@ static grpc_socket_factory* get_socket_factory(const grpc_channel_args* args) { } grpc_udp_server* grpc_udp_server_create(const grpc_channel_args* args) { - grpc_udp_server* s = grpc_core::New(); + grpc_udp_server* s = new grpc_udp_server(); gpr_mu_init(&s->mu); s->socket_factory = get_socket_factory(args); if (s->socket_factory) { @@ -258,7 +258,7 @@ static void finish_shutdown(grpc_udp_server* s) { grpc_socket_factory_unref(s->socket_factory); } - grpc_core::Delete(s); + delete s; } static void destroyed_port(void* server, grpc_error* /*error*/) { diff --git a/src/core/lib/security/credentials/alts/alts_credentials.cc b/src/core/lib/security/credentials/alts/alts_credentials.cc index cbc43d565a4..1bc76d9c0c6 100644 --- a/src/core/lib/security/credentials/alts/alts_credentials.cc +++ b/src/core/lib/security/credentials/alts/alts_credentials.cc @@ -85,7 +85,7 @@ grpc_channel_credentials* grpc_alts_credentials_create_customized( if (!enable_untrusted_alts && !grpc_alts_is_running_on_gcp()) { return nullptr; } - return grpc_core::New(options, handshaker_service_url); + return new grpc_alts_credentials(options, handshaker_service_url); } grpc_server_credentials* grpc_alts_server_credentials_create_customized( @@ -94,8 +94,7 @@ grpc_server_credentials* grpc_alts_server_credentials_create_customized( if (!enable_untrusted_alts && !grpc_alts_is_running_on_gcp()) { return nullptr; } - return grpc_core::New(options, - handshaker_service_url); + return new grpc_alts_server_credentials(options, handshaker_service_url); } grpc_channel_credentials* grpc_alts_credentials_create( diff --git a/src/core/lib/security/credentials/composite/composite_credentials.cc b/src/core/lib/security/credentials/composite/composite_credentials.cc index 1e46798ff2c..d35a4c27359 100644 --- a/src/core/lib/security/credentials/composite/composite_credentials.cc +++ b/src/core/lib/security/credentials/composite/composite_credentials.cc @@ -90,7 +90,7 @@ bool grpc_composite_call_credentials::get_request_metadata( grpc_credentials_mdelem_array* md_array, grpc_closure* on_request_metadata, grpc_error** error) { grpc_composite_call_credentials_metadata_context* ctx; - ctx = grpc_core::New( + ctx = new grpc_composite_call_credentials_metadata_context( this, pollent, auth_md_context, md_array, on_request_metadata); bool synchronous = true; const CallCredentialsList& inner = ctx->composite_creds->inner(); @@ -104,7 +104,7 @@ bool grpc_composite_call_credentials::get_request_metadata( break; } } - if (synchronous) grpc_core::Delete(ctx); + if (synchronous) delete ctx; return synchronous; } @@ -205,6 +205,6 @@ grpc_channel_credentials* grpc_composite_channel_credentials_create( "grpc_composite_channel_credentials_create(channel_creds=%p, " "call_creds=%p, reserved=%p)", 3, (channel_creds, call_creds, reserved)); - return grpc_core::New( - channel_creds->Ref(), call_creds->Ref()); + return new grpc_composite_channel_credentials(channel_creds->Ref(), + call_creds->Ref()); } diff --git a/src/core/lib/security/credentials/credentials.cc b/src/core/lib/security/credentials/credentials.cc index 37678715704..8ef58d2a4b4 100644 --- a/src/core/lib/security/credentials/credentials.cc +++ b/src/core/lib/security/credentials/credentials.cc @@ -53,10 +53,10 @@ static gpr_mu g_control_plane_creds_mu; static void do_control_plane_creds_init() { gpr_mu_init(&g_control_plane_creds_mu); GPR_ASSERT(g_grpc_control_plane_creds == nullptr); - g_grpc_control_plane_creds = grpc_core::New< - std::map, - grpc_core::RefCountedPtr, - grpc_core::StringLess>>(); + g_grpc_control_plane_creds = + new std::map, + grpc_core::RefCountedPtr, + grpc_core::StringLess>(); } void grpc_control_plane_credentials_init() { @@ -65,7 +65,7 @@ void grpc_control_plane_credentials_init() { } void grpc_test_only_control_plane_credentials_destroy() { - grpc_core::Delete(g_grpc_control_plane_creds); + delete g_grpc_control_plane_creds; g_grpc_control_plane_creds = nullptr; gpr_mu_destroy(&g_control_plane_creds_mu); } diff --git a/src/core/lib/security/credentials/credentials.h b/src/core/lib/security/credentials/credentials.h index e0700c41a92..4518f013e1b 100644 --- a/src/core/lib/security/credentials/credentials.h +++ b/src/core/lib/security/credentials/credentials.h @@ -314,12 +314,12 @@ struct grpc_credentials_metadata_request { inline grpc_credentials_metadata_request* grpc_credentials_metadata_request_create( grpc_core::RefCountedPtr creds) { - return grpc_core::New(std::move(creds)); + return new grpc_credentials_metadata_request(std::move(creds)); } inline void grpc_credentials_metadata_request_destroy( grpc_credentials_metadata_request* r) { - grpc_core::Delete(r); + delete r; } #endif /* GRPC_CORE_LIB_SECURITY_CREDENTIALS_CREDENTIALS_H */ diff --git a/src/core/lib/security/credentials/fake/fake_credentials.cc b/src/core/lib/security/credentials/fake/fake_credentials.cc index 77aed2c1b9d..8fd0493ee44 100644 --- a/src/core/lib/security/credentials/fake/fake_credentials.cc +++ b/src/core/lib/security/credentials/fake/fake_credentials.cc @@ -66,12 +66,12 @@ class grpc_fake_server_credentials final : public grpc_server_credentials { } // namespace grpc_channel_credentials* grpc_fake_transport_security_credentials_create() { - return grpc_core::New(); + return new grpc_fake_channel_credentials(); } grpc_server_credentials* grpc_fake_transport_security_server_credentials_create() { - return grpc_core::New(); + return new grpc_fake_server_credentials(); } grpc_arg grpc_fake_transport_expected_targets_arg(char* expected_targets) { @@ -108,6 +108,5 @@ void grpc_md_only_test_credentials::cancel_get_request_metadata( grpc_call_credentials* grpc_md_only_test_credentials_create( const char* md_key, const char* md_value, bool is_async) { - return grpc_core::New(md_key, md_value, - is_async); + return new grpc_md_only_test_credentials(md_key, md_value, is_async); } diff --git a/src/core/lib/security/credentials/local/local_credentials.cc b/src/core/lib/security/credentials/local/local_credentials.cc index 9977cae050d..966a887baf8 100644 --- a/src/core/lib/security/credentials/local/local_credentials.cc +++ b/src/core/lib/security/credentials/local/local_credentials.cc @@ -50,7 +50,7 @@ grpc_local_credentials::grpc_local_credentials( grpc_channel_credentials* grpc_local_credentials_create( grpc_local_connect_type connect_type) { - return grpc_core::New(connect_type); + return new grpc_local_credentials(connect_type); } grpc_local_server_credentials::grpc_local_server_credentials( @@ -60,5 +60,5 @@ grpc_local_server_credentials::grpc_local_server_credentials( grpc_server_credentials* grpc_local_server_credentials_create( grpc_local_connect_type connect_type) { - return grpc_core::New(connect_type); + return new grpc_local_server_credentials(connect_type); } diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc index 1c6ea9388b0..895776c27f0 100644 --- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc +++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc @@ -643,7 +643,7 @@ grpc_error* ValidateStsCredentialsOptions( }; *sts_url_out = nullptr; InlinedVector error_list; - UniquePtr sts_url( + std::unique_ptr sts_url( options->token_exchange_service_uri != nullptr ? grpc_uri_parse(options->token_exchange_service_uri, false) : nullptr); diff --git a/src/core/lib/security/credentials/plugin/plugin_credentials.cc b/src/core/lib/security/credentials/plugin/plugin_credentials.cc index d74f77282a2..517bf277f37 100644 --- a/src/core/lib/security/credentials/plugin/plugin_credentials.cc +++ b/src/core/lib/security/credentials/plugin/plugin_credentials.cc @@ -250,5 +250,5 @@ grpc_call_credentials* grpc_metadata_credentials_create_from_plugin( GRPC_API_TRACE("grpc_metadata_credentials_create_from_plugin(reserved=%p)", 1, (reserved)); GPR_ASSERT(reserved == nullptr); - return grpc_core::New(plugin); + return new grpc_plugin_credentials(plugin); } diff --git a/src/core/lib/security/credentials/ssl/ssl_credentials.cc b/src/core/lib/security/credentials/ssl/ssl_credentials.cc index 65e57cebeb5..48d78f39583 100644 --- a/src/core/lib/security/credentials/ssl/ssl_credentials.cc +++ b/src/core/lib/security/credentials/ssl/ssl_credentials.cc @@ -130,7 +130,7 @@ grpc_channel_credentials* grpc_ssl_credentials_create( 4, (pem_root_certs, pem_key_cert_pair, verify_options, reserved)); GPR_ASSERT(reserved == nullptr); - return grpc_core::New( + return new grpc_ssl_credentials( pem_root_certs, pem_key_cert_pair, reinterpret_cast(verify_options)); } @@ -146,8 +146,8 @@ grpc_channel_credentials* grpc_ssl_credentials_create_ex( 4, (pem_root_certs, pem_key_cert_pair, verify_options, reserved)); GPR_ASSERT(reserved == nullptr); - return grpc_core::New(pem_root_certs, pem_key_cert_pair, - verify_options); + return new grpc_ssl_credentials(pem_root_certs, pem_key_cert_pair, + verify_options); } // @@ -348,7 +348,7 @@ grpc_server_credentials* grpc_ssl_server_credentials_create_with_options( goto done; } - retval = grpc_core::New(*options); + retval = new grpc_ssl_server_credentials(*options); done: grpc_ssl_server_credentials_options_destroy(options); diff --git a/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc b/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc index 7e0af3dcc17..199a15b6354 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc +++ b/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc @@ -76,7 +76,7 @@ grpc_tls_server_authorization_check_config:: /** -- Wrapper APIs declared in grpc_security.h -- **/ grpc_tls_credentials_options* grpc_tls_credentials_options_create() { - return grpc_core::New(); + return new grpc_tls_credentials_options(); } int grpc_tls_credentials_options_set_cert_request_type( @@ -133,7 +133,7 @@ int grpc_tls_credentials_options_set_server_authorization_check_config( } grpc_tls_key_materials_config* grpc_tls_key_materials_config_create() { - return grpc_core::New(); + return new grpc_tls_key_materials_config(); } int grpc_tls_key_materials_config_set_key_materials( @@ -192,8 +192,8 @@ grpc_tls_credential_reload_config* grpc_tls_credential_reload_config_create( "Schedule API is nullptr in creating TLS credential reload config."); return nullptr; } - return grpc_core::New( - config_user_data, schedule, cancel, destruct); + return new grpc_tls_credential_reload_config(config_user_data, schedule, + cancel, destruct); } grpc_tls_server_authorization_check_config* @@ -210,6 +210,6 @@ grpc_tls_server_authorization_check_config_create( "check config."); return nullptr; } - return grpc_core::New( + return new grpc_tls_server_authorization_check_config( config_user_data, schedule, cancel, destruct); } diff --git a/src/core/lib/security/credentials/tls/spiffe_credentials.cc b/src/core/lib/security/credentials/tls/spiffe_credentials.cc index e8433bf09b8..078bc578a4f 100644 --- a/src/core/lib/security/credentials/tls/spiffe_credentials.cc +++ b/src/core/lib/security/credentials/tls/spiffe_credentials.cc @@ -115,7 +115,7 @@ grpc_channel_credentials* grpc_tls_spiffe_credentials_create( if (!CredentialOptionSanityCheck(options, true /* is_client */)) { return nullptr; } - return grpc_core::New( + return new SpiffeCredentials( grpc_core::RefCountedPtr(options)); } @@ -124,6 +124,6 @@ grpc_server_credentials* grpc_tls_spiffe_server_credentials_create( if (!CredentialOptionSanityCheck(options, false /* is_client */)) { return nullptr; } - return grpc_core::New( + return new SpiffeServerCredentials( grpc_core::RefCountedPtr(options)); } diff --git a/src/core/lib/security/security_connector/tls/spiffe_security_connector.cc b/src/core/lib/security/security_connector/tls/spiffe_security_connector.cc index 12fd15f6a58..a388f9d5739 100644 --- a/src/core/lib/security/security_connector/tls/spiffe_security_connector.cc +++ b/src/core/lib/security/security_connector/tls/spiffe_security_connector.cc @@ -80,8 +80,7 @@ grpc_status_code TlsFetchKeyMaterials( grpc_status_code status = GRPC_STATUS_OK; /* Use credential reload config to fetch credentials. */ if (options.credential_reload_config() != nullptr) { - grpc_tls_credential_reload_arg* arg = - grpc_core::New(); + grpc_tls_credential_reload_arg* arg = new grpc_tls_credential_reload_arg(); arg->key_materials_config = key_materials_config.get(); int result = options.credential_reload_config()->Schedule(arg); if (result) { @@ -107,7 +106,7 @@ grpc_status_code TlsFetchKeyMaterials( if (arg->destroy_context != nullptr) { arg->destroy_context(arg->context); } - grpc_core::Delete(arg); + delete arg; } return status; } @@ -381,7 +380,7 @@ grpc_tls_server_authorization_check_arg* SpiffeChannelSecurityConnector::ServerAuthorizationCheckArgCreate( void* user_data) { grpc_tls_server_authorization_check_arg* arg = - grpc_core::New(); + new grpc_tls_server_authorization_check_arg(); arg->cb = ServerAuthorizationCheckDone; arg->cb_user_data = user_data; arg->status = GRPC_STATUS_OK; @@ -399,7 +398,7 @@ void SpiffeChannelSecurityConnector::ServerAuthorizationCheckArgDestroy( if (arg->destroy_context != nullptr) { arg->destroy_context(arg->context); } - grpc_core::Delete(arg); + delete arg; } SpiffeServerSecurityConnector::SpiffeServerSecurityConnector( diff --git a/src/core/lib/security/transport/secure_endpoint.cc b/src/core/lib/security/transport/secure_endpoint.cc index 705d1675615..eaa8c7da704 100644 --- a/src/core/lib/security/transport/secure_endpoint.cc +++ b/src/core/lib/security/transport/secure_endpoint.cc @@ -104,7 +104,7 @@ struct secure_endpoint { grpc_core::TraceFlag grpc_trace_secure_endpoint(false, "secure_endpoint"); -static void destroy(secure_endpoint* ep) { grpc_core::Delete(ep); } +static void destroy(secure_endpoint* ep) { delete ep; } #ifndef NDEBUG #define SECURE_ENDPOINT_UNREF(ep, reason) \ @@ -439,8 +439,8 @@ grpc_endpoint* grpc_secure_endpoint_create( struct tsi_zero_copy_grpc_protector* zero_copy_protector, grpc_endpoint* transport, grpc_slice* leftover_slices, size_t leftover_nslices) { - secure_endpoint* ep = grpc_core::New( - &vtable, protector, zero_copy_protector, transport, leftover_slices, - leftover_nslices); + secure_endpoint* ep = + new secure_endpoint(&vtable, protector, zero_copy_protector, transport, + leftover_slices, leftover_nslices); return &ep->base; } diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc index a3936a8d2e3..c0e21648f74 100644 --- a/src/core/lib/slice/slice.cc +++ b/src/core/lib/slice/slice.cc @@ -73,9 +73,7 @@ static_assert(std::is_trivially_destructible::value, with the user provided data pointer & destroy function */ class NewSliceRefcount { public: - static void Destroy(void* arg) { - Delete(static_cast(arg)); - } + static void Destroy(void* arg) { delete static_cast(arg); } NewSliceRefcount(void (*destroy)(void*), void* user_data) : base_(grpc_slice_refcount::Type::REGULAR, &refs_, Destroy, this, @@ -116,8 +114,7 @@ grpc_slice grpc_slice_new_with_user_data(void* p, size_t len, void* user_data) { grpc_slice slice; slice.refcount = - grpc_core::New(destroy, user_data) - ->base_refcount(); + (new grpc_core::NewSliceRefcount(destroy, user_data))->base_refcount(); slice.data.refcounted.bytes = static_cast(p); slice.data.refcounted.length = len; return slice; @@ -134,7 +131,7 @@ namespace grpc_core { class NewWithLenSliceRefcount { public: static void Destroy(void* arg) { - Delete(static_cast(arg)); + delete static_cast(arg); } NewWithLenSliceRefcount(void (*destroy)(void*, size_t), void* user_data, @@ -168,7 +165,7 @@ class MovedStringSliceRefCount { private: static void Destroy(void* arg) { - Delete(static_cast(arg)); + delete static_cast(arg); } grpc_slice_refcount base_; @@ -181,9 +178,8 @@ class MovedStringSliceRefCount { grpc_slice grpc_slice_new_with_len(void* p, size_t len, void (*destroy)(void*, size_t)) { grpc_slice slice; - slice.refcount = - grpc_core::New(destroy, p, len) - ->base_refcount(); + slice.refcount = (new grpc_core::NewWithLenSliceRefcount(destroy, p, len)) + ->base_refcount(); slice.data.refcounted.bytes = static_cast(p); slice.data.refcounted.length = len; return slice; @@ -223,9 +219,8 @@ grpc_slice grpc_slice_from_moved_buffer(grpc_core::UniquePtr p, slice.data.inlined.length = len; memcpy(GRPC_SLICE_START_PTR(slice), ptr, len); } else { - slice.refcount = - grpc_core::New(std::move(p)) - ->base_refcount(); + slice.refcount = (new grpc_core::MovedStringSliceRefCount(std::move(p))) + ->base_refcount(); slice.data.refcounted.bytes = ptr; slice.data.refcounted.length = len; } diff --git a/src/core/lib/surface/server.cc b/src/core/lib/surface/server.cc index f3848fd4ffa..33ea56b62ce 100644 --- a/src/core/lib/surface/server.cc +++ b/src/core/lib/surface/server.cc @@ -1249,8 +1249,7 @@ void grpc_server_setup_transport( op->set_accept_stream = true; op->set_accept_stream_fn = accept_stream; op->set_accept_stream_user_data = chand; - op->start_connectivity_watch.reset( - grpc_core::New(chand)); + op->start_connectivity_watch.reset(new ConnectivityWatcher(chand)); if (gpr_atm_acq_load(&s->shutdown_flag) != 0) { op->disconnect_with_error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server shutdown"); diff --git a/src/core/lib/transport/connectivity_state.cc b/src/core/lib/transport/connectivity_state.cc index d8b8022aae1..16da01d041c 100644 --- a/src/core/lib/transport/connectivity_state.cc +++ b/src/core/lib/transport/connectivity_state.cc @@ -79,7 +79,7 @@ class AsyncConnectivityStateWatcherInterface::Notifier { self->watcher_.get(), ConnectivityStateName(self->state_)); } self->watcher_->OnConnectivityStateChange(self->state_); - Delete(self); + delete self; } RefCountedPtr watcher_; @@ -89,7 +89,7 @@ class AsyncConnectivityStateWatcherInterface::Notifier { void AsyncConnectivityStateWatcherInterface::Notify( grpc_connectivity_state state) { - New(Ref(), state, combiner_); // Deletes itself when done. + new Notifier(Ref(), state, combiner_); // Deletes itself when done. } // diff --git a/src/core/lib/transport/metadata.cc b/src/core/lib/transport/metadata.cc index 76017207d47..9a6645cf57f 100644 --- a/src/core/lib/transport/metadata.cc +++ b/src/core/lib/transport/metadata.cc @@ -207,7 +207,7 @@ size_t InternedMetadata::CleanupLinkedMetadata( next = md->link_.next; if (md->AllRefsDropped()) { prev_next->next = next; - grpc_core::Delete(md); + delete md; num_freed++; } else { prev_next = &md->link_; @@ -373,14 +373,13 @@ static grpc_mdelem md_create( // We allocate backing store. return key_definitely_static ? GRPC_MAKE_MDELEM( - grpc_core::New( + new AllocatedMetadata( key, value, static_cast( nullptr)), GRPC_MDELEM_STORAGE_ALLOCATED) - : GRPC_MAKE_MDELEM( - grpc_core::New(key, value), - GRPC_MDELEM_STORAGE_ALLOCATED); + : GRPC_MAKE_MDELEM(new AllocatedMetadata(key, value), + GRPC_MDELEM_STORAGE_ALLOCATED); } } return md_create_maybe_static( @@ -456,11 +455,10 @@ static grpc_mdelem md_create_must_intern(const grpc_slice& key, /* not found: create a new pair */ md = key_definitely_static - ? grpc_core::New( + ? new InternedMetadata( key, value, hash, shard->elems[idx].next, static_cast(nullptr)) - : grpc_core::New(key, value, hash, - shard->elems[idx].next); + : new InternedMetadata(key, value, hash, shard->elems[idx].next); shard->elems[idx].next = md; shard->count++; @@ -656,7 +654,7 @@ void grpc_mdelem_do_unref(grpc_mdelem gmd DEBUG_ARGS) { case GRPC_MDELEM_STORAGE_ALLOCATED: { auto* md = reinterpret_cast GRPC_MDELEM_DATA(gmd); if (GPR_UNLIKELY(md->Unref(FWD_DEBUG_ARGS))) { - grpc_core::Delete(md); + delete md; } break; } @@ -674,7 +672,7 @@ void grpc_mdelem_on_final_unref(grpc_mdelem_data_storage storage, void* ptr, break; } case GRPC_MDELEM_STORAGE_ALLOCATED: { - grpc_core::Delete(reinterpret_cast(ptr)); + delete reinterpret_cast(ptr); break; } } diff --git a/src/core/lib/transport/metadata.h b/src/core/lib/transport/metadata.h index 9631df3c1a2..4bb8d64dd03 100644 --- a/src/core/lib/transport/metadata.h +++ b/src/core/lib/transport/metadata.h @@ -423,7 +423,7 @@ inline grpc_mdelem grpc_mdelem_from_slices( const grpc_core::ManagedMemorySlice& key, const grpc_core::UnmanagedMemorySlice& value) { using grpc_core::AllocatedMetadata; - return GRPC_MAKE_MDELEM(grpc_core::New(key, value), + return GRPC_MAKE_MDELEM(new AllocatedMetadata(key, value), GRPC_MDELEM_STORAGE_ALLOCATED); } @@ -431,7 +431,7 @@ inline grpc_mdelem grpc_mdelem_from_slices( const grpc_core::ExternallyManagedSlice& key, const grpc_core::UnmanagedMemorySlice& value) { using grpc_core::AllocatedMetadata; - return GRPC_MAKE_MDELEM(grpc_core::New(key, value), + return GRPC_MAKE_MDELEM(new AllocatedMetadata(key, value), GRPC_MDELEM_STORAGE_ALLOCATED); } @@ -439,7 +439,7 @@ inline grpc_mdelem grpc_mdelem_from_slices( const grpc_core::StaticMetadataSlice& key, const grpc_core::UnmanagedMemorySlice& value) { using grpc_core::AllocatedMetadata; - return GRPC_MAKE_MDELEM(grpc_core::New(key, value), + return GRPC_MAKE_MDELEM(new AllocatedMetadata(key, value), GRPC_MDELEM_STORAGE_ALLOCATED); } diff --git a/src/core/lib/transport/static_metadata.cc b/src/core/lib/transport/static_metadata.cc index a86ab002309..0aa3296122e 100644 --- a/src/core/lib/transport/static_metadata.cc +++ b/src/core/lib/transport/static_metadata.cc @@ -1149,8 +1149,7 @@ uint64_t StaticMetadataInitCanary() { } // namespace grpc_core void grpc_init_static_metadata_ctx(void) { - grpc_core::g_static_metadata_slice_ctx = - grpc_core::New(); + grpc_core::g_static_metadata_slice_ctx = new grpc_core::StaticMetadataCtx(); grpc_core::g_static_metadata_slice_table = grpc_core::g_static_metadata_slice_ctx->slices; grpc_core::g_static_metadata_slice_refcounts = @@ -1162,8 +1161,7 @@ void grpc_init_static_metadata_ctx(void) { } void grpc_destroy_static_metadata_ctx(void) { - grpc_core::Delete( - grpc_core::g_static_metadata_slice_ctx); + delete grpc_core::g_static_metadata_slice_ctx; grpc_core::g_static_metadata_slice_ctx = nullptr; grpc_core::g_static_metadata_slice_table = nullptr; grpc_core::g_static_metadata_slice_refcounts = nullptr; diff --git a/src/core/lib/transport/transport.cc b/src/core/lib/transport/transport.cc index f691074cf67..2763aeecb90 100644 --- a/src/core/lib/transport/transport.cc +++ b/src/core/lib/transport/transport.cc @@ -221,11 +221,11 @@ static void destroy_made_transport_op(void* arg, grpc_error* error) { made_transport_op* op = static_cast(arg); grpc_core::ExecCtx::Run(DEBUG_LOCATION, op->inner_on_complete, GRPC_ERROR_REF(error)); - grpc_core::Delete(op); + delete op; } grpc_transport_op* grpc_make_transport_op(grpc_closure* on_complete) { - made_transport_op* op = grpc_core::New(); + made_transport_op* op = new made_transport_op(); GRPC_CLOSURE_INIT(&op->outer_on_complete, destroy_made_transport_op, op, grpc_schedule_on_exec_ctx); op->inner_on_complete = on_complete; diff --git a/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc b/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc index edd95c38386..468ec36ed7d 100644 --- a/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc +++ b/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc @@ -378,7 +378,7 @@ static void alts_tsi_handshaker_create_channel(void* arg, next_args->cb(continue_next_result, next_args->user_data, nullptr, 0, nullptr); } - grpc_core::Delete(next_args); + delete next_args; } static tsi_result handshaker_next( @@ -401,7 +401,7 @@ static tsi_result handshaker_next( } if (handshaker->channel == nullptr && !handshaker->use_dedicated_cq) { alts_tsi_handshaker_continue_handshaker_next_args* args = - grpc_core::New(); + new alts_tsi_handshaker_continue_handshaker_next_args(); args->handshaker = handshaker; args->received_bytes = nullptr; args->received_bytes_size = received_bytes_size; diff --git a/src/core/tsi/ssl/session_cache/ssl_session_cache.cc b/src/core/tsi/ssl/session_cache/ssl_session_cache.cc index 8e3a78f6393..0fd5aa9ce16 100644 --- a/src/core/tsi/ssl/session_cache/ssl_session_cache.cc +++ b/src/core/tsi/ssl/session_cache/ssl_session_cache.cc @@ -92,7 +92,7 @@ SslSessionLRUCache::~SslSessionLRUCache() { Node* node = use_order_list_head_; while (node) { Node* next = node->next_; - grpc_core::Delete(node); + delete node; node = next; } grpc_avl_unref(entry_by_key_, nullptr); @@ -127,7 +127,7 @@ void SslSessionLRUCache::Put(const char* key, SslSessionPtr session) { return; } grpc_slice key_slice = grpc_slice_from_copied_string(key); - node = grpc_core::New(key_slice, std::move(session)); + node = new Node(key_slice, std::move(session)); PushFront(node); entry_by_key_ = grpc_avl_add(entry_by_key_, node->AvlKey(), node, nullptr); AssertInvariants(); @@ -137,7 +137,7 @@ void SslSessionLRUCache::Put(const char* key, SslSessionPtr session) { Remove(node); // Order matters, key is destroyed after deleting node. entry_by_key_ = grpc_avl_remove(entry_by_key_, node->AvlKey(), nullptr); - grpc_core::Delete(node); + delete node; AssertInvariants(); } } diff --git a/src/objective-c/tests/CronetTests/CoreCronetEnd2EndTests.mm b/src/objective-c/tests/CronetTests/CoreCronetEnd2EndTests.mm index b0929074c3d..32db8da9fb4 100644 --- a/src/objective-c/tests/CronetTests/CoreCronetEnd2EndTests.mm +++ b/src/objective-c/tests/CronetTests/CoreCronetEnd2EndTests.mm @@ -59,7 +59,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack( grpc_channel_args *client_args, grpc_channel_args *server_args) { grpc_end2end_test_fixture f; int port = grpc_pick_unused_port_or_die(); - fullstack_secure_fixture_data *ffd = grpc_core::New(); + fullstack_secure_fixture_data *ffd = new fullstack_secure_fixture_data(); memset(&f, 0, sizeof(f)); grpc_core::JoinHostPort(&ffd->localaddr, "127.0.0.1", port); diff --git a/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc b/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc index 549255fbf01..564a4339ea4 100644 --- a/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc +++ b/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc @@ -167,7 +167,7 @@ int main(int argc, char** argv) { { grpc_core::ExecCtx exec_ctx; - ResultHandler* result_handler = grpc_core::New(); + ResultHandler* result_handler = new ResultHandler(); grpc_core::OrphanablePtr resolver = create_resolver( "dns:test", grpc_core::UniquePtr( result_handler)); diff --git a/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc b/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc index 5eb42b09c53..35f45c59216 100644 --- a/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc +++ b/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc @@ -230,7 +230,7 @@ static void on_fourth_resolution(OnResolutionCallbackArg* cb_arg) { GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_iomgr_args.pollset, nullptr)); gpr_mu_unlock(g_iomgr_args.mu); - grpc_core::Delete(cb_arg); + delete cb_arg; g_all_callbacks_invoked = true; } @@ -274,7 +274,7 @@ static void on_first_resolution(OnResolutionCallbackArg* cb_arg) { static void start_test_under_combiner(void* arg, grpc_error* /*error*/) { OnResolutionCallbackArg* res_cb_arg = static_cast(arg); - res_cb_arg->result_handler = grpc_core::New(); + res_cb_arg->result_handler = new ResultHandler(); grpc_core::ResolverFactory* factory = grpc_core::ResolverRegistry::LookupResolverFactory("dns"); grpc_uri* uri = grpc_uri_parse(res_cb_arg->uri_str, 0); @@ -305,8 +305,7 @@ static void start_test_under_combiner(void* arg, grpc_error* /*error*/) { static void test_cooldown() { grpc_core::ExecCtx exec_ctx; iomgr_args_init(&g_iomgr_args); - OnResolutionCallbackArg* res_cb_arg = - grpc_core::New(); + OnResolutionCallbackArg* res_cb_arg = new OnResolutionCallbackArg(); res_cb_arg->uri_str = "dns:127.0.0.1"; g_combiner->Run( diff --git a/test/core/client_channel/resolvers/fake_resolver_test.cc b/test/core/client_channel/resolvers/fake_resolver_test.cc index 6bfe953b8ae..cdb4fa41bc8 100644 --- a/test/core/client_channel/resolvers/fake_resolver_test.cc +++ b/test/core/client_channel/resolvers/fake_resolver_test.cc @@ -120,7 +120,7 @@ static void test_fake_resolver() { grpc_core::ExecCtx exec_ctx; grpc_core::Combiner* combiner = grpc_combiner_create(); // Create resolver. - ResultHandler* result_handler = grpc_core::New(); + ResultHandler* result_handler = new ResultHandler(); grpc_core::RefCountedPtr response_generator = grpc_core::MakeRefCounted(); diff --git a/test/core/end2end/bad_server_response_test.cc b/test/core/end2end/bad_server_response_test.cc index 6bc13d675f6..09c503e1e85 100644 --- a/test/core/end2end/bad_server_response_test.cc +++ b/test/core/end2end/bad_server_response_test.cc @@ -264,8 +264,8 @@ static grpc_core::Thread* poll_server_until_read_done( poll_args* pa = static_cast(gpr_malloc(sizeof(*pa))); pa->server = server; pa->signal_when_done = signal_when_done; - auto* th = grpc_core::New("grpc_poll_server", - actually_poll_server, pa); + auto* th = + new grpc_core::Thread("grpc_poll_server", actually_poll_server, pa); th->Start(); return th; } diff --git a/test/core/end2end/fixtures/h2_census.cc b/test/core/end2end/fixtures/h2_census.cc index 69f11c593df..afabae10966 100644 --- a/test/core/end2end/fixtures/h2_census.cc +++ b/test/core/end2end/fixtures/h2_census.cc @@ -43,7 +43,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_fullstack( grpc_channel_args* /*client_args*/, grpc_channel_args* /*server_args*/) { grpc_end2end_test_fixture f; int port = grpc_pick_unused_port_or_die(); - fullstack_fixture_data* ffd = grpc_core::New(); + fullstack_fixture_data* ffd = new fullstack_fixture_data(); memset(&f, 0, sizeof(f)); grpc_core::JoinHostPort(&ffd->localaddr, "localhost", port); @@ -100,7 +100,7 @@ void chttp2_init_server_fullstack(grpc_end2end_test_fixture* f, void chttp2_tear_down_fullstack(grpc_end2end_test_fixture* f) { fullstack_fixture_data* ffd = static_cast(f->fixture_data); - grpc_core::Delete(ffd); + delete ffd; } /* All test configurations */ diff --git a/test/core/end2end/fixtures/h2_compress.cc b/test/core/end2end/fixtures/h2_compress.cc index 8492cba87cd..a0a7c298234 100644 --- a/test/core/end2end/fixtures/h2_compress.cc +++ b/test/core/end2end/fixtures/h2_compress.cc @@ -51,7 +51,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_fullstack_compression( grpc_end2end_test_fixture f; int port = grpc_pick_unused_port_or_die(); fullstack_compression_fixture_data* ffd = - grpc_core::New(); + new fullstack_compression_fixture_data(); grpc_core::JoinHostPort(&ffd->localaddr, "localhost", port); memset(&f, 0, sizeof(f)); @@ -102,7 +102,7 @@ void chttp2_tear_down_fullstack_compression(grpc_end2end_test_fixture* f) { grpc_core::ExecCtx exec_ctx; fullstack_compression_fixture_data* ffd = static_cast(f->fixture_data); - grpc_core::Delete(ffd); + delete ffd; } /* All test configurations */ diff --git a/test/core/end2end/fixtures/h2_fakesec.cc b/test/core/end2end/fixtures/h2_fakesec.cc index 130c04bb151..d8d92bea3b5 100644 --- a/test/core/end2end/fixtures/h2_fakesec.cc +++ b/test/core/end2end/fixtures/h2_fakesec.cc @@ -39,8 +39,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack( grpc_channel_args* /*client_args*/, grpc_channel_args* /*server_args*/) { grpc_end2end_test_fixture f; int port = grpc_pick_unused_port_or_die(); - fullstack_secure_fixture_data* ffd = - grpc_core::New(); + fullstack_secure_fixture_data* ffd = new fullstack_secure_fixture_data(); memset(&f, 0, sizeof(f)); grpc_core::JoinHostPort(&ffd->localaddr, "localhost", port); @@ -90,7 +89,7 @@ static void chttp2_init_server_secure_fullstack( void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture* f) { fullstack_secure_fixture_data* ffd = static_cast(f->fixture_data); - grpc_core::Delete(ffd); + delete ffd; } static void chttp2_init_client_fake_secure_fullstack( diff --git a/test/core/end2end/fixtures/h2_full+pipe.cc b/test/core/end2end/fixtures/h2_full+pipe.cc index 609a8e66da8..a9807e620de 100644 --- a/test/core/end2end/fixtures/h2_full+pipe.cc +++ b/test/core/end2end/fixtures/h2_full+pipe.cc @@ -48,7 +48,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_fullstack( grpc_channel_args* /*client_args*/, grpc_channel_args* /*server_args*/) { grpc_end2end_test_fixture f; int port = grpc_pick_unused_port_or_die(); - fullstack_fixture_data* ffd = grpc_core::New(); + fullstack_fixture_data* ffd = new fullstack_fixture_data(); memset(&f, 0, sizeof(f)); grpc_core::JoinHostPort(&ffd->localaddr, "localhost", port); @@ -86,7 +86,7 @@ void chttp2_init_server_fullstack(grpc_end2end_test_fixture* f, void chttp2_tear_down_fullstack(grpc_end2end_test_fixture* f) { fullstack_fixture_data* ffd = static_cast(f->fixture_data); - grpc_core::Delete(ffd); + delete ffd; } /* All test configurations */ diff --git a/test/core/end2end/fixtures/h2_full+trace.cc b/test/core/end2end/fixtures/h2_full+trace.cc index 7405f613bdd..64fdca78a4a 100644 --- a/test/core/end2end/fixtures/h2_full+trace.cc +++ b/test/core/end2end/fixtures/h2_full+trace.cc @@ -48,7 +48,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_fullstack( grpc_channel_args* /*client_args*/, grpc_channel_args* /*server_args*/) { grpc_end2end_test_fixture f; int port = grpc_pick_unused_port_or_die(); - fullstack_fixture_data* ffd = grpc_core::New(); + fullstack_fixture_data* ffd = new fullstack_fixture_data(); memset(&f, 0, sizeof(f)); grpc_core::JoinHostPort(&ffd->localaddr, "localhost", port); @@ -86,7 +86,7 @@ void chttp2_init_server_fullstack(grpc_end2end_test_fixture* f, void chttp2_tear_down_fullstack(grpc_end2end_test_fixture* f) { fullstack_fixture_data* ffd = static_cast(f->fixture_data); - grpc_core::Delete(ffd); + delete ffd; } /* All test configurations */ diff --git a/test/core/end2end/fixtures/h2_full+workarounds.cc b/test/core/end2end/fixtures/h2_full+workarounds.cc index e4ced484c5e..d524175925a 100644 --- a/test/core/end2end/fixtures/h2_full+workarounds.cc +++ b/test/core/end2end/fixtures/h2_full+workarounds.cc @@ -47,7 +47,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_fullstack( grpc_channel_args* /*client_args*/, grpc_channel_args* /*server_args*/) { grpc_end2end_test_fixture f; int port = grpc_pick_unused_port_or_die(); - fullstack_fixture_data* ffd = grpc_core::New(); + fullstack_fixture_data* ffd = new fullstack_fixture_data(); memset(&f, 0, sizeof(f)); grpc_core::JoinHostPort(&ffd->localaddr, "localhost", port); f.fixture_data = ffd; @@ -93,7 +93,7 @@ void chttp2_init_server_fullstack(grpc_end2end_test_fixture* f, void chttp2_tear_down_fullstack(grpc_end2end_test_fixture* f) { fullstack_fixture_data* ffd = static_cast(f->fixture_data); - grpc_core::Delete(ffd); + delete ffd; } /* All test configurations */ diff --git a/test/core/end2end/fixtures/h2_full.cc b/test/core/end2end/fixtures/h2_full.cc index 4b42c13f5e7..485c792162c 100644 --- a/test/core/end2end/fixtures/h2_full.cc +++ b/test/core/end2end/fixtures/h2_full.cc @@ -42,7 +42,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_fullstack( grpc_channel_args* /*client_args*/, grpc_channel_args* /*server_args*/) { grpc_end2end_test_fixture f; int port = grpc_pick_unused_port_or_die(); - fullstack_fixture_data* ffd = grpc_core::New(); + fullstack_fixture_data* ffd = new fullstack_fixture_data(); memset(&f, 0, sizeof(f)); grpc_core::JoinHostPort(&ffd->localaddr, "localhost", port); @@ -80,7 +80,7 @@ void chttp2_init_server_fullstack(grpc_end2end_test_fixture* f, void chttp2_tear_down_fullstack(grpc_end2end_test_fixture* f) { fullstack_fixture_data* ffd = static_cast(f->fixture_data); - grpc_core::Delete(ffd); + delete ffd; } /* All test configurations */ diff --git a/test/core/end2end/fixtures/h2_http_proxy.cc b/test/core/end2end/fixtures/h2_http_proxy.cc index e1158146004..e88042d57fb 100644 --- a/test/core/end2end/fixtures/h2_http_proxy.cc +++ b/test/core/end2end/fixtures/h2_http_proxy.cc @@ -47,7 +47,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_fullstack( grpc_channel_args* client_args, grpc_channel_args* /*server_args*/) { grpc_end2end_test_fixture f; memset(&f, 0, sizeof(f)); - fullstack_fixture_data* ffd = grpc_core::New(); + fullstack_fixture_data* ffd = new fullstack_fixture_data(); const int server_port = grpc_pick_unused_port_or_die(); grpc_core::JoinHostPort(&ffd->server_addr, "localhost", server_port); @@ -103,7 +103,7 @@ void chttp2_init_server_fullstack(grpc_end2end_test_fixture* f, void chttp2_tear_down_fullstack(grpc_end2end_test_fixture* f) { fullstack_fixture_data* ffd = static_cast(f->fixture_data); - grpc_core::Delete(ffd); + delete ffd; } /* All test configurations */ diff --git a/test/core/end2end/fixtures/h2_oauth2.cc b/test/core/end2end/fixtures/h2_oauth2.cc index 440a5fd24fc..0800d5929f2 100644 --- a/test/core/end2end/fixtures/h2_oauth2.cc +++ b/test/core/end2end/fixtures/h2_oauth2.cc @@ -94,8 +94,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack( grpc_channel_args* /*client_args*/, grpc_channel_args* /*server_args*/) { grpc_end2end_test_fixture f; int port = grpc_pick_unused_port_or_die(); - fullstack_secure_fixture_data* ffd = - grpc_core::New(); + fullstack_secure_fixture_data* ffd = new fullstack_secure_fixture_data(); memset(&f, 0, sizeof(f)); grpc_core::JoinHostPort(&ffd->localaddr, "localhost", port); f.fixture_data = ffd; @@ -134,7 +133,7 @@ static void chttp2_init_server_secure_fullstack( void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture* f) { fullstack_secure_fixture_data* ffd = static_cast(f->fixture_data); - grpc_core::Delete(ffd); + delete ffd; } static void chttp2_init_client_simple_ssl_with_oauth2_secure_fullstack( diff --git a/test/core/end2end/fixtures/h2_spiffe.cc b/test/core/end2end/fixtures/h2_spiffe.cc index 21df3b54531..306e94fd1b2 100644 --- a/test/core/end2end/fixtures/h2_spiffe.cc +++ b/test/core/end2end/fixtures/h2_spiffe.cc @@ -56,8 +56,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack( grpc_channel_args* /*client_args*/, grpc_channel_args* /*server_args*/) { grpc_end2end_test_fixture f; int port = grpc_pick_unused_port_or_die(); - fullstack_secure_fixture_data* ffd = - grpc_core::New(); + fullstack_secure_fixture_data* ffd = new fullstack_secure_fixture_data(); memset(&f, 0, sizeof(f)); grpc_core::JoinHostPort(&ffd->localaddr, "localhost", port); f.fixture_data = ffd; @@ -105,7 +104,7 @@ static void chttp2_init_server_secure_fullstack( void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture* f) { fullstack_secure_fixture_data* ffd = static_cast(f->fixture_data); - grpc_core::Delete(ffd); + delete ffd; } // Application-provided callback for server authorization check. diff --git a/test/core/end2end/fixtures/h2_ssl.cc b/test/core/end2end/fixtures/h2_ssl.cc index f0bc469f337..2ba2418151d 100644 --- a/test/core/end2end/fixtures/h2_ssl.cc +++ b/test/core/end2end/fixtures/h2_ssl.cc @@ -42,8 +42,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack( grpc_channel_args* /*client_args*/, grpc_channel_args* /*server_args*/) { grpc_end2end_test_fixture f; int port = grpc_pick_unused_port_or_die(); - fullstack_secure_fixture_data* ffd = - grpc_core::New(); + fullstack_secure_fixture_data* ffd = new fullstack_secure_fixture_data(); memset(&f, 0, sizeof(f)); grpc_core::JoinHostPort(&ffd->localaddr, "localhost", port); @@ -94,7 +93,7 @@ static void chttp2_init_server_secure_fullstack( void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture* f) { fullstack_secure_fixture_data* ffd = static_cast(f->fixture_data); - grpc_core::Delete(ffd); + delete ffd; } static void chttp2_init_client_simple_ssl_secure_fullstack( diff --git a/test/core/end2end/fixtures/h2_ssl_cred_reload.cc b/test/core/end2end/fixtures/h2_ssl_cred_reload.cc index d1fc1dccd4b..97600990230 100644 --- a/test/core/end2end/fixtures/h2_ssl_cred_reload.cc +++ b/test/core/end2end/fixtures/h2_ssl_cred_reload.cc @@ -63,8 +63,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack( grpc_channel_args* /*client_args*/, grpc_channel_args* /*server_args*/) { grpc_end2end_test_fixture f; int port = grpc_pick_unused_port_or_die(); - fullstack_secure_fixture_data* ffd = - grpc_core::New(); + fullstack_secure_fixture_data* ffd = new fullstack_secure_fixture_data(); memset(&f, 0, sizeof(f)); grpc_core::JoinHostPort(&ffd->localaddr, "localhost", port); @@ -115,7 +114,7 @@ static void chttp2_init_server_secure_fullstack( void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture* f) { fullstack_secure_fixture_data* ffd = static_cast(f->fixture_data); - grpc_core::Delete(ffd); + delete ffd; } static void chttp2_init_client_simple_ssl_secure_fullstack( diff --git a/test/core/end2end/fixtures/http_proxy_fixture.cc b/test/core/end2end/fixtures/http_proxy_fixture.cc index 90e16dc43c8..de8cec386d4 100644 --- a/test/core/end2end/fixtures/http_proxy_fixture.cc +++ b/test/core/end2end/fixtures/http_proxy_fixture.cc @@ -609,7 +609,7 @@ static void thread_main(void* arg) { grpc_end2end_http_proxy* grpc_end2end_http_proxy_create( grpc_channel_args* args) { grpc_core::ExecCtx exec_ctx; - grpc_end2end_http_proxy* proxy = grpc_core::New(); + grpc_end2end_http_proxy* proxy = new grpc_end2end_http_proxy(); // Construct proxy address. const int proxy_port = grpc_pick_unused_port_or_die(); grpc_core::JoinHostPort(&proxy->proxy_name, "localhost", proxy_port); @@ -658,7 +658,7 @@ void grpc_end2end_http_proxy_destroy(grpc_end2end_http_proxy* proxy) { GRPC_CLOSURE_CREATE(destroy_pollset, proxy->pollset, grpc_schedule_on_exec_ctx)); GRPC_COMBINER_UNREF(proxy->combiner, "test"); - grpc_core::Delete(proxy); + delete proxy; } const char* grpc_end2end_http_proxy_get_proxy_name( diff --git a/test/core/end2end/fixtures/local_util.cc b/test/core/end2end/fixtures/local_util.cc index c1fd88b67b0..fadf80caf4f 100644 --- a/test/core/end2end/fixtures/local_util.cc +++ b/test/core/end2end/fixtures/local_util.cc @@ -36,7 +36,7 @@ grpc_end2end_test_fixture grpc_end2end_local_chttp2_create_fixture_fullstack() { grpc_end2end_test_fixture f; grpc_end2end_local_fullstack_fixture_data* ffd = - grpc_core::New(); + new grpc_end2end_local_fullstack_fixture_data(); memset(&f, 0, sizeof(f)); f.fixture_data = ffd; f.cq = grpc_completion_queue_create_for_next(nullptr); @@ -108,5 +108,5 @@ void grpc_end2end_local_chttp2_tear_down_fullstack( grpc_end2end_test_fixture* f) { grpc_end2end_local_fullstack_fixture_data* ffd = static_cast(f->fixture_data); - grpc_core::Delete(ffd); + delete ffd; } diff --git a/test/core/end2end/fixtures/proxy.cc b/test/core/end2end/fixtures/proxy.cc index 3351eab2f3c..ff6ee12ca77 100644 --- a/test/core/end2end/fixtures/proxy.cc +++ b/test/core/end2end/fixtures/proxy.cc @@ -89,7 +89,7 @@ grpc_end2end_proxy* grpc_end2end_proxy_create(const grpc_end2end_proxy_def* def, int proxy_port = grpc_pick_unused_port_or_die(); int server_port = grpc_pick_unused_port_or_die(); - grpc_end2end_proxy* proxy = grpc_core::New(); + grpc_end2end_proxy* proxy = new grpc_end2end_proxy(); grpc_core::JoinHostPort(&proxy->proxy_port, "localhost", proxy_port); grpc_core::JoinHostPort(&proxy->server_port, "localhost", server_port); @@ -134,7 +134,7 @@ void grpc_end2end_proxy_destroy(grpc_end2end_proxy* proxy) { grpc_channel_destroy(proxy->client); grpc_completion_queue_destroy(proxy->cq); grpc_call_details_destroy(&proxy->new_call_details); - grpc_core::Delete(proxy); + delete proxy; } static void unrefpc(proxy_call* pc, const char* /*reason*/) { diff --git a/test/core/end2end/fuzzers/api_fuzzer.cc b/test/core/end2end/fuzzers/api_fuzzer.cc index 7cc2360b920..b1eb33a042b 100644 --- a/test/core/end2end/fuzzers/api_fuzzer.cc +++ b/test/core/end2end/fuzzers/api_fuzzer.cc @@ -355,14 +355,14 @@ static void finish_resolve(void* arg, grpc_error* error) { } gpr_free(r->addr); - grpc_core::Delete(r); + delete r; } void my_resolve_address(const char* addr, const char* /*default_port*/, grpc_pollset_set* /*interested_parties*/, grpc_closure* on_done, grpc_resolved_addresses** addrs) { - addr_req* r = grpc_core::New(); + addr_req* r = new addr_req(); r->addr = gpr_strdup(addr); r->on_done = on_done; r->addrs = addrs; diff --git a/test/core/end2end/h2_ssl_cert_test.cc b/test/core/end2end/h2_ssl_cert_test.cc index 9bdacc3f137..61f685045e7 100644 --- a/test/core/end2end/h2_ssl_cert_test.cc +++ b/test/core/end2end/h2_ssl_cert_test.cc @@ -48,8 +48,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack( grpc_channel_args* /*client_args*/, grpc_channel_args* /*server_args*/) { grpc_end2end_test_fixture f; int port = grpc_pick_unused_port_or_die(); - fullstack_secure_fixture_data* ffd = - grpc_core::New(); + fullstack_secure_fixture_data* ffd = new fullstack_secure_fixture_data(); memset(&f, 0, sizeof(f)); grpc_core::JoinHostPort(&ffd->localaddr, "localhost", port); @@ -98,7 +97,7 @@ static void chttp2_init_server_secure_fullstack( void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture* f) { fullstack_secure_fixture_data* ffd = static_cast(f->fixture_data); - grpc_core::Delete(ffd); + delete ffd; } static int fail_server_auth_check(grpc_channel_args* server_args) { diff --git a/test/core/end2end/inproc_callback_test.cc b/test/core/end2end/inproc_callback_test.cc index 15376c59d51..8d51421d4c0 100644 --- a/test/core/end2end/inproc_callback_test.cc +++ b/test/core/end2end/inproc_callback_test.cc @@ -46,7 +46,7 @@ class CQDeletingCallback : public grpc_experimental_completion_queue_functor { static void Run(grpc_experimental_completion_queue_functor* cb, int ok) { auto* callback = static_cast(cb); callback->func_(static_cast(ok)); - grpc_core::Delete(callback); + delete callback; } private: @@ -55,7 +55,7 @@ class CQDeletingCallback : public grpc_experimental_completion_queue_functor { template grpc_experimental_completion_queue_functor* NewDeletingCallback(F f) { - return grpc_core::New>(f); + return new CQDeletingCallback(f); } class ShutdownCallback : public grpc_experimental_completion_queue_functor { @@ -212,7 +212,7 @@ static grpc_end2end_test_fixture inproc_create_fixture( memset(&f, 0, sizeof(f)); f.fixture_data = ffd; - g_shutdown_callback = grpc_core::New(); + g_shutdown_callback = new ShutdownCallback(); f.cq = grpc_completion_queue_create_for_callback(g_shutdown_callback, nullptr); f.shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr); @@ -263,7 +263,7 @@ static void drain_cq(grpc_completion_queue* /*cq*/) { // Wait for the shutdown callback to arrive, or fail the test GPR_ASSERT(g_shutdown_callback->Wait(five_seconds_from_now())); gpr_log(GPR_DEBUG, "CQ shutdown wait complete"); - grpc_core::Delete(g_shutdown_callback); + delete g_shutdown_callback; } static void shutdown_server(grpc_end2end_test_fixture* f) { diff --git a/test/core/gprpp/BUILD b/test/core/gprpp/BUILD index 773406e85cd..b22a651f8ce 100644 --- a/test/core/gprpp/BUILD +++ b/test/core/gprpp/BUILD @@ -82,20 +82,6 @@ grpc_cc_test( ], ) -grpc_cc_test( - name = "memory_test", - srcs = ["memory_test.cc"], - external_deps = [ - "gtest", - ], - language = "C++", - uses_polling = False, - deps = [ - "//:gpr_base", - "//test/core/util:grpc_test_util", - ], -) - grpc_cc_test( name = "inlined_vector_test", srcs = ["inlined_vector_test.cc"], diff --git a/test/core/gprpp/inlined_vector_test.cc b/test/core/gprpp/inlined_vector_test.cc index 03e116aa2a4..fdbc9ed971a 100644 --- a/test/core/gprpp/inlined_vector_test.cc +++ b/test/core/gprpp/inlined_vector_test.cc @@ -72,7 +72,7 @@ TEST(InlinedVectorTest, PushBackWithMove) { TEST(InlinedVectorTest, EmplaceBack) { InlinedVector, 1> v; - v.emplace_back(New(3)); + v.emplace_back(new int(3)); EXPECT_EQ(1UL, v.size()); EXPECT_EQ(3, *v[0]); } diff --git a/test/core/gprpp/memory_test.cc b/test/core/gprpp/memory_test.cc deleted file mode 100644 index b148d7dfccb..00000000000 --- a/test/core/gprpp/memory_test.cc +++ /dev/null @@ -1,95 +0,0 @@ -/* - * - * Copyright 2017 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 "src/core/lib/gprpp/memory.h" -#include -#include "test/core/util/test_config.h" - -namespace grpc_core { -namespace testing { - -struct Foo { - Foo(int p, int q) : a(p), b(q) {} - int a; - int b; -}; - -struct Base1 { - int a; - virtual ~Base1() {} -}; - -struct Base2 { - int b; - virtual ~Base2() {} -}; - -struct Compound : public Base1, Base2 { - int c; - virtual ~Compound() {} -}; - -TEST(MemoryTest, NewDeleteTest) { Delete(New()); } - -TEST(MemoryTest, NewDeleteWithArgTest) { - int* i = New(42); - EXPECT_EQ(42, *i); - Delete(i); -} - -TEST(MemoryTest, NewDeleteWithArgsTest) { - Foo* p = New(1, 2); - EXPECT_EQ(1, p->a); - EXPECT_EQ(2, p->b); - Delete(p); -} - -TEST(MemoryTest, MakeUniqueTest) { MakeUnique(); } - -TEST(MemoryTest, MakeUniqueWithArgTest) { - auto i = MakeUnique(42); - EXPECT_EQ(42, *i); -} - -TEST(MemoryTest, UniquePtrWithCustomDeleter) { - int n = 0; - class IncrementingDeleter { - public: - void operator()(int* p) { ++*p; } - }; - { - UniquePtr p(&n); - EXPECT_EQ(0, n); - } - EXPECT_EQ(1, n); -} - -TEST(MemoryTest, MultipleInheritence) { - Base2* p = New(); - EXPECT_NE(p, dynamic_cast(p)); - Delete(p); -} - -} // namespace testing -} // namespace grpc_core - -int main(int argc, char** argv) { - grpc::testing::TestEnvironment env(argc, argv); - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/test/core/gprpp/mpscq_test.cc b/test/core/gprpp/mpscq_test.cc index a3b6bb59e4b..d19a362f279 100644 --- a/test/core/gprpp/mpscq_test.cc +++ b/test/core/gprpp/mpscq_test.cc @@ -38,7 +38,7 @@ typedef struct test_node { } test_node; static test_node* new_node(size_t i, size_t* ctr) { - test_node* n = grpc_core::New(); + test_node* n = new test_node(); n->i = i; n->ctr = ctr; return n; diff --git a/test/core/gprpp/orphanable_test.cc b/test/core/gprpp/orphanable_test.cc index fe13df0d0d0..341b753548a 100644 --- a/test/core/gprpp/orphanable_test.cc +++ b/test/core/gprpp/orphanable_test.cc @@ -31,7 +31,7 @@ class Foo : public Orphanable { public: Foo() : Foo(0) {} explicit Foo(int value) : value_(value) {} - void Orphan() override { Delete(this); } + void Orphan() override { delete this; } int value() const { return value_; } private: @@ -39,12 +39,12 @@ class Foo : public Orphanable { }; TEST(Orphanable, Basic) { - Foo* foo = New(); + Foo* foo = new Foo(); foo->Orphan(); } TEST(OrphanablePtr, Basic) { - OrphanablePtr foo(New()); + OrphanablePtr foo(new Foo()); EXPECT_EQ(0, foo->value()); } diff --git a/test/core/gprpp/ref_counted_ptr_test.cc b/test/core/gprpp/ref_counted_ptr_test.cc index 38bd4b61364..e392c2058e4 100644 --- a/test/core/gprpp/ref_counted_ptr_test.cc +++ b/test/core/gprpp/ref_counted_ptr_test.cc @@ -48,31 +48,31 @@ TEST(RefCountedPtr, ExplicitConstructorEmpty) { RefCountedPtr foo(nullptr); } -TEST(RefCountedPtr, ExplicitConstructor) { RefCountedPtr foo(New()); } +TEST(RefCountedPtr, ExplicitConstructor) { RefCountedPtr foo(new Foo()); } TEST(RefCountedPtr, MoveConstructor) { - RefCountedPtr foo(New()); + RefCountedPtr foo(new Foo()); RefCountedPtr foo2(std::move(foo)); EXPECT_EQ(nullptr, foo.get()); EXPECT_NE(nullptr, foo2.get()); } TEST(RefCountedPtr, MoveAssignment) { - RefCountedPtr foo(New()); + RefCountedPtr foo(new Foo()); RefCountedPtr foo2 = std::move(foo); EXPECT_EQ(nullptr, foo.get()); EXPECT_NE(nullptr, foo2.get()); } TEST(RefCountedPtr, CopyConstructor) { - RefCountedPtr foo(New()); + RefCountedPtr foo(new Foo()); const RefCountedPtr& foo2(foo); EXPECT_NE(nullptr, foo.get()); EXPECT_EQ(foo.get(), foo2.get()); } TEST(RefCountedPtr, CopyAssignment) { - RefCountedPtr foo(New()); + RefCountedPtr foo(new Foo()); const RefCountedPtr& foo2 = foo; EXPECT_NE(nullptr, foo.get()); EXPECT_EQ(foo.get(), foo2.get()); @@ -87,12 +87,12 @@ TEST(RefCountedPtr, CopyAssignmentWhenEmpty) { } TEST(RefCountedPtr, CopyAssignmentToSelf) { - RefCountedPtr foo(New()); + RefCountedPtr foo(new Foo()); foo = *&foo; // The "*&" avoids warnings from LLVM -Wself-assign. } TEST(RefCountedPtr, EnclosedScope) { - RefCountedPtr foo(New()); + RefCountedPtr foo(new Foo()); { RefCountedPtr foo2(std::move(foo)); EXPECT_EQ(nullptr, foo.get()); @@ -104,21 +104,21 @@ TEST(RefCountedPtr, EnclosedScope) { TEST(RefCountedPtr, ResetFromNullToNonNull) { RefCountedPtr foo; EXPECT_EQ(nullptr, foo.get()); - foo.reset(New()); + foo.reset(new Foo()); EXPECT_NE(nullptr, foo.get()); } TEST(RefCountedPtr, ResetFromNonNullToNonNull) { - RefCountedPtr foo(New()); + RefCountedPtr foo(new Foo()); EXPECT_NE(nullptr, foo.get()); Foo* original = foo.get(); - foo.reset(New()); + foo.reset(new Foo()); EXPECT_NE(nullptr, foo.get()); EXPECT_NE(original, foo.get()); } TEST(RefCountedPtr, ResetFromNonNullToNull) { - RefCountedPtr foo(New()); + RefCountedPtr foo(new Foo()); EXPECT_NE(nullptr, foo.get()); foo.reset(); EXPECT_EQ(nullptr, foo.get()); @@ -132,14 +132,14 @@ TEST(RefCountedPtr, ResetFromNullToNull) { } TEST(RefCountedPtr, DerefernceOperators) { - RefCountedPtr foo(New()); + RefCountedPtr foo(new Foo()); foo->value(); Foo& foo_ref = *foo; foo_ref.value(); } TEST(RefCountedPtr, EqualityOperators) { - RefCountedPtr foo(New()); + RefCountedPtr foo(new Foo()); RefCountedPtr bar = foo; RefCountedPtr empty; // Test equality between RefCountedPtrs. @@ -152,8 +152,8 @@ TEST(RefCountedPtr, EqualityOperators) { } TEST(RefCountedPtr, Swap) { - Foo* foo = New(); - Foo* bar = New(); + Foo* foo = new Foo(); + Foo* bar = new Foo(); RefCountedPtr ptr1(foo); RefCountedPtr ptr2(bar); ptr1.swap(ptr2); @@ -183,7 +183,7 @@ class FooWithTracing : public RefCounted { }; TEST(RefCountedPtr, RefCountedWithTracing) { - RefCountedPtr foo(New()); + RefCountedPtr foo(new FooWithTracing()); RefCountedPtr foo2 = foo->Ref(DEBUG_LOCATION, "foo"); foo2.release(); foo->Unref(DEBUG_LOCATION, "foo"); @@ -200,7 +200,7 @@ class Subclass : public BaseClass { }; TEST(RefCountedPtr, ConstructFromSubclass) { - RefCountedPtr p(New()); + RefCountedPtr p(new Subclass()); } TEST(RefCountedPtr, CopyAssignFromSubclass) { @@ -222,12 +222,12 @@ TEST(RefCountedPtr, MoveAssignFromSubclass) { TEST(RefCountedPtr, ResetFromSubclass) { RefCountedPtr b; EXPECT_EQ(nullptr, b.get()); - b.reset(New()); + b.reset(new Subclass()); EXPECT_NE(nullptr, b.get()); } TEST(RefCountedPtr, EqualityWithSubclass) { - Subclass* s = New(); + Subclass* s = new Subclass(); RefCountedPtr b(s); EXPECT_EQ(b, s); } diff --git a/test/core/gprpp/ref_counted_test.cc b/test/core/gprpp/ref_counted_test.cc index 1955be33115..3205d7c6725 100644 --- a/test/core/gprpp/ref_counted_test.cc +++ b/test/core/gprpp/ref_counted_test.cc @@ -36,12 +36,12 @@ class Foo : public RefCounted { }; TEST(RefCounted, Basic) { - Foo* foo = New(); + Foo* foo = new Foo(); foo->Unref(); } TEST(RefCounted, ExtraRef) { - Foo* foo = New(); + Foo* foo = new Foo(); RefCountedPtr foop = foo->Ref(); foop.release(); foo->Unref(); @@ -58,12 +58,12 @@ class FooNonPolymorphic }; TEST(RefCountedNonPolymorphic, Basic) { - FooNonPolymorphic* foo = New(); + FooNonPolymorphic* foo = new FooNonPolymorphic(); foo->Unref(); } TEST(RefCountedNonPolymorphic, ExtraRef) { - FooNonPolymorphic* foo = New(); + FooNonPolymorphic* foo = new FooNonPolymorphic(); RefCountedPtr foop = foo->Ref(); foop.release(); foo->Unref(); @@ -80,7 +80,7 @@ class FooWithTracing : public RefCounted { }; TEST(RefCountedWithTracing, Basic) { - FooWithTracing* foo = New(); + FooWithTracing* foo = new FooWithTracing(); RefCountedPtr foop = foo->Ref(DEBUG_LOCATION, "extra_ref"); foop.release(); foo->Unref(DEBUG_LOCATION, "extra_ref"); @@ -98,7 +98,7 @@ class FooNonPolymorphicWithTracing }; TEST(RefCountedNonPolymorphicWithTracing, Basic) { - FooNonPolymorphicWithTracing* foo = New(); + FooNonPolymorphicWithTracing* foo = new FooNonPolymorphicWithTracing(); RefCountedPtr foop = foo->Ref(DEBUG_LOCATION, "extra_ref"); foop.release(); diff --git a/test/core/iomgr/mpmcqueue_test.cc b/test/core/iomgr/mpmcqueue_test.cc index 9ebc1cc7363..9c3d2210dee 100644 --- a/test/core/iomgr/mpmcqueue_test.cc +++ b/test/core/iomgr/mpmcqueue_test.cc @@ -49,7 +49,7 @@ class ProducerThread { ~ProducerThread() { for (int i = 0; i < num_items_; ++i) { GPR_ASSERT(items_[i]->done); - grpc_core::Delete(items_[i]); + delete items_[i]; } gpr_free(items_); } @@ -62,7 +62,7 @@ class ProducerThread { items_ = static_cast(gpr_zalloc(num_items_ * sizeof(WorkItem*))); for (int i = 0; i < num_items_; ++i) { - items_[i] = grpc_core::New(start_index_ + i); + items_[i] = new WorkItem(start_index_ + i); queue_->Put(items_[i]); } } @@ -109,13 +109,13 @@ static void test_FIFO(void) { gpr_log(GPR_INFO, "test_FIFO"); grpc_core::InfLenFIFOQueue large_queue; for (int i = 0; i < TEST_NUM_ITEMS; ++i) { - large_queue.Put(static_cast(grpc_core::New(i))); + large_queue.Put(static_cast(new WorkItem(i))); } GPR_ASSERT(large_queue.count() == TEST_NUM_ITEMS); for (int i = 0; i < TEST_NUM_ITEMS; ++i) { WorkItem* item = static_cast(large_queue.Get()); GPR_ASSERT(i == item->index); - grpc_core::Delete(item); + delete item; } } @@ -125,7 +125,7 @@ static void test_space_efficiency(void) { gpr_log(GPR_INFO, "test_space_efficiency"); grpc_core::InfLenFIFOQueue queue; for (int i = 0; i < queue.init_num_nodes(); ++i) { - queue.Put(static_cast(grpc_core::New(i))); + queue.Put(static_cast(new WorkItem(i))); } // Queue should not have been expanded at this time. GPR_ASSERT(queue.num_nodes() == queue.init_num_nodes()); @@ -136,34 +136,34 @@ static void test_space_efficiency(void) { GPR_ASSERT(queue.num_nodes() == queue.init_num_nodes()); for (int i = 0; i < queue.init_num_nodes(); ++i) { WorkItem* item = static_cast(queue.Get()); - grpc_core::Delete(item); + delete item; } // Queue never shrinks even it is empty. GPR_ASSERT(queue.num_nodes() == queue.init_num_nodes()); GPR_ASSERT(queue.count() == 0); // queue empty now for (int i = 0; i < queue.init_num_nodes() * 2; ++i) { - queue.Put(static_cast(grpc_core::New(i))); + queue.Put(static_cast(new WorkItem(i))); } GPR_ASSERT(queue.count() == queue.init_num_nodes() * 2); // Queue should have been expanded once. GPR_ASSERT(queue.num_nodes() == queue.init_num_nodes() * 2); for (int i = 0; i < queue.init_num_nodes(); ++i) { WorkItem* item = static_cast(queue.Get()); - grpc_core::Delete(item); + delete item; } GPR_ASSERT(queue.count() == queue.init_num_nodes()); // Queue will never shrink, should keep same number of node as before. GPR_ASSERT(queue.num_nodes() == queue.init_num_nodes() * 2); for (int i = 0; i < queue.init_num_nodes() + 1; ++i) { - queue.Put(static_cast(grpc_core::New(i))); + queue.Put(static_cast(new WorkItem(i))); } GPR_ASSERT(queue.count() == queue.init_num_nodes() * 2 + 1); // Queue should have been expanded twice. GPR_ASSERT(queue.num_nodes() == queue.init_num_nodes() * 4); for (int i = 0; i < queue.init_num_nodes() * 2 + 1; ++i) { WorkItem* item = static_cast(queue.Get()); - grpc_core::Delete(item); + delete item; } GPR_ASSERT(queue.count() == 0); GPR_ASSERT(queue.num_nodes() == queue.init_num_nodes() * 4); @@ -182,14 +182,14 @@ static void test_many_thread(void) { gpr_log(GPR_DEBUG, "Fork ProducerThreads..."); for (int i = 0; i < num_producer_threads; ++i) { - producer_threads[i] = grpc_core::New( - &queue, i * TEST_NUM_ITEMS, TEST_NUM_ITEMS); + producer_threads[i] = + new ProducerThread(&queue, i * TEST_NUM_ITEMS, TEST_NUM_ITEMS); producer_threads[i]->Start(); } gpr_log(GPR_DEBUG, "ProducerThreads Started."); gpr_log(GPR_DEBUG, "Fork ConsumerThreads..."); for (int i = 0; i < num_consumer_threads; ++i) { - consumer_threads[i] = grpc_core::New(&queue); + consumer_threads[i] = new ConsumerThread(&queue); consumer_threads[i]->Start(); } gpr_log(GPR_DEBUG, "ConsumerThreads Started."); @@ -209,11 +209,11 @@ static void test_many_thread(void) { gpr_log(GPR_DEBUG, "Checking WorkItems and Cleaning Up..."); for (int i = 0; i < num_producer_threads; ++i) { // Destructor of ProducerThread will do the check of WorkItems - grpc_core::Delete(producer_threads[i]); + delete producer_threads[i]; } gpr_free(producer_threads); for (int i = 0; i < num_consumer_threads; ++i) { - grpc_core::Delete(consumer_threads[i]); + delete consumer_threads[i]; } gpr_free(consumer_threads); gpr_log(GPR_DEBUG, "Done."); diff --git a/test/core/iomgr/threadpool_test.cc b/test/core/iomgr/threadpool_test.cc index 4edabc1d3b6..952cec34fea 100644 --- a/test/core/iomgr/threadpool_test.cc +++ b/test/core/iomgr/threadpool_test.cc @@ -27,10 +27,9 @@ static const int kThreadLargeIter = 10000; static void test_size_zero(void) { gpr_log(GPR_INFO, "test_size_zero"); - grpc_core::ThreadPool* pool_size_zero = - grpc_core::New(0); + grpc_core::ThreadPool* pool_size_zero = new grpc_core::ThreadPool(0); GPR_ASSERT(pool_size_zero->pool_capacity() == 1); - Delete(pool_size_zero); + delete pool_size_zero; } static void test_constructor_option(void) { @@ -38,10 +37,10 @@ static void test_constructor_option(void) { // Tests options grpc_core::Thread::Options options; options.set_stack_size(192 * 1024); // Random non-default value - grpc_core::ThreadPool* pool = grpc_core::New( - 0, "test_constructor_option", options); + grpc_core::ThreadPool* pool = + new grpc_core::ThreadPool(0, "test_constructor_option", options); GPR_ASSERT(pool->thread_options().stack_size() == options.stack_size()); - Delete(pool); + delete pool; } // Simple functor for testing. It will count how many times being called. @@ -69,15 +68,15 @@ class SimpleFunctorForAdd : public grpc_experimental_completion_queue_functor { static void test_add(void) { gpr_log(GPR_INFO, "test_add"); grpc_core::ThreadPool* pool = - grpc_core::New(kSmallThreadPoolSize, "test_add"); + new grpc_core::ThreadPool(kSmallThreadPoolSize, "test_add"); - SimpleFunctorForAdd* functor = grpc_core::New(); + SimpleFunctorForAdd* functor = new SimpleFunctorForAdd(); for (int i = 0; i < kThreadSmallIter; ++i) { pool->Add(functor); } - grpc_core::Delete(pool); + delete pool; GPR_ASSERT(functor->count() == kThreadSmallIter); - grpc_core::Delete(functor); + delete functor; gpr_log(GPR_DEBUG, "Done."); } @@ -111,29 +110,29 @@ class WorkThread { static void test_multi_add(void) { gpr_log(GPR_INFO, "test_multi_add"); const int num_work_thds = 10; - grpc_core::ThreadPool* pool = grpc_core::New( - kLargeThreadPoolSize, "test_multi_add"); - SimpleFunctorForAdd* functor = grpc_core::New(); + grpc_core::ThreadPool* pool = + new grpc_core::ThreadPool(kLargeThreadPoolSize, "test_multi_add"); + SimpleFunctorForAdd* functor = new SimpleFunctorForAdd(); WorkThread** work_thds = static_cast( gpr_zalloc(sizeof(WorkThread*) * num_work_thds)); gpr_log(GPR_DEBUG, "Fork threads for adding..."); for (int i = 0; i < num_work_thds; ++i) { - work_thds[i] = grpc_core::New(pool, functor, kThreadLargeIter); + work_thds[i] = new WorkThread(pool, functor, kThreadLargeIter); work_thds[i]->Start(); } // Wait for all threads finish gpr_log(GPR_DEBUG, "Waiting for all work threads finish..."); for (int i = 0; i < num_work_thds; ++i) { work_thds[i]->Join(); - grpc_core::Delete(work_thds[i]); + delete work_thds[i]; } gpr_free(work_thds); gpr_log(GPR_DEBUG, "Done."); gpr_log(GPR_DEBUG, "Waiting for all closures finish..."); // Destructor of thread pool will wait for all closures to finish - grpc_core::Delete(pool); + delete pool; GPR_ASSERT(functor->count() == kThreadLargeIter * num_work_thds); - grpc_core::Delete(functor); + delete functor; gpr_log(GPR_DEBUG, "Done."); } @@ -161,19 +160,18 @@ static void test_one_thread_FIFO(void) { gpr_log(GPR_INFO, "test_one_thread_FIFO"); int counter = 0; grpc_core::ThreadPool* pool = - grpc_core::New(1, "test_one_thread_FIFO"); + new grpc_core::ThreadPool(1, "test_one_thread_FIFO"); SimpleFunctorCheckForAdd** check_functors = static_cast( gpr_zalloc(sizeof(SimpleFunctorCheckForAdd*) * kThreadSmallIter)); for (int i = 0; i < kThreadSmallIter; ++i) { - check_functors[i] = - grpc_core::New(i + 1, &counter); + check_functors[i] = new SimpleFunctorCheckForAdd(i + 1, &counter); pool->Add(check_functors[i]); } // Destructor of pool will wait until all closures finished. - grpc_core::Delete(pool); + delete pool; for (int i = 0; i < kThreadSmallIter; ++i) { - grpc_core::Delete(check_functors[i]); + delete check_functors[i]; } gpr_free(check_functors); gpr_log(GPR_DEBUG, "Done."); diff --git a/test/core/iomgr/udp_server_test.cc b/test/core/iomgr/udp_server_test.cc index 84a93154b4f..27532035318 100644 --- a/test/core/iomgr/udp_server_test.cc +++ b/test/core/iomgr/udp_server_test.cc @@ -113,12 +113,12 @@ class TestGrpcUdpHandlerFactory : public GrpcUdpHandlerFactory { public: GrpcUdpHandler* CreateUdpHandler(grpc_fd* emfd, void* user_data) override { gpr_log(GPR_INFO, "create udp handler for fd %d", grpc_fd_wrapped_fd(emfd)); - return grpc_core::New(emfd, user_data); + return new TestGrpcUdpHandler(emfd, user_data); } void DestroyUdpHandler(GrpcUdpHandler* handler) override { gpr_log(GPR_INFO, "Destroy handler"); - grpc_core::Delete(reinterpret_cast(handler)); + delete reinterpret_cast(handler); } }; diff --git a/test/core/security/credentials_test.cc b/test/core/security/credentials_test.cc index 884f93fb255..93c66c73370 100644 --- a/test/core/security/credentials_test.cc +++ b/test/core/security/credentials_test.cc @@ -442,8 +442,7 @@ class check_channel_oauth2 final : public grpc_channel_credentials { static void test_channel_oauth2_composite_creds(void) { grpc_core::ExecCtx exec_ctx; grpc_channel_args* new_args; - grpc_channel_credentials* channel_creds = - grpc_core::New(); + grpc_channel_credentials* channel_creds = new check_channel_oauth2(); grpc_call_credentials* oauth2_creds = grpc_access_token_credentials_create("blah", nullptr); grpc_channel_credentials* channel_oauth2_creds = @@ -523,7 +522,7 @@ static void test_channel_oauth2_google_iam_composite_creds(void) { grpc_core::ExecCtx exec_ctx; grpc_channel_args* new_args; grpc_channel_credentials* channel_creds = - grpc_core::New(); + new check_channel_oauth2_google_iam(); grpc_call_credentials* oauth2_creds = grpc_access_token_credentials_create("blah", nullptr); grpc_channel_credentials* channel_oauth2_creds = diff --git a/test/core/surface/completion_queue_test.cc b/test/core/surface/completion_queue_test.cc index d53b6756772..f775cd28534 100644 --- a/test/core/surface/completion_queue_test.cc +++ b/test/core/surface/completion_queue_test.cc @@ -429,7 +429,7 @@ static void test_callback(void) { gpr_cv_signal(&cv); } gpr_mu_unlock(&mu); - grpc_core::Delete(callback); + delete callback; }; private: @@ -438,7 +438,7 @@ static void test_callback(void) { }; for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { - tags[i] = static_cast(grpc_core::New(&counter, i)); + tags[i] = static_cast(new TagCallback(&counter, i)); sumtags += i; } diff --git a/test/core/transport/connectivity_state_test.cc b/test/core/transport/connectivity_state_test.cc index 5a82bb5979a..8e5b2b4fe2e 100644 --- a/test/core/transport/connectivity_state_test.cc +++ b/test/core/transport/connectivity_state_test.cc @@ -97,7 +97,7 @@ TEST(StateTracker, SubscribeThenUnsubscribe) { bool destroyed = false; ConnectivityStateTracker tracker("xxx", GRPC_CHANNEL_IDLE); ConnectivityStateWatcherInterface* watcher = - New(&count, &state, &destroyed); + new Watcher(&count, &state, &destroyed); tracker.AddWatcher(GRPC_CHANNEL_IDLE, OrphanablePtr(watcher)); // No initial notification, since we started the watch from the @@ -117,7 +117,7 @@ TEST(StateTracker, OrphanUponShutdown) { bool destroyed = false; ConnectivityStateTracker tracker("xxx", GRPC_CHANNEL_IDLE); ConnectivityStateWatcherInterface* watcher = - New(&count, &state, &destroyed); + new Watcher(&count, &state, &destroyed); tracker.AddWatcher(GRPC_CHANNEL_IDLE, OrphanablePtr(watcher)); // No initial notification, since we started the watch from the @@ -137,7 +137,7 @@ TEST(StateTracker, AddWhenAlreadyShutdown) { bool destroyed = false; ConnectivityStateTracker tracker("xxx", GRPC_CHANNEL_SHUTDOWN); ConnectivityStateWatcherInterface* watcher = - New(&count, &state, &destroyed); + new Watcher(&count, &state, &destroyed); tracker.AddWatcher(GRPC_CHANNEL_IDLE, OrphanablePtr(watcher)); EXPECT_TRUE(destroyed); diff --git a/test/core/util/test_lb_policies.cc b/test/core/util/test_lb_policies.cc index d70bf42e1ee..fd1547f4c6a 100644 --- a/test/core/util/test_lb_policies.cc +++ b/test/core/util/test_lb_policies.cc @@ -93,7 +93,7 @@ class InterceptRecvTrailingMetadataLoadBalancingPolicy InterceptRecvTrailingMetadataLoadBalancingPolicy( Args args, InterceptRecvTrailingMetadataCallback cb, void* user_data) : ForwardingLoadBalancingPolicy( - UniquePtr(New( + UniquePtr(new Helper( RefCountedPtr( this), cb, user_data)), @@ -154,7 +154,7 @@ class InterceptRecvTrailingMetadataLoadBalancingPolicy UniquePtr picker) override { parent_->channel_control_helper()->UpdateState( state, UniquePtr( - New(std::move(picker), cb_, user_data_))); + new Picker(std::move(picker), cb_, user_data_))); } void RequestReresolution() override { @@ -241,7 +241,7 @@ void RegisterInterceptRecvTrailingMetadataLoadBalancingPolicy( InterceptRecvTrailingMetadataCallback cb, void* user_data) { LoadBalancingPolicyRegistry::Builder::RegisterLoadBalancingPolicyFactory( UniquePtr( - New(cb, user_data))); + new InterceptTrailingFactory(cb, user_data))); } } // namespace grpc_core diff --git a/test/cpp/client/credentials_test.cc b/test/cpp/client/credentials_test.cc index 160a7a36566..af4c8532ef9 100644 --- a/test/cpp/client/credentials_test.cc +++ b/test/cpp/client/credentials_test.cc @@ -332,8 +332,7 @@ TEST_F(CredentialsTest, TlsCredentialReloadConfigSchedule) { new TestTlsCredentialReload()); std::shared_ptr config( new TlsCredentialReloadConfig(test_credential_reload)); - grpc_tls_credential_reload_arg* c_arg = - grpc_core::New(); + grpc_tls_credential_reload_arg* c_arg = new grpc_tls_credential_reload_arg(); c_arg->context = nullptr; TlsCredentialReloadArg* arg = new TlsCredentialReloadArg(c_arg); std::shared_ptr key_materials_config( @@ -368,7 +367,7 @@ TEST_F(CredentialsTest, TlsCredentialReloadConfigSchedule) { // Cleanup. gpr_free(const_cast(error_details_before_schedule)); - grpc_core::Delete(c_arg->key_materials_config); + delete c_arg->key_materials_config; if (c_arg->destroy_context != nullptr) { c_arg->destroy_context(c_arg->context); } @@ -424,7 +423,7 @@ TEST_F(CredentialsTest, TlsCredentialReloadConfigCppToC) { // Cleanup. c_arg.destroy_context(c_arg.context); - ::grpc_core::Delete(config.c_config()); + ::delete config.c_config(); } typedef class ::grpc_impl::experimental::TlsServerAuthorizationCheckArg @@ -474,7 +473,7 @@ TEST_F(CredentialsTest, TlsServerAuthorizationCheckConfigSchedule) { test_server_authorization_check(new TestTlsServerAuthorizationCheck()); TlsServerAuthorizationCheckConfig config(test_server_authorization_check); grpc_tls_server_authorization_check_arg* c_arg = - grpc_core::New(); + new grpc_tls_server_authorization_check_arg(); c_arg->context = nullptr; TlsServerAuthorizationCheckArg* arg = new TlsServerAuthorizationCheckArg(c_arg); @@ -641,7 +640,7 @@ TEST_F(CredentialsTest, TlsCredentialsOptionsCppToC) { "sync_error_details"); // Cleanup. - ::grpc_core::Delete(c_credential_reload_arg.key_materials_config); + ::delete c_credential_reload_arg.key_materials_config; c_credential_reload_arg.destroy_context(c_credential_reload_arg.context); c_server_authorization_check_arg.destroy_context( c_server_authorization_check_arg.context); @@ -649,8 +648,8 @@ TEST_F(CredentialsTest, TlsCredentialsOptionsCppToC) { gpr_free(const_cast(c_server_authorization_check_arg.target_name)); gpr_free(const_cast(c_server_authorization_check_arg.peer_cert)); gpr_free(const_cast(c_server_authorization_check_arg.error_details)); - ::grpc_core::Delete(c_credential_reload_config); - ::grpc_core::Delete(c_server_authorization_check_config); + ::delete c_credential_reload_config; + ::delete c_server_authorization_check_config; gpr_free(c_options); } diff --git a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc index 8deceb45162..9bafcf1dcd3 100644 --- a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc +++ b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc @@ -440,7 +440,7 @@ static void BM_HpackParserInitDestroy(benchmark::State& state) { grpc_chttp2_hpack_parser_init(&p); // Note that grpc_chttp2_hpack_parser_destroy frees the table dynamic // elements so we need to recreate it here. In actual operation, - // grpc_core::New allocates the table once + // new grpc_chttp2_hpack_parser_destroy allocates the table once // and for all. new (&p.table) grpc_chttp2_hptbl(); grpc_chttp2_hpack_parser_destroy(&p); diff --git a/test/cpp/microbenchmarks/bm_threadpool.cc b/test/cpp/microbenchmarks/bm_threadpool.cc index 792b57cf3cb..9f813fa972c 100644 --- a/test/cpp/microbenchmarks/bm_threadpool.cc +++ b/test/cpp/microbenchmarks/bm_threadpool.cc @@ -151,7 +151,7 @@ static void BM_ThreadPoolExternalAdd(benchmark::State& state) { // Setup for each run of test. if (state.thread_index == 0) { const int num_threads = state.range(1); - external_add_pool = grpc_core::New(num_threads); + external_add_pool = new grpc_core::ThreadPool(num_threads); } const int num_iterations = state.range(0) / state.threads; while (state.KeepRunningBatch(num_iterations)) { @@ -165,7 +165,7 @@ static void BM_ThreadPoolExternalAdd(benchmark::State& state) { // Teardown at the end of each test run. if (state.thread_index == 0) { state.SetItemsProcessed(state.range(0)); - grpc_core::Delete(external_add_pool); + delete external_add_pool; } } BENCHMARK(BM_ThreadPoolExternalAdd) diff --git a/test/cpp/naming/cancel_ares_query_test.cc b/test/cpp/naming/cancel_ares_query_test.cc index 86408fb49fc..e53c57ed261 100644 --- a/test/cpp/naming/cancel_ares_query_test.cc +++ b/test/cpp/naming/cancel_ares_query_test.cc @@ -165,7 +165,7 @@ void TestCancelActiveDNSQuery(ArgsStruct* args) { grpc_core::ResolverRegistry::CreateResolver( client_target, nullptr, args->pollset_set, args->lock, grpc_core::UniquePtr( - grpc_core::New(args))); + new AssertFailureResultHandler(args))); gpr_free(client_target); resolver->StartLocked(); // Without resetting and causing resolver shutdown, the diff --git a/test/cpp/naming/resolver_component_test.cc b/test/cpp/naming/resolver_component_test.cc index ac170e4a99a..d14caa996da 100644 --- a/test/cpp/naming/resolver_component_test.cc +++ b/test/cpp/naming/resolver_component_test.cc @@ -423,7 +423,7 @@ class ResultHandler : public grpc_core::Resolver::ResultHandler { static grpc_core::UniquePtr Create( ArgsStruct* args) { return grpc_core::UniquePtr( - grpc_core::New(args)); + new ResultHandler(args)); } explicit ResultHandler(ArgsStruct* args) : args_(args) {} @@ -456,7 +456,7 @@ class CheckingResultHandler : public ResultHandler { static grpc_core::UniquePtr Create( ArgsStruct* args) { return grpc_core::UniquePtr( - grpc_core::New(args)); + new CheckingResultHandler(args)); } explicit CheckingResultHandler(ArgsStruct* args) : ResultHandler(args) {} @@ -559,7 +559,7 @@ void RunResolvesRelevantRecordsTest( if (FLAGS_inject_broken_nameserver_list == "True") { g_fake_non_responsive_dns_server_port = grpc_pick_unused_port_or_die(); fake_non_responsive_dns_server.reset( - grpc_core::New( + new grpc::testing::FakeNonResponsiveDNSServer( g_fake_non_responsive_dns_server_port)); grpc_ares_test_only_inject_config = InjectBrokenNameServerList; GPR_ASSERT( diff --git a/tools/codegen/core/gen_static_metadata.py b/tools/codegen/core/gen_static_metadata.py index b83d13f9f3d..e8ce31bd07f 100755 --- a/tools/codegen/core/gen_static_metadata.py +++ b/tools/codegen/core/gen_static_metadata.py @@ -526,7 +526,7 @@ uint64_t StaticMetadataInitCanary() { void grpc_init_static_metadata_ctx(void) { grpc_core::g_static_metadata_slice_ctx - = grpc_core::New(); + = new grpc_core::StaticMetadataCtx(); grpc_core::g_static_metadata_slice_table = grpc_core::g_static_metadata_slice_ctx->slices; grpc_core::g_static_metadata_slice_refcounts @@ -538,8 +538,7 @@ void grpc_init_static_metadata_ctx(void) { } void grpc_destroy_static_metadata_ctx(void) { - grpc_core::Delete( - grpc_core::g_static_metadata_slice_ctx); + delete grpc_core::g_static_metadata_slice_ctx; grpc_core::g_static_metadata_slice_ctx = nullptr; grpc_core::g_static_metadata_slice_table = nullptr; grpc_core::g_static_metadata_slice_refcounts = nullptr; diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json index 263a382bbc8..e6bd18bcfdb 100644 --- a/tools/run_tests/generated/tests.json +++ b/tools/run_tests/generated/tests.json @@ -5019,30 +5019,6 @@ ], "uses_polling": true }, - { - "args": [], - "benchmark": false, - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "cpu_cost": 1.0, - "exclude_configs": [], - "exclude_iomgrs": [], - "flaky": false, - "gtest": true, - "language": "c++", - "name": "memory_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "uses_polling": false - }, { "args": [], "benchmark": false, From 3d3577e28d1d5fd0fe4b42883236b0eed872ec4b Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Wed, 6 Nov 2019 16:45:13 -0800 Subject: [PATCH 128/133] Update by review --- src/core/lib/gprpp/memory.h | 12 ------------ src/core/lib/gprpp/orphanable.h | 4 ++-- src/core/lib/gprpp/ref_counted.h | 4 ++-- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/core/lib/gprpp/memory.h b/src/core/lib/gprpp/memory.h index adbd0035bc4..97c26b4093e 100644 --- a/src/core/lib/gprpp/memory.h +++ b/src/core/lib/gprpp/memory.h @@ -30,18 +30,6 @@ namespace grpc_core { -// Gets the base pointer of any class, in case of multiple inheritance. -// Used by Delete and friends. -template -struct BasePointerGetter { - static void* get(T* p) { return p; } -}; - -template -struct BasePointerGetter { - static void* get(T* p) { return dynamic_cast(p); } -}; - template using UniquePtr = std::unique_ptr; diff --git a/src/core/lib/gprpp/orphanable.h b/src/core/lib/gprpp/orphanable.h index c3bd9e1eb71..79542de6dd1 100644 --- a/src/core/lib/gprpp/orphanable.h +++ b/src/core/lib/gprpp/orphanable.h @@ -106,12 +106,12 @@ class InternallyRefCounted : public Orphanable { void Unref() { if (GPR_UNLIKELY(refs_.Unref())) { - delete static_cast(this); + delete this; } } void Unref(const DebugLocation& location, const char* reason) { if (GPR_UNLIKELY(refs_.Unref(location, reason))) { - delete static_cast(this); + delete this; } } diff --git a/src/core/lib/gprpp/ref_counted.h b/src/core/lib/gprpp/ref_counted.h index 44070e58bf1..c2cf0873b09 100644 --- a/src/core/lib/gprpp/ref_counted.h +++ b/src/core/lib/gprpp/ref_counted.h @@ -267,12 +267,12 @@ class RefCounted : public Impl { // friend of this class. void Unref() { if (GPR_UNLIKELY(refs_.Unref())) { - delete static_cast(this); + delete this; } } void Unref(const DebugLocation& location, const char* reason) { if (GPR_UNLIKELY(refs_.Unref(location, reason))) { - delete static_cast(this); + delete this; } } From d287745c77d33215f6e755192ddae7fc73f17431 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Wed, 6 Nov 2019 20:25:40 -0800 Subject: [PATCH 129/133] Fix test --- src/core/lib/gprpp/ref_counted.h | 4 ++-- src/objective-c/tests/CronetTests/CoreCronetEnd2EndTests.mm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/lib/gprpp/ref_counted.h b/src/core/lib/gprpp/ref_counted.h index c2cf0873b09..44070e58bf1 100644 --- a/src/core/lib/gprpp/ref_counted.h +++ b/src/core/lib/gprpp/ref_counted.h @@ -267,12 +267,12 @@ class RefCounted : public Impl { // friend of this class. void Unref() { if (GPR_UNLIKELY(refs_.Unref())) { - delete this; + delete static_cast(this); } } void Unref(const DebugLocation& location, const char* reason) { if (GPR_UNLIKELY(refs_.Unref(location, reason))) { - delete this; + delete static_cast(this); } } diff --git a/src/objective-c/tests/CronetTests/CoreCronetEnd2EndTests.mm b/src/objective-c/tests/CronetTests/CoreCronetEnd2EndTests.mm index 32db8da9fb4..f2715af6c98 100644 --- a/src/objective-c/tests/CronetTests/CoreCronetEnd2EndTests.mm +++ b/src/objective-c/tests/CronetTests/CoreCronetEnd2EndTests.mm @@ -103,7 +103,7 @@ static void chttp2_init_server_secure_fullstack(grpc_end2end_test_fixture *f, static void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture *f) { fullstack_secure_fixture_data *ffd = (fullstack_secure_fixture_data *)f->fixture_data; - grpc_core::Delete(ffd); + delete ffd; } static void cronet_init_client_simple_ssl_secure_fullstack(grpc_end2end_test_fixture *f, From 3928a20bdf2ef06bbb351862858ce3e0f53018e3 Mon Sep 17 00:00:00 2001 From: Vijay Pai Date: Thu, 7 Nov 2019 01:28:34 -0800 Subject: [PATCH 130/133] Fix outdated thread invocation that now causes Windows breakage --- test/cpp/end2end/async_end2end_test.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/cpp/end2end/async_end2end_test.cc b/test/cpp/end2end/async_end2end_test.cc index eae0ad0d540..659076fe5dc 100644 --- a/test/cpp/end2end/async_end2end_test.cc +++ b/test/cpp/end2end/async_end2end_test.cc @@ -1378,7 +1378,7 @@ class AsyncEnd2endServerTryCancelTest : public AsyncEnd2endTest { if (server_try_cancel == CANCEL_DURING_PROCESSING) { server_try_cancel_thd = - new std::thread(&ServerContext::TryCancel, &srv_ctx); + new std::thread([&srv_ctx] { srv_ctx.TryCancel(); }); // Server will cancel the RPC in a parallel thread while reading the // requests from the client. Since the cancellation can happen at anytime, // some of the cq results (i.e those until cancellation) might be true but @@ -1526,7 +1526,7 @@ class AsyncEnd2endServerTryCancelTest : public AsyncEnd2endTest { if (server_try_cancel == CANCEL_DURING_PROCESSING) { server_try_cancel_thd = - new std::thread(&ServerContext::TryCancel, &srv_ctx); + new std::thread([&srv_ctx] { srv_ctx.TryCancel(); }); // Server will cancel the RPC in a parallel thread while writing responses // to the client. Since the cancellation can happen at anytime, some of @@ -1673,7 +1673,7 @@ class AsyncEnd2endServerTryCancelTest : public AsyncEnd2endTest { if (server_try_cancel == CANCEL_DURING_PROCESSING) { server_try_cancel_thd = - new std::thread(&ServerContext::TryCancel, &srv_ctx); + new std::thread([&srv_ctx] { srv_ctx.TryCancel(); }); // Since server is going to cancel the RPC in a parallel thread, some of // the cq results (i.e those until the cancellation) might be true. Since From 300252a857d12887f6ea80fcbdbead7774c0e21e Mon Sep 17 00:00:00 2001 From: Vijay Pai Date: Thu, 7 Nov 2019 02:35:04 -0800 Subject: [PATCH 131/133] Constify parameter struct since all fields set at construction Improve readability --- include/grpcpp/impl/codegen/rpc_service_method.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/grpcpp/impl/codegen/rpc_service_method.h b/include/grpcpp/impl/codegen/rpc_service_method.h index fb4c32659fc..ad48e2071ca 100644 --- a/include/grpcpp/impl/codegen/rpc_service_method.h +++ b/include/grpcpp/impl/codegen/rpc_service_method.h @@ -62,12 +62,12 @@ class MethodHandler { internal_data(handler_data), call_requester(std::move(requester)) {} ~HandlerParameter() {} - Call* call; - ::grpc_impl::ServerContext* server_context; - void* request; - Status status; - void* internal_data; - std::function call_requester; + Call* const call; + ::grpc_impl::ServerContext* const server_context; + void* const request; + const Status status; + void* const internal_data; + const std::function call_requester; }; virtual void RunHandler(const HandlerParameter& param) = 0; From 5a5734ff0314b209e18eba5fda6ee92d6b650e56 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Wed, 6 Nov 2019 21:10:49 -0800 Subject: [PATCH 132/133] Use std::string for channelz --- .../client_channel/client_channel_channelz.cc | 14 +++---- .../client_channel/client_channel_channelz.h | 6 ++- .../transport/chttp2/server/chttp2_server.cc | 6 ++- .../chttp2/transport/chttp2_transport.cc | 7 ++-- src/core/lib/channel/channelz.cc | 41 +++++++++---------- src/core/lib/channel/channelz.h | 25 +++++------ src/core/lib/gprpp/string_view.h | 10 +++++ src/core/lib/surface/channel.cc | 6 +-- test/core/channel/channel_trace_test.cc | 20 ++++----- test/core/channel/channelz_registry_test.cc | 3 +- 10 files changed, 76 insertions(+), 62 deletions(-) diff --git a/src/core/ext/filters/client_channel/client_channel_channelz.cc b/src/core/ext/filters/client_channel/client_channel_channelz.cc index a47766031a3..bc9bbe59219 100644 --- a/src/core/ext/filters/client_channel/client_channel_channelz.cc +++ b/src/core/ext/filters/client_channel/client_channel_channelz.cc @@ -30,11 +30,10 @@ namespace grpc_core { namespace channelz { -SubchannelNode::SubchannelNode(const char* target_address, +SubchannelNode::SubchannelNode(std::string target_address, size_t channel_tracer_max_nodes) - : BaseNode(EntityType::kSubchannel, - UniquePtr(gpr_strdup(target_address))), - target_(UniquePtr(gpr_strdup(target_address))), + : BaseNode(EntityType::kSubchannel, target_address), + target_(std::move(target_address)), trace_(channel_tracer_max_nodes) {} SubchannelNode::~SubchannelNode() {} @@ -76,8 +75,8 @@ grpc_json* SubchannelNode::RenderJson() { json = data; json_iterator = nullptr; PopulateConnectivityState(json); - GPR_ASSERT(target_.get() != nullptr); - grpc_json_create_child(nullptr, json, "target", target_.get(), + GPR_ASSERT(!target_.empty()); + grpc_json_create_child(nullptr, json, "target", target_.c_str(), GRPC_JSON_STRING, false); // fill in the channel trace if applicable grpc_json* trace_json = trace_.RenderJson(); @@ -102,7 +101,8 @@ grpc_json* SubchannelNode::RenderJson() { grpc_json* sibling_iterator = grpc_json_add_number_string_child( json_iterator, nullptr, "socketId", child_socket->uuid()); grpc_json_create_child(sibling_iterator, json_iterator, "name", - child_socket->name(), GRPC_JSON_STRING, false); + child_socket->name().c_str(), GRPC_JSON_STRING, + false); } return top_level_json; } diff --git a/src/core/ext/filters/client_channel/client_channel_channelz.h b/src/core/ext/filters/client_channel/client_channel_channelz.h index 5a1a1adcd1b..270aa543dfc 100644 --- a/src/core/ext/filters/client_channel/client_channel_channelz.h +++ b/src/core/ext/filters/client_channel/client_channel_channelz.h @@ -21,6 +21,8 @@ #include +#include + #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_trace.h" @@ -34,7 +36,7 @@ namespace channelz { class SubchannelNode : public BaseNode { public: - SubchannelNode(const char* target_address, size_t channel_tracer_max_nodes); + SubchannelNode(std::string target_address, size_t channel_tracer_max_nodes); ~SubchannelNode() override; // Sets the subchannel's connectivity state without health checking. @@ -67,7 +69,7 @@ class SubchannelNode : public BaseNode { Atomic connectivity_state_{GRPC_CHANNEL_IDLE}; Mutex socket_mu_; RefCountedPtr child_socket_; - UniquePtr target_; + std::string target_; CallCountingHelper call_counter_; ChannelTrace trace_; }; diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc index f37551fce2d..d7e15959b23 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.cc +++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc @@ -417,8 +417,10 @@ grpc_error* grpc_chttp2_server_add_port(grpc_server* server, const char* addr, gpr_asprintf(&socket_name, "chttp2 listener %s", addr); state->channelz_listen_socket = grpc_core::MakeRefCounted( - grpc_core::UniquePtr(gpr_strdup(addr)), - grpc_core::UniquePtr(socket_name)); + addr, socket_name); + // TODO(veblush): Remove this once gpr_asprintf is replaced by + // absl::StrFormat + gpr_free(socket_name); } /* Register with the server only upon success */ diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc index e0aa8e5d9c8..db68eda7484 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc @@ -382,9 +382,10 @@ static bool read_channel_args(grpc_chttp2_transport* t, gpr_asprintf(&socket_name, "%s %s", get_vtable()->name, t->peer_string); t->channelz_socket = grpc_core::MakeRefCounted( - grpc_core::UniquePtr(), - grpc_core::UniquePtr(gpr_strdup(t->peer_string)), - grpc_core::UniquePtr(socket_name)); + "", t->peer_string, socket_name); + // TODO(veblush): Remove this once gpr_asprintf is replaced by + // absl::StrFormat + gpr_free(socket_name); } return enable_bdp; } diff --git a/src/core/lib/channel/channelz.cc b/src/core/lib/channel/channelz.cc index 6300c230d4e..f5d06c78a80 100644 --- a/src/core/lib/channel/channelz.cc +++ b/src/core/lib/channel/channelz.cc @@ -85,7 +85,7 @@ intptr_t GetParentUuidFromArgs(const grpc_channel_args& args) { // BaseNode // -BaseNode::BaseNode(EntityType type, UniquePtr name) +BaseNode::BaseNode(EntityType type, std::string name) : type_(type), uuid_(-1), name_(std::move(name)) { // The registry will set uuid_ under its lock. ChannelzRegistry::Register(this); @@ -180,11 +180,11 @@ void CallCountingHelper::PopulateCallCounts(grpc_json* json) { // ChannelNode // -ChannelNode::ChannelNode(UniquePtr target, - size_t channel_tracer_max_nodes, intptr_t parent_uuid) +ChannelNode::ChannelNode(std::string target, size_t channel_tracer_max_nodes, + intptr_t parent_uuid) : BaseNode(parent_uuid == 0 ? EntityType::kTopLevelChannel : EntityType::kInternalChannel, - UniquePtr(gpr_strdup(target.get()))), + target), target_(std::move(target)), trace_(channel_tracer_max_nodes), parent_uuid_(parent_uuid) {} @@ -239,8 +239,8 @@ grpc_json* ChannelNode::RenderJson() { json = data; } // populate the target. - GPR_ASSERT(target_.get() != nullptr); - grpc_json_create_child(nullptr, json, "target", target_.get(), + GPR_ASSERT(!target_.empty()); + grpc_json_create_child(nullptr, json, "target", target_.c_str(), GRPC_JSON_STRING, false); // fill in the channel trace if applicable grpc_json* trace_json = trace_.RenderJson(); @@ -316,8 +316,7 @@ void ChannelNode::RemoveChildSubchannel(intptr_t child_uuid) { // ServerNode::ServerNode(grpc_server* /*server*/, size_t channel_tracer_max_nodes) - : BaseNode(EntityType::kServer, /* name */ nullptr), - trace_(channel_tracer_max_nodes) {} + : BaseNode(EntityType::kServer, ""), trace_(channel_tracer_max_nodes) {} ServerNode::~ServerNode() {} @@ -363,7 +362,8 @@ char* ServerNode::RenderServerSockets(intptr_t start_socket_id, json_iterator = grpc_json_add_number_string_child( socket_ref_json, nullptr, "socketId", it->first); grpc_json_create_child(json_iterator, socket_ref_json, "name", - it->second->name(), GRPC_JSON_STRING, false); + it->second->name().c_str(), GRPC_JSON_STRING, + false); } } if (sockets_rendered == child_sockets_.size()) { @@ -416,7 +416,8 @@ grpc_json* ServerNode::RenderJson() { grpc_json* sibling_iterator = grpc_json_add_number_string_child( json_iterator, nullptr, "socketId", it.first); grpc_json_create_child(sibling_iterator, json_iterator, "name", - it.second->name(), GRPC_JSON_STRING, false); + it.second->name().c_str(), GRPC_JSON_STRING, + false); } } return top_level_json; @@ -479,8 +480,7 @@ void PopulateSocketAddressJson(grpc_json* json, const char* name, } // namespace -SocketNode::SocketNode(UniquePtr local, UniquePtr remote, - UniquePtr name) +SocketNode::SocketNode(std::string local, std::string remote, std::string name) : BaseNode(EntityType::kSocket, std::move(name)), local_(std::move(local)), remote_(std::move(remote)) {} @@ -520,11 +520,11 @@ grpc_json* SocketNode::RenderJson() { json_iterator = nullptr; json_iterator = grpc_json_add_number_string_child(json, json_iterator, "socketId", uuid()); - json_iterator = grpc_json_create_child(json_iterator, json, "name", name(), - GRPC_JSON_STRING, false); + json_iterator = grpc_json_create_child( + json_iterator, json, "name", name().c_str(), GRPC_JSON_STRING, false); json = top_level_json; - PopulateSocketAddressJson(json, "remote", remote_.get()); - PopulateSocketAddressJson(json, "local", local_.get()); + PopulateSocketAddressJson(json, "remote", remote_.c_str()); + PopulateSocketAddressJson(json, "local", local_.c_str()); // reset json iterators to top level object json = top_level_json; json_iterator = nullptr; @@ -605,8 +605,7 @@ grpc_json* SocketNode::RenderJson() { // ListenSocketNode // -ListenSocketNode::ListenSocketNode(UniquePtr local_addr, - UniquePtr name) +ListenSocketNode::ListenSocketNode(std::string local_addr, std::string name) : BaseNode(EntityType::kSocket, std::move(name)), local_addr_(std::move(local_addr)) {} @@ -622,10 +621,10 @@ grpc_json* ListenSocketNode::RenderJson() { json_iterator = nullptr; json_iterator = grpc_json_add_number_string_child(json, json_iterator, "socketId", uuid()); - json_iterator = grpc_json_create_child(json_iterator, json, "name", name(), - GRPC_JSON_STRING, false); + json_iterator = grpc_json_create_child( + json_iterator, json, "name", name().c_str(), GRPC_JSON_STRING, false); json = top_level_json; - PopulateSocketAddressJson(json, "local", local_addr_.get()); + PopulateSocketAddressJson(json, "local", local_addr_.c_str()); return top_level_json; } diff --git a/src/core/lib/channel/channelz.h b/src/core/lib/channel/channelz.h index 5a063b4df96..8702cbe9e95 100644 --- a/src/core/lib/channel/channelz.h +++ b/src/core/lib/channel/channelz.h @@ -23,6 +23,8 @@ #include +#include + #include "src/core/lib/channel/channel_trace.h" #include "src/core/lib/gpr/time_precise.h" #include "src/core/lib/gprpp/inlined_vector.h" @@ -82,7 +84,7 @@ class BaseNode : public RefCounted { }; protected: - BaseNode(EntityType type, UniquePtr name); + BaseNode(EntityType type, std::string name); public: virtual ~BaseNode(); @@ -96,14 +98,14 @@ class BaseNode : public RefCounted { EntityType type() const { return type_; } intptr_t uuid() const { return uuid_; } - const char* name() const { return name_.get(); } + const std::string& name() const { return name_; } private: // to allow the ChannelzRegistry to set uuid_ under its lock. friend class ChannelzRegistry; const EntityType type_; intptr_t uuid_; - UniquePtr name_; + std::string name_; }; // This class is a helper class for channelz entities that deal with Channels, @@ -165,7 +167,7 @@ class CallCountingHelper { // Handles channelz bookkeeping for channels class ChannelNode : public BaseNode { public: - ChannelNode(UniquePtr target, size_t channel_tracer_max_nodes, + ChannelNode(std::string target, size_t channel_tracer_max_nodes, intptr_t parent_uuid); // Returns the string description of the given connectivity state. @@ -208,7 +210,7 @@ class ChannelNode : public BaseNode { // to allow the channel trace test to access trace_. friend class testing::ChannelNodePeer; - UniquePtr target_; + std::string target_; CallCountingHelper call_counter_; ChannelTrace trace_; const intptr_t parent_uuid_; @@ -269,8 +271,7 @@ class ServerNode : public BaseNode { // Handles channelz bookkeeping for sockets class SocketNode : public BaseNode { public: - SocketNode(UniquePtr local, UniquePtr remote, - UniquePtr name); + SocketNode(std::string local, std::string remote, std::string name); ~SocketNode() override {} grpc_json* RenderJson() override; @@ -289,7 +290,7 @@ class SocketNode : public BaseNode { gpr_atm_no_barrier_fetch_add(&keepalives_sent_, static_cast(1)); } - const char* remote() { return remote_.get(); } + const std::string& remote() { return remote_; } private: gpr_atm streams_started_ = 0; @@ -302,20 +303,20 @@ class SocketNode : public BaseNode { gpr_atm last_remote_stream_created_cycle_ = 0; gpr_atm last_message_sent_cycle_ = 0; gpr_atm last_message_received_cycle_ = 0; - UniquePtr local_; - UniquePtr remote_; + std::string local_; + std::string remote_; }; // Handles channelz bookkeeping for listen sockets class ListenSocketNode : public BaseNode { public: - ListenSocketNode(UniquePtr local_addr, UniquePtr name); + ListenSocketNode(std::string local_addr, std::string name); ~ListenSocketNode() override {} grpc_json* RenderJson() override; private: - UniquePtr local_addr_; + std::string local_addr_; }; } // namespace channelz diff --git a/src/core/lib/gprpp/string_view.h b/src/core/lib/gprpp/string_view.h index 7823b930709..e2e082e3ea5 100644 --- a/src/core/lib/gprpp/string_view.h +++ b/src/core/lib/gprpp/string_view.h @@ -28,6 +28,7 @@ #include #include #include +#include #include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" @@ -111,6 +112,15 @@ class StringView final { size_ = 0; } + // Converts to `std::basic_string`. + template + explicit operator std::basic_string, Allocator>() + const { + if (data() == nullptr) return {}; + return std::basic_string, Allocator>(data(), + size()); + } + private: const char* ptr_; size_t size_; diff --git a/src/core/lib/surface/channel.cc b/src/core/lib/surface/channel.cc index afc4042a2ba..9f5abca9c47 100644 --- a/src/core/lib/surface/channel.cc +++ b/src/core/lib/surface/channel.cc @@ -202,11 +202,11 @@ void CreateChannelzNode(grpc_channel_stack_builder* builder) { const intptr_t channelz_parent_uuid = grpc_core::channelz::GetParentUuidFromArgs(*args); // Create the channelz node. + const char* target = grpc_channel_stack_builder_get_target(builder); grpc_core::RefCountedPtr channelz_node = grpc_core::MakeRefCounted( - grpc_core::UniquePtr( - gpr_strdup(grpc_channel_stack_builder_get_target(builder))), - channel_tracer_max_memory, channelz_parent_uuid); + target != nullptr ? target : "", channel_tracer_max_memory, + channelz_parent_uuid); channelz_node->AddTraceEvent( grpc_core::channelz::ChannelTrace::Severity::Info, grpc_slice_from_static_string("Channel created")); diff --git a/test/core/channel/channel_trace_test.cc b/test/core/channel/channel_trace_test.cc index 5ac7f0871a4..a957dca0f97 100644 --- a/test/core/channel/channel_trace_test.cc +++ b/test/core/channel/channel_trace_test.cc @@ -174,8 +174,8 @@ TEST(ChannelTracerTest, ComplexTest) { AddSimpleTrace(&tracer); AddSimpleTrace(&tracer); ChannelFixture channel1(kEventListMemoryLimit); - RefCountedPtr sc1 = MakeRefCounted( - UniquePtr(gpr_strdup("fake_target")), kEventListMemoryLimit, 0); + RefCountedPtr sc1 = + MakeRefCounted("fake_target", kEventListMemoryLimit, 0); ChannelNodePeer sc1_peer(sc1.get()); tracer.AddTraceEventWithReference( ChannelTrace::Severity::Info, @@ -193,8 +193,8 @@ TEST(ChannelTracerTest, ComplexTest) { AddSimpleTrace(&tracer); ValidateChannelTrace(&tracer, 5); ChannelFixture channel2(kEventListMemoryLimit); - RefCountedPtr sc2 = MakeRefCounted( - UniquePtr(gpr_strdup("fake_target")), kEventListMemoryLimit, 0); + RefCountedPtr sc2 = + MakeRefCounted("fake_target", kEventListMemoryLimit, 0); tracer.AddTraceEventWithReference( ChannelTrace::Severity::Info, grpc_slice_from_static_string("LB channel two created"), sc2); @@ -222,8 +222,8 @@ TEST(ChannelTracerTest, TestNesting) { AddSimpleTrace(&tracer); ValidateChannelTrace(&tracer, 2); ChannelFixture channel1(kEventListMemoryLimit); - RefCountedPtr sc1 = MakeRefCounted( - UniquePtr(gpr_strdup("fake_target")), kEventListMemoryLimit, 0); + RefCountedPtr sc1 = + MakeRefCounted("fake_target", kEventListMemoryLimit, 0); ChannelNodePeer sc1_peer(sc1.get()); tracer.AddTraceEventWithReference( ChannelTrace::Severity::Info, @@ -231,8 +231,8 @@ TEST(ChannelTracerTest, TestNesting) { ValidateChannelTrace(&tracer, 3); AddSimpleTrace(sc1_peer.trace()); ChannelFixture channel2(kEventListMemoryLimit); - RefCountedPtr conn1 = MakeRefCounted( - UniquePtr(gpr_strdup("fake_target")), kEventListMemoryLimit, 0); + RefCountedPtr conn1 = + MakeRefCounted("fake_target", kEventListMemoryLimit, 0); ChannelNodePeer conn1_peer(conn1.get()); // nesting one level deeper. sc1_peer.trace()->AddTraceEventWithReference( @@ -245,8 +245,8 @@ TEST(ChannelTracerTest, TestNesting) { ValidateChannelTrace(&tracer, 5); ValidateChannelTrace(conn1_peer.trace(), 1); ChannelFixture channel3(kEventListMemoryLimit); - RefCountedPtr sc2 = MakeRefCounted( - UniquePtr(gpr_strdup("fake_target")), kEventListMemoryLimit, 0); + RefCountedPtr sc2 = + MakeRefCounted("fake_target", kEventListMemoryLimit, 0); tracer.AddTraceEventWithReference( ChannelTrace::Severity::Info, grpc_slice_from_static_string("subchannel two created"), sc2); diff --git a/test/core/channel/channelz_registry_test.cc b/test/core/channel/channelz_registry_test.cc index 39d3b1d5eeb..eca7f20ead6 100644 --- a/test/core/channel/channelz_registry_test.cc +++ b/test/core/channel/channelz_registry_test.cc @@ -52,8 +52,7 @@ class ChannelzRegistryTest : public ::testing::Test { }; static RefCountedPtr CreateTestNode() { - return MakeRefCounted(UniquePtr(gpr_strdup("test")), - UniquePtr(gpr_strdup("test"))); + return MakeRefCounted("test", "test"); } TEST_F(ChannelzRegistryTest, UuidStartsAboveZeroTest) { From b2b7fc9af8fd0ad8e81f6e7c8818e839a3eb1db6 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Thu, 7 Nov 2019 10:02:22 -0800 Subject: [PATCH 133/133] Replaced grpc_core::UniquePtr with std::unique_ptr --- .../filters/client_channel/client_channel.cc | 52 +++++++-------- .../health/health_check_client.cc | 2 +- .../ext/filters/client_channel/http_proxy.cc | 4 +- .../ext/filters/client_channel/lb_policy.h | 6 +- .../client_channel/lb_policy/grpclb/grpclb.cc | 18 +++--- .../lb_policy/grpclb/grpclb_channel_secure.cc | 4 +- .../lb_policy/grpclb/grpclb_client_stats.cc | 4 +- .../lb_policy/grpclb/grpclb_client_stats.h | 8 +-- .../lb_policy/grpclb/load_balancer_api.cc | 2 +- .../lb_policy/subchannel_list.h | 2 +- .../client_channel/lb_policy/xds/cds.cc | 12 ++-- .../client_channel/lb_policy/xds/xds.cc | 37 +++++------ .../client_channel/lb_policy_registry.cc | 6 +- .../client_channel/lb_policy_registry.h | 2 +- .../filters/client_channel/parse_address.cc | 8 +-- .../ext/filters/client_channel/resolver.cc | 3 +- .../ext/filters/client_channel/resolver.h | 4 +- .../resolver/dns/c_ares/dns_resolver_ares.cc | 5 +- .../dns/c_ares/grpc_ares_ev_driver.cc | 2 +- .../resolver/dns/c_ares/grpc_ares_ev_driver.h | 2 +- .../dns/c_ares/grpc_ares_ev_driver_libuv.cc | 5 +- .../dns/c_ares/grpc_ares_ev_driver_posix.cc | 3 +- .../dns/c_ares/grpc_ares_ev_driver_windows.cc | 3 +- .../resolver/dns/c_ares/grpc_ares_wrapper.cc | 50 +++++++-------- .../resolver/dns/c_ares/grpc_ares_wrapper.h | 4 +- .../dns/c_ares/grpc_ares_wrapper_fallback.cc | 8 +-- .../resolver/dns/native/dns_resolver.cc | 3 +- .../resolver/sockaddr/sockaddr_resolver.cc | 7 ++- .../resolver/xds/xds_resolver.cc | 2 +- .../filters/client_channel/resolver_factory.h | 6 +- .../client_channel/resolver_registry.cc | 22 ++++--- .../client_channel/resolver_registry.h | 9 +-- .../client_channel/resolver_result_parsing.cc | 12 ++-- .../client_channel/resolver_result_parsing.h | 12 ++-- .../client_channel/resolving_lb_policy.cc | 8 +-- .../client_channel/resolving_lb_policy.h | 6 +- .../filters/client_channel/service_config.cc | 24 +++---- .../filters/client_channel/service_config.h | 24 +++---- .../ext/filters/client_channel/subchannel.cc | 8 +-- .../ext/filters/client_channel/subchannel.h | 4 +- .../client_channel/subchannel_interface.h | 2 +- .../ext/filters/client_channel/xds/xds_api.cc | 9 +-- .../ext/filters/client_channel/xds/xds_api.h | 12 ++-- .../client_channel/xds/xds_bootstrap.cc | 4 +- .../client_channel/xds/xds_bootstrap.h | 4 +- .../filters/client_channel/xds/xds_client.cc | 18 +++--- .../filters/client_channel/xds/xds_client.h | 19 +++--- .../client_channel/xds/xds_client_stats.cc | 7 ++- .../client_channel/xds/xds_client_stats.h | 24 +++---- .../message_size/message_size_filter.cc | 5 +- .../message_size/message_size_filter.h | 2 +- .../ext/transport/chttp2/client/authority.cc | 2 +- .../chttp2/client/insecure/channel_create.cc | 2 +- .../client/secure/secure_channel_create.cc | 6 +- .../transport/chttp2/transport/frame_data.cc | 2 +- .../chttp2/transport/frame_rst_stream.cc | 8 +-- src/core/lib/channel/channelz.cc | 4 +- src/core/lib/channel/handshaker_registry.cc | 10 +-- src/core/lib/channel/handshaker_registry.h | 6 +- src/core/lib/debug/trace.cc | 2 +- src/core/lib/gpr/log.cc | 2 +- src/core/lib/gprpp/global_config_env.cc | 14 ++--- src/core/lib/gprpp/global_config_env.h | 6 +- src/core/lib/gprpp/global_config_generic.h | 4 +- src/core/lib/gprpp/host_port.cc | 6 +- src/core/lib/gprpp/host_port.h | 6 +- src/core/lib/gprpp/map.h | 3 +- src/core/lib/gprpp/memory.h | 63 +------------------ src/core/lib/gprpp/string_view.h | 4 +- src/core/lib/http/httpcli.cc | 2 +- src/core/lib/iomgr/ev_posix.cc | 2 +- src/core/lib/iomgr/resolve_address_custom.cc | 12 ++-- src/core/lib/iomgr/resolve_address_posix.cc | 4 +- src/core/lib/iomgr/resolve_address_windows.cc | 4 +- src/core/lib/iomgr/sockaddr_utils.cc | 2 +- src/core/lib/iomgr/tcp_client_cfstream.cc | 4 +- src/core/lib/profiling/basic_timers.cc | 3 +- .../lib/security/credentials/credentials.cc | 10 +-- .../lib/security/credentials/credentials.h | 2 +- .../credentials/oauth2/oauth2_credentials.cc | 16 ++--- .../tls/grpc_tls_credentials_options.cc | 4 +- .../tls/grpc_tls_credentials_options.h | 6 +- .../load_system_roots_linux.cc | 3 +- .../security_connector/security_connector.h | 2 +- .../ssl/ssl_security_connector.cc | 4 +- .../security/security_connector/ssl_utils.cc | 5 +- .../security/security_connector/ssl_utils.h | 8 +-- .../tls/spiffe_security_connector.cc | 4 +- .../tls/spiffe_security_connector.h | 4 +- .../transport/target_authority_table.h | 2 +- src/core/lib/slice/slice.cc | 9 ++- src/core/lib/slice/slice_internal.h | 5 +- src/core/lib/slice/slice_string_helpers.cc | 2 +- src/core/lib/surface/channel.cc | 6 +- .../alts/handshaker/alts_tsi_handshaker.cc | 4 +- src/core/tsi/ssl/session_cache/ssl_session.h | 2 +- .../session_cache/ssl_session_boringssl.cc | 2 +- .../ssl/session_cache/ssl_session_cache.cc | 2 +- .../ssl/session_cache/ssl_session_openssl.cc | 2 +- src/core/tsi/ssl_transport_security.cc | 2 +- src/cpp/common/tls_credentials_options.cc | 5 +- .../common/tls_credentials_options_util.cc | 7 ++- .../CronetTests/CoreCronetEnd2EndTests.mm | 2 +- .../tests/CronetTests/CronetUnitTests.mm | 4 +- test/core/bad_ssl/bad_ssl_test.cc | 2 +- test/core/channel/channelz_test.cc | 4 +- .../parse_address_with_named_scope_id_test.cc | 4 +- .../dns_resolver_connectivity_test.cc | 8 +-- .../resolvers/dns_resolver_cooldown_test.cc | 13 ++-- .../resolvers/dns_resolver_test.cc | 3 +- .../resolvers/fake_resolver_test.cc | 4 +- .../client_channel/service_config_test.cc | 8 +-- test/core/end2end/bad_server_response_test.cc | 4 +- test/core/end2end/connection_refused_test.cc | 2 +- test/core/end2end/dualstack_socket_test.cc | 4 +- test/core/end2end/fixtures/h2_census.cc | 2 +- test/core/end2end/fixtures/h2_compress.cc | 2 +- test/core/end2end/fixtures/h2_fakesec.cc | 2 +- test/core/end2end/fixtures/h2_full+pipe.cc | 2 +- test/core/end2end/fixtures/h2_full+trace.cc | 2 +- .../end2end/fixtures/h2_full+workarounds.cc | 2 +- test/core/end2end/fixtures/h2_full.cc | 2 +- test/core/end2end/fixtures/h2_http_proxy.cc | 2 +- test/core/end2end/fixtures/h2_oauth2.cc | 2 +- test/core/end2end/fixtures/h2_spiffe.cc | 2 +- test/core/end2end/fixtures/h2_ssl.cc | 2 +- .../end2end/fixtures/h2_ssl_cred_reload.cc | 2 +- .../end2end/fixtures/http_proxy_fixture.cc | 2 +- test/core/end2end/fixtures/local_util.h | 2 +- test/core/end2end/fixtures/proxy.cc | 4 +- test/core/end2end/fuzzers/api_fuzzer.cc | 4 +- test/core/end2end/goaway_server_test.cc | 8 +-- test/core/end2end/h2_ssl_cert_test.cc | 2 +- .../core/end2end/h2_ssl_session_reuse_test.cc | 2 +- .../end2end/invalid_call_argument_test.cc | 2 +- test/core/end2end/tests/keepalive_timeout.cc | 2 +- test/core/fling/fling_stream_test.cc | 2 +- test/core/fling/fling_test.cc | 2 +- test/core/fling/server.cc | 2 +- test/core/gprpp/global_config_env_test.cc | 2 +- test/core/gprpp/global_config_test.cc | 2 +- test/core/gprpp/host_port_test.cc | 6 +- test/core/gprpp/inlined_vector_test.cc | 16 ++--- test/core/gprpp/string_view_test.cc | 2 +- test/core/iomgr/resolve_address_posix_test.cc | 6 +- test/core/iomgr/resolve_address_test.cc | 3 +- .../control_plane_credentials_test.cc | 22 +++---- .../spiffe_security_connector_test.cc | 10 +-- test/core/slice/slice_hash_table_test.cc | 10 +-- test/core/slice/slice_test.cc | 6 +- test/core/slice/slice_weak_hash_table_test.cc | 8 +-- ...num_external_connectivity_watchers_test.cc | 4 +- .../surface/sequential_connectivity_test.cc | 2 +- test/core/surface/server_chttp2_test.cc | 2 +- test/core/surface/server_test.cc | 2 +- .../alts_concurrent_connectivity_test.cc | 16 ++--- test/core/util/test_lb_policies.cc | 14 ++--- test/cpp/client/credentials_test.cc | 2 +- test/cpp/end2end/async_end2end_test.cc | 2 +- test/cpp/end2end/client_lb_end2end_test.cc | 6 +- test/cpp/end2end/end2end_test.cc | 2 +- test/cpp/naming/address_sorting_test.cc | 7 +-- test/cpp/naming/cancel_ares_query_test.cc | 2 +- test/cpp/naming/resolver_component_test.cc | 18 +++--- test/cpp/qps/driver.cc | 2 +- test/cpp/qps/qps_worker.cc | 2 +- test/cpp/qps/server_async.cc | 2 +- test/cpp/qps/server_callback.cc | 2 +- test/cpp/qps/server_sync.cc | 2 +- 169 files changed, 530 insertions(+), 582 deletions(-) diff --git a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc index a3e46ca0825..b4ec10a2240 100644 --- a/src/core/ext/filters/client_channel/client_channel.cc +++ b/src/core/ext/filters/client_channel/client_channel.cc @@ -228,7 +228,7 @@ class ChannelData { void UpdateStateAndPickerLocked( grpc_connectivity_state state, const char* reason, - UniquePtr picker); + std::unique_ptr picker); void UpdateServiceConfigLocked( RefCountedPtr retry_throttle_data, @@ -252,7 +252,7 @@ class ChannelData { void ProcessLbPolicy( const Resolver::Result& resolver_result, const internal::ClientChannelGlobalParsedConfig* parsed_service_config, - UniquePtr* lb_policy_name, + std::unique_ptr* lb_policy_name, RefCountedPtr* lb_policy_config); // @@ -265,15 +265,15 @@ class ChannelData { ClientChannelFactory* client_channel_factory_; const grpc_channel_args* channel_args_; RefCountedPtr default_service_config_; - UniquePtr server_name_; - UniquePtr target_uri_; + std::unique_ptr server_name_; + std::unique_ptr target_uri_; channelz::ChannelNode* channelz_node_; // // Fields used in the data plane. Guarded by data_plane_mu. // mutable Mutex data_plane_mu_; - UniquePtr picker_; + std::unique_ptr picker_; QueuedPick* queued_picks_ = nullptr; // Linked list of queued picks. // Data from service config. bool received_service_config_data_ = false; @@ -288,7 +288,7 @@ class ChannelData { RefCountedPtr subchannel_pool_; OrphanablePtr resolving_lb_policy_; ConnectivityStateTracker state_tracker_; - UniquePtr health_check_service_name_; + std::unique_ptr health_check_service_name_; RefCountedPtr saved_service_config_; bool received_first_resolver_result_ = false; // The number of SubchannelWrapper instances referencing a given Subchannel. @@ -314,8 +314,8 @@ class ChannelData { // synchronously via get_channel_info(). // gpr_mu info_mu_; - UniquePtr info_lb_policy_name_; - UniquePtr info_service_config_json_; + std::unique_ptr info_lb_policy_name_; + std::unique_ptr info_service_config_json_; // // Fields guarded by a mutex, since they need to be accessed @@ -843,7 +843,7 @@ class CallData { class ChannelData::SubchannelWrapper : public SubchannelInterface { public: SubchannelWrapper(ChannelData* chand, Subchannel* subchannel, - UniquePtr health_check_service_name) + std::unique_ptr health_check_service_name) : SubchannelInterface(&grpc_client_channel_routing_trace), chand_(chand), subchannel_(subchannel), @@ -898,7 +898,7 @@ class ChannelData::SubchannelWrapper : public SubchannelInterface { void WatchConnectivityState( grpc_connectivity_state initial_state, - UniquePtr watcher) override { + std::unique_ptr watcher) override { auto& watcher_wrapper = watcher_map_[watcher.get()]; GPR_ASSERT(watcher_wrapper == nullptr); watcher_wrapper = new WatcherWrapper(std::move(watcher), @@ -906,7 +906,7 @@ class ChannelData::SubchannelWrapper : public SubchannelInterface { initial_state); subchannel_->WatchConnectivityState( initial_state, - UniquePtr(gpr_strdup(health_check_service_name_.get())), + std::unique_ptr(gpr_strdup(health_check_service_name_.get())), OrphanablePtr( watcher_wrapper)); } @@ -928,7 +928,8 @@ class ChannelData::SubchannelWrapper : public SubchannelInterface { return subchannel_->channel_args(); } - void UpdateHealthCheckServiceName(UniquePtr health_check_service_name) { + void UpdateHealthCheckServiceName( + std::unique_ptr health_check_service_name) { if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { gpr_log(GPR_INFO, "chand=%p: subchannel wrapper %p: updating health check service " @@ -954,7 +955,7 @@ class ChannelData::SubchannelWrapper : public SubchannelInterface { watcher_wrapper = replacement; subchannel_->WatchConnectivityState( replacement->last_seen_state(), - UniquePtr(gpr_strdup(health_check_service_name.get())), + std::unique_ptr(gpr_strdup(health_check_service_name.get())), OrphanablePtr( replacement)); } @@ -994,7 +995,7 @@ class ChannelData::SubchannelWrapper : public SubchannelInterface { class WatcherWrapper : public Subchannel::ConnectivityStateWatcherInterface { public: WatcherWrapper( - UniquePtr + std::unique_ptr watcher, RefCountedPtr parent, grpc_connectivity_state initial_state) @@ -1083,7 +1084,8 @@ class ChannelData::SubchannelWrapper : public SubchannelInterface { grpc_closure closure_; }; - UniquePtr watcher_; + std::unique_ptr + watcher_; RefCountedPtr parent_; grpc_connectivity_state last_seen_state_; WatcherWrapper* replacement_ = nullptr; @@ -1112,7 +1114,7 @@ class ChannelData::SubchannelWrapper : public SubchannelInterface { ChannelData* chand_; Subchannel* subchannel_; - UniquePtr health_check_service_name_; + std::unique_ptr health_check_service_name_; // Maps from the address of the watcher passed to us by the LB policy // to the address of the WrapperWatcher that we passed to the underlying // subchannel. This is needed so that when the LB policy calls @@ -1298,7 +1300,7 @@ class ChannelData::ClientChannelControlHelper const grpc_channel_args& args) override { bool inhibit_health_checking = grpc_channel_arg_get_bool( grpc_channel_args_find(&args, GRPC_ARG_INHIBIT_HEALTH_CHECKING), false); - UniquePtr health_check_service_name; + std::unique_ptr health_check_service_name; if (!inhibit_health_checking) { health_check_service_name.reset( gpr_strdup(chand_->health_check_service_name_.get())); @@ -1321,7 +1323,7 @@ class ChannelData::ClientChannelControlHelper void UpdateState( grpc_connectivity_state state, - UniquePtr picker) override { + std::unique_ptr picker) override { grpc_error* disconnect_error = chand_->disconnect_error(); if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { const char* extra = disconnect_error == GRPC_ERROR_NONE @@ -1494,7 +1496,7 @@ ChannelData::~ChannelData() { void ChannelData::UpdateStateAndPickerLocked( grpc_connectivity_state state, const char* reason, - UniquePtr picker) { + std::unique_ptr picker) { // Clean the control plane when entering IDLE. if (picker_ == nullptr) { health_check_service_name_.reset(); @@ -1594,7 +1596,7 @@ void ChannelData::CreateResolvingLoadBalancingPolicyLocked() { lb_args.combiner = combiner_; lb_args.channel_control_helper = MakeUnique(this); lb_args.args = channel_args_; - UniquePtr target_uri(gpr_strdup(target_uri_.get())); + std::unique_ptr target_uri(gpr_strdup(target_uri_.get())); resolving_lb_policy_.reset(new ResolvingLoadBalancingPolicy( std::move(lb_args), &grpc_client_channel_routing_trace, std::move(target_uri), ProcessResolverResultLocked, this)); @@ -1617,7 +1619,7 @@ void ChannelData::DestroyResolvingLoadBalancingPolicyLocked() { void ChannelData::ProcessLbPolicy( const Resolver::Result& resolver_result, const internal::ClientChannelGlobalParsedConfig* parsed_service_config, - UniquePtr* lb_policy_name, + std::unique_ptr* lb_policy_name, RefCountedPtr* lb_policy_config) { // Prefer the LB policy name found in the service config. if (parsed_service_config != nullptr && @@ -1712,7 +1714,7 @@ bool ChannelData::ProcessResolverResultLocked( return false; } // Process service config. - UniquePtr service_config_json; + std::unique_ptr service_config_json; const internal::ClientChannelGlobalParsedConfig* parsed_service_config = nullptr; if (service_config != nullptr) { @@ -1746,8 +1748,8 @@ bool ChannelData::ProcessResolverResultLocked( } // Update health check service name used by existing subchannel wrappers. for (auto* subchannel_wrapper : chand->subchannel_wrappers_) { - subchannel_wrapper->UpdateHealthCheckServiceName( - UniquePtr(gpr_strdup(chand->health_check_service_name_.get()))); + subchannel_wrapper->UpdateHealthCheckServiceName(std::unique_ptr( + gpr_strdup(chand->health_check_service_name_.get()))); } // Save service config. chand->saved_service_config_ = std::move(service_config); @@ -1772,7 +1774,7 @@ bool ChannelData::ProcessResolverResultLocked( chand->UpdateServiceConfigLocked(std::move(retry_throttle_data), chand->saved_service_config_); } - UniquePtr processed_lb_policy_name; + std::unique_ptr processed_lb_policy_name; chand->ProcessLbPolicy(result, parsed_service_config, &processed_lb_policy_name, lb_policy_config); // Swap out the data used by GetChannelInfo(). diff --git a/src/core/ext/filters/client_channel/health/health_check_client.cc b/src/core/ext/filters/client_channel/health/health_check_client.cc index 2826dfe9685..5c4aa986e80 100644 --- a/src/core/ext/filters/client_channel/health/health_check_client.cc +++ b/src/core/ext/filters/client_channel/health/health_check_client.cc @@ -200,7 +200,7 @@ bool DecodeResponse(grpc_slice_buffer* slice_buffer, grpc_error** error) { return false; } // Concatenate the slices to form a single string. - UniquePtr recv_message_deleter; + std::unique_ptr recv_message_deleter; uint8_t* recv_message; if (slice_buffer->count == 1) { recv_message = GRPC_SLICE_START_PTR(slice_buffer->slices[0]); diff --git a/src/core/ext/filters/client_channel/http_proxy.cc b/src/core/ext/filters/client_channel/http_proxy.cc index 1c4a227576a..e4f8e368c9d 100644 --- a/src/core/ext/filters/client_channel/http_proxy.cc +++ b/src/core/ext/filters/client_channel/http_proxy.cc @@ -130,8 +130,8 @@ static bool proxy_mapper_map_name(grpc_proxy_mapper* /*mapper*/, if (no_proxy_str != nullptr) { static const char* NO_PROXY_SEPARATOR = ","; bool use_proxy = true; - grpc_core::UniquePtr server_host; - grpc_core::UniquePtr server_port; + std::unique_ptr server_host; + std::unique_ptr server_port; if (!grpc_core::SplitHostPort( uri->path[0] == '/' ? uri->path + 1 : uri->path, &server_host, &server_port)) { diff --git a/src/core/ext/filters/client_channel/lb_policy.h b/src/core/ext/filters/client_channel/lb_policy.h index ad10316f8dd..7e9c206265b 100644 --- a/src/core/ext/filters/client_channel/lb_policy.h +++ b/src/core/ext/filters/client_channel/lb_policy.h @@ -269,7 +269,7 @@ class LoadBalancingPolicy : public InternallyRefCounted { /// Sets the connectivity state and returns a new picker to be used /// by the client channel. virtual void UpdateState(grpc_connectivity_state state, - UniquePtr) = 0; + std::unique_ptr) = 0; /// Requests that the resolver re-resolve. virtual void RequestReresolution() = 0; @@ -318,7 +318,7 @@ class LoadBalancingPolicy : public InternallyRefCounted { /// Channel control helper. /// Note: LB policies MUST NOT call any method on the helper from /// their constructor. - UniquePtr channel_control_helper; + std::unique_ptr channel_control_helper; /// Channel args. // TODO(roth): Find a better channel args representation for this API. // TODO(roth): Clarify ownership semantics here -- currently, this @@ -404,7 +404,7 @@ class LoadBalancingPolicy : public InternallyRefCounted { /// Owned pointer to interested parties in load balancing decisions. grpc_pollset_set* interested_parties_; /// Channel control helper. - UniquePtr channel_control_helper_; + std::unique_ptr channel_control_helper_; }; } // namespace grpc_core diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc index caace9a015b..23ab796f52d 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc @@ -237,7 +237,7 @@ class GrpcLb : public LoadBalancingPolicy { const grpc_grpclb_serverlist* serverlist() const { return serverlist_; } // Returns a text representation suitable for logging. - UniquePtr AsText() const; + std::unique_ptr AsText() const; // Extracts all non-drop entries into a ServerAddressList. ServerAddressList GetServerAddressList( @@ -268,7 +268,7 @@ class GrpcLb : public LoadBalancingPolicy { class Picker : public SubchannelPicker { public: Picker(GrpcLb* parent, RefCountedPtr serverlist, - UniquePtr child_picker, + std::unique_ptr child_picker, RefCountedPtr client_stats) : parent_(parent), serverlist_(std::move(serverlist)), @@ -285,7 +285,7 @@ class GrpcLb : public LoadBalancingPolicy { // Serverlist to be used for determining drops. RefCountedPtr serverlist_; - UniquePtr child_picker_; + std::unique_ptr child_picker_; RefCountedPtr client_stats_; }; @@ -297,7 +297,7 @@ class GrpcLb : public LoadBalancingPolicy { RefCountedPtr CreateSubchannel( const grpc_channel_args& args) override; void UpdateState(grpc_connectivity_state state, - UniquePtr picker) override; + std::unique_ptr picker) override; void RequestReresolution() override; void AddTraceEvent(TraceSeverity severity, StringView message) override; @@ -430,7 +430,7 @@ void ParseServer(const grpc_grpclb_server* server, } } -UniquePtr GrpcLb::Serverlist::AsText() const { +std::unique_ptr GrpcLb::Serverlist::AsText() const { gpr_strvec entries; gpr_strvec_init(&entries); for (size_t i = 0; i < serverlist_->num_servers; ++i) { @@ -449,7 +449,7 @@ UniquePtr GrpcLb::Serverlist::AsText() const { gpr_free(ipport); gpr_strvec_add(&entries, entry); } - UniquePtr result(gpr_strvec_flatten(&entries, nullptr)); + std::unique_ptr result(gpr_strvec_flatten(&entries, nullptr)); gpr_strvec_destroy(&entries); return result; } @@ -657,7 +657,7 @@ RefCountedPtr GrpcLb::Helper::CreateSubchannel( } void GrpcLb::Helper::UpdateState(grpc_connectivity_state state, - UniquePtr picker) { + std::unique_ptr picker) { if (parent_->shutting_down_) return; // If this request is from the pending child policy, ignore it until // it reports READY, at which point we swap it into place. @@ -1099,7 +1099,7 @@ void GrpcLb::BalancerCallState::OnBalancerMessageReceivedLocked( GPR_ASSERT(lb_calld->lb_call_ != nullptr); auto serverlist_wrapper = MakeRefCounted(serverlist); if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_glb_trace)) { - UniquePtr serverlist_text = serverlist_wrapper->AsText(); + std::unique_ptr serverlist_text = serverlist_wrapper->AsText(); gpr_log(GPR_INFO, "[grpclb %p] lb_calld=%p: Serverlist with %" PRIuPTR " servers received:\n%s", @@ -1729,7 +1729,7 @@ OrphanablePtr GrpcLb::CreateChildPolicyLocked( lb_policy_args.combiner = combiner(); lb_policy_args.args = args; lb_policy_args.channel_control_helper = - UniquePtr(helper); + std::unique_ptr(helper); OrphanablePtr lb_policy = LoadBalancingPolicyRegistry::CreateLoadBalancingPolicy( name, std::move(lb_policy_args)); diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc index 5bc4f5157ad..29b46afbdfa 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc @@ -39,8 +39,8 @@ namespace grpc_core { namespace { -int BalancerNameCmp(const grpc_core::UniquePtr& a, - const grpc_core::UniquePtr& b) { +int BalancerNameCmp(const std::unique_ptr& a, + const std::unique_ptr& b) { return strcmp(a.get(), b.get()); } diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc index b6c1b03e48b..31ace9a824f 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc @@ -61,7 +61,7 @@ void GrpcLbClientStats::AddCallDropped(const char* token) { } } // Not found, so add a new entry. - drop_token_counts_->emplace_back(UniquePtr(gpr_strdup(token)), 1); + drop_token_counts_->emplace_back(std::unique_ptr(gpr_strdup(token)), 1); } namespace { @@ -76,7 +76,7 @@ void GrpcLbClientStats::Get( int64_t* num_calls_started, int64_t* num_calls_finished, int64_t* num_calls_finished_with_client_failed_to_send, int64_t* num_calls_finished_known_received, - UniquePtr* drop_token_counts) { + std::unique_ptr* drop_token_counts) { AtomicGetAndResetCounter(num_calls_started, &num_calls_started_); AtomicGetAndResetCounter(num_calls_finished, &num_calls_finished_); AtomicGetAndResetCounter(num_calls_finished_with_client_failed_to_send, diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h index bcc6598c105..64f6ace349f 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h @@ -33,10 +33,10 @@ namespace grpc_core { class GrpcLbClientStats : public RefCounted { public: struct DropTokenCount { - UniquePtr token; + std::unique_ptr token; int64_t count; - DropTokenCount(UniquePtr token, int64_t count) + DropTokenCount(std::unique_ptr token, int64_t count) : token(std::move(token)), count(count) {} }; @@ -51,7 +51,7 @@ class GrpcLbClientStats : public RefCounted { void Get(int64_t* num_calls_started, int64_t* num_calls_finished, int64_t* num_calls_finished_with_client_failed_to_send, int64_t* num_calls_finished_known_received, - UniquePtr* drop_token_counts); + std::unique_ptr* drop_token_counts); // A destruction function to use as the user_data key when attaching // client stats to a grpc_mdelem. @@ -65,7 +65,7 @@ class GrpcLbClientStats : public RefCounted { gpr_atm num_calls_finished_with_client_failed_to_send_ = 0; gpr_atm num_calls_finished_known_received_ = 0; Mutex drop_count_mu_; // Guards drop_token_counts_. - UniquePtr drop_token_counts_; + std::unique_ptr drop_token_counts_; }; } // namespace grpc_core diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc index 68097e14a4e..b5353984025 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc @@ -63,7 +63,7 @@ grpc_grpclb_request* grpc_grpclb_load_report_request_create( int64_t num_calls_finished; int64_t num_calls_finished_with_client_failed_to_send; int64_t num_calls_finished_known_received; - UniquePtr drop_token_counts; + std::unique_ptr drop_token_counts; client_stats->Get(&num_calls_started, &num_calls_finished, &num_calls_finished_with_client_failed_to_send, &num_calls_finished_known_received, &drop_token_counts); diff --git a/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h b/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h index 2e0b5e2ace5..4932a6869f1 100644 --- a/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h +++ b/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h @@ -316,7 +316,7 @@ void SubchannelDataRef(DEBUG_LOCATION, "Watcher")); subchannel_->WatchConnectivityState( connectivity_state_, - UniquePtr( + std::unique_ptr( pending_watcher_)); } diff --git a/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc b/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc index b2969f78ffc..a78bccbc750 100644 --- a/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc +++ b/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc @@ -39,13 +39,13 @@ constexpr char kCds[] = "cds_experimental"; // Parsed config for this LB policy. class ParsedCdsConfig : public LoadBalancingPolicy::Config { public: - explicit ParsedCdsConfig(UniquePtr cluster) + explicit ParsedCdsConfig(std::unique_ptr cluster) : cluster_(std::move(cluster)) {} const char* cluster() const { return cluster_.get(); } const char* name() const override { return kCds; } private: - UniquePtr cluster_; + std::unique_ptr cluster_; }; // CDS LB policy. @@ -78,7 +78,7 @@ class CdsLb : public LoadBalancingPolicy { RefCountedPtr CreateSubchannel( const grpc_channel_args& args) override; void UpdateState(grpc_connectivity_state state, - UniquePtr picker) override; + std::unique_ptr picker) override; void RequestReresolution() override; void AddTraceEvent(TraceSeverity severity, StringView message) override; @@ -136,7 +136,7 @@ void CdsLb::ClusterWatcher::OnClusterChanged(CdsUpdate cluster_data) { ? parent_->config_->cluster() : cluster_data.eds_service_name.get())); gpr_free(lrs_str); - UniquePtr json_str_deleter(json_str); + std::unique_ptr json_str_deleter(json_str); if (GRPC_TRACE_FLAG_ENABLED(grpc_cds_lb_trace)) { gpr_log(GPR_INFO, "[cdslb %p] generated config for child policy: %s", parent_.get(), json_str); @@ -203,7 +203,7 @@ RefCountedPtr CdsLb::Helper::CreateSubchannel( } void CdsLb::Helper::UpdateState(grpc_connectivity_state state, - UniquePtr picker) { + std::unique_ptr picker) { if (parent_->shutting_down_) return; if (GRPC_TRACE_FLAG_ENABLED(grpc_cds_lb_trace)) { gpr_log(GPR_INFO, "[cdslb %p] state updated by child: %s", this, @@ -343,7 +343,7 @@ class CdsFactory : public LoadBalancingPolicyFactory { } if (error_list.empty()) { return MakeRefCounted( - UniquePtr(gpr_strdup(cluster))); + std::unique_ptr(gpr_strdup(cluster))); } else { *error = GRPC_ERROR_CREATE_FROM_VECTOR("Cds Parser", &error_list); return nullptr; diff --git a/src/core/ext/filters/client_channel/lb_policy/xds/xds.cc b/src/core/ext/filters/client_channel/lb_policy/xds/xds.cc index 57cdec10487..38235e7c34a 100644 --- a/src/core/ext/filters/client_channel/lb_policy/xds/xds.cc +++ b/src/core/ext/filters/client_channel/lb_policy/xds/xds.cc @@ -78,8 +78,8 @@ class ParsedXdsConfig : public LoadBalancingPolicy::Config { public: ParsedXdsConfig(RefCountedPtr child_policy, RefCountedPtr fallback_policy, - UniquePtr eds_service_name, - UniquePtr lrs_load_reporting_server_name) + std::unique_ptr eds_service_name, + std::unique_ptr lrs_load_reporting_server_name) : child_policy_(std::move(child_policy)), fallback_policy_(std::move(fallback_policy)), eds_service_name_(std::move(eds_service_name)), @@ -105,8 +105,8 @@ class ParsedXdsConfig : public LoadBalancingPolicy::Config { private: RefCountedPtr child_policy_; RefCountedPtr fallback_policy_; - UniquePtr eds_service_name_; - UniquePtr lrs_load_reporting_server_name_; + std::unique_ptr eds_service_name_; + std::unique_ptr lrs_load_reporting_server_name_; }; class XdsLb : public LoadBalancingPolicy { @@ -123,12 +123,13 @@ class XdsLb : public LoadBalancingPolicy { // We need this wrapper for the following reasons: // 1. To process per-locality load reporting. - // 2. Since pickers are UniquePtrs we use this RefCounted wrapper to control + // 2. Since pickers are std::unique_ptrs we use this RefCounted wrapper to + // control // references to it by the xds picker and the locality. class EndpointPickerWrapper : public RefCounted { public: EndpointPickerWrapper( - UniquePtr picker, + std::unique_ptr picker, RefCountedPtr locality_stats) : picker_(std::move(picker)), locality_stats_(std::move(locality_stats)) { @@ -139,7 +140,7 @@ class XdsLb : public LoadBalancingPolicy { PickResult Pick(PickArgs args); private: - UniquePtr picker_; + std::unique_ptr picker_; RefCountedPtr locality_stats_; }; @@ -180,7 +181,7 @@ class XdsLb : public LoadBalancingPolicy { RefCountedPtr CreateSubchannel( const grpc_channel_args& args) override; void UpdateState(grpc_connectivity_state state, - UniquePtr picker) override; + std::unique_ptr picker) override; void RequestReresolution() override; void AddTraceEvent(TraceSeverity severity, StringView message) override; @@ -238,7 +239,7 @@ class XdsLb : public LoadBalancingPolicy { RefCountedPtr CreateSubchannel( const grpc_channel_args& args) override; void UpdateState(grpc_connectivity_state state, - UniquePtr picker) override; + std::unique_ptr picker) override; // This is a no-op, because we get the addresses from the xds // client, which is a watch-based API. void RequestReresolution() override {} @@ -405,7 +406,7 @@ class XdsLb : public LoadBalancingPolicy { } // Server name from target URI. - UniquePtr server_name_; + std::unique_ptr server_name_; // Current channel args and config from the resolver. const grpc_channel_args* args_ = nullptr; @@ -494,7 +495,7 @@ LoadBalancingPolicy::PickResult XdsLb::EndpointPickerWrapper::Pick( XdsLb::PickResult XdsLb::LocalityPicker::Pick(PickArgs args) { // Handle drop. - const UniquePtr* drop_category; + const std::unique_ptr* drop_category; if (drop_config_->ShouldDrop(&drop_category)) { xds_policy_->client_stats_.AddCallDropped(*drop_category); PickResult result; @@ -553,8 +554,8 @@ RefCountedPtr XdsLb::FallbackHelper::CreateSubchannel( return parent_->channel_control_helper()->CreateSubchannel(args); } -void XdsLb::FallbackHelper::UpdateState(grpc_connectivity_state state, - UniquePtr picker) { +void XdsLb::FallbackHelper::UpdateState( + grpc_connectivity_state state, std::unique_ptr picker) { if (parent_->shutting_down_) return; // If this request is from the pending fallback policy, ignore it until // it reports READY, at which point we swap it into place. @@ -997,7 +998,7 @@ OrphanablePtr XdsLb::CreateFallbackPolicyLocked( lb_policy_args.combiner = combiner(); lb_policy_args.args = args; lb_policy_args.channel_control_helper = - UniquePtr(helper); + std::unique_ptr(helper); OrphanablePtr lb_policy = LoadBalancingPolicyRegistry::CreateLoadBalancingPolicy( name, std::move(lb_policy_args)); @@ -1505,7 +1506,7 @@ XdsLb::PriorityList::LocalityMap::Locality::CreateChildPolicyLocked( lb_policy_args.combiner = xds_policy()->combiner(); lb_policy_args.args = args; lb_policy_args.channel_control_helper = - UniquePtr(helper); + std::unique_ptr(helper); OrphanablePtr lb_policy = LoadBalancingPolicyRegistry::CreateLoadBalancingPolicy( name, std::move(lb_policy_args)); @@ -1741,7 +1742,7 @@ XdsLb::PriorityList::LocalityMap::Locality::Helper::CreateSubchannel( } void XdsLb::PriorityList::LocalityMap::Locality::Helper::UpdateState( - grpc_connectivity_state state, UniquePtr picker) { + grpc_connectivity_state state, std::unique_ptr picker) { if (locality_->xds_policy()->shutting_down_) return; // If this request is from the pending child policy, ignore it until // it reports READY, at which point we swap it into place. @@ -1870,8 +1871,8 @@ class XdsFactory : public LoadBalancingPolicyFactory { if (error_list.empty()) { return MakeRefCounted( std::move(child_policy), std::move(fallback_policy), - UniquePtr(gpr_strdup(eds_service_name)), - UniquePtr(gpr_strdup(lrs_load_reporting_server_name))); + std::unique_ptr(gpr_strdup(eds_service_name)), + std::unique_ptr(gpr_strdup(lrs_load_reporting_server_name))); } else { *error = GRPC_ERROR_CREATE_FROM_VECTOR("Xds Parser", &error_list); return nullptr; diff --git a/src/core/ext/filters/client_channel/lb_policy_registry.cc b/src/core/ext/filters/client_channel/lb_policy_registry.cc index 21fcca5cd09..857522a4491 100644 --- a/src/core/ext/filters/client_channel/lb_policy_registry.cc +++ b/src/core/ext/filters/client_channel/lb_policy_registry.cc @@ -34,7 +34,7 @@ class RegistryState { RegistryState() {} void RegisterLoadBalancingPolicyFactory( - UniquePtr factory) { + std::unique_ptr factory) { for (size_t i = 0; i < factories_.size(); ++i) { GPR_ASSERT(strcmp(factories_[i]->name(), factory->name()) != 0); } @@ -52,7 +52,7 @@ class RegistryState { } private: - InlinedVector, 10> factories_; + InlinedVector, 10> factories_; }; RegistryState* g_state = nullptr; @@ -73,7 +73,7 @@ void LoadBalancingPolicyRegistry::Builder::ShutdownRegistry() { } void LoadBalancingPolicyRegistry::Builder::RegisterLoadBalancingPolicyFactory( - UniquePtr factory) { + std::unique_ptr factory) { InitRegistry(); g_state->RegisterLoadBalancingPolicyFactory(std::move(factory)); } diff --git a/src/core/ext/filters/client_channel/lb_policy_registry.h b/src/core/ext/filters/client_channel/lb_policy_registry.h index c5f02953a1b..d6d9bc305fd 100644 --- a/src/core/ext/filters/client_channel/lb_policy_registry.h +++ b/src/core/ext/filters/client_channel/lb_policy_registry.h @@ -41,7 +41,7 @@ class LoadBalancingPolicyRegistry { /// Registers an LB policy factory. The factory will be used to create an /// LB policy whose name matches that of the factory. static void RegisterLoadBalancingPolicyFactory( - UniquePtr factory); + std::unique_ptr factory); }; /// Creates an LB policy of the type specified by \a name. diff --git a/src/core/ext/filters/client_channel/parse_address.cc b/src/core/ext/filters/client_channel/parse_address.cc index fbfbb4445f3..4ececc5faef 100644 --- a/src/core/ext/filters/client_channel/parse_address.cc +++ b/src/core/ext/filters/client_channel/parse_address.cc @@ -73,8 +73,8 @@ bool grpc_parse_ipv4_hostport(const char* hostport, grpc_resolved_address* addr, bool log_errors) { bool success = false; // Split host and port. - grpc_core::UniquePtr host; - grpc_core::UniquePtr port; + std::unique_ptr host; + std::unique_ptr port; if (!grpc_core::SplitHostPort(hostport, &host, &port)) { if (log_errors) { gpr_log(GPR_ERROR, "Failed gpr_split_host_port(%s, ...)", hostport); @@ -125,8 +125,8 @@ bool grpc_parse_ipv6_hostport(const char* hostport, grpc_resolved_address* addr, bool log_errors) { bool success = false; // Split host and port. - grpc_core::UniquePtr host; - grpc_core::UniquePtr port; + std::unique_ptr host; + std::unique_ptr port; if (!grpc_core::SplitHostPort(hostport, &host, &port)) { if (log_errors) { gpr_log(GPR_ERROR, "Failed gpr_split_host_port(%s, ...)", hostport); diff --git a/src/core/ext/filters/client_channel/resolver.cc b/src/core/ext/filters/client_channel/resolver.cc index fd20def0d85..ff3e47f701b 100644 --- a/src/core/ext/filters/client_channel/resolver.cc +++ b/src/core/ext/filters/client_channel/resolver.cc @@ -30,7 +30,8 @@ namespace grpc_core { // Resolver // -Resolver::Resolver(Combiner* combiner, UniquePtr result_handler) +Resolver::Resolver(Combiner* combiner, + std::unique_ptr result_handler) : InternallyRefCounted(&grpc_trace_resolver_refcount), result_handler_(std::move(result_handler)), combiner_(GRPC_COMBINER_REF(combiner, "resolver")) {} diff --git a/src/core/ext/filters/client_channel/resolver.h b/src/core/ext/filters/client_channel/resolver.h index e57ca12a786..56bf273fa12 100644 --- a/src/core/ext/filters/client_channel/resolver.h +++ b/src/core/ext/filters/client_channel/resolver.h @@ -127,7 +127,7 @@ class Resolver : public InternallyRefCounted { // API should change to take a RefCountedPtr<>, so that we always take // ownership of a new ref. explicit Resolver(Combiner* combiner, - UniquePtr result_handler); + std::unique_ptr result_handler); /// Shuts down the resolver. virtual void ShutdownLocked() = 0; @@ -137,7 +137,7 @@ class Resolver : public InternallyRefCounted { ResultHandler* result_handler() const { return result_handler_.get(); } private: - UniquePtr result_handler_; + std::unique_ptr result_handler_; Combiner* combiner_; }; diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc index 7500fa189d2..102a87ea012 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc @@ -108,7 +108,7 @@ class AresDnsResolver : public Resolver { /// retry backoff state BackOff backoff_; /// currently resolving addresses - UniquePtr addresses_; + std::unique_ptr addresses_; /// currently resolving service config char* service_config_json_ = nullptr; // has shutdown been initiated @@ -496,8 +496,7 @@ static bool should_use_ares(const char* resolver_env) { static bool g_use_ares_dns_resolver; void grpc_resolver_dns_ares_init() { - grpc_core::UniquePtr resolver = - GPR_GLOBAL_CONFIG_GET(grpc_dns_resolver); + std::unique_ptr resolver = GPR_GLOBAL_CONFIG_GET(grpc_dns_resolver); if (should_use_ares(resolver.get())) { g_use_ares_dns_resolver = true; gpr_log(GPR_DEBUG, "Using ares dns resolver"); diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc index 1d69eefdf3d..626b725ef4f 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc @@ -77,7 +77,7 @@ struct grpc_ares_ev_driver { /** request object that's using this ev driver */ grpc_ares_request* request; /** Owned by the ev_driver. Creates new GrpcPolledFd's */ - grpc_core::UniquePtr polled_fd_factory; + std::unique_ptr polled_fd_factory; /** query timeout in milliseconds */ int query_timeout_ms; /** alarm to cancel active queries */ diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h index c17ba176c21..1a5a3f6e171 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h @@ -95,7 +95,7 @@ class GrpcPolledFdFactory { virtual void ConfigureAresChannelLocked(ares_channel channel) = 0; }; -UniquePtr NewGrpcPolledFdFactory(Combiner* combiner); +std::unique_ptr NewGrpcPolledFdFactory(Combiner* combiner); } // namespace grpc_core diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc index f43192f778b..5d26f5bb88c 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc @@ -122,7 +122,7 @@ struct AresUvPollCbArg { }; static void ares_uv_poll_cb_locked(void* arg, grpc_error* error) { - grpc_core::UniquePtr arg_struct( + std::unique_ptr arg_struct( reinterpret_cast(arg)); uv_poll_t* handle = arg_struct->handle; int status = arg_struct->status; @@ -171,7 +171,8 @@ class GrpcPolledFdFactoryLibuv : public GrpcPolledFdFactory { void ConfigureAresChannelLocked(ares_channel channel) override {} }; -UniquePtr NewGrpcPolledFdFactory(Combiner* combiner) { +std::unique_ptr NewGrpcPolledFdFactory( + Combiner* combiner) { return MakeUnique(); } diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc index eb48b6feac4..5ae7d3c1adb 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc @@ -97,7 +97,8 @@ class GrpcPolledFdFactoryPosix : public GrpcPolledFdFactory { void ConfigureAresChannelLocked(ares_channel /*channel*/) override {} }; -UniquePtr NewGrpcPolledFdFactory(Combiner* /*combiner*/) { +std::unique_ptr NewGrpcPolledFdFactory( + Combiner* /*combiner*/) { return MakeUnique(); } diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc index 08429f6e8d4..0b8d767630d 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc @@ -932,7 +932,8 @@ class GrpcPolledFdFactoryWindows : public GrpcPolledFdFactory { SockToPolledFdMap sock_to_polled_fd_map_; }; -UniquePtr NewGrpcPolledFdFactory(Combiner* combiner) { +std::unique_ptr NewGrpcPolledFdFactory( + Combiner* combiner) { return MakeUnique(combiner); } diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc index a1fdac1cd88..d30ff4b5bed 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc @@ -59,7 +59,7 @@ struct grpc_ares_request { /** closure to call when the request completes */ grpc_closure* on_done; /** the pointer to receive the resolved addresses */ - grpc_core::UniquePtr* addresses_out; + std::unique_ptr* addresses_out; /** the pointer to receive the service config in JSON */ char** service_config_json_out; /** the evernt driver used by this request */ @@ -355,8 +355,8 @@ void grpc_dns_lookup_ares_continue_after_check_localhost_and_ip_literals_locked( grpc_ares_hostbyname_request* hr = nullptr; ares_channel* channel = nullptr; /* parse name, splitting it into host and port parts */ - grpc_core::UniquePtr host; - grpc_core::UniquePtr port; + std::unique_ptr host; + std::unique_ptr port; grpc_core::SplitHostPort(name, &host, &port); if (host == nullptr) { error = grpc_error_set_str( @@ -452,9 +452,9 @@ error_cleanup: static bool inner_resolve_as_ip_literal_locked( const char* name, const char* default_port, - grpc_core::UniquePtr* addrs, - grpc_core::UniquePtr* host, grpc_core::UniquePtr* port, - grpc_core::UniquePtr* hostport) { + std::unique_ptr* addrs, + std::unique_ptr* host, std::unique_ptr* port, + std::unique_ptr* hostport) { grpc_core::SplitHostPort(name, host, port); if (*host == nullptr) { gpr_log(GPR_ERROR, @@ -489,18 +489,18 @@ static bool inner_resolve_as_ip_literal_locked( static bool resolve_as_ip_literal_locked( const char* name, const char* default_port, - grpc_core::UniquePtr* addrs) { - grpc_core::UniquePtr host; - grpc_core::UniquePtr port; - grpc_core::UniquePtr hostport; + std::unique_ptr* addrs) { + std::unique_ptr host; + std::unique_ptr port; + std::unique_ptr hostport; bool out = inner_resolve_as_ip_literal_locked(name, default_port, addrs, &host, &port, &hostport); return out; } static bool target_matches_localhost_inner(const char* name, - grpc_core::UniquePtr* host, - grpc_core::UniquePtr* port) { + std::unique_ptr* host, + std::unique_ptr* port) { if (!grpc_core::SplitHostPort(name, host, port)) { gpr_log(GPR_ERROR, "Unable to split host and port for name: %s", name); return false; @@ -513,16 +513,16 @@ static bool target_matches_localhost_inner(const char* name, } static bool target_matches_localhost(const char* name) { - grpc_core::UniquePtr host; - grpc_core::UniquePtr port; + std::unique_ptr host; + std::unique_ptr port; return target_matches_localhost_inner(name, &host, &port); } #ifdef GRPC_ARES_RESOLVE_LOCALHOST_MANUALLY static bool inner_maybe_resolve_localhost_manually_locked( const char* name, const char* default_port, - grpc_core::UniquePtr* addrs, - grpc_core::UniquePtr* host, grpc_core::UniquePtr* port) { + std::unique_ptr* addrs, + std::unique_ptr* host, std::unique_ptr* port) { grpc_core::SplitHostPort(name, host, port); if (*host == nullptr) { gpr_log(GPR_ERROR, @@ -571,16 +571,16 @@ static bool inner_maybe_resolve_localhost_manually_locked( static bool grpc_ares_maybe_resolve_localhost_manually_locked( const char* name, const char* default_port, - grpc_core::UniquePtr* addrs) { - grpc_core::UniquePtr host; - grpc_core::UniquePtr port; + std::unique_ptr* addrs) { + std::unique_ptr host; + std::unique_ptr port; return inner_maybe_resolve_localhost_manually_locked(name, default_port, addrs, &host, &port); } #else /* GRPC_ARES_RESOLVE_LOCALHOST_MANUALLY */ static bool grpc_ares_maybe_resolve_localhost_manually_locked( const char* /*name*/, const char* /*default_port*/, - grpc_core::UniquePtr* /*addrs*/) { + std::unique_ptr* /*addrs*/) { return false; } #endif /* GRPC_ARES_RESOLVE_LOCALHOST_MANUALLY */ @@ -588,8 +588,8 @@ static bool grpc_ares_maybe_resolve_localhost_manually_locked( static grpc_ares_request* grpc_dns_lookup_ares_locked_impl( const char* dns_server, const char* name, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, - grpc_core::UniquePtr* addrs, - bool check_grpclb, char** service_config_json, int query_timeout_ms, + std::unique_ptr* addrs, bool check_grpclb, + char** service_config_json, int query_timeout_ms, grpc_core::Combiner* combiner) { grpc_ares_request* r = static_cast(gpr_zalloc(sizeof(grpc_ares_request))); @@ -631,8 +631,8 @@ static grpc_ares_request* grpc_dns_lookup_ares_locked_impl( grpc_ares_request* (*grpc_dns_lookup_ares_locked)( const char* dns_server, const char* name, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, - grpc_core::UniquePtr* addrs, - bool check_grpclb, char** service_config_json, int query_timeout_ms, + std::unique_ptr* addrs, bool check_grpclb, + char** service_config_json, int query_timeout_ms, grpc_core::Combiner* combiner) = grpc_dns_lookup_ares_locked_impl; static void grpc_cancel_ares_request_locked_impl(grpc_ares_request* r) { @@ -678,7 +678,7 @@ typedef struct grpc_resolve_address_ares_request { /** the pointer to receive the resolved addresses */ grpc_resolved_addresses** addrs_out; /** currently resolving addresses */ - grpc_core::UniquePtr addresses; + std::unique_ptr addresses; /** closure to call when the resolve_address_ares request completes */ grpc_closure* on_resolve_address_done; /** a closure wrapping on_resolve_address_done, which should be invoked when diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h index ca5e91139bf..115018155b3 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h @@ -63,8 +63,8 @@ extern void (*grpc_resolve_address_ares)(const char* name, extern grpc_ares_request* (*grpc_dns_lookup_ares_locked)( const char* dns_server, const char* name, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, - grpc_core::UniquePtr* addresses, - bool check_grpclb, char** service_config_json, int query_timeout_ms, + std::unique_ptr* addresses, bool check_grpclb, + char** service_config_json, int query_timeout_ms, grpc_core::Combiner* combiner); /* Cancel the pending grpc_ares_request \a request */ diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc index 05d6eaace66..fe631f873e9 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc @@ -29,8 +29,8 @@ struct grpc_ares_request { static grpc_ares_request* grpc_dns_lookup_ares_locked_impl( const char* dns_server, const char* name, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, - grpc_core::UniquePtr* addrs, - bool check_grpclb, char** service_config_json, int query_timeout_ms, + std::unique_ptr* addrs, bool check_grpclb, + char** service_config_json, int query_timeout_ms, grpc_core::Combiner* combiner) { return NULL; } @@ -38,8 +38,8 @@ static grpc_ares_request* grpc_dns_lookup_ares_locked_impl( grpc_ares_request* (*grpc_dns_lookup_ares_locked)( const char* dns_server, const char* name, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, - grpc_core::UniquePtr* addrs, - bool check_grpclb, char** service_config_json, int query_timeout_ms, + std::unique_ptr* addrs, bool check_grpclb, + char** service_config_json, int query_timeout_ms, grpc_core::Combiner* combiner) = grpc_dns_lookup_ares_locked_impl; static void grpc_cancel_ares_request_locked_impl(grpc_ares_request* r) {} diff --git a/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc b/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc index d7028a5eaa3..f0224b00e7a 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc @@ -300,8 +300,7 @@ class NativeDnsResolverFactory : public ResolverFactory { } // namespace grpc_core void grpc_resolver_dns_native_init() { - grpc_core::UniquePtr resolver = - GPR_GLOBAL_CONFIG_GET(grpc_dns_resolver); + std::unique_ptr resolver = GPR_GLOBAL_CONFIG_GET(grpc_dns_resolver); if (gpr_stricmp(resolver.get(), "native") == 0) { gpr_log(GPR_DEBUG, "Using native dns resolver"); grpc_core::ResolverRegistry::Builder::RegisterResolverFactory( diff --git a/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc b/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc index 066e3fd0b49..67cf40e8469 100644 --- a/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc @@ -97,7 +97,8 @@ bool ParseUri(const grpc_uri* uri, bool errors_found = false; for (size_t i = 0; i < path_parts.count; i++) { grpc_uri ith_uri = *uri; - UniquePtr part_str(grpc_slice_to_c_string(path_parts.slices[i])); + std::unique_ptr part_str( + grpc_slice_to_c_string(path_parts.slices[i])); ith_uri.path = part_str.get(); grpc_resolved_address addr; if (!parse(&ith_uri, &addr)) { @@ -160,8 +161,8 @@ class UnixResolverFactory : public ResolverFactory { return CreateSockaddrResolver(std::move(args), grpc_parse_unix); } - UniquePtr GetDefaultAuthority(grpc_uri* /*uri*/) const override { - return UniquePtr(gpr_strdup("localhost")); + std::unique_ptr GetDefaultAuthority(grpc_uri* /*uri*/) const override { + return std::unique_ptr(gpr_strdup("localhost")); } const char* scheme() const override { return "unix"; } diff --git a/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc b/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc index 41dfbcde911..d2916f4c11b 100644 --- a/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc @@ -60,7 +60,7 @@ class XdsResolver : public Resolver { RefCountedPtr resolver_; }; - UniquePtr server_name_; + std::unique_ptr server_name_; const grpc_channel_args* args_; grpc_pollset_set* interested_parties_; OrphanablePtr xds_client_; diff --git a/src/core/ext/filters/client_channel/resolver_factory.h b/src/core/ext/filters/client_channel/resolver_factory.h index 0349c4745ff..21933e0592b 100644 --- a/src/core/ext/filters/client_channel/resolver_factory.h +++ b/src/core/ext/filters/client_channel/resolver_factory.h @@ -41,7 +41,7 @@ struct ResolverArgs { /// The combiner under which all resolver calls will be run. Combiner* combiner = nullptr; /// The result handler to be used by the resolver. - UniquePtr result_handler; + std::unique_ptr result_handler; }; class ResolverFactory { @@ -55,10 +55,10 @@ class ResolverFactory { /// Returns a string representing the default authority to use for this /// scheme. - virtual UniquePtr GetDefaultAuthority(grpc_uri* uri) const { + virtual std::unique_ptr GetDefaultAuthority(grpc_uri* uri) const { const char* path = uri->path; if (path[0] == '/') ++path; - return UniquePtr(gpr_strdup(path)); + return std::unique_ptr(gpr_strdup(path)); } /// Returns the URI scheme that this factory implements. diff --git a/src/core/ext/filters/client_channel/resolver_registry.cc b/src/core/ext/filters/client_channel/resolver_registry.cc index fd34b9c856c..0a073738918 100644 --- a/src/core/ext/filters/client_channel/resolver_registry.cc +++ b/src/core/ext/filters/client_channel/resolver_registry.cc @@ -40,7 +40,7 @@ class RegistryState { default_prefix_.reset(gpr_strdup(default_resolver_prefix)); } - void RegisterResolverFactory(UniquePtr factory) { + void RegisterResolverFactory(std::unique_ptr factory) { for (size_t i = 0; i < factories_.size(); ++i) { GPR_ASSERT(strcmp(factories_[i]->scheme(), factory->scheme()) != 0); } @@ -90,8 +90,8 @@ class RegistryState { // more factories are needed and the additional allocations are // hurting performance (which is unlikely, since these allocations // only occur at gRPC initialization time). - InlinedVector, 10> factories_; - UniquePtr default_prefix_; + InlinedVector, 10> factories_; + std::unique_ptr default_prefix_; }; static RegistryState* g_state = nullptr; @@ -118,7 +118,7 @@ void ResolverRegistry::Builder::SetDefaultPrefix( } void ResolverRegistry::Builder::RegisterResolverFactory( - UniquePtr factory) { + std::unique_ptr factory) { InitRegistry(); g_state->RegisterResolverFactory(std::move(factory)); } @@ -146,7 +146,7 @@ bool ResolverRegistry::IsValidTarget(const char* target) { OrphanablePtr ResolverRegistry::CreateResolver( const char* target, const grpc_channel_args* args, grpc_pollset_set* pollset_set, Combiner* combiner, - UniquePtr result_handler) { + std::unique_ptr result_handler) { GPR_ASSERT(g_state != nullptr); grpc_uri* uri = nullptr; char* canonical_target = nullptr; @@ -166,27 +166,29 @@ OrphanablePtr ResolverRegistry::CreateResolver( return resolver; } -UniquePtr ResolverRegistry::GetDefaultAuthority(const char* target) { +std::unique_ptr ResolverRegistry::GetDefaultAuthority( + const char* target) { GPR_ASSERT(g_state != nullptr); grpc_uri* uri = nullptr; char* canonical_target = nullptr; ResolverFactory* factory = g_state->FindResolverFactory(target, &uri, &canonical_target); - UniquePtr authority = + std::unique_ptr authority = factory == nullptr ? nullptr : factory->GetDefaultAuthority(uri); grpc_uri_destroy(uri); gpr_free(canonical_target); return authority; } -UniquePtr ResolverRegistry::AddDefaultPrefixIfNeeded(const char* target) { +std::unique_ptr ResolverRegistry::AddDefaultPrefixIfNeeded( + const char* target) { GPR_ASSERT(g_state != nullptr); grpc_uri* uri = nullptr; char* canonical_target = nullptr; g_state->FindResolverFactory(target, &uri, &canonical_target); grpc_uri_destroy(uri); - return UniquePtr(canonical_target == nullptr ? gpr_strdup(target) - : canonical_target); + return std::unique_ptr(canonical_target == nullptr ? gpr_strdup(target) + : canonical_target); } } // namespace grpc_core diff --git a/src/core/ext/filters/client_channel/resolver_registry.h b/src/core/ext/filters/client_channel/resolver_registry.h index dd3ac4713e9..4dd83e51aab 100644 --- a/src/core/ext/filters/client_channel/resolver_registry.h +++ b/src/core/ext/filters/client_channel/resolver_registry.h @@ -47,7 +47,8 @@ class ResolverRegistry { /// Registers a resolver factory. The factory will be used to create a /// resolver for any URI whose scheme matches that of the factory. /// Calls InitRegistry() if it has not already been called. - static void RegisterResolverFactory(UniquePtr factory); + static void RegisterResolverFactory( + std::unique_ptr factory); }; /// Checks whether the user input \a target is valid to create a resolver. @@ -69,13 +70,13 @@ class ResolverRegistry { static OrphanablePtr CreateResolver( const char* target, const grpc_channel_args* args, grpc_pollset_set* pollset_set, Combiner* combiner, - UniquePtr result_handler); + std::unique_ptr result_handler); /// Returns the default authority to pass from a client for \a target. - static UniquePtr GetDefaultAuthority(const char* target); + static std::unique_ptr GetDefaultAuthority(const char* target); /// Returns \a target with the default prefix prepended, if needed. - static UniquePtr AddDefaultPrefixIfNeeded(const char* target); + static std::unique_ptr AddDefaultPrefixIfNeeded(const char* target); /// Returns the resolver factory for \a scheme. /// Caller does NOT own the return value. diff --git a/src/core/ext/filters/client_channel/resolver_result_parsing.cc b/src/core/ext/filters/client_channel/resolver_result_parsing.cc index 221e0f4feb3..abb939dc1f5 100644 --- a/src/core/ext/filters/client_channel/resolver_result_parsing.cc +++ b/src/core/ext/filters/client_channel/resolver_result_parsing.cc @@ -66,7 +66,7 @@ bool ParseDuration(grpc_json* field, grpc_millis* duration) { if (field->type != GRPC_JSON_STRING) return false; size_t len = strlen(field->value); if (field->value[len - 1] != 's') return false; - UniquePtr buf(gpr_strdup(field->value)); + std::unique_ptr buf(gpr_strdup(field->value)); *(buf.get() + len - 1) = '\0'; // Remove trailing 's'. char* decimal_point = strchr(buf.get(), '.'); int nanos = 0; @@ -91,7 +91,7 @@ bool ParseDuration(grpc_json* field, grpc_millis* duration) { return true; } -UniquePtr ParseRetryPolicy( +std::unique_ptr ParseRetryPolicy( grpc_json* field, grpc_error** error) { GPR_DEBUG_ASSERT(error != nullptr && *error == GRPC_ERROR_NONE); auto retry_policy = @@ -262,13 +262,13 @@ const char* ParseHealthCheckConfig(const grpc_json* field, grpc_error** error) { } // namespace -UniquePtr +std::unique_ptr ClientChannelServiceConfigParser::ParseGlobalParams(const grpc_json* json, grpc_error** error) { GPR_DEBUG_ASSERT(error != nullptr && *error == GRPC_ERROR_NONE); InlinedVector error_list; RefCountedPtr parsed_lb_config; - UniquePtr lb_policy_name; + std::unique_ptr lb_policy_name; Optional retry_throttling; const char* health_check_service_name = nullptr; for (grpc_json* field = json->child; field != nullptr; field = field->next) { @@ -445,14 +445,14 @@ ClientChannelServiceConfigParser::ParseGlobalParams(const grpc_json* json, return nullptr; } -UniquePtr +std::unique_ptr ClientChannelServiceConfigParser::ParsePerMethodParams(const grpc_json* json, grpc_error** error) { GPR_DEBUG_ASSERT(error != nullptr && *error == GRPC_ERROR_NONE); InlinedVector error_list; Optional wait_for_ready; grpc_millis timeout = 0; - UniquePtr retry_policy; + std::unique_ptr retry_policy; for (grpc_json* field = json->child; field != nullptr; field = field->next) { if (field->key == nullptr) continue; if (strcmp(field->key, "waitForReady") == 0) { diff --git a/src/core/ext/filters/client_channel/resolver_result_parsing.h b/src/core/ext/filters/client_channel/resolver_result_parsing.h index d0a0456875d..33f5fc1f0ac 100644 --- a/src/core/ext/filters/client_channel/resolver_result_parsing.h +++ b/src/core/ext/filters/client_channel/resolver_result_parsing.h @@ -46,7 +46,7 @@ class ClientChannelGlobalParsedConfig : public ServiceConfig::ParsedConfig { ClientChannelGlobalParsedConfig( RefCountedPtr parsed_lb_config, - UniquePtr parsed_deprecated_lb_policy, + std::unique_ptr parsed_deprecated_lb_policy, const Optional& retry_throttling, const char* health_check_service_name) : parsed_lb_config_(std::move(parsed_lb_config)), @@ -72,7 +72,7 @@ class ClientChannelGlobalParsedConfig : public ServiceConfig::ParsedConfig { private: RefCountedPtr parsed_lb_config_; - UniquePtr parsed_deprecated_lb_policy_; + std::unique_ptr parsed_deprecated_lb_policy_; Optional retry_throttling_; const char* health_check_service_name_; }; @@ -89,7 +89,7 @@ class ClientChannelMethodParsedConfig : public ServiceConfig::ParsedConfig { ClientChannelMethodParsedConfig(grpc_millis timeout, const Optional& wait_for_ready, - UniquePtr retry_policy) + std::unique_ptr retry_policy) : timeout_(timeout), wait_for_ready_(wait_for_ready), retry_policy_(std::move(retry_policy)) {} @@ -103,15 +103,15 @@ class ClientChannelMethodParsedConfig : public ServiceConfig::ParsedConfig { private: grpc_millis timeout_ = 0; Optional wait_for_ready_; - UniquePtr retry_policy_; + std::unique_ptr retry_policy_; }; class ClientChannelServiceConfigParser : public ServiceConfig::Parser { public: - UniquePtr ParseGlobalParams( + std::unique_ptr ParseGlobalParams( const grpc_json* json, grpc_error** error) override; - UniquePtr ParsePerMethodParams( + std::unique_ptr ParsePerMethodParams( const grpc_json* json, grpc_error** error) override; static size_t ParserIndex(); diff --git a/src/core/ext/filters/client_channel/resolving_lb_policy.cc b/src/core/ext/filters/client_channel/resolving_lb_policy.cc index 15182000dc5..a6e83ce7c00 100644 --- a/src/core/ext/filters/client_channel/resolving_lb_policy.cc +++ b/src/core/ext/filters/client_channel/resolving_lb_policy.cc @@ -114,7 +114,7 @@ class ResolvingLoadBalancingPolicy::ResolvingControlHelper } void UpdateState(grpc_connectivity_state state, - UniquePtr picker) override { + std::unique_ptr picker) override { if (parent_->resolver_ == nullptr) return; // Shutting down. // If this request is from the pending child policy, ignore it until // it reports READY, at which point we swap it into place. @@ -177,7 +177,7 @@ class ResolvingLoadBalancingPolicy::ResolvingControlHelper // ResolvingLoadBalancingPolicy::ResolvingLoadBalancingPolicy( - Args args, TraceFlag* tracer, UniquePtr target_uri, + Args args, TraceFlag* tracer, std::unique_ptr target_uri, ProcessResolverResultCallback process_resolver_result, void* process_resolver_result_user_data) : LoadBalancingPolicy(std::move(args)), @@ -375,7 +375,7 @@ ResolvingLoadBalancingPolicy::CreateLbPolicyLocked( LoadBalancingPolicy::Args lb_policy_args; lb_policy_args.combiner = combiner(); lb_policy_args.channel_control_helper = - UniquePtr(helper); + std::unique_ptr(helper); lb_policy_args.args = &args; OrphanablePtr lb_policy = LoadBalancingPolicyRegistry::CreateLoadBalancingPolicy( @@ -425,7 +425,7 @@ void ResolvingLoadBalancingPolicy::ConcatenateAndAddChannelTraceLocked( gpr_strvec_add(&v, (*trace_strings)[i]); } size_t len = 0; - UniquePtr message(gpr_strvec_flatten(&v, &len)); + std::unique_ptr message(gpr_strvec_flatten(&v, &len)); channel_control_helper()->AddTraceEvent(ChannelControlHelper::TRACE_INFO, StringView(message.get())); gpr_strvec_destroy(&v); diff --git a/src/core/ext/filters/client_channel/resolving_lb_policy.h b/src/core/ext/filters/client_channel/resolving_lb_policy.h index 342a30e88a5..7db6426957a 100644 --- a/src/core/ext/filters/client_channel/resolving_lb_policy.h +++ b/src/core/ext/filters/client_channel/resolving_lb_policy.h @@ -65,7 +65,7 @@ class ResolvingLoadBalancingPolicy : public LoadBalancingPolicy { // If error is set when this returns, then construction failed, and // the caller may not use the new object. ResolvingLoadBalancingPolicy( - Args args, TraceFlag* tracer, UniquePtr target_uri, + Args args, TraceFlag* tracer, std::unique_ptr target_uri, ProcessResolverResultCallback process_resolver_result, void* process_resolver_result_user_data); @@ -106,10 +106,10 @@ class ResolvingLoadBalancingPolicy : public LoadBalancingPolicy { // Passed in from caller at construction time. TraceFlag* tracer_; - UniquePtr target_uri_; + std::unique_ptr target_uri_; ProcessResolverResultCallback process_resolver_result_ = nullptr; void* process_resolver_result_user_data_ = nullptr; - UniquePtr child_policy_name_; + std::unique_ptr child_policy_name_; RefCountedPtr child_lb_config_; // Resolver and associated state. diff --git a/src/core/ext/filters/client_channel/service_config.cc b/src/core/ext/filters/client_channel/service_config.cc index 3a089f5b442..5be16b93ef6 100644 --- a/src/core/ext/filters/client_channel/service_config.cc +++ b/src/core/ext/filters/client_channel/service_config.cc @@ -34,7 +34,7 @@ namespace grpc_core { namespace { -typedef InlinedVector, +typedef InlinedVector, ServiceConfig::kNumPreallocatedParsers> ServiceConfigParserList; ServiceConfigParserList* g_registered_parsers; @@ -42,8 +42,8 @@ ServiceConfigParserList* g_registered_parsers; RefCountedPtr ServiceConfig::Create(const char* json, grpc_error** error) { - UniquePtr service_config_json(gpr_strdup(json)); - UniquePtr json_string(gpr_strdup(json)); + std::unique_ptr service_config_json(gpr_strdup(json)); + std::unique_ptr json_string(gpr_strdup(json)); GPR_DEBUG_ASSERT(error != nullptr); grpc_json* json_tree = grpc_json_parse_string(json_string.get()); if (json_tree == nullptr) { @@ -55,9 +55,9 @@ RefCountedPtr ServiceConfig::Create(const char* json, std::move(service_config_json), std::move(json_string), json_tree, error); } -ServiceConfig::ServiceConfig(UniquePtr service_config_json, - UniquePtr json_string, grpc_json* json_tree, - grpc_error** error) +ServiceConfig::ServiceConfig(std::unique_ptr service_config_json, + std::unique_ptr json_string, + grpc_json* json_tree, grpc_error** error) : service_config_json_(std::move(service_config_json)), json_string_(std::move(json_string)), json_tree_(json_tree) { @@ -121,7 +121,7 @@ grpc_error* ServiceConfig::ParseJsonMethodConfigToServiceConfigVectorTable( [parsed_method_config_vectors_storage_.size() - 1] .get(); // Construct list of paths. - InlinedVector, 10> paths; + InlinedVector, 10> paths; for (grpc_json* child = json->child; child != nullptr; child = child->next) { if (child->key == nullptr) continue; if (strcmp(child->key, "name") == 0) { @@ -132,7 +132,7 @@ grpc_error* ServiceConfig::ParseJsonMethodConfigToServiceConfigVectorTable( } for (grpc_json* name = child->child; name != nullptr; name = name->next) { grpc_error* parse_error = GRPC_ERROR_NONE; - UniquePtr path = ParseJsonMethodName(name, &parse_error); + std::unique_ptr path = ParseJsonMethodName(name, &parse_error); if (path == nullptr) { error_list.push_back(parse_error); } else { @@ -228,8 +228,8 @@ int ServiceConfig::CountNamesInMethodConfig(grpc_json* json) { return num_names; } -UniquePtr ServiceConfig::ParseJsonMethodName(grpc_json* json, - grpc_error** error) { +std::unique_ptr ServiceConfig::ParseJsonMethodName(grpc_json* json, + grpc_error** error) { if (json->type != GRPC_JSON_OBJECT) { *error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( "field:name error:type is not object"); @@ -282,7 +282,7 @@ UniquePtr ServiceConfig::ParseJsonMethodName(grpc_json* json, char* path; gpr_asprintf(&path, "/%s/%s", service_name, method_name == nullptr ? "*" : method_name); - return UniquePtr(path); + return std::unique_ptr(path); } const ServiceConfig::ParsedConfigVector* @@ -311,7 +311,7 @@ ServiceConfig::GetMethodParsedConfigVector(const grpc_slice& path) { return *value; } -size_t ServiceConfig::RegisterParser(UniquePtr parser) { +size_t ServiceConfig::RegisterParser(std::unique_ptr parser) { g_registered_parsers->push_back(std::move(parser)); return g_registered_parsers->size() - 1; } diff --git a/src/core/ext/filters/client_channel/service_config.h b/src/core/ext/filters/client_channel/service_config.h index e510c599e0c..634412ebd5a 100644 --- a/src/core/ext/filters/client_channel/service_config.h +++ b/src/core/ext/filters/client_channel/service_config.h @@ -69,7 +69,7 @@ class ServiceConfig : public RefCounted { public: virtual ~Parser() = default; - virtual UniquePtr ParseGlobalParams( + virtual std::unique_ptr ParseGlobalParams( const grpc_json* /* json */, grpc_error** error) { // Avoid unused parameter warning on debug-only parameter (void)error; @@ -77,7 +77,7 @@ class ServiceConfig : public RefCounted { return nullptr; } - virtual UniquePtr ParsePerMethodParams( + virtual std::unique_ptr ParsePerMethodParams( const grpc_json* /* json */, grpc_error** error) { // Avoid unused parameter warning on debug-only parameter (void)error; @@ -87,7 +87,7 @@ class ServiceConfig : public RefCounted { }; static constexpr int kNumPreallocatedParsers = 4; - typedef InlinedVector, kNumPreallocatedParsers> + typedef InlinedVector, kNumPreallocatedParsers> ParsedConfigVector; /// When a service config is applied to a call in the client_channel_filter, @@ -129,8 +129,8 @@ class ServiceConfig : public RefCounted { grpc_error** error); // Takes ownership of \a json_tree. - ServiceConfig(UniquePtr service_config_json, - UniquePtr json_string, grpc_json* json_tree, + ServiceConfig(std::unique_ptr service_config_json, + std::unique_ptr json_string, grpc_json* json_tree, grpc_error** error); ~ServiceConfig(); @@ -155,7 +155,7 @@ class ServiceConfig : public RefCounted { /// registered parser. Each parser is responsible for reading the service /// config json and returning a parsed config. This parsed config can later be /// retrieved using the same index that was returned at registration time. - static size_t RegisterParser(UniquePtr parser); + static size_t RegisterParser(std::unique_ptr parser); static void Init(); @@ -171,18 +171,18 @@ class ServiceConfig : public RefCounted { // Returns a path string for the JSON name object specified by \a json. // Returns null on error, and stores error in \a error. - static UniquePtr ParseJsonMethodName(grpc_json* json, - grpc_error** error); + static std::unique_ptr ParseJsonMethodName(grpc_json* json, + grpc_error** error); grpc_error* ParseJsonMethodConfigToServiceConfigVectorTable( const grpc_json* json, SliceHashTable::Entry* entries, size_t* idx); - UniquePtr service_config_json_; - UniquePtr json_string_; // Underlying storage for json_tree. + std::unique_ptr service_config_json_; + std::unique_ptr json_string_; // Underlying storage for json_tree. grpc_json* json_tree_; - InlinedVector, kNumPreallocatedParsers> + InlinedVector, kNumPreallocatedParsers> parsed_global_configs_; // A map from the method name to the parsed config vector. Note that we are // using a raw pointer and not a unique pointer so that we can use the same @@ -191,7 +191,7 @@ class ServiceConfig : public RefCounted { parsed_method_configs_table_; // Storage for all the vectors that are being used in // parsed_method_configs_table_. - InlinedVector, 32> + InlinedVector, 32> parsed_method_config_vectors_storage_; }; diff --git a/src/core/ext/filters/client_channel/subchannel.cc b/src/core/ext/filters/client_channel/subchannel.cc index d7a7f1be1b0..00f5f2f250a 100644 --- a/src/core/ext/filters/client_channel/subchannel.cc +++ b/src/core/ext/filters/client_channel/subchannel.cc @@ -404,7 +404,7 @@ void Subchannel::ConnectivityStateWatcherList::NotifyLocked( class Subchannel::HealthWatcherMap::HealthWatcher : public AsyncConnectivityStateWatcherInterface { public: - HealthWatcher(Subchannel* c, UniquePtr health_check_service_name, + HealthWatcher(Subchannel* c, std::unique_ptr health_check_service_name, grpc_connectivity_state subchannel_state) : subchannel_(c), health_check_service_name_(std::move(health_check_service_name)), @@ -489,7 +489,7 @@ class Subchannel::HealthWatcherMap::HealthWatcher } Subchannel* subchannel_; - UniquePtr health_check_service_name_; + std::unique_ptr health_check_service_name_; OrphanablePtr health_check_client_; grpc_connectivity_state state_; ConnectivityStateWatcherList watcher_list_; @@ -501,7 +501,7 @@ class Subchannel::HealthWatcherMap::HealthWatcher void Subchannel::HealthWatcherMap::AddWatcherLocked( Subchannel* subchannel, grpc_connectivity_state initial_state, - UniquePtr health_check_service_name, + std::unique_ptr health_check_service_name, OrphanablePtr watcher) { // If the health check service name is not already present in the map, // add it. @@ -786,7 +786,7 @@ grpc_connectivity_state Subchannel::CheckConnectivityState( void Subchannel::WatchConnectivityState( grpc_connectivity_state initial_state, - UniquePtr health_check_service_name, + std::unique_ptr health_check_service_name, OrphanablePtr watcher) { MutexLock lock(&mu_); grpc_pollset_set* interested_parties = watcher->interested_parties(); diff --git a/src/core/ext/filters/client_channel/subchannel.h b/src/core/ext/filters/client_channel/subchannel.h index be17de53373..bf02dddbf3f 100644 --- a/src/core/ext/filters/client_channel/subchannel.h +++ b/src/core/ext/filters/client_channel/subchannel.h @@ -242,7 +242,7 @@ class Subchannel { // destroyed or when CancelConnectivityStateWatch() is called. void WatchConnectivityState( grpc_connectivity_state initial_state, - UniquePtr health_check_service_name, + std::unique_ptr health_check_service_name, OrphanablePtr watcher); // Cancels a connectivity state watch. @@ -311,7 +311,7 @@ class Subchannel { public: void AddWatcherLocked( Subchannel* subchannel, grpc_connectivity_state initial_state, - UniquePtr health_check_service_name, + std::unique_ptr health_check_service_name, OrphanablePtr watcher); void RemoveWatcherLocked(const char* health_check_service_name, ConnectivityStateWatcherInterface* watcher); diff --git a/src/core/ext/filters/client_channel/subchannel_interface.h b/src/core/ext/filters/client_channel/subchannel_interface.h index 9ea3dfe4931..f7a788a9b94 100644 --- a/src/core/ext/filters/client_channel/subchannel_interface.h +++ b/src/core/ext/filters/client_channel/subchannel_interface.h @@ -66,7 +66,7 @@ class SubchannelInterface : public RefCounted { // the previous watcher using CancelConnectivityStateWatch(). virtual void WatchConnectivityState( grpc_connectivity_state initial_state, - UniquePtr watcher) = 0; + std::unique_ptr watcher) = 0; // Cancels a connectivity state watch. // If the watcher has already been destroyed, this is a no-op. diff --git a/src/core/ext/filters/client_channel/xds/xds_api.cc b/src/core/ext/filters/client_channel/xds/xds_api.cc index 01874823b9c..85dc17448d0 100644 --- a/src/core/ext/filters/client_channel/xds/xds_api.cc +++ b/src/core/ext/filters/client_channel/xds/xds_api.cc @@ -88,7 +88,8 @@ bool XdsPriorityListUpdate::Contains( return false; } -bool XdsDropConfig::ShouldDrop(const UniquePtr** category_name) const { +bool XdsDropConfig::ShouldDrop( + const std::unique_ptr** category_name) const { for (size_t i = 0; i < drop_category_list_.size(); ++i) { const auto& drop_category = drop_category_list_[i]; // Generate a random number in [0, 1000000). @@ -258,11 +259,11 @@ grpc_error* ServerAddressParseAndAppend( namespace { -UniquePtr StringCopy(const upb_strview& strview) { +std::unique_ptr StringCopy(const upb_strview& strview) { char* str = static_cast(gpr_malloc(strview.size + 1)); memcpy(str, strview.data, strview.size); str[strview.size] = '\0'; - return UniquePtr(str); + return std::unique_ptr(str); } } // namespace @@ -542,7 +543,7 @@ grpc_slice XdsLrsRequestCreateAndEncode(const char* server_name, } grpc_error* XdsLrsResponseDecodeAndParse(const grpc_slice& encoded_response, - UniquePtr* cluster_name, + std::unique_ptr* cluster_name, grpc_millis* load_reporting_interval) { upb::Arena arena; // Decode the response. diff --git a/src/core/ext/filters/client_channel/xds/xds_api.h b/src/core/ext/filters/client_channel/xds/xds_api.h index 70241334a9d..5050c1cafe3 100644 --- a/src/core/ext/filters/client_channel/xds/xds_api.h +++ b/src/core/ext/filters/client_channel/xds/xds_api.h @@ -101,19 +101,19 @@ class XdsDropConfig : public RefCounted { parts_per_million == other.parts_per_million; } - UniquePtr name; + std::unique_ptr name; const uint32_t parts_per_million; }; using DropCategoryList = InlinedVector; - void AddCategory(UniquePtr name, uint32_t parts_per_million) { + void AddCategory(std::unique_ptr name, uint32_t parts_per_million) { drop_category_list_.emplace_back( DropCategory{std::move(name), parts_per_million}); } // The only method invoked from the data plane combiner. - bool ShouldDrop(const UniquePtr** category_name) const; + bool ShouldDrop(const std::unique_ptr** category_name) const; const DropCategoryList& drop_category_list() const { return drop_category_list_; @@ -139,12 +139,12 @@ struct EdsUpdate { struct CdsUpdate { // The name to use in the EDS request. // If null, the cluster name will be used. - UniquePtr eds_service_name; + std::unique_ptr eds_service_name; // The LRS server to use for load reporting. // If null, load reporting will be disabled. // If set to the empty string, will use the same server we obtained // the CDS data from. - UniquePtr lrs_load_reporting_server_name; + std::unique_ptr lrs_load_reporting_server_name; }; // Creates an EDS request querying \a service_name. @@ -171,7 +171,7 @@ grpc_slice XdsLrsRequestCreateAndEncode(const char* server_name, // load_reporting_interval for client-side load reporting. If there is any // error, the output config is invalid. grpc_error* XdsLrsResponseDecodeAndParse(const grpc_slice& encoded_response, - UniquePtr* cluster_name, + std::unique_ptr* cluster_name, grpc_millis* load_reporting_interval); } // namespace grpc_core diff --git a/src/core/ext/filters/client_channel/xds/xds_bootstrap.cc b/src/core/ext/filters/client_channel/xds/xds_bootstrap.cc index f2bba8faf96..820bccba2bc 100644 --- a/src/core/ext/filters/client_channel/xds/xds_bootstrap.cc +++ b/src/core/ext/filters/client_channel/xds/xds_bootstrap.cc @@ -29,8 +29,8 @@ namespace grpc_core { -UniquePtr XdsBootstrap::ReadFromFile(grpc_error** error) { - UniquePtr path(gpr_getenv("GRPC_XDS_BOOTSTRAP")); +std::unique_ptr XdsBootstrap::ReadFromFile(grpc_error** error) { + std::unique_ptr path(gpr_getenv("GRPC_XDS_BOOTSTRAP")); if (path == nullptr) { *error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( "GRPC_XDS_BOOTSTRAP env var not set"); diff --git a/src/core/ext/filters/client_channel/xds/xds_bootstrap.h b/src/core/ext/filters/client_channel/xds/xds_bootstrap.h index c0712ec24ed..d8705fa3ff2 100644 --- a/src/core/ext/filters/client_channel/xds/xds_bootstrap.h +++ b/src/core/ext/filters/client_channel/xds/xds_bootstrap.h @@ -60,7 +60,7 @@ class XdsBootstrap { // If *error is not GRPC_ERROR_NONE after returning, then there was an // error reading the file. - static UniquePtr ReadFromFile(grpc_error** error); + static std::unique_ptr ReadFromFile(grpc_error** error); // Do not instantiate directly -- use ReadFromFile() above instead. XdsBootstrap(grpc_slice contents, grpc_error** error); @@ -92,7 +92,7 @@ class XdsBootstrap { const char* server_uri_ = nullptr; InlinedVector channel_creds_; - UniquePtr node_; + std::unique_ptr node_; }; } // namespace grpc_core diff --git a/src/core/ext/filters/client_channel/xds/xds_client.cc b/src/core/ext/filters/client_channel/xds/xds_client.cc index 2f9ef9e2a61..f2208567750 100644 --- a/src/core/ext/filters/client_channel/xds/xds_client.cc +++ b/src/core/ext/filters/client_channel/xds/xds_client.cc @@ -244,7 +244,7 @@ class XdsClient::ChannelState::LrsCallState grpc_closure on_status_received_; // Load reporting state. - UniquePtr cluster_name_; + std::unique_ptr cluster_name_; grpc_millis load_reporting_interval_ = 0; OrphanablePtr reporter_; }; @@ -1124,7 +1124,7 @@ void XdsClient::ChannelState::LrsCallState::OnResponseReceivedLocked( // This anonymous lambda is a hack to avoid the usage of goto. [&]() { // Parse the response. - UniquePtr new_cluster_name; + std::unique_ptr new_cluster_name; grpc_millis new_load_reporting_interval; grpc_error* parse_error = XdsLrsResponseDecodeAndParse( response_slice, &new_cluster_name, &new_load_reporting_interval); @@ -1240,18 +1240,18 @@ bool XdsClient::ChannelState::LrsCallState::IsCurrentCallOnChannel() const { namespace { -UniquePtr GenerateBuildVersionString() { +std::unique_ptr GenerateBuildVersionString() { char* build_version_str; gpr_asprintf(&build_version_str, "gRPC C-core %s %s", grpc_version_string(), GPR_PLATFORM_STRING); - return UniquePtr(build_version_str); + return std::unique_ptr(build_version_str); } } // namespace XdsClient::XdsClient(Combiner* combiner, grpc_pollset_set* interested_parties, StringView server_name, - UniquePtr watcher, + std::unique_ptr watcher, const grpc_channel_args& channel_args, grpc_error** error) : build_version_(GenerateBuildVersionString()), combiner_(GRPC_COMBINER_REF(combiner, "xds_client")), @@ -1289,8 +1289,8 @@ void XdsClient::Orphan() { Unref(DEBUG_LOCATION, "XdsClient::Orphan()"); } -void XdsClient::WatchClusterData(StringView cluster, - UniquePtr watcher) { +void XdsClient::WatchClusterData( + StringView cluster, std::unique_ptr watcher) { ClusterWatcherInterface* w = watcher.get(); cluster_state_.cluster_watchers[w] = std::move(watcher); // TODO(juanlishen): Start CDS call if not already started and return @@ -1312,8 +1312,8 @@ void XdsClient::CancelClusterDataWatch(StringView cluster, } } -void XdsClient::WatchEndpointData(StringView /*cluster*/, - UniquePtr watcher) { +void XdsClient::WatchEndpointData( + StringView /*cluster*/, std::unique_ptr watcher) { EndpointWatcherInterface* w = watcher.get(); cluster_state_.endpoint_watchers[w] = std::move(watcher); // If we've already received an EDS update, notify the new watcher diff --git a/src/core/ext/filters/client_channel/xds/xds_client.h b/src/core/ext/filters/client_channel/xds/xds_client.h index 2cd68271953..1e9dc3c22db 100644 --- a/src/core/ext/filters/client_channel/xds/xds_client.h +++ b/src/core/ext/filters/client_channel/xds/xds_client.h @@ -74,7 +74,7 @@ class XdsClient : public InternallyRefCounted { // an error initializing the client. XdsClient(Combiner* combiner, grpc_pollset_set* interested_parties, StringView server_name, - UniquePtr watcher, + std::unique_ptr watcher, const grpc_channel_args& channel_args, grpc_error** error); ~XdsClient(); @@ -86,7 +86,7 @@ class XdsClient : public InternallyRefCounted { // cancellation. (Because the caller does not own the watcher, the // pointer must not be used for any other purpose.) void WatchClusterData(StringView cluster, - UniquePtr watcher); + std::unique_ptr watcher); void CancelClusterDataWatch(StringView cluster, ClusterWatcherInterface* watcher); @@ -96,7 +96,7 @@ class XdsClient : public InternallyRefCounted { // cancellation. (Because the caller does not own the watcher, the // pointer must not be used for any other purpose.) void WatchEndpointData(StringView cluster, - UniquePtr watcher); + std::unique_ptr watcher); void CancelEndpointDataWatch(StringView cluster, EndpointWatcherInterface* watcher); @@ -172,9 +172,10 @@ class XdsClient : public InternallyRefCounted { }; struct ClusterState { - std::map> + std::map> cluster_watchers; - std::map> + std::map> endpoint_watchers; std::set client_stats; // The latest data seen from EDS. @@ -195,15 +196,15 @@ class XdsClient : public InternallyRefCounted { static const grpc_arg_pointer_vtable kXdsClientVtable; - UniquePtr build_version_; + std::unique_ptr build_version_; Combiner* combiner_; grpc_pollset_set* interested_parties_; - UniquePtr bootstrap_; + std::unique_ptr bootstrap_; - UniquePtr server_name_; - UniquePtr service_config_watcher_; + std::unique_ptr server_name_; + std::unique_ptr service_config_watcher_; // TODO(juanlishen): Once we implement LDS support, this will no // longer be needed. grpc_closure service_config_notify_; diff --git a/src/core/ext/filters/client_channel/xds/xds_client_stats.cc b/src/core/ext/filters/client_channel/xds/xds_client_stats.cc index 2f36c3d979f..604870f3c24 100644 --- a/src/core/ext/filters/client_channel/xds/xds_client_stats.cc +++ b/src/core/ext/filters/client_channel/xds/xds_client_stats.cc @@ -90,7 +90,7 @@ XdsClientStats::LocalityStats::GetSnapshotAndReset() { const char* metric_name = p.first.get(); LoadMetric& metric_value = p.second; snapshot.load_metric_stats.emplace( - UniquePtr(gpr_strdup(metric_name)), + std::unique_ptr(gpr_strdup(metric_name)), metric_value.GetSnapshotAndReset()); } } @@ -178,12 +178,13 @@ void XdsClientStats::PruneLocalityStats() { } } -void XdsClientStats::AddCallDropped(const UniquePtr& category) { +void XdsClientStats::AddCallDropped(const std::unique_ptr& category) { total_dropped_requests_.FetchAdd(1, MemoryOrder::RELAXED); MutexLock lock(&dropped_requests_mu_); auto iter = dropped_requests_.find(category); if (iter == dropped_requests_.end()) { - dropped_requests_.emplace(UniquePtr(gpr_strdup(category.get())), 1); + dropped_requests_.emplace(std::unique_ptr(gpr_strdup(category.get())), + 1); } else { ++iter->second; } diff --git a/src/core/ext/filters/client_channel/xds/xds_client_stats.h b/src/core/ext/filters/client_channel/xds/xds_client_stats.h index 07b457a0bf4..26b4d264a43 100644 --- a/src/core/ext/filters/client_channel/xds/xds_client_stats.h +++ b/src/core/ext/filters/client_channel/xds/xds_client_stats.h @@ -46,8 +46,8 @@ class XdsLocalityName : public RefCounted { } }; - XdsLocalityName(UniquePtr region, UniquePtr zone, - UniquePtr subzone) + XdsLocalityName(std::unique_ptr region, std::unique_ptr zone, + std::unique_ptr subzone) : region_(std::move(region)), zone_(std::move(zone)), sub_zone_(std::move(subzone)) {} @@ -73,10 +73,10 @@ class XdsLocalityName : public RefCounted { } private: - UniquePtr region_; - UniquePtr zone_; - UniquePtr sub_zone_; - UniquePtr human_readable_string_; + std::unique_ptr region_; + std::unique_ptr zone_; + std::unique_ptr sub_zone_; + std::unique_ptr human_readable_string_; }; // The stats classes (i.e., XdsClientStats, LocalityStats, and LoadMetric) can @@ -111,9 +111,10 @@ class XdsClientStats { double total_metric_value_{0}; }; - using LoadMetricMap = std::map, LoadMetric, StringLess>; + using LoadMetricMap = + std::map, LoadMetric, StringLess>; using LoadMetricSnapshotMap = - std::map, LoadMetric::Snapshot, StringLess>; + std::map, LoadMetric::Snapshot, StringLess>; struct Snapshot { // TODO(juanlishen): Change this to const method when const_iterator is @@ -177,7 +178,7 @@ class XdsClientStats { // TODO(juanlishen): The value type of Map<> must be movable in current // implementation. To avoid making LocalityStats movable, we wrap it by - // UniquePtr<>. We should remove this wrapper if the value type of Map<> + // std::unique_ptr<>. We should remove this wrapper if the value type of Map<> // doesn't have to be movable. using LocalityStatsMap = std::map, RefCountedPtr, @@ -185,7 +186,8 @@ class XdsClientStats { using LocalityStatsSnapshotMap = std::map, LocalityStats::Snapshot, XdsLocalityName::Less>; - using DroppedRequestsMap = std::map, uint64_t, StringLess>; + using DroppedRequestsMap = + std::map, uint64_t, StringLess>; using DroppedRequestsSnapshotMap = DroppedRequestsMap; struct Snapshot { @@ -208,7 +210,7 @@ class XdsClientStats { RefCountedPtr FindLocalityStats( const RefCountedPtr& locality_name); void PruneLocalityStats(); - void AddCallDropped(const UniquePtr& category); + void AddCallDropped(const std::unique_ptr& category); private: // The stats for each locality. diff --git a/src/core/ext/filters/message_size/message_size_filter.cc b/src/core/ext/filters/message_size/message_size_filter.cc index f13efd76236..b6f5f872314 100644 --- a/src/core/ext/filters/message_size/message_size_filter.cc +++ b/src/core/ext/filters/message_size/message_size_filter.cc @@ -44,8 +44,9 @@ namespace { size_t g_message_size_parser_index; } // namespace -UniquePtr MessageSizeParser::ParsePerMethodParams( - const grpc_json* json, grpc_error** error) { +std::unique_ptr +MessageSizeParser::ParsePerMethodParams(const grpc_json* json, + grpc_error** error) { GPR_DEBUG_ASSERT(error != nullptr && *error == GRPC_ERROR_NONE); int max_request_message_bytes = -1; int max_response_message_bytes = -1; diff --git a/src/core/ext/filters/message_size/message_size_filter.h b/src/core/ext/filters/message_size/message_size_filter.h index 1dde55f40b1..b54acd538f2 100644 --- a/src/core/ext/filters/message_size/message_size_filter.h +++ b/src/core/ext/filters/message_size/message_size_filter.h @@ -46,7 +46,7 @@ class MessageSizeParsedConfig : public ServiceConfig::ParsedConfig { class MessageSizeParser : public ServiceConfig::Parser { public: - UniquePtr ParsePerMethodParams( + std::unique_ptr ParsePerMethodParams( const grpc_json* json, grpc_error** error) override; static void Register(); diff --git a/src/core/ext/transport/chttp2/client/authority.cc b/src/core/ext/transport/chttp2/client/authority.cc index bad3153b013..09211456bab 100644 --- a/src/core/ext/transport/chttp2/client/authority.cc +++ b/src/core/ext/transport/chttp2/client/authority.cc @@ -26,7 +26,7 @@ grpc_channel_args* grpc_default_authority_add_if_not_present( grpc_channel_args_find(args, GRPC_ARG_DEFAULT_AUTHORITY) != nullptr; grpc_arg new_args[1]; size_t num_new_args = 0; - grpc_core::UniquePtr default_authority; + std::unique_ptr default_authority; if (!has_default_authority) { const grpc_arg* server_uri_arg = grpc_channel_args_find(args, GRPC_ARG_SERVER_URI); diff --git a/src/core/ext/transport/chttp2/client/insecure/channel_create.cc b/src/core/ext/transport/chttp2/client/insecure/channel_create.cc index 9bf975e8796..fdfa65a2c18 100644 --- a/src/core/ext/transport/chttp2/client/insecure/channel_create.cc +++ b/src/core/ext/transport/chttp2/client/insecure/channel_create.cc @@ -56,7 +56,7 @@ grpc_channel* CreateChannel(const char* target, const grpc_channel_args* args) { return nullptr; } // Add channel arg containing the server URI. - UniquePtr canonical_target = + std::unique_ptr canonical_target = ResolverRegistry::AddDefaultPrefixIfNeeded(target); grpc_arg arg = grpc_channel_arg_string_create( const_cast(GRPC_ARG_SERVER_URI), canonical_target.get()); diff --git a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc index 49389844e00..68789a23c57 100644 --- a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc +++ b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc @@ -86,7 +86,7 @@ class Chttp2SecureClientChannelFactory : public ClientChannelFactory { GPR_ASSERT(server_uri != nullptr); const TargetAuthorityTable* target_authority_table = FindTargetAuthorityTableInArgs(args); - UniquePtr authority; + std::unique_ptr authority; if (target_authority_table != nullptr) { // Find the authority for the target. const char* target_uri_str = @@ -98,7 +98,7 @@ class Chttp2SecureClientChannelFactory : public ClientChannelFactory { const grpc_slice key = grpc_slice_from_static_string( target_uri->path[0] == '/' ? target_uri->path + 1 : target_uri->path); - const UniquePtr* value = target_authority_table->Get(key); + const std::unique_ptr* value = target_authority_table->Get(key); if (value != nullptr) authority.reset(gpr_strdup(value->get())); grpc_slice_unref_internal(key); } @@ -158,7 +158,7 @@ grpc_channel* CreateChannel(const char* target, const grpc_channel_args* args) { return nullptr; } // Add channel arg containing the server URI. - UniquePtr canonical_target = + std::unique_ptr canonical_target = ResolverRegistry::AddDefaultPrefixIfNeeded(target); grpc_arg arg = grpc_channel_arg_string_create( const_cast(GRPC_ARG_SERVER_URI), canonical_target.get()); diff --git a/src/core/ext/transport/chttp2/transport/frame_data.cc b/src/core/ext/transport/chttp2/transport/frame_data.cc index d815654c31c..1b8200a3be6 100644 --- a/src/core/ext/transport/chttp2/transport/frame_data.cc +++ b/src/core/ext/transport/chttp2/transport/frame_data.cc @@ -138,7 +138,7 @@ grpc_error* grpc_deframe_unprocessed_incoming_frames( gpr_free(msg); p->error = grpc_error_set_str( p->error, GRPC_ERROR_STR_RAW_BYTES, - grpc_slice_from_moved_string(grpc_core::UniquePtr( + grpc_slice_from_moved_string(std::unique_ptr( grpc_dump_slice(*slice, GPR_DUMP_HEX | GPR_DUMP_ASCII)))); p->error = grpc_error_set_int(p->error, GRPC_ERROR_INT_OFFSET, cur - beg); diff --git a/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc b/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc index 1350a967b9f..bfa586d175c 100644 --- a/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc +++ b/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc @@ -109,10 +109,10 @@ grpc_error* grpc_chttp2_rst_stream_parser_parse(void* parser, char* message; gpr_asprintf(&message, "Received RST_STREAM with error code %d", reason); error = grpc_error_set_int( - grpc_error_set_str(GRPC_ERROR_CREATE_FROM_STATIC_STRING("RST_STREAM"), - GRPC_ERROR_STR_GRPC_MESSAGE, - grpc_slice_from_moved_string( - grpc_core::UniquePtr(message))), + grpc_error_set_str( + GRPC_ERROR_CREATE_FROM_STATIC_STRING("RST_STREAM"), + GRPC_ERROR_STR_GRPC_MESSAGE, + grpc_slice_from_moved_string(std::unique_ptr(message))), GRPC_ERROR_INT_HTTP2_ERROR, static_cast(reason)); } grpc_chttp2_mark_stream_closed(t, s, true, true, error); diff --git a/src/core/lib/channel/channelz.cc b/src/core/lib/channel/channelz.cc index f5d06c78a80..b7498d559ad 100644 --- a/src/core/lib/channel/channelz.cc +++ b/src/core/lib/channel/channelz.cc @@ -442,8 +442,8 @@ void PopulateSocketAddressJson(grpc_json* json, const char* name, (strcmp(uri->scheme, "ipv6") == 0))) { const char* host_port = uri->path; if (*host_port == '/') ++host_port; - UniquePtr host; - UniquePtr port; + std::unique_ptr host; + std::unique_ptr port; GPR_ASSERT(SplitHostPort(host_port, &host, &port)); int port_num = -1; if (port != nullptr) { diff --git a/src/core/lib/channel/handshaker_registry.cc b/src/core/lib/channel/handshaker_registry.cc index 199cb877497..9ec458b210a 100644 --- a/src/core/lib/channel/handshaker_registry.cc +++ b/src/core/lib/channel/handshaker_registry.cc @@ -38,21 +38,21 @@ namespace { class HandshakerFactoryList { public: - void Register(bool at_start, UniquePtr factory); + void Register(bool at_start, std::unique_ptr factory); void AddHandshakers(const grpc_channel_args* args, grpc_pollset_set* interested_parties, HandshakeManager* handshake_mgr); private: - InlinedVector, 2> factories_; + InlinedVector, 2> factories_; }; HandshakerFactoryList* g_handshaker_factory_lists = nullptr; } // namespace -void HandshakerFactoryList::Register(bool at_start, - UniquePtr factory) { +void HandshakerFactoryList::Register( + bool at_start, std::unique_ptr factory) { factories_.push_back(std::move(factory)); if (at_start) { auto* end = &factories_[factories_.size() - 1]; @@ -99,7 +99,7 @@ void HandshakerRegistry::Shutdown() { void HandshakerRegistry::RegisterHandshakerFactory( bool at_start, HandshakerType handshaker_type, - UniquePtr factory) { + std::unique_ptr factory) { GPR_ASSERT(g_handshaker_factory_lists != nullptr); auto& factory_list = g_handshaker_factory_lists[handshaker_type]; factory_list.Register(at_start, std::move(factory)); diff --git a/src/core/lib/channel/handshaker_registry.h b/src/core/lib/channel/handshaker_registry.h index 1b93a8dd47e..4a02efc3f24 100644 --- a/src/core/lib/channel/handshaker_registry.h +++ b/src/core/lib/channel/handshaker_registry.h @@ -38,9 +38,9 @@ class HandshakerRegistry { /// Registers a new handshaker factory. Takes ownership. /// If \a at_start is true, the new handshaker will be at the beginning of /// the list. Otherwise, it will be added to the end. - static void RegisterHandshakerFactory(bool at_start, - HandshakerType handshaker_type, - UniquePtr factory); + static void RegisterHandshakerFactory( + bool at_start, HandshakerType handshaker_type, + std::unique_ptr factory); static void AddHandshakers(HandshakerType handshaker_type, const grpc_channel_args* args, grpc_pollset_set* interested_parties, diff --git a/src/core/lib/debug/trace.cc b/src/core/lib/debug/trace.cc index 84c0a3805d3..a354ceef821 100644 --- a/src/core/lib/debug/trace.cc +++ b/src/core/lib/debug/trace.cc @@ -143,7 +143,7 @@ void grpc_tracer_init(const char* env_var_name) { } void grpc_tracer_init() { - grpc_core::UniquePtr value = GPR_GLOBAL_CONFIG_GET(grpc_trace); + std::unique_ptr value = GPR_GLOBAL_CONFIG_GET(grpc_trace); parse(value.get()); } diff --git a/src/core/lib/gpr/log.cc b/src/core/lib/gpr/log.cc index 8a229b2adf1..f0954e6ce9a 100644 --- a/src/core/lib/gpr/log.cc +++ b/src/core/lib/gpr/log.cc @@ -75,7 +75,7 @@ void gpr_set_log_verbosity(gpr_log_severity min_severity_to_print) { } void gpr_log_verbosity_init() { - grpc_core::UniquePtr verbosity = GPR_GLOBAL_CONFIG_GET(grpc_verbosity); + std::unique_ptr verbosity = GPR_GLOBAL_CONFIG_GET(grpc_verbosity); gpr_atm min_severity_to_print = GPR_LOG_SEVERITY_ERROR; if (strlen(verbosity.get()) > 0) { diff --git a/src/core/lib/gprpp/global_config_env.cc b/src/core/lib/gprpp/global_config_env.cc index fb14805d01b..483a2d6877a 100644 --- a/src/core/lib/gprpp/global_config_env.cc +++ b/src/core/lib/gprpp/global_config_env.cc @@ -56,8 +56,8 @@ void SetGlobalConfigEnvErrorFunction(GlobalConfigEnvErrorFunctionType func) { g_global_config_env_error_func = func; } -UniquePtr GlobalConfigEnv::GetValue() { - return UniquePtr(gpr_getenv(GetName())); +std::unique_ptr GlobalConfigEnv::GetValue() { + return std::unique_ptr(gpr_getenv(GetName())); } void GlobalConfigEnv::SetValue(const char* value) { @@ -78,7 +78,7 @@ static_assert(std::is_trivially_destructible::value, "GlobalConfigEnvBool needs to be trivially destructible."); bool GlobalConfigEnvBool::Get() { - UniquePtr str = GetValue(); + std::unique_ptr str = GetValue(); if (str == nullptr) { return default_value_; } @@ -99,7 +99,7 @@ static_assert(std::is_trivially_destructible::value, "GlobalConfigEnvInt32 needs to be trivially destructible."); int32_t GlobalConfigEnvInt32::Get() { - UniquePtr str = GetValue(); + std::unique_ptr str = GetValue(); if (str == nullptr) { return default_value_; } @@ -122,10 +122,10 @@ void GlobalConfigEnvInt32::Set(int32_t value) { static_assert(std::is_trivially_destructible::value, "GlobalConfigEnvString needs to be trivially destructible."); -UniquePtr GlobalConfigEnvString::Get() { - UniquePtr str = GetValue(); +std::unique_ptr GlobalConfigEnvString::Get() { + std::unique_ptr str = GetValue(); if (str == nullptr) { - return UniquePtr(gpr_strdup(default_value_)); + return std::unique_ptr(gpr_strdup(default_value_)); } return str; } diff --git a/src/core/lib/gprpp/global_config_env.h b/src/core/lib/gprpp/global_config_env.h index 3d3038895d3..9de21eafca4 100644 --- a/src/core/lib/gprpp/global_config_env.h +++ b/src/core/lib/gprpp/global_config_env.h @@ -43,7 +43,7 @@ class GlobalConfigEnv { public: // Returns the value of `name` variable. - UniquePtr GetValue(); + std::unique_ptr GetValue(); // Sets the value of `name` variable. void SetValue(const char* value); @@ -87,7 +87,7 @@ class GlobalConfigEnvString : public GlobalConfigEnv { constexpr GlobalConfigEnvString(char* name, const char* default_value) : GlobalConfigEnv(name), default_value_(default_value) {} - UniquePtr Get(); + std::unique_ptr Get(); void Set(const char* value); private: @@ -121,7 +121,7 @@ class GlobalConfigEnvString : public GlobalConfigEnv { static char g_env_str_##name[] = #name; \ static ::grpc_core::GlobalConfigEnvString g_env_##name(g_env_str_##name, \ default_value); \ - ::grpc_core::UniquePtr gpr_global_config_get_##name() { \ + ::std::unique_ptr gpr_global_config_get_##name() { \ return g_env_##name.Get(); \ } \ void gpr_global_config_set_##name(const char* value) { \ diff --git a/src/core/lib/gprpp/global_config_generic.h b/src/core/lib/gprpp/global_config_generic.h index d3e3e2a2dbe..5e128453358 100644 --- a/src/core/lib/gprpp/global_config_generic.h +++ b/src/core/lib/gprpp/global_config_generic.h @@ -37,8 +37,8 @@ extern int32_t gpr_global_config_get_##name(); \ extern void gpr_global_config_set_##name(int32_t value) -#define GPR_GLOBAL_CONFIG_DECLARE_STRING(name) \ - extern grpc_core::UniquePtr gpr_global_config_get_##name(); \ +#define GPR_GLOBAL_CONFIG_DECLARE_STRING(name) \ + extern std::unique_ptr gpr_global_config_get_##name(); \ extern void gpr_global_config_set_##name(const char* value) #endif /* GRPC_CORE_LIB_GPRPP_GLOBAL_CONFIG_GENERIC_H */ diff --git a/src/core/lib/gprpp/host_port.cc b/src/core/lib/gprpp/host_port.cc index d69dd9c447f..298a0dbfef9 100644 --- a/src/core/lib/gprpp/host_port.cc +++ b/src/core/lib/gprpp/host_port.cc @@ -30,7 +30,7 @@ #include "src/core/lib/gprpp/string_view.h" namespace grpc_core { -int JoinHostPort(UniquePtr* out, const char* host, int port) { +int JoinHostPort(std::unique_ptr* out, const char* host, int port) { char* tmp; int ret; if (host[0] != '[' && strchr(host, ':') != nullptr) { @@ -96,8 +96,8 @@ bool SplitHostPort(StringView name, StringView* host, StringView* port) { return DoSplitHostPort(name, host, port, &unused); } -bool SplitHostPort(StringView name, UniquePtr* host, - UniquePtr* port) { +bool SplitHostPort(StringView name, std::unique_ptr* host, + std::unique_ptr* port) { GPR_DEBUG_ASSERT(host != nullptr && *host == nullptr); GPR_DEBUG_ASSERT(port != nullptr && *port == nullptr); StringView host_view; diff --git a/src/core/lib/gprpp/host_port.h b/src/core/lib/gprpp/host_port.h index 9a0b492b98f..75bc8f98ba9 100644 --- a/src/core/lib/gprpp/host_port.h +++ b/src/core/lib/gprpp/host_port.h @@ -35,7 +35,7 @@ namespace grpc_core { (excluding the final '\0'), and *out points to a string. In the unlikely event of an error, returns -1 and sets *out to NULL. */ -int JoinHostPort(UniquePtr* out, const char* host, int port); +int JoinHostPort(std::unique_ptr* out, const char* host, int port); /** Given a name in the form "host:port" or "[ho:st]:port", split into hostname and port number. @@ -51,8 +51,8 @@ int JoinHostPort(UniquePtr* out, const char* host, int port); Return true on success, false on failure. Guarantees *host and *port are cleared on failure. */ bool SplitHostPort(StringView name, StringView* host, StringView* port); -bool SplitHostPort(StringView name, UniquePtr* host, - UniquePtr* port); +bool SplitHostPort(StringView name, std::unique_ptr* host, + std::unique_ptr* port); } // namespace grpc_core diff --git a/src/core/lib/gprpp/map.h b/src/core/lib/gprpp/map.h index 0ad92d0bfc8..4816b8e6a4d 100644 --- a/src/core/lib/gprpp/map.h +++ b/src/core/lib/gprpp/map.h @@ -34,7 +34,8 @@ struct StringLess { bool operator()(const char* a, const char* b) const { return strcmp(a, b) < 0; } - bool operator()(const UniquePtr& a, const UniquePtr& b) const { + bool operator()(const std::unique_ptr& a, + const std::unique_ptr& b) const { return strcmp(a.get(), b.get()) < 0; } bool operator()(const StringView& a, const StringView& b) const { diff --git a/src/core/lib/gprpp/memory.h b/src/core/lib/gprpp/memory.h index 97c26b4093e..e26d4d062f1 100644 --- a/src/core/lib/gprpp/memory.h +++ b/src/core/lib/gprpp/memory.h @@ -30,67 +30,10 @@ namespace grpc_core { -template -using UniquePtr = std::unique_ptr; - +// TODO(veblush): Replace this with absl::make_unique once abseil is added. template -inline UniquePtr MakeUnique(Args&&... args) { - return UniquePtr(new T(std::forward(args)...)); -} - -// an allocator that uses gpr_malloc/gpr_free -template -class Allocator { - public: - typedef T value_type; - typedef T* pointer; - typedef const T* const_pointer; - typedef T& reference; - typedef const T& const_reference; - typedef std::size_t size_type; - typedef std::ptrdiff_t difference_type; - typedef std::false_type propagate_on_container_move_assignment; - template - struct rebind { - typedef Allocator other; - }; - typedef std::true_type is_always_equal; - - Allocator() = default; - - template - Allocator(const Allocator&) {} - - pointer address(reference x) const { return &x; } - const_pointer address(const_reference x) const { return &x; } - pointer allocate(std::size_t n, - std::allocator::const_pointer /*hint*/ = nullptr) { - return static_cast(gpr_malloc(n * sizeof(T))); - } - void deallocate(T* p, std::size_t /* n */) { gpr_free(p); } - size_t max_size() const { - return std::numeric_limits::max() / sizeof(value_type); - } - void construct(pointer p, const_reference val) { new ((void*)p) T(val); } - template - void construct(U* p, Args&&... args) { - ::new ((void*)p) U(std::forward(args)...); - } - void destroy(pointer p) { p->~T(); } - template - void destroy(U* p) { - p->~U(); - } -}; - -template -bool operator==(Allocator const&, Allocator const&) noexcept { - return true; -} - -template -bool operator!=(Allocator const& /*x*/, Allocator const& /*y*/) noexcept { - return false; +inline std::unique_ptr MakeUnique(Args&&... args) { + return std::unique_ptr(new T(std::forward(args)...)); } } // namespace grpc_core diff --git a/src/core/lib/gprpp/string_view.h b/src/core/lib/gprpp/string_view.h index e2e082e3ea5..971b2d88e5a 100644 --- a/src/core/lib/gprpp/string_view.h +++ b/src/core/lib/gprpp/string_view.h @@ -143,11 +143,11 @@ inline StringView StringViewFromSlice(const grpc_slice& slice) { // Creates a dup of the string viewed by this class. // Return value is null-terminated and never nullptr. -inline grpc_core::UniquePtr StringViewToCString(const StringView sv) { +inline std::unique_ptr StringViewToCString(const StringView sv) { char* str = static_cast(gpr_malloc(sv.size() + 1)); if (sv.size() > 0) memcpy(str, sv.data(), sv.size()); str[sv.size()] = '\0'; - return grpc_core::UniquePtr(str); + return std::unique_ptr(str); } // Compares lhs and rhs. diff --git a/src/core/lib/http/httpcli.cc b/src/core/lib/http/httpcli.cc index 7edcdcc8427..3399b75967e 100644 --- a/src/core/lib/http/httpcli.cc +++ b/src/core/lib/http/httpcli.cc @@ -113,7 +113,7 @@ static void append_error(internal_request* req, grpc_error* error) { GRPC_ERROR_CREATE_FROM_STATIC_STRING("Failed HTTP/1 client request"); } grpc_resolved_address* addr = &req->addresses->addrs[req->next_address - 1]; - grpc_core::UniquePtr addr_text(grpc_sockaddr_to_uri(addr)); + std::unique_ptr addr_text(grpc_sockaddr_to_uri(addr)); req->overall_error = grpc_error_add_child( req->overall_error, grpc_error_set_str(error, GRPC_ERROR_STR_TARGET_ADDRESS, diff --git a/src/core/lib/iomgr/ev_posix.cc b/src/core/lib/iomgr/ev_posix.cc index 02e4da1c349..40368cef269 100644 --- a/src/core/lib/iomgr/ev_posix.cc +++ b/src/core/lib/iomgr/ev_posix.cc @@ -211,7 +211,7 @@ void grpc_register_event_engine_factory(const char* name, const char* grpc_get_poll_strategy_name() { return g_poll_strategy_name; } void grpc_event_engine_init(void) { - grpc_core::UniquePtr value = GPR_GLOBAL_CONFIG_GET(grpc_poll_strategy); + std::unique_ptr value = GPR_GLOBAL_CONFIG_GET(grpc_poll_strategy); char** strings = nullptr; size_t nstrings = 0; diff --git a/src/core/lib/iomgr/resolve_address_custom.cc b/src/core/lib/iomgr/resolve_address_custom.cc index 1d5230d74d0..6b8baae94bb 100644 --- a/src/core/lib/iomgr/resolve_address_custom.cc +++ b/src/core/lib/iomgr/resolve_address_custom.cc @@ -88,8 +88,8 @@ void grpc_custom_resolve_callback(grpc_custom_resolver* r, static grpc_error* try_split_host_port(const char* name, const char* default_port, - grpc_core::UniquePtr* host, - grpc_core::UniquePtr* port) { + std::unique_ptr* host, + std::unique_ptr* port) { /* parse name, splitting it into host and port parts */ grpc_error* error; grpc_core::SplitHostPort(name, host, port); @@ -117,8 +117,8 @@ static grpc_error* try_split_host_port(const char* name, static grpc_error* blocking_resolve_address_impl( const char* name, const char* default_port, grpc_resolved_addresses** addresses) { - grpc_core::UniquePtr host; - grpc_core::UniquePtr port; + std::unique_ptr host; + std::unique_ptr port; grpc_error* err; GRPC_CUSTOM_IOMGR_ASSERT_SAME_THREAD(); @@ -155,8 +155,8 @@ static void resolve_address_impl(const char* name, const char* default_port, grpc_closure* on_done, grpc_resolved_addresses** addrs) { grpc_custom_resolver* r = nullptr; - grpc_core::UniquePtr host; - grpc_core::UniquePtr port; + std::unique_ptr host; + std::unique_ptr port; grpc_error* err; GRPC_CUSTOM_IOMGR_ASSERT_SAME_THREAD(); err = try_split_host_port(name, default_port, &host, &port); diff --git a/src/core/lib/iomgr/resolve_address_posix.cc b/src/core/lib/iomgr/resolve_address_posix.cc index 1d2a79f41d8..f67ebca548c 100644 --- a/src/core/lib/iomgr/resolve_address_posix.cc +++ b/src/core/lib/iomgr/resolve_address_posix.cc @@ -57,8 +57,8 @@ static grpc_error* posix_blocking_resolve_address( return grpc_resolve_unix_domain_address(name + 5, addresses); } - grpc_core::UniquePtr host; - grpc_core::UniquePtr port; + std::unique_ptr host; + std::unique_ptr port; /* parse name, splitting it into host and port parts */ grpc_core::SplitHostPort(name, &host, &port); if (host == nullptr) { diff --git a/src/core/lib/iomgr/resolve_address_windows.cc b/src/core/lib/iomgr/resolve_address_windows.cc index 5a9d4421bb4..637d214e9e8 100644 --- a/src/core/lib/iomgr/resolve_address_windows.cc +++ b/src/core/lib/iomgr/resolve_address_windows.cc @@ -62,8 +62,8 @@ static grpc_error* windows_blocking_resolve_address( grpc_error* error = GRPC_ERROR_NONE; /* parse name, splitting it into host and port parts */ - grpc_core::UniquePtr host; - grpc_core::UniquePtr port; + std::unique_ptr host; + std::unique_ptr port; grpc_core::SplitHostPort(name, &host, &port); if (host == NULL) { char* msg; diff --git a/src/core/lib/iomgr/sockaddr_utils.cc b/src/core/lib/iomgr/sockaddr_utils.cc index 2f8ed2225a6..6b5f9fd2e71 100644 --- a/src/core/lib/iomgr/sockaddr_utils.cc +++ b/src/core/lib/iomgr/sockaddr_utils.cc @@ -181,7 +181,7 @@ int grpc_sockaddr_to_string(char** out, } if (ip != nullptr && grpc_inet_ntop(addr->sa_family, ip, ntop_buf, sizeof(ntop_buf)) != nullptr) { - grpc_core::UniquePtr tmp_out; + std::unique_ptr tmp_out; if (sin6_scope_id != 0) { char* host_with_scope; /* Enclose sin6_scope_id with the format defined in RFC 6784 section 2. */ diff --git a/src/core/lib/iomgr/tcp_client_cfstream.cc b/src/core/lib/iomgr/tcp_client_cfstream.cc index 23d8c0c0089..208d6c4a55e 100644 --- a/src/core/lib/iomgr/tcp_client_cfstream.cc +++ b/src/core/lib/iomgr/tcp_client_cfstream.cc @@ -145,8 +145,8 @@ static void ParseResolvedAddress(const grpc_resolved_address* addr, CFStringRef* host, int* port) { char* host_port; grpc_sockaddr_to_string(&host_port, addr, 1); - grpc_core::UniquePtr host_string; - grpc_core::UniquePtr port_string; + std::unique_ptr host_string; + std::unique_ptr port_string; grpc_core::SplitHostPort(host_port, &host_string, &port_string); *host = CFStringCreateWithCString(NULL, host_string.get(), kCFStringEncodingUTF8); diff --git a/src/core/lib/profiling/basic_timers.cc b/src/core/lib/profiling/basic_timers.cc index 2056940f3a6..a4cf08a2cbb 100644 --- a/src/core/lib/profiling/basic_timers.cc +++ b/src/core/lib/profiling/basic_timers.cc @@ -80,8 +80,7 @@ GPR_GLOBAL_CONFIG_DEFINE_STRING(grpc_latency_trace, "latency_trace.txt", static const char* output_filename() { if (output_filename_or_null == NULL) { - grpc_core::UniquePtr value = - GPR_GLOBAL_CONFIG_GET(grpc_latency_trace); + std::unique_ptr value = GPR_GLOBAL_CONFIG_GET(grpc_latency_trace); if (strlen(value.get()) > 0) { output_filename_or_null = value.release(); } else { diff --git a/src/core/lib/security/credentials/credentials.cc b/src/core/lib/security/credentials/credentials.cc index 8ef58d2a4b4..4c8db4ac665 100644 --- a/src/core/lib/security/credentials/credentials.cc +++ b/src/core/lib/security/credentials/credentials.cc @@ -45,7 +45,7 @@ void grpc_channel_credentials_release(grpc_channel_credentials* creds) { if (creds) creds->Unref(); } -static std::map, +static std::map, grpc_core::RefCountedPtr, grpc_core::StringLess>* g_grpc_control_plane_creds; static gpr_mu g_control_plane_creds_mu; @@ -54,7 +54,7 @@ static void do_control_plane_creds_init() { gpr_mu_init(&g_control_plane_creds_mu); GPR_ASSERT(g_grpc_control_plane_creds == nullptr); g_grpc_control_plane_creds = - new std::map, + new std::map, grpc_core::RefCountedPtr, grpc_core::StringLess>(); } @@ -88,7 +88,7 @@ bool grpc_control_plane_credentials_register( grpc_core::ExecCtx exec_ctx; { grpc_core::MutexLock lock(&g_control_plane_creds_mu); - auto key = grpc_core::UniquePtr(gpr_strdup(authority)); + auto key = std::unique_ptr(gpr_strdup(authority)); if (g_grpc_control_plane_creds->find(key) != g_grpc_control_plane_creds->end()) { return false; @@ -101,7 +101,7 @@ bool grpc_control_plane_credentials_register( bool grpc_channel_credentials::attach_credentials( const char* authority, grpc_core::RefCountedPtr control_plane_creds) { - auto key = grpc_core::UniquePtr(gpr_strdup(authority)); + auto key = std::unique_ptr(gpr_strdup(authority)); if (local_control_plane_creds_.find(key) != local_control_plane_creds_.end()) { return false; @@ -113,7 +113,7 @@ bool grpc_channel_credentials::attach_credentials( grpc_core::RefCountedPtr grpc_channel_credentials::get_control_plane_credentials(const char* authority) { { - auto key = grpc_core::UniquePtr(gpr_strdup(authority)); + auto key = std::unique_ptr(gpr_strdup(authority)); auto local_lookup = local_control_plane_creds_.find(key); if (local_lookup != local_control_plane_creds_.end()) { return local_lookup->second; diff --git a/src/core/lib/security/credentials/credentials.h b/src/core/lib/security/credentials/credentials.h index 4518f013e1b..d8bb7f04370 100644 --- a/src/core/lib/security/credentials/credentials.h +++ b/src/core/lib/security/credentials/credentials.h @@ -148,7 +148,7 @@ struct grpc_channel_credentials private: const char* type_; - std::map, + std::map, grpc_core::RefCountedPtr, grpc_core::StringLess> local_control_plane_creds_; diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc index 895776c27f0..69a1c350397 100644 --- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc +++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc @@ -624,14 +624,14 @@ class StsTokenFetcherCredentials grpc_uri* sts_url_; grpc_closure http_post_cb_closure_; - grpc_core::UniquePtr resource_; - grpc_core::UniquePtr audience_; - grpc_core::UniquePtr scope_; - grpc_core::UniquePtr requested_token_type_; - grpc_core::UniquePtr subject_token_path_; - grpc_core::UniquePtr subject_token_type_; - grpc_core::UniquePtr actor_token_path_; - grpc_core::UniquePtr actor_token_type_; + std::unique_ptr resource_; + std::unique_ptr audience_; + std::unique_ptr scope_; + std::unique_ptr requested_token_type_; + std::unique_ptr subject_token_path_; + std::unique_ptr subject_token_type_; + std::unique_ptr actor_token_path_; + std::unique_ptr actor_token_type_; }; } // namespace diff --git a/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc b/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc index 199a15b6354..bddd851cf4e 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc +++ b/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc @@ -29,7 +29,7 @@ /** -- gRPC TLS key materials config API implementation. -- **/ void grpc_tls_key_materials_config::set_key_materials( - grpc_core::UniquePtr pem_root_certs, + std::unique_ptr pem_root_certs, PemKeyCertPairList pem_key_cert_pair_list) { pem_key_cert_pair_list_ = std::move(pem_key_cert_pair_list); pem_root_certs_ = std::move(pem_root_certs); @@ -145,7 +145,7 @@ int grpc_tls_key_materials_config_set_key_materials( "grpc_tls_key_materials_config_set_key_materials()"); return 0; } - grpc_core::UniquePtr pem_root(const_cast(root_certs)); + std::unique_ptr pem_root(const_cast(root_certs)); grpc_tls_key_materials_config::PemKeyCertPairList cert_pair_list; for (size_t i = 0; i < num; i++) { grpc_core::PemKeyCertPair key_cert_pair( diff --git a/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h b/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h index a7f99822121..a46452bc1b8 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h +++ b/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h @@ -42,20 +42,20 @@ struct grpc_tls_key_materials_config int version() const { return version_; } /** Setters for member fields. **/ - void set_pem_root_certs(grpc_core::UniquePtr pem_root_certs) { + void set_pem_root_certs(std::unique_ptr pem_root_certs) { pem_root_certs_ = std::move(pem_root_certs); } void add_pem_key_cert_pair(grpc_core::PemKeyCertPair pem_key_cert_pair) { pem_key_cert_pair_list_.push_back(pem_key_cert_pair); } - void set_key_materials(grpc_core::UniquePtr pem_root_certs, + void set_key_materials(std::unique_ptr pem_root_certs, PemKeyCertPairList pem_key_cert_pair_list); void set_version(int version) { version_ = version; } private: int version_ = 0; PemKeyCertPairList pem_key_cert_pair_list_; - grpc_core::UniquePtr pem_root_certs_; + std::unique_ptr pem_root_certs_; }; /** TLS credential reload config. **/ diff --git a/src/core/lib/security/security_connector/load_system_roots_linux.cc b/src/core/lib/security/security_connector/load_system_roots_linux.cc index 61b0b9be5b9..7a60cdc4692 100644 --- a/src/core/lib/security/security_connector/load_system_roots_linux.cc +++ b/src/core/lib/security/security_connector/load_system_roots_linux.cc @@ -144,7 +144,8 @@ grpc_slice CreateRootCertsBundle(const char* certs_directory) { grpc_slice LoadSystemRootCerts() { grpc_slice result = grpc_empty_slice(); // Prioritize user-specified custom directory if flag is set. - UniquePtr custom_dir = GPR_GLOBAL_CONFIG_GET(grpc_system_ssl_roots_dir); + std::unique_ptr custom_dir = + GPR_GLOBAL_CONFIG_GET(grpc_system_ssl_roots_dir); if (strlen(custom_dir.get()) > 0) { result = CreateRootCertsBundle(custom_dir.get()); } diff --git a/src/core/lib/security/security_connector/security_connector.h b/src/core/lib/security/security_connector/security_connector.h index 39e56bcc59a..32033ec5c92 100644 --- a/src/core/lib/security/security_connector/security_connector.h +++ b/src/core/lib/security/security_connector/security_connector.h @@ -138,7 +138,7 @@ class grpc_channel_security_connector : public grpc_security_connector { private: grpc_core::RefCountedPtr channel_creds_; grpc_core::RefCountedPtr request_metadata_creds_; - grpc_core::UniquePtr channel_args_; + std::unique_ptr channel_args_; }; /* --- server_security_connector object. --- diff --git a/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc b/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc index 13b0dd59a00..4dd2d476a6d 100644 --- a/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc +++ b/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc @@ -214,8 +214,8 @@ class grpc_ssl_channel_security_connector final private: tsi_ssl_client_handshaker_factory* client_handshaker_factory_; - grpc_core::UniquePtr target_name_; - grpc_core::UniquePtr overridden_target_name_; + std::unique_ptr target_name_; + std::unique_ptr overridden_target_name_; const verify_peer_options* verify_options_; }; diff --git a/src/core/lib/security/security_connector/ssl_utils.cc b/src/core/lib/security/security_connector/ssl_utils.cc index 570b650eeb6..66f32bdfcc8 100644 --- a/src/core/lib/security/security_connector/ssl_utils.cc +++ b/src/core/lib/security/security_connector/ssl_utils.cc @@ -72,8 +72,7 @@ GPR_GLOBAL_CONFIG_DEFINE_STRING( "A colon separated list of cipher suites to use with OpenSSL") static void init_cipher_suites(void) { - grpc_core::UniquePtr value = - GPR_GLOBAL_CONFIG_GET(grpc_ssl_cipher_suites); + std::unique_ptr value = GPR_GLOBAL_CONFIG_GET(grpc_ssl_cipher_suites); cipher_suites = value.release(); } @@ -423,7 +422,7 @@ grpc_slice DefaultSslRootStore::ComputePemRootCerts() { const bool not_use_system_roots = GPR_GLOBAL_CONFIG_GET(grpc_not_use_system_ssl_roots); // First try to load the roots from the configuration. - UniquePtr default_root_certs_path = + std::unique_ptr default_root_certs_path = GPR_GLOBAL_CONFIG_GET(grpc_default_ssl_roots_file_path); if (strlen(default_root_certs_path.get()) > 0) { GRPC_LOG_IF_ERROR( diff --git a/src/core/lib/security/security_connector/ssl_utils.h b/src/core/lib/security/security_connector/ssl_utils.h index 6ee2c3c7248..afc7a3110d1 100644 --- a/src/core/lib/security/security_connector/ssl_utils.h +++ b/src/core/lib/security/security_connector/ssl_utils.h @@ -152,8 +152,8 @@ class PemKeyCertPair { : private_key_(gpr_strdup(other.private_key())), cert_chain_(gpr_strdup(other.cert_chain())) {} PemKeyCertPair& operator=(const PemKeyCertPair& other) { - private_key_ = grpc_core::UniquePtr(gpr_strdup(other.private_key())); - cert_chain_ = grpc_core::UniquePtr(gpr_strdup(other.cert_chain())); + private_key_ = std::unique_ptr(gpr_strdup(other.private_key())); + cert_chain_ = std::unique_ptr(gpr_strdup(other.cert_chain())); return *this; } @@ -161,8 +161,8 @@ class PemKeyCertPair { char* cert_chain() const { return cert_chain_.get(); } private: - grpc_core::UniquePtr private_key_; - grpc_core::UniquePtr cert_chain_; + std::unique_ptr private_key_; + std::unique_ptr cert_chain_; }; } // namespace grpc_core diff --git a/src/core/lib/security/security_connector/tls/spiffe_security_connector.cc b/src/core/lib/security/security_connector/tls/spiffe_security_connector.cc index a388f9d5739..114952cfa59 100644 --- a/src/core/lib/security/security_connector/tls/spiffe_security_connector.cc +++ b/src/core/lib/security/security_connector/tls/spiffe_security_connector.cc @@ -300,7 +300,7 @@ SpiffeChannelSecurityConnector::InitializeHandshakerFactory( if (key_materials_config != nullptr) { grpc_tls_key_materials_config::PemKeyCertPairList cert_pair_list = key_materials_config->pem_key_cert_pair_list(); - auto pem_root_certs = grpc_core::UniquePtr( + auto pem_root_certs = std::unique_ptr( gpr_strdup(key_materials_config->pem_root_certs())); key_materials_config_->set_key_materials(std::move(pem_root_certs), std::move(cert_pair_list)); @@ -505,7 +505,7 @@ SpiffeServerSecurityConnector::InitializeHandshakerFactory() { if (key_materials_config != nullptr) { grpc_tls_key_materials_config::PemKeyCertPairList cert_pair_list = key_materials_config->pem_key_cert_pair_list(); - auto pem_root_certs = grpc_core::UniquePtr( + auto pem_root_certs = std::unique_ptr( gpr_strdup(key_materials_config->pem_root_certs())); key_materials_config_->set_key_materials(std::move(pem_root_certs), std::move(cert_pair_list)); diff --git a/src/core/lib/security/security_connector/tls/spiffe_security_connector.h b/src/core/lib/security/security_connector/tls/spiffe_security_connector.h index 8de2bfcd3a4..74275f2d2b1 100644 --- a/src/core/lib/security/security_connector/tls/spiffe_security_connector.h +++ b/src/core/lib/security/security_connector/tls/spiffe_security_connector.h @@ -98,8 +98,8 @@ class SpiffeChannelSecurityConnector final grpc_core::Mutex mu_; grpc_closure* on_peer_checked_; - grpc_core::UniquePtr target_name_; - grpc_core::UniquePtr overridden_target_name_; + std::unique_ptr target_name_; + std::unique_ptr overridden_target_name_; tsi_ssl_client_handshaker_factory* client_handshaker_factory_ = nullptr; grpc_tls_server_authorization_check_arg* check_arg_; grpc_core::RefCountedPtr key_materials_config_; diff --git a/src/core/lib/security/transport/target_authority_table.h b/src/core/lib/security/transport/target_authority_table.h index a2e7dc6ac23..d874cd4f81b 100644 --- a/src/core/lib/security/transport/target_authority_table.h +++ b/src/core/lib/security/transport/target_authority_table.h @@ -26,7 +26,7 @@ namespace grpc_core { /// A hash table mapping target addresses to authorities. -typedef SliceHashTable> TargetAuthorityTable; +typedef SliceHashTable> TargetAuthorityTable; /// Returns a channel argument containing \a table. grpc_arg CreateTargetAuthorityTableChannelArg(TargetAuthorityTable* table); diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc index c0e21648f74..37f91c2c2d2 100644 --- a/src/core/lib/slice/slice.cc +++ b/src/core/lib/slice/slice.cc @@ -156,7 +156,7 @@ class NewWithLenSliceRefcount { /** grpc_slice_from_moved_(string|buffer) ref count .*/ class MovedStringSliceRefCount { public: - MovedStringSliceRefCount(grpc_core::UniquePtr&& str) + MovedStringSliceRefCount(std::unique_ptr&& str) : base_(grpc_slice_refcount::Type::REGULAR, &refs_, Destroy, this, &base_), str_(std::move(str)) {} @@ -170,7 +170,7 @@ class MovedStringSliceRefCount { grpc_slice_refcount base_; grpc_core::RefCount refs_; - grpc_core::UniquePtr str_; + std::unique_ptr str_; }; } // namespace grpc_core @@ -210,8 +210,7 @@ grpc_slice grpc_slice_from_copied_string(const char* source) { return grpc_core::UnmanagedMemorySlice(source, strlen(source)); } -grpc_slice grpc_slice_from_moved_buffer(grpc_core::UniquePtr p, - size_t len) { +grpc_slice grpc_slice_from_moved_buffer(std::unique_ptr p, size_t len) { uint8_t* ptr = reinterpret_cast(p.get()); grpc_slice slice; if (len <= sizeof(slice.data.inlined.bytes)) { @@ -227,7 +226,7 @@ grpc_slice grpc_slice_from_moved_buffer(grpc_core::UniquePtr p, return slice; } -grpc_slice grpc_slice_from_moved_string(grpc_core::UniquePtr p) { +grpc_slice grpc_slice_from_moved_string(std::unique_ptr p) { const size_t len = strlen(p.get()); return grpc_slice_from_moved_buffer(std::move(p), len); } diff --git a/src/core/lib/slice/slice_internal.h b/src/core/lib/slice/slice_internal.h index e74aba94145..a603f893a3d 100644 --- a/src/core/lib/slice/slice_internal.h +++ b/src/core/lib/slice/slice_internal.h @@ -335,9 +335,8 @@ inline uint32_t grpc_slice_hash_internal(const grpc_slice& s) { : grpc_slice_hash_refcounted(s); } -grpc_slice grpc_slice_from_moved_buffer(grpc_core::UniquePtr p, - size_t len); -grpc_slice grpc_slice_from_moved_string(grpc_core::UniquePtr p); +grpc_slice grpc_slice_from_moved_buffer(std::unique_ptr p, size_t len); +grpc_slice grpc_slice_from_moved_string(std::unique_ptr p); // Returns the memory used by this slice, not counting the slice structure // itself. This means that inlined and slices from static strings will return diff --git a/src/core/lib/slice/slice_string_helpers.cc b/src/core/lib/slice/slice_string_helpers.cc index 7887e0305fb..5a9721a6436 100644 --- a/src/core/lib/slice/slice_string_helpers.cc +++ b/src/core/lib/slice/slice_string_helpers.cc @@ -35,7 +35,7 @@ char* grpc_dump_slice(const grpc_slice& s, uint32_t flags) { grpc_slice grpc_dump_slice_to_slice(const grpc_slice& s, uint32_t flags) { size_t len; - grpc_core::UniquePtr ptr( + std::unique_ptr ptr( gpr_dump_return_len(reinterpret_cast GRPC_SLICE_START_PTR(s), GRPC_SLICE_LENGTH(s), flags, &len)); return grpc_slice_from_moved_buffer(std::move(ptr), len); diff --git a/src/core/lib/surface/channel.cc b/src/core/lib/surface/channel.cc index 9f5abca9c47..29bf4b4ab55 100644 --- a/src/core/lib/surface/channel.cc +++ b/src/core/lib/surface/channel.cc @@ -138,11 +138,11 @@ grpc_channel* grpc_channel_create_with_builder( return channel; } -static grpc_core::UniquePtr get_default_authority( +static std::unique_ptr get_default_authority( const grpc_channel_args* input_args) { bool has_default_authority = false; char* ssl_override = nullptr; - grpc_core::UniquePtr default_authority; + std::unique_ptr default_authority; const size_t num_args = input_args != nullptr ? input_args->num_args : 0; for (size_t i = 0; i < num_args; ++i) { if (0 == strcmp(input_args->args[i].key, GRPC_ARG_DEFAULT_AUTHORITY)) { @@ -257,7 +257,7 @@ grpc_channel* grpc_channel_create(const char* target, // ensuring that shutdown is deferred until that point. grpc_init(); grpc_channel_stack_builder* builder = grpc_channel_stack_builder_create(); - const grpc_core::UniquePtr default_authority = + const std::unique_ptr default_authority = get_default_authority(input_args); grpc_channel_args* args = build_channel_args(input_args, default_authority.get()); diff --git a/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc b/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc index 468ec36ed7d..9b12a4895d1 100644 --- a/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc +++ b/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc @@ -355,7 +355,7 @@ static tsi_result alts_tsi_handshaker_continue_handshaker_next( struct alts_tsi_handshaker_continue_handshaker_next_args { alts_tsi_handshaker* handshaker; - grpc_core::UniquePtr received_bytes; + std::unique_ptr received_bytes; size_t received_bytes_size; tsi_handshaker_on_next_done_cb cb; void* user_data; @@ -406,7 +406,7 @@ static tsi_result handshaker_next( args->received_bytes = nullptr; args->received_bytes_size = received_bytes_size; if (received_bytes_size > 0) { - args->received_bytes = grpc_core::UniquePtr( + args->received_bytes = std::unique_ptr( static_cast(gpr_zalloc(received_bytes_size))); memcpy(args->received_bytes.get(), received_bytes, received_bytes_size); } diff --git a/src/core/tsi/ssl/session_cache/ssl_session.h b/src/core/tsi/ssl/session_cache/ssl_session.h index 6188637464f..e8107dfa39e 100644 --- a/src/core/tsi/ssl/session_cache/ssl_session.h +++ b/src/core/tsi/ssl/session_cache/ssl_session.h @@ -57,7 +57,7 @@ class SslCachedSession { SslCachedSession& operator=(const SslCachedSession&) = delete; /// Create single cached instance of \a session. - static grpc_core::UniquePtr Create(SslSessionPtr session); + static std::unique_ptr Create(SslSessionPtr session); virtual ~SslCachedSession() = default; diff --git a/src/core/tsi/ssl/session_cache/ssl_session_boringssl.cc b/src/core/tsi/ssl/session_cache/ssl_session_boringssl.cc index a3ba5fedee9..a2d71a4afac 100644 --- a/src/core/tsi/ssl/session_cache/ssl_session_boringssl.cc +++ b/src/core/tsi/ssl/session_cache/ssl_session_boringssl.cc @@ -47,7 +47,7 @@ class BoringSslCachedSession : public SslCachedSession { } // namespace -grpc_core::UniquePtr SslCachedSession::Create( +std::unique_ptr SslCachedSession::Create( SslSessionPtr session) { return grpc_core::MakeUnique(std::move(session)); } diff --git a/src/core/tsi/ssl/session_cache/ssl_session_cache.cc b/src/core/tsi/ssl/session_cache/ssl_session_cache.cc index 0fd5aa9ce16..6da4fb4ee1c 100644 --- a/src/core/tsi/ssl/session_cache/ssl_session_cache.cc +++ b/src/core/tsi/ssl/session_cache/ssl_session_cache.cc @@ -76,7 +76,7 @@ class SslSessionLRUCache::Node { friend class SslSessionLRUCache; grpc_slice key_; - grpc_core::UniquePtr session_; + std::unique_ptr session_; Node* next_ = nullptr; Node* prev_ = nullptr; diff --git a/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc b/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc index b03d005574e..2787f4b9b38 100644 --- a/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc +++ b/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc @@ -65,7 +65,7 @@ class OpenSslCachedSession : public SslCachedSession { } // namespace -grpc_core::UniquePtr SslCachedSession::Create( +std::unique_ptr SslCachedSession::Create( SslSessionPtr session) { return grpc_core::MakeUnique(std::move(session)); } diff --git a/src/core/tsi/ssl_transport_security.cc b/src/core/tsi/ssl_transport_security.cc index 8b6d9f39dd4..535dcce9af5 100644 --- a/src/core/tsi/ssl_transport_security.cc +++ b/src/core/tsi/ssl_transport_security.cc @@ -1543,7 +1543,7 @@ static int does_entry_match_name(grpc_core::StringView entry, entry.remove_prefix(2); /* Remove *. */ size_t dot = name_subdomain.find('.'); if (dot == grpc_core::StringView::npos || dot == name_subdomain.size() - 1) { - grpc_core::UniquePtr name_subdomain_cstr( + std::unique_ptr name_subdomain_cstr( grpc_core::StringViewToCString(name_subdomain)); gpr_log(GPR_ERROR, "Invalid toplevel subdomain: %s", name_subdomain_cstr.get()); diff --git a/src/cpp/common/tls_credentials_options.cc b/src/cpp/common/tls_credentials_options.cc index 60d6a23fee1..43c259f7af1 100644 --- a/src/cpp/common/tls_credentials_options.cc +++ b/src/cpp/common/tls_credentials_options.cc @@ -80,8 +80,7 @@ void TlsCredentialReloadArg::set_cb_user_data(void* cb_user_data) { void TlsCredentialReloadArg::set_pem_root_certs( const grpc::string& pem_root_certs) { - ::grpc_core::UniquePtr c_pem_root_certs( - gpr_strdup(pem_root_certs.c_str())); + ::std::unique_ptr c_pem_root_certs(gpr_strdup(pem_root_certs.c_str())); c_arg_->key_materials_config->set_pem_root_certs(std::move(c_pem_root_certs)); } @@ -117,7 +116,7 @@ void TlsCredentialReloadArg::set_key_materials_config( ::grpc_core::PemKeyCertPair(ssl_pair); c_pem_key_cert_pair_list.emplace_back(std::move(c_pem_key_cert_pair)); } - ::grpc_core::UniquePtr c_pem_root_certs( + ::std::unique_ptr c_pem_root_certs( gpr_strdup(key_materials_config->pem_root_certs().c_str())); if (c_arg_->key_materials_config == nullptr) { c_arg_->key_materials_config = grpc_tls_key_materials_config_create(); diff --git a/src/cpp/common/tls_credentials_options_util.cc b/src/cpp/common/tls_credentials_options_util.cc index 25dfd67a65b..367afbd7b62 100644 --- a/src/cpp/common/tls_credentials_options_util.cc +++ b/src/cpp/common/tls_credentials_options_util.cc @@ -25,8 +25,9 @@ namespace experimental { /** Converts the Cpp key materials to C key materials; this allocates memory for * the C key materials. Note that the user must free * the underlying pointer to private key and cert chain duplicates; they are not - * freed when the UniquePtr member variables of PemKeyCertPair are unused. - * Similarly, the user must free the underlying pointer to c_pem_root_certs. **/ + * freed when the std::unique_ptr member variables of PemKeyCertPair are + * unused. Similarly, the user must free the underlying pointer to + * c_pem_root_certs. **/ grpc_tls_key_materials_config* ConvertToCKeyMaterialsConfig( const std::shared_ptr& config) { if (config == nullptr) { @@ -46,7 +47,7 @@ grpc_tls_key_materials_config* ConvertToCKeyMaterialsConfig( ::grpc_core::PemKeyCertPair(ssl_pair); c_pem_key_cert_pair_list.push_back(::std::move(c_pem_key_cert_pair)); } - ::grpc_core::UniquePtr c_pem_root_certs( + ::std::unique_ptr c_pem_root_certs( gpr_strdup(config->pem_root_certs().c_str())); c_config->set_key_materials(std::move(c_pem_root_certs), std::move(c_pem_key_cert_pair_list)); diff --git a/src/objective-c/tests/CronetTests/CoreCronetEnd2EndTests.mm b/src/objective-c/tests/CronetTests/CoreCronetEnd2EndTests.mm index f2715af6c98..1ffddd0bc79 100644 --- a/src/objective-c/tests/CronetTests/CoreCronetEnd2EndTests.mm +++ b/src/objective-c/tests/CronetTests/CoreCronetEnd2EndTests.mm @@ -52,7 +52,7 @@ #import "../ConfigureCronet.h" struct fullstack_secure_fixture_data { - grpc_core::UniquePtr localaddr; + std::unique_ptr localaddr; }; static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack( diff --git a/src/objective-c/tests/CronetTests/CronetUnitTests.mm b/src/objective-c/tests/CronetTests/CronetUnitTests.mm index b5562654b0b..af6ca99202c 100644 --- a/src/objective-c/tests/CronetTests/CronetUnitTests.mm +++ b/src/objective-c/tests/CronetTests/CronetUnitTests.mm @@ -133,7 +133,7 @@ unsigned int parse_h2_length(const char *field) { {{NULL, NULL, NULL, NULL}}}}; int port = grpc_pick_unused_port_or_die(); - grpc_core::UniquePtr addr; + std::unique_ptr addr; grpc_core::JoinHostPort(&addr, "127.0.0.1", port); grpc_completion_queue *cq = grpc_completion_queue_create_for_next(NULL); stream_engine *cronetEngine = [Cronet getGlobalEngine]; @@ -264,7 +264,7 @@ unsigned int parse_h2_length(const char *field) { {{NULL, NULL, NULL, NULL}}}}; int port = grpc_pick_unused_port_or_die(); - grpc_core::UniquePtr addr; + std::unique_ptr addr; grpc_core::JoinHostPort(&addr, "127.0.0.1", port); grpc_completion_queue *cq = grpc_completion_queue_create_for_next(NULL); stream_engine *cronetEngine = [Cronet getGlobalEngine]; diff --git a/test/core/bad_ssl/bad_ssl_test.cc b/test/core/bad_ssl/bad_ssl_test.cc index 0480815443a..3e47b876a46 100644 --- a/test/core/bad_ssl/bad_ssl_test.cc +++ b/test/core/bad_ssl/bad_ssl_test.cc @@ -145,7 +145,7 @@ int main(int argc, char** argv) { gpr_asprintf(&args[0], "%s/bad_ssl_%s_server%s", root, test, gpr_subprocess_binary_extension()); args[1] = const_cast("--bind"); - grpc_core::UniquePtr joined; + std::unique_ptr joined; grpc_core::JoinHostPort(&joined, "::", port); args[2] = joined.get(); svr = gpr_subprocess_create(4, (const char**)args); diff --git a/test/core/channel/channelz_test.cc b/test/core/channel/channelz_test.cc index 10a5e457b76..34fa53d9ca5 100644 --- a/test/core/channel/channelz_test.cc +++ b/test/core/channel/channelz_test.cc @@ -459,10 +459,10 @@ TEST_F(ChannelzRegistryBasedTest, GetTopChannelsMoreGaps) { TEST_F(ChannelzRegistryBasedTest, GetTopChannelsUuidAfterCompaction) { const intptr_t kLoopIterations = 50; grpc_core::ExecCtx exec_ctx; - std::vector> even_channels; + std::vector> even_channels; { // these will delete and unregister themselves after this block. - std::vector> odd_channels; + std::vector> odd_channels; for (int i = 0; i < kLoopIterations; i++) { odd_channels.push_back(MakeUnique()); even_channels.push_back(MakeUnique()); diff --git a/test/core/client_channel/parse_address_with_named_scope_id_test.cc b/test/core/client_channel/parse_address_with_named_scope_id_test.cc index 071fb88b734..c9fffacc920 100644 --- a/test/core/client_channel/parse_address_with_named_scope_id_test.cc +++ b/test/core/client_channel/parse_address_with_named_scope_id_test.cc @@ -61,8 +61,8 @@ static void test_grpc_parse_ipv6_parity_with_getaddrinfo( struct sockaddr_in6 resolve_with_gettaddrinfo(const char* uri_text) { grpc_uri* uri = grpc_uri_parse(uri_text, 0); - grpc_core::UniquePtr host; - grpc_core::UniquePtr port; + std::unique_ptr host; + std::unique_ptr port; grpc_core::SplitHostPort(uri->path, &host, &port); struct addrinfo hints; memset(&hints, 0, sizeof(hints)); diff --git a/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc b/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc index 564a4339ea4..95eafeff54f 100644 --- a/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc +++ b/test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc @@ -63,7 +63,7 @@ static grpc_address_resolver_vtable test_resolver = {my_resolve_address, static grpc_ares_request* my_dns_lookup_ares_locked( const char* /*dns_server*/, const char* addr, const char* /*default_port*/, grpc_pollset_set* /*interested_parties*/, grpc_closure* on_done, - grpc_core::UniquePtr* addresses, + std::unique_ptr* addresses, bool /*check_grpclb*/, char** /*service_config_json*/, int /*query_timeout_ms*/, grpc_core::Combiner* /*combiner*/) { gpr_mu_lock(&g_mu); @@ -91,7 +91,7 @@ static void my_cancel_ares_request_locked(grpc_ares_request* request) { static grpc_core::OrphanablePtr create_resolver( const char* name, - grpc_core::UniquePtr result_handler) { + std::unique_ptr result_handler) { grpc_core::ResolverFactory* factory = grpc_core::ResolverRegistry::LookupResolverFactory("dns"); grpc_uri* uri = grpc_uri_parse(name, 0); @@ -169,8 +169,8 @@ int main(int argc, char** argv) { grpc_core::ExecCtx exec_ctx; ResultHandler* result_handler = new ResultHandler(); grpc_core::OrphanablePtr resolver = create_resolver( - "dns:test", grpc_core::UniquePtr( - result_handler)); + "dns:test", + std::unique_ptr(result_handler)); ResultHandler::ResolverOutput output1; result_handler->SetOutput(&output1); resolver->StartLocked(); diff --git a/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc b/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc index 35f45c59216..94699bd3b31 100644 --- a/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc +++ b/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc @@ -42,8 +42,8 @@ static grpc_core::Combiner* g_combiner; static grpc_ares_request* (*g_default_dns_lookup_ares_locked)( const char* dns_server, const char* name, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, - grpc_core::UniquePtr* addresses, - bool check_grpclb, char** service_config_json, int query_timeout_ms, + std::unique_ptr* addresses, bool check_grpclb, + char** service_config_json, int query_timeout_ms, grpc_core::Combiner* combiner); // Counter incremented by test_resolve_address_impl indicating the number of @@ -93,8 +93,8 @@ static grpc_address_resolver_vtable test_resolver = { static grpc_ares_request* test_dns_lookup_ares_locked( const char* dns_server, const char* name, const char* default_port, grpc_pollset_set* /*interested_parties*/, grpc_closure* on_done, - grpc_core::UniquePtr* addresses, - bool check_grpclb, char** service_config_json, int query_timeout_ms, + std::unique_ptr* addresses, bool check_grpclb, + char** service_config_json, int query_timeout_ms, grpc_core::Combiner* combiner) { grpc_ares_request* result = g_default_dns_lookup_ares_locked( dns_server, name, default_port, g_iomgr_args.pollset_set, on_done, @@ -284,9 +284,8 @@ static void start_test_under_combiner(void* arg, grpc_error* /*error*/) { grpc_core::ResolverArgs args; args.uri = uri; args.combiner = g_combiner; - args.result_handler = - grpc_core::UniquePtr( - res_cb_arg->result_handler); + args.result_handler = std::unique_ptr( + res_cb_arg->result_handler); g_resolution_count = 0; grpc_arg cooldown_arg = grpc_channel_arg_integer_create( diff --git a/test/core/client_channel/resolvers/dns_resolver_test.cc b/test/core/client_channel/resolvers/dns_resolver_test.cc index f86f52b4e92..7394824f8d9 100644 --- a/test/core/client_channel/resolvers/dns_resolver_test.cc +++ b/test/core/client_channel/resolvers/dns_resolver_test.cc @@ -82,8 +82,7 @@ int main(int argc, char** argv) { test_succeeds(dns, "dns:10.2.1.1:1234"); test_succeeds(dns, "dns:www.google.com"); test_succeeds(dns, "dns:///www.google.com"); - grpc_core::UniquePtr resolver = - GPR_GLOBAL_CONFIG_GET(grpc_dns_resolver); + std::unique_ptr resolver = GPR_GLOBAL_CONFIG_GET(grpc_dns_resolver); if (gpr_stricmp(resolver.get(), "native") == 0) { test_fails(dns, "dns://8.8.8.8/8.8.8.8:8888"); } else { diff --git a/test/core/client_channel/resolvers/fake_resolver_test.cc b/test/core/client_channel/resolvers/fake_resolver_test.cc index cdb4fa41bc8..01d82cbdd05 100644 --- a/test/core/client_channel/resolvers/fake_resolver_test.cc +++ b/test/core/client_channel/resolvers/fake_resolver_test.cc @@ -65,7 +65,7 @@ class ResultHandler : public grpc_core::Resolver::ResultHandler { static grpc_core::OrphanablePtr build_fake_resolver( grpc_core::Combiner* combiner, grpc_core::FakeResolverResponseGenerator* response_generator, - grpc_core::UniquePtr result_handler) { + std::unique_ptr result_handler) { grpc_core::ResolverFactory* factory = grpc_core::ResolverRegistry::LookupResolverFactory("fake"); grpc_arg generator_arg = @@ -126,7 +126,7 @@ static void test_fake_resolver() { grpc_core::MakeRefCounted(); grpc_core::OrphanablePtr resolver = build_fake_resolver( combiner, response_generator.get(), - grpc_core::UniquePtr(result_handler)); + std::unique_ptr(result_handler)); GPR_ASSERT(resolver.get() != nullptr); resolver->StartLocked(); // Test 1: normal resolution. diff --git a/test/core/client_channel/service_config_test.cc b/test/core/client_channel/service_config_test.cc index 7b94ea21b02..a8d29efa0bd 100644 --- a/test/core/client_channel/service_config_test.cc +++ b/test/core/client_channel/service_config_test.cc @@ -43,7 +43,7 @@ class TestParsedConfig1 : public ServiceConfig::ParsedConfig { class TestParser1 : public ServiceConfig::Parser { public: - UniquePtr ParseGlobalParams( + std::unique_ptr ParseGlobalParams( const grpc_json* json, grpc_error** error) override { GPR_DEBUG_ASSERT(error != nullptr); for (grpc_json* field = json->child; field != nullptr; @@ -77,7 +77,7 @@ class TestParser1 : public ServiceConfig::Parser { class TestParser2 : public ServiceConfig::Parser { public: - UniquePtr ParsePerMethodParams( + std::unique_ptr ParsePerMethodParams( const grpc_json* json, grpc_error** error) override { GPR_DEBUG_ASSERT(error != nullptr); for (grpc_json* field = json->child; field != nullptr; @@ -115,14 +115,14 @@ class TestParser2 : public ServiceConfig::Parser { // This parser always adds errors class ErrorParser : public ServiceConfig::Parser { public: - UniquePtr ParsePerMethodParams( + std::unique_ptr ParsePerMethodParams( const grpc_json* /*json*/, grpc_error** error) override { GPR_DEBUG_ASSERT(error != nullptr); *error = GRPC_ERROR_CREATE_FROM_STATIC_STRING(MethodError()); return nullptr; } - UniquePtr ParseGlobalParams( + std::unique_ptr ParseGlobalParams( const grpc_json* /*json*/, grpc_error** error) override { GPR_DEBUG_ASSERT(error != nullptr); *error = GRPC_ERROR_CREATE_FROM_STATIC_STRING(GlobalError()); diff --git a/test/core/end2end/bad_server_response_test.cc b/test/core/end2end/bad_server_response_test.cc index 09c503e1e85..e1cce29831c 100644 --- a/test/core/end2end/bad_server_response_test.cc +++ b/test/core/end2end/bad_server_response_test.cc @@ -71,7 +71,7 @@ #define SERVER_INCOMING_DATA_LENGTH_LOWER_THRESHOLD (size_t)200 struct rpc_state { - grpc_core::UniquePtr target; + std::unique_ptr target; grpc_completion_queue* cq; grpc_channel* channel; grpc_call* call; @@ -287,7 +287,7 @@ static void run_test(const char* response_payload, state.response_payload_length = response_payload_length; /* poll server until sending out the response */ - grpc_core::UniquePtr thdptr( + std::unique_ptr thdptr( poll_server_until_read_done(&test_server, &ev)); start_rpc(server_port, expected_status, expected_detail); gpr_event_wait(&ev, gpr_inf_future(GPR_CLOCK_REALTIME)); diff --git a/test/core/end2end/connection_refused_test.cc b/test/core/end2end/connection_refused_test.cc index 3bb6d2e23b6..b2c51593044 100644 --- a/test/core/end2end/connection_refused_test.cc +++ b/test/core/end2end/connection_refused_test.cc @@ -77,7 +77,7 @@ static void run_test(bool wait_for_ready, bool use_service_config) { /* create a call, channel to a port which will refuse connection */ int port = grpc_pick_unused_port_or_die(); - grpc_core::UniquePtr addr; + std::unique_ptr addr; grpc_core::JoinHostPort(&addr, "127.0.0.1", port); gpr_log(GPR_INFO, "server: %s", addr.get()); chan = grpc_insecure_channel_create(addr.get(), args, nullptr); diff --git a/test/core/end2end/dualstack_socket_test.cc b/test/core/end2end/dualstack_socket_test.cc index efc691dd43f..ae792f86cc0 100644 --- a/test/core/end2end/dualstack_socket_test.cc +++ b/test/core/end2end/dualstack_socket_test.cc @@ -97,7 +97,7 @@ void test_connect(const char* server_host, const char* client_host, int port, picked_port = 1; } - grpc_core::UniquePtr server_hostport; + std::unique_ptr server_hostport; grpc_core::JoinHostPort(&server_hostport, server_host, port); grpc_metadata_array_init(&initial_metadata_recv); @@ -120,7 +120,7 @@ void test_connect(const char* server_host, const char* client_host, int port, cqv = cq_verifier_create(cq); /* Create client. */ - grpc_core::UniquePtr client_hostport; + std::unique_ptr client_hostport; if (client_host[0] == 'i') { /* for ipv4:/ipv6: addresses, concatenate the port to each of the parts */ size_t i; diff --git a/test/core/end2end/fixtures/h2_census.cc b/test/core/end2end/fixtures/h2_census.cc index afabae10966..64d06fff081 100644 --- a/test/core/end2end/fixtures/h2_census.cc +++ b/test/core/end2end/fixtures/h2_census.cc @@ -36,7 +36,7 @@ #include "test/core/util/test_config.h" struct fullstack_fixture_data { - grpc_core::UniquePtr localaddr; + std::unique_ptr localaddr; }; static grpc_end2end_test_fixture chttp2_create_fixture_fullstack( diff --git a/test/core/end2end/fixtures/h2_compress.cc b/test/core/end2end/fixtures/h2_compress.cc index a0a7c298234..5059872f9ba 100644 --- a/test/core/end2end/fixtures/h2_compress.cc +++ b/test/core/end2end/fixtures/h2_compress.cc @@ -41,7 +41,7 @@ struct fullstack_compression_fixture_data { grpc_channel_args_destroy(client_args_compression); grpc_channel_args_destroy(server_args_compression); } - grpc_core::UniquePtr localaddr; + std::unique_ptr localaddr; grpc_channel_args* client_args_compression = nullptr; grpc_channel_args* server_args_compression = nullptr; }; diff --git a/test/core/end2end/fixtures/h2_fakesec.cc b/test/core/end2end/fixtures/h2_fakesec.cc index d8d92bea3b5..bf1ee933208 100644 --- a/test/core/end2end/fixtures/h2_fakesec.cc +++ b/test/core/end2end/fixtures/h2_fakesec.cc @@ -32,7 +32,7 @@ #include "test/core/util/test_config.h" struct fullstack_secure_fixture_data { - grpc_core::UniquePtr localaddr; + std::unique_ptr localaddr; }; static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack( diff --git a/test/core/end2end/fixtures/h2_full+pipe.cc b/test/core/end2end/fixtures/h2_full+pipe.cc index a9807e620de..249c4d3d41f 100644 --- a/test/core/end2end/fixtures/h2_full+pipe.cc +++ b/test/core/end2end/fixtures/h2_full+pipe.cc @@ -41,7 +41,7 @@ #include "test/core/util/test_config.h" struct fullstack_fixture_data { - grpc_core::UniquePtr localaddr; + std::unique_ptr localaddr; }; static grpc_end2end_test_fixture chttp2_create_fixture_fullstack( diff --git a/test/core/end2end/fixtures/h2_full+trace.cc b/test/core/end2end/fixtures/h2_full+trace.cc index 64fdca78a4a..facf0aea34d 100644 --- a/test/core/end2end/fixtures/h2_full+trace.cc +++ b/test/core/end2end/fixtures/h2_full+trace.cc @@ -41,7 +41,7 @@ #include "test/core/util/test_config.h" struct fullstack_fixture_data { - grpc_core::UniquePtr localaddr; + std::unique_ptr localaddr; }; static grpc_end2end_test_fixture chttp2_create_fixture_fullstack( diff --git a/test/core/end2end/fixtures/h2_full+workarounds.cc b/test/core/end2end/fixtures/h2_full+workarounds.cc index d524175925a..4a4849b9a9b 100644 --- a/test/core/end2end/fixtures/h2_full+workarounds.cc +++ b/test/core/end2end/fixtures/h2_full+workarounds.cc @@ -40,7 +40,7 @@ static char* workarounds_arg[GRPC_MAX_WORKAROUND_ID] = { const_cast(GRPC_ARG_WORKAROUND_CRONET_COMPRESSION)}; struct fullstack_fixture_data { - grpc_core::UniquePtr localaddr; + std::unique_ptr localaddr; }; static grpc_end2end_test_fixture chttp2_create_fixture_fullstack( diff --git a/test/core/end2end/fixtures/h2_full.cc b/test/core/end2end/fixtures/h2_full.cc index 485c792162c..f568f7fa5ac 100644 --- a/test/core/end2end/fixtures/h2_full.cc +++ b/test/core/end2end/fixtures/h2_full.cc @@ -35,7 +35,7 @@ #include "test/core/util/test_config.h" struct fullstack_fixture_data { - grpc_core::UniquePtr localaddr; + std::unique_ptr localaddr; }; static grpc_end2end_test_fixture chttp2_create_fixture_fullstack( diff --git a/test/core/end2end/fixtures/h2_http_proxy.cc b/test/core/end2end/fixtures/h2_http_proxy.cc index e88042d57fb..a2bf2402c8e 100644 --- a/test/core/end2end/fixtures/h2_http_proxy.cc +++ b/test/core/end2end/fixtures/h2_http_proxy.cc @@ -39,7 +39,7 @@ struct fullstack_fixture_data { ~fullstack_fixture_data() { grpc_end2end_http_proxy_destroy(proxy); } - grpc_core::UniquePtr server_addr; + std::unique_ptr server_addr; grpc_end2end_http_proxy* proxy = nullptr; }; diff --git a/test/core/end2end/fixtures/h2_oauth2.cc b/test/core/end2end/fixtures/h2_oauth2.cc index 0800d5929f2..a3bc1a2aa73 100644 --- a/test/core/end2end/fixtures/h2_oauth2.cc +++ b/test/core/end2end/fixtures/h2_oauth2.cc @@ -37,7 +37,7 @@ static const char* client_identity_property_name = "smurf_name"; static const char* client_identity = "Brainy Smurf"; struct fullstack_secure_fixture_data { - grpc_core::UniquePtr localaddr; + std::unique_ptr localaddr; }; static const grpc_metadata* find_metadata(const grpc_metadata* md, diff --git a/test/core/end2end/fixtures/h2_spiffe.cc b/test/core/end2end/fixtures/h2_spiffe.cc index 306e94fd1b2..5172794af9b 100644 --- a/test/core/end2end/fixtures/h2_spiffe.cc +++ b/test/core/end2end/fixtures/h2_spiffe.cc @@ -48,7 +48,7 @@ struct fullstack_secure_fixture_data { thd_list[ind].Join(); } } - grpc_core::UniquePtr localaddr; + std::unique_ptr localaddr; ThreadList thd_list; }; diff --git a/test/core/end2end/fixtures/h2_ssl.cc b/test/core/end2end/fixtures/h2_ssl.cc index 2ba2418151d..7597c1fb11b 100644 --- a/test/core/end2end/fixtures/h2_ssl.cc +++ b/test/core/end2end/fixtures/h2_ssl.cc @@ -35,7 +35,7 @@ #include "test/core/util/test_config.h" struct fullstack_secure_fixture_data { - grpc_core::UniquePtr localaddr; + std::unique_ptr localaddr; }; static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack( diff --git a/test/core/end2end/fixtures/h2_ssl_cred_reload.cc b/test/core/end2end/fixtures/h2_ssl_cred_reload.cc index 97600990230..44c7c8d1c95 100644 --- a/test/core/end2end/fixtures/h2_ssl_cred_reload.cc +++ b/test/core/end2end/fixtures/h2_ssl_cred_reload.cc @@ -35,7 +35,7 @@ #include "test/core/util/test_config.h" struct fullstack_secure_fixture_data { - grpc_core::UniquePtr localaddr; + std::unique_ptr localaddr; bool server_credential_reloaded = false; }; diff --git a/test/core/end2end/fixtures/http_proxy_fixture.cc b/test/core/end2end/fixtures/http_proxy_fixture.cc index de8cec386d4..1438fc44142 100644 --- a/test/core/end2end/fixtures/http_proxy_fixture.cc +++ b/test/core/end2end/fixtures/http_proxy_fixture.cc @@ -61,7 +61,7 @@ struct grpc_end2end_http_proxy { gpr_ref_init(&users, 1); combiner = grpc_combiner_create(); } - grpc_core::UniquePtr proxy_name; + std::unique_ptr proxy_name; grpc_core::Thread thd; grpc_tcp_server* server; grpc_channel_args* channel_args; diff --git a/test/core/end2end/fixtures/local_util.h b/test/core/end2end/fixtures/local_util.h index df204d2fab2..8664b0b465e 100644 --- a/test/core/end2end/fixtures/local_util.h +++ b/test/core/end2end/fixtures/local_util.h @@ -23,7 +23,7 @@ #include "src/core/lib/surface/channel.h" struct grpc_end2end_local_fullstack_fixture_data { - grpc_core::UniquePtr localaddr; + std::unique_ptr localaddr; }; /* Utility functions shared by h2_local tests. */ diff --git a/test/core/end2end/fixtures/proxy.cc b/test/core/end2end/fixtures/proxy.cc index ff6ee12ca77..e25bf8f05ef 100644 --- a/test/core/end2end/fixtures/proxy.cc +++ b/test/core/end2end/fixtures/proxy.cc @@ -41,8 +41,8 @@ struct grpc_end2end_proxy { memset(&new_call_metadata, 0, sizeof(new_call_metadata)); } grpc_core::Thread thd; - grpc_core::UniquePtr proxy_port; - grpc_core::UniquePtr server_port; + std::unique_ptr proxy_port; + std::unique_ptr server_port; grpc_completion_queue* cq; grpc_server* server; grpc_channel* client; diff --git a/test/core/end2end/fuzzers/api_fuzzer.cc b/test/core/end2end/fuzzers/api_fuzzer.cc index b1eb33a042b..eecf9363bfb 100644 --- a/test/core/end2end/fuzzers/api_fuzzer.cc +++ b/test/core/end2end/fuzzers/api_fuzzer.cc @@ -325,7 +325,7 @@ typedef struct addr_req { char* addr; grpc_closure* on_done; grpc_resolved_addresses** addrs; - grpc_core::UniquePtr* addresses; + std::unique_ptr* addresses; } addr_req; static void finish_resolve(void* arg, grpc_error* error) { @@ -377,7 +377,7 @@ static grpc_address_resolver_vtable fuzzer_resolver = {my_resolve_address, grpc_ares_request* my_dns_lookup_ares_locked( const char* /*dns_server*/, const char* addr, const char* /*default_port*/, grpc_pollset_set* /*interested_parties*/, grpc_closure* on_done, - grpc_core::UniquePtr* addresses, + std::unique_ptr* addresses, bool /*check_grpclb*/, char** /*service_config_json*/, int /*query_timeout*/, grpc_core::Combiner* /*combiner*/) { addr_req* r = static_cast(gpr_malloc(sizeof(*r))); diff --git a/test/core/end2end/goaway_server_test.cc b/test/core/end2end/goaway_server_test.cc index 8d7df94aa6d..86f27295a5f 100644 --- a/test/core/end2end/goaway_server_test.cc +++ b/test/core/end2end/goaway_server_test.cc @@ -47,8 +47,8 @@ static int g_resolve_port = -1; static grpc_ares_request* (*iomgr_dns_lookup_ares_locked)( const char* dns_server, const char* addr, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, - grpc_core::UniquePtr* addresses, - bool check_grpclb, char** service_config_json, int query_timeout_ms, + std::unique_ptr* addresses, bool check_grpclb, + char** service_config_json, int query_timeout_ms, grpc_core::Combiner* combiner); static void (*iomgr_cancel_ares_request_locked)(grpc_ares_request* request); @@ -104,8 +104,8 @@ static grpc_address_resolver_vtable test_resolver = { static grpc_ares_request* my_dns_lookup_ares_locked( const char* dns_server, const char* addr, const char* default_port, grpc_pollset_set* interested_parties, grpc_closure* on_done, - grpc_core::UniquePtr* addresses, - bool check_grpclb, char** service_config_json, int query_timeout_ms, + std::unique_ptr* addresses, bool check_grpclb, + char** service_config_json, int query_timeout_ms, grpc_core::Combiner* combiner) { if (0 != strcmp(addr, "test")) { return iomgr_dns_lookup_ares_locked( diff --git a/test/core/end2end/h2_ssl_cert_test.cc b/test/core/end2end/h2_ssl_cert_test.cc index 61f685045e7..647fcd924fb 100644 --- a/test/core/end2end/h2_ssl_cert_test.cc +++ b/test/core/end2end/h2_ssl_cert_test.cc @@ -41,7 +41,7 @@ namespace grpc { namespace testing { struct fullstack_secure_fixture_data { - grpc_core::UniquePtr localaddr; + std::unique_ptr localaddr; }; static grpc_end2end_test_fixture chttp2_create_fixture_secure_fullstack( diff --git a/test/core/end2end/h2_ssl_session_reuse_test.cc b/test/core/end2end/h2_ssl_session_reuse_test.cc index ed450aebf1b..3e9a6e97311 100644 --- a/test/core/end2end/h2_ssl_session_reuse_test.cc +++ b/test/core/end2end/h2_ssl_session_reuse_test.cc @@ -215,7 +215,7 @@ void drain_cq(grpc_completion_queue* cq) { TEST(H2SessionReuseTest, SingleReuse) { int port = grpc_pick_unused_port_or_die(); - grpc_core::UniquePtr server_addr; + std::unique_ptr server_addr; grpc_core::JoinHostPort(&server_addr, "localhost", port); grpc_completion_queue* cq = grpc_completion_queue_create_for_next(nullptr); diff --git a/test/core/end2end/invalid_call_argument_test.cc b/test/core/end2end/invalid_call_argument_test.cc index 5f920fad638..c3d09e0550f 100644 --- a/test/core/end2end/invalid_call_argument_test.cc +++ b/test/core/end2end/invalid_call_argument_test.cc @@ -77,7 +77,7 @@ static void prepare_test(int is_client) { } else { g_state.server = grpc_server_create(nullptr, nullptr); grpc_server_register_completion_queue(g_state.server, g_state.cq, nullptr); - grpc_core::UniquePtr server_hostport; + std::unique_ptr server_hostport; grpc_core::JoinHostPort(&server_hostport, "0.0.0.0", port); grpc_server_add_insecure_http2_port(g_state.server, server_hostport.get()); grpc_server_start(g_state.server); diff --git a/test/core/end2end/tests/keepalive_timeout.cc b/test/core/end2end/tests/keepalive_timeout.cc index 1750f6fe5ee..5ae79e06200 100644 --- a/test/core/end2end/tests/keepalive_timeout.cc +++ b/test/core/end2end/tests/keepalive_timeout.cc @@ -230,7 +230,7 @@ static void test_keepalive_timeout(grpc_end2end_test_config config) { * that the keepalive ping is never sent. */ static void test_read_delays_keepalive(grpc_end2end_test_config config) { #ifdef GRPC_POSIX_SOCKET - grpc_core::UniquePtr poller = GPR_GLOBAL_CONFIG_GET(grpc_poll_strategy); + std::unique_ptr poller = GPR_GLOBAL_CONFIG_GET(grpc_poll_strategy); /* It is hard to get the timing right for the polling engine poll. */ if ((0 == strcmp(poller.get(), "poll"))) { return; diff --git a/test/core/fling/fling_stream_test.cc b/test/core/fling/fling_stream_test.cc index edd5616c824..595f5f4462f 100644 --- a/test/core/fling/fling_stream_test.cc +++ b/test/core/fling/fling_stream_test.cc @@ -46,7 +46,7 @@ int main(int /*argc*/, char** argv) { gpr_asprintf(&args[0], "%s/fling_server%s", root, gpr_subprocess_binary_extension()); args[1] = const_cast("--bind"); - grpc_core::UniquePtr joined; + std::unique_ptr joined; grpc_core::JoinHostPort(&joined, "::", port); args[2] = joined.get(); args[3] = const_cast("--no-secure"); diff --git a/test/core/fling/fling_test.cc b/test/core/fling/fling_test.cc index 00d399c4196..57908ee2730 100644 --- a/test/core/fling/fling_test.cc +++ b/test/core/fling/fling_test.cc @@ -47,7 +47,7 @@ int main(int /*argc*/, const char** argv) { gpr_asprintf(&args[0], "%s/fling_server%s", root, gpr_subprocess_binary_extension()); args[1] = const_cast("--bind"); - grpc_core::UniquePtr joined; + std::unique_ptr joined; grpc_core::JoinHostPort(&joined, "::", port); args[2] = joined.get(); args[3] = const_cast("--no-secure"); diff --git a/test/core/fling/server.cc b/test/core/fling/server.cc index 878bff3a9fd..65e78e05a79 100644 --- a/test/core/fling/server.cc +++ b/test/core/fling/server.cc @@ -172,7 +172,7 @@ static void sigint_handler(int /*x*/) { _exit(0); } int main(int argc, char** argv) { grpc_event ev; call_state* s; - grpc_core::UniquePtr addr_buf; + std::unique_ptr addr_buf; gpr_cmdline* cl; grpc_completion_queue* shutdown_cq; int shutdown_started = 0; diff --git a/test/core/gprpp/global_config_env_test.cc b/test/core/gprpp/global_config_env_test.cc index d67dd42f70c..0aaa8fba033 100644 --- a/test/core/gprpp/global_config_env_test.cc +++ b/test/core/gprpp/global_config_env_test.cc @@ -105,7 +105,7 @@ TEST_F(GlobalConfigEnvTest, Int32WithEnvTest) { TEST_F(GlobalConfigEnvTest, StringWithEnvTest) { const char* string_var_name = "STRING_VAR"; - grpc_core::UniquePtr value; + std::unique_ptr value; gpr_unsetenv(string_var_name); value = GPR_GLOBAL_CONFIG_GET(string_var); diff --git a/test/core/gprpp/global_config_test.cc b/test/core/gprpp/global_config_test.cc index 7da78b690b1..5c57c4e38bd 100644 --- a/test/core/gprpp/global_config_test.cc +++ b/test/core/gprpp/global_config_test.cc @@ -47,7 +47,7 @@ TEST(GlobalConfigTest, Int32Test) { } TEST(GlobalConfigTest, StringTest) { - grpc_core::UniquePtr value; + std::unique_ptr value; value = GPR_GLOBAL_CONFIG_GET(string_var); EXPECT_EQ(0, strcmp(value.get(), "")); diff --git a/test/core/gprpp/host_port_test.cc b/test/core/gprpp/host_port_test.cc index cfe0eddb036..370404bc83f 100644 --- a/test/core/gprpp/host_port_test.cc +++ b/test/core/gprpp/host_port_test.cc @@ -26,7 +26,7 @@ static void join_host_port_expect(const char* host, int port, const char* expected) { - grpc_core::UniquePtr buf; + std::unique_ptr buf; int len; len = grpc_core::JoinHostPort(&buf, host, port); GPR_ASSERT(len >= 0); @@ -50,8 +50,8 @@ static void test_join_host_port_garbage(void) { static void split_host_port_expect(const char* name, const char* host, const char* port, bool ret) { - grpc_core::UniquePtr actual_host; - grpc_core::UniquePtr actual_port; + std::unique_ptr actual_host; + std::unique_ptr actual_port; const bool actual_ret = grpc_core::SplitHostPort(name, &actual_host, &actual_port); GPR_ASSERT(actual_ret == ret); diff --git a/test/core/gprpp/inlined_vector_test.cc b/test/core/gprpp/inlined_vector_test.cc index fdbc9ed971a..34e7d1443eb 100644 --- a/test/core/gprpp/inlined_vector_test.cc +++ b/test/core/gprpp/inlined_vector_test.cc @@ -62,8 +62,8 @@ TEST(InlinedVectorTest, ValuesAreInlined) { } TEST(InlinedVectorTest, PushBackWithMove) { - InlinedVector, 1> v; - UniquePtr i = MakeUnique(3); + InlinedVector, 1> v; + std::unique_ptr i = MakeUnique(3); v.push_back(std::move(i)); EXPECT_EQ(nullptr, i.get()); EXPECT_EQ(1UL, v.size()); @@ -71,7 +71,7 @@ TEST(InlinedVectorTest, PushBackWithMove) { } TEST(InlinedVectorTest, EmplaceBack) { - InlinedVector, 1> v; + InlinedVector, 1> v; v.emplace_back(new int(3)); EXPECT_EQ(1UL, v.size()); EXPECT_EQ(3, *v[0]); @@ -328,12 +328,12 @@ class Value { return *this; } - const UniquePtr& value() const { return value_; } + const std::unique_ptr& value() const { return value_; } bool copied() const { return copied_; } bool moved() const { return moved_; } private: - UniquePtr value_; + std::unique_ptr value_; bool copied_ = false; bool moved_ = false; }; @@ -461,7 +461,7 @@ TEST(InlinedVectorTest, MoveAssignmentMovesElementsAllocated) { } TEST(InlinedVectorTest, PopBackInlined) { - InlinedVector, 2> v; + InlinedVector, 2> v; // Add two elements, pop one out v.push_back(MakeUnique(3)); EXPECT_EQ(1UL, v.size()); @@ -475,7 +475,7 @@ TEST(InlinedVectorTest, PopBackInlined) { TEST(InlinedVectorTest, PopBackAllocated) { const int kInlinedSize = 2; - InlinedVector, kInlinedSize> v; + InlinedVector, kInlinedSize> v; // Add elements to ensure allocated backing. for (size_t i = 0; i < kInlinedSize + 1; ++i) { v.push_back(MakeUnique(3)); @@ -488,7 +488,7 @@ TEST(InlinedVectorTest, PopBackAllocated) { TEST(InlinedVectorTest, Resize) { const int kInlinedSize = 2; - InlinedVector, kInlinedSize> v; + InlinedVector, kInlinedSize> v; // Size up. v.resize(5); EXPECT_EQ(5UL, v.size()); diff --git a/test/core/gprpp/string_view_test.cc b/test/core/gprpp/string_view_test.cc index d0a1d3cb724..6ccb3f31df1 100644 --- a/test/core/gprpp/string_view_test.cc +++ b/test/core/gprpp/string_view_test.cc @@ -74,7 +74,7 @@ TEST(StringViewTest, Dup) { constexpr char kStr[] = "foo"; grpc_core::StringView slice( grpc_core::StringViewFromSlice(grpc_slice_from_static_string(kStr))); - grpc_core::UniquePtr dup = grpc_core::StringViewToCString(slice); + std::unique_ptr dup = grpc_core::StringViewToCString(slice); EXPECT_EQ(0, strcmp(kStr, dup.get())); EXPECT_EQ(slice.size(), strlen(kStr)); } diff --git a/test/core/iomgr/resolve_address_posix_test.cc b/test/core/iomgr/resolve_address_posix_test.cc index 4247bfa5950..ff08ad301db 100644 --- a/test/core/iomgr/resolve_address_posix_test.cc +++ b/test/core/iomgr/resolve_address_posix_test.cc @@ -225,8 +225,7 @@ int main(int argc, char** argv) { // --resolver will always be the first one, so only parse the first argument // (other arguments may be unknown to cl) gpr_cmdline_parse(cl, argc > 2 ? 2 : argc, argv); - grpc_core::UniquePtr resolver = - GPR_GLOBAL_CONFIG_GET(grpc_dns_resolver); + std::unique_ptr resolver = GPR_GLOBAL_CONFIG_GET(grpc_dns_resolver); if (strlen(resolver.get()) != 0) { gpr_log(GPR_INFO, "Warning: overriding resolver setting of %s", resolver.get()); @@ -248,8 +247,7 @@ int main(int argc, char** argv) { // c-ares resolver doesn't support UDS (ability for native DNS resolver // to handle this is only expected to be used by servers, which // unconditionally use the native DNS resolver). - grpc_core::UniquePtr resolver = - GPR_GLOBAL_CONFIG_GET(grpc_dns_resolver); + std::unique_ptr resolver = GPR_GLOBAL_CONFIG_GET(grpc_dns_resolver); if (gpr_stricmp(resolver.get(), "native") == 0) { test_unix_socket(); test_unix_socket_path_name_too_long(); diff --git a/test/core/iomgr/resolve_address_test.cc b/test/core/iomgr/resolve_address_test.cc index 48d3f8eb105..1e3fc4bff59 100644 --- a/test/core/iomgr/resolve_address_test.cc +++ b/test/core/iomgr/resolve_address_test.cc @@ -347,8 +347,7 @@ int main(int argc, char** argv) { // --resolver will always be the first one, so only parse the first argument // (other arguments may be unknown to cl) gpr_cmdline_parse(cl, argc > 2 ? 2 : argc, argv); - grpc_core::UniquePtr resolver = - GPR_GLOBAL_CONFIG_GET(grpc_dns_resolver); + std::unique_ptr resolver = GPR_GLOBAL_CONFIG_GET(grpc_dns_resolver); if (strlen(resolver.get()) != 0) { gpr_log(GPR_INFO, "Warning: overriding resolver setting of %s", resolver.get()); diff --git a/test/core/security/control_plane_credentials_test.cc b/test/core/security/control_plane_credentials_test.cc index d7c401d9ad1..97dbe2fc767 100644 --- a/test/core/security/control_plane_credentials_test.cc +++ b/test/core/security/control_plane_credentials_test.cc @@ -83,10 +83,10 @@ grpc_server_credentials* create_test_ssl_server_creds() { // Perform a simple RPC and capture the ASCII value of the // authorization metadata sent to the server, if any. Return // nullptr if no authorization metadata was sent to the server. -grpc_core::UniquePtr perform_call_and_get_authorization_header( +std::unique_ptr perform_call_and_get_authorization_header( grpc_channel_credentials* channel_creds) { // Create a new channel and call - grpc_core::UniquePtr server_addr = nullptr; + std::unique_ptr server_addr = nullptr; grpc_core::JoinHostPort(&server_addr, "localhost", g_port); grpc_arg ssl_name_override = { GRPC_ARG_STRING, @@ -196,7 +196,7 @@ grpc_core::UniquePtr perform_call_and_get_authorization_header( cq_verify(cqv); GPR_ASSERT(status == GRPC_STATUS_OK); // Extract the ascii value of the authorization header, if present - grpc_core::UniquePtr authorization_header_val; + std::unique_ptr authorization_header_val; gpr_log(GPR_DEBUG, "RPC done. Now examine received metadata on server..."); for (size_t i = 0; i < request_metadata_recv.count; i++) { char* cur_key = @@ -239,10 +239,10 @@ void test_attach_and_get() { create_test_ssl_plus_token_channel_creds("foo-auth-header"); grpc_channel_credentials* bar_creds = create_test_ssl_plus_token_channel_creds("bar-auth-header"); - auto foo_key = grpc_core::UniquePtr(gpr_strdup("foo")); + auto foo_key = std::unique_ptr(gpr_strdup("foo")); GPR_ASSERT(grpc_channel_credentials_attach_credentials( main_creds, foo_key.get(), foo_creds) == true); - auto bar_key = grpc_core::UniquePtr(gpr_strdup("bar")); + auto bar_key = std::unique_ptr(gpr_strdup("bar")); GPR_ASSERT(grpc_channel_credentials_attach_credentials( main_creds, bar_key.get(), bar_creds) == true); GPR_ASSERT(grpc_channel_credentials_attach_credentials(main_creds, "foo", @@ -295,10 +295,10 @@ void test_registering_same_creds_under_different_keys() { create_test_ssl_plus_token_channel_creds("main-auth-header"); grpc_channel_credentials* foo_creds = create_test_ssl_plus_token_channel_creds("foo-auth-header"); - auto foo_key = grpc_core::UniquePtr(gpr_strdup("foo")); + auto foo_key = std::unique_ptr(gpr_strdup("foo")); GPR_ASSERT(grpc_channel_credentials_attach_credentials( main_creds, foo_key.get(), foo_creds) == true); - auto foo2_key = grpc_core::UniquePtr(gpr_strdup("foo2")); + auto foo2_key = std::unique_ptr(gpr_strdup("foo2")); GPR_ASSERT(grpc_channel_credentials_attach_credentials( main_creds, foo2_key.get(), foo_creds) == true); GPR_ASSERT(grpc_channel_credentials_attach_credentials(main_creds, "foo", @@ -335,7 +335,7 @@ void test_attach_and_get_with_global_registry() { create_test_ssl_plus_token_channel_creds("global-override-auth-header"); grpc_channel_credentials* random_creds = create_test_ssl_plus_token_channel_creds("random-auth-header"); - auto global_key = grpc_core::UniquePtr(gpr_strdup("global")); + auto global_key = std::unique_ptr(gpr_strdup("global")); GPR_ASSERT(grpc_channel_credentials_attach_credentials( main_creds, global_key.get(), global_override_creds) == true); GPR_ASSERT(grpc_channel_credentials_attach_credentials( @@ -392,7 +392,7 @@ int main(int argc, char** argv) { g_server = grpc_server_create(nullptr, nullptr); g_port = grpc_pick_unused_port_or_die(); grpc_server_register_completion_queue(g_server, g_cq, nullptr); - grpc_core::UniquePtr localaddr; + std::unique_ptr localaddr; grpc_core::JoinHostPort(&localaddr, "localhost", g_port); GPR_ASSERT(grpc_server_add_secure_http2_port(g_server, localaddr.get(), server_creds)); @@ -403,7 +403,7 @@ int main(int argc, char** argv) { // will have access. grpc_channel_credentials* global_creds = create_test_ssl_plus_token_channel_creds("global-auth-header"); - auto global_key = grpc_core::UniquePtr(gpr_strdup("global")); + auto global_key = std::unique_ptr(gpr_strdup("global")); GPR_ASSERT(grpc_control_plane_credentials_register(global_key.get(), global_creds) == true); GPR_ASSERT(grpc_control_plane_credentials_register( @@ -439,7 +439,7 @@ int main(int argc, char** argv) { // a full shutdown and restart of the library. grpc_channel_credentials* global_creds = create_test_ssl_plus_token_channel_creds("global-auth-header"); - auto global_key = grpc_core::UniquePtr(gpr_strdup("global")); + auto global_key = std::unique_ptr(gpr_strdup("global")); GPR_ASSERT(grpc_control_plane_credentials_register(global_key.get(), global_creds) == false); grpc_channel_credentials_release(global_creds); diff --git a/test/core/security/spiffe_security_connector_test.cc b/test/core/security/spiffe_security_connector_test.cc index 4c420ca48fc..406c539dd1e 100644 --- a/test/core/security/spiffe_security_connector_test.cc +++ b/test/core/security/spiffe_security_connector_test.cc @@ -223,7 +223,7 @@ TEST_F(SpiffeSecurityConnectorTest, WithKeyUnchangedReload) { TEST_F(SpiffeSecurityConnectorTest, CreateChannelSecurityConnectorSuccess) { SetOptions(SUCCESS); - auto cred = grpc_core::UniquePtr( + auto cred = std::unique_ptr( grpc_tls_spiffe_credentials_create(options_.get())); const char* target_name = "some_target"; grpc_channel_args* new_args = nullptr; @@ -236,7 +236,7 @@ TEST_F(SpiffeSecurityConnectorTest, CreateChannelSecurityConnectorSuccess) { TEST_F(SpiffeSecurityConnectorTest, CreateChannelSecurityConnectorFailNoTargetName) { SetOptions(SUCCESS); - auto cred = grpc_core::UniquePtr( + auto cred = std::unique_ptr( grpc_tls_spiffe_credentials_create(options_.get())); grpc_channel_args* new_args = nullptr; auto connector = @@ -246,7 +246,7 @@ TEST_F(SpiffeSecurityConnectorTest, TEST_F(SpiffeSecurityConnectorTest, CreateChannelSecurityConnectorFailInit) { SetOptions(FAIL); - auto cred = grpc_core::UniquePtr( + auto cred = std::unique_ptr( grpc_tls_spiffe_credentials_create(options_.get())); grpc_channel_args* new_args = nullptr; auto connector = @@ -256,7 +256,7 @@ TEST_F(SpiffeSecurityConnectorTest, CreateChannelSecurityConnectorFailInit) { TEST_F(SpiffeSecurityConnectorTest, CreateServerSecurityConnectorSuccess) { SetOptions(SUCCESS); - auto cred = grpc_core::UniquePtr( + auto cred = std::unique_ptr( grpc_tls_spiffe_server_credentials_create(options_.get())); auto connector = cred->create_security_connector(); EXPECT_NE(connector, nullptr); @@ -264,7 +264,7 @@ TEST_F(SpiffeSecurityConnectorTest, CreateServerSecurityConnectorSuccess) { TEST_F(SpiffeSecurityConnectorTest, CreateServerSecurityConnectorFailInit) { SetOptions(FAIL); - auto cred = grpc_core::UniquePtr( + auto cred = std::unique_ptr( grpc_tls_spiffe_server_credentials_create(options_.get())); auto connector = cred->create_security_connector(); EXPECT_EQ(connector, nullptr); diff --git a/test/core/slice/slice_hash_table_test.cc b/test/core/slice/slice_hash_table_test.cc index 08cfe91e5a1..39b07bc4227 100644 --- a/test/core/slice/slice_hash_table_test.cc +++ b/test/core/slice/slice_hash_table_test.cc @@ -35,7 +35,7 @@ namespace grpc_core { namespace { -typedef SliceHashTable> TestHashTable; +typedef SliceHashTable> TestHashTable; struct TestEntry { const char* key; @@ -46,7 +46,7 @@ void CheckValues(const std::vector& input, const TestHashTable& table) { for (const TestEntry& expected : input) { grpc_slice key = grpc_slice_from_static_string(expected.key); - const UniquePtr* actual = table.Get(key); + const std::unique_ptr* actual = table.Get(key); ASSERT_NE(actual, nullptr); EXPECT_STREQ(expected.value, actual->get()); grpc_slice_unref(key); @@ -63,7 +63,7 @@ void PopulateEntries(const std::vector& input, TestHashTable::Entry* output) { for (size_t i = 0; i < input.size(); ++i) { output[i].key = grpc_slice_from_copied_string(input[i].key); - output[i].value = UniquePtr(gpr_strdup(input[i].value)); + output[i].value = std::unique_ptr(gpr_strdup(input[i].value)); } } @@ -123,11 +123,11 @@ TEST(SliceHashTable, Basic) { CheckNonExistentValue("XX", *table); } -int StringCmp(const UniquePtr& a, const UniquePtr& b) { +int StringCmp(const std::unique_ptr& a, const std::unique_ptr& b) { return strcmp(a.get(), b.get()); } -int PointerCmp(const UniquePtr& a, const UniquePtr& b) { +int PointerCmp(const std::unique_ptr& a, const std::unique_ptr& b) { return GPR_ICMP(a.get(), b.get()); } diff --git a/test/core/slice/slice_test.cc b/test/core/slice/slice_test.cc index 83a6db4a113..9f1fd82795b 100644 --- a/test/core/slice/slice_test.cc +++ b/test/core/slice/slice_test.cc @@ -301,7 +301,7 @@ static void test_moved_string_slice(void) { constexpr char kSmallStr[] = "hello12345"; char* small_ptr = strdup(kSmallStr); grpc_slice small = - grpc_slice_from_moved_string(grpc_core::UniquePtr(small_ptr)); + grpc_slice_from_moved_string(std::unique_ptr(small_ptr)); GPR_ASSERT(GRPC_SLICE_LENGTH(small) == strlen(kSmallStr)); GPR_ASSERT(GRPC_SLICE_START_PTR(small) != reinterpret_cast(small_ptr)); @@ -311,7 +311,7 @@ static void test_moved_string_slice(void) { constexpr char kSLargeStr[] = "hello123456789123456789123456789"; char* large_ptr = strdup(kSLargeStr); grpc_slice large = - grpc_slice_from_moved_string(grpc_core::UniquePtr(large_ptr)); + grpc_slice_from_moved_string(std::unique_ptr(large_ptr)); GPR_ASSERT(GRPC_SLICE_LENGTH(large) == strlen(kSLargeStr)); GPR_ASSERT(GRPC_SLICE_START_PTR(large) == reinterpret_cast(large_ptr)); @@ -320,7 +320,7 @@ static void test_moved_string_slice(void) { // Moved buffer must respect the provided length not the actual length of the // string. large_ptr = strdup(kSLargeStr); - small = grpc_slice_from_moved_buffer(grpc_core::UniquePtr(large_ptr), + small = grpc_slice_from_moved_buffer(std::unique_ptr(large_ptr), strlen(kSmallStr)); GPR_ASSERT(GRPC_SLICE_LENGTH(small) == strlen(kSmallStr)); GPR_ASSERT(GRPC_SLICE_START_PTR(small) != diff --git a/test/core/slice/slice_weak_hash_table_test.cc b/test/core/slice/slice_weak_hash_table_test.cc index ab0a648727d..37798df445d 100644 --- a/test/core/slice/slice_weak_hash_table_test.cc +++ b/test/core/slice/slice_weak_hash_table_test.cc @@ -43,11 +43,11 @@ grpc_slice BuildRefCountedKey(const char* key_str) { } TEST(SliceWeakHashTable, Basic) { - auto table = SliceWeakHashTable, 10>::Create(); + auto table = SliceWeakHashTable, 10>::Create(); // Single key-value insertion. grpc_slice key = BuildRefCountedKey("key"); grpc_slice_ref(key); // Get doesn't own. - table->Add(key, UniquePtr(gpr_strdup("value"))); + table->Add(key, std::unique_ptr(gpr_strdup("value"))); ASSERT_NE(table->Get(key), nullptr); ASSERT_STREQ(table->Get(key)->get(), "value"); grpc_slice_unref(key); @@ -70,7 +70,7 @@ TEST(SliceWeakHashTable, ValueTypeConstructor) { TEST(SliceWeakHashTable, ForceOverload) { constexpr int kTableSize = 10; - auto table = SliceWeakHashTable, kTableSize>::Create(); + auto table = SliceWeakHashTable, kTableSize>::Create(); // Insert a multiple of the maximum size table. for (int i = 0; i < kTableSize * 2; ++i) { std::ostringstream oss; @@ -78,7 +78,7 @@ TEST(SliceWeakHashTable, ForceOverload) { grpc_slice key = BuildRefCountedKey(oss.str().c_str()); oss.clear(); oss << "value-" << i; - table->Add(key, UniquePtr(gpr_strdup(oss.str().c_str()))); + table->Add(key, std::unique_ptr(gpr_strdup(oss.str().c_str()))); } // Verify that some will have been replaced. int num_missing = 0; diff --git a/test/core/surface/num_external_connectivity_watchers_test.cc b/test/core/surface/num_external_connectivity_watchers_test.cc index 2c9b0d9aaed..e93d58c31c5 100644 --- a/test/core/surface/num_external_connectivity_watchers_test.cc +++ b/test/core/surface/num_external_connectivity_watchers_test.cc @@ -67,7 +67,7 @@ static void channel_idle_poll_for_timeout(grpc_channel* channel, static void run_timeouts_test(const test_fixture* fixture) { gpr_log(GPR_INFO, "TEST: %s", fixture->name); - grpc_core::UniquePtr addr; + std::unique_ptr addr; grpc_init(); grpc_core::JoinHostPort(&addr, "localhost", grpc_pick_unused_port_or_die()); @@ -118,7 +118,7 @@ static void run_channel_shutdown_before_timeout_test( const test_fixture* fixture) { gpr_log(GPR_INFO, "TEST: %s", fixture->name); - grpc_core::UniquePtr addr; + std::unique_ptr addr; grpc_init(); grpc_core::JoinHostPort(&addr, "localhost", grpc_pick_unused_port_or_die()); diff --git a/test/core/surface/sequential_connectivity_test.cc b/test/core/surface/sequential_connectivity_test.cc index 46c4a24f5ed..51cb51df124 100644 --- a/test/core/surface/sequential_connectivity_test.cc +++ b/test/core/surface/sequential_connectivity_test.cc @@ -56,7 +56,7 @@ static void run_test(const test_fixture* fixture) { grpc_init(); - grpc_core::UniquePtr addr; + std::unique_ptr addr; grpc_core::JoinHostPort(&addr, "localhost", grpc_pick_unused_port_or_die()); grpc_server* server = grpc_server_create(nullptr, nullptr); diff --git a/test/core/surface/server_chttp2_test.cc b/test/core/surface/server_chttp2_test.cc index a88362e13b0..068b06740df 100644 --- a/test/core/surface/server_chttp2_test.cc +++ b/test/core/surface/server_chttp2_test.cc @@ -47,7 +47,7 @@ void test_add_same_port_twice() { grpc_channel_args args = {1, &a}; int port = grpc_pick_unused_port_or_die(); - grpc_core::UniquePtr addr; + std::unique_ptr addr; grpc_completion_queue* cq = grpc_completion_queue_create_for_pluck(nullptr); grpc_server* server = grpc_server_create(&args, nullptr); grpc_server_credentials* fake_creds = diff --git a/test/core/surface/server_test.cc b/test/core/surface/server_test.cc index 185a6757743..4076a060bac 100644 --- a/test/core/surface/server_test.cc +++ b/test/core/surface/server_test.cc @@ -106,7 +106,7 @@ void test_bind_server_twice(void) { void test_bind_server_to_addr(const char* host, bool secure) { int port = grpc_pick_unused_port_or_die(); - grpc_core::UniquePtr addr; + std::unique_ptr addr; grpc_core::JoinHostPort(&addr, host, port); gpr_log(GPR_INFO, "Test bind to %s", addr.get()); diff --git a/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc b/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc index 853dce5c88a..9b12510ef57 100644 --- a/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc +++ b/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc @@ -109,7 +109,7 @@ class FakeHandshakeServer { const char* address() { return address_.get(); } private: - grpc_core::UniquePtr address_; + std::unique_ptr address_; std::unique_ptr service_; std::unique_ptr server_; }; @@ -163,7 +163,7 @@ class TestServer { grpc_server* server_; grpc_completion_queue* server_cq_; std::unique_ptr server_thd_; - grpc_core::UniquePtr server_addr_; + std::unique_ptr server_addr_; }; class ConnectLoopRunner { @@ -172,9 +172,9 @@ class ConnectLoopRunner { const char* server_address, const char* fake_handshake_server_addr, int per_connect_deadline_seconds, size_t loops, grpc_connectivity_state expected_connectivity_states) - : server_address_(grpc_core::UniquePtr(gpr_strdup(server_address))), + : server_address_(std::unique_ptr(gpr_strdup(server_address))), fake_handshake_server_addr_( - grpc_core::UniquePtr(gpr_strdup(fake_handshake_server_addr))), + std::unique_ptr(gpr_strdup(fake_handshake_server_addr))), per_connect_deadline_seconds_(per_connect_deadline_seconds), loops_(loops), expected_connectivity_states_(expected_connectivity_states) { @@ -222,8 +222,8 @@ class ConnectLoopRunner { } private: - grpc_core::UniquePtr server_address_; - grpc_core::UniquePtr fake_handshake_server_addr_; + std::unique_ptr server_address_; + std::unique_ptr fake_handshake_server_addr_; int per_connect_deadline_seconds_; size_t loops_; grpc_connectivity_state expected_connectivity_states_; @@ -286,7 +286,7 @@ class FakeTcpServer { accept_socket_ = socket(AF_INET6, SOCK_STREAM, 0); char* addr_str; GPR_ASSERT(gpr_asprintf(&addr_str, "[::]:%d", port_)); - address_ = grpc_core::UniquePtr(addr_str); + address_ = std::unique_ptr(addr_str); GPR_ASSERT(accept_socket_ != -1); if (accept_socket_ == -1) { gpr_log(GPR_ERROR, "Failed to create socket: %d", errno); @@ -426,7 +426,7 @@ class FakeTcpServer { int accept_socket_; int port_; gpr_event stop_ev_; - grpc_core::UniquePtr address_; + std::unique_ptr address_; std::unique_ptr run_server_loop_thd_; std::function process_read_cb_; }; diff --git a/test/core/util/test_lb_policies.cc b/test/core/util/test_lb_policies.cc index fd1547f4c6a..150a196ae45 100644 --- a/test/core/util/test_lb_policies.cc +++ b/test/core/util/test_lb_policies.cc @@ -51,7 +51,7 @@ namespace { class ForwardingLoadBalancingPolicy : public LoadBalancingPolicy { public: ForwardingLoadBalancingPolicy( - UniquePtr delegating_helper, Args args, + std::unique_ptr delegating_helper, Args args, const std::string& delegate_policy_name, intptr_t initial_refcount = 1) : LoadBalancingPolicy(std::move(args), initial_refcount) { Args delegate_args; @@ -93,7 +93,7 @@ class InterceptRecvTrailingMetadataLoadBalancingPolicy InterceptRecvTrailingMetadataLoadBalancingPolicy( Args args, InterceptRecvTrailingMetadataCallback cb, void* user_data) : ForwardingLoadBalancingPolicy( - UniquePtr(new Helper( + std::unique_ptr(new Helper( RefCountedPtr( this), cb, user_data)), @@ -110,7 +110,7 @@ class InterceptRecvTrailingMetadataLoadBalancingPolicy private: class Picker : public SubchannelPicker { public: - explicit Picker(UniquePtr delegate_picker, + explicit Picker(std::unique_ptr delegate_picker, InterceptRecvTrailingMetadataCallback cb, void* user_data) : delegate_picker_(std::move(delegate_picker)), cb_(cb), @@ -133,7 +133,7 @@ class InterceptRecvTrailingMetadataLoadBalancingPolicy } private: - UniquePtr delegate_picker_; + std::unique_ptr delegate_picker_; InterceptRecvTrailingMetadataCallback cb_; void* user_data_; }; @@ -151,9 +151,9 @@ class InterceptRecvTrailingMetadataLoadBalancingPolicy } void UpdateState(grpc_connectivity_state state, - UniquePtr picker) override { + std::unique_ptr picker) override { parent_->channel_control_helper()->UpdateState( - state, UniquePtr( + state, std::unique_ptr( new Picker(std::move(picker), cb_, user_data_))); } @@ -240,7 +240,7 @@ class InterceptTrailingFactory : public LoadBalancingPolicyFactory { void RegisterInterceptRecvTrailingMetadataLoadBalancingPolicy( InterceptRecvTrailingMetadataCallback cb, void* user_data) { LoadBalancingPolicyRegistry::Builder::RegisterLoadBalancingPolicyFactory( - UniquePtr( + std::unique_ptr( new InterceptTrailingFactory(cb, user_data))); } diff --git a/test/cpp/client/credentials_test.cc b/test/cpp/client/credentials_test.cc index af4c8532ef9..8b263b03e2e 100644 --- a/test/cpp/client/credentials_test.cc +++ b/test/cpp/client/credentials_test.cc @@ -397,7 +397,7 @@ TEST_F(CredentialsTest, TlsCredentialReloadConfigCppToC) { pem_key_cert_pair_list.push_back(pem_key_cert_pair); grpc::string test_pem_root_certs = "pem_root_certs"; c_key_materials.set_key_materials( - ::grpc_core::UniquePtr(gpr_strdup(test_pem_root_certs.c_str())), + ::std::unique_ptr(gpr_strdup(test_pem_root_certs.c_str())), pem_key_cert_pair_list); c_arg.key_materials_config = &c_key_materials; c_arg.status = GRPC_SSL_CERTIFICATE_CONFIG_RELOAD_UNCHANGED; diff --git a/test/cpp/end2end/async_end2end_test.cc b/test/cpp/end2end/async_end2end_test.cc index 659076fe5dc..37c74da615b 100644 --- a/test/cpp/end2end/async_end2end_test.cc +++ b/test/cpp/end2end/async_end2end_test.cc @@ -365,7 +365,7 @@ TEST_P(AsyncEnd2endTest, ReconnectChannel) { #ifdef GRPC_POSIX_SOCKET // It needs 2 pollset_works to reconnect the channel with polling engine // "poll" - grpc_core::UniquePtr poller = GPR_GLOBAL_CONFIG_GET(grpc_poll_strategy); + std::unique_ptr poller = GPR_GLOBAL_CONFIG_GET(grpc_poll_strategy); if (0 == strcmp(poller.get(), "poll")) { poller_slowdown_factor = 2; } diff --git a/test/cpp/end2end/client_lb_end2end_test.cc b/test/cpp/end2end/client_lb_end2end_test.cc index 2b62a866740..900b5ff1a4b 100644 --- a/test/cpp/end2end/client_lb_end2end_test.cc +++ b/test/cpp/end2end/client_lb_end2end_test.cc @@ -1669,13 +1669,11 @@ class ClientLbInterceptTrailingMetadataTest : public ClientLbEnd2endTest { backend_metric_data->mem_utilization); self->load_report_->set_rps(backend_metric_data->requests_per_second); for (const auto& p : backend_metric_data->request_cost) { - grpc_core::UniquePtr name = - grpc_core::StringViewToCString(p.first); + std::unique_ptr name = grpc_core::StringViewToCString(p.first); (*self->load_report_->mutable_request_cost())[name.get()] = p.second; } for (const auto& p : backend_metric_data->utilization) { - grpc_core::UniquePtr name = - grpc_core::StringViewToCString(p.first); + std::unique_ptr name = grpc_core::StringViewToCString(p.first); (*self->load_report_->mutable_utilization())[name.get()] = p.second; } } diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc index 52c8fe3fba3..9ffd0bbfc04 100644 --- a/test/cpp/end2end/end2end_test.cc +++ b/test/cpp/end2end/end2end_test.cc @@ -834,7 +834,7 @@ TEST_P(End2endTest, ReconnectChannel) { // It needs 2 pollset_works to reconnect the channel with polling engine // "poll" #ifdef GRPC_POSIX_SOCKET - grpc_core::UniquePtr poller = GPR_GLOBAL_CONFIG_GET(grpc_poll_strategy); + std::unique_ptr poller = GPR_GLOBAL_CONFIG_GET(grpc_poll_strategy); if (0 == strcmp(poller.get(), "poll")) { poller_slowdown_factor = 2; } diff --git a/test/cpp/naming/address_sorting_test.cc b/test/cpp/naming/address_sorting_test.cc index a3d9936606d..4191d04e8b1 100644 --- a/test/cpp/naming/address_sorting_test.cc +++ b/test/cpp/naming/address_sorting_test.cc @@ -64,8 +64,8 @@ struct TestAddress { }; grpc_resolved_address TestAddressToGrpcResolvedAddress(TestAddress test_addr) { - grpc_core::UniquePtr host; - grpc_core::UniquePtr port; + std::unique_ptr host; + std::unique_ptr port; grpc_resolved_address resolved_addr; grpc_core::SplitHostPort(test_addr.dest_addr.c_str(), &host, &port); if (test_addr.family == AF_INET) { @@ -827,8 +827,7 @@ TEST_F(AddressSortingTest, TestSorterKnowsIpv6LoopbackIsAvailable) { } // namespace int main(int argc, char** argv) { - grpc_core::UniquePtr resolver = - GPR_GLOBAL_CONFIG_GET(grpc_dns_resolver); + std::unique_ptr resolver = GPR_GLOBAL_CONFIG_GET(grpc_dns_resolver); if (strlen(resolver.get()) == 0) { GPR_GLOBAL_CONFIG_SET(grpc_dns_resolver, "ares"); } else if (strcmp("ares", resolver.get())) { diff --git a/test/cpp/naming/cancel_ares_query_test.cc b/test/cpp/naming/cancel_ares_query_test.cc index e53c57ed261..285c0cb793c 100644 --- a/test/cpp/naming/cancel_ares_query_test.cc +++ b/test/cpp/naming/cancel_ares_query_test.cc @@ -164,7 +164,7 @@ void TestCancelActiveDNSQuery(ArgsStruct* args) { grpc_core::OrphanablePtr resolver = grpc_core::ResolverRegistry::CreateResolver( client_target, nullptr, args->pollset_set, args->lock, - grpc_core::UniquePtr( + std::unique_ptr( new AssertFailureResultHandler(args))); gpr_free(client_target); resolver->StartLocked(); diff --git a/test/cpp/naming/resolver_component_test.cc b/test/cpp/naming/resolver_component_test.cc index d14caa996da..5e1783d951c 100644 --- a/test/cpp/naming/resolver_component_test.cc +++ b/test/cpp/naming/resolver_component_test.cc @@ -420,9 +420,9 @@ void OpenAndCloseSocketsStressLoop(int dummy_port, gpr_event* done_ev) { class ResultHandler : public grpc_core::Resolver::ResultHandler { public: - static grpc_core::UniquePtr Create( + static std::unique_ptr Create( ArgsStruct* args) { - return grpc_core::UniquePtr( + return std::unique_ptr( new ResultHandler(args)); } @@ -453,9 +453,9 @@ class ResultHandler : public grpc_core::Resolver::ResultHandler { class CheckingResultHandler : public ResultHandler { public: - static grpc_core::UniquePtr Create( + static std::unique_ptr Create( ArgsStruct* args) { - return grpc_core::UniquePtr( + return std::unique_ptr( new CheckingResultHandler(args)); } @@ -506,8 +506,8 @@ int g_fake_non_responsive_dns_server_port = -1; void InjectBrokenNameServerList(ares_channel channel) { struct ares_addr_port_node dns_server_addrs[2]; memset(dns_server_addrs, 0, sizeof(dns_server_addrs)); - grpc_core::UniquePtr unused_host; - grpc_core::UniquePtr local_dns_server_port; + std::unique_ptr unused_host; + std::unique_ptr local_dns_server_port; GPR_ASSERT(grpc_core::SplitHostPort(FLAGS_local_dns_server_address.c_str(), &unused_host, &local_dns_server_port)); gpr_log(GPR_DEBUG, @@ -540,8 +540,8 @@ void StartResolvingLocked(void* arg, grpc_error* /*unused*/) { } void RunResolvesRelevantRecordsTest( - grpc_core::UniquePtr ( - *CreateResultHandler)(ArgsStruct* args)) { + std::unique_ptr (*CreateResultHandler)( + ArgsStruct* args)) { grpc_core::ExecCtx exec_ctx; ArgsStruct args; ArgsInit(&args); @@ -554,7 +554,7 @@ void RunResolvesRelevantRecordsTest( gpr_log(GPR_DEBUG, "resolver_component_test: --inject_broken_nameserver_list: %s", FLAGS_inject_broken_nameserver_list.c_str()); - grpc_core::UniquePtr + std::unique_ptr fake_non_responsive_dns_server; if (FLAGS_inject_broken_nameserver_list == "True") { g_fake_non_responsive_dns_server_port = grpc_pick_unused_port_or_die(); diff --git a/test/cpp/qps/driver.cc b/test/cpp/qps/driver.cc index c37529ea274..0b8828a07da 100644 --- a/test/cpp/qps/driver.cc +++ b/test/cpp/qps/driver.cc @@ -333,7 +333,7 @@ std::unique_ptr RunScenario( client_config.add_server_targets(cli_target); } else { std::string host; - grpc_core::UniquePtr cli_target; + std::unique_ptr cli_target; host = get_host(workers[i]); grpc_core::JoinHostPort(&cli_target, host.c_str(), init_status.port()); client_config.add_server_targets(cli_target.get()); diff --git a/test/cpp/qps/qps_worker.cc b/test/cpp/qps/qps_worker.cc index 78dae6207e0..711a5950b8a 100644 --- a/test/cpp/qps/qps_worker.cc +++ b/test/cpp/qps/qps_worker.cc @@ -279,7 +279,7 @@ QpsWorker::QpsWorker(int driver_port, int server_port, std::unique_ptr builder = CreateQpsServerBuilder(); if (driver_port >= 0) { - grpc_core::UniquePtr server_address; + std::unique_ptr server_address; grpc_core::JoinHostPort(&server_address, "::", driver_port); builder->AddListeningPort( server_address.get(), diff --git a/test/cpp/qps/server_async.cc b/test/cpp/qps/server_async.cc index 9c405bd3775..175574bbcc5 100644 --- a/test/cpp/qps/server_async.cc +++ b/test/cpp/qps/server_async.cc @@ -80,7 +80,7 @@ class AsyncQpsServerTest final : public grpc::testing::Server { auto port_num = port(); // Negative port number means inproc server, so no listen port needed if (port_num >= 0) { - grpc_core::UniquePtr server_address; + std::unique_ptr server_address; grpc_core::JoinHostPort(&server_address, "::", port_num); builder->AddListeningPort(server_address.get(), Server::CreateServerCredentials(config)); diff --git a/test/cpp/qps/server_callback.cc b/test/cpp/qps/server_callback.cc index 9060f7368d6..42d7e364945 100644 --- a/test/cpp/qps/server_callback.cc +++ b/test/cpp/qps/server_callback.cc @@ -105,7 +105,7 @@ class CallbackServer final : public grpc::testing::Server { auto port_num = port(); // Negative port number means inproc server, so no listen port needed if (port_num >= 0) { - grpc_core::UniquePtr server_address; + std::unique_ptr server_address; grpc_core::JoinHostPort(&server_address, "::", port_num); builder->AddListeningPort(server_address.get(), Server::CreateServerCredentials(config)); diff --git a/test/cpp/qps/server_sync.cc b/test/cpp/qps/server_sync.cc index f69a8f07ace..7b195ec2e97 100644 --- a/test/cpp/qps/server_sync.cc +++ b/test/cpp/qps/server_sync.cc @@ -160,7 +160,7 @@ class SynchronousServer final : public grpc::testing::Server { auto port_num = port(); // Negative port number means inproc server, so no listen port needed if (port_num >= 0) { - grpc_core::UniquePtr server_address; + std::unique_ptr server_address; grpc_core::JoinHostPort(&server_address, "::", port_num); builder->AddListeningPort(server_address.get(), Server::CreateServerCredentials(config));