diff --git a/test/cpp/qps/client.h b/test/cpp/qps/client.h
index c2fdbb576fa2c54f84b5149092ff441af9bccbbf..221fb30fc59deac0a8c664baa99160fbe00f1c00 100644
--- a/test/cpp/qps/client.h
+++ b/test/cpp/qps/client.h
@@ -84,8 +84,7 @@ class Client {
class ClientChannelInfo {
public:
- explicit ClientChannelInfo(const grpc::string& target,
- const ClientConfig& config)
+ ClientChannelInfo(const grpc::string& target, const ClientConfig& config)
: channel_(CreateTestChannel(target, config.enable_ssl())),
stub_(TestService::NewStub(channel_)) {}
ChannelInterface* get_channel() { return channel_.get(); }
@@ -98,14 +97,12 @@ class Client {
std::vector<ClientChannelInfo> channels_;
void StartThreads(size_t num_threads) {
- for (size_t i = 0; i < num_threads; i++) {
- threads_.emplace_back(new Thread(this, i));
- }
+ for (size_t i = 0; i < num_threads; i++) {
+ threads_.emplace_back(new Thread(this, i));
+ }
}
- void EndThreads() {
- threads_.clear();
- }
+ void EndThreads() { threads_.clear(); }
virtual void ThreadFunc(Histogram* histogram, size_t thread_idx) = 0;
diff --git a/test/cpp/qps/client_async.cc b/test/cpp/qps/client_async.cc
index cd80f1f9a95965cc3bf1402f35b7a792480248d5..5eb9ff6521f77739f71002e7b1a5df058f18e29d 100644
--- a/test/cpp/qps/client_async.cc
+++ b/test/cpp/qps/client_async.cc
@@ -72,22 +72,22 @@ template <class RequestType, class ResponseType>
class ClientRpcContextUnaryImpl : public ClientRpcContext {
public:
ClientRpcContextUnaryImpl(
- TestService::Stub *stub,
- const RequestType &req,
+ TestService::Stub *stub, const RequestType &req,
std::function<
std::unique_ptr<grpc::ClientAsyncResponseReader<ResponseType>>(
- TestService::Stub *, grpc::ClientContext *, const RequestType &,
- void *)> start_req,
+ TestService::Stub *, grpc::ClientContext *, const RequestType &,
+ void *)> start_req,
std::function<void(grpc::Status, ResponseType *)> on_done)
: context_(),
stub_(stub),
req_(req),
response_(),
next_state_(&ClientRpcContextUnaryImpl::ReqSent),
- callback_(on_done), start_req_(start_req),
+ callback_(on_done),
+ start_req_(start_req),
start_(Timer::Now()),
response_reader_(
- start_req(stub_, &context_, req_, ClientRpcContext::tag(this))) {}
+ start_req(stub_, &context_, req_, ClientRpcContext::tag(this))) {}
~ClientRpcContextUnaryImpl() GRPC_OVERRIDE {}
bool RunNextState() GRPC_OVERRIDE { return (this->*next_state_)(); }
void report_stats(Histogram *hist) GRPC_OVERRIDE {
@@ -118,10 +118,9 @@ class ClientRpcContextUnaryImpl : public ClientRpcContext {
ResponseType response_;
bool (ClientRpcContextUnaryImpl::*next_state_)();
std::function<void(grpc::Status, ResponseType *)> callback_;
- std::function<
- std::unique_ptr<grpc::ClientAsyncResponseReader<ResponseType>>(
- TestService::Stub *, grpc::ClientContext *, const RequestType &,
- void *)> start_req_;
+ std::function<std::unique_ptr<grpc::ClientAsyncResponseReader<ResponseType>>(
+ TestService::Stub *, grpc::ClientContext *, const RequestType &, void *)>
+ start_req_;
grpc::Status status_;
double start_;
std::unique_ptr<grpc::ClientAsyncResponseReader<ResponseType>>
@@ -130,7 +129,7 @@ class ClientRpcContextUnaryImpl : public ClientRpcContext {
class AsyncClient GRPC_FINAL : public Client {
public:
- explicit AsyncClient(const ClientConfig& config) : Client(config) {
+ explicit AsyncClient(const ClientConfig &config) : Client(config) {
for (int i = 0; i < config.async_client_threads(); i++) {
cli_cqs_.emplace_back(new CompletionQueue);
}
@@ -145,16 +144,18 @@ class AsyncClient GRPC_FINAL : public Client {
int t = 0;
for (int i = 0; i < config.outstanding_rpcs_per_channel(); i++) {
- for (auto& channel : channels_) {
+ for (auto &channel : channels_) {
auto *cq = cli_cqs_[t].get();
t = (t + 1) % cli_cqs_.size();
- auto start_req = [cq](TestService::Stub *stub, grpc::ClientContext *ctx, const SimpleRequest& request, void *tag) {
+ auto start_req = [cq](TestService::Stub *stub, grpc::ClientContext *ctx,
+ const SimpleRequest &request, void *tag) {
return stub->AsyncUnaryCall(ctx, request, cq, tag);
};
- TestService::Stub* stub = channel.get_stub();
- const SimpleRequest& request = request_;
- new ClientRpcContextUnaryImpl<SimpleRequest, SimpleResponse>(stub, request, start_req, check_done);
+ TestService::Stub *stub = channel.get_stub();
+ const SimpleRequest &request = request_;
+ new ClientRpcContextUnaryImpl<SimpleRequest, SimpleResponse>(
+ stub, request, start_req, check_done);
}
}
@@ -164,7 +165,7 @@ class AsyncClient GRPC_FINAL : public Client {
~AsyncClient() GRPC_OVERRIDE {
EndThreads();
- for (auto& cq : cli_cqs_) {
+ for (auto &cq : cli_cqs_) {
cq->Shutdown();
void *got_tag;
bool ok;
@@ -192,9 +193,9 @@ class AsyncClient GRPC_FINAL : public Client {
std::vector<std::unique_ptr<CompletionQueue>> cli_cqs_;
};
-std::unique_ptr<Client> CreateAsyncClient(const ClientConfig& args) {
+std::unique_ptr<Client> CreateAsyncClient(const ClientConfig &args) {
return std::unique_ptr<Client>(new AsyncClient(args));
}
-} // namespace testing
-} // namespace grpc
+} // namespace testing
+} // namespace grpc
diff --git a/test/cpp/qps/client_sync.cc b/test/cpp/qps/client_sync.cc
index 0be01e137fb8d369f98a2cfe5b1614d6846cfa2b..7bb7231c6f6538bee9542d014a671e12c9c4fc84 100644
--- a/test/cpp/qps/client_sync.cc
+++ b/test/cpp/qps/client_sync.cc
@@ -64,20 +64,20 @@ namespace testing {
class SynchronousClient GRPC_FINAL : public Client {
public:
SynchronousClient(const ClientConfig& config) : Client(config) {
- size_t num_threads = config.outstanding_rpcs_per_channel() * config.client_channels();
+ size_t num_threads =
+ config.outstanding_rpcs_per_channel() * config.client_channels();
responses_.resize(num_threads);
StartThreads(num_threads);
}
- ~SynchronousClient() {
- EndThreads();
- }
+ ~SynchronousClient() { EndThreads(); }
void ThreadFunc(Histogram* histogram, size_t thread_idx) {
auto* stub = channels_[thread_idx % channels_.size()].get_stub();
double start = Timer::Now();
grpc::ClientContext context;
- grpc::Status s = stub->UnaryCall(&context, request_, &responses_[thread_idx]);
+ grpc::Status s =
+ stub->UnaryCall(&context, request_, &responses_[thread_idx]);
histogram->Add((Timer::Now() - start) * 1e9);
}
diff --git a/test/cpp/qps/driver.cc b/test/cpp/qps/driver.cc
index de1ccce3d724e8f016daea9c8fe87a7106236f08..6d5df799a270439d8bb810d01a8c2243e4fa5db7 100644
--- a/test/cpp/qps/driver.cc
+++ b/test/cpp/qps/driver.cc
@@ -71,8 +71,10 @@ static vector<string> get_hosts(const string& name) {
}
}
-ScenarioResult RunScenario(const ClientConfig& initial_client_config, size_t num_clients,
- const ServerConfig& server_config, size_t num_servers) {
+ScenarioResult RunScenario(const ClientConfig& initial_client_config,
+ size_t num_clients,
+ const ServerConfig& server_config,
+ size_t num_servers) {
// ClientContext allocator (all are destroyed at scope exit)
list<ClientContext> contexts;
auto alloc_context = [&contexts]() {
@@ -183,13 +185,15 @@ ScenarioResult RunScenario(const ClientConfig& initial_client_config, size_t num
for (auto& server : servers) {
GPR_ASSERT(server.stream->Read(&server_status));
const auto& stats = server_status.stats();
- result.server_resources.push_back(ResourceUsage{stats.time_elapsed(), stats.time_user(), stats.time_system()});
+ result.server_resources.push_back(ResourceUsage{
+ stats.time_elapsed(), stats.time_user(), stats.time_system()});
}
for (auto& client : clients) {
GPR_ASSERT(client.stream->Read(&client_status));
const auto& stats = client_status.stats();
result.latencies.MergeProto(stats.latencies());
- result.client_resources.push_back(ResourceUsage{stats.time_elapsed(), stats.time_user(), stats.time_system()});
+ result.client_resources.push_back(ResourceUsage{
+ stats.time_elapsed(), stats.time_user(), stats.time_system()});
}
for (auto& client : clients) {
diff --git a/test/cpp/qps/driver.h b/test/cpp/qps/driver.h
index b9d2b33f651b5144a8985366f80cff28f6c865e6..d87e80dc552a593a7b5230e34eaece33e1e19c04 100644
--- a/test/cpp/qps/driver.h
+++ b/test/cpp/qps/driver.h
@@ -52,10 +52,10 @@ struct ScenarioResult {
};
ScenarioResult RunScenario(const grpc::testing::ClientConfig& client_config,
- size_t num_clients,
- const grpc::testing::ServerConfig& server_config,
- size_t num_servers);
-} // namespace testing
-} // namespace grpc
+ size_t num_clients,
+ const grpc::testing::ServerConfig& server_config,
+ size_t num_servers);
+} // namespace testing
+} // namespace grpc
#endif
diff --git a/test/cpp/qps/histogram.h b/test/cpp/qps/histogram.h
index e37be80df290126575bf655174ffe54e3ac49925..7ba00e94c3947423e9f39ca721742437f9cee622 100644
--- a/test/cpp/qps/histogram.h
+++ b/test/cpp/qps/histogram.h
@@ -43,10 +43,10 @@ namespace testing {
class Histogram {
public:
Histogram() : impl_(gpr_histogram_create(0.01, 60e9)) {}
- ~Histogram() { if (impl_) gpr_histogram_destroy(impl_); }
- Histogram(Histogram&& other) : impl_(other.impl_) {
- other.impl_ = nullptr;
+ ~Histogram() {
+ if (impl_) gpr_histogram_destroy(impl_);
}
+ Histogram(Histogram&& other) : impl_(other.impl_) { other.impl_ = nullptr; }
void Merge(Histogram* h) { gpr_histogram_merge(impl_, h->impl_); }
void Add(double value) { gpr_histogram_add(impl_, value); }
diff --git a/test/cpp/qps/qps_driver.cc b/test/cpp/qps/qps_driver.cc
index 7d73bb40d291eae13e3de0896f523f2ff30ae3c9..bf51e7408e9f6f0ae382f6f752f4e3e585e833df 100644
--- a/test/cpp/qps/qps_driver.cc
+++ b/test/cpp/qps/qps_driver.cc
@@ -93,18 +93,39 @@ int main(int argc, char **argv) {
server_config.set_enable_ssl(FLAGS_enable_ssl);
auto result = RunScenario(client_config, FLAGS_num_clients, server_config,
- FLAGS_num_servers);
+ FLAGS_num_servers);
- gpr_log(GPR_INFO, "QPS: %.1f", result.latencies.Count() / average(result.client_resources, [](ResourceUsage u) { return u.wall_time; }));
+ gpr_log(GPR_INFO, "QPS: %.1f",
+ result.latencies.Count() /
+ average(result.client_resources,
+ [](ResourceUsage u) { return u.wall_time; }));
gpr_log(GPR_INFO, "Latencies (50/95/99/99.9%%-ile): %.1f/%.1f/%.1f/%.1f us",
- result.latencies.Percentile(50) / 1000, result.latencies.Percentile(95) / 1000,
- result.latencies.Percentile(99) / 1000, result.latencies.Percentile(99.9) / 1000);
-
- gpr_log(GPR_INFO, "Server system time: %.2f%%", 100.0 * sum(result.server_resources, [](ResourceUsage u) { return u.system_time; }) / sum(result.server_resources, [](ResourceUsage u) { return u.wall_time; }));
- gpr_log(GPR_INFO, "Server user time: %.2f%%", 100.0 * sum(result.server_resources, [](ResourceUsage u) { return u.user_time; }) / sum(result.server_resources, [](ResourceUsage u) { return u.wall_time; }));
- gpr_log(GPR_INFO, "Client system time: %.2f%%", 100.0 * sum(result.client_resources, [](ResourceUsage u) { return u.system_time; }) / sum(result.client_resources, [](ResourceUsage u) { return u.wall_time; }));
- gpr_log(GPR_INFO, "Client user time: %.2f%%", 100.0 * sum(result.client_resources, [](ResourceUsage u) { return u.user_time; }) / sum(result.client_resources, [](ResourceUsage u) { return u.wall_time; }));
+ result.latencies.Percentile(50) / 1000,
+ result.latencies.Percentile(95) / 1000,
+ result.latencies.Percentile(99) / 1000,
+ result.latencies.Percentile(99.9) / 1000);
+
+ gpr_log(GPR_INFO, "Server system time: %.2f%%",
+ 100.0 * sum(result.server_resources,
+ [](ResourceUsage u) { return u.system_time; }) /
+ sum(result.server_resources,
+ [](ResourceUsage u) { return u.wall_time; }));
+ gpr_log(GPR_INFO, "Server user time: %.2f%%",
+ 100.0 * sum(result.server_resources,
+ [](ResourceUsage u) { return u.user_time; }) /
+ sum(result.server_resources,
+ [](ResourceUsage u) { return u.wall_time; }));
+ gpr_log(GPR_INFO, "Client system time: %.2f%%",
+ 100.0 * sum(result.client_resources,
+ [](ResourceUsage u) { return u.system_time; }) /
+ sum(result.client_resources,
+ [](ResourceUsage u) { return u.wall_time; }));
+ gpr_log(GPR_INFO, "Client user time: %.2f%%",
+ 100.0 * sum(result.client_resources,
+ [](ResourceUsage u) { return u.user_time; }) /
+ sum(result.client_resources,
+ [](ResourceUsage u) { return u.wall_time; }));
grpc_shutdown();
return 0;
diff --git a/test/cpp/qps/server.h b/test/cpp/qps/server.h
index ca22d7ca1cda9cbe7b70b32a80541851e44c920c..ef71cb94d00a379e47ec1c9233105a24ad80b69d 100644
--- a/test/cpp/qps/server.h
+++ b/test/cpp/qps/server.h
@@ -42,7 +42,7 @@ namespace testing {
class Server {
public:
- Server():timer_(new Timer) {}
+ Server() : timer_(new Timer) {}
virtual ~Server() {}
ServerStats Mark() {
@@ -58,17 +58,17 @@ class Server {
return stats;
}
- static bool SetPayload(PayloadType type, int size, Payload* payload) {
- PayloadType response_type = type;
- // TODO(yangg): Support UNCOMPRESSABLE payload.
- if (type != PayloadType::COMPRESSABLE) {
- return false;
- }
- payload->set_type(response_type);
- std::unique_ptr<char[]> body(new char[size]());
- payload->set_body(body.get(), size);
- return true;
- }
+ static bool SetPayload(PayloadType type, int size, Payload* payload) {
+ PayloadType response_type = type;
+ // TODO(yangg): Support UNCOMPRESSABLE payload.
+ if (type != PayloadType::COMPRESSABLE) {
+ return false;
+ }
+ payload->set_type(response_type);
+ std::unique_ptr<char[]> body(new char[size]());
+ payload->set_body(body.get(), size);
+ return true;
+ }
private:
std::unique_ptr<Timer> timer_;
diff --git a/test/cpp/qps/server_async.cc b/test/cpp/qps/server_async.cc
index 741a85802adb328566f852346ad7ec314d18e253..64aca957e4cf8674bf566c90ff02890dbd09b4a3 100644
--- a/test/cpp/qps/server_async.cc
+++ b/test/cpp/qps/server_async.cc
@@ -57,11 +57,12 @@
#include <grpc/support/log.h>
namespace grpc {
- namespace testing {
+namespace testing {
class AsyncQpsServerTest : public Server {
public:
- AsyncQpsServerTest(const ServerConfig& config, int port) : srv_cq_(), async_service_(&srv_cq_), server_(nullptr) {
+ AsyncQpsServerTest(const ServerConfig &config, int port)
+ : srv_cq_(), async_service_(&srv_cq_), server_(nullptr) {
char *server_address = NULL;
gpr_join_host_port(&server_address, "::", port);
@@ -103,7 +104,7 @@ class AsyncQpsServerTest : public Server {
~AsyncQpsServerTest() {
server_->Shutdown();
srv_cq_.Shutdown();
- for (auto& thr: threads_) {
+ for (auto &thr : threads_) {
thr.join();
}
while (!contexts_.empty()) {
@@ -117,8 +118,8 @@ class AsyncQpsServerTest : public Server {
public:
ServerRpcContext() {}
virtual ~ServerRpcContext(){};
- virtual bool RunNextState() = 0;// do next state, return false if all done
- virtual void Reset() = 0; // start this back at a clean state
+ virtual bool RunNextState() = 0; // do next state, return false if all done
+ virtual void Reset() = 0; // start this back at a clean state
};
static void *tag(ServerRpcContext *func) {
return reinterpret_cast<void *>(func);
@@ -201,9 +202,10 @@ class AsyncQpsServerTest : public Server {
std::forward_list<ServerRpcContext *> contexts_;
};
-std::unique_ptr<Server> CreateAsyncServer(const ServerConfig& config, int port) {
- return std::unique_ptr<Server>(new AsyncQpsServerTest(config, port));
+std::unique_ptr<Server> CreateAsyncServer(const ServerConfig &config,
+ int port) {
+ return std::unique_ptr<Server>(new AsyncQpsServerTest(config, port));
}
- }// namespace testing
-}// namespace grpc
+} // namespace testing
+} // namespace grpc
diff --git a/test/cpp/qps/server_sync.cc b/test/cpp/qps/server_sync.cc
index e598fb51ae030dcb238881179720027ab2320ea0..88a201fe790131b8ddcc87c366ea7dee1ce51dda 100644
--- a/test/cpp/qps/server_sync.cc
+++ b/test/cpp/qps/server_sync.cc
@@ -62,8 +62,9 @@ class TestServiceImpl GRPC_FINAL : public TestService::Service {
Status UnaryCall(ServerContext* context, const SimpleRequest* request,
SimpleResponse* response) override {
if (request->has_response_size() && request->response_size() > 0) {
- if (!Server::SetPayload(request->response_type(), request->response_size(),
- response->mutable_payload())) {
+ if (!Server::SetPayload(request->response_type(),
+ request->response_size(),
+ response->mutable_payload())) {
return Status(grpc::StatusCode::INTERNAL, "Error creating payload.");
}
}
@@ -74,8 +75,7 @@ class TestServiceImpl GRPC_FINAL : public TestService::Service {
class SynchronousServer GRPC_FINAL : public grpc::testing::Server {
public:
SynchronousServer(const ServerConfig& config, int port)
- : thread_pool_(config.threads()),
- impl_(MakeImpl(port)) {}
+ : thread_pool_(config.threads()), impl_(MakeImpl(port)) {}
private:
std::unique_ptr<grpc::Server> MakeImpl(int port) {
diff --git a/test/cpp/qps/stats.h b/test/cpp/qps/stats.h
index f7a4f8c05dec6b448b0878166d294018c04ec131..ca59390ad79958a371dec9dda4747d8f5ebc65d9 100644
--- a/test/cpp/qps/stats.h
+++ b/test/cpp/qps/stats.h
@@ -44,7 +44,7 @@ template <class T, class F>
double sum(const T& container, F functor) {
double r = 0;
for (auto v : container) {
- r += functor(v);
+ r += functor(v);
}
return r;
}
@@ -54,7 +54,7 @@ double average(const T& container, F functor) {
return sum(container, functor) / container.size();
}
-} // namespace testing
-} // namespace grpc
+} // namespace testing
+} // namespace grpc
#endif