aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/cpp/thread_manager
diff options
context:
space:
mode:
authorGravatar Sree Kuchibhotla <sreek@google.com>2016-10-18 16:26:38 -0700
committerGravatar Sree Kuchibhotla <sreek@google.com>2016-10-18 16:26:38 -0700
commit385c9b2f0540e8a6c278c00ad922e97ab749fd21 (patch)
tree472958b9534f068876c5b9f6810a10d494ac9dc5 /src/cpp/thread_manager
parent556aebb1e07c6fb595e51bfc01c37186c0768795 (diff)
Address code review comments
Diffstat (limited to 'src/cpp/thread_manager')
-rw-r--r--src/cpp/thread_manager/thread_manager.cc5
-rw-r--r--src/cpp/thread_manager/thread_manager.h2
2 files changed, 3 insertions, 4 deletions
diff --git a/src/cpp/thread_manager/thread_manager.cc b/src/cpp/thread_manager/thread_manager.cc
index e2b32512f1..c4bf842fbb 100644
--- a/src/cpp/thread_manager/thread_manager.cc
+++ b/src/cpp/thread_manager/thread_manager.cc
@@ -42,7 +42,7 @@ namespace grpc {
ThreadManager::WorkerThread::WorkerThread(ThreadManager* thd_mgr)
: thd_mgr_(thd_mgr),
- thd_(new std::thread(&ThreadManager::WorkerThread::Run, this)) {}
+ thd_(&ThreadManager::WorkerThread::Run, this) {}
void ThreadManager::WorkerThread::Run() {
thd_mgr_->MainWorkLoop();
@@ -50,8 +50,7 @@ void ThreadManager::WorkerThread::Run() {
}
ThreadManager::WorkerThread::~WorkerThread() {
- thd_->join();
- thd_.reset();
+ thd_.join();
}
ThreadManager::ThreadManager(int min_pollers, int max_pollers)
diff --git a/src/cpp/thread_manager/thread_manager.h b/src/cpp/thread_manager/thread_manager.h
index b667a645af..1bb13a67dd 100644
--- a/src/cpp/thread_manager/thread_manager.h
+++ b/src/cpp/thread_manager/thread_manager.h
@@ -114,7 +114,7 @@ class ThreadManager {
void Run();
ThreadManager* thd_mgr_;
- std::unique_ptr<grpc::thread> thd_;
+ grpc::thread thd_;
};
// The main funtion in ThreadManager