Index: content/renderer/scheduler/renderer_scheduler_impl.cc |
diff --git a/content/renderer/scheduler/renderer_scheduler_impl.cc b/content/renderer/scheduler/renderer_scheduler_impl.cc |
new file mode 100644 |
index 0000000000000000000000000000000000000000..4f116af0ed8653745b2512cb1f3e915e9194c0b5 |
--- /dev/null |
+++ b/content/renderer/scheduler/renderer_scheduler_impl.cc |
@@ -0,0 +1,182 @@ |
+// Copyright 2014 The Chromium Authors. All rights reserved. |
+// Use of this source code is governed by a BSD-style license that can be |
+// found in the LICENSE file. |
+ |
+#include "content/renderer/scheduler/renderer_scheduler_impl.h" |
+ |
+#include "base/bind.h" |
+#include "base/message_loop/message_loop_proxy.h" |
+#include "cc/output/begin_frame_args.h" |
+#include "content/renderer/scheduler/renderer_task_queue_selector.h" |
+#include "ui/gfx/frame_time.h" |
+ |
+namespace content { |
+ |
+RendererSchedulerImpl::RendererSchedulerImpl() |
+ : RendererSchedulerImpl(base::MessageLoopProxy::current()) { |
+} |
+ |
+RendererSchedulerImpl::RendererSchedulerImpl( |
+ scoped_refptr<base::SingleThreadTaskRunner> main_task_runner) |
+ : renderer_task_queue_selector_(new RendererTaskQueueSelector()), |
+ task_queue_manager_( |
+ new TaskQueueManager(TASK_QUEUE_COUNT, |
+ main_task_runner, |
+ renderer_task_queue_selector_.get())), |
+ control_task_runner_( |
+ task_queue_manager_->TaskRunnerForQueue(CONTROL_TASK_QUEUE)), |
+ default_task_runner_( |
+ task_queue_manager_->TaskRunnerForQueue(DEFAULT_TASK_QUEUE)), |
+ compositor_task_runner_( |
+ task_queue_manager_->TaskRunnerForQueue(COMPOSITOR_TASK_QUEUE)), |
+ current_policy_(NORMAL_PRIORITY_POLICY), |
+ policy_may_need_update_(0), |
+ weak_factory_(this) { |
+ weak_renderer_scheduler_ptr_ = weak_factory_.GetWeakPtr(); |
+ idle_task_runner_ = make_scoped_refptr(new SingleThreadIdleTaskRunner( |
+ task_queue_manager_->TaskRunnerForQueue(IDLE_TASK_QUEUE), |
+ weak_factory_.GetWeakPtr())); |
+ renderer_task_queue_selector_->SetQueuePriority( |
+ CONTROL_TASK_QUEUE, RendererTaskQueueSelector::CONTROL_PRIORITY); |
+ renderer_task_queue_selector_->DisableQueue(IDLE_TASK_QUEUE); |
+ task_queue_manager_->SetAutoPump(IDLE_TASK_QUEUE, false); |
+} |
+ |
+RendererSchedulerImpl::~RendererSchedulerImpl() { |
+} |
+ |
+void RendererSchedulerImpl::Shutdown() { |
+ task_queue_manager_.reset(); |
+} |
+ |
+scoped_refptr<base::SingleThreadTaskRunner> |
+RendererSchedulerImpl::DefaultTaskRunner() { |
no sievers
2014/10/30 23:40:51
What about these task runner getter methods being
alex clarke (OOO till 29th)
2014/11/03 17:39:34
If a task gets posted during shut down, then it wi
rmcilroy
2014/11/03 19:02:52
This should be fine - the task_runners are ref_cou
no sievers
2014/11/03 22:19:01
But these getters should call main_thread_checker_
rmcilroy
2014/11/04 02:22:19
Yes, these getters should call main_thread_checker
|
+ return default_task_runner_; |
+} |
+ |
+scoped_refptr<base::SingleThreadTaskRunner> |
+RendererSchedulerImpl::CompositorTaskRunner() { |
+ return compositor_task_runner_; |
+} |
+ |
+scoped_refptr<SingleThreadIdleTaskRunner> |
+RendererSchedulerImpl::IdleTaskRunner() { |
+ return idle_task_runner_; |
+} |
+ |
+void RendererSchedulerImpl::WillBeginFrame(const cc::BeginFrameArgs& args) { |
+ main_thread_checker_.CalledOnValidThread(); |
+ if (!task_queue_manager_) |
no sievers
2014/10/30 23:40:51
Do we really expect this after shutdown? Should it
rmcilroy
2014/11/03 19:02:52
Unfortunately we can still get called by the compo
|
+ return; |
+ |
+ EndIdlePeriod(); |
+ estimated_next_frame_begin_ = args.frame_time + args.interval; |
+} |
+ |
+void RendererSchedulerImpl::DidCommitFrameToCompositor() { |
+ main_thread_checker_.CalledOnValidThread(); |
+ if (!task_queue_manager_) |
+ return; |
+ |
+ if (Now() < estimated_next_frame_begin_) { |
+ StartIdlePeriod(); |
+ } |
+} |
+ |
+void RendererSchedulerImpl::DidReceiveInputEvent() { |
+ if (!task_queue_manager_) |
no sievers
2014/10/30 23:40:51
This is accessing task_queue_manager_ without a mu
rmcilroy
2014/11/03 19:02:52
Very good point. I've removed the check entirely
|
+ return; |
+ base::AutoLock lock(incoming_signals_lock_); |
+ if (last_input_time_.is_null()) { |
+ // Update scheduler policy if should start a new compositor policy mode. |
+ base::subtle::Release_Store(&policy_may_need_update_, 1); |
+ PostUpdatePolicyOnControlRunner(base::TimeDelta()); |
+ } |
+ last_input_time_ = Now(); |
+} |
+ |
+bool RendererSchedulerImpl::ShouldYieldForHighPriorityWork() { |
+ main_thread_checker_.CalledOnValidThread(); |
+ if (!task_queue_manager_) |
+ return false; |
+ |
+ return SchedulerPolicy() == COMPOSITOR_PRIORITY_POLICY && |
+ !task_queue_manager_->IsQueueEmpty(COMPOSITOR_TASK_QUEUE); |
+} |
+ |
+base::TimeTicks RendererSchedulerImpl::CurrentIdleTaskDeadline() const { |
+ main_thread_checker_.CalledOnValidThread(); |
+ return estimated_next_frame_begin_; |
+} |
+ |
+RendererSchedulerImpl::Policy RendererSchedulerImpl::SchedulerPolicy() { |
+ main_thread_checker_.CalledOnValidThread(); |
+ if (base::subtle::Acquire_Load(&policy_may_need_update_)) { |
+ UpdatePolicy(); |
no sievers
2014/10/30 23:40:51
Why do we need to do this here? We know that if it
alex clarke (OOO till 29th)
2014/11/03 17:39:33
The motivation for this is to let ShouldYieldForHi
rmcilroy
2014/11/03 19:02:52
We need this due to the ShouldYieldForHighPriority
no sievers
2014/11/03 22:19:01
Shouldn't it also yield then for any control task
rmcilroy
2014/11/04 02:22:19
As discussed offline, this doesn't quite give us w
|
+ } |
+ return current_policy_; |
+} |
+ |
+void RendererSchedulerImpl::PostUpdatePolicyOnControlRunner( |
+ base::TimeDelta delay) { |
+ base::Closure closure = base::Bind(&RendererSchedulerImpl::UpdatePolicy, |
+ weak_renderer_scheduler_ptr_); |
+ control_task_runner_->PostDelayedTask(FROM_HERE, closure, delay); |
+} |
+ |
+void RendererSchedulerImpl::UpdatePolicy() { |
+ main_thread_checker_.CalledOnValidThread(); |
+ if (!task_queue_manager_) |
+ return; |
+ |
+ base::AutoLock lock(incoming_signals_lock_); |
+ base::subtle::Release_Store(&policy_may_need_update_, 0); |
+ |
+ Policy new_policy = NORMAL_PRIORITY_POLICY; |
+ if (!last_input_time_.is_null()) { |
+ base::TimeDelta compositor_priority_duration = |
no sievers
2014/10/30 23:40:51
nit: indent
rmcilroy
2014/11/03 19:02:52
I'm not sure what's wrongly indented here?
|
+ base::TimeDelta::FromMilliseconds(kCompositorPriorityAfterTouchMillis); |
+ base::TimeDelta remaining_compositor_priority_duration = |
+ last_input_time_ + compositor_priority_duration - Now(); |
+ if (remaining_compositor_priority_duration > base::TimeDelta()) { |
no sievers
2014/10/30 23:40:51
nit: can you write instead:
base::TimeTicks prior
rmcilroy
2014/11/03 19:02:52
Done.
|
+ PostUpdatePolicyOnControlRunner(remaining_compositor_priority_duration); |
+ new_policy = COMPOSITOR_PRIORITY_POLICY; |
+ } else { |
+ // Null out last_input_time_ to ensure DidReceiveInputEvent will post an |
+ // UpdatePolicy task when it's next called. |
+ last_input_time_ = base::TimeTicks(); |
+ } |
+ } |
+ |
+ if (new_policy == current_policy_) { |
+ return; |
+ } |
+ |
+ switch (new_policy) { |
+ case COMPOSITOR_PRIORITY_POLICY: |
+ renderer_task_queue_selector_->SetQueuePriority( |
+ COMPOSITOR_TASK_QUEUE, RendererTaskQueueSelector::HIGH_PRIORITY); |
+ break; |
+ case NORMAL_PRIORITY_POLICY: |
+ renderer_task_queue_selector_->SetQueuePriority( |
+ COMPOSITOR_TASK_QUEUE, RendererTaskQueueSelector::NORMAL_PRIORITY); |
+ break; |
+ } |
+ current_policy_ = new_policy; |
+} |
+ |
+void RendererSchedulerImpl::StartIdlePeriod() { |
+ renderer_task_queue_selector_->EnableQueue( |
+ IDLE_TASK_QUEUE, RendererTaskQueueSelector::BEST_EFFORT_PRIORITY); |
+ task_queue_manager_->PumpQueue(IDLE_TASK_QUEUE); |
+} |
+ |
+void RendererSchedulerImpl::EndIdlePeriod() { |
+ renderer_task_queue_selector_->DisableQueue(IDLE_TASK_QUEUE); |
+} |
+ |
+base::TimeTicks RendererSchedulerImpl::Now() const { |
+ return gfx::FrameTime::Now(); |
+} |
+ |
+} // namespace content |