diff --git a/BUILD b/BUILD
index 5153bf668471b54492cf1fffa782bafb73e0ee81..6b186fccbbbbcb01489f5cf583453664b9fe3bcc 100644
--- a/BUILD
+++ b/BUILD
@@ -1,5 +1,5 @@
# GRPC Bazel BUILD file.
-# This currently builds C and C++ code.
+# This currently builds C, C++ and Objective-C code.
# This file has been automatically generated from a template file.
# Please look at the templates directory instead.
# This file can be regenerated from the template by running
diff --git a/grpc.bzl b/grpc.bzl
new file mode 100644
index 0000000000000000000000000000000000000000..9f2693126af451f180598a3e31a674e6f9ef431f
--- /dev/null
+++ b/grpc.bzl
@@ -0,0 +1,128 @@
+# Copyright 2015, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+# * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""
+Bazel macros to declare gRPC libraries automatically generated from proto files.
+
+This file declares two macros:
+- objc_proto_library
+- objc_grpc_library
+"""
+
+def _lower_underscore_to_upper_camel(str):
+ 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])
+
+def _file_with_extension(src, 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
+
+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)"
+
+ 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)
+
+ 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)")
+
+ 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/templates/BUILD.template b/templates/BUILD.template
index dffdc1dddde27832784eb65df8fe0bbcc079449a..4e9d8c376a996574b50a6ce2a6e06fa7f2b6046d 100644
--- a/templates/BUILD.template
+++ b/templates/BUILD.template
@@ -1,5 +1,5 @@
# GRPC Bazel BUILD file.
-# This currently builds C and C++ code.
+# This currently builds C, C++ and Objective-C code.
# This file has been automatically generated from a template file.
# Please look at the templates directory instead.
# This file can be regenerated from the template by running
diff --git a/test/cpp/qps/client_async.cc b/test/cpp/qps/client_async.cc
index 8c8d927d15fa5355e0cb56872634dc7f190d0bce..e1e44f9ac0da8566d387de66ab782c76c1d185bd 100644
--- a/test/cpp/qps/client_async.cc
+++ b/test/cpp/qps/client_async.cc
@@ -199,6 +199,15 @@ class AsyncClient : public Client {
delete ClientRpcContext::detag(got_tag);
}
}
+ // Now clear out all the pre-allocated idle contexts
+ for (int ch = 0; ch < channel_count_; ch++) {
+ while (!contexts_[ch].empty()) {
+ // Get an idle context from the front of the list
+ auto* ctx = *(contexts_[ch].begin());
+ contexts_[ch].pop_front();
+ delete ctx;
+ }
+ }
}
bool ThreadFunc(Histogram* histogram,
diff --git a/test/cpp/qps/qps_test_openloop.cc b/test/cpp/qps/qps_test_openloop.cc
index 52873b2987e0a02543be7efe60432868e4cfed15..96a9b4504c9dc9739185e63f940539c945167db6 100644
--- a/test/cpp/qps/qps_test_openloop.cc
+++ b/test/cpp/qps/qps_test_openloop.cc
@@ -60,7 +60,7 @@ static void RunQPS() {
client_config.set_rpc_type(UNARY);
client_config.set_load_type(POISSON);
client_config.mutable_load_params()->
- mutable_poisson()->set_offered_load(10000.0);
+ mutable_poisson()->set_offered_load(1000.0);
ServerConfig server_config;
server_config.set_server_type(ASYNC_SERVER);