| Index: tools/telemetry/telemetry/core/platform/profiler/java_heap_profiler.py
|
| diff --git a/tools/telemetry/telemetry/core/platform/profiler/java_heap_profiler.py b/tools/telemetry/telemetry/core/platform/profiler/java_heap_profiler.py
|
| index 3b5afe33f1e141565e6a4f11d81abd00570e57ae..d956b37914bd2df0dc8d649fbba7204a41902150 100644
|
| --- a/tools/telemetry/telemetry/core/platform/profiler/java_heap_profiler.py
|
| +++ b/tools/telemetry/telemetry/core/platform/profiler/java_heap_profiler.py
|
| @@ -50,12 +50,12 @@ class JavaHeapProfiler(profiler.Profiler):
|
| self._timer.cancel()
|
| self._DumpJavaHeap(True)
|
| try:
|
| - self._browser_backend.adb.device().PullFile(
|
| + self._browser_backend.device.PullFile(
|
| self._DEFAULT_DEVICE_DIR, self._output_path)
|
| except:
|
| logging.exception('New exception caused by DeviceUtils conversion')
|
| raise
|
| - self._browser_backend.adb.RunShellCommand(
|
| + self._browser_backend.device.RunShellCommand(
|
| 'rm ' + os.path.join(self._DEFAULT_DEVICE_DIR, '*'))
|
| output_files = []
|
| for f in os.listdir(self._output_path):
|
| @@ -72,25 +72,25 @@ class JavaHeapProfiler(profiler.Profiler):
|
| self._DumpJavaHeap(False)
|
|
|
| def _DumpJavaHeap(self, wait_for_completion):
|
| - if not self._browser_backend.adb.device().FileExists(
|
| + if not self._browser_backend.device.FileExists(
|
| self._DEFAULT_DEVICE_DIR):
|
| - self._browser_backend.adb.RunShellCommand(
|
| + self._browser_backend.device.RunShellCommand(
|
| 'mkdir -p ' + self._DEFAULT_DEVICE_DIR)
|
| - self._browser_backend.adb.RunShellCommand(
|
| + self._browser_backend.device.RunShellCommand(
|
| 'chmod 777 ' + self._DEFAULT_DEVICE_DIR)
|
|
|
| device_dump_file = None
|
| for pid in self._GetProcessOutputFileMap().iterkeys():
|
| device_dump_file = '%s/%s.%s.aprof' % (self._DEFAULT_DEVICE_DIR, pid,
|
| self._run_count)
|
| - self._browser_backend.adb.RunShellCommand('am dumpheap %s %s' %
|
| - (pid, device_dump_file))
|
| + self._browser_backend.device.RunShellCommand('am dumpheap %s %s' %
|
| + (pid, device_dump_file))
|
| if device_dump_file and wait_for_completion:
|
| util.WaitFor(lambda: self._FileSize(device_dump_file) > 0, timeout=2)
|
| self._run_count += 1
|
|
|
| def _FileSize(self, file_name):
|
| try:
|
| - return self._browser_backend.adb.device().Stat(file_name).st_size
|
| + return self._browser_backend.device.Stat(file_name).st_size
|
| except device_errors.CommandFailedError:
|
| return 0
|
|
|