added buffers stats in bytes

Author: sy-c

src/ConsumerFMQchannel.cxx

@@ -415,6 +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;
       }
     }
     theLog.log(LogInfoDevel_(3008), "Using memory pool [%d]: %d pages x %d bytes", mp->getId(), memoryPoolNumberOfPages, memoryPoolPageSize);

src/ConsumerStats.cxx

@@ -176,8 +176,9 @@ class ConsumerStats : public Consumer
       // buffer stats
       for (int i = 0; i < ReadoutStatsMaxItems; i++) {
 	double r = snapshot.bufferUsage[i].load();
+        uint64_t b = (uint64_t)(r * snapshot.bufferSize[i].load());
 	if (r >= 0) {
-	  sendMetricNoException(Metric{(int)(r*100), "readout.bufferUsage"}.addTag(tags::Key::ID, i));
+	  sendMetricNoException(Metric{"readout.bufferUsage"}.addValue((int)(r*100), "value").addValue(b, "bytes").addTag(tags::Key::ID, i));
 	}
       }
     }

src/ReadoutEquipment.cxx

@@ -227,6 +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;
     }
     theLog.log(LogInfoDevel_(3008), "Using memory pool [%d]: %d pages x %d bytes", mp->getId(), memoryPoolNumberOfPages, memoryPoolPageSize);
 

src/ReadoutStats.cxx

@@ -73,6 +73,7 @@ void ReadoutStats::reset(bool lightReset)
   if (!lightReset) {
     for (unsigned int i = 0; i < ReadoutStatsMaxItems; i++) {
       counters.bufferUsage[i] = -1.0;
+      counters.bufferSize[i] = 0;
     }
   }
 

src/ReadoutStats.h

@@ -48,6 +48,7 @@ struct ReadoutStatsCounters {
   std::atomic<uint32_t> logMessagesError;           // number of log messages (severity: error)
   std::atomic<uint32_t> currentOrbit;               // 1st orbit of current timeframe (last out of aggregator)
   std::atomic<double> bufferUsage[ReadoutStatsMaxItems]; // buffer usage. -1 means not used.
+  std::atomic<uint64_t> bufferSize[ReadoutStatsMaxItems]; // buffer size in bytes. 0 means not used.
   std::atomic<uint64_t> ddHBFRepacked;              // Data Distribution: number of HBF re-packed (HBF overlapping superpages)
   std::atomic<uint64_t> ddBytesCopied;              // Data Distribution: number of bytes copied (HBF overlapping superpages)
   std::atomic<uint64_t> ddMemoryPendingBytes;       // Data Distribution: number of bytes pending release in ConsumerFMQ (real memory)