Index: base/task_scheduler/task_scheduler_impl_unittest.cc |
diff --git a/base/task_scheduler/task_scheduler_impl_unittest.cc b/base/task_scheduler/task_scheduler_impl_unittest.cc |
index 1489baebe4f958f5d12477ac2dc9c19e6ed41376..cf947b4a4ff3631a51bfdce391dce8b9fffe1d0e 100644 |
--- a/base/task_scheduler/task_scheduler_impl_unittest.cc |
+++ b/base/task_scheduler/task_scheduler_impl_unittest.cc |
@@ -175,23 +175,6 @@ std::vector<TraitsExecutionModePair> GetTraitsExecutionModePairs() { |
return params; |
} |
-enum WorkerPoolType { |
- BACKGROUND_WORKER_POOL = 0, |
- BACKGROUND_BLOCKING_WORKER_POOL, |
- FOREGROUND_WORKER_POOL, |
- FOREGROUND_BLOCKING_WORKER_POOL, |
-}; |
- |
-size_t GetThreadPoolIndexForTraits(const TaskTraits& traits) { |
- if (traits.may_block()) { |
- return traits.priority() == TaskPriority::BACKGROUND |
- ? BACKGROUND_BLOCKING_WORKER_POOL |
- : FOREGROUND_BLOCKING_WORKER_POOL; |
- } |
- return traits.priority() == TaskPriority::BACKGROUND ? BACKGROUND_WORKER_POOL |
- : FOREGROUND_WORKER_POOL; |
-} |
- |
class TaskSchedulerImplTest |
: public testing::TestWithParam<TraitsExecutionModePair> { |
protected: |
@@ -200,27 +183,22 @@ class TaskSchedulerImplTest |
void SetUp() override { |
using StandbyThreadPolicy = SchedulerWorkerPoolParams::StandbyThreadPolicy; |
- std::vector<SchedulerWorkerPoolParams> params_vector; |
- |
- ASSERT_EQ(BACKGROUND_WORKER_POOL, params_vector.size()); |
- params_vector.emplace_back("Background", ThreadPriority::BACKGROUND, |
- StandbyThreadPolicy::LAZY, 1U, TimeDelta::Max()); |
+ constexpr TimeDelta kSuggestedReclaimTime = TimeDelta::FromSeconds(30); |
+ constexpr int kMaxNumBackgroundThreads = 1; |
+ constexpr int kMaxNumBackgroundBlockingThreads = 3; |
+ constexpr int kMaxNumForegroundThreads = 4; |
+ constexpr int kMaxNumForegroundBlockingThreads = 12; |
+ |
+ scheduler_ = TaskSchedulerImpl::Create( |
+ "Test", {{StandbyThreadPolicy::LAZY, kMaxNumBackgroundThreads, |
+ kSuggestedReclaimTime}, |
+ {StandbyThreadPolicy::LAZY, kMaxNumBackgroundBlockingThreads, |
+ kSuggestedReclaimTime}, |
+ {StandbyThreadPolicy::LAZY, kMaxNumForegroundThreads, |
+ kSuggestedReclaimTime}, |
+ {StandbyThreadPolicy::LAZY, kMaxNumForegroundBlockingThreads, |
+ kSuggestedReclaimTime}}); |
- ASSERT_EQ(BACKGROUND_BLOCKING_WORKER_POOL, params_vector.size()); |
- params_vector.emplace_back("BackgroundBlocking", ThreadPriority::BACKGROUND, |
- StandbyThreadPolicy::LAZY, 3U, TimeDelta::Max()); |
- |
- ASSERT_EQ(FOREGROUND_WORKER_POOL, params_vector.size()); |
- params_vector.emplace_back("Foreground", ThreadPriority::NORMAL, |
- StandbyThreadPolicy::LAZY, 4U, TimeDelta::Max()); |
- |
- ASSERT_EQ(FOREGROUND_BLOCKING_WORKER_POOL, params_vector.size()); |
- params_vector.emplace_back("ForegroundBlocking", ThreadPriority::NORMAL, |
- StandbyThreadPolicy::LAZY, 12U, |
- TimeDelta::Max()); |
- |
- scheduler_ = TaskSchedulerImpl::Create(params_vector, |
- Bind(&GetThreadPoolIndexForTraits)); |
ASSERT_TRUE(scheduler_); |
} |
@@ -298,12 +276,14 @@ TEST_F(TaskSchedulerImplTest, MultipleTraitsExecutionModePairs) { |
scheduler_.get(), traits_execution_mode_pair.traits, |
traits_execution_mode_pair.execution_mode))); |
threads_posting_tasks.back()->Start(); |
+ threads_posting_tasks.back()->WaitForAllTasksToRun(); |
+ threads_posting_tasks.back()->Join(); |
} |
- |
- for (const auto& thread : threads_posting_tasks) { |
- thread->WaitForAllTasksToRun(); |
- thread->Join(); |
- } |
+ /* |
+ for (const auto& thread : threads_posting_tasks) { |
+ //thread->WaitForAllTasksToRun(); |
+ //thread->Join(); |
+ }*/ |
gab
2017/04/12 18:46:24
Fix temp code?
fdoray
2017/04/12 20:00:23
Done.
|
} |
TEST_F(TaskSchedulerImplTest, GetMaxConcurrentTasksWithTraitsDeprecated) { |