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

Side by Side Diff: content/gpu/gpu_watchdog_thread.cc

Issue 2396093003: Revert of Verify if GPU message pump is signaled when it hangs in WaitForWork (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 2 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 | « base/message_loop/message_pump_win.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "content/gpu/gpu_watchdog_thread.h" 5 #include "content/gpu/gpu_watchdog_thread.h"
6 6
7 #include <errno.h> 7 #include <errno.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 339
340 base::debug::Alias(&interrupt_delay); 340 base::debug::Alias(&interrupt_delay);
341 base::debug::Alias(&current_cpu_time); 341 base::debug::Alias(&current_cpu_time);
342 base::debug::Alias(&time_since_arm); 342 base::debug::Alias(&time_since_arm);
343 343
344 bool using_thread_ticks = base::ThreadTicks::IsSupported(); 344 bool using_thread_ticks = base::ThreadTicks::IsSupported();
345 base::debug::Alias(&using_thread_ticks); 345 base::debug::Alias(&using_thread_ticks);
346 346
347 bool using_high_res_timer = base::Time::IsHighResolutionTimerInUse(); 347 bool using_high_res_timer = base::Time::IsHighResolutionTimerInUse();
348 base::debug::Alias(&using_high_res_timer); 348 base::debug::Alias(&using_high_res_timer);
349
350 bool message_pump_is_signaled =
351 watched_message_loop_->MessagePumpWasSignaled();
352 base::debug::Alias(&message_pump_is_signaled);
353 #endif 349 #endif
354 350
355 base::Time current_time = base::Time::Now(); 351 base::Time current_time = base::Time::Now();
356 base::TimeTicks current_timeticks = base::TimeTicks::Now(); 352 base::TimeTicks current_timeticks = base::TimeTicks::Now();
357 base::debug::Alias(&current_time); 353 base::debug::Alias(&current_time);
358 base::debug::Alias(&current_timeticks); 354 base::debug::Alias(&current_timeticks);
359 355
360 LOG(ERROR) << "The GPU process hung. Terminating after " 356 LOG(ERROR) << "The GPU process hung. Terminating after "
361 << timeout_.InMilliseconds() << " ms."; 357 << timeout_.InMilliseconds() << " ms.";
362 358
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 int tty_number; 460 int tty_number;
465 size_t num_res = sscanf(tty_string, "tty%d\n", &tty_number); 461 size_t num_res = sscanf(tty_string, "tty%d\n", &tty_number);
466 if (num_res == 1) 462 if (num_res == 1)
467 return tty_number; 463 return tty_number;
468 } 464 }
469 return -1; 465 return -1;
470 } 466 }
471 #endif 467 #endif
472 468
473 } // namespace content 469 } // namespace content
OLDNEW
« no previous file with comments | « base/message_loop/message_pump_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698