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

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

Issue 1101853002: Revert of Add a WinHeap dump provider to the memory profiler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 unified diff | Download patch
« no previous file with comments | « no previous file | base/trace_event/trace_event.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/trace_event/memory_dump_provider.h" 11 #include "base/trace_event/memory_dump_provider.h"
12 #include "base/trace_event/memory_dump_session_state.h" 12 #include "base/trace_event/memory_dump_session_state.h"
13 #include "base/trace_event/process_memory_dump.h" 13 #include "base/trace_event/process_memory_dump.h"
14 #include "base/trace_event/trace_event_argument.h" 14 #include "base/trace_event/trace_event_argument.h"
15 15
16 #if defined(OS_LINUX) || defined(OS_ANDROID) 16 #if defined(OS_LINUX) || defined(OS_ANDROID)
17 #include "base/trace_event/malloc_dump_provider.h" 17 #include "base/trace_event/malloc_dump_provider.h"
18 #include "base/trace_event/process_memory_maps_dump_provider.h" 18 #include "base/trace_event/process_memory_maps_dump_provider.h"
19 #include "base/trace_event/process_memory_totals_dump_provider.h" 19 #include "base/trace_event/process_memory_totals_dump_provider.h"
20 #elif defined(OS_WIN)
21 #include "base/trace_event/winheap_dump_provider_win.h"
22 #endif 20 #endif
23 21
24 namespace base { 22 namespace base {
25 namespace trace_event { 23 namespace trace_event {
26 24
27 namespace { 25 namespace {
28 26
29 // TODO(primiano): this should be smarter and should do something similar to 27 // TODO(primiano): this should be smarter and should do something similar to
30 // trace event synthetic delays. 28 // trace event synthetic delays.
31 const char kTraceCategory[] = TRACE_DISABLED_BY_DEFAULT("memory-infra"); 29 const char kTraceCategory[] = TRACE_DISABLED_BY_DEFAULT("memory-infra");
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 trace_event::TraceLog::GetInstance()->AddEnabledStateObserver(this); 158 trace_event::TraceLog::GetInstance()->AddEnabledStateObserver(this);
161 159
162 if (skip_core_dumpers_auto_registration_for_testing_) 160 if (skip_core_dumpers_auto_registration_for_testing_)
163 return; 161 return;
164 162
165 #if defined(OS_LINUX) || defined(OS_ANDROID) 163 #if defined(OS_LINUX) || defined(OS_ANDROID)
166 // Enable the core dump providers. 164 // Enable the core dump providers.
167 RegisterDumpProvider(ProcessMemoryTotalsDumpProvider::GetInstance()); 165 RegisterDumpProvider(ProcessMemoryTotalsDumpProvider::GetInstance());
168 RegisterDumpProvider(ProcessMemoryMapsDumpProvider::GetInstance()); 166 RegisterDumpProvider(ProcessMemoryMapsDumpProvider::GetInstance());
169 RegisterDumpProvider(MallocDumpProvider::GetInstance()); 167 RegisterDumpProvider(MallocDumpProvider::GetInstance());
170 #elif defined(OS_WIN)
171 RegisterDumpProvider(WinHeapDumpProvider::GetInstance());
172 #endif 168 #endif
173 } 169 }
174 170
175 void MemoryDumpManager::SetDelegate(MemoryDumpManagerDelegate* delegate) { 171 void MemoryDumpManager::SetDelegate(MemoryDumpManagerDelegate* delegate) {
176 AutoLock lock(lock_); 172 AutoLock lock(lock_);
177 DCHECK_EQ(static_cast<MemoryDumpManagerDelegate*>(nullptr), delegate_); 173 DCHECK_EQ(static_cast<MemoryDumpManagerDelegate*>(nullptr), delegate_);
178 delegate_ = delegate; 174 delegate_ = delegate;
179 } 175 }
180 176
181 void MemoryDumpManager::RegisterDumpProvider(MemoryDumpProvider* mdp) { 177 void MemoryDumpManager::RegisterDumpProvider(MemoryDumpProvider* mdp) {
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 void MemoryDumpManager::OnTraceLogDisabled() { 361 void MemoryDumpManager::OnTraceLogDisabled() {
366 AutoLock lock(lock_); 362 AutoLock lock(lock_);
367 periodic_dump_timer_.Stop(); 363 periodic_dump_timer_.Stop();
368 dump_providers_enabled_.clear(); 364 dump_providers_enabled_.clear();
369 subtle::NoBarrier_Store(&memory_tracing_enabled_, 0); 365 subtle::NoBarrier_Store(&memory_tracing_enabled_, 0);
370 session_state_ = nullptr; 366 session_state_ = nullptr;
371 } 367 }
372 368
373 } // namespace trace_event 369 } // namespace trace_event
374 } // namespace base 370 } // namespace base
OLDNEW
« no previous file with comments | « no previous file | base/trace_event/trace_event.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698