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

Unified Diff: base/trace_event/malloc_dump_provider.cc

Issue 1105143003: [tracing] Simplify the MemoryAllocatorDump API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@simplif_2
Patch Set: Fix Win build Created 5 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/trace_event/java_heap_dump_provider_android.cc ('k') | base/trace_event/memory_allocator_dump.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/trace_event/malloc_dump_provider.cc
diff --git a/base/trace_event/malloc_dump_provider.cc b/base/trace_event/malloc_dump_provider.cc
index 50037c41832aa67028eb733fd883579c9a89ebf8..c04b8588c276137d019bdd2bffd42e7b9e7ee5ef 100644
--- a/base/trace_event/malloc_dump_provider.cc
+++ b/base/trace_event/malloc_dump_provider.cc
@@ -29,8 +29,7 @@ bool MallocDumpProvider::OnMemoryDump(ProcessMemoryDump* pmd) {
struct mallinfo info = mallinfo();
DCHECK_GE(info.arena + info.hblkhd, info.uordblks);
- MemoryAllocatorDump* dump =
- pmd->CreateAllocatorDump("malloc", MemoryAllocatorDump::kRootHeap);
+ MemoryAllocatorDump* dump = pmd->CreateAllocatorDump("malloc");
if (!dump)
return false;
@@ -39,13 +38,12 @@ bool MallocDumpProvider::OnMemoryDump(ProcessMemoryDump* pmd) {
// |arena| is 0 and the outer pages size is reported by |hblkhd|. In case of
// dlmalloc the total is given by |arena| + |hblkhd|.
// For more details see link: http://goo.gl/fMR8lF.
- dump->set_physical_size_in_bytes(info.arena + info.hblkhd);
-
- // mallinfo doesn't support any allocated object count.
- dump->set_allocated_objects_count(0);
+ dump->AddScalar(MemoryAllocatorDump::kNameOuterSize,
+ MemoryAllocatorDump::kUnitsBytes, info.arena + info.hblkhd);
// Total allocated space is given by |uordblks|.
- dump->set_allocated_objects_size_in_bytes(info.uordblks);
+ dump->AddScalar(MemoryAllocatorDump::kNameInnerSize,
+ MemoryAllocatorDump::kUnitsBytes, info.uordblks);
return true;
}
« no previous file with comments | « base/trace_event/java_heap_dump_provider_android.cc ('k') | base/trace_event/memory_allocator_dump.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698