Make page_cycler.py fully measure memory for each page.

build/android/pylib/android_commands.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Provides an interface to communicate with the device via the adb command.
 
 Assumes adb binary is currently on system path.
 """
 
 import collections
@@ skipping 235 matching lines @@
     self._device = device
     self._logcat = None
     self.logcat_process = None
     self._logcat_tmpoutfile = None
     self._pushed_files = []
     self._device_utc_offset = None
     self._potential_push_size = 0
     self._actual_push_size = 0
     self._external_storage = ''
     self._util_wrapper = ''
+    self._purge_ashmem_binary_was_pushed = False
 
   def _LogShell(self, cmd):
     """Logs the adb shell command."""
     if self._device:
       device_repr = self._device[-4:]
     else:
       device_repr = '????'
     logging.info('[%s]> %s', device_repr, cmd)
 
   def Adb(self):
@@ skipping 1162 matching lines @@
       if stats.device == 'mmcblk0':
         return {
             'num_reads': stats.num_reads_issued,
             'num_writes': stats.num_writes_completed,
             'read_ms': stats.ms_spent_reading,
             'write_ms': stats.ms_spent_writing,
         }
     logging.warning('Could not find disk IO stats.')
     return None
 
+  def _PushPurgeAshmemBinaryIfNeeded(self):
+    """Pushes the ashmem binary once at construction if needed."""
+    if not self._purge_ashmem_binary_was_pushed:
+      host_path = host_path_finder.GetMostRecentHostPath('purge_ashmem')
+      if not host_path:
+        raise Exception('Could not find the purge_ashmem binary.')
+      device_path = os.path.join(constants.TEST_EXECUTABLE_DIR, 'purge_ashmem')
+      self.PushIfNeeded(host_path, device_path)
+      self._purge_ashmem_binary_was_pushed = True
+
   def PurgeUnpinnedAshmem(self):

[bulach, 2013/11/28 13:31:24]

I think both _PushPurgeAshmemBinaryIfNeeded and PurgeUnpinnedAshmem would be
better suited higher up in android_platform_backend.py, wdyt?

craig is undergoing a big effort to trim this down and have a slightly saner API
at this level, so we could help him by moving this up to the only place where
it's needed..

[Philippe, 2013/11/28 17:03:04]

Yeah, agreed :)

     """Purges the unpinned ashmem memory for the whole system.
 
     This can be used to make memory measurements more stable in particular.
     """
-    host_path = host_path_finder.GetMostRecentHostPath('purge_ashmem')
-    if not host_path:
-      raise Exception('Could not find the purge_ashmem binary.')
+    self._PushPurgeAshmemBinaryIfNeeded()
     device_path = os.path.join(constants.TEST_EXECUTABLE_DIR, 'purge_ashmem')
-    self.PushIfNeeded(host_path, device_path)
     if self.RunShellCommand(device_path, log_result=True):
       return
     raise Exception('Error while purging ashmem.')
 
   def GetMemoryUsageForPid(self, pid):
     """Returns the memory usage for given pid.
 
     Args:
       pid: The pid number of the specific process running on device.
 
@@ skipping 245 matching lines @@
   """
   def __init__(self, output):
     self._output = output
 
   def write(self, data):
     data = data.replace('\r\r\n', '\n')
     self._output.write(data)
 
   def flush(self):
     self._output.flush()