mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve debugger/valgrind handling in watchdog

Browse Source 
This way it'll avoid incorrect lock-up detection also if the debugger
is attached later when LO is already running.

Change-Id: I9b762ee439a62631036ad2f09f4396cca0b5ba6b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88609
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
This commit is contained in:
Luboš Luňák
2020-02-12 18:16:16 +01:00
parent a2e0abc7c6
commit e0a94e9625
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
vcl/source/app/watchdog.cxx
View File

@@ -114,6 +114,15 @@ void WatchdogThread::execute()
gpWatchdogExit->wait(&aQuarterSecond); gpWatchdogExit->wait(&aQuarterSecond);
#if defined HAVE_VALGRIND_HEADERS
if (RUNNING_ON_VALGRIND)
continue;
#endif
#if defined DBG_UTIL
if (comphelper::isDebuggerAttached())
continue;
#endif
#if HAVE_FEATURE_OPENGL #if HAVE_FEATURE_OPENGL
WatchdogHelper<OpenGLZone>::check(); WatchdogHelper<OpenGLZone>::check();
#endif #endif
@@ -130,14 +139,6 @@ void WatchdogThread::start()
return; // already running return; // already running
if (getenv("SAL_DISABLE_WATCHDOG")) if (getenv("SAL_DISABLE_WATCHDOG"))
return; return;
#if defined HAVE_VALGRIND_HEADERS
if (RUNNING_ON_VALGRIND)
return;
#endif
#if defined DBG_UTIL
if (comphelper::isDebuggerAttached())
return;
#endif
gpWatchdogExit = new osl::Condition(); gpWatchdogExit = new osl::Condition();
gxWatchdog.set(new WatchdogThread()); gxWatchdog.set(new WatchdogThread());
gxWatchdog->launch(); gxWatchdog->launch();