Merge pull request #274 from sy-c/master

v2.22.0

Author: sy-c

doc/releaseNotes.md

@@ -609,3 +609,6 @@ This file describes the main feature changes for each readout.exe released versi
 
 ## v2.21.9 - 06/12/2023
 - When equipment-*-rdhCheckFirstOrbit is set (default), the run is stopped if the first RDH received for an equipment does not passes validation, as in the case when first orbits mismatch.
+
+## v2.22.0 - 30/01/2024
+- consumer-FairMQChannel: fix for DD TF ordering. In case of start/stop/start with parameter threads>1, there were some "non-continuous ordering" warnings due to a missing counter reset.

src/ConsumerFMQchannel.cxx

@@ -209,7 +209,6 @@ class ConsumerFMQchannel : public Consumer
   std::unique_ptr<std::thread> senderThread; // this one empties the output FIFOs of the wThreads
   bool senderThreadIsRunning;
   int wThreadIxWrite = 0; // push data round-robin in wThreads
-  int wThreadIxRead = 0; // read data round-robin in wThreads
   void cleanupThreads() {
     if (nwThreads) {
       wThreadShutdown = 1;
@@ -1372,6 +1371,8 @@ int ConsumerFMQchannel::start() {
 
   currentTimeframeId = undefinedTimeframeId;
 
+  wThreadIxWrite = 0;
+
   return Consumer::start();
 }
 int ConsumerFMQchannel::stop() {
@@ -1428,6 +1429,9 @@ int ConsumerFMQchannel::stop() {
     theLog.log(LogInfoSupport_(3235), "Consumer %s - %llu incomplete TF dropped", name.c_str(), (unsigned long long)TFdropped);
   }
 
+  // ensure wThread fifos in/out are empty
+  // this is done continuously in the (!isRunning) case of the worker threads and the sender thread
+
   // wait threads completed
   return Consumer::stop();
 }

src/ReadoutVersion.h

@@ -9,5 +9,5 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#define READOUT_VERSION "2.21.9"
+#define READOUT_VERSION "2.22.0"