Merge pull request #236 from sy-c/master

v2.15.2

Author: sy-c

doc/releaseNotes.md

@@ -501,3 +501,6 @@ This file describes the main feature changes for each readout.exe released versi
 - Updated configuration parameters:
   - added readout.fairmqConsoleSeverity, to set fair::Logger::SetConsoleSeverity
 - Explicit log message when reporting error state, in case not reported by state machine
+
+## v2.15.2 - 08/12/2022
+- Added ROC link Id for some log messages, as provided from new superpage metadata link field from ROC library.

src/RdhUtils.cxx

@@ -70,23 +70,27 @@ int RdhHandle::validateRdh(std::string& err)
   int retCode = 0;
   // expecting RDH v5 or v6
   if ((getHeaderVersion() != 5) && (getHeaderVersion() != 6)) {
-    err += "Wrong header version\n";
+    if (err.length()) err += ", ";
+    err += "Wrong header version";
     retCode++;
   }
   // check header size
   if (getHeaderSize() != sizeof(o2::Header::RAWDataHeader)) {
-    err += "Wrong header size\n";
+    if (err.length()) err += ", ";
+    err += "Wrong header size";
     retCode++;
   }
   // expecting linkId 0-31
   if (getLinkId() > RdhMaxLinkId) {
-    err += "Wrong link ID\n";
+    if (err.length()) err += ", ";
+    err += "Wrong link ID";
     retCode++;
   }
 
   // expecting offset next packet at least the size of the header
   if ((getOffsetNextPacket() > 0) && (getOffsetNextPacket() < sizeof(o2::Header::RAWDataHeader))) {
-    err += "Wrong offsetNextPacket\n";
+    if (err.length()) err += ", ";
+    err += "Wrong offsetNextPacket";
     retCode++;
   }
 

src/ReadoutEquipment.cxx

@@ -672,10 +672,12 @@ int ReadoutEquipment::tagDatablockFromRdh(RdhHandle& h, DataBlockHeader& bh)
   uint32_t hbOrbit = undefinedOrbit;
   bool isError = 0;
 
+  static InfoLogger::AutoMuteToken logRdhErrorsToken(LogWarningSupport_(3004), 30, 5);
+
   // check that it is a correct RDH
   std::string errorDescription;
   if (h.validateRdh(errorDescription) != 0) {
-    theLog.log(LogWarningSupport_(3004), "First RDH in page is wrong: %s", errorDescription.c_str());
+    theLog.log(logRdhErrorsToken, "First RDH in page is wrong (link %s): %s", (bh.linkId == undefinedLinkId) ? "undefined" : std::to_string((int)bh.linkId).c_str(), errorDescription.c_str());
     isError = 1;
   } else {
     // timeframe ID
@@ -705,7 +707,13 @@ int ReadoutEquipment::tagDatablockFromRdh(RdhHandle& h, DataBlockHeader& bh)
   bh.systemId = systemId;
   bh.feeId = feeId;
   bh.equipmentId = equipmentId;
-  bh.linkId = linkId;
+  if (bh.linkId == undefinedLinkId) {
+    bh.linkId = linkId;
+  } else {
+    if ((bh.linkId != linkId) && (linkId != undefinedLinkId)) {
+      theLog.log(logRdhErrorsToken, "linkId mismatch:  ROC reports %d !=  RDH reports %d", (int)bh.linkId, (int)linkId);
+    }
+  }
   getTimeframeOrbitRange(tfId, bh.timeframeOrbitFirst, bh.timeframeOrbitLast);
   bh.timeframeOrbitFirst -= bh.orbitOffset;
   bh.timeframeOrbitLast -= bh.orbitOffset;
@@ -872,7 +880,7 @@ int ReadoutEquipment::processRdh(DataBlockContainerReference& block)
             printf("%08X ", (int)(((uint32_t*)baseAddress)[i]));
           }
           printf("\n");
-          printf("Page 0x%p + %ld\n%s", (void*)baseAddress, pageOffset, errorDescription.c_str());
+          printf("Page 0x%p + %ld\n%s\n", (void*)baseAddress, pageOffset, errorDescription.c_str());
           h.dumpRdh(pageOffset, 1);
           errorDescription.clear();
         }
@@ -951,6 +959,30 @@ int ReadoutEquipment::processRdh(DataBlockContainerReference& block)
 
       uint16_t offsetNextPacket = h.getOffsetNextPacket();
       if (offsetNextPacket == 0) {
+
+        // provision for further checks on superpage size
+        /*
+        theLog.log(logRdhErrorsToken, "Equipment %d RDH #%d @ 0x%X : offsetNextPacket is null", id, rdhIndexInPage, (unsigned int)pageOffset);
+        statsRdhCheckErr++;
+        isPageError = 1;
+        break;
+      }
+      if ((pageOffset + h.getMemorySize() == blockSize)&&(pageOffset + offsetNextPacket == blockSize)) {
+        // this is normal end of page: the last packet fills the end of the page
+        theLog.log(logRdhErrorsToken, "Equipment %d RDH #%d @ 0x%X : end packet size ok: offsetNextpacket = %d bytes, memorySize = %d bytes, page = %d bytes", id, rdhIndexInPage, (unsigned int)pageOffset, (int)offsetNextPacket, (int)h.getMemorySize(),  (int)blockSize);
+        break;
+      }
+      if ((pageOffset + offsetNextPacket == blockSize)||(pageOffset + h.getMemorySize() == blockSize)) {
+        theLog.log(logRdhErrorsToken, "Equipment %d RDH #%d @ 0x%X : end packet size mismatch: offsetNextpacket = %d bytes, memorySize = %d bytes, page = %d bytes", id, rdhIndexInPage, (unsigned int)pageOffset, (int)offsetNextPacket, (int)h.getMemorySize(),  (int)blockSize);
+        // this is normal end of page: the last packet fills the end of the page
+        break;
+      }
+      if (pageOffset + offsetNextPacket > blockSize) {
+        theLog.log(logRdhErrorsToken, "Equipment %d RDH #%d @ 0x%X : next packet (+ %d bytes) is outside of page (%d bytes)", id, rdhIndexInPage, (unsigned int)pageOffset, (int)offsetNextPacket, (int)blockSize);
+        statsRdhCheckErr++;
+        isPageError = 1;
+        */
+
         break;
       }
       pageOffset += offsetNextPacket;

src/ReadoutEquipmentRORC.cxx

@@ -357,6 +357,11 @@ DataBlockContainerReference ReadoutEquipmentRORC::getNextBlock()
           nextBlock = d;
           d->getData()->header.dataSize = superpage.getReceived();
 
+          // check if link ID set by ROC lib, and propagate it to header
+          int deviceLinkId = superpage.getLink();
+          if ((deviceLinkId >= 0) && (deviceLinkId <= (int)RdhMaxLinkId)) {
+            d->getData()->header.linkId = (uint8_t)(deviceLinkId);
+          }
           // printf("\nPage %llu\n",statsNumberOfPages);
 	} else {
           // there is a ready superpage, but we are not able to keep it

src/ReadoutVersion.h

@@ -9,5 +9,5 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#define READOUT_VERSION "2.15.1"
+#define READOUT_VERSION "2.15.2"