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

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: 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");
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");
160 RegisterDumpProvider(MallocDumpProvider::GetInstance(), "Malloc");
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");
163 #endif 165 #endif
164 166
165 #if defined(OS_WIN) 167 #if defined(OS_WIN)
166 RegisterDumpProvider(WinHeapDumpProvider::GetInstance()); 168 RegisterDumpProvider(WinHeapDumpProvider::GetInstance(), "WinHeap");
167 #endif 169 #endif
168 170
169 // If tracing was enabled before initializing MemoryDumpManager, we missed the 171 // If tracing was enabled before initializing MemoryDumpManager, we missed the
170 // OnTraceLogEnabled() event. Synthetize it so we can late-join the party. 172 // OnTraceLogEnabled() event. Synthetize it so we can late-join the party.
171 bool is_tracing_already_enabled = TraceLog::GetInstance()->IsEnabled(); 173 bool is_tracing_already_enabled = TraceLog::GetInstance()->IsEnabled();
172 TRACE_EVENT0(kTraceCategory, "init"); // Add to trace-viewer category list. 174 TRACE_EVENT0(kTraceCategory, "init"); // Add to trace-viewer category list.
173 TraceLog::GetInstance()->AddEnabledStateObserver(this); 175 TraceLog::GetInstance()->AddEnabledStateObserver(this);
174 if (is_tracing_already_enabled) 176 if (is_tracing_already_enabled)
175 OnTraceLogEnabled(); 177 OnTraceLogEnabled();
176 } 178 }
(...skipping 15 matching lines...) Expand all
192 // collection but flagged |unregistered|. 194 // collection but flagged |unregistered|.
193 if (!iter_new.second) { 195 if (!iter_new.second) {
194 dump_providers_.erase(iter_new.first); 196 dump_providers_.erase(iter_new.first);
195 dump_providers_.insert(mdp_info); 197 dump_providers_.insert(mdp_info);
196 } 198 }
197 199
198 if (heap_profiling_enabled_) 200 if (heap_profiling_enabled_)
199 mdp->OnHeapProfilingEnabled(true); 201 mdp->OnHeapProfilingEnabled(true);
200 } 202 }
201 203
202 void MemoryDumpManager::RegisterDumpProvider( 204 void MemoryDumpManager::RegisterDumpProvider(MemoryDumpProvider* mdp,
203 MemoryDumpProvider* mdp, 205 const char* name) {
204 const scoped_refptr<SingleThreadTaskRunner>& task_runner) { 206 RegisterDumpProvider(mdp, name, nullptr);
205 RegisterDumpProvider(mdp, "unknown", task_runner);
206 }
207
208 void MemoryDumpManager::RegisterDumpProvider(MemoryDumpProvider* mdp) {
209 RegisterDumpProvider(mdp, nullptr);
210 } 207 }
211 208
212 void MemoryDumpManager::UnregisterDumpProvider(MemoryDumpProvider* mdp) { 209 void MemoryDumpManager::UnregisterDumpProvider(MemoryDumpProvider* mdp) {
213 AutoLock lock(lock_); 210 AutoLock lock(lock_);
214 211
215 auto mdp_iter = dump_providers_.begin(); 212 auto mdp_iter = dump_providers_.begin();
216 for (; mdp_iter != dump_providers_.end(); ++mdp_iter) { 213 for (; mdp_iter != dump_providers_.end(); ++mdp_iter) {
217 if (mdp_iter->dump_provider == mdp) 214 if (mdp_iter->dump_provider == mdp)
218 break; 215 break;
219 } 216 }
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 req_args(req_args), 564 req_args(req_args),
568 next_dump_provider(next_dump_provider), 565 next_dump_provider(next_dump_provider),
569 callback(callback), 566 callback(callback),
570 task_runner(MessageLoop::current()->task_runner()) {} 567 task_runner(MessageLoop::current()->task_runner()) {}
571 568
572 MemoryDumpManager::ProcessMemoryDumpAsyncState::~ProcessMemoryDumpAsyncState() { 569 MemoryDumpManager::ProcessMemoryDumpAsyncState::~ProcessMemoryDumpAsyncState() {
573 } 570 }
574 571
575 } // namespace trace_event 572 } // namespace trace_event
576 } // namespace base 573 } // namespace base
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698