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 <stdlib.h> | 5 #include <stdlib.h> |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <windows.h> | 8 #include <windows.h> |
9 #endif | 9 #endif |
10 | 10 |
11 #include "base/debug/trace_event.h" | 11 #include "base/debug/trace_event.h" |
12 #include "base/lazy_instance.h" | 12 #include "base/lazy_instance.h" |
13 #include "base/message_loop.h" | 13 #include "base/message_loop.h" |
| 14 #include "base/power_monitor/power_monitor.h" |
14 #include "base/rand_util.h" | 15 #include "base/rand_util.h" |
15 #include "base/strings/string_number_conversions.h" | 16 #include "base/strings/string_number_conversions.h" |
16 #include "base/strings/stringprintf.h" | 17 #include "base/strings/stringprintf.h" |
17 #include "base/threading/platform_thread.h" | 18 #include "base/threading/platform_thread.h" |
18 #include "build/build_config.h" | 19 #include "build/build_config.h" |
19 #include "content/child/child_process.h" | 20 #include "content/child/child_process.h" |
20 #include "content/common/gpu/gpu_config.h" | 21 #include "content/common/gpu/gpu_config.h" |
21 #include "content/common/gpu/gpu_messages.h" | 22 #include "content/common/gpu/gpu_messages.h" |
| 23 #include "content/common/power_monitor_broadcast_source.h" |
22 #include "content/common/sandbox_linux.h" | 24 #include "content/common/sandbox_linux.h" |
23 #include "content/gpu/gpu_child_thread.h" | 25 #include "content/gpu/gpu_child_thread.h" |
24 #include "content/gpu/gpu_process.h" | 26 #include "content/gpu/gpu_process.h" |
25 #include "content/gpu/gpu_watchdog_thread.h" | 27 #include "content/gpu/gpu_watchdog_thread.h" |
26 #include "content/public/common/content_client.h" | 28 #include "content/public/common/content_client.h" |
27 #include "content/public/common/content_switches.h" | 29 #include "content/public/common/content_switches.h" |
28 #include "content/public/common/main_function_params.h" | 30 #include "content/public/common/main_function_params.h" |
29 #include "crypto/hmac.h" | 31 #include "crypto/hmac.h" |
30 #include "gpu/config/gpu_info_collector.h" | 32 #include "gpu/config/gpu_info_collector.h" |
31 #include "ui/gl/gl_implementation.h" | 33 #include "ui/gl/gl_implementation.h" |
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
162 #endif | 164 #endif |
163 | 165 |
164 bool delayed_watchdog_enable = false; | 166 bool delayed_watchdog_enable = false; |
165 | 167 |
166 #if defined(OS_CHROMEOS) | 168 #if defined(OS_CHROMEOS) |
167 // Don't start watchdog immediately, to allow developers to switch to VT2 on | 169 // Don't start watchdog immediately, to allow developers to switch to VT2 on |
168 // startup. | 170 // startup. |
169 delayed_watchdog_enable = true; | 171 delayed_watchdog_enable = true; |
170 #endif | 172 #endif |
171 | 173 |
| 174 PowerMonitorBroadcastSource* power_monitor_source = |
| 175 new PowerMonitorBroadcastSource(); |
| 176 base::PowerMonitor power_monitor(power_monitor_source); |
172 scoped_refptr<GpuWatchdogThread> watchdog_thread; | 177 scoped_refptr<GpuWatchdogThread> watchdog_thread; |
173 | 178 |
174 // Start the GPU watchdog only after anything that is expected to be time | 179 // Start the GPU watchdog only after anything that is expected to be time |
175 // consuming has completed, otherwise the process is liable to be aborted. | 180 // consuming has completed, otherwise the process is liable to be aborted. |
176 if (enable_watchdog && !delayed_watchdog_enable) { | 181 if (enable_watchdog && !delayed_watchdog_enable) { |
177 watchdog_thread = new GpuWatchdogThread(kGpuTimeout); | 182 watchdog_thread = new GpuWatchdogThread(kGpuTimeout); |
178 watchdog_thread->Start(); | 183 watchdog_thread->Start(); |
179 } | 184 } |
180 | 185 |
181 gpu::GPUInfo gpu_info; | 186 gpu::GPUInfo gpu_info; |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
279 } | 284 } |
280 | 285 |
281 logging::SetLogMessageHandler(NULL); | 286 logging::SetLogMessageHandler(NULL); |
282 | 287 |
283 GpuProcess gpu_process; | 288 GpuProcess gpu_process; |
284 | 289 |
285 GpuChildThread* child_thread = new GpuChildThread(watchdog_thread.get(), | 290 GpuChildThread* child_thread = new GpuChildThread(watchdog_thread.get(), |
286 dead_on_arrival, | 291 dead_on_arrival, |
287 gpu_info, | 292 gpu_info, |
288 deferred_messages.Get()); | 293 deferred_messages.Get()); |
| 294 |
| 295 child_thread->channel()->AddFilter(power_monitor_source->MessageFilter()); |
| 296 |
289 while (!deferred_messages.Get().empty()) | 297 while (!deferred_messages.Get().empty()) |
290 deferred_messages.Get().pop(); | 298 deferred_messages.Get().pop(); |
291 | 299 |
292 child_thread->Init(start_time); | 300 child_thread->Init(start_time); |
293 | 301 |
294 gpu_process.set_main_thread(child_thread); | 302 gpu_process.set_main_thread(child_thread); |
295 | 303 |
296 { | 304 { |
297 TRACE_EVENT0("gpu", "Run Message Loop"); | 305 TRACE_EVENT0("gpu", "Run Message Loop"); |
298 main_message_loop.Run(); | 306 main_message_loop.Run(); |
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
426 return true; | 434 return true; |
427 } | 435 } |
428 | 436 |
429 return false; | 437 return false; |
430 } | 438 } |
431 #endif // defined(OS_WIN) | 439 #endif // defined(OS_WIN) |
432 | 440 |
433 } // namespace. | 441 } // namespace. |
434 | 442 |
435 } // namespace content | 443 } // namespace content |
OLD | NEW |