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

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

Issue 1406213005: [tracing] Add names to memory-infra dumpers for debugging (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@memory-infra-runtime
Patch Set: Rebase + fix android Created 5 years, 1 month 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/memory_dump_manager.h" 5 #include "base/trace_event/memory_dump_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/atomic_sequence_num.h" 9 #include "base/atomic_sequence_num.h"
10 #include "base/base_switches.h" 10 #include "base/base_switches.h"
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 { 143 {
144 AutoLock lock(lock_); 144 AutoLock lock(lock_);
145 DCHECK(delegate); 145 DCHECK(delegate);
146 DCHECK(!delegate_); 146 DCHECK(!delegate_);
147 delegate_ = delegate; 147 delegate_ = delegate;
148 is_coordinator_ = is_coordinator; 148 is_coordinator_ = is_coordinator;
149 } 149 }
150 150
151 // Enable the core dump providers. 151 // Enable the core dump providers.
152 #if !defined(OS_NACL) 152 #if !defined(OS_NACL)
153 RegisterDumpProvider(ProcessMemoryTotalsDumpProvider::GetInstance()); 153 RegisterDumpProvider(ProcessMemoryTotalsDumpProvider::GetInstance(),
154 "ProcessMemoryTotals", nullptr);
154 #endif 155 #endif
155 156
156 #if defined(OS_LINUX) || defined(OS_ANDROID) 157 #if defined(OS_LINUX) || defined(OS_ANDROID)
157 RegisterDumpProvider(ProcessMemoryMapsDumpProvider::GetInstance()); 158 RegisterDumpProvider(ProcessMemoryMapsDumpProvider::GetInstance(),
158 RegisterDumpProvider(MallocDumpProvider::GetInstance()); 159 "ProcessMemoryMaps", nullptr);
160 RegisterDumpProvider(MallocDumpProvider::GetInstance(), "Malloc", nullptr);
159 #endif 161 #endif
160 162
161 #if defined(OS_ANDROID) 163 #if defined(OS_ANDROID)
162 RegisterDumpProvider(JavaHeapDumpProvider::GetInstance()); 164 RegisterDumpProvider(JavaHeapDumpProvider::GetInstance(), "JavaHeap",
165 nullptr);
163 #endif 166 #endif
164 167
165 #if defined(OS_WIN) 168 #if defined(OS_WIN)
166 RegisterDumpProvider(WinHeapDumpProvider::GetInstance()); 169 RegisterDumpProvider(WinHeapDumpProvider::GetInstance(), "WinHeap", nullptr);
167 #endif 170 #endif
168 171
169 // If tracing was enabled before initializing MemoryDumpManager, we missed the 172 // If tracing was enabled before initializing MemoryDumpManager, we missed the
170 // OnTraceLogEnabled() event. Synthetize it so we can late-join the party. 173 // OnTraceLogEnabled() event. Synthetize it so we can late-join the party.
171 bool is_tracing_already_enabled = TraceLog::GetInstance()->IsEnabled(); 174 bool is_tracing_already_enabled = TraceLog::GetInstance()->IsEnabled();
172 TRACE_EVENT0(kTraceCategory, "init"); // Add to trace-viewer category list. 175 TRACE_EVENT0(kTraceCategory, "init"); // Add to trace-viewer category list.
173 TraceLog::GetInstance()->AddEnabledStateObserver(this); 176 TraceLog::GetInstance()->AddEnabledStateObserver(this);
174 if (is_tracing_already_enabled) 177 if (is_tracing_already_enabled)
175 OnTraceLogEnabled(); 178 OnTraceLogEnabled();
176 } 179 }
(...skipping 15 matching lines...) Expand all
192 // collection but flagged |unregistered|. 195 // collection but flagged |unregistered|.
193 if (!iter_new.second) { 196 if (!iter_new.second) {
194 dump_providers_.erase(iter_new.first); 197 dump_providers_.erase(iter_new.first);
195 dump_providers_.insert(mdp_info); 198 dump_providers_.insert(mdp_info);
196 } 199 }
197 200
198 if (heap_profiling_enabled_) 201 if (heap_profiling_enabled_)
199 mdp->OnHeapProfilingEnabled(true); 202 mdp->OnHeapProfilingEnabled(true);
200 } 203 }
201 204
202 void MemoryDumpManager::RegisterDumpProvider(
203 MemoryDumpProvider* mdp,
204 const scoped_refptr<SingleThreadTaskRunner>& task_runner) {
205 RegisterDumpProvider(mdp, "unknown", task_runner);
206 }
207
208 void MemoryDumpManager::RegisterDumpProvider(MemoryDumpProvider* mdp) {
209 RegisterDumpProvider(mdp, nullptr);
210 }
211
212 void MemoryDumpManager::UnregisterDumpProvider(MemoryDumpProvider* mdp) { 205 void MemoryDumpManager::UnregisterDumpProvider(MemoryDumpProvider* mdp) {
213 AutoLock lock(lock_); 206 AutoLock lock(lock_);
214 207
215 auto mdp_iter = dump_providers_.begin(); 208 auto mdp_iter = dump_providers_.begin();
216 for (; mdp_iter != dump_providers_.end(); ++mdp_iter) { 209 for (; mdp_iter != dump_providers_.end(); ++mdp_iter) {
217 if (mdp_iter->dump_provider == mdp) 210 if (mdp_iter->dump_provider == mdp)
218 break; 211 break;
219 } 212 }
220 213
221 if (mdp_iter == dump_providers_.end()) 214 if (mdp_iter == dump_providers_.end())
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 req_args(req_args), 571 req_args(req_args),
579 next_dump_provider(next_dump_provider), 572 next_dump_provider(next_dump_provider),
580 callback(callback), 573 callback(callback),
581 task_runner(MessageLoop::current()->task_runner()) {} 574 task_runner(MessageLoop::current()->task_runner()) {}
582 575
583 MemoryDumpManager::ProcessMemoryDumpAsyncState::~ProcessMemoryDumpAsyncState() { 576 MemoryDumpManager::ProcessMemoryDumpAsyncState::~ProcessMemoryDumpAsyncState() {
584 } 577 }
585 578
586 } // namespace trace_event 579 } // namespace trace_event
587 } // namespace base 580 } // namespace base
OLDNEW
« no previous file with comments | « base/trace_event/memory_dump_manager.h ('k') | base/trace_event/memory_dump_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698