diff options
Diffstat (limited to 'community/chromium/no-mallinfo.patch')
| -rw-r--r-- | community/chromium/no-mallinfo.patch | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/community/chromium/no-mallinfo.patch b/community/chromium/no-mallinfo.patch index ceaf009295..306c64b622 100644 --- a/community/chromium/no-mallinfo.patch +++ b/community/chromium/no-mallinfo.patch @@ -1,16 +1,16 @@ ---- base/trace_event/malloc_dump_provider.cc.orig 2016-11-16 02:19:56.753320143 +0100 -+++ base/trace_event/malloc_dump_provider.cc 2016-11-16 02:13:58.286196506 +0100 -@@ -224,7 +224,7 @@ - resident_size = all_heap_info.committed_size; - allocated_objects_size = all_heap_info.allocated_size; - allocated_objects_count = all_heap_info.block_count; +--- base/trace_event/malloc_dump_provider.cc.orig ++++ base/trace_event/malloc_dump_provider.cc +@@ -187,7 +187,7 @@ + resident_size = main_heap_info.committed_size; + allocated_objects_size = main_heap_info.allocated_size; + allocated_objects_count = main_heap_info.block_count; -#else +#elif defined(OS_LINUX) && defined(__GLIBC__) struct mallinfo info = mallinfo(); DCHECK_GE(info.arena + info.hblkhd, info.uordblks); - ---- content/child/content_child_helpers.cc.orig 2016-05-08 08:05:37.415219394 +0200 -+++ content/child/content_child_helpers.cc 2016-05-08 08:06:27.110142484 +0200 + +--- content/child/content_child_helpers.cc.orig ++++ content/child/content_child_helpers.cc @@ -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 @@ -20,13 +20,11 @@ size_t GetMemoryUsageKB() { struct mallinfo minfo = mallinfo(); uint64_t mem_usage = -diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc -index d569350..6edcffe 100644 ---- content/renderer/render_thread_impl.cc +--- content/renderer/render_thread_impl.cc.orig +++ content/renderer/render_thread_impl.cc -@@ -1821,6 +1821,49 @@ static size_t GetMallocUsage() { +@@ -1712,6 +1712,49 @@ } - + } // namespace +#elif defined(OS_LINUX) && !defined(__GLIBC__) +namespace { @@ -72,12 +70,12 @@ index d569350..6edcffe 100644 + +} // namespace #endif - - // TODO(tasak): Once it is possible to use memory-infra without tracing, -@@ -1839,7 +1882,7 @@ void RenderThreadImpl::RecordPurgeAndSuspendMetrics() const { - blink_stats.partitionAllocTotalAllocatedBytes / 1024); - UMA_HISTOGRAM_MEMORY_KB("PurgeAndSuspend.Memory.BlinkGCKB", - blink_stats.blinkGCTotalAllocatedBytes / 1024); + + void RenderThreadImpl::GetRendererMemoryMetrics( +@@ -1722,7 +1765,7 @@ + memory_metrics->partition_alloc_kb = + blink_stats.partitionAllocTotalAllocatedBytes / 1024; + memory_metrics->blink_gc_kb = blink_stats.blinkGCTotalAllocatedBytes / 1024; -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_ANDROID) struct mallinfo minfo = mallinfo(); |