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

Unified Diff: tools/telemetry/telemetry/core/platform/proc_supporting_platform_backend.py

Issue 440783003: [Telemetry] Allow memory info to go missing on non-rooted devices. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 months 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
« no previous file with comments | « tools/telemetry/telemetry/core/browser.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/core/platform/proc_supporting_platform_backend.py
diff --git a/tools/telemetry/telemetry/core/platform/proc_supporting_platform_backend.py b/tools/telemetry/telemetry/core/platform/proc_supporting_platform_backend.py
index 8a7ddd0d81593fd16f8825b97c2a98c684106e4b..8633b4301eda2b1c5ccbd0d879d1f6cbe9f6244e 100644
--- a/tools/telemetry/telemetry/core/platform/proc_supporting_platform_backend.py
+++ b/tools/telemetry/telemetry/core/platform/proc_supporting_platform_backend.py
@@ -21,6 +21,8 @@ class ProcSupportingPlatformBackend(platform_backend.PlatformBackend):
def GetSystemCommitCharge(self):
meminfo_contents = self._GetFileContents('/proc/meminfo')
meminfo = self._GetProcFileDict(meminfo_contents)
+ if not meminfo:
+ return None
return (self._ConvertKbToByte(meminfo['MemTotal'])
- self._ConvertKbToByte(meminfo['MemFree'])
- self._ConvertKbToByte(meminfo['Buffers'])
@@ -30,6 +32,8 @@ class ProcSupportingPlatformBackend(platform_backend.PlatformBackend):
def GetSystemTotalPhysicalMemory(self):
meminfo_contents = self._GetFileContents('/proc/meminfo')
meminfo = self._GetProcFileDict(meminfo_contents)
+ if not meminfo:
+ return None
return self._ConvertKbToByte(meminfo['MemTotal'])
def GetCpuStats(self, pid):
« no previous file with comments | « tools/telemetry/telemetry/core/browser.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698