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

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

Issue 1262333005: [tracing] Introduce MemoryDumpArgs to enable light and heavy dumps (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 5 years, 4 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
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 10 matching lines...) Expand all
21 } 21 }
22 22
23 MallocDumpProvider::MallocDumpProvider() { 23 MallocDumpProvider::MallocDumpProvider() {
24 } 24 }
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(const MemoryDumpArgs& args,
32 ProcessMemoryDump* pmd) {
32 struct mallinfo info = mallinfo(); 33 struct mallinfo info = mallinfo();
33 DCHECK_GE(info.arena + info.hblkhd, info.uordblks); 34 DCHECK_GE(info.arena + info.hblkhd, info.uordblks);
34 35
35 // When the system allocator is implemented by tcmalloc, the total heap 36 // 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 37 // 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 38 // |arena| is 0 and the outer pages size is reported by |hblkhd|. In case of
38 // dlmalloc the total is given by |arena| + |hblkhd|. 39 // dlmalloc the total is given by |arena| + |hblkhd|.
39 // For more details see link: http://goo.gl/fMR8lF. 40 // For more details see link: http://goo.gl/fMR8lF.
40 MemoryAllocatorDump* outer_dump = pmd->CreateAllocatorDump("malloc"); 41 MemoryAllocatorDump* outer_dump = pmd->CreateAllocatorDump("malloc");
41 outer_dump->AddScalar("heap_virtual_size", 42 outer_dump->AddScalar("heap_virtual_size",
42 MemoryAllocatorDump::kUnitsBytes, 43 MemoryAllocatorDump::kUnitsBytes,
43 info.arena + info.hblkhd); 44 info.arena + info.hblkhd);
44 45
45 // Total allocated space is given by |uordblks|. 46 // Total allocated space is given by |uordblks|.
46 MemoryAllocatorDump* inner_dump = pmd->CreateAllocatorDump(kAllocatedObjects); 47 MemoryAllocatorDump* inner_dump = pmd->CreateAllocatorDump(kAllocatedObjects);
47 inner_dump->AddScalar(MemoryAllocatorDump::kNameSize, 48 inner_dump->AddScalar(MemoryAllocatorDump::kNameSize,
48 MemoryAllocatorDump::kUnitsBytes, info.uordblks); 49 MemoryAllocatorDump::kUnitsBytes, info.uordblks);
49 50
50 return true; 51 return true;
51 } 52 }
52 53
53 } // namespace trace_event 54 } // namespace trace_event
54 } // namespace base 55 } // namespace base
OLDNEW
« no previous file with comments | « base/trace_event/malloc_dump_provider.h ('k') | base/trace_event/memory_allocator_dump_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698