summaryrefslogtreecommitdiffstats
path: root/content/gpu/gpu_watchdog_thread.h
diff options
context:
space:
mode:
authormarcheu@chromium.org <marcheu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-10 21:57:22 +0000
committermarcheu@chromium.org <marcheu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-10 21:57:22 +0000
commit53cf496aa216b5e2755a708668d507835bd98535 (patch)
treed3bde9d95e77420bbc32af57c6103b76f95888f0 /content/gpu/gpu_watchdog_thread.h
parentb01c2e162173be1a1226b9742344a0f4c5593ad9 (diff)
downloadchromium_src-53cf496aa216b5e2755a708668d507835bd98535.zip
chromium_src-53cf496aa216b5e2755a708668d507835bd98535.tar.gz
chromium_src-53cf496aa216b5e2755a708668d507835bd98535.tar.bz2
Don't kill the GPU process on Chrome OS if we're not on VT1
When Chrome OS is switched to VT2, the GPU process watchdog will eventually kick in and kill the GPU process. This would be fine, as this is only possible in dev mode, except for the fact that some people run dev mode and still report their crashes. This creates a lot of noise in the crash reports, which makes finding the real issues difficult. To fix this, we modify the GPU watchdog to check the active tty before killing the GPU process, and if the tty isn't 1, then we will leave it alone, assuming that we are simply on a dev-mode machine. BUG=chromium:222224 TEST=switch to VT2, wait 10 seconds, switch back: the GPU process didn't get killed TEST=crash the GPU while on VT1, the watchdog still triggers Review URL: https://codereview.chromium.org/25037011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228015 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/gpu/gpu_watchdog_thread.h')
-rw-r--r--content/gpu/gpu_watchdog_thread.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/content/gpu/gpu_watchdog_thread.h b/content/gpu/gpu_watchdog_thread.h
index 8731e41..db7978b 100644
--- a/content/gpu/gpu_watchdog_thread.h
+++ b/content/gpu/gpu_watchdog_thread.h
@@ -92,6 +92,10 @@ class GpuWatchdogThread : public base::Thread,
bool suspended_;
+#if defined(OS_CHROMEOS)
+ FILE* tty_file_;
+#endif
+
DISALLOW_COPY_AND_ASSIGN(GpuWatchdogThread);
};