[alf] Use logging facility from ReadoutCard

Author: kostorr

CMakeLists.txt

@@ -53,7 +53,6 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
 
 find_package(Boost 1.56 REQUIRED)
 find_package(Common REQUIRED)
-find_package(InfoLogger REQUIRED)
 find_package(ReadoutCard REQUIRED)
 find_package(LLA REQUIRED)
 find_package(DIM REQUIRED)
@@ -86,7 +85,6 @@ target_sources(ALF PRIVATE
   src/AlfServer.cxx
   src/DimServices/DimServices.cxx
   src/DimServices/ServiceNames.cxx
-  src/Logger.cxx
   $<$<BOOL:${Python2_FOUND}>:src/PythonInterface.cxx>
   $<$<BOOL:${Python3_FOUND}>:src/PythonInterface.cxx>
 )
@@ -103,7 +101,6 @@ set(LINK_LIBS
     o2::LLA
     AliceO2::ReadoutCard
     AliceO2::Common
-    AliceO2::InfoLogger
     Boost::boost
     $<$<BOOL:${Python2_FOUND}>:Boost::python27>
     $<$<BOOL:${Python2_FOUND}>:Python2::Python>

README.md

@@ -268,17 +268,14 @@ g++ -Wall \
   -I /opt/alisw/el7/Common-O2/v1.4.9-27/include/ \
   -I /opt/alisw/el7/LLA/v0.1.0-1/include \
   -I /opt/alisw/el7/ReadoutCard/v0.21.3-1/include \
-  -I /opt/alisw/el7/libInfoLogger/v1.3.9-28/include/ \
   -I /opt/alisw/el7/boost/v1.72.0-alice1-36/include/ \
   -lO2Alf \
   -lCommon \
   -lO2Lla \
-  -lInfoLogger \
   -lReadoutCard \
   -L /opt/alisw/el7/ALF/v0.7.0-1/lib \
   -L /opt/alisw/el7/Common-O2/v1.4.9-27/lib \
   -L /opt/alisw/el7/LLA/v0.1.0-1/lib \
-  -L /opt/alisw/el7/libInfoLogger/v1.3.9-28/lib \
   -L /opt/alisw/el7/ReadoutCard/v0.21.3-1/lib \
   alf-lib-example.cxx -o ale
 ```

apps/Alf.cxx

@@ -62,14 +62,15 @@ class Alf : public AliceO2::Common::Program
   {
     //verbose = isVerbose();
 
-    Logger::get().log() << "ALF server initializations..." << endm;
+    Logger::setFacility("ALF");
+    Logger::get() << "ALF server starting..." << LogInfoOps << endm;
 
     if (mOptions.dimDnsNode != "") {
-      Logger::get().log() << "Setting DIM_DNS_NODE from argument." << endm;
-      Logger::get().log() << "DIM_DNS_NODE=" << mOptions.dimDnsNode << endm;
+      Logger::get() << "Setting DIM_DNS_NODE from argument." << LogDebugDevel << endm;
+      Logger::get() << "DIM_DNS_NODE=" << mOptions.dimDnsNode << LogDebugDevel << endm;
     } else if (const char* dimDnsNode = std::getenv("DIM_DNS_NODE")) {
-      Logger::get().log() << "Picked up DIM_DMS_NODE from the environment." << endm;
-      Logger::get().log() << "DIM_DNS_NODE=" << dimDnsNode << endm;
+      Logger::get() << "Picked up DIM_DMS_NODE from the environment." << LogDebugDevel << endm;
+      Logger::get() << "DIM_DNS_NODE=" << dimDnsNode << LogDebugDevel << endm;
       mOptions.dimDnsNode = dimDnsNode;
     } else {
       BOOST_THROW_EXCEPTION(AlfException() << ErrorInfo::Message("DIM_DNS_NODE env variable not set, and no relevant argument provided.")); // InfoLogger and errors?
@@ -78,7 +79,7 @@ class Alf : public AliceO2::Common::Program
     std::string alfId = ip::host_name();
     boost::to_upper(alfId);
 
-    Logger::get().log() << "Starting the DIM Server" << endm;
+    Logger::get() << "Starting the DIM Server" << LogInfoDevel << endm;
     DimServer::setDnsNode(mOptions.dimDnsNode.c_str(), 2505);
     DimServer::start(("ALF_" + alfId).c_str());
 
@@ -95,32 +96,32 @@ class Alf : public AliceO2::Common::Program
         try {
           roc::FirmwareChecker().checkFirmwareCompatibility(card.pciAddress);
         } catch (const roc::Exception& e) {
-          Logger::get().warn() << e.what() << endm;
+          Logger::get() << e.what() << LogWarningOps << endm;
           continue;
         }
       }
 
       if (card.cardType == roc::CardType::Cru) {
 
-        Logger::get().log() << "CRU " << card.serialId << endm;
+        Logger::get() << "CRU " << card.serialId << " registered" << LogInfoDevel << endm;
         bar = roc::ChannelFactory().getBar(card.serialId, 2);
         for (int linkId = 0; linkId < CRU_NUM_LINKS; linkId++) {
           links.push_back({ alfId, card.serialId, linkId, card.serialId.getEndpoint() * 12 + linkId, bar, roc::CardType::Cru });
         }
 
       } else if (card.cardType == roc::CardType::Crorc) {
-        Logger::get().log() << "CRORC " << card.serialId << endm;
+        Logger::get() << "CRORC " << card.serialId << " registered" << LogInfoDevel << endm;
         for (int linkId = 0; linkId < CRORC_NUM_LINKS; linkId++) {
           bar = roc::ChannelFactory().getBar(card.serialId, linkId);
           links.push_back({ alfId, card.serialId, linkId, -1, bar, roc::CardType::Crorc });
         }
       } else {
-        Logger::get().log() << AliceO2::InfoLogger::InfoLogger::Severity::Warning << card.serialId << " is not a CRU or a CRORC. Skipping..." << endm;
+        Logger::get() << card.serialId << " is not a CRU or a CRORC. Skipping..." << LogWarningDevel << endm;
       }
 
       if (isVerbose()) {
         for (auto const& link : links) {
-          Logger::get().log() << link.alfId << " " << link.serialId << " " << link.linkId << endm;
+          Logger::get() << link.alfId << " " << link.serialId << " " << link.linkId << LogDebugDevel << endm;
         }
       }
       alfServer.makeRpcServers(links);

apps/AlfClient.cxx

@@ -93,20 +93,23 @@ class AlfClient : public AliceO2::Common::Program
 
   virtual void run(const po::variables_map&) override
   {
+    Logger::enableInfoLogger(false);
+    Logger::setFacility("ALF/Client");
     if (mOptions.alfId == "") {
-      Logger::get().err() << "Parameter alf-id is required." << endm;
+      std::cerr << "Parameter alf-id is required." << std::endl;
       return;
     }
 
-    Logger::get().log() << "ALF client initializations..." << endm;
+    std::cout << "ALF client initializations..." << std::endl;
+    std::cout << "ALF client initializations..." << std::endl;
 
     if (mOptions.dimDnsNode != "") {
-      Logger::get().log() << "Setting DIM_DNS_NODE from argument." << endm;
-      Logger::get().log() << "DIM_DNS_NODE=" << mOptions.dimDnsNode << endm;
+      std::cout << "Setting DIM_DNS_NODE from argument." << std::endl;
+      std::cout << "DIM_DNS_NODE=" << mOptions.dimDnsNode << std::endl;
       setenv("DIM_DNS_NODE", mOptions.dimDnsNode.c_str(), true);
     } else if (const char* dimDnsNode = std::getenv("DIM_DNS_NODE")) {
-      Logger::get().log() << "Picked up DIM_DMS_NODE from the environment." << endm;
-      Logger::get().log() << "DIM_DNS_NODE=" << dimDnsNode << endm;
+      std::cout << "Picked up DIM_DMS_NODE from the environment." << std::endl;
+      std::cout << "DIM_DNS_NODE=" << dimDnsNode << std::endl;
       mOptions.dimDnsNode = dimDnsNode;
     } else {
       BOOST_THROW_EXCEPTION(AlfException() << ErrorInfo::Message("DIM_DNS_NODE env variable not set, and no relevant argument provided.")); // InfoLogger and errors?
@@ -115,7 +118,7 @@ class AlfClient : public AliceO2::Common::Program
     std::string alfId = mOptions.alfId;
     boost::to_upper(alfId);
 
-    Logger::get().log() << "Starting the DIM Client using ALF ID=" << alfId << ", card=" << mOptions.serial << ":" << mOptions.endpoint << " and link=" << mOptions.link << endm;
+    std::cout << "Starting the DIM Client using ALF ID=" << alfId << ", card=" << mOptions.serial << ":" << mOptions.endpoint << " and link=" << mOptions.link << std::endl;
 
     AlfLink link = AlfLink{ alfId, roc::SerialId(mOptions.serial, mOptions.endpoint), mOptions.link, mOptions.endpoint * 12 + mOptions.link, nullptr, roc::CardType::Cru };
 
@@ -129,7 +132,7 @@ class AlfClient : public AliceO2::Common::Program
                                              std::make_pair("0x1f0", ""),
                                              std::make_pair("0x1f0", "0x00080000"),
                                              std::make_pair("0x1f0", "") });
-      Logger::get().log() << "[REGISTER SEQUENCE] output: " << regOut << endm;
+      std::cout << "[REGISTER SEQUENCE] output: " << regOut << std::endl;
 
       return;
     }
@@ -152,7 +155,7 @@ class AlfClient : public AliceO2::Common::Program
     uint32_t rAddress = 0x00f0005c;
     registerWriteRpc.writeRegister(wAddress, wValue);
     uint32_t rValue = registerReadRpc.readRegister(rAddress);
-    Logger::get().log() << "[REGISTER] Wrote: " << Util::formatValue(wValue) << " Read: " << Util::formatValue(rValue) << endm;
+    std::cout << "[REGISTER] Wrote: " << Util::formatValue(wValue) << " Read: " << Util::formatValue(rValue) << std::endl;
 
     if (mOptions.swt) {
       auto swtOut = swtSequence.write({ std::make_pair("", "lock"),
@@ -166,7 +169,7 @@ class AlfClient : public AliceO2::Common::Program
                                         std::make_pair("1", "read"),
                                         std::make_pair("0xbadc0ffee", "write"),
                                         std::make_pair("4", "read") });
-      Logger::get().log() << "[SWT_SEQUENCE] output: " << swtOut << endm;
+      std::cout << "[SWT_SEQUENCE] output: " << swtOut << std::endl;
     }
 
     if (mOptions.swtStress) {
@@ -182,8 +185,8 @@ class AlfClient : public AliceO2::Common::Program
         swtStressPairs.push_back(std::make_pair("1000", "read"));
 
         auto swtStressOut = swtSequence.write(swtStressPairs);
-        Logger::get().log() << "[SWT stress] cycle  " << cycle << endm;
-        Logger::get().log() << "[SWT stress] output:  " << swtStressOut << endm;
+        std::cout << "[SWT stress] cycle  " << cycle << std::endl;
+        std::cout << "[SWT stress] output:  " << swtStressOut << std::endl;
         std::cout << "[SWT stress] output:  " << swtStressOut << std::endl; // Infologger gets filled up here...
       }
     }
@@ -200,7 +203,7 @@ class AlfClient : public AliceO2::Common::Program
                                         std::make_pair("0x0B9601DE", "0x50000000"),
                                         std::make_pair("0x0B970471", "0x50000000"),
                                         std::make_pair("0x0B980461", "0x50000000") });
-      Logger::get().log() << "[SCA_SEQUENCE] output: " << scaOut << endm;
+      std::cout << "[SCA_SEQUENCE] output: " << scaOut << std::endl;
     }
 
     if (mOptions.ic) {
@@ -212,13 +215,13 @@ class AlfClient : public AliceO2::Common::Program
         std::make_pair("0x56,0xff", "write"),
         std::make_pair("0x56", "read"),
       });
-      Logger::get().log() << "[IC_SEQUENCE] output: " << icOut << endm;
+      std::cout << "[IC_SEQUENCE] output: " << icOut << std::endl;
 
       icGbtI2cWriteRpc.write(0x3);
     }
 
     if (mOptions.patternPlayer) {
-      Logger::get().log() << "Running the pattern player" << endm;
+      std::cout << "Running the pattern player" << std::endl;
       auto ppOut = patternPlayerRpc.play({
         "0x23456789abcdef123456",
         "0x5678",
@@ -234,11 +237,11 @@ class AlfClient : public AliceO2::Common::Program
         "false",
         //"0xdeadbeef" // Uncomment to test more parameters than expected
       });
-      Logger::get().log() << "Pairs test return: " << ppOut << endm;
+      std::cout << "Pairs test return: " << ppOut << std::endl;
     }
 
     if (mOptions.lla) {
-      Logger::get().log() << "Running the lla" << endm;
+      std::cout << "Running the lla" << std::endl;
       const auto start = std::chrono::steady_clock::now();
       auto timeExceeded = [&]() { return ((std::chrono::steady_clock::now() - start) > std::chrono::milliseconds(4100)); };
 
@@ -255,7 +258,7 @@ class AlfClient : public AliceO2::Common::Program
       }
     }
 
-    Logger::get().log() << "See ya!" << endm;
+    std::cout << "See ya!" << std::endl;
   }
 
  private:

apps/AlfLibClient.cxx

@@ -63,6 +63,8 @@ class AlfLibClient : public AliceO2::Common::Program
 
   virtual void run(const po::variables_map&) override
   {
+    Logger::enableInfoLogger(false);
+    Logger::setFacility("ALF/LibClient");
     if (mOptions.sca) {
       std::cout << "Running SCA test" << std::endl;
       auto sca = Sca(roc::SerialId{ mOptions.serial, mOptions.endpoint }, mOptions.link);
@@ -133,7 +135,7 @@ class AlfLibClient : public AliceO2::Common::Program
       swt = Swt(roc::SerialId{ mOptions.serial, mOptions.endpoint });
       swt.setChannel(1);
       ops.push_back({ Swt::Operation::SCReset, {} });
-      ops.push_back({ Swt::Operation::Write, SwtWord{ 0xcafe, 0x41d, 0x0 } });
+      ops.push_back({ Swt::Operation::Write, SwtWord{ 0xcaff, 0x41d, 0x0 } });
       ops.push_back({ Swt::Operation::Write, SwtWord{ 0xb00f, 0x42, 0x88, SwtWord::Size::High } });
       ops.push_back({ Swt::Operation::Write, SwtWord{ 0xb00f, 0x42, 0x88 } });
       ops.push_back({ Swt::Operation::Read, {} });

cmake/ALFConfig.cmake.in

@@ -4,7 +4,6 @@ get_filename_component(ALF_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
 include(CMakeFindDependencyMacro)
 
 set(Common_CMAKE_DIR @Common_DIR@)
-set(InfoLogger_CMAKE_DIR @InfoLogger_ROOT@)
 set(LLA_CMAKE_DIR @LLA_ROOT@)
 set(ReadoutCard_CMAKE_DIR @ReadoutCard_ROOT@)
 
@@ -23,7 +22,6 @@ set(ReadoutCard_CMAKE_DIR @ReadoutCard_ROOT@)
 find_dependency(LLA CONFIG HINTS ${LLA_CMAKE_DIR})
 find_dependency(ReadoutCard CONFIG HINTS ${ReadoutCard_CMAKE_DIR})
 find_dependency(Common CONFIG HINTS ${Common_CMAKE_DIR})
-find_dependency(InfoLogger CONFIG HINTS ${InfoLogger_CMAKE_DIR})
 find_dependency(Boost)
 
 # find package must be used as Common already looks for boost and set Boost_FOUND