Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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 | 4 |
| 5 import re | 5 import re |
| 6 | 6 |
| 7 from core import perf_benchmark | 7 from core import perf_benchmark |
| 8 | 8 |
| 9 from telemetry import benchmark | 9 from telemetry import benchmark |
| 10 from telemetry.timeline import tracing_category_filter | 10 from telemetry.timeline import tracing_category_filter |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 159 @classmethod | 159 @classmethod |
| 160 def ValueCanBeAddedPredicate(cls, value, is_first_result): | 160 def ValueCanBeAddedPredicate(cls, value, is_first_result): |
| 161 return bool(cls._RE_RENDERER_VALUES.match(value.name)) | 161 return bool(cls._RE_RENDERER_VALUES.match(value.name)) |
| 162 | 162 |
| 163 | 163 |
| 164 class _MemoryV8Benchmark(_MemoryInfra): | 164 class _MemoryV8Benchmark(_MemoryInfra): |
| 165 | 165 |
| 166 # Report only V8-specific and overall renderer memory values. Note that | 166 # Report only V8-specific and overall renderer memory values. Note that |
| 167 # detailed values reported by the OS (such as native heap) are excluded. | 167 # detailed values reported by the OS (such as native heap) are excluded. |
| 168 _V8_AND_OVERALL_MEMORY_RE = re.compile( | 168 _V8_AND_OVERALL_MEMORY_RE = re.compile( |
| 169 r'renderer:(reported_by_chrome:v8|reported_by_os:system:[^:]+$)') | 169 r'renderer_processes:' |
|
nednguyen
2016/06/11 04:46:58
Don't you need (renderer_processes:|renderer:) so
petrcermak
2016/06/13 08:32:01
No, but thanks for checking :-) This change only a
| |
| 170 r'(reported_by_chrome:v8|reported_by_os:system_memory:[^:]+$)') | |
| 170 | 171 |
| 171 def CreateTimelineBasedMeasurementOptions(self): | 172 def CreateTimelineBasedMeasurementOptions(self): |
| 172 v8_categories = [ | 173 v8_categories = [ |
| 173 'blink.console', 'renderer.scheduler', 'v8', 'webkit.console'] | 174 'blink.console', 'renderer.scheduler', 'v8', 'webkit.console'] |
| 174 memory_categories = ['blink.console', 'disabled-by-default-memory-infra'] | 175 memory_categories = ['blink.console', 'disabled-by-default-memory-infra'] |
| 175 category_filter = tracing_category_filter.TracingCategoryFilter( | 176 category_filter = tracing_category_filter.TracingCategoryFilter( |
| 176 ','.join(['-*'] + v8_categories + memory_categories)) | 177 ','.join(['-*'] + v8_categories + memory_categories)) |
| 177 options = timeline_based_measurement.Options(category_filter) | 178 options = timeline_based_measurement.Options(category_filter) |
| 178 options.SetTimelineBasedMetric('v8AndMemoryMetrics') | 179 options.SetTimelineBasedMetric('v8AndMemoryMetrics') |
| 179 return options | 180 return options |
| (...skipping 30 matching lines...) Expand all Loading... | |
| 210 of long running idle Gmail page """ | 211 of long running idle Gmail page """ |
| 211 page_set = page_sets.LongRunningIdleGmailBackgroundPageSet | 212 page_set = page_sets.LongRunningIdleGmailBackgroundPageSet |
| 212 | 213 |
| 213 @classmethod | 214 @classmethod |
| 214 def Name(cls): | 215 def Name(cls): |
| 215 return 'memory.long_running_idle_gmail_background_tbmv2' | 216 return 'memory.long_running_idle_gmail_background_tbmv2' |
| 216 | 217 |
| 217 @classmethod | 218 @classmethod |
| 218 def ShouldDisable(cls, possible_browser): # http://crbug.com/616530 | 219 def ShouldDisable(cls, possible_browser): # http://crbug.com/616530 |
| 219 return cls.IsSvelte(possible_browser) | 220 return cls.IsSvelte(possible_browser) |
| OLD | NEW |