diff options
author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-06 22:34:44 +0000 |
---|---|---|
committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-06 22:34:44 +0000 |
commit | 281d17a33e0d4059bffa3e4d85e563553d244f87 (patch) | |
tree | 2192ab8c43f21055fefd82d4ab5f9b3ea2239155 /chrome/gpu/gpu_watchdog_thread.h | |
parent | 5d1d6d841218a88cbfff5d65306331ae0beb2cfc (diff) | |
download | chromium_src-281d17a33e0d4059bffa3e4d85e563553d244f87.zip chromium_src-281d17a33e0d4059bffa3e4d85e563553d244f87.tar.gz chromium_src-281d17a33e0d4059bffa3e4d85e563553d244f87.tar.bz2 |
GPU process terminates on hang.
I added a watchdog thread that intermitently checks the main thread can respond to tasks posted on its message queue.
I fixed some bugs that preventede GGL from failing when the GPU channel was lost.
Added a command line swith to disable the watchdog thread for debugging purposes.
TEST=try, check WebGL works, check about:gpuhang terminates process.
BUG=38739,53871
Review URL: http://codereview.chromium.org/3528012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61718 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/gpu/gpu_watchdog_thread.h')
-rw-r--r-- | chrome/gpu/gpu_watchdog_thread.h | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/chrome/gpu/gpu_watchdog_thread.h b/chrome/gpu/gpu_watchdog_thread.h new file mode 100644 index 0000000..6dbbc32 --- /dev/null +++ b/chrome/gpu/gpu_watchdog_thread.h @@ -0,0 +1,40 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CHROME_GPU_GPU_WATCHDOG_THREAD_H_ +#define CHROME_GPU_GPU_WATCHDOG_THREAD_H_ + +#include "base/ref_counted.h" +#include "base/scoped_ptr.h" +#include "base/task.h" +#include "base/thread.h" + +// A thread that intermitently sends tasks to a group of watched message loops +// and deliberately crashes if one of them does not respond after a timeout. +class GpuWatchdogThread : public base::Thread, + public base::RefCountedThreadSafe<GpuWatchdogThread> { + public: + explicit GpuWatchdogThread(MessageLoop* watched_message_loop); + virtual ~GpuWatchdogThread(); + + protected: + virtual void Init(); + virtual void CleanUp(); + + private: + void OnAcknowledge(); + void OnCheck(); + void PostAcknowledge(); + void OnExit(); + void Disable(); + + MessageLoop* watched_message_loop_; + + typedef ScopedRunnableMethodFactory<GpuWatchdogThread> MethodFactory; + scoped_ptr<MethodFactory> method_factory_; + + DISALLOW_COPY_AND_ASSIGN(GpuWatchdogThread); +}; + +#endif // CHROME_GPU_GPU_WATCHDOG_THREAD_H_ |