tdf#102295: remove mutex - use atomic for watchdog timings

Change-Id: I6587bad8b7906faeae39735343278b10be78c05b

1 files changed, 24 insertions, 22 deletions

diff --git a/vcl/inc/opengl/watchdog.hxx b/vcl/inc/opengl/watchdog.hxx
index ced3cf23fbd6..c266de62f7dc 100644
--- a/vcl/inc/opengl/watchdog.hxx
+++ b/vcl/inc/opengl/watchdog.hxx
@@ -14,40 +14,42 @@
 #include <sal/types.h>
 #include <rtl/ref.hxx>
 #include <salhelper/thread.hxx>
-#include <osl/mutex.hxx>
+#include <atomic>
 
-struct WatchdogTimings
+struct WatchdogTimingsValues
 {
-    osl::Mutex maMutex;
-
-    int mnMode;
-
     /// delays to take various actions in 1/4 of a second increments.
-    std::vector<int> maDisableEntries;
-    std::vector<int> maAbortAfter;
+    int mnDisableEntries;
+    int mnAbortAfter;
+};
 
-    WatchdogTimings();
+enum class WatchdogTimingMode
+{
+    NORMAL,
+    SHADER_COMPILE
+};
 
-    void relax();
+class WatchdogTimings
+{
+private:
+    std::vector<WatchdogTimingsValues> maTimingValues;
+    std::atomic<bool> mbRelaxed;
 
-    int getMode()
-    {
-        return mnMode;
-    }
+public:
+    WatchdogTimings();
 
-    void setMode(int nMode)
+    void setRelax(bool bRelaxed)
     {
-        mnMode = nMode;
+        mbRelaxed = bRelaxed;
     }
 
-    int getDisableEntries()
+    WatchdogTimingsValues getWatchdogTimingsValues(WatchdogTimingMode eMode)
     {
-       return maDisableEntries[mnMode];
-    }
+        size_t index = 0;
+        index = (eMode == WatchdogTimingMode::SHADER_COMPILE) ? 1 : 0;
+        index = mbRelaxed ? index + 2 : index;
 
-    int getAbortAfter()
-    {
-        return maAbortAfter[mnMode];
+        return maTimingValues[index];
     }
 };