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

Unified Diff: base/trace_event/process_memory_maps_dump_provider.cc

Issue 1391933002: Restrict memory maps dump provider to only android and linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@smaps_fscan
Patch Set: Fix nacl. Created 5 years, 2 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
Index: base/trace_event/process_memory_maps_dump_provider.cc
diff --git a/base/trace_event/process_memory_maps_dump_provider.cc b/base/trace_event/process_memory_maps_dump_provider.cc
index 335dd829ac578a70dc846718f210152c04a1cba2..5fb2bbb96af862b1ae10d37165d9a9e85c7e197f 100644
--- a/base/trace_event/process_memory_maps_dump_provider.cc
+++ b/base/trace_event/process_memory_maps_dump_provider.cc
@@ -13,7 +13,6 @@
namespace base {
namespace trace_event {
-#if defined(OS_LINUX) || defined(OS_ANDROID)
// static
FILE* ProcessMemoryMapsDumpProvider::proc_smaps_for_testing = nullptr;
@@ -134,7 +133,6 @@ uint32 ReadLinuxProcSmapsFile(FILE* smaps_file, ProcessMemoryMaps* pmm) {
}
} // namespace
-#endif // defined(OS_LINUX) || defined(OS_ANDROID)
// static
ProcessMemoryMapsDumpProvider* ProcessMemoryMapsDumpProvider::GetInstance() {
@@ -157,23 +155,17 @@ bool ProcessMemoryMapsDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
return true;
uint32 res = 0;
-
-#if defined(OS_LINUX) || defined(OS_ANDROID)
if (UNLIKELY(proc_smaps_for_testing)) {
res = ReadLinuxProcSmapsFile(proc_smaps_for_testing, pmd->process_mmaps());
} else {
ScopedFILE smaps_file(fopen("/proc/self/smaps", "r"));
res = ReadLinuxProcSmapsFile(smaps_file.get(), pmd->process_mmaps());
}
-#else
- LOG(ERROR) << "ProcessMemoryMaps dump provider is supported only on Linux";
-#endif
if (res > 0) {
pmd->set_has_process_mmaps();
return true;
}
-
return false;
}

Powered by Google App Engine
This is Rietveld 408576698