use tbb concurrent queue because unpacking can go on in parallel

Author: smorovic

EventFilter/Utilities/interface/DAQSourceModelsFRD.h

@@ -3,6 +3,7 @@
 
 #include <filesystem>
 #include <queue>
+#include "oneapi/tbb/concurrent_unordered_set.h"
 
 #include "EventFilter/Utilities/interface/DAQSourceModels.h"
 #include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
@@ -169,8 +170,8 @@ class DataModeFRDPreUnpack : public DataMode {
   uint16_t MINTCDSuTCAFEDID_ = FEDNumbering::MINTCDSuTCAFEDID;
   uint16_t MAXTCDSuTCAFEDID_ = FEDNumbering::MAXTCDSuTCAFEDID;
   bool eventCached_ = false;
-  std::unordered_set<unsigned short> fedIdSet_;
-  unsigned int expectedFedsInEvent_ = 0;
+  oneapi::tbb::concurrent_unordered_set<unsigned short> fedIdSet_;
+  std::atomic<unsigned int> expectedFedsInEvent_ = 0;
   bool verifyFEDs_ = true;
 };
 

EventFilter/Utilities/interface/FedRawDataInputSource.h

@@ -185,7 +185,7 @@ class FedRawDataInputSource : public edm::RawInputSource {
 
   std::map<unsigned int, unsigned int> sourceEventsReport_;
   std::mutex monlock_;
-  expectedFedsInEvent_ = 0;
+  unsigned int expectedFedsInEvent_ = 0;
 };
 
 #endif  // EventFilter_Utilities_FedRawDataInputSource_h

EventFilter/Utilities/src/FedRawDataInputSource.cc

@@ -658,7 +658,7 @@ edm::Timestamp FedRawDataInputSource::fillFEDRawDataCollection(FEDRawDataCollect
   tcds_pointer_ = nullptr;
   tcdsInRange = false;
   uint16_t selectedTCDSFed = 0;
-  fedsInEvent = 0;
+  unsigned int fedsInEvent = 0;
   while (eventSize > 0) {
     assert(eventSize >= FEDTrailer::length);
     eventSize -= FEDTrailer::length;
@@ -706,7 +706,7 @@ edm::Timestamp FedRawDataInputSource::fillFEDRawDataCollection(FEDRawDataCollect
 
   if (fedsInEvent != expectedFedsInEvent_ && expectedFedsInEvent_)
     edm::LogWarning("DataModeFRDStriped:::fillFRDCollection")
-        << "Event " << events_.at(0)->event() << " does not contain same number of FEDs as previous: "
+        << "Event " << event_->event() << " does not contain same number of FEDs as previous: "
         << fedsInEvent << "/" << expectedFedsInEvent_;
 
   return tstamp;

EventFilter/Utilities/test/RunBUFU.sh

@@ -171,7 +171,7 @@ CMDLINE_STARTFU="cmsRun startFU_daqsource.py daqSourceMode=FRDStriped runNumber=
 ${CMDLINE_STARTFU}  > out_2_fu.log 2>&1 || diefu "${CMDLINE_STARTFU}" $? $OUTDIR out_2_fu.log
 rm -rf $OUTDIR/{ramdisk,data,*.log}
 
-echo "running DAQSource test with FRDPreUnpack"
+echo "running DAQSource test with unpacking in reader threads"
 CMDLINE_STARTBU="cmsRun startBU.py runNumber=${runnumber} fffBaseDir=${OUTDIR} maxLS=2 fedMeanSize=128 eventsPerFile=20 eventsPerLS=35 frdFileVersion=1"
 CMDLINE_STARTFU="cmsRun startFU_daqsource.py daqSourceMode=FRDPreUnpack runNumber=${runnumber} fffBaseDir=${OUTDIR}"
 ${CMDLINE_STARTBU}  > out_2_bu.log 2>&1 || diebu "${CMDLINE_STARTBU}" $? $OUTDIR