Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(285)

Unified Diff: trunk/src/tools/telemetry/telemetry/core/platform/android_platform_backend.py

Issue 111773002: Revert 239784 "Make page_cycler.py fully measure memory for each..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/tools/telemetry/telemetry/core/platform/android_platform_backend.py
===================================================================
--- trunk/src/tools/telemetry/telemetry/core/platform/android_platform_backend.py (revision 239788)
+++ trunk/src/tools/telemetry/telemetry/core/platform/android_platform_backend.py (working copy)
@@ -11,7 +11,6 @@
from telemetry.core import platform
from telemetry.core import util
from telemetry.core.platform import proc_supporting_platform_backend
-from telemetry.core.platform.profiler import android_prebuilt_profiler_helper
# Get build/android scripts into our path.
util.AddDirToPythonPath(util.GetChromiumSrcDir(), 'build', 'android')
@@ -110,19 +109,8 @@
return {}
return super(AndroidPlatformBackend, self).GetCpuTimestamp()
- def PurgeUnpinnedMemory(self):
- """Purges the unpinned ashmem memory for the whole system.
-
- This can be used to make memory measurements more stable in particular.
- """
- android_prebuilt_profiler_helper.InstallOnDevice(self._adb, 'purge_ashmem')
- if self._adb.RunShellCommand(
- android_prebuilt_profiler_helper.GetDevicePath('purge_ashmem'),
- log_result=True):
- return
- raise Exception('Error while purging ashmem.')
-
def GetMemoryStats(self, pid):
+ self._adb.PurgeUnpinnedAshmem()
memory_usage = self._adb.GetMemoryUsageForPid(pid)[0]
return {'ProportionalSetSize': memory_usage['Pss'] * 1024,
'SharedDirty': memory_usage['Shared_Dirty'] * 1024,

Powered by Google App Engine
This is Rietveld 408576698