Merge branch 'iss135'

include/DeviceModule.h

@@ -116,6 +116,7 @@ namespace ChimeraTK {
      * handling is done internally by ApplicationCore.
      * This functions is blocking until the Device reports isFunctional() again.*/
     void reportException(std::string errMsg);
+    void waitForRecovery();
 
     void prepare() override;
 

include/TriggerFanOut.h

@@ -108,7 +108,9 @@ namespace ChimeraTK {
             lastValidity = DataValidity::faulty;
             boost::fusion::for_each(fanOutMap.table, SendDataToConsumers(version, lastValidity));
           }
+//          _deviceModule.reportException(e.what());
           _deviceModule.reportException(e.what());
+          _deviceModule.waitForRecovery();
           goto retry;
         }
         // send the version number to the consumers

src/DeviceModule.cc

@@ -220,6 +220,7 @@ namespace ChimeraTK {
     return virtualisedModuleFromCatalog;
   }
 
+
   /*********************************************************************************************************************/
 
   void DeviceModule::reportException(std::string errMsg) {
@@ -248,16 +249,36 @@ namespace ChimeraTK {
         errorLock.unlock();
       }
 
-      //Wait until the error condition has been cleared by the exception handling thread.
-      //We must not hold the testable mode mutex while doing so, otherwise the other thread will never run to fulfill the condition
-      owner->testableModeUnlock("waitForDeviceOK");
-      errorLock.lock();
-      while(deviceHasError) {
-        errorIsResolvedCondVar.wait(errorLock);
-        boost::this_thread::interruption_point();
+    }
+    catch(...) {
+      //catch any to notify the waiting thread(s) (exception handling thread), then re-throw
+      errorIsReportedCondVar.notify_all();
+      throw;
+    }
+  }
+
+  /*********************************************************************************************************************/
+
+  void DeviceModule::waitForRecovery() {
+    try {
+      if(owner->isTestableModeEnabled()) {
+        assert(owner->testableModeTestLock());
       }
+
+      // see waitForException
+      std::unique_lock<std::mutex> errorLock(errorMutex);
       errorLock.unlock();
-      owner->testableModeLock("continueAfterException");
+
+      //Wait until the error condition has been cleared by the exception handling thread.
+      //We must not hold the testable mode mutex while doing so, otherwise the other thread will never run to fulfill the condition
+            owner->testableModeUnlock("waitForDeviceOK");
+            errorLock.lock();
+            while(deviceHasError) {
+              errorIsResolvedCondVar.wait(errorLock);
+              boost::this_thread::interruption_point();
+            }
+            errorLock.unlock();
+            owner->testableModeLock("continueAfterException");
     }
     catch(...) {
       //catch any to notify the waiting thread(s) (exception handling thread), then re-throw

src/ExceptionHandlingDecorator.cc

@@ -76,7 +76,9 @@ namespace ChimeraTK {
       }
       catch(ChimeraTK::runtime_error& e) {
         setOwnerValidityFunction(/*hasExceptionNow = */ true);
+//        deviceModule.reportException(e.what());
         deviceModule.reportException(e.what());
+        deviceModule.waitForRecovery();
       }
     }
   }