2016-04-05 17:20:59 +00:00
|
|
|
--- ./base/trace_event/malloc_dump_provider.cc.orig
|
|
|
|
|
+++ ./base/trace_event/malloc_dump_provider.cc
|
|
|
|
|
@@ -61,7 +61,7 @@
|
|
|
|
|
// 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__)
|
|
|
|
|
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
|
2015-11-27 16:02:40 +00:00
|
|
|
+++ ./content/child/content_child_helpers.cc
|
2016-04-05 17:20:59 +00:00
|
|
|
@@ -18,7 +18,7 @@
|
2015-11-27 16:02:40 +00:00
|
|
|
|
|
|
|
|
namespace content {
|
|
|
|
|
|
|
|
|
|
-#if defined(OS_LINUX) || defined(OS_ANDROID)
|
|
|
|
|
+#if defined(__GLIBC__) || defined(OS_ANDROID)
|
|
|
|
|
size_t GetMemoryUsageKB() {
|
|
|
|
|
struct mallinfo minfo = mallinfo();
|
|
|
|
|
uint64_t mem_usage =
|
