[cru] Improve roc-config logging verbosity

Author: kostorr

src/CommandLineUtilities/ProgramConfig.cxx

@@ -241,7 +241,7 @@ class ProgramConfig : public Program
         return;
       }
 
-      Logger::get() << "Configuring with command line arguments" << LogDebugOps << endm;
+      Logger::get() << "Configuring card " << cardId << " with command line arguments" << LogDebugOps << endm;
       try {
         CardConfigurator(params, mOptions.forceConfig);
       } catch (const std::runtime_error& e) {
@@ -252,7 +252,7 @@ class ProgramConfig : public Program
         throw;
       }
     } else {
-      Logger::get() << "Configuring with config uri" << LogDebugOps << endm;
+      Logger::get() << "Configuring card " << cardId << " with config uri: " << mOptions.configUri << LogDebugOps << endm;
       try {
         CardConfigurator(cardId, mOptions.configUri, mOptions.forceConfig);
       } catch (const std::runtime_error& e) {

src/Cru/CruBar.cxx

@@ -737,10 +737,9 @@ void CruBar::configure(bool force)
 
   /* TTC */
   if (static_cast<uint32_t>(mClock) != reportInfo.ttcClock /*|| !checkClockConsistent(reportInfo.linkMap)*/ || force) {
-    log("Setting the clock", LogInfoDevel);
+    log("Setting the clock to " + Clock::toString(mClock), LogInfoDevel);
     ttc.setClock(mClock);
 
-    log("Calibrating TTC", LogInfoDevel);
     if (mClock == Clock::Ttc) {
       ttc.calibrateTtc();
 
@@ -753,7 +752,6 @@ void CruBar::configure(bool force)
     }
 
     if (mGbtEnabled /*|| !checkClockConsistent(reportInfo.linkMap)*/) {
-      log("Calibrating the fPLLs", LogInfoDevel);
       Gbt gbt = Gbt(mPdaBar, mLinkMap, mWrapperCount, mEndpoint);
       gbt.calibrateGbt(mLinkMap);
       Cru::fpllref(mLinkMap, mPdaBar, 2);
@@ -763,7 +761,7 @@ void CruBar::configure(bool force)
   }
 
   if (static_cast<uint32_t>(mDownstreamData) != reportInfo.downstreamData || force) {
-    log("Setting downstream data", LogInfoDevel);
+    log("Setting downstream data: " + DownstreamData::toString(mDownstreamData), LogInfoDevel);
     ttc.selectDownstreamData(mDownstreamData);
   }
 
@@ -785,7 +783,10 @@ void CruBar::configure(bool force)
     //datapathWrapper.setLinksEnabled(0, 0x0);
     //datapathWrapper.setLinksEnabled(1, 0x0);
 
-    log("Enabling links and setting datapath mode and flow control", LogInfoDevel);
+    log("System ID: " + Utilities::toHexString(mSystemId), LogInfoDevel);
+    log("Allow rejection enabled: " + Utilities::toBoolString(mAllowRejection), LogInfoDevel);
+    log("DatapathMode: " + DatapathMode::toString(mDatapathMode), LogInfoDevel);
+    log("Enabling links:", LogInfoDevel);
     for (auto const& el : mLinkMap) {
       auto& link = el.second;
       auto& linkPrevState = reportInfo.linkMap.at(el.first);
@@ -805,47 +806,52 @@ void CruBar::configure(bool force)
       datapathWrapper.setFlowControl(link.dwrapper, mAllowRejection); //Set flow control anyway as it's per dwrapper
       datapathWrapper.setSystemId(link, mSystemId);
       datapathWrapper.setFeeId(link, link.feeId);
+      if (link.enabled) {
+        std::stringstream linkLog;
+        linkLog << "Link #" << el.first << " | GBT MUX: " << GbtMux::toString(link.gbtMux) << " | FEE ID: " << Utilities::toHexString(link.feeId);
+        log(linkLog.str(), LogInfoDevel);
+      }
     }
   }
 
   /* USER LOGIC */
   if (mUserLogicEnabled != reportInfo.userLogicEnabled || force) {
-    log("Toggling the User Logic link", LogInfoDevel);
+    log("User Logic enabled: " + Utilities::toBoolString(mUserLogicEnabled), LogInfoDevel);
     toggleUserLogicLink(mUserLogicEnabled);
   }
 
   /* RUN STATS */
   if (mRunStatsEnabled != reportInfo.runStatsEnabled || force) {
-    log("Toggling the Run Statistics link", LogInfoDevel);
+    log("Run Statistics link enabled: " + Utilities::toBoolString(mRunStatsEnabled), LogInfoDevel);
     toggleRunStatsLink(mRunStatsEnabled);
   }
 
   setVirtualLinksIds(mSystemId);
 
   /* UL + CL */
   if (mUserAndCommonLogicEnabled != reportInfo.userAndCommonLogicEnabled || force) {
-    log("Toggling User and Common Logic", LogInfoDevel);
+    log("User and Common Logic enabled: " + Utilities::toBoolString(mUserAndCommonLogicEnabled), LogInfoDevel);
     datapathWrapper.toggleUserAndCommonLogic(mUserAndCommonLogicEnabled, mEndpoint);
   }
 
   /* BSP */
   if (mCruId != reportInfo.cruId || force) {
-    log("Setting the CRU ID", LogInfoDevel);
+    log("Setting the CRU ID: " + Utilities::toHexString(mCruId), LogInfoDevel);
     setCruId(mCruId);
   }
 
   if (mTriggerWindowSize != reportInfo.triggerWindowSize || force) {
-    log("Setting trigger window size", LogInfoDevel);
+    log("Setting trigger window size: " + std::to_string(mTriggerWindowSize), LogInfoDevel);
     datapathWrapper.setTriggerWindowSize(mEndpoint, mTriggerWindowSize);
   }
 
   if (mDynamicOffset != reportInfo.dynamicOffset || force) {
-    log("Toggling fixed/dynamic offset", LogInfoDevel);
+    log("Dynamic offset enabled: " + Utilities::toBoolString(mDynamicOffset), LogInfoDevel);
     datapathWrapper.setDynamicOffset(mEndpoint, mDynamicOffset);
   }
 
   if (mTimeFrameLength != reportInfo.timeFrameLength || force) {
-    log("Setting Time Frame length", LogInfoDevel);
+    log("Setting Time Frame length: " + std::to_string(mTimeFrameLength), LogInfoDevel);
     setTimeFrameLength(mTimeFrameLength);
   }