roc-status monitoring added link 15 when UL enabled

Author: sy-c

README.md

@@ -671,6 +671,9 @@ metric format for the CRORC and the CRU is different, as different parameters ar
 | `tags::Key::ID`       | ID of the link        |
 | `tags::Key::Type`     | `tags::Value::CRU`    |
 
+
+NB: For link 15 (User Logic), when enabled, the list of values exported is a subset of the metrics above: `"orbitSor"`.
+
 Logging
 -------------------
 Logging is achieved through the use of the [InfoLogger](https://github.com/AliceO2Group/InfoLogger) library.

src/CommandLineUtilities/ProgramStatus.cxx

@@ -466,6 +466,20 @@ class ProgramStatus : public Program
           table << format;
         }
       }
+
+      /* PARAMETERS FOR USER LOGIC */
+      if (reportInfo.userLogicEnabled) {
+        if (mOptions.monitoring) {
+          monitoring->send(Metric{ "link" }
+                             .addValue((uint64_t)reportInfo.userLogicOrbitSor, "orbitSor")
+                             .addTag(tags::Key::SerialId, card.serialId.getSerial())
+                             .addTag(tags::Key::Endpoint, card.serialId.getEndpoint())
+                             .addTag(tags::Key::CRU, card.sequenceId)
+                             .addTag(tags::Key::ID, reportInfo.userLogicLinkId)
+                             .addTag(tags::Key::Type, tags::Value::CRU));
+        }
+      }
+
     } else {
       std::cout << "Invalid card type" << std::endl;
       return;

src/Cru/Common.h

@@ -120,6 +120,8 @@ struct ReportInfo {
   uint32_t triggerWindowSize;
   bool gbtEnabled;
   bool userLogicEnabled;
+  uint32_t userLogicLinkId;
+  uint32_t userLogicOrbitSor;
   bool runStatsEnabled;
   bool userAndCommonLogicEnabled;
   uint16_t timeFrameLength;

src/Cru/CruBar.cxx

@@ -545,10 +545,12 @@ Cru::ReportInfo CruBar::report(bool forConfig)
   bool dynamicOffset = datapathWrapper.getDynamicOffsetEnabled(mEndpoint);
   uint32_t triggerWindowSize = datapathWrapper.getTriggerWindowSize(mEndpoint);
 
+  uint32_t userLogicLinkId = 15;
   Link userLogicLink;
   userLogicLink.dwrapper = mEndpoint;
-  userLogicLink.dwrapperId = 15;
+  userLogicLink.dwrapperId = userLogicLinkId;
   bool userLogicEnabled = datapathWrapper.isLinkEnabled(userLogicLink);
+  uint32_t userLogicOrbitSor = datapathWrapper.getLinkRegister(userLogicLink, Cru::Registers::DATALINK_ORBIT_SOR);
 
   Link runStatsLink;
   runStatsLink.dwrapper = mEndpoint;
@@ -560,22 +562,23 @@ Cru::ReportInfo CruBar::report(bool forConfig)
 
   bool dmaStatus = getDmaStatus();
 
-  Cru::ReportInfo reportInfo = {
-    linkMap,
-    clock,
-    downstreamData,
-    ponStatusRegister,
-    onuAddress,
-    cruId,
-    dynamicOffset,
-    triggerWindowSize,
-    gbtEnabled,
-    userLogicEnabled,
-    runStatsEnabled,
-    userAndCommonLogicEnabled,
-    timeFrameLength,
-    dmaStatus
-  };
+  Cru::ReportInfo reportInfo;
+  reportInfo.linkMap = linkMap;
+  reportInfo.ttcClock = clock;
+  reportInfo.downstreamData = downstreamData;
+  reportInfo.ponStatusRegister = ponStatusRegister;
+  reportInfo.onuAddress = onuAddress;
+  reportInfo.cruId = cruId;
+  reportInfo.dynamicOffset = dynamicOffset;
+  reportInfo.triggerWindowSize = triggerWindowSize;
+  reportInfo.gbtEnabled = gbtEnabled;
+  reportInfo.userLogicEnabled = userLogicEnabled;
+  reportInfo.userLogicLinkId = userLogicLinkId;
+  reportInfo.userLogicOrbitSor = userLogicOrbitSor;
+  reportInfo.runStatsEnabled = runStatsEnabled;
+  reportInfo.userAndCommonLogicEnabled = userAndCommonLogicEnabled;
+  reportInfo.timeFrameLength = timeFrameLength;
+  reportInfo.dmaStatus = dmaStatus;
 
   return reportInfo;
 }