use a ptr instead of a vector to keep reference

Author: Barthelemy

DataSampling/include/DataSampling/MockInjector.h

@@ -24,9 +24,9 @@ class MockInjector: public InjectorInterface
 ///
 /// @todo Make it a class, add namespaces, rename.
 ///
-/// \param dataBlocks A reference to a vector of data blocks. All data blocks in the vector have the same event id.
+/// \param dataSet A reference to a vector of data blocks. All data blocks in the vector have the same event id.
 /// \return 0 on success, an error code otherwise
-    int injectSamples(DataSetReference dataBlocks) override;
+    int injectSamples(DataSetReference dataSet) override;
 
 };
 

DataSampling/src/FairInjector.cxx

@@ -45,12 +45,16 @@ FairInjector::~FairInjector()
   ChangeState(END);
 }
 
-std::map<void*, DataBlockContainerReference> store;
+//std::map<void *, DataBlockContainerReference> store;
 
 void cleanupCallback(void *data, void *object)
 {
-  if (data != nullptr) {
-    store.erase(data);
+//  if (data != nullptr) {
+//    store.erase(data);
+//  }
+  if ((object!=nullptr)&&(data!=nullptr)) {
+    DataBlockContainerReference *ptr=(DataBlockContainerReference *)object;
+    delete ptr;
   }
 }
 
@@ -63,10 +67,11 @@ int FairInjector::injectSamples(DataSetReference dataSetReference)
     char *data = block->getData()->data;
 
     // just to keep reference alive
-    store[data] = block;
+//    store[data] = block;
+    DataBlockContainerReference *ptr = new DataBlockContainerReference(block);
 
     FairMQMessagePtr msgHeader(NewMessage((void *) &header, (header.headerSize), cleanupCallback, (void *) nullptr));
-    FairMQMessagePtr msgBody(NewMessage((void *) data, (header.dataSize), cleanupCallback));
+    FairMQMessagePtr msgBody(NewMessage((void *) data, (header.dataSize), cleanupCallback, (void *) (ptr)));
 
     parts.AddPart(std::move(msgHeader));
     parts.AddPart(std::move(msgBody));

DataSampling/src/MockInjector.cxx

@@ -9,20 +9,22 @@
 namespace AliceO2 {
 namespace DataSampling {
 
-// TODO use MockDataBlockContainer like in DataBlockProducer
-int MockInjector::injectSamples(DataSetReference dataBlocks)
+int MockInjector::injectSamples(DataSetReference dataSet)
 {
-  unsigned int nBlocks = (int) dataBlocks->size();
-  int totalSize = 0;
-  for (DataBlockContainerReference blockContainer : *dataBlocks) {
-    DataBlockHeaderBase *header = &blockContainer->getData()->header;
-    void *payload = blockContainer->getData()->data;
-    unsigned int blockSize = header->dataSize;
-    printf("%p : %d\n", payload, blockSize);
-    totalSize += blockSize;
-  }
-
-  printf("DataSampling injection: got %u blocks, total size %u bytes\n", nBlocks, totalSize);
+  // TODO we don't want to slow down the caller, thus we do nothing...
+  // TODO This being said we might want in certain cases to print the stuff below.
+  //
+//  unsigned int nBlocks = (int) dataSet->size();
+//  int totalSize = 0;
+//  for (DataBlockContainerReference blockContainer : *dataSet) {
+//    DataBlockHeaderBase *header = &blockContainer->getData()->header;
+//    void *payload = blockContainer->getData()->data;
+//    unsigned int blockSize = header->dataSize;
+//    printf("%p : %d\n", payload, blockSize);
+//    totalSize += blockSize;
+//  }
+//
+//  printf("DataSampling injection: got %u blocks, total size %u bytes\n", nBlocks, totalSize);
   return 0;
 }
 

Readout/src/ConsumerStats.cxx

@@ -16,7 +16,7 @@ using namespace AliceO2::Monitoring;
 
 
 // macro to get number of element in static array
-#define STATIC_ARRAY_ELEMENT_COUNT(x) sizeof(x)/sizeof(x[0]) 
+#define STATIC_ARRAY_ELEMENT_COUNT(x) sizeof(x)/sizeof(x[0])
 
 // function to convert a value in bytes to a prefixed number 3+3 digits
 // suffix is the "base unit" to add after calculated prefix, e.g. Byte-> kBytes
@@ -36,7 +36,7 @@ std::string NumberOfBytesToString(double value,const char*suffix) {
     suffix="";
   }
   snprintf(bufStr,sizeof(bufStr)-1,"%.03lf %s%s",scaledValue,prefixes[prefixIndex],suffix);
-  return std::string(bufStr);  
+  return std::string(bufStr);
 }
 
 
@@ -58,7 +58,7 @@ class ConsumerStats: public Consumer {
     if (monitoringEnabled) {
       // todo: support for long long types
       // https://alice.its.cern.ch/jira/browse/FLPPROT-69
- 
+
       monitoringCollector->send(counterBlocks, "readout.Blocks");
       monitoringCollector->send(counterBytesTotal, "readout.BytesTotal");
       monitoringCollector->send(counterBytesDiff, "readout.BytesInterval");
@@ -67,11 +67,11 @@ class ConsumerStats: public Consumer {
       counterBytesDiff=0;
     }
   }
-  
-  
-  public: 
+
+
+  public:
   ConsumerStats(ConfigFile &cfg, std::string cfgEntryPoint):Consumer(cfg,cfgEntryPoint) {
-    
+
     cfg.getOptionalValue(cfgEntryPoint + ".monitoringEnabled", monitoringEnabled, 0);
     if (monitoringEnabled) {
       cfg.getOptionalValue(cfgEntryPoint + ".monitoringUpdatePeriod", monitoringUpdatePeriod, 10);
@@ -83,7 +83,7 @@ class ConsumerStats: public Consumer {
 
       t.reset(monitoringUpdatePeriod*1000000);
     }
-    
+
     counterBytesTotal=0;
     counterBytesHeader=0;
     counterBlocks=0;
@@ -113,13 +113,13 @@ class ConsumerStats: public Consumer {
 
 //    printf("Stats: got %p (%d)\n",b,b.use_count());
     if (monitoringEnabled) {
-      // todo: do not check time every push() if it goes fast...      
+      // todo: do not check time every push() if it goes fast...
       if (t.isTimeout()) {
         publishStats();
         t.increment();
       }
     }
-    
+
     return 0;
   }
 };