diff options
| author | Carlo Landmeter <clandmeter@gmail.com> | 2015-10-22 15:59:16 +0200 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@gmail.com> | 2015-10-22 15:59:38 +0200 |
| commit | 3321ebfe8d85bddce205cba4b52e9b1da956776a (patch) | |
| tree | 16df163fc4fb2171f1a45fc0478ceaaead632a28 /community/chromium/no-mallinfo.patch | |
| parent | 1aecb7a940aa7f6224e384fa3d1becf08c962367 (diff) | |
| download | aports-3321ebfe8d85bddce205cba4b52e9b1da956776a.tar.bz2 aports-3321ebfe8d85bddce205cba4b52e9b1da956776a.tar.xz | |
community/chromium: upgrade to 46.0.2490.71
Diffstat (limited to 'community/chromium/no-mallinfo.patch')
| -rw-r--r-- | community/chromium/no-mallinfo.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/community/chromium/no-mallinfo.patch b/community/chromium/no-mallinfo.patch index 6e1063084a..0dadb3b480 100644 --- a/community/chromium/no-mallinfo.patch +++ b/community/chromium/no-mallinfo.patch @@ -9,17 +9,17 @@ size_t GetMemoryUsageKB() { struct mallinfo minfo = mallinfo(); uint64_t mem_usage = ---- ./base/trace_event/malloc_dump_provider.cc.orig +--- ./base/trace_event/malloc_dump_provider.cc +++ ./base/trace_event/malloc_dump_provider.cc -@@ -29,6 +29,7 @@ - // Called at trace dump point time. Creates a snapshot the memory counters for +@@ -30,6 +30,7 @@ // the current process. - bool MallocDumpProvider::OnMemoryDump(ProcessMemoryDump* pmd) { + bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, + ProcessMemoryDump* pmd) { +#if defined(__GLIBC__) struct mallinfo info = mallinfo(); DCHECK_GE(info.arena + info.hblkhd, info.uordblks); -@@ -46,6 +47,7 @@ +@@ -47,6 +48,7 @@ MemoryAllocatorDump* inner_dump = pmd->CreateAllocatorDump(kAllocatedObjects); inner_dump->AddScalar(MemoryAllocatorDump::kNameSize, MemoryAllocatorDump::kUnitsBytes, info.uordblks); |