diff options
| author | alexclarke <alexclarke@chromium.org> | 2015-04-17 09:05:40 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-17 16:05:57 +0000 |
| commit | db9f6e17076f075f47eeaca7998c23c0298bd115 (patch) | |
| tree | 649c0da9a02ceeb0ade03383bee8b3fccdf282c7 /content/renderer/scheduler | |
| parent | 16687d3f2158d728712599c8b0c1586f6323b9b6 (diff) | |
| download | chromium_src-db9f6e17076f075f47eeaca7998c23c0298bd115.zip chromium_src-db9f6e17076f075f47eeaca7998c23c0298bd115.tar.gz chromium_src-db9f6e17076f075f47eeaca7998c23c0298bd115.tar.bz2 | |
Allow configurable idle period names in tracing, so the schedulers
may differentiate their idle periods.
BUG=463143
Review URL: https://codereview.chromium.org/1083923002
Cr-Commit-Position: refs/heads/master@{#325641}
Diffstat (limited to 'content/renderer/scheduler')
| -rw-r--r-- | content/renderer/scheduler/renderer_scheduler.cc | 6 | ||||
| -rw-r--r-- | content/renderer/scheduler/renderer_scheduler_impl.cc | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/content/renderer/scheduler/renderer_scheduler.cc b/content/renderer/scheduler/renderer_scheduler.cc index ef92635..0ecba8c 100644 --- a/content/renderer/scheduler/renderer_scheduler.cc +++ b/content/renderer/scheduler/renderer_scheduler.cc @@ -6,6 +6,8 @@ #include "base/command_line.h" #include "base/message_loop/message_loop.h" +#include "base/trace_event/trace_event.h" +#include "base/trace_event/trace_event_impl.h" #include "content/child/scheduler/scheduler_message_loop_delegate.h" #include "content/public/common/content_switches.h" #include "content/renderer/scheduler/null_renderer_scheduler.h" @@ -21,6 +23,10 @@ RendererScheduler::~RendererScheduler() { // static scoped_ptr<RendererScheduler> RendererScheduler::Create() { + // Ensure worker.scheduler appears as an option in about://tracing + base::trace_event::TraceLog::GetCategoryGroupEnabled( + TRACE_DISABLED_BY_DEFAULT("worker.scheduler")); + base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); if (command_line->HasSwitch(switches::kDisableBlinkScheduler)) { return make_scoped_ptr(new NullRendererScheduler()); diff --git a/content/renderer/scheduler/renderer_scheduler_impl.cc b/content/renderer/scheduler/renderer_scheduler_impl.cc index 035b46a..be1eaf4 100644 --- a/content/renderer/scheduler/renderer_scheduler_impl.cc +++ b/content/renderer/scheduler/renderer_scheduler_impl.cc @@ -21,6 +21,7 @@ RendererSchedulerImpl::RendererSchedulerImpl( this, "renderer.scheduler", TRACE_DISABLED_BY_DEFAULT("renderer.scheduler"), + "RendererSchedulerIdlePeriod", TASK_QUEUE_COUNT, base::TimeDelta()), control_task_runner_(helper_.ControlTaskRunner()), |