OLD | NEW |
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 import collections | 4 import collections |
5 | 5 |
6 from telemetry.util.statistics import DivideIfPossibleOrZero | 6 from telemetry.util.statistics import DivideIfPossibleOrZero |
7 from telemetry.value import scalar | 7 from telemetry.value import scalar |
8 from telemetry.web_perf.metrics import timeline_based_metric | 8 from telemetry.web_perf.metrics import timeline_based_metric |
9 | 9 |
10 | 10 |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
69 # having several process configurations (in-proc-gpu/single-proc). | 69 # having several process configurations (in-proc-gpu/single-proc). |
70 # Since we can't isolate renderer threads in single-process mode, we | 70 # Since we can't isolate renderer threads in single-process mode, we |
71 # always sum renderer-process threads' times. We also sum all io-threads | 71 # always sum renderer-process threads' times. We also sum all io-threads |
72 # for simplicity. | 72 # for simplicity. |
73 TimelineThreadCategories = { | 73 TimelineThreadCategories = { |
74 "Chrome_InProcGpuThread": "GPU", | 74 "Chrome_InProcGpuThread": "GPU", |
75 "CrGpuMain" : "GPU", | 75 "CrGpuMain" : "GPU", |
76 "AsyncTransferThread" : "GPU_transfer", | 76 "AsyncTransferThread" : "GPU_transfer", |
77 "CrBrowserMain" : "browser", | 77 "CrBrowserMain" : "browser", |
78 "Browser Compositor" : "browser", | 78 "Browser Compositor" : "browser", |
| 79 "Browser Worker" : "browser", |
79 "CrRendererMain" : "renderer_main", | 80 "CrRendererMain" : "renderer_main", |
80 "Compositor" : "renderer_compositor", | 81 "Compositor" : "renderer_compositor", |
| 82 "Worker" : "raster", |
81 "IOThread" : "IO", | 83 "IOThread" : "IO", |
82 "CompositorTileWorker" : "raster", | |
83 "DummyThreadName1" : "other", | 84 "DummyThreadName1" : "other", |
84 "DummyThreadName2" : "total_fast_path", | 85 "DummyThreadName2" : "total_fast_path", |
85 "DummyThreadName3" : "total_all" | 86 "DummyThreadName3" : "total_all" |
86 } | 87 } |
87 | 88 |
88 _MatchBySubString = ["IOThread", "CompositorTileWorker"] | 89 _MatchBySubString = ["IOThread", "Worker"] |
89 | 90 |
90 AllThreads = TimelineThreadCategories.values() | 91 AllThreads = TimelineThreadCategories.values() |
91 NoThreads = [] | 92 NoThreads = [] |
92 FastPathThreads = ["GPU", "renderer_compositor", "browser", "IO"] | 93 FastPathThreads = ["GPU", "renderer_compositor", "browser", "IO"] |
93 | 94 |
94 ReportMainThreadOnly = ["renderer_main"] | 95 ReportMainThreadOnly = ["renderer_main"] |
95 ReportSilkDetails = ["renderer_main"] | 96 ReportSilkDetails = ["renderer_main"] |
96 | 97 |
97 # TODO(epenner): Thread names above are likely fairly stable but trace names | 98 # TODO(epenner): Thread names above are likely fairly stable but trace names |
98 # could change. We should formalize these traces to keep this robust. | 99 # could change. We should formalize these traces to keep this robust. |
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
301 thread_results.AddDetailedResults( | 302 thread_results.AddDetailedResults( |
302 num_intervals, interval_name, results) | 303 num_intervals, interval_name, results) |
303 | 304 |
304 # Report mean frame time for the frame rate thread. We could report other | 305 # Report mean frame time for the frame rate thread. We could report other |
305 # frame rates (eg. renderer_main) but this might get confusing. | 306 # frame rates (eg. renderer_main) but this might get confusing. |
306 mean_frame_time = Rate(frame_rate_thread.all_action_time, num_frames) | 307 mean_frame_time = Rate(frame_rate_thread.all_action_time, num_frames) |
307 results.AddValue(scalar.ScalarValue( | 308 results.AddValue(scalar.ScalarValue( |
308 results.current_page, | 309 results.current_page, |
309 ThreadMeanFrameTimeResultName(FrameTraceThreadName), | 310 ThreadMeanFrameTimeResultName(FrameTraceThreadName), |
310 'ms', mean_frame_time)) | 311 'ms', mean_frame_time)) |
OLD | NEW |