Commit 05b79709 authored by Robert Liao's avatar Robert Liao Committed by Commit Bot

Quick Task Scheduler Cleanup

Some cleanup in response to
https://chromium-review.googlesource.com/c/chromium/src/+/741455#message-2cd2ececba25f8c996dd3815baaa9b1312d7d899

BUG=

Change-Id: Ib0db0f62ca7eb9e355eef139cb4958520205768e
Reviewed-on: https://chromium-review.googlesource.com/775574Reviewed-by: default avatarGabriel Charette <gab@chromium.org>
Commit-Queue: Robert Liao <robliao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#517234}
parent 5b443bf4
...@@ -72,7 +72,8 @@ class BASE_EXPORT SchedulerWorkerPoolImpl : public SchedulerWorkerPool { ...@@ -72,7 +72,8 @@ class BASE_EXPORT SchedulerWorkerPoolImpl : public SchedulerWorkerPool {
// Creates workers following the |params| specification, allowing existing and // Creates workers following the |params| specification, allowing existing and
// future tasks to run. Uses |service_thread_task_runner| to monitor for // future tasks to run. Uses |service_thread_task_runner| to monitor for
// blocked threads in the pool. |thread_environment| Can only be called once. // blocked threads in the pool. |worker_environment| specifies any requested
// environment to execute the tasks. Can only be called once.
// CHECKs on failure. // CHECKs on failure.
void Start(const SchedulerWorkerPoolParams& params, void Start(const SchedulerWorkerPoolParams& params,
scoped_refptr<TaskRunner> service_thread_task_runner, scoped_refptr<TaskRunner> service_thread_task_runner,
......
...@@ -69,11 +69,11 @@ class TaskSchedulerWorkerPoolImplTestBase { ...@@ -69,11 +69,11 @@ class TaskSchedulerWorkerPoolImplTestBase {
TaskSchedulerWorkerPoolImplTestBase() TaskSchedulerWorkerPoolImplTestBase()
: service_thread_("TaskSchedulerServiceThread"){}; : service_thread_("TaskSchedulerServiceThread"){};
void SetUp() { void CommonSetUp() {
CreateAndStartWorkerPool(TimeDelta::Max(), kNumWorkersInWorkerPool); CreateAndStartWorkerPool(TimeDelta::Max(), kNumWorkersInWorkerPool);
} }
void TearDown() { void CommonTearDown() {
service_thread_.Stop(); service_thread_.Stop();
task_tracker_.Flush(); task_tracker_.Flush();
worker_pool_->WaitForAllWorkersIdleForTesting(); worker_pool_->WaitForAllWorkersIdleForTesting();
...@@ -122,9 +122,11 @@ class TaskSchedulerWorkerPoolImplTest ...@@ -122,9 +122,11 @@ class TaskSchedulerWorkerPoolImplTest
protected: protected:
TaskSchedulerWorkerPoolImplTest() = default; TaskSchedulerWorkerPoolImplTest() = default;
void SetUp() override { TaskSchedulerWorkerPoolImplTestBase::SetUp(); } void SetUp() override { TaskSchedulerWorkerPoolImplTestBase::CommonSetUp(); }
void TearDown() override { TaskSchedulerWorkerPoolImplTestBase::TearDown(); } void TearDown() override {
TaskSchedulerWorkerPoolImplTestBase::CommonTearDown();
}
private: private:
DISALLOW_COPY_AND_ASSIGN(TaskSchedulerWorkerPoolImplTest); DISALLOW_COPY_AND_ASSIGN(TaskSchedulerWorkerPoolImplTest);
...@@ -136,9 +138,11 @@ class TaskSchedulerWorkerPoolImplTestParam ...@@ -136,9 +138,11 @@ class TaskSchedulerWorkerPoolImplTestParam
protected: protected:
TaskSchedulerWorkerPoolImplTestParam() = default; TaskSchedulerWorkerPoolImplTestParam() = default;
void SetUp() override { TaskSchedulerWorkerPoolImplTestBase::SetUp(); } void SetUp() override { TaskSchedulerWorkerPoolImplTestBase::CommonSetUp(); }
void TearDown() override { TaskSchedulerWorkerPoolImplTestBase::TearDown(); } void TearDown() override {
TaskSchedulerWorkerPoolImplTestBase::CommonTearDown();
}
private: private:
DISALLOW_COPY_AND_ASSIGN(TaskSchedulerWorkerPoolImplTestParam); DISALLOW_COPY_AND_ASSIGN(TaskSchedulerWorkerPoolImplTestParam);
...@@ -302,9 +306,11 @@ class TaskSchedulerWorkerPoolImplTestCOMMTAParam ...@@ -302,9 +306,11 @@ class TaskSchedulerWorkerPoolImplTestCOMMTAParam
protected: protected:
TaskSchedulerWorkerPoolImplTestCOMMTAParam() = default; TaskSchedulerWorkerPoolImplTestCOMMTAParam() = default;
void SetUp() override { TaskSchedulerWorkerPoolImplTestBase::SetUp(); } void SetUp() override { TaskSchedulerWorkerPoolImplTestBase::CommonSetUp(); }
void TearDown() override { TaskSchedulerWorkerPoolImplTestBase::TearDown(); } void TearDown() override {
TaskSchedulerWorkerPoolImplTestBase::CommonTearDown();
}
private: private:
void StartWorkerPool(TimeDelta suggested_reclaim_time, void StartWorkerPool(TimeDelta suggested_reclaim_time,
...@@ -909,12 +915,14 @@ class TaskSchedulerWorkerPoolBlockingTest ...@@ -909,12 +915,14 @@ class TaskSchedulerWorkerPoolBlockingTest
} }
void SetUp() override { void SetUp() override {
TaskSchedulerWorkerPoolImplTestBase::SetUp(); TaskSchedulerWorkerPoolImplTestBase::CommonSetUp();
task_runner_ = task_runner_ =
worker_pool_->CreateTaskRunnerWithTraits({WithBaseSyncPrimitives()}); worker_pool_->CreateTaskRunnerWithTraits({WithBaseSyncPrimitives()});
} }
void TearDown() override { TaskSchedulerWorkerPoolImplTestBase::TearDown(); } void TearDown() override {
TaskSchedulerWorkerPoolImplTestBase::CommonTearDown();
}
protected: protected:
// Saturates the worker pool with a task that first blocks, waits to be // Saturates the worker pool with a task that first blocks, waits to be
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment