ensure equipment thread terminated when desctructor called

Author: sy-c

src/ReadoutEquipmentCruEmulator.cxx

@@ -138,7 +138,9 @@ ReadoutEquipmentCruEmulator::ReadoutEquipmentCruEmulator(ConfigFile& cfg, std::s
   payloadDistrib = std::normal_distribution<> (cfgPayloadSize, cfgPayloadSizeStdev * cfgPayloadSize);
 }
 
-ReadoutEquipmentCruEmulator::~ReadoutEquipmentCruEmulator() {}
+ReadoutEquipmentCruEmulator::~ReadoutEquipmentCruEmulator() {
+  abortThread();
+}
 
 Thread::CallbackResult ReadoutEquipmentCruEmulator::prepareBlocks()
 {

src/ReadoutEquipmentDummy.cxx

@@ -58,7 +58,9 @@ ReadoutEquipmentDummy::ReadoutEquipmentDummy(ConfigFile& cfg, std::string cfgEnt
   }
 }
 
-ReadoutEquipmentDummy::~ReadoutEquipmentDummy() {}
+ReadoutEquipmentDummy::~ReadoutEquipmentDummy() {
+  abortThread();
+}
 
 DataBlockContainerReference ReadoutEquipmentDummy::getNextBlock()
 {

src/ReadoutEquipmentPlayer.cxx

@@ -187,6 +187,7 @@ ReadoutEquipmentPlayer::ReadoutEquipmentPlayer(ConfigFile& cfg, std::string cfgE
 
 ReadoutEquipmentPlayer::~ReadoutEquipmentPlayer()
 {
+  abortThread();
   fpLock.lock();
   if (fp != nullptr) {
     fclose(fp);

src/ReadoutEquipmentRORC.cxx

@@ -195,7 +195,9 @@ ReadoutEquipmentRORC::ReadoutEquipmentRORC(ConfigFile& cfg, std::string name) :
   isInitialized = true;
 }
 
-ReadoutEquipmentRORC::~ReadoutEquipmentRORC() {}
+ReadoutEquipmentRORC::~ReadoutEquipmentRORC() {
+    abortThread();
+}
 
 Thread::CallbackResult ReadoutEquipmentRORC::prepareBlocks()
 {

src/ReadoutEquipmentZmq.cxx

@@ -193,6 +193,7 @@ ReadoutEquipmentZmq::ReadoutEquipmentZmq(ConfigFile& cfg, std::string cfgEntryPo
 
 ReadoutEquipmentZmq::~ReadoutEquipmentZmq()
 {
+  abortThread();
 
   // stopping snapshot thread
   if (snapshotThread != nullptr) {

src/mainReadout.cxx

@@ -1640,6 +1640,10 @@ int Readout::reset()
 
   theLog.log(LogInfoDevel, "Releasing readout devices");
   for (size_t i = 0, size = readoutDevices.size(); i != size; ++i) {
+    if (readoutDevices[i] != nullptr) {
+      // ensure readout equipment threads stopped before releasing resources
+      readoutDevices[i]->abortThread();
+    }
     readoutDevices[i] = nullptr; // effectively deletes the device
   }
   readoutDevices.clear();