34 lines
979 B
Diff
34 lines
979 B
Diff
--- base/trace_event/malloc_dump_provider.cc
|
|
+++ base/trace_event/malloc_dump_provider.cc
|
|
@@ -132,7 +132,7 @@
|
|
}
|
|
#elif defined(OS_FUCHSIA)
|
|
// TODO(fuchsia): Port, see https://crbug.com/706592.
|
|
-#else
|
|
+#elif defined(__GLIBC__)
|
|
struct mallinfo info = mallinfo();
|
|
#if !defined(ADDRESS_SANITIZER) && !defined(THREAD_SANITIZER)
|
|
// Sanitizers override mallinfo.
|
|
--- base/process/process_metrics_posix.cc
|
|
+++ base/process/process_metrics_posix.cc
|
|
@@ -110,17 +110,16 @@
|
|
malloc_statistics_t stats = {0};
|
|
malloc_zone_statistics(nullptr, &stats);
|
|
return stats.size_in_use;
|
|
-#elif defined(OS_LINUX) || defined(OS_ANDROID)
|
|
+#elif defined(__GLIBC__) || defined(OS_ANDROID)
|
|
struct mallinfo minfo = mallinfo();
|
|
#if BUILDFLAG(USE_TCMALLOC)
|
|
return minfo.uordblks;
|
|
#else
|
|
return minfo.hblkhd + minfo.arena;
|
|
#endif
|
|
-#elif defined(OS_FUCHSIA)
|
|
+#endif
|
|
// TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
|
|
return 0;
|
|
-#endif
|
|
}
|
|
|
|
} // namespace base
|