| commit | 80fdea404b6713e9ec1da4c3346d427aad1cfa74 | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Fri Nov 18 12:02:15 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Nov 18 12:02:15 2016 +0000 |
| tree | 43ee0efd7e7f07e9e7da4df8f06456099cac6ed7 | |
| parent | b760a2f966ae07596da6cfe6baeef39a3ed7664e [diff] | |
| parent | e2fc98e88106b9cfa44eeacc6765c291feda04a8 [diff] |
Merge "Fix valgrind issue with thread_pool_test."
diff --git a/runtime/thread_pool_test.cc b/runtime/thread_pool_test.cc index 2ae2ecf..89e9005 100644 --- a/runtime/thread_pool_test.cc +++ b/runtime/thread_pool_test.cc
@@ -114,6 +114,8 @@ 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. } class TreeTask : public Task {