45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
--- base/trace_event/malloc_dump_provider.cc.orig
|
|
+++ base/trace_event/malloc_dump_provider.cc
|
|
@@ -243,7 +243,7 @@
|
|
allocated_objects_count = main_heap_info.block_count;
|
|
#elif defined(OS_FUCHSIA)
|
|
// TODO(fuchsia): Port, see https://crbug.com/706592.
|
|
-#else
|
|
+#elif defined(__GLIBC__)
|
|
struct mallinfo info = mallinfo();
|
|
DCHECK_GE(info.arena + info.hblkhd, info.uordblks);
|
|
|
|
diff --git a/base/process/process_metrics_posix.cc b/base/process/process_metrics_posix.cc
|
|
index 0eb5c1f..8af7799 100644
|
|
--- base/process/process_metrics_posix.cc
|
|
+++ base/process/process_metrics_posix.cc
|
|
@@ -94,14 +94,14 @@ size_t ProcessMetrics::GetMallocUsage() {
|
|
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 defined(USE_TCMALLOC)
|
|
return minfo.uordblks;
|
|
#else
|
|
return minfo.hblkhd + minfo.arena;
|
|
#endif
|
|
-#elif defined(OS_FUCHSIA)
|
|
+#else
|
|
// TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
|
|
return 0;
|
|
#endif
|
|
--- third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc
|
|
+++ third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc.orig
|
|
@@ -84,7 +84,7 @@
|
|
}
|
|
|
|
size_t Process::GetMallocUsage() {
|
|
-#if defined(HAVE_MALLINFO)
|
|
+#if defined(HAVE_MALLINFO) && defined(__GLIBC__)
|
|
struct mallinfo mi;
|
|
mi = ::mallinfo();
|
|
return mi.uordblks;
|
|
|