Merge pull request #2 from awegrzyn/updated-conf-and-mon

Fix Configuration and Monitoring incompatibilities
knopers8 · Feb 8, 2018 · a3161b0 · a3161b0
2 parents 73708db + cf2b391
commit a3161b0
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 20 deletions.
diff --git a/Framework/include/QualityControl/Checker.h b/Framework/include/QualityControl/Checker.h
@@ -16,10 +16,8 @@
 #include <FairMQDevice.h>
 // O2
 #include <Configuration/ConfigurationInterface.h>
-#include <Configuration/Configuration.h>
 #include <Common/Timer.h>
-#include <Monitoring/Collector.h>
-#include <Monitoring/ProcessMonitor.h>
+#include <Monitoring/MonitoringFactory.h>
 // QC
 #include "QualityControl/QcInfoLogger.h"
 #include "QualityControl/CheckInterface.h"

diff --git a/Framework/include/QualityControl/TaskDevice.h b/Framework/include/QualityControl/TaskDevice.h
@@ -14,9 +14,8 @@
 #include <boost/accumulators/statistics.hpp>
 // O2
 #include <Common/Timer.h>
-#include <Configuration/Configuration.h>
 #include <Configuration/ConfigurationInterface.h>
-#include <Monitoring/Collector.h>
+#include <Monitoring/MonitoringFactory.h>
 #include <DataSampling/SamplerInterface.h>
 // QC
 #include "QualityControl/TaskConfig.h"

diff --git a/Framework/src/Checker.cxx b/Framework/src/Checker.cxx
@@ -37,6 +37,7 @@ using namespace std;
 using namespace AliceO2::InfoLogger;
 using namespace std::chrono;
 using namespace AliceO2::Configuration;
+using namespace AliceO2::Monitoring;
 
 namespace o2 {
 namespace quality_control {
@@ -66,7 +67,7 @@ Checker::Checker(std::string checkerName, std::string configurationSource)
 
   // monitoring
   try {
-    mCollector = std::make_shared<AliceO2::Monitoring::Collector>(configurationSource);
+    mCollector = MonitoringFactory::Get("infologger://");
     mCollector->addDerivedMetric("objects", AliceO2::Monitoring::DerivedMetricMode::RATE);
   } catch (...) {
     string diagnostic = boost::current_exception_diagnostic_information();

diff --git a/Framework/src/SpyMainFrame.cxx b/Framework/src/SpyMainFrame.cxx
@@ -13,7 +13,6 @@
 #include <TClass.h>
 #include <TGButtonGroup.h>
 #include <QualityControl/DatabaseFactory.h>
-#include <Configuration/Configuration.h>
 #include <Configuration/ConfigurationFactory.h>
 #include <TGraph.h>
 

diff --git a/Framework/src/TaskDevice.cxx b/Framework/src/TaskDevice.cxx
@@ -57,7 +57,7 @@ TaskDevice::TaskDevice(std::string taskName, std::string configurationSource) :
   populateConfig(mTaskName);
 
   // setup monitoring
-  mCollector = make_unique<Collector>(configurationSource);
+  mCollector = MonitoringFactory::Get("infologger://");
 
   // setup publisher
   mObjectsManager = make_shared<ObjectsManager>(mTaskConfig);

diff --git a/Modules/Common/src/MeanIsAbove.cxx b/Modules/Common/src/MeanIsAbove.cxx
@@ -11,11 +11,12 @@
 #include <TList.h>
 #include <TLine.h>
 // O2
-#include "Configuration/Configuration.h"
+#include "Configuration/ConfigurationFactory.h"
 
 ClassImp(o2::quality_control_modules::common::MeanIsAbove)
 
 using namespace std;
+using namespace AliceO2::Configuration;
 
 namespace o2 {
 namespace quality_control_modules {
@@ -29,9 +30,8 @@ MeanIsAbove::MeanIsAbove()
 void MeanIsAbove::configure(std::string name)
 {
   // TODO use the configuration system to set the params
-  AliceO2::Configuration::ConfigFile configFile;
   try {
-    configFile.load("file:../example.ini"); // not ok...
+    auto configFile = ConfigurationFactory::getConfiguration("file:../example.ini"); // not ok...
   } catch (string &exception) {
     cout << "error getting config file in MeanIsAbove : " << exception << endl;
     mThreshold = 1.0f;

diff --git a/Modules/Example/include/Example/BenchmarkTask.h b/Modules/Example/include/Example/BenchmarkTask.h
@@ -9,7 +9,7 @@
 #include "QualityControl/TaskInterface.h"
 
 #include <vector>
-#include "Configuration/Configuration.h"
+#include "Configuration/ConfigurationFactory.h"
 
 class TH1F;
 
@@ -44,7 +44,7 @@ class BenchmarkTask: public TaskInterface
   private:
 
     std::vector<TH1F*> mHistos;
-    AliceO2::Configuration::ConfigFile mConfigFile;
+    std::unique_ptr<AliceO2::Configuration::ConfigurationInterface> mConfigFile;
     size_t mNumberHistos;
     size_t mNumberChecks;
     std::string mTypeOfChecks;

diff --git a/Modules/Example/src/BenchmarkTask.cxx b/Modules/Example/src/BenchmarkTask.cxx
@@ -10,6 +10,7 @@
 #include <thread>
 
 using namespace std;
+using namespace AliceO2::Configuration;
 
 namespace o2 {
 namespace quality_control_modules {
@@ -29,12 +30,12 @@ void BenchmarkTask::initialize()
   QcInfoLogger::GetInstance() << "initialize benchmarktask \"" << getName() << "\""
                               << AliceO2::InfoLogger::InfoLogger::endm;
 
-  mConfigFile.load("file:./example.ini");
-  string taskDefinitionName = mConfigFile.getValue<string>(getName() + ".taskDefinition");
-  mNumberHistos = mConfigFile.getValue<size_t>(taskDefinitionName + ".numberHistos");
-  mNumberChecks = mConfigFile.getValue<size_t>(taskDefinitionName + ".numberChecks");
-  mTypeOfChecks = mConfigFile.getValue<string>(taskDefinitionName + ".typeOfChecks");
-  mModuleOfChecks = mConfigFile.getValue<string>(taskDefinitionName + ".moduleOfChecks");
+  mConfigFile = ConfigurationFactory::getConfiguration("file:./example.ini");
+  string taskDefinitionName = mConfigFile->get<std::string>(getName() + ".taskDefinition").value();
+  mNumberHistos = mConfigFile->get<int>(taskDefinitionName + ".numberHistos").value();
+  mNumberChecks = mConfigFile->get<int>(taskDefinitionName + ".numberChecks").value();
+  mTypeOfChecks = mConfigFile->get<std::string>(taskDefinitionName + ".typeOfChecks").value();
+  mModuleOfChecks = mConfigFile->get<std::string>(taskDefinitionName + ".moduleOfChecks").value();
 
   mHistos.reserve(mNumberHistos);
 

diff --git a/cmake/FindConfiguration.cmake b/cmake/FindConfiguration.cmake
@@ -14,7 +14,7 @@
 include(FindPackageHandleStandardArgs)
 
 # find includes
-find_path(CONFIGURATION_INCLUDE_DIR Configuration.h
+find_path(CONFIGURATION_INCLUDE_DIR ConfigurationInterface.h
            HINTS ${Configuration_ROOT}/include ENV LD_LIBRARY_PATH PATH_SUFFIXES "../include/Configuration" "../../include/Configuration" )
 # Remove the final "Configuration"
 get_filename_component(CONFIGURATION_INCLUDE_DIR ${CONFIGURATION_INCLUDE_DIR} DIRECTORY)