diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-08-28 02:43:12 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-08-28 02:48:24 +0000 |
| commit | 4321d98a3c9eed570fe04872e5d133c5d011be92 (patch) | |
| tree | 29b939fa9c133b448c5d40802f869a87b27f7fe5 /community/chromium/no-mallinfo.patch | |
| parent | 712aae449ebc46ea0fb31db103ced0633a958df1 (diff) | |
| download | aports-4321d98a3c9eed570fe04872e5d133c5d011be92.tar.bz2 aports-4321d98a3c9eed570fe04872e5d133c5d011be92.tar.xz | |
community/chromium: upgrade to 52.0.2743.116
Diffstat (limited to 'community/chromium/no-mallinfo.patch')
| -rw-r--r-- | community/chromium/no-mallinfo.patch | 38 |
1 files changed, 11 insertions, 27 deletions
diff --git a/community/chromium/no-mallinfo.patch b/community/chromium/no-mallinfo.patch index be571d40ad..965cddb2eb 100644 --- a/community/chromium/no-mallinfo.patch +++ b/community/chromium/no-mallinfo.patch @@ -1,38 +1,22 @@ ---- ./base/trace_event/malloc_dump_provider.cc.orig -+++ ./base/trace_event/malloc_dump_provider.cc -@@ -61,7 +61,7 @@ +--- a/base/trace_event/malloc_dump_provider.cc.orig 2016-05-08 08:04:01.166374018 +0200 ++++ b/base/trace_event/malloc_dump_provider.cc 2016-05-08 08:05:07.846264723 +0200 +@@ -61,7 +61,7 @@ bool MallocDumpProvider::OnMemoryDump(co // fixed quantum, so the excess region will not be resident. // See crrev.com/1531463004 for detailed explanation. resident_size = stats.max_size_in_use; -#else -+#elif defined(__GLIBC__) ++#elif defined(OS_LINUX) && defined(__GLIBC__) struct mallinfo info = mallinfo(); DCHECK_GE(info.arena + info.hblkhd, info.uordblks); -@@ -73,6 +73,7 @@ - allocated_objects_size = info.uordblks; - #endif - -+#if defined(USE_TCMALLOC) || defined(__GLIBC__) || defined(OS_MACOSX) || defined(OS_IOS) - MemoryAllocatorDump* outer_dump = pmd->CreateAllocatorDump("malloc"); - outer_dump->AddScalar("virtual_size", MemoryAllocatorDump::kUnitsBytes, - total_virtual_size); -@@ -95,6 +96,7 @@ - MemoryAllocatorDump::kUnitsBytes, - resident_size - allocated_objects_size); - } -+#endif - - return true; - } ---- ./content/child/content_child_helpers.cc -+++ ./content/child/content_child_helpers.cc -@@ -18,7 +18,7 @@ - - namespace content { - +--- a/content/child/content_child_helpers.cc.orig 2016-05-08 08:05:37.415219394 +0200 ++++ b/content/child/content_child_helpers.cc 2016-05-08 08:06:27.110142484 +0200 +@@ -24,7 +24,7 @@ namespace content { + // though, this provides only a partial and misleading value. + // Unfortunately some telemetry benchmark rely on it and these need to + // be refactored before getting rid of this. See crbug.com/581365 . -#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(_GLIBC_) || defined(OS_ANDROID) ++#if defined(OS_LINUX) && defined(__GLIBC__) || defined(OS_ANDROID) size_t GetMemoryUsageKB() { struct mallinfo minfo = mallinfo(); uint64_t mem_usage = |