Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Side by Side Diff: base/trace_event/malloc_dump_provider.cc

Issue 1191893002: [tracing] Fix malloc accounting in memory-infra (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/trace_event/malloc_dump_provider.h" 5 #include "base/trace_event/malloc_dump_provider.h"
6 6
7 #include <malloc.h> 7 #include <malloc.h>
8 8
9 #include "base/trace_event/process_memory_dump.h" 9 #include "base/trace_event/process_memory_dump.h"
10 10
(...skipping 14 matching lines...) Expand all
25 25
26 MallocDumpProvider::~MallocDumpProvider() { 26 MallocDumpProvider::~MallocDumpProvider() {
27 } 27 }
28 28
29 // Called at trace dump point time. Creates a snapshot the memory counters for 29 // Called at trace dump point time. Creates a snapshot the memory counters for
30 // the current process. 30 // the current process.
31 bool MallocDumpProvider::OnMemoryDump(ProcessMemoryDump* pmd) { 31 bool MallocDumpProvider::OnMemoryDump(ProcessMemoryDump* pmd) {
32 struct mallinfo info = mallinfo(); 32 struct mallinfo info = mallinfo();
33 DCHECK_GE(info.arena + info.hblkhd, info.uordblks); 33 DCHECK_GE(info.arena + info.hblkhd, info.uordblks);
34 34
35 // When the system allocator is implemented by tcmalloc, the total physical 35 // When the system allocator is implemented by tcmalloc, the total heap
36 // size is given by |arena| and |hblkhd| is 0. In case of Android's jemalloc 36 // size is given by |arena| and |hblkhd| is 0. In case of Android's jemalloc
37 // |arena| is 0 and the outer pages size is reported by |hblkhd|. In case of 37 // |arena| is 0 and the outer pages size is reported by |hblkhd|. In case of
38 // dlmalloc the total is given by |arena| + |hblkhd|. 38 // dlmalloc the total is given by |arena| + |hblkhd|.
39 // For more details see link: http://goo.gl/fMR8lF. 39 // For more details see link: http://goo.gl/fMR8lF.
40 MemoryAllocatorDump* outer_dump = pmd->CreateAllocatorDump("malloc"); 40 MemoryAllocatorDump* outer_dump = pmd->CreateAllocatorDump("malloc");
41 outer_dump->AddScalar(MemoryAllocatorDump::kNameSize, 41 outer_dump->AddScalar("heap_virtual_size",
42 MemoryAllocatorDump::kUnitsBytes, 42 MemoryAllocatorDump::kUnitsBytes,
43 info.arena + info.hblkhd); 43 info.arena + info.hblkhd);
44 44
45 // Total allocated space is given by |uordblks|. 45 // Total allocated space is given by |uordblks|.
46 MemoryAllocatorDump* inner_dump = pmd->CreateAllocatorDump(kAllocatedObjects); 46 MemoryAllocatorDump* inner_dump = pmd->CreateAllocatorDump(kAllocatedObjects);
47 inner_dump->AddScalar(MemoryAllocatorDump::kNameSize, 47 inner_dump->AddScalar(MemoryAllocatorDump::kNameSize,
48 MemoryAllocatorDump::kUnitsBytes, info.uordblks); 48 MemoryAllocatorDump::kUnitsBytes, info.uordblks);
49 49
50 return true; 50 return true;
51 } 51 }
52 52
53 } // namespace trace_event 53 } // namespace trace_event
54 } // namespace base 54 } // namespace base
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698