runnumber, fmqtools

ironMann · ironMann · commit c75456fa56d1 · 2021-03-31T10:18:47.000+02:00
diff --git a/src/StfBuilder/CMakeLists.txt b/src/StfBuilder/CMakeLists.txt
@@ -8,7 +8,7 @@ set(EXE_STFB_SOURCES
 )
 
 add_library(StfBuilder_lib OBJECT ${EXE_STFB_SOURCES})
-target_link_libraries(StfBuilder_lib base common)
+target_link_libraries(StfBuilder_lib base fmqtools common)
 
 add_executable(StfBuilder)
 
@@ -21,7 +21,7 @@ endif()
 target_link_libraries(StfBuilder
   PRIVATE
     StfBuilder_lib
-    base common
+    base fmqtools common
 )
 
 install(TARGETS StfBuilder RUNTIME DESTINATION bin)
diff --git a/src/StfBuilder/runStfBuilderDevice.cxx b/src/StfBuilder/runStfBuilderDevice.cxx
@@ -16,6 +16,7 @@
 
 #include <SubTimeFrameFileSink.h>
 #include <SubTimeFrameFileSource.h>
+#include <FmqUtilities.h>
 
 #include <fairmq/DeviceRunner.h>
 
@@ -96,7 +97,7 @@ int main(int argc, char* argv[])
       // });
 
       // Install listener for Logging options
-      o2::DataDistribution::impl::DataDistLoggerCtx::HandleFMQOptions(r);
+      fmqtools::HandleFMQOptions(r);
       // reset unsupported options
       r.fConfig.SetProperty<int>("io-threads", (int) std::min(std::thread::hardware_concurrency(), 16u));
       r.fConfig.SetProperty<float>("rate", 0.f);
diff --git a/src/StfSender/CMakeLists.txt b/src/StfSender/CMakeLists.txt
@@ -9,7 +9,7 @@ set(EXE_STFS_SOURCES
 )
 
 add_library(StfSender_lib OBJECT ${EXE_STFS_SOURCES})
-target_link_libraries(StfSender_lib  base common discovery)
+target_link_libraries(StfSender_lib  base fmqtools common discovery)
 
 add_executable(StfSender)
 
@@ -22,7 +22,7 @@ endif()
 target_link_libraries(StfSender
   PRIVATE
     StfSender_lib
-    base common discovery
+    base fmqtools common discovery
 )
 
 install(TARGETS StfSender RUNTIME DESTINATION bin)
diff --git a/src/StfSender/runStfSenderDevice.cxx b/src/StfSender/runStfSenderDevice.cxx
@@ -12,6 +12,7 @@
 #include "StfSenderDevice.h"
 #include <SubTimeFrameFileSink.h>
 #include <Config.h>
+#include <FmqUtilities.h>
 
 #include <options/FairMQProgOptions.h>
 
@@ -65,7 +66,7 @@ int main(int argc, char* argv[])
       // });
 
       // Install listener for Logging options
-      o2::DataDistribution::impl::DataDistLoggerCtx::HandleFMQOptions(r);
+      fmqtools::HandleFMQOptions(r);
 
       // Install listener for discovery partition key
       r.fConfig.Subscribe<std::string>("discovery-partition", [&](const std::string& pKey, std::string pValue) {
diff --git a/src/TfBuilder/CMakeLists.txt b/src/TfBuilder/CMakeLists.txt
@@ -9,7 +9,7 @@ set(EXE_TFB_SOURCES
 )
 
 add_library(TfBuilder_lib OBJECT ${EXE_TFB_SOURCES})
-target_link_libraries(TfBuilder_lib base common discovery)
+target_link_libraries(TfBuilder_lib base fmqtools common discovery)
 
 add_executable(TfBuilder)
 
@@ -22,7 +22,7 @@ endif()
 target_link_libraries(TfBuilder
   PRIVATE
     TfBuilder_lib
-    base common discovery
+    base fmqtools common discovery
 )
 
 install(TARGETS TfBuilder RUNTIME DESTINATION bin)
diff --git a/src/TfBuilder/runTfBuilderDevice.cxx b/src/TfBuilder/runTfBuilderDevice.cxx
@@ -15,6 +15,7 @@
 #include "TfBuilderDevice.h"
 #include <SubTimeFrameFileSink.h>
 #include <Config.h>
+#include <FmqUtilities.h>
 
 #include <options/FairMQProgOptions.h>
 #include <fairmq/DeviceRunner.h>
@@ -71,7 +72,7 @@ int main(int argc, char* argv[])
       // });
 
       // Install listener for Logging options
-      o2::DataDistribution::impl::DataDistLoggerCtx::HandleFMQOptions(r);
+      fmqtools::HandleFMQOptions(r);
 
       // Install listener for discovery partition key
       r.fConfig.Subscribe<std::string>("discovery-partition", [&](const std::string& pKey, std::string pValue) {
diff --git a/src/TfScheduler/CMakeLists.txt b/src/TfScheduler/CMakeLists.txt
@@ -12,7 +12,7 @@ set(EXE_TFS_SOURCES
 )
 
 add_library(TfScheduler_lib OBJECT ${EXE_TFS_SOURCES})
-target_link_libraries(TfScheduler_lib  base discovery)
+target_link_libraries(TfScheduler_lib  base fmqtools discovery)
 
 add_executable(TfScheduler)
 
@@ -25,7 +25,7 @@ endif()
 target_link_libraries(TfScheduler
   PRIVATE
     TfScheduler_lib
-    base discovery
+    base fmqtools discovery
 )
 
 install(TARGETS TfScheduler RUNTIME DESTINATION bin)
diff --git a/src/TfScheduler/runTfScheduler.cxx b/src/TfScheduler/runTfScheduler.cxx
@@ -11,6 +11,7 @@
 #include "DataDistLogger.h"
 #include "TfSchedulerDevice.h"
 #include <Config.h>
+#include <FmqUtilities.h>
 
 #include <options/FairMQProgOptions.h>
 #include <fairmq/DeviceRunner.h>
@@ -47,7 +48,7 @@ int main(int argc, char* argv[])
       // });
 
       // Install listener for Logging options
-      o2::DataDistribution::impl::DataDistLoggerCtx::HandleFMQOptions(r);
+      fmqtools::HandleFMQOptions(r);
       // reset unsupported options
       r.fConfig.SetProperty<int>("io-threads", (int) std::min(std::thread::hardware_concurrency(), 16u));
       r.fConfig.SetProperty<float>("rate", 0.f);
@@ -60,4 +61,4 @@ int main(int argc, char* argv[])
     });
 
     return runner.RunWithExceptionHandlers();
-}
+}
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
@@ -5,6 +5,7 @@
 
 add_subdirectory(base)
 add_subdirectory(discovery)
+add_subdirectory(fmqtools)
 
 set (LIB_COMMON_SOURCES
   ReadoutDataModel
diff --git a/src/common/base/CMakeLists.txt b/src/common/base/CMakeLists.txt
@@ -19,7 +19,5 @@ target_link_libraries(base
   PUBLIC
     spdlog::spdlog
     Boost::filesystem
-    FairLogger::FairLogger
-    FairMQ::FairMQ
     AliceO2::InfoLogger
 )
diff --git a/src/common/base/DataDistLogger.cxx b/src/common/base/DataDistLogger.cxx
@@ -43,6 +43,8 @@ DataDistSeverity DataDistLogger::sConfigSeverity = DataDistSeverity::debug;
 // Keep the desired InfoLogger Severity level
 bool DataDistLogger::sInfologgerEnabled = false;
 DataDistSeverity DataDistLogger::sInfologgerSeverity = DataDistSeverity::nolog;
+std::uint64_t DataDistLogger::sRunNumber = 0;
+std::string DataDistLogger::sRunNumberStr = "";
 
 
 // this is a static object that will interpose early into FairLogger
diff --git a/src/common/base/DataDistLogger.h b/src/common/base/DataDistLogger.h
@@ -25,16 +25,13 @@
 #include <spdlog/sinks/stdout_color_sinks.h>
 
 #include <fairlogger/Logger.h>
-#include <fairmq/DeviceRunner.h>
-#include <options/FairMQProgOptions.h>
+// #include <fairmq/DeviceRunner.h>
+// #include <options/FairMQProgOptions.h>
 
 #include <InfoLogger/InfoLogger.hxx>
-
 #include <boost/program_options/options_description.hpp>
 
-namespace o2
-{
-namespace DataDistribution
+namespace o2::DataDistribution
 {
 
 using DataDistSeverity = fair::Severity;
@@ -51,6 +48,8 @@ class DataDistLogger {
   static DataDistSeverity sInfologgerSeverity;
   static std::string sInfoLoggerFacility;
   static bool sInfologgerEnabled;
+  static std::uint64_t sRunNumber;
+  static std::string sRunNumberStr;
 
   static spdlog::logger& I() {
     static std::shared_ptr<spdlog::logger> sTheLogger = nullptr;
@@ -399,81 +398,7 @@ struct DataDistLoggerCtx {
     }
   }
 
-  // react to FMQ program options
-  static void HandleFMQOptions(fair::mq::DeviceRunner &pFMQRunner) {
-
-    fair::mq::ProgOptions& lFMQConfig = pFMQRunner.fConfig;
 
-    try {
-      pFMQRunner.UnsubscribeFromConfigChange();
-    } catch(...) { }
-
-    // disable fairlogger file backend
-    lFMQConfig.SetProperty<std::string>("file-severity", "nolog");
-    lFMQConfig.SetProperty<std::string>("log-to-file", "");
-
-    auto lSetSeverity = [](const std::string &pSevKey, const std::string &pSevVal) {
-      // we never allow FairMQ console or file backends!
-      fair::Logger::SetFileSeverity(DataDistSeverity::nolog);
-      fair::Logger::SetConsoleSeverity(fair::Severity::nolog);
-
-      if (pSevKey == "severity") {
-        fair::Logger::SetConsoleSeverity(fair::Severity::nolog);
-
-        // set the DD log console severity
-        if (fair::Logger::fSeverityMap.count(pSevVal)) {
-          const auto newLevel = fair::Logger::fSeverityMap.at(pSevVal);
-          if (newLevel == fair::Severity::nolog) {
-            DataDistLogger::sConfigSeverity = fair::Severity::fatal;
-          } else {
-            DataDistLogger::sConfigSeverity = newLevel;
-          }
-        }
-
-      } else if (pSevKey == "severity-infologger") {
-        // check the InfoLogger mode. Only infoLoggerD is supported.
-        if(!checkInfoLoggerOptions()) {
-          WDDLOG("DataDistLogger: Invalid INFOLOGGER_MODE. Ignoring severity-infologger={}",
-            pSevVal);
-          DataDistLogger::sInfologgerSeverity = DataDistSeverity::nolog;
-          DataDistLogger::sInfologgerEnabled = false;
-          return;
-        }
-
-        // set the InfoLogger log severity
-        if (fair::Logger::fSeverityMap.count(pSevVal)) {
-          const auto newLevel = fair::Logger::fSeverityMap.at(pSevVal);
-          if (newLevel == fair::Severity::nolog) {
-            DataDistLogger::sInfologgerSeverity = fair::Severity::fatal;
-            DataDistLogger::sInfologgerEnabled = false;
-          } else {
-            DataDistLogger::sInfologgerSeverity = newLevel;
-            DataDistLogger::sInfologgerEnabled = true;
-            impl::DataDistLoggerCtx::InitInfoLogger();
-          }
-        }
-
-      } else if (pSevKey == "severity-file") {
-          EDDLOG("DataDistLogger: FMQ File logger is not supported.");
-      }
-    };
-
-    // subscribe to notifications
-    lFMQConfig.Subscribe<std::string>("dd-log-config", [&](const std::string& key, const std::string& val) {
-
-      try {
-        pFMQRunner.UnsubscribeFromConfigChange();
-      } catch(...) { }
-
-      lSetSeverity(key, val);
-    });
-
-    // read and apply the current value
-    lSetSeverity("severity", lFMQConfig.GetProperty<std::string>("severity"));
-
-    // read and apply the current value
-    lSetSeverity("severity-infologger", lFMQConfig.GetProperty<std::string>("severity-infologger"));
-  }
 
   // InfoLogger Options
   static boost::program_options::options_description getProgramOptions() {
@@ -489,38 +414,6 @@ struct DataDistLoggerCtx {
     return lInfoLoggerOpts;
   };
 
-private:
-
-  // check the InfoLogger mode. Only infoLoggerD is supported.
-  static inline bool checkInfoLoggerOptions() {
-
-    DDDLOG("DataDistLogger: Checking INFOLOGGER_MODE variable");
-
-    const char *cMode = getenv("INFOLOGGER_MODE");
-
-    if (cMode == nullptr) {
-      IDDLOG("DataDistLogger: INFOLOGGER_MODE backend is not set.");
-      return false;
-    }
-
-    const std::string cModeStr = std::string(cMode);
-
-    if (cModeStr.length() == 0) {
-      WDDLOG("DataDistLogger: INFOLOGGER_MODE variable is empty.");
-      return false;
-    }
-
-    if (cModeStr != "infoLoggerD") {
-      EDDLOG("DataDistLogger: INFOLOGGER_MODE mode is not supported "
-        "(only infoLoggerD mode). INFOLOGGER_MODE={}", cModeStr);
-      return false;
-    }
-
-    IDDLOG("DataDistLogger: enabling InfoLogger in infoLoggerD mode.");
-
-    return true;
-  }
-
 static inline void InitInfoLogger() {
   if (!DataDistLogger::sInfologgerEnabled) {
     return;
@@ -531,14 +424,18 @@ static inline void InitInfoLogger() {
   AliceO2::InfoLogger::InfoLoggerContext lInfoLoggerCtx;
   lInfoLoggerCtx.setField(AliceO2::InfoLogger::InfoLoggerContext::FieldName::Facility,
     DataDistLogger::sInfoLoggerFacility);
+  lInfoLoggerCtx.setField(AliceO2::InfoLogger::InfoLoggerContext::FieldName::Run,
+    DataDistLogger::sRunNumberStr);
+
   lIlogger.setContext(lInfoLoggerCtx);
 
   DDDLOG("DataDistLogger: infoLoggerD settings are updated.");
 }
+
 };
 
 }
-}
+
 } /* o2::DataDistribution */
 
 #endif /* DATADIST_LOGGER_H_ */
diff --git a/src/common/fmqtools/CMakeLists.txt b/src/common/fmqtools/CMakeLists.txt
@@ -0,0 +1,21 @@
+# @author Gvozden Neskovic
+# @brief  DataDistribution base stuff: Logging, etc...
+
+#-------------------------------------------------------------------------------
+set (LIB_FMQTOOLS_SOURCES
+  FmqUtilities
+)
+
+add_library(fmqtools OBJECT ${LIB_FMQTOOLS_SOURCES})
+
+
+target_include_directories(fmqtools
+  PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+target_link_libraries(base
+  PUBLIC
+    FairLogger::FairLogger
+    FairMQ::FairMQ
+)
diff --git a/src/common/fmqtools/FmqUtilities.cxx b/src/common/fmqtools/FmqUtilities.cxx
@@ -0,0 +1,12 @@
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/src/common/fmqtools/FmqUtilities.h b/src/common/fmqtools/FmqUtilities.h

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ set(EXE_STFB_SOURCES`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`add_library(StfBuilder_lib OBJECT ${EXE_STFB_SOURCES})`
`11`		`-target_link_libraries(StfBuilder_lib base common)`
	`11`	`+target_link_libraries(StfBuilder_lib base fmqtools common)`
`12`	`12`
`13`	`13`	`add_executable(StfBuilder)`
`14`	`14`
`@@ -21,7 +21,7 @@ endif()`
`21`	`21`	`target_link_libraries(StfBuilder`
`22`	`22`	`PRIVATE`
`23`	`23`	`StfBuilder_lib`
`24`		`- base common`
	`24`	`+ base fmqtools common`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`install(TARGETS StfBuilder RUNTIME DESTINATION bin)`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ set(EXE_STFS_SOURCES`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`add_library(StfSender_lib OBJECT ${EXE_STFS_SOURCES})`
`12`		`-target_link_libraries(StfSender_lib base common discovery)`
	`12`	`+target_link_libraries(StfSender_lib base fmqtools common discovery)`
`13`	`13`
`14`	`14`	`add_executable(StfSender)`
`15`	`15`
`@@ -22,7 +22,7 @@ endif()`
`22`	`22`	`target_link_libraries(StfSender`
`23`	`23`	`PRIVATE`
`24`	`24`	`StfSender_lib`
`25`		`- base common discovery`
	`25`	`+ base fmqtools common discovery`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`install(TARGETS StfSender RUNTIME DESTINATION bin)`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ set(EXE_TFB_SOURCES`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`add_library(TfBuilder_lib OBJECT ${EXE_TFB_SOURCES})`
`12`		`-target_link_libraries(TfBuilder_lib base common discovery)`
	`12`	`+target_link_libraries(TfBuilder_lib base fmqtools common discovery)`
`13`	`13`
`14`	`14`	`add_executable(TfBuilder)`
`15`	`15`
`@@ -22,7 +22,7 @@ endif()`
`22`	`22`	`target_link_libraries(TfBuilder`
`23`	`23`	`PRIVATE`
`24`	`24`	`TfBuilder_lib`
`25`		`- base common discovery`
	`25`	`+ base fmqtools common discovery`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`install(TARGETS TfBuilder RUNTIME DESTINATION bin)`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ set(EXE_TFS_SOURCES`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`add_library(TfScheduler_lib OBJECT ${EXE_TFS_SOURCES})`
`15`		`-target_link_libraries(TfScheduler_lib base discovery)`
	`15`	`+target_link_libraries(TfScheduler_lib base fmqtools discovery)`
`16`	`16`
`17`	`17`	`add_executable(TfScheduler)`
`18`	`18`
`@@ -25,7 +25,7 @@ endif()`
`25`	`25`	`target_link_libraries(TfScheduler`
`26`	`26`	`PRIVATE`
`27`	`27`	`TfScheduler_lib`
`28`		`- base discovery`
	`28`	`+ base fmqtools discovery`
`29`	`29`	`)`
`30`	`30`
`31`	`31`	`install(TARGETS TfScheduler RUNTIME DESTINATION bin)`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,5 @@ target_link_libraries(base`
`19`	`19`	`PUBLIC`
`20`	`20`	`spdlog::spdlog`
`21`	`21`	`Boost::filesystem`
`22`		`- FairLogger::FairLogger`
`23`		`- FairMQ::FairMQ`
`24`	`22`	`AliceO2::InfoLogger`
`25`	`23`	`)`