OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/performance_monitor/performance_monitor.h" | 5 #include "chrome/browser/performance_monitor/performance_monitor.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <utility> |
8 | 9 |
9 #include "base/memory/singleton.h" | 10 #include "base/memory/singleton.h" |
10 #include "base/process/process_iterator.h" | 11 #include "base/process/process_iterator.h" |
11 #include "base/strings/utf_string_conversions.h" | 12 #include "base/strings/utf_string_conversions.h" |
12 #include "base/time/time.h" | 13 #include "base/time/time.h" |
13 #include "content/public/browser/browser_child_process_host.h" | 14 #include "content/public/browser/browser_child_process_host.h" |
14 #include "content/public/browser/browser_child_process_host_iterator.h" | 15 #include "content/public/browser/browser_child_process_host_iterator.h" |
15 #include "content/public/browser/browser_thread.h" | 16 #include "content/public/browser/browser_thread.h" |
16 #include "content/public/browser/child_process_data.h" | 17 #include "content/public/browser/child_process_data.h" |
17 #include "content/public/browser/render_process_host.h" | 18 #include "content/public/browser/render_process_host.h" |
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
162 | 163 |
163 // Add the current (browser) process. | 164 // Add the current (browser) process. |
164 ProcessMetricsMetadata browser_process_data; | 165 ProcessMetricsMetadata browser_process_data; |
165 browser_process_data.process_type = content::PROCESS_TYPE_BROWSER; | 166 browser_process_data.process_type = content::PROCESS_TYPE_BROWSER; |
166 browser_process_data.handle = base::GetCurrentProcessHandle(); | 167 browser_process_data.handle = base::GetCurrentProcessHandle(); |
167 process_data_list->push_back(browser_process_data); | 168 process_data_list->push_back(browser_process_data); |
168 | 169 |
169 BrowserThread::PostTask( | 170 BrowserThread::PostTask( |
170 BrowserThread::UI, FROM_HERE, | 171 BrowserThread::UI, FROM_HERE, |
171 base::Bind(&PerformanceMonitor::MarkProcessesAsAliveOnUIThread, | 172 base::Bind(&PerformanceMonitor::MarkProcessesAsAliveOnUIThread, |
172 base::Unretained(this), base::Passed(process_data_list.Pass()), | 173 base::Unretained(this), |
| 174 base::Passed(std::move(process_data_list)), |
173 current_update_sequence)); | 175 current_update_sequence)); |
174 } | 176 } |
175 | 177 |
176 void PerformanceMonitor::MarkProcessesAsAliveOnUIThread( | 178 void PerformanceMonitor::MarkProcessesAsAliveOnUIThread( |
177 scoped_ptr<std::vector<ProcessMetricsMetadata>> process_data_list, | 179 scoped_ptr<std::vector<ProcessMetricsMetadata>> process_data_list, |
178 int current_update_sequence) { | 180 int current_update_sequence) { |
179 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 181 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
180 for (size_t i = 0; i < process_data_list->size(); ++i) { | 182 for (size_t i = 0; i < process_data_list->size(); ++i) { |
181 MarkProcessAsAlive((*process_data_list)[i], current_update_sequence); | 183 MarkProcessAsAlive((*process_data_list)[i], current_update_sequence); |
182 } | 184 } |
(...skipping 27 matching lines...) Expand all Loading... |
210 void PerformanceMonitor::RunTriggersUIThread() { | 212 void PerformanceMonitor::RunTriggersUIThread() { |
211 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 213 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
212 for (auto it = metrics_map_.begin(); it != metrics_map_.end(); ++it) { | 214 for (auto it = metrics_map_.begin(); it != metrics_map_.end(); ++it) { |
213 it->second.RunPerformanceTriggers(); | 215 it->second.RunPerformanceTriggers(); |
214 } | 216 } |
215 | 217 |
216 StartGatherCycle(); | 218 StartGatherCycle(); |
217 } | 219 } |
218 | 220 |
219 } // namespace performance_monitor | 221 } // namespace performance_monitor |
OLD | NEW |