| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 math | 5 import math |
| 6 import os | 6 import os |
| 7 | 7 |
| 8 from metrics import power | 8 from metrics import power |
| 9 from telemetry import benchmark | 9 from telemetry import benchmark |
| 10 from telemetry import page as page_module | 10 from telemetry import page as page_module |
| 11 from telemetry.page import page_set | 11 from telemetry.page import page_set |
| 12 from telemetry.page import page_test | 12 from telemetry.page import page_test |
| 13 from telemetry.value import improvement_direction |
| 13 from telemetry.value import scalar | 14 from telemetry.value import scalar |
| 14 | 15 |
| 15 | 16 |
| 16 class _DromaeoMeasurement(page_test.PageTest): | 17 class _DromaeoMeasurement(page_test.PageTest): |
| 17 def __init__(self): | 18 def __init__(self): |
| 18 super(_DromaeoMeasurement, self).__init__( | 19 super(_DromaeoMeasurement, self).__init__( |
| 19 action_name_to_run='RunPageInteractions') | 20 action_name_to_run='RunPageInteractions') |
| 20 self._power_metric = None | 21 self._power_metric = None |
| 21 | 22 |
| 22 def CustomizeBrowserOptions(self, options): | 23 def CustomizeBrowserOptions(self, options): |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 container[key] = {'count': 0, 'sum': 0} | 72 container[key] = {'count': 0, 'sum': 0} |
| 72 container[key]['count'] += 1 | 73 container[key]['count'] += 1 |
| 73 container[key]['sum'] += math.log(value) | 74 container[key]['sum'] += math.log(value) |
| 74 | 75 |
| 75 suffix = page.url[page.url.index('?') + 1 :] | 76 suffix = page.url[page.url.index('?') + 1 :] |
| 76 def AddResult(name, value): | 77 def AddResult(name, value): |
| 77 important = False | 78 important = False |
| 78 if name == suffix: | 79 if name == suffix: |
| 79 important = True | 80 important = True |
| 80 results.AddValue(scalar.ScalarValue( | 81 results.AddValue(scalar.ScalarValue( |
| 81 results.current_page, Escape(name), 'runs/s', value, important)) | 82 results.current_page, Escape(name), 'runs/s', value, important, |
| 83 improvement_direction=improvement_direction.UP)) |
| 82 | 84 |
| 83 aggregated = {} | 85 aggregated = {} |
| 84 for data in score: | 86 for data in score: |
| 85 AddResult('%s/%s' % (data['collection'], data['name']), | 87 AddResult('%s/%s' % (data['collection'], data['name']), |
| 86 data['mean']) | 88 data['mean']) |
| 87 | 89 |
| 88 top_name = data['collection'].split('-', 1)[0] | 90 top_name = data['collection'].split('-', 1)[0] |
| 89 AggregateData(aggregated, top_name, data['mean']) | 91 AggregateData(aggregated, top_name, data['mean']) |
| 90 | 92 |
| 91 collection_name = data['collection'] | 93 collection_name = data['collection'] |
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 252 | 254 |
| 253 | 255 |
| 254 class DromaeoCSSQueryJquery(_DromaeoBenchmark): | 256 class DromaeoCSSQueryJquery(_DromaeoBenchmark): |
| 255 """Dromaeo CSS Query jquery JavaScript benchmark. | 257 """Dromaeo CSS Query jquery JavaScript benchmark. |
| 256 | 258 |
| 257 Tests traversing a DOM structure using the Prototype JavaScript Library. | 259 Tests traversing a DOM structure using the Prototype JavaScript Library. |
| 258 """ | 260 """ |
| 259 tag = 'cssqueryjquery' | 261 tag = 'cssqueryjquery' |
| 260 query_param = 'cssquery-jquery' | 262 query_param = 'cssquery-jquery' |
| 261 | 263 |
| OLD | NEW |