| OLD | NEW |
| 1 # Copyright 2012 The Chromium Authors. All rights reserved. | 1 # Copyright 2012 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 logging | 5 import logging |
| 6 | 6 |
| 7 from telemetry.page import page_test | 7 from telemetry.page import page_test |
| 8 | 8 |
| 9 from metrics import memory | 9 from metrics import memory |
| 10 from metrics import power | 10 from metrics import power |
| 11 | 11 |
| 12 | 12 |
| 13 class Memory(page_test.PageTest): | 13 class Memory(page_test.PageTest): |
| 14 | 14 |
| 15 def __init__(self): | 15 def __init__(self): |
| 16 super(Memory, self).__init__() | 16 super(Memory, self).__init__() |
| 17 self._memory_metric = None | 17 self._memory_metric = None |
| 18 self._power_metric = None | 18 self._power_metric = None |
| 19 | 19 |
| 20 def WillStartBrowser(self, platform): | 20 def WillStartBrowser(self, platform): |
| 21 self._power_metric = power.PowerMetric(platform) | 21 self._power_metric = power.PowerMetric(platform) |
| 22 | 22 |
| 23 def DidStartBrowser(self, browser): | 23 def DidStartBrowser(self, browser): |
| 24 self._memory_metric = memory.MemoryMetric(browser) | 24 self._memory_metric = memory.MemoryMetric(browser) |
| 25 | 25 |
| 26 def WillNavigateToPage(self, page, tab): | 26 def WillNavigateToPage(self, page, tab): |
| 27 del page # unused |
| 27 tab.CollectGarbage() | 28 tab.CollectGarbage() |
| 28 | 29 |
| 29 def DidNavigateToPage(self, page, tab): | 30 def DidNavigateToPage(self, page, tab): |
| 30 self._memory_metric.Start(page, tab) | 31 self._memory_metric.Start(page, tab) |
| 31 self._power_metric.Start(page, tab) | 32 self._power_metric.Start(page, tab) |
| 32 | 33 |
| 33 def CustomizeBrowserOptions(self, options): | 34 def CustomizeBrowserOptions(self, options): |
| 34 memory.MemoryMetric.CustomizeBrowserOptions(options) | 35 memory.MemoryMetric.CustomizeBrowserOptions(options) |
| 35 # Since this is a memory benchmark, we want to sample memory histograms at | 36 # Since this is a memory benchmark, we want to sample memory histograms at |
| 36 # a high frequency. | 37 # a high frequency. |
| 37 options.AppendExtraBrowserArgs('--memory-metrics') | 38 options.AppendExtraBrowserArgs('--memory-metrics') |
| 38 | 39 |
| 39 def ValidateAndMeasurePage(self, page, tab, results): | 40 def ValidateAndMeasurePage(self, page, tab, results): |
| 40 self._power_metric.Stop(page, tab) | 41 self._power_metric.Stop(page, tab) |
| 41 self._memory_metric.Stop(page, tab) | 42 self._memory_metric.Stop(page, tab) |
| 42 self._memory_metric.AddResults(tab, results) | 43 self._memory_metric.AddResults(tab, results) |
| 43 self._power_metric.AddResults(tab, results) | 44 self._power_metric.AddResults(tab, results) |
| 44 | 45 |
| 45 def DidRunPage(self, platform): | 46 def DidRunPage(self, platform): |
| 47 del platform # unused |
| 46 # TODO(rnephew): Remove when crbug.com/553601 is solved. | 48 # TODO(rnephew): Remove when crbug.com/553601 is solved. |
| 47 logging.info('DidRunPage for memory metric') | 49 logging.info('DidRunPage for memory metric') |
| 48 self._power_metric.Close() | 50 self._power_metric.Close() |
| OLD | NEW |