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

Unified Diff: chrome/browser/task_manager/task_manager.cc

Issue 16116003: Revert 202639 "Use totmaps if available on chromeos" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Undo revert Created 7 years, 7 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 | « base/process/process_metrics_linux.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/task_manager/task_manager.cc
diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc
index 86d08e44c22b641c54b0a6b61afb46cb7812acad..af863b3e9c77a3718e8a95e5cbead73565c82107 100644
--- a/chrome/browser/task_manager/task_manager.cc
+++ b/chrome/browser/task_manager/task_manager.cc
@@ -586,11 +586,16 @@ bool TaskManagerModel::GetPhysicalMemory(int index, size_t* result) const {
!iter->second->GetWorkingSetKBytes(&ws_usage))
return false;
+ values.is_physical_memory_valid = true;
+#if defined(OS_LINUX)
+ // On Linux private memory is also resident. Just use it.
+ values.physical_memory = ws_usage.priv * 1024;
+#else
// Memory = working_set.private + working_set.shareable.
// We exclude the shared memory.
- values.is_physical_memory_valid = true;
values.physical_memory = iter->second->GetWorkingSetSize();
values.physical_memory -= ws_usage.shared * 1024;
+#endif
}
*result = values.physical_memory;
return true;
« no previous file with comments | « base/process/process_metrics_linux.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698