diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-08-25 11:44:41 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-08-25 17:08:46 +0000 |
| commit | 74bc7cb59c1bc3f7acdb4d1492fe563ebcefee6c (patch) | |
| tree | ace620d6fc0b106045e45c96dee94dfcadedb5d6 /vcl/source/app/svmain.cxx | |
| parent | 7bb7539c0e34283baeaacf7e4ff0b19287afadc2 (diff) | |
tdf#93614 - detect hanging OpenGL drivers with a watchdog.
If an OpenGL zone takes >2s to make progress, disable OpenGL.
If an OpenGL zone takes >5s to make progress, abort the app.
Change-Id: I776c06a3f8ba460ff9842a9130c21f9ee2147eee
Reviewed-on: https://gerrit.libreoffice.org/17986
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'vcl/source/app/svmain.cxx')
| -rw-r--r-- | vcl/source/app/svmain.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 7b6c778f3972..b5aca4281ae9 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -82,6 +82,7 @@ #include "uno/current_context.hxx" #include "opengl/zone.hxx" +#include "opengl/watchdog.hxx" #if OSL_DEBUG_LEVEL > 0 #include <typeinfo> @@ -189,7 +190,10 @@ int ImplSVMain() pSVData->mxAccessBridge.clear(); } + OpenGLWatchdogThread::stop(); + DeInitVCL(); + return nReturn; } |