| OLD | NEW |
| 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 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/atomic_sequence_num.h" | 10 #include "base/atomic_sequence_num.h" |
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 192 const MemoryDumpProvider::Options& options) { | 192 const MemoryDumpProvider::Options& options) { |
| 193 if (dumper_registrations_ignored_for_testing_) | 193 if (dumper_registrations_ignored_for_testing_) |
| 194 return; | 194 return; |
| 195 | 195 |
| 196 scoped_refptr<MemoryDumpProviderInfo> mdpinfo = | 196 scoped_refptr<MemoryDumpProviderInfo> mdpinfo = |
| 197 new MemoryDumpProviderInfo(mdp, name, task_runner, options); | 197 new MemoryDumpProviderInfo(mdp, name, task_runner, options); |
| 198 | 198 |
| 199 { | 199 { |
| 200 AutoLock lock(lock_); | 200 AutoLock lock(lock_); |
| 201 bool already_registered = !dump_providers_.insert(mdpinfo).second; | 201 bool already_registered = !dump_providers_.insert(mdpinfo).second; |
| 202 // This actually happen in some tests which don't have a clean tear-down | 202 // This actually happens in some tests which don't have a clean tear-down |
| 203 // path for RenderThreadImpl::Init(). | 203 // path for RenderThreadImpl::Init(). |
| 204 if (already_registered) | 204 if (already_registered) |
| 205 return; | 205 return; |
| 206 } | 206 } |
| 207 | 207 |
| 208 if (heap_profiling_enabled_) | 208 if (heap_profiling_enabled_) |
| 209 mdp->OnHeapProfilingEnabled(true); | 209 mdp->OnHeapProfilingEnabled(true); |
| 210 } | 210 } |
| 211 | 211 |
| 212 void MemoryDumpManager::RegisterDumpProvider( | 212 void MemoryDumpManager::RegisterDumpProvider( |
| (...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 617 auto iter = process_dumps.find(pid); | 617 auto iter = process_dumps.find(pid); |
| 618 if (iter == process_dumps.end()) { | 618 if (iter == process_dumps.end()) { |
| 619 scoped_ptr<ProcessMemoryDump> new_pmd(new ProcessMemoryDump(session_state)); | 619 scoped_ptr<ProcessMemoryDump> new_pmd(new ProcessMemoryDump(session_state)); |
| 620 iter = process_dumps.insert(std::make_pair(pid, std::move(new_pmd))).first; | 620 iter = process_dumps.insert(std::make_pair(pid, std::move(new_pmd))).first; |
| 621 } | 621 } |
| 622 return iter->second.get(); | 622 return iter->second.get(); |
| 623 } | 623 } |
| 624 | 624 |
| 625 } // namespace trace_event | 625 } // namespace trace_event |
| 626 } // namespace base | 626 } // namespace base |
| OLD | NEW |