aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/cpp/server
diff options
context:
space:
mode:
authorGravatar Sree Kuchibhotla <sreek@google.com>2016-10-20 11:17:22 -0700
committerGravatar Sree Kuchibhotla <sreek@google.com>2016-10-20 11:17:22 -0700
commit6135535ca77a076652fa3d14ea1619835ec424ae (patch)
tree3f5fae78def8f325e8bd9ac0ecba5c612cc6e644 /src/cpp/server
parent491e1a63064acfb53d61dce4de1beb4a57b3b0c3 (diff)
Minor changes and called generate_projects.sh again
Diffstat (limited to 'src/cpp/server')
-rw-r--r--src/cpp/server/server_builder.cc4
-rw-r--r--src/cpp/server/server_cc.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/cpp/server/server_builder.cc b/src/cpp/server/server_builder.cc
index 9bf3221e6a..8ca29ee58c 100644
--- a/src/cpp/server/server_builder.cc
+++ b/src/cpp/server/server_builder.cc
@@ -216,8 +216,8 @@ std::unique_ptr<Server> ServerBuilder::BuildAndStart() {
// ServerBuilder's AddCompletionQueue() method (those completion queues
// are in 'cqs_' member variable of ServerBuilder object)
std::shared_ptr<std::vector<std::unique_ptr<ServerCompletionQueue>>>
- sync_server_cqs = std::make_shared<
- std::vector<std::unique_ptr<ServerCompletionQueue>>>();
+ sync_server_cqs(std::make_shared<
+ std::vector<std::unique_ptr<ServerCompletionQueue>>>());
if (has_sync_methods) {
// This is a Sync server
diff --git a/src/cpp/server/server_cc.cc b/src/cpp/server/server_cc.cc
index 050f593d44..59af7087cf 100644
--- a/src/cpp/server/server_cc.cc
+++ b/src/cpp/server/server_cc.cc
@@ -332,7 +332,7 @@ class Server::SyncRequestThreadManager : public ThreadManager {
m->Request(server_->c_server(), server_cq_->cq());
}
- ThreadManager::Initialize();
+ Initialize(); // ThreadManager's Initialize()
}
}
@@ -513,7 +513,7 @@ void Server::ShutdownInternal(gpr_timespec deadline) {
// Shutdown all ThreadManagers. This will try to gracefully stop all the
// threads in the ThreadManagers (once they process any inflight requests)
for (auto it = sync_req_mgrs_.begin(); it != sync_req_mgrs_.end(); it++) {
- (*it)->Shutdown();
+ (*it)->Shutdown(); // ThreadManager's Shutdown()
}
shutdown_cq.Shutdown();