Merge branch 'wip/ckampm/wip-fix-compatibility-da'

include/ConstantAccessor.h

@@ -21,6 +21,11 @@ namespace ChimeraTK {
     : ChimeraTK::NDRegisterAccessor<UserType>("UnnamedConstantAccessor", accessModeFlags), _value(length, value) {
       ChimeraTK::NDRegisterAccessor<UserType>::buffer_2D.resize(1);
       ChimeraTK::NDRegisterAccessor<UserType>::buffer_2D[0] = _value;
+
+      if(TransferElement::_accessModeFlags.has(AccessMode::wait_for_new_data)) {
+        TransferElement::_readQueue = cppext::future_queue<void>(1);
+        //TransferElement::_readQueue.push(value);
+      }
     }
 
     ~ConstantAccessor() {}

include/ConsumingFanOut.h

@@ -43,7 +43,9 @@ namespace ChimeraTK {
     void interrupt() override {
       // call the interrut sequences of the fan out (interrupts for fan input and all outputs), and the ndRegisterAccessor
       FanOut<UserType>::interrupt();
-      ChimeraTK::NDRegisterAccessor<UserType>::interrupt();
+      if(this->_accessModeFlags.has(AccessMode::wait_for_new_data)) {
+        ChimeraTK::NDRegisterAccessor<UserType>::interrupt();
+      }
     }
 
    protected:

include/FanOut.h

@@ -51,10 +51,14 @@ namespace ChimeraTK {
     // interrupt the input and all slaves
     virtual void interrupt() {
       if(impl) {
-        impl->interrupt();
+        if(impl->getAccessModeFlags().has(AccessMode::wait_for_new_data)) {
+          impl->interrupt();
+        }
       }
       for(auto& slave : slaves) {
-        slave->interrupt();
+        if(slave->getAccessModeFlags().has(AccessMode::wait_for_new_data)) {
+          slave->interrupt();
+        }
       }
     }
 

include/FeedingFanOut.h

@@ -63,6 +63,8 @@ namespace ChimeraTK {
       _withReturn(withReturn) {
       ChimeraTK::NDRegisterAccessor<UserType>::buffer_2D.resize(1);
       ChimeraTK::NDRegisterAccessor<UserType>::buffer_2D[0].resize(numberOfElements);
+
+      TransferElement::_readQueue = cppext::future_queue<void>(1);
     }
 
     /** Add a slave to the FanOut. Only sending end-points of a consuming node may
@@ -96,6 +98,8 @@ namespace ChimeraTK {
           // As this becomes the implemention of the feeding output, the flags are determined by that slave accessor
           // In other cases, the information is not relevant because the feeding node is on output which is never read
           ChimeraTK::NDRegisterAccessor<UserType>::_accessModeFlags = _returnSlave->getAccessModeFlags();
+
+          TransferElement::_readQueue = _returnSlave->getReadQueue();
         }
       }
 
@@ -222,7 +226,9 @@ namespace ChimeraTK {
     void interrupt() override {
       // call the interrut sequences of the fan out (interrupts for fan input and all outputs), and the ndRegisterAccessor
       FanOut<UserType>::interrupt();
-      ChimeraTK::NDRegisterAccessor<UserType>::interrupt();
+      if(this->_accessModeFlags.has(AccessMode::wait_for_new_data)) {
+        ChimeraTK::NDRegisterAccessor<UserType>::interrupt();
+      }
     }
 
    protected:

include/TestableModeAccessorDecorator.h

@@ -114,8 +114,9 @@ namespace ChimeraTK {
     }
 
     /** Implement callback called by TransferFuture before it blocks in wait() */
-    // TODO Removed in TE spec. Call preRead isntead, see F.4
-    //void transferFutureWaitCallback() override { releaseLock(); }
+    // TODO Removed in TE spec. Call preRead isntead, see F.4 Still, has to
+    // handle multiple calls to preRead in readAny()
+    void doPreRead(TransferType /*type*/) override { releaseLock(); }
 
     /** Obtain the testableModeLock if not owned yet, and decrement the counter.
      */

include/TriggerFanOut.h

@@ -49,7 +49,9 @@ namespace ChimeraTK {
     void deactivate() override {
       if(_thread.joinable()) {
         _thread.interrupt();
-        externalTrigger->interrupt();
+        if(externalTrigger->getAccessModeFlags().has(AccessMode::wait_for_new_data)) {
+          externalTrigger->interrupt();
+        }
         _deviceModule.notify();
         _thread.join();
       }

src/ApplicationModule.cc

@@ -63,7 +63,10 @@ namespace ChimeraTK {
       while(!moduleThread.try_join_for(boost::chrono::milliseconds(10))) {
         // if thread is not yet joined, send interrupt() to all variables.
         for(auto& var : getAccessorListRecursive()) {
-          var.getAppAccessorNoType().getHighLevelImplElement()->interrupt();
+          auto el{var.getAppAccessorNoType().getHighLevelImplElement()};
+          if(el->getAccessModeFlags().has(AccessMode::wait_for_new_data)) {
+            el->interrupt();
+          }
         }
         // it may not suffice to send interrupt() once, as the exception might get
         // overwritten in the queue, thus we repeat this until the thread was