1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
|
--- 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 =
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
@@ -1821,6 +1821,49 @@ static size_t GetMallocUsage() {
}
} // namespace
+#elif defined(OS_LINUX) && !defined(__GLIBC__)
+namespace {
+
+static size_t GetMallocUsage() {
+ char *line=NULL;
+ size_t n,usage=0;
+ FILE *f = fopen("/proc/self/maps", "r");
+ char *path, *perm;
+ if (f == NULL) {
+ perror("/proc/self/maps");
+ return 0;
+ }
+ path = (char *)malloc(PATH_MAX+16);
+ if (path == NULL)
+ goto out;
+ perm = path + PATH_MAX;
+
+ while (getline(&line, &n, f) >=0) {
+ size_t start,end,offset,inode;
+ int devmaj, devmin, items;
+
+ items = sscanf(line, "%zx-%zx %s %zx %x:%x %zu %s",
+ &start, &end, perm, &offset,
+ &devmaj, &devmin, &inode, path);
+
+ if (items < 7)
+ continue;
+
+ if (items < 8)
+ path[0] = '\0';
+
+ if ((strcmp(perm, "rw-p") == 0 && devmaj+devmin == 0)
+ && (path[0] == '\0' || strcmp(path, "[heap]") == 0))
+ usage += end-start;
+ }
+ free(line);
+ free(path);
+out:
+ fclose(f);
+ return usage;
+}
+
+} // 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);
-#if defined(OS_LINUX) || defined(OS_ANDROID)
+#if (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_ANDROID)
struct mallinfo minfo = mallinfo();
#if defined(USE_TCMALLOC)
size_t malloc_usage = minfo.uordblks;
|
