Merge pull request #262 from sy-c/master

v2.21.2

Author: sy-c

doc/releaseNotes.md

@@ -582,3 +582,6 @@ This file describes the main feature changes for each readout.exe released versi
 - o2-readout-rawreader: added options logOff and dumpOrbitStats.
 - Bookkeeping: final stats publish at end of run is synchronous.
 - Monitoring: added buffers statistics in bytes: readout.bufferUsage.bytes (in addition to existing readout.bufferUsage.value, as a percentage)
+
+## v2.21.2 - 14/09/2023
+- Monitoring: fix buffer statistics in bytes (wrong values were reported above 4GB because of a 32bit variable).

src/ConsumerFMQchannel.cxx

@@ -415,7 +415,7 @@ class ConsumerFMQchannel : public Consumer
       mp -> setWarningCallback(std::bind(&ConsumerFMQchannel::mplog, this, std::placeholders::_1));
       if ((mp->getId() >= 0) && (mp->getId() < ReadoutStatsMaxItems)) {
 	mp -> setBufferStateVariable(&gReadoutStats.counters.bufferUsage[mp->getId()]);
-        gReadoutStats.counters.bufferSize[mp->getId()] = memoryPoolPageSize * memoryPoolNumberOfPages;
+        gReadoutStats.counters.bufferSize[mp->getId()] = (uint64_t)memoryPoolPageSize * (uint64_t)memoryPoolNumberOfPages;
       }
     }
     theLog.log(LogInfoDevel_(3008), "Using memory pool [%d]: %d pages x %d bytes", mp->getId(), memoryPoolNumberOfPages, memoryPoolPageSize);

src/ReadoutEquipment.cxx

@@ -227,7 +227,7 @@ ReadoutEquipment::ReadoutEquipment(ConfigFile& cfg, std::string cfgEntryPoint, b
     mp -> setWarningCallback(std::bind(&ReadoutEquipment::mplog, this, std::placeholders::_1));
     if ((mp->getId() >= 0) && (mp->getId() < ReadoutStatsMaxItems)) {
       mp -> setBufferStateVariable(&gReadoutStats.counters.bufferUsage[mp->getId()]);
-      gReadoutStats.counters.bufferSize[mp->getId()] = memoryPoolPageSize * memoryPoolNumberOfPages;
+      gReadoutStats.counters.bufferSize[mp->getId()] = (uint64_t)memoryPoolPageSize * (uint64_t)memoryPoolNumberOfPages;
     }
     theLog.log(LogInfoDevel_(3008), "Using memory pool [%d]: %d pages x %d bytes", mp->getId(), memoryPoolNumberOfPages, memoryPoolPageSize);
 

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.21.1"
+#define READOUT_VERSION "2.21.2"