diff options
Diffstat (limited to 'community/chromium/no-mallinfo.patch')
| -rw-r--r-- | community/chromium/no-mallinfo.patch | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/community/chromium/no-mallinfo.patch b/community/chromium/no-mallinfo.patch index 0dadb3b480..7ce835b096 100644 --- a/community/chromium/no-mallinfo.patch +++ b/community/chromium/no-mallinfo.patch @@ -9,20 +9,32 @@ size_t GetMemoryUsageKB() { struct mallinfo minfo = mallinfo(); uint64_t mem_usage = ---- ./base/trace_event/malloc_dump_provider.cc +--- ./base/trace_event/malloc_dump_provider.cc.orig +++ ./base/trace_event/malloc_dump_provider.cc -@@ -30,6 +30,7 @@ - // the current process. - bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, - ProcessMemoryDump* pmd) { +@@ -55,6 +55,7 @@ + res = get_property_function("generic.current_allocated_bytes", + &allocated_objects_size); + DCHECK(res); +#if defined(__GLIBC__) - struct mallinfo info = mallinfo(); - DCHECK_GE(info.arena + info.hblkhd, info.uordblks); + } else { + struct mallinfo info = mallinfo(); + DCHECK_GE(info.arena + info.hblkhd, info.uordblks); +@@ -65,9 +66,11 @@ + total_virtual_size = info.arena + info.hblkhd; + resident_size = info.uordblks; + allocated_objects_size = info.uordblks; ++#endif + } + #endif -@@ -47,6 +48,7 @@ - MemoryAllocatorDump* inner_dump = pmd->CreateAllocatorDump(kAllocatedObjects); ++#if defined(__GLIBC__) + MemoryAllocatorDump* outer_dump = pmd->CreateAllocatorDump("malloc"); + outer_dump->AddScalar("virtual_size", MemoryAllocatorDump::kUnitsBytes, + total_virtual_size); +@@ -79,6 +82,7 @@ inner_dump->AddScalar(MemoryAllocatorDump::kNameSize, - MemoryAllocatorDump::kUnitsBytes, info.uordblks); + MemoryAllocatorDump::kUnitsBytes, + allocated_objects_size); +#endif return true; |