From 4a011daed3856a391d4d0cb0488a0b4c0e48441c Mon Sep 17 00:00:00 2001 From: klzgrad Date: Sat, 30 Nov 2019 22:36:22 +0800 Subject: [PATCH] musl: base: Remove use of mallinfo --- src/base/process/process_metrics_posix.cc | 4 ++++ src/base/trace_event/malloc_dump_provider.cc | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/base/process/process_metrics_posix.cc b/src/base/process/process_metrics_posix.cc index 205200021c..1c1991da55 100644 --- a/src/base/process/process_metrics_posix.cc +++ b/src/base/process/process_metrics_posix.cc @@ -112,6 +112,9 @@ void IncreaseFdLimitTo(unsigned int max_descriptors) { namespace { size_t GetMallocUsageMallinfo() { +#if defined(__MUSL__) + return 0; +#else #if defined(__GLIBC__) && defined(__GLIBC_PREREQ) #if __GLIBC_PREREQ(2, 33) #define MALLINFO2_FOUND_IN_LIBC @@ -123,6 +126,7 @@ size_t GetMallocUsageMallinfo() { #endif #undef MALLINFO2_FOUND_IN_LIBC return checked_cast(minfo.hblkhd + minfo.arena); +#endif } } // namespace diff --git a/src/base/trace_event/malloc_dump_provider.cc b/src/base/trace_event/malloc_dump_provider.cc index bf6a3f68b6..d0daaf4ddc 100644 --- a/src/base/trace_event/malloc_dump_provider.cc +++ b/src/base/trace_event/malloc_dump_provider.cc @@ -192,7 +192,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size, #if (PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(IS_ANDROID)) || \ (!PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_WIN) && \ - !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_FUCHSIA)) + !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_FUCHSIA) && !defined(__MUSL__)) void ReportMallinfoStats(ProcessMemoryDump* pmd, size_t* total_virtual_size, size_t* resident_size, @@ -395,6 +395,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, &allocated_objects_count); #elif BUILDFLAG(IS_FUCHSIA) // TODO(fuchsia): Port, see https://crbug.com/706592. +#elif defined(__MUSL__) #else ReportMallinfoStats(/*pmd=*/nullptr, &total_virtual_size, &resident_size, &allocated_objects_size, &allocated_objects_count);