Revert "Revert 239784 "Make page_cycler.py fully measure memory for each...""

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
 import datetime
 import inspect
 import logging
 import os
 import re
 import shlex
 import signal
 import subprocess
 import sys
 import tempfile
 import time
 
 import cmd_helper
 import constants
 import screenshot
 import system_properties
 
-from utils import host_path_finder
-
 try:
   from pylib import pexpect
 except:
   pexpect = None
 
 sys.path.append(os.path.join(
     constants.DIR_SOURCE_ROOT, 'third_party', 'android_testrunner'))
 import adb_interface
 import am_instrument_parser
 import errors
@@ skipping 1454 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 PurgeUnpinnedAshmem(self):
-    """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.')
-    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.
 
     Returns:
       A tuple containg:
       [0]: Dict of {metric:usage_kb}, for the process which has specified pid.
       The metric keys which may be included are: Size, Rss, Pss, Shared_Clean,
@@ skipping 241 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()