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

Unified Diff: base/trace_event/process_memory_dump.cc

Issue 1095003002: [tracing] Simplify design of MemoryAllocatorDump (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@matr_2_sess
Patch Set: Rebase 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/process_memory_dump.h ('k') | base/trace_event/trace_event.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/trace_event/process_memory_dump.cc
diff --git a/base/trace_event/process_memory_dump.cc b/base/trace_event/process_memory_dump.cc
index d646ef3653e3cb48af192eefea0e1270b6627b05..836d6ae7d4378897fa177dacee45ae8114cb3cb1 100644
--- a/base/trace_event/process_memory_dump.cc
+++ b/base/trace_event/process_memory_dump.cc
@@ -21,23 +21,21 @@ ProcessMemoryDump::~ProcessMemoryDump() {
}
MemoryAllocatorDump* ProcessMemoryDump::CreateAllocatorDump(
- const std::string& name) {
- return CreateAllocatorDump(name, nullptr);
-}
-
-MemoryAllocatorDump* ProcessMemoryDump::CreateAllocatorDump(
- const std::string& name,
- MemoryAllocatorDump* parent) {
- DCHECK_EQ(0ul, allocator_dumps_.count(name));
- MemoryAllocatorDump* mad = new MemoryAllocatorDump(name, parent);
+ const std::string& allocator_name,
+ const std::string& heap_name) {
+ MemoryAllocatorDump* mad =
+ new MemoryAllocatorDump(allocator_name, heap_name, this);
+ DCHECK_EQ(0ul, allocator_dumps_.count(mad->GetAbsoluteName()));
allocator_dumps_storage_.push_back(mad);
- allocator_dumps_[name] = mad;
+ allocator_dumps_[mad->GetAbsoluteName()] = mad;
return mad;
}
MemoryAllocatorDump* ProcessMemoryDump::GetAllocatorDump(
- const std::string& name) const {
- auto it = allocator_dumps_.find(name);
+ const std::string& allocator_name,
+ const std::string& heap_name) const {
+ auto it = allocator_dumps_.find(
+ MemoryAllocatorDump::GetAbsoluteName(allocator_name, heap_name));
return it == allocator_dumps_.end() ? nullptr : it->second;
}
« no previous file with comments | « base/trace_event/process_memory_dump.h ('k') | base/trace_event/trace_event.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698