use MemoryBankManager

Author: sy-c

src/ReadoutEquipmentDummy.cxx

@@ -1,9 +1,12 @@
 #include "ReadoutEquipment.h"
+#include "MemoryBankManager.h"
+#include "ReadoutUtils.h"
 
 #include <InfoLogger/InfoLogger.hxx>
 using namespace AliceO2::InfoLogger;
 extern InfoLogger theLog;
 
+
 class ReadoutEquipmentDummy : public ReadoutEquipment {
 
   public:
@@ -12,34 +15,42 @@ class ReadoutEquipmentDummy : public ReadoutEquipment {
     DataBlockContainerReference getNextBlock();
 
   private:
-    std::shared_ptr<MemPool> mp;  // a memory pool from which to allocate data pages
+    std::shared_ptr<MemoryPagesPool> mp; // a memory pool from which to allocate data pages
     Thread::CallbackResult  populateFifoOut(); // iterative callback
 
-    DataBlockId currentId;  // current block id
+    DataBlockId currentId; // current block id
     int eventMaxSize; // maximum data block size
     int eventMinSize; // minimum data block size
+    int fillData; // if set, data pages filled with incremental values
 };
 
 ReadoutEquipmentDummy::ReadoutEquipmentDummy(ConfigFile &cfg, std::string cfgEntryPoint) : ReadoutEquipment(cfg, cfgEntryPoint) {
 
-  int memPoolNumberOfElements=10000;
-  int memPoolElementSize=0.01*1024*1024;
-
+  int memoryPoolPageSize=0.01*1024*1024;
+  int memoryPoolNumberOfPages=10000;
+  std::string memoryBankName=""; // by default, this uses the first memory bank available
+  
   // get configuration values
-  cfg.getOptionalValue<int>(cfgEntryPoint + ".memPoolNumberOfElements", memPoolNumberOfElements);
-  cfg.getOptionalValue<int>(cfgEntryPoint + ".memPoolElementSize", memPoolElementSize);
+  cfg.getOptionalValue<std::string>(cfgEntryPoint + ".memoryBankName", memoryBankName);
+  cfg.getOptionalValue<int>(cfgEntryPoint + ".memoryPoolPageSize", memoryPoolPageSize);
+  cfg.getOptionalValue<int>(cfgEntryPoint + ".memoryPoolNumberOfPages", memoryPoolNumberOfPages);
   cfg.getOptionalValue<int>(cfgEntryPoint + ".eventMaxSize", eventMaxSize, (int)1024);
   cfg.getOptionalValue<int>(cfgEntryPoint + ".eventMinSize", eventMinSize, (int)1024);
+  cfg.getOptionalValue<int>(cfgEntryPoint + ".fillData", fillData, (int)0);
 
+  theLog.log("%s : buffer %d pages x %d bytes, eventSize: %d -> %d",
+  cfgEntryPoint.c_str(),(int) memoryPoolNumberOfPages, (int) memoryPoolPageSize, eventMinSize, eventMaxSize);
+  
+  
   // ensure generated events will fit in blocks allocated from memory pool
   int maxElementSize=eventMaxSize+sizeof(DataBlockHeaderBase);
-  if (maxElementSize>memPoolElementSize) {
-    theLog.log("memPoolElementSize too small, need at least %d bytes",maxElementSize);
+  if (maxElementSize>memoryPoolPageSize) {
+    theLog.log("memoryPoolPageSize too small, need at least %d bytes",maxElementSize);
     throw __LINE__;
   }
 
   // create memory pool
-  mp=std::make_shared<MemPool>(memPoolNumberOfElements,memPoolElementSize);
+  mp=theMemoryBankManager.getPagedPool(memoryPoolPageSize, memoryPoolNumberOfPages, memoryBankName);
 
   // init variables
   currentId=0;  
@@ -48,7 +59,7 @@ ReadoutEquipmentDummy::ReadoutEquipmentDummy(ConfigFile &cfg, std::string cfgEnt
 ReadoutEquipmentDummy::~ReadoutEquipmentDummy() {
   // check if mempool still referenced
   if (!mp.unique()) {
-    printf("Warning: mempool still %d references\n",(int)mp.use_count());
+    printf("Warning: mempool still has %d references\n",(int)mp.use_count());
   }
 } 
 
@@ -57,7 +68,7 @@ DataBlockContainerReference ReadoutEquipmentDummy::getNextBlock() {
   // query memory pool for a free block
   DataBlockContainerReference nextBlock=nullptr;
   try {
-    nextBlock=std::make_shared<DataBlockContainerFromMemPool>(mp);
+    nextBlock=mp->getNewDataBlockContainer();
   }
   catch (...) {
   }
@@ -80,8 +91,10 @@ DataBlockContainerReference ReadoutEquipmentDummy::getNextBlock() {
     b->data=&(((char *)b)[sizeof(DataBlock)]);
 
     // fill (a bit of) data
-    for (int k=0;k<100;k++) {
-      b->data[k]=(char)k;
+    if (fillData==1) {
+      for (int k=0;k<dSize;k++) {
+        b->data[k]=(char)k;
+      }
     }
   }  
   return nextBlock;