Commit 9cfdee0a authored by Katie Dillon's avatar Katie Dillon Committed by Commit Bot

[scheduling] Remove unecessary references to TaskQueue in metrics.

A few places in the scheduling code take a queue as an argument to
recording metrics but don't actually use the queue for anything. This
CL removes those references.

This CL is also a pre-requiste for crrev.com/c/2453591 which refactors
MainThreadTaskQueue to not extend TaskQueue. Removing these unecessary
references makes that refactor simpler.

Change-Id: Ie98e19e44be2e5d156981a775c757f97766d0c35
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2486214
Commit-Queue: Katie Dillon <kdillon@chromium.org>
Reviewed-by: default avatarAlexander Timin <altimin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#819858}
parent 7afefc29
......@@ -34,7 +34,6 @@ ThreadMetrics::ThreadMetrics(ThreadType thread_type,
ThreadMetrics::~ThreadMetrics() {}
bool ThreadMetrics::ShouldDiscardTask(
base::sequence_manager::TaskQueue* queue,
const base::sequence_manager::Task& task,
const base::sequence_manager::TaskQueue::TaskTiming& task_timing) {
// TODO(altimin): Investigate the relationship between thread time and
......@@ -43,7 +42,6 @@ bool ThreadMetrics::ShouldDiscardTask(
}
void ThreadMetrics::RecordTaskMetrics(
base::sequence_manager::TaskQueue* queue,
const base::sequence_manager::Task& task,
const base::sequence_manager::TaskQueue::TaskTiming& task_timing) {
DCHECK(!has_cpu_timing_for_each_task_ || task_timing.has_thread_time());
......
......@@ -25,13 +25,11 @@ class COMPONENT_EXPORT(SCHEDULING_METRICS) ThreadMetrics {
~ThreadMetrics();
bool ShouldDiscardTask(
base::sequence_manager::TaskQueue* queue,
const base::sequence_manager::Task& task,
const base::sequence_manager::TaskQueue::TaskTiming& task_timing);
// Record task metrics which are shared between threads.
void RecordTaskMetrics(
base::sequence_manager::TaskQueue* queue,
const base::sequence_manager::Task& task,
const base::sequence_manager::TaskQueue::TaskTiming& task_timing);
......
......@@ -40,18 +40,15 @@ TEST(MetricsHelperTest, TaskDurationPerThreadType) {
false /* has_cpu_timing_for_each_task */);
main_thread_metrics.RecordTaskMetrics(
nullptr, FakeTask(),
FakeTaskTiming(Seconds(10), Seconds(50), ThreadSeconds(0),
FakeTask(), FakeTaskTiming(Seconds(10), Seconds(50), ThreadSeconds(0),
ThreadSeconds(15)));
compositor_metrics.RecordTaskMetrics(
nullptr, FakeTask(),
FakeTaskTiming(Seconds(10), Seconds(80), ThreadSeconds(0),
FakeTask(), FakeTaskTiming(Seconds(10), Seconds(80), ThreadSeconds(0),
ThreadSeconds(5)));
compositor_metrics.RecordTaskMetrics(
nullptr, FakeTask(), FakeTaskTiming(Seconds(100), Seconds(200)));
FakeTask(), FakeTaskTiming(Seconds(100), Seconds(200)));
worker_metrics.RecordTaskMetrics(
nullptr, FakeTask(),
FakeTaskTiming(Seconds(10), Seconds(125), ThreadSeconds(0),
FakeTask(), FakeTaskTiming(Seconds(10), Seconds(125), ThreadSeconds(0),
ThreadSeconds(25)));
EXPECT_THAT(
......@@ -84,12 +81,10 @@ TEST(MetricsHelperTest, TrackedCPUTimeMetrics) {
true /* has_cpu_timing_for_each_task */);
main_thread_metrics.RecordTaskMetrics(
nullptr, FakeTask(),
FakeTaskTiming(Seconds(10), Seconds(50), ThreadSeconds(5),
FakeTask(), FakeTaskTiming(Seconds(10), Seconds(50), ThreadSeconds(5),
ThreadSeconds(15)));
main_thread_metrics.RecordTaskMetrics(
nullptr, FakeTask(),
FakeTaskTiming(Seconds(10), Seconds(50), ThreadSeconds(20),
FakeTask(), FakeTaskTiming(Seconds(10), Seconds(50), ThreadSeconds(20),
ThreadSeconds(25)));
EXPECT_THAT(histogram_tester.GetAllSamples(
......
......@@ -71,7 +71,6 @@ MetricsHelper::MetricsHelper(ThreadType thread_type,
MetricsHelper::~MetricsHelper() {}
bool MetricsHelper::ShouldDiscardTask(
base::sequence_manager::TaskQueue* queue,
const base::sequence_manager::Task& task,
const base::sequence_manager::TaskQueue::TaskTiming& task_timing) {
// TODO(altimin): Investigate the relationship between thread time and
......@@ -82,10 +81,9 @@ bool MetricsHelper::ShouldDiscardTask(
}
void MetricsHelper::RecordCommonTaskMetrics(
base::sequence_manager::TaskQueue* queue,
const base::sequence_manager::Task& task,
const base::sequence_manager::TaskQueue::TaskTiming& task_timing) {
thread_metrics_.RecordTaskMetrics(queue, task, task_timing);
thread_metrics_.RecordTaskMetrics(task, task_timing);
thread_task_duration_reporter_.RecordTask(thread_type_,
task_timing.wall_duration());
......
......@@ -44,13 +44,11 @@ class PLATFORM_EXPORT MetricsHelper {
protected:
bool ShouldDiscardTask(
base::sequence_manager::TaskQueue* queue,
const base::sequence_manager::Task& task,
const base::sequence_manager::TaskQueue::TaskTiming& task_timing);
// Record task metrics which are shared between threads.
void RecordCommonTaskMetrics(
base::sequence_manager::TaskQueue* queue,
const base::sequence_manager::Task& task,
const base::sequence_manager::TaskQueue::TaskTiming& task_timing);
......
......@@ -51,18 +51,15 @@ TEST(MetricsHelperTest, TaskDurationPerThreadType) {
false /* has_cpu_timing_for_each_task */);
main_thread_metrics.RecordCommonTaskMetrics(
nullptr, FakeTask(),
FakeTaskTiming(Seconds(10), Seconds(50), ThreadSeconds(0),
FakeTask(), FakeTaskTiming(Seconds(10), Seconds(50), ThreadSeconds(0),
ThreadSeconds(15)));
compositor_metrics.RecordCommonTaskMetrics(
nullptr, FakeTask(),
FakeTaskTiming(Seconds(10), Seconds(80), ThreadSeconds(0),
FakeTask(), FakeTaskTiming(Seconds(10), Seconds(80), ThreadSeconds(0),
ThreadSeconds(5)));
compositor_metrics.RecordCommonTaskMetrics(
nullptr, FakeTask(), FakeTaskTiming(Seconds(100), Seconds(200)));
FakeTask(), FakeTaskTiming(Seconds(100), Seconds(200)));
worker_metrics.RecordCommonTaskMetrics(
nullptr, FakeTask(),
FakeTaskTiming(Seconds(10), Seconds(125), ThreadSeconds(0),
FakeTask(), FakeTaskTiming(Seconds(10), Seconds(125), ThreadSeconds(0),
ThreadSeconds(25)));
EXPECT_THAT(
......
......@@ -241,10 +241,10 @@ void MainThreadMetricsHelper::RecordTaskMetrics(
MainThreadTaskQueue* queue,
const base::sequence_manager::Task& task,
const base::sequence_manager::TaskQueue::TaskTiming& task_timing) {
if (ShouldDiscardTask(queue, task, task_timing))
if (ShouldDiscardTask(task, task_timing))
return;
MetricsHelper::RecordCommonTaskMetrics(queue, task, task_timing);
MetricsHelper::RecordCommonTaskMetrics(task, task_timing);
total_task_time_reporter_.RecordAdditionalDuration(
task_timing.wall_duration());
......
......@@ -15,13 +15,12 @@ CompositorMetricsHelper::CompositorMetricsHelper(
CompositorMetricsHelper::~CompositorMetricsHelper() {}
void CompositorMetricsHelper::RecordTaskMetrics(
NonMainThreadTaskQueue* queue,
const base::sequence_manager::Task& task,
const base::sequence_manager::TaskQueue::TaskTiming& task_timing) {
if (ShouldDiscardTask(queue, task, task_timing))
if (ShouldDiscardTask(task, task_timing))
return;
MetricsHelper::RecordCommonTaskMetrics(queue, task, task_timing);
MetricsHelper::RecordCommonTaskMetrics(task, task_timing);
}
} // namespace scheduler
......
......@@ -17,7 +17,6 @@ class PLATFORM_EXPORT CompositorMetricsHelper : public MetricsHelper {
~CompositorMetricsHelper();
void RecordTaskMetrics(
NonMainThreadTaskQueue* queue,
const base::sequence_manager::Task& task,
const base::sequence_manager::TaskQueue::TaskTiming& task_timing);
......
......@@ -56,8 +56,7 @@ void CompositorThreadScheduler::OnTaskCompleted(
base::sequence_manager::TaskQueue::TaskTiming* task_timing,
base::sequence_manager::LazyNow* lazy_now) {
task_timing->RecordTaskEnd(lazy_now);
compositor_metrics_helper_.RecordTaskMetrics(worker_task_queue, task,
*task_timing);
compositor_metrics_helper_.RecordTaskMetrics(task, *task_timing);
}
scoped_refptr<scheduler::SingleThreadIdleTaskRunner>
......
......@@ -29,13 +29,12 @@ void WorkerMetricsHelper::SetParentFrameType(FrameOriginType frame_type) {
}
void WorkerMetricsHelper::RecordTaskMetrics(
NonMainThreadTaskQueue* queue,
const base::sequence_manager::Task& task,
const base::sequence_manager::TaskQueue::TaskTiming& task_timing) {
if (ShouldDiscardTask(queue, task, task_timing))
if (ShouldDiscardTask(task, task_timing))
return;
MetricsHelper::RecordCommonTaskMetrics(queue, task, task_timing);
MetricsHelper::RecordCommonTaskMetrics(task, task_timing);
bool backgrounded = internal::ProcessState::Get()->is_process_backgrounded;
......
......@@ -21,7 +21,6 @@ class PLATFORM_EXPORT WorkerMetricsHelper : public MetricsHelper {
~WorkerMetricsHelper();
void RecordTaskMetrics(
NonMainThreadTaskQueue* queue,
const base::sequence_manager::Task& task,
const base::sequence_manager::TaskQueue::TaskTiming& task_timing);
......
......@@ -207,7 +207,7 @@ void WorkerThreadScheduler::OnTaskCompleted(
PerformMicrotaskCheckpoint();
task_timing->RecordTaskEnd(lazy_now);
worker_metrics_helper_.RecordTaskMetrics(task_queue, task, *task_timing);
worker_metrics_helper_.RecordTaskMetrics(task, *task_timing);
if (task_queue_throttler_) {
task_queue_throttler_->OnTaskRunTimeReported(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment