Chromium Code Reviews

Side by Side Diff: trace_event/malloc_dump_provider.cc

Issue 2045223003: Update to Chromium //base at Chromium commit 82baa9afc6620c68cb2168f20bb65e77e3e57f0a. (Closed) Base URL: https://github.com/domokit/base.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
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 21 matching lines...)
32 ProcessMemoryDump* pmd) { 32 ProcessMemoryDump* pmd) {
33 struct mallinfo info = mallinfo(); 33 struct mallinfo info = mallinfo();
34 DCHECK_GE(info.arena + info.hblkhd, info.uordblks); 34 DCHECK_GE(info.arena + info.hblkhd, info.uordblks);
35 35
36 // When the system allocator is implemented by tcmalloc, the total heap 36 // When the system allocator is implemented by tcmalloc, the total heap
37 // 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
38 // |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
39 // dlmalloc the total is given by |arena| + |hblkhd|. 39 // dlmalloc the total is given by |arena| + |hblkhd|.
40 // For more details see link: http://goo.gl/fMR8lF. 40 // For more details see link: http://goo.gl/fMR8lF.
41 MemoryAllocatorDump* outer_dump = pmd->CreateAllocatorDump("malloc"); 41 MemoryAllocatorDump* outer_dump = pmd->CreateAllocatorDump("malloc");
42 outer_dump->AddScalar("heap_virtual_size", MemoryAllocatorDump::kUnitsBytes, 42 outer_dump->AddScalar("virtual_size", 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 | « trace_event/java_heap_dump_provider_android_unittest.cc ('k') | trace_event/memory_allocator_dump.h » ('j') | no next file with comments »

Powered by Google App Engine