blob: 3ea66e475d8a87ffc5003a337660786ce5f82fb9 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
|
--- 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;
-#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
@@ -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(OS_LINUX) && defined(__GLIBC__) || defined(OS_ANDROID)
size_t GetMemoryUsageKB() {
struct mallinfo minfo = mallinfo();
uint64_t mem_usage =
|
