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 |
index 767f942dfb5e2f043b3159f179ef29c9fdff6725..2f9260534bb599d87b59ccdcb5c115e2548a848d 100644 |
--- a/content/renderer/scheduler/renderer_scheduler_impl.cc |
+++ b/content/renderer/scheduler/renderer_scheduler_impl.cc |
@@ -5,6 +5,8 @@ |
#include "content/renderer/scheduler/renderer_scheduler_impl.h" |
#include "base/bind.h" |
+#include "base/debug/trace_event.h" |
+#include "base/debug/trace_event_argument.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" |
@@ -40,6 +42,15 @@ RendererSchedulerImpl::RendererSchedulerImpl( |
CONTROL_TASK_QUEUE, RendererTaskQueueSelector::CONTROL_PRIORITY); |
renderer_task_queue_selector_->DisableQueue(IDLE_TASK_QUEUE); |
task_queue_manager_->SetAutoPump(IDLE_TASK_QUEUE, false); |
+ |
+ for (size_t i = 0; i < TASK_QUEUE_COUNT; i++) { |
+ task_queue_manager_->SetQueueName( |
+ i, TaskQueueIdToString(static_cast<QueueId>(i))); |
+ } |
+ TRACE_EVENT_OBJECT_CREATED_WITH_ID( |
+ TRACE_DISABLED_BY_DEFAULT("renderer.scheduler"), |
+ "RendererScheduler", |
+ this); |
} |
RendererSchedulerImpl::~RendererSchedulerImpl() { |
@@ -65,6 +76,8 @@ RendererSchedulerImpl::IdleTaskRunner() { |
} |
void RendererSchedulerImpl::WillBeginFrame(const cc::BeginFrameArgs& args) { |
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("renderer.scheduler"), |
+ "RendererSchedulerImpl::WillBeginFrame"); |
rmcilroy
2014/11/07 18:21:57
Would it be worth passing the args values (frame_t
Sami
2014/11/10 14:35:01
Good idea. Looks like |args| already knows how to
|
main_thread_checker_.CalledOnValidThread(); |
if (!task_queue_manager_) |
return; |
@@ -74,6 +87,8 @@ void RendererSchedulerImpl::WillBeginFrame(const cc::BeginFrameArgs& args) { |
} |
void RendererSchedulerImpl::DidCommitFrameToCompositor() { |
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("renderer.scheduler"), |
+ "RendererSchedulerImpl::DidCommitFrameToCompositor"); |
main_thread_checker_.CalledOnValidThread(); |
if (!task_queue_manager_) |
return; |
@@ -84,6 +99,8 @@ void RendererSchedulerImpl::DidCommitFrameToCompositor() { |
} |
void RendererSchedulerImpl::DidReceiveInputEvent() { |
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("renderer.scheduler"), |
+ "RendererSchedulerImpl::DidReceiveInputEvent"); |
if (!task_queue_manager_) |
return; |
base::AutoLock lock(incoming_signals_lock_); |
@@ -135,13 +152,15 @@ void RendererSchedulerImpl::UpdatePolicy() { |
base::AutoLock lock(incoming_signals_lock_); |
base::subtle::Release_Store(&policy_may_need_update_, 0); |
+ base::TimeTicks now; |
Policy new_policy = NORMAL_PRIORITY_POLICY; |
if (!last_input_time_.is_null()) { |
+ now = Now(); |
base::TimeDelta compositor_priority_duration = |
base::TimeDelta::FromMilliseconds(kCompositorPriorityAfterTouchMillis); |
base::TimeDelta remaining_compositor_priority_duration = |
- last_input_time_ + compositor_priority_duration - Now(); |
+ last_input_time_ + compositor_priority_duration - now; |
if (remaining_compositor_priority_duration > base::TimeDelta()) { |
PostUpdatePolicyOnControlRunner(remaining_compositor_priority_duration); |
new_policy = COMPOSITOR_PRIORITY_POLICY; |
@@ -167,15 +186,30 @@ void RendererSchedulerImpl::UpdatePolicy() { |
break; |
} |
current_policy_ = new_policy; |
+ |
+ TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID( |
+ TRACE_DISABLED_BY_DEFAULT("renderer.scheduler"), |
+ "RendererScheduler", |
+ this, |
+ AsValueLocked(now)); |
+ TRACE_COUNTER1(TRACE_DISABLED_BY_DEFAULT("renderer.scheduler"), |
+ "RendererScheduler.policy", |
+ current_policy_); |
} |
void RendererSchedulerImpl::StartIdlePeriod() { |
+ TRACE_EVENT_ASYNC_BEGIN0(TRACE_DISABLED_BY_DEFAULT("renderer.scheduler"), |
+ "RendererSchedulerIdlePeriod", |
+ this); |
renderer_task_queue_selector_->EnableQueue( |
IDLE_TASK_QUEUE, RendererTaskQueueSelector::BEST_EFFORT_PRIORITY); |
task_queue_manager_->PumpQueue(IDLE_TASK_QUEUE); |
} |
void RendererSchedulerImpl::EndIdlePeriod() { |
+ TRACE_EVENT_ASYNC_END0(TRACE_DISABLED_BY_DEFAULT("renderer.scheduler"), |
+ "RendererSchedulerIdlePeriod", |
+ this); |
renderer_task_queue_selector_->DisableQueue(IDLE_TASK_QUEUE); |
} |
@@ -183,4 +217,56 @@ base::TimeTicks RendererSchedulerImpl::Now() const { |
return gfx::FrameTime::Now(); |
} |
+// static |
+const char* RendererSchedulerImpl::TaskQueueIdToString(QueueId queue_id) { |
+ switch (queue_id) { |
+ case DEFAULT_TASK_QUEUE: |
+ return "default_tq"; |
+ case COMPOSITOR_TASK_QUEUE: |
+ return "compositor_tq"; |
+ case IDLE_TASK_QUEUE: |
+ return "idle_tq"; |
+ case CONTROL_TASK_QUEUE: |
+ return "control_tq"; |
+ default: |
+ NOTREACHED(); |
+ return nullptr; |
+ } |
+} |
+ |
+// static |
+const char* RendererSchedulerImpl::PolicyToString(Policy policy) { |
+ switch (policy) { |
+ case NORMAL_PRIORITY_POLICY: |
+ return "normal"; |
+ case COMPOSITOR_PRIORITY_POLICY: |
+ return "compositor"; |
+ default: |
+ NOTREACHED(); |
+ return nullptr; |
+ } |
+} |
+ |
+scoped_refptr<base::debug::ConvertableToTraceFormat> |
+RendererSchedulerImpl::AsValueLocked(base::TimeTicks optional_now) const { |
+ main_thread_checker_.CalledOnValidThread(); |
+ incoming_signals_lock_.AssertAcquired(); |
+ |
+ if (optional_now.is_null()) |
+ optional_now = Now(); |
+ scoped_refptr<base::debug::TracedValue> state = |
+ new base::debug::TracedValue(); |
+ |
+ state->SetString("current_policy", PolicyToString(current_policy_)); |
+ state->SetBoolean("has_task_queue_manager", task_queue_manager_.get()); |
+ state->SetDouble("now", (optional_now - base::TimeTicks()).InMillisecondsF()); |
+ state->SetDouble("last_input_time", |
+ (last_input_time_ - base::TimeTicks()).InMillisecondsF()); |
+ state->SetDouble( |
+ "estimated_next_frame_begin", |
+ (estimated_next_frame_begin_ - base::TimeTicks()).InMillisecondsF()); |
+ |
+ return state; |
+} |
+ |
} // namespace content |