ecs: start all configuration in initTask

AliceO2Group · Mar 31, 2021 · 6983dc9 · 6983dc9
1 parent c75456f
commit 6983dc9
Show file tree

Hide file tree

Showing 7 changed files with 159 additions and 131 deletions.
diff --git a/src/StfBuilder/StfBuilderDevice.cxx b/src/StfBuilder/StfBuilderDevice.cxx
@@ -140,6 +140,8 @@ void StfBuilderDevice::InitTask()
     std::this_thread::sleep_for(1s); exit(-1);
   }
 
+  I().mRunning = true;
+
   // make sure we have detector if not using files
   if (!I().mFileSource->enabled()) {
     if ((ReadoutDataUtils::sRdhVersion < ReadoutDataUtils::RdhVersion::eRdhVer6) &&
@@ -223,7 +225,7 @@ void StfBuilderDevice::InitTask()
   // info thread
   I().mInfoThread = create_thread_member("stfb_info", &StfBuilderDevice::InfoThread, this);
 
-  IDDLOG("PreRun() done... ");
+  IDDLOG("InitTask() done... ");
 }
 
 void StfBuilderDevice::ResetTask()
@@ -268,9 +270,6 @@ void StfBuilderDevice::ResetTask()
 
 void StfBuilderDevice::StfOutputThread()
 {
-  // wait for the device to go into RUNNING state
-  WaitForRunningState();
-
   std::unique_ptr<InterleavedHdrDataSerializer> lStfSerializer;
   std::unique_ptr<StfToDplAdapter> lStfDplAdapter;
 
@@ -286,13 +285,14 @@ void StfBuilderDevice::StfOutputThread()
     }
   }
 
-  while (IsReadyOrRunningState()) {
+  while (I().mRunning) {
     using hres_clock = std::chrono::high_resolution_clock;
 
     // Get a STF ready for sending
     std::unique_ptr<SubTimeFrame> lStf = dequeue(eStfSendIn);
-    if (!lStf)
+    if (!lStf) {
       break;
+    }
 
     // decrement the stf counter
     I().mNumStfs--;
@@ -382,10 +382,7 @@ void StfBuilderDevice::StfOutputThread()
 
 void StfBuilderDevice::InfoThread()
 {
-  // wait for the device to go into RUNNING state
-  WaitForRunningState();
-
-  while (IsReadyOrRunningState()) {
+  while (I().mRunning) {
 
     std::this_thread::sleep_for(2s);
 
@@ -450,8 +447,6 @@ bpo::options_description StfBuilderDevice::getStfBuildingProgramOptions() {
   return lStfBuildingOptions;
 }
 
-
-
 o2::header::DataOrigin StfBuilderDevice::getDataOriginFromOption(const std::string pArg)
 {
   const auto lDetStr = boost::to_upper_copy<std::string>(pArg);

diff --git a/src/StfBuilder/StfBuilderDevice.h b/src/StfBuilder/StfBuilderDevice.h
@@ -113,13 +113,17 @@ class StfBuilderDevice : public DataDistDevice,
       IDDLOG("Restarting file source.");
     }
     I().mRestartRateCounter = true;
+
+    IDDLOG("Entering running state. RunNumber: {}", DataDistLogger::sRunNumberStr);
   }
   virtual void PostRun() override final {
     I().mPaused = true;
     if (I().mFileSource) {
       I().mFileSource->pause();
       IDDLOG("Pausing file source.");
     }
+
+    IDDLOG("Exiting running state. RunNumber: {}", DataDistLogger::sRunNumberStr);
   }
 
   bool tryPopOldestStfs()
@@ -207,7 +211,7 @@ class StfBuilderDevice : public DataDistDevice,
 
     /// Internal threads
     std::thread mOutputThread;
-    std::atomic_bool mRunning = true;
+    std::atomic_bool mRunning = false;
     std::atomic_bool mPaused = false;
 
     /// File sink