Bug fixes

1 files changed, 13 insertions, 14 deletions

diff --git a/src/cpp/server/dynamic_thread_pool.cc b/src/cpp/server/dynamic_thread_pool.cc
index c42563103c..7e9b01143a 100644
--- a/src/cpp/server/dynamic_thread_pool.cc
+++ b/src/cpp/server/dynamic_thread_pool.cc
@@ -50,14 +50,9 @@ void DynamicThreadPool::DynamicThread::ThreadFunc() {
   // Now that we have killed ourselves, we should reduce the thread count
   grpc::unique_lock<grpc::mutex> lock(pool_->mu_);
   pool_->nthreads_--;
-  // Move ourselves from live list to dead list
-  for (auto t = pool_->live_threads_.begin(); t != pool_->live_threads_.end();
-       t++) {
-    if ((*t) == this) {
-      t = pool_->live_threads_.erase(t);
-      pool_->dead_threads_.push_back(this);
-    }
-  }
+  // Move ourselves to dead list
+  pool_->dead_threads_.push_back(this);
+
   if ((pool_->shutdown_) && (pool_->nthreads_ == 0)) {
     pool_->shutdown_cv_.notify_one();
   }
@@ -69,7 +64,7 @@ void DynamicThreadPool::ThreadFunc() {
     grpc::unique_lock<grpc::mutex> lock(mu_);
     if (!shutdown_ && callbacks_.empty()) {
       // If there are too many threads waiting, then quit this thread
-      if (threads_waiting_ == reserve_threads_) {
+      if (threads_waiting_ >= reserve_threads_) {
 	break;
       }
       threads_waiting_++;
@@ -90,11 +85,12 @@ void DynamicThreadPool::ThreadFunc() {
 }
 
 DynamicThreadPool::DynamicThreadPool(int reserve_threads) :
-  shutdown_(false), reserve_threads_(reserve_threads), threads_waiting_(0) {
+  shutdown_(false), reserve_threads_(reserve_threads), nthreads_(0),
+  threads_waiting_(0) {
   for (int i = 0; i < reserve_threads_; i++) {
     grpc::lock_guard<grpc::mutex> lock(mu_);
     nthreads_++;
-    live_threads_.push_back(new DynamicThread(this));
+    new DynamicThread(this);
   }
 }
 
@@ -117,13 +113,16 @@ DynamicThreadPool::~DynamicThreadPool() {
 
 void DynamicThreadPool::Add(const std::function<void()>& callback) {
   grpc::lock_guard<grpc::mutex> lock(mu_);
+  // Add works to the callbacks list
+  callbacks_.push(callback);
+  // Increase pool size or notify as needed
   if (threads_waiting_ == 0) {
     // Kick off a new thread
     nthreads_++;
-    live_threads_.push_back(new DynamicThread(this));
+    new DynamicThread(this);
+  } else {
+    cv_.notify_one();
   }
-  callbacks_.push(callback);
-  cv_.notify_one();
   // Also use this chance to harvest dead threads
   if (!dead_threads_.empty()) {
     ReapThreads(&dead_threads_);