| Index: tools/telemetry/telemetry/core/platform/profiler/tcmalloc_heap_profiler.py
|
| diff --git a/tools/telemetry/telemetry/core/platform/profiler/tcmalloc_heap_profiler.py b/tools/telemetry/telemetry/core/platform/profiler/tcmalloc_heap_profiler.py
|
| index 8c67284f58fb36eac26f08fb21c9d047a38ff340..01d95c341631f6358c3c7ecda689c900e6fa52e8 100644
|
| --- a/tools/telemetry/telemetry/core/platform/profiler/tcmalloc_heap_profiler.py
|
| +++ b/tools/telemetry/telemetry/core/platform/profiler/tcmalloc_heap_profiler.py
|
| @@ -34,26 +34,34 @@
|
| def _SetDeviceProperties(self, properties):
|
| device_configured = False
|
| # This profiler requires adb root to set properties.
|
| - self._browser_backend.device.EnableRoot()
|
| + try:
|
| + self._browser_backend.adb.device().EnableRoot()
|
| + except:
|
| + logging.exception('New exception caused by DeviceUtils conversion')
|
| + raise
|
| for values in properties.itervalues():
|
| - device_property = self._browser_backend.device.GetProp(values[0])
|
| + device_property = self._browser_backend.adb.device().GetProp(values[0])
|
| if not device_property or not device_property.strip():
|
| - self._browser_backend.device.SetProp(values[0], values[1])
|
| + self._browser_backend.adb.device().SetProp(values[0], values[1])
|
| device_configured = True
|
| - if not self._browser_backend.device.FileExists(
|
| + if not self._browser_backend.adb.device().FileExists(
|
| self._DEFAULT_DEVICE_DIR):
|
| - self._browser_backend.device.RunShellCommand(
|
| + self._browser_backend.adb.RunShellCommand(
|
| 'mkdir -p ' + self._DEFAULT_DEVICE_DIR)
|
| - self._browser_backend.device.RunShellCommand(
|
| + self._browser_backend.adb.RunShellCommand(
|
| 'chmod 777 ' + self._DEFAULT_DEVICE_DIR)
|
| device_configured = True
|
| if device_configured:
|
| raise Exception('Device required special config, run again.')
|
|
|
| def CollectProfile(self):
|
| - self._browser_backend.device.PullFile(
|
| - self._DEFAULT_DEVICE_DIR, self._output_path)
|
| - self._browser_backend.device.RunShellCommand(
|
| + try:
|
| + self._browser_backend.adb.device().PullFile(
|
| + self._DEFAULT_DEVICE_DIR, self._output_path)
|
| + except:
|
| + logging.exception('New exception caused by DeviceUtils conversion')
|
| + raise
|
| + self._browser_backend.adb.RunShellCommand(
|
| 'rm ' + os.path.join(self._DEFAULT_DEVICE_DIR, '*'))
|
| if os.path.exists(self._output_path):
|
| logging.info('TCMalloc dumps pulled to %s', self._output_path)
|
|
|