During thread-pool shutdown, wait for worker threads to shutdown.

runtime/vm/thread_pool_test.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/os.h"
 #include "vm/lockers.h"
 #include "vm/thread_pool.h"
 #include "vm/unit_test.h"
 
 namespace dart {
 
 DECLARE_FLAG(int, worker_timeout_millis);
 
 
-class ThreadPoolTestPeer {
- public:
-  // When the pool has an exit monitor, workers notify a monitor just
-  // before they exit.  This is only used in tests to make sure that
-  // Shutdown works.
-  static void SetExitMonitor(Monitor* exit_monitor, int* exit_count) {
-    ThreadPool::exit_monitor_ = exit_monitor;
-    ThreadPool::exit_count_ = exit_count;
-  }
-};
-
-
 UNIT_TEST_CASE(ThreadPool_Create) {
   ThreadPool thread_pool;
 }
 
 
 class TestTask : public ThreadPool::Task {
  public:
   TestTask(Monitor* sync, bool* done)
       : sync_(sync), done_(done) {
   }
@@ skipping 57 matching lines @@
 
   virtual void Run() {
     OS::Sleep(millis_);
   }
 
  private:
   int millis_;
 };
 
 
-UNIT_TEST_CASE(ThreadPool_WorkerShutdown) {
-  Monitor exit_sync;
-  int exit_count = 0;
-  MonitorLocker ml(&exit_sync);
-
-  // Set up the ThreadPool so that workers notify before they exit.
-  ThreadPool* thread_pool = new ThreadPool();
-  ThreadPoolTestPeer::SetExitMonitor(&exit_sync, &exit_count);
-
-  // Run a single task.
-  thread_pool->Run(new SleepTask(2));
-
-  // Kill the thread pool.
-  delete thread_pool;
-  thread_pool = NULL;
-
-  // Wait for the workers to terminate.
-  while (exit_count == 0) {
-    ml.Wait();
-  }
-  EXPECT_EQ(1, exit_count);
-}
-
-
 UNIT_TEST_CASE(ThreadPool_WorkerTimeout) {
   // Adjust the worker timeout so that we timeout quickly.
   int saved_timeout = FLAG_worker_timeout_millis;
   FLAG_worker_timeout_millis = 1;
 
   ThreadPool thread_pool;
   EXPECT_EQ(0U, thread_pool.workers_started());
   EXPECT_EQ(0U, thread_pool.workers_stopped());
 
   // Run a worker.
@@ skipping 71 matching lines @@
     MonitorLocker ml(&sync);
     while (done < kTotalTasks) {
       ml.Wait();
     }
   }
   EXPECT_EQ(kTotalTasks, done);
 }
 
 
 }  // namespace dart