mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-22 02:35:23 +03:00
43 lines
1.9 KiB
Diff
43 lines
1.9 KiB
Diff
diff --git a/src/3rdparty/chromium/base/process/process_metrics_posix.cc b/src/3rdparty/chromium/base/process/process_metrics_posix.cc
|
|
index 9d12c427b..9030de9f6 100644
|
|
--- a/src/3rdparty/chromium/base/process/process_metrics_posix.cc
|
|
+++ b/src/3rdparty/chromium/base/process/process_metrics_posix.cc
|
|
@@ -119,14 +119,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_CHROMEOS) || defined(OS_ANDROID)
|
|
+#elif (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || 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)
|
|
+#else //if defined(OS_FUCHSIA) // also musl doesn't do this.
|
|
// TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
|
|
return 0;
|
|
#endif
|
|
diff --git a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
|
|
index c327f4865..2717eca5a 100644
|
|
--- a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
|
|
+++ b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
|
|
@@ -132,7 +132,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
|
|
}
|
|
#elif defined(OS_FUCHSIA)
|
|
// TODO(fuchsia): Port, see https://crbug.com/706592.
|
|
-#else
|
|
+#elif defined(__GLIBC__)
|
|
struct mallinfo info = mallinfo();
|
|
// In case of Android's jemalloc |arena| is 0 and the outer pages size is
|
|
// reported by |hblkhd|. In case of dlmalloc the total is given by
|
|
@@ -142,6 +142,8 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
|
|
|
|
// Total allocated space is given by |uordblks|.
|
|
allocated_objects_size = info.uordblks;
|
|
+#else
|
|
+ // musl libc does not support mallinfo()
|
|
#endif
|
|
|
|
MemoryAllocatorDump* outer_dump = pmd->CreateAllocatorDump("malloc");
|