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 e380e5d987b9232360ac2cf7517a485fe805d917..14858777f611f31378a4b4c5d7da5a2a5b5b5060 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_scheduler_selector.h" |
@@ -35,9 +37,18 @@ RendererSchedulerImpl::RendererSchedulerImpl( |
kControlTaskQueue, RendererSchedulerSelector::kControlPriority); |
renderer_scheduler_selector_->DisableQueue(kIdleTaskQueue); |
task_queue_manager_.SetAutoPump(kIdleTaskQueue, false); |
+ |
+ for (size_t i = 0; i < kTaskQueueCount; i++) { |
+ renderer_scheduler_selector_->SetQueueName( |
+ i, TaskQueueIdToString(static_cast<QueueId>(i))); |
+ } |
+ TRACE_EVENT_OBJECT_CREATED_WITH_ID( |
+ TRACE_DISABLED_BY_DEFAULT("blink.scheduler"), "RendererScheduler", this); |
} |
picksi1
2014/10/28 11:01:40
Does it still make sense to use a "blink.scheduler
Sami
2014/10/28 12:57:47
You're probably right, let's go for renderer.sched
|
RendererSchedulerImpl::~RendererSchedulerImpl() { |
+ TRACE_EVENT_OBJECT_DELETED_WITH_ID( |
+ TRACE_DISABLED_BY_DEFAULT("blink.scheduler"), "RendererScheduler", this); |
} |
scoped_refptr<base::SingleThreadTaskRunner> |
@@ -144,15 +155,30 @@ void RendererSchedulerImpl::UpdatePolicy() { |
break; |
} |
current_policy_ = new_policy; |
+ |
+ TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID( |
+ TRACE_DISABLED_BY_DEFAULT("blink.scheduler"), |
+ "RendererScheduler", |
+ this, |
+ AsValueLocked()); |
+ TRACE_COUNTER1(TRACE_DISABLED_BY_DEFAULT("blink.scheduler"), |
+ "RendererScheduler.policy", |
+ current_policy_); |
} |
void RendererSchedulerImpl::StartIdlePeriod() { |
+ TRACE_EVENT_ASYNC_BEGIN0(TRACE_DISABLED_BY_DEFAULT("blink.scheduler"), |
+ "RendererSchedulerIdlePeriod", |
+ this); |
renderer_scheduler_selector_->EnableQueue( |
kIdleTaskQueue, RendererSchedulerSelector::kBestEffortPriority); |
task_queue_manager_.PumpQueue(kIdleTaskQueue); |
} |
void RendererSchedulerImpl::EndIdlePeriod() { |
+ TRACE_EVENT_ASYNC_END0(TRACE_DISABLED_BY_DEFAULT("blink.scheduler"), |
+ "RendererSchedulerIdlePeriod", |
+ this); |
renderer_scheduler_selector_->DisableQueue(kIdleTaskQueue); |
} |
@@ -160,4 +186,61 @@ base::TimeTicks RendererSchedulerImpl::Now() const { |
return gfx::FrameTime::Now(); |
} |
+// static |
+const char* RendererSchedulerImpl::TaskQueueIdToString(QueueId queue_id) { |
+ switch (queue_id) { |
+ case kDefaultTaskQueue: |
+ return "default_tq"; |
+ case kCompositorTaskQueue: |
+ return "compositor_tq"; |
+ case kIdleTaskQueue: |
+ return "idle_tq"; |
+ case kControlTaskQueue: |
+ return "control_tq"; |
+ default: |
+ NOTREACHED(); |
+ return nullptr; |
+ } |
+} |
+ |
+// static |
+const char* RendererSchedulerImpl::PolicyToString(Policy policy) { |
+ switch (policy) { |
+ case kNormalPriorityPolicy: |
+ return "normal"; |
+ case kCompositorPriorityPolicy: |
+ return "compositor"; |
+ default: |
+ NOTREACHED(); |
+ return nullptr; |
+ } |
+} |
+ |
+scoped_refptr<base::debug::ConvertableToTraceFormat> |
+RendererSchedulerImpl::AsValueLocked() const { |
+ main_thread_checker_.CalledOnValidThread(); |
+ incoming_signals_lock_.AssertAcquired(); |
+ scoped_refptr<base::debug::TracedValue> state = |
+ new base::debug::TracedValue(); |
+ |
+ state->SetString("current_policy", PolicyToString(current_policy_)); |
+ state->BeginDictionary("task_queue_manager"); |
+ task_queue_manager_.AsValueInto(state.get()); |
+ state->EndDictionary(); |
+ state->BeginDictionary("renderer_scheduler_selector"); |
+ renderer_scheduler_selector_->AsValueInto(state.get()); |
+ state->EndDictionary(); |
+ state->SetDouble("now", |
+ (Now() - base::TimeTicks()).InMicroseconds() / 1000.0L); |
rmcilroy
2014/10/27 17:51:28
Maybe pass in the value of "Now()" from it's use i
Sami
2014/10/28 12:57:47
Done, although it's a little messy since I want to
|
+ state->SetDouble( |
+ "last_input_time", |
+ (last_input_time_ - base::TimeTicks()).InMicroseconds() / 1000.0L); |
picksi1
2014/10/28 11:01:40
Would InMillisecondsF() do the same here?
Sami
2014/10/28 12:57:47
Yes, that's much cleaner. I wonder why cc -- where
|
+ state->SetDouble( |
+ "estimated_next_frame_begin", |
+ (estimated_next_frame_begin_ - base::TimeTicks()).InMicroseconds() / |
+ 1000.0L); |
+ |
+ return state; |
+} |
+ |
} // namespace content |