Use INDI:SingleThreadPool - Deadlock fix (#362)

indilib · Mar 22, 2021 · a15898c · a15898c
1 parent 99ec370
commit a15898c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 79 deletions.
diff --git a/indi-asi/asi_ccd.cpp b/indi-asi/asi_ccd.cpp
@@ -993,7 +993,7 @@ bool ASICCD::activateCooler(bool enable)
 
 bool ASICCD::StartExposure(float duration)
 {
-    mWorker.run(std::bind(&ASICCD::workerExposure, this, std::placeholders::_1, duration));
+    mWorker.start(std::bind(&ASICCD::workerExposure, this, std::placeholders::_1, duration));
     return true;
 }
 
@@ -1034,7 +1034,7 @@ bool ASICCD::StartStreaming()
         }
     }
 #endif
-    mWorker.run(std::bind(&ASICCD::workerStreamVideo, this, std::placeholders::_1));
+    mWorker.start(std::bind(&ASICCD::workerStreamVideo, this, std::placeholders::_1));
     return true;
 }
 

diff --git a/indi-asi/asi_ccd.h b/indi-asi/asi_ccd.h
@@ -27,7 +27,7 @@
 #include "indipropertyswitch.h"
 #include "indipropertynumber.h"
 #include "indipropertytext.h"
-#include "singleworker_tmp.h"
+#include "indisinglethreadpool.h"
 
 #include <vector>
 
@@ -81,7 +81,7 @@ class ASICCD : public INDI::CCD
     const char *getBayerString() const;
 
 private:
-    Temporary::SingleWorker mWorker;
+    INDI::SingleThreadPool mWorker;
     void workerStreamVideo(const std::atomic_bool &isAboutToQuit);
     void workerBlinkExposure(const std::atomic_bool &isAboutToQuit, int blinks, float duration);
     void workerExposure(const std::atomic_bool &isAboutToQuit, float duration);

diff --git a/indi-asi/singleworker_tmp.h b/indi-asi/singleworker_tmp.h