mirror/naiveproxy
1
0
Fork 0
mirror of https://github.com/klzgrad/naiveproxy.git synced 2024-11-26 15:26:10 +03:00
Code Issues Projects Releases Wiki Activity

musl: base: Remove use of mallinfo

Browse Source
This commit is contained in:
klzgrad 2019-11-30 22:36:22 +08:00
parent c20cce4d08
commit 7cd1bcce1d
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/base/process/process_metrics_posix.cc
View File

@ -110,6 +110,9 @@ void IncreaseFdLimitTo(unsigned int max_descriptors) {
namespace { namespace {
size_t GetMallocUsageMallinfo() { size_t GetMallocUsageMallinfo() {
#if defined(__MUSL__)
return 0;
#else
#if defined(__GLIBC__) && defined(__GLIBC_PREREQ) #if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
#if __GLIBC_PREREQ(2, 33) #if __GLIBC_PREREQ(2, 33)
#define MALLINFO2_FOUND_IN_LIBC #define MALLINFO2_FOUND_IN_LIBC
@ -121,6 +124,7 @@ size_t GetMallocUsageMallinfo() {
#endif #endif
#undef MALLINFO2_FOUND_IN_LIBC #undef MALLINFO2_FOUND_IN_LIBC
return checked_cast<size_t>(minfo.hblkhd + minfo.arena); return checked_cast<size_t>(minfo.hblkhd + minfo.arena);
#endif
} }
} // namespace } // namespace

1
src/base/trace_event/malloc_dump_provider.cc
View File

@ -368,6 +368,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
&allocated_objects_count); &allocated_objects_count);
#elif BUILDFLAG(IS_FUCHSIA) #elif BUILDFLAG(IS_FUCHSIA)
// TODO(fuchsia): Port, see https://crbug.com/706592. // TODO(fuchsia): Port, see https://crbug.com/706592.
#elif defined(__MUSL__)
#else #else
ReportMallinfoStats(/*pmd=*/nullptr, &total_virtual_size, &resident_size, ReportMallinfoStats(/*pmd=*/nullptr, &total_virtual_size, &resident_size,
&allocated_objects_size, &allocated_objects_count); &allocated_objects_size, &allocated_objects_count);