| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/renderer/categorized_worker_pool.h" | 5 #include "content/renderer/categorized_worker_pool.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 class CategorizedWorkerPool::CategorizedWorkerPoolSequencedTaskRunner | 46 class CategorizedWorkerPool::CategorizedWorkerPoolSequencedTaskRunner |
| 47 : public base::SequencedTaskRunner { | 47 : public base::SequencedTaskRunner { |
| 48 public: | 48 public: |
| 49 explicit CategorizedWorkerPoolSequencedTaskRunner( | 49 explicit CategorizedWorkerPoolSequencedTaskRunner( |
| 50 cc::TaskGraphRunner* task_graph_runner) | 50 cc::TaskGraphRunner* task_graph_runner) |
| 51 : task_graph_runner_(task_graph_runner), | 51 : task_graph_runner_(task_graph_runner), |
| 52 namespace_token_(task_graph_runner->GenerateNamespaceToken()) {} | 52 namespace_token_(task_graph_runner->GenerateNamespaceToken()) {} |
| 53 | 53 |
| 54 // Overridden from base::TaskRunner: | 54 // Overridden from base::TaskRunner: |
| 55 bool PostDelayedTask(const tracked_objects::Location& from_here, | 55 bool PostDelayedTask(const tracked_objects::Location& from_here, |
| 56 base::Closure task, | 56 base::OnceClosure task, |
| 57 base::TimeDelta delay) override { | 57 base::TimeDelta delay) override { |
| 58 return PostNonNestableDelayedTask(from_here, std::move(task), delay); | 58 return PostNonNestableDelayedTask(from_here, std::move(task), delay); |
| 59 } | 59 } |
| 60 bool RunsTasksOnCurrentThread() const override { return true; } | 60 bool RunsTasksOnCurrentThread() const override { return true; } |
| 61 | 61 |
| 62 // Overridden from base::SequencedTaskRunner: | 62 // Overridden from base::SequencedTaskRunner: |
| 63 bool PostNonNestableDelayedTask(const tracked_objects::Location& from_here, | 63 bool PostNonNestableDelayedTask(const tracked_objects::Location& from_here, |
| 64 base::Closure task, | 64 base::OnceClosure task, |
| 65 base::TimeDelta delay) override { | 65 base::TimeDelta delay) override { |
| 66 base::AutoLock lock(lock_); | 66 base::AutoLock lock(lock_); |
| 67 | 67 |
| 68 // Remove completed tasks. | 68 // Remove completed tasks. |
| 69 DCHECK(completed_tasks_.empty()); | 69 DCHECK(completed_tasks_.empty()); |
| 70 task_graph_runner_->CollectCompletedTasks(namespace_token_, | 70 task_graph_runner_->CollectCompletedTasks(namespace_token_, |
| 71 &completed_tasks_); | 71 &completed_tasks_); |
| 72 | 72 |
| 73 tasks_.erase(tasks_.begin(), tasks_.begin() + completed_tasks_.size()); | 73 tasks_.erase(tasks_.begin(), tasks_.begin() + completed_tasks_.size()); |
| 74 | 74 |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 179 } | 179 } |
| 180 while (!threads_.empty()) { | 180 while (!threads_.empty()) { |
| 181 threads_.back()->Join(); | 181 threads_.back()->Join(); |
| 182 threads_.pop_back(); | 182 threads_.pop_back(); |
| 183 } | 183 } |
| 184 } | 184 } |
| 185 | 185 |
| 186 // Overridden from base::TaskRunner: | 186 // Overridden from base::TaskRunner: |
| 187 bool CategorizedWorkerPool::PostDelayedTask( | 187 bool CategorizedWorkerPool::PostDelayedTask( |
| 188 const tracked_objects::Location& from_here, | 188 const tracked_objects::Location& from_here, |
| 189 base::Closure task, | 189 base::OnceClosure task, |
| 190 base::TimeDelta delay) { | 190 base::TimeDelta delay) { |
| 191 base::AutoLock lock(lock_); | 191 base::AutoLock lock(lock_); |
| 192 | 192 |
| 193 // Remove completed tasks. | 193 // Remove completed tasks. |
| 194 DCHECK(completed_tasks_.empty()); | 194 DCHECK(completed_tasks_.empty()); |
| 195 CollectCompletedTasksWithLockAcquired(namespace_token_, &completed_tasks_); | 195 CollectCompletedTasksWithLockAcquired(namespace_token_, &completed_tasks_); |
| 196 | 196 |
| 197 cc::Task::Vector::iterator end = std::remove_if( | 197 cc::Task::Vector::iterator end = std::remove_if( |
| 198 tasks_.begin(), tasks_.end(), [this](const scoped_refptr<cc::Task>& e) { | 198 tasks_.begin(), tasks_.end(), [this](const scoped_refptr<cc::Task>& e) { |
| 199 return std::find(this->completed_tasks_.begin(), | 199 return std::find(this->completed_tasks_.begin(), |
| (...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 407 ShouldRunTaskForCategoryWithLockAcquired( | 407 ShouldRunTaskForCategoryWithLockAcquired( |
| 408 cc::TASK_CATEGORY_NONCONCURRENT_FOREGROUND)) { | 408 cc::TASK_CATEGORY_NONCONCURRENT_FOREGROUND)) { |
| 409 has_ready_to_run_foreground_tasks_cv_.Signal(); | 409 has_ready_to_run_foreground_tasks_cv_.Signal(); |
| 410 } | 410 } |
| 411 | 411 |
| 412 if (ShouldRunTaskForCategoryWithLockAcquired(cc::TASK_CATEGORY_BACKGROUND)) { | 412 if (ShouldRunTaskForCategoryWithLockAcquired(cc::TASK_CATEGORY_BACKGROUND)) { |
| 413 has_ready_to_run_background_tasks_cv_.Signal(); | 413 has_ready_to_run_background_tasks_cv_.Signal(); |
| 414 } | 414 } |
| 415 } | 415 } |
| 416 | 416 |
| 417 CategorizedWorkerPool::ClosureTask::ClosureTask(base::Closure closure) | 417 CategorizedWorkerPool::ClosureTask::ClosureTask(base::OnceClosure closure) |
| 418 : closure_(std::move(closure)) {} | 418 : closure_(std::move(closure)) {} |
| 419 | 419 |
| 420 // Overridden from cc::Task: | 420 // Overridden from cc::Task: |
| 421 void CategorizedWorkerPool::ClosureTask::RunOnWorkerThread() { | 421 void CategorizedWorkerPool::ClosureTask::RunOnWorkerThread() { |
| 422 std::move(closure_).Run(); | 422 std::move(closure_).Run(); |
| 423 } | 423 } |
| 424 | 424 |
| 425 CategorizedWorkerPool::ClosureTask::~ClosureTask() {} | 425 CategorizedWorkerPool::ClosureTask::~ClosureTask() {} |
| 426 | 426 |
| 427 } // namespace content | 427 } // namespace content |
| OLD | NEW |