fix monitoring buffer size counters

sy-c · sy-c · commit 9b0773769a8c · 2023-09-14T16:28:57.000+02:00
diff --git a/src/ConsumerFMQchannel.cxx b/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);
diff --git a/src/ReadoutEquipment.cxx b/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);
 

Original file line number	Diff line number	Diff line change
`@@ -415,7 +415,7 @@ class ConsumerFMQchannel : public Consumer`
`415`	`415`	`mp -> setWarningCallback(std::bind(&ConsumerFMQchannel::mplog, this, std::placeholders::_1));`
`416`	`416`	`if ((mp->getId() >= 0) && (mp->getId() < ReadoutStatsMaxItems)) {`
`417`	`417`	`mp -> setBufferStateVariable(&gReadoutStats.counters.bufferUsage[mp->getId()]);`
`418`		`- gReadoutStats.counters.bufferSize[mp->getId()] = memoryPoolPageSize * memoryPoolNumberOfPages;`
	`418`	`+ gReadoutStats.counters.bufferSize[mp->getId()] = (uint64_t)memoryPoolPageSize * (uint64_t)memoryPoolNumberOfPages;`
`419`	`419`	`}`
`420`	`420`	`}`
`421`	`421`	`theLog.log(LogInfoDevel_(3008), "Using memory pool [%d]: %d pages x %d bytes", mp->getId(), memoryPoolNumberOfPages, memoryPoolPageSize);`
Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ ReadoutEquipment::ReadoutEquipment(ConfigFile& cfg, std::string cfgEntryPoint, b`
`227`	`227`	`mp -> setWarningCallback(std::bind(&ReadoutEquipment::mplog, this, std::placeholders::_1));`
`228`	`228`	`if ((mp->getId() >= 0) && (mp->getId() < ReadoutStatsMaxItems)) {`
`229`	`229`	`mp -> setBufferStateVariable(&gReadoutStats.counters.bufferUsage[mp->getId()]);`
`230`		`- gReadoutStats.counters.bufferSize[mp->getId()] = memoryPoolPageSize * memoryPoolNumberOfPages;`
	`230`	`+ gReadoutStats.counters.bufferSize[mp->getId()] = (uint64_t)memoryPoolPageSize * (uint64_t)memoryPoolNumberOfPages;`
`231`	`231`	`}`
`232`	`232`	`theLog.log(LogInfoDevel_(3008), "Using memory pool [%d]: %d pages x %d bytes", mp->getId(), memoryPoolNumberOfPages, memoryPoolPageSize);`
`233`	`233`