commit ab07cbe238fc41cc074bd2af87a0b3fcdddedf27
author Treehugger Robot <treehugger-gerrit@google.com> Sat Nov 19 01:07:35 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Nov 19 01:07:36 2016 +0000
tree 0895bf5691ad5013435192bb734777ce30024292
parent 3bf14d69ab1823ae3e3ff372ac04a404044c3682
parent 1013bdeacffb39b160a6a9e4ea4027930c955e7a

Merge "Fix valgrind issue with thread_pool_test."

runtime/thread_pool_test.cc

diff --git a/runtime/thread_pool_test.cc b/runtime/thread_pool_test.cc
index 89e9005..14c2c3b 100644
--- a/runtime/thread_pool_test.cc
+++ b/runtime/thread_pool_test.cc
@@ -114,8 +114,11 @@
   thread_pool.StopWorkers(self);
 
   thread_pool.Wait(self, false, false);  // We should not deadlock here.
-  // Drain the task list.
-  thread_pool.Wait(self, /* do_work */ true, false);  // We should not deadlock here.
+
+  // Drain the task list. Note: we have to restart here, as no tasks will be finished when
+  // the pool is stopped.
+  thread_pool.StartWorkers(self);
+  thread_pool.Wait(self, /* do_work */ true, false);
 }
 
 class TreeTask : public Task {