Merge pull request #12 from sy-c/master

added overloaded DataBlockContainer constructor with release callback

include/Common/DataBlockContainer.h

@@ -6,6 +6,7 @@
 
 #include <stdlib.h>
 #include <memory>
+#include <functional>
 
 // A container class for data blocks.
 // In particular, allows to take care of the block release after use.
@@ -17,8 +18,15 @@ class DataBlockContainer {
   virtual ~DataBlockContainer();
   DataBlock *getData();
 
+  using ReleaseCallback = std::function<void(void)>;
+  // NB: may use std::bind to add extra arguments
+
+  // this constructor allows to specify a callback which is invoked when container is destroyed
+  DataBlockContainer(ReleaseCallback callback, DataBlock *v_data=NULL);
+
   protected:
   DataBlock *data;
+  ReleaseCallback releaseCallback;
 };
 
 

src/DataBlockContainer.cxx

@@ -3,10 +3,17 @@
 
 // base DataBlockContainer class
 
-DataBlockContainer::DataBlockContainer(DataBlock *v_data) : data(v_data) {
+DataBlockContainer::DataBlockContainer(DataBlock *v_data) : data(v_data), releaseCallback(nullptr) {
+}
+
+DataBlockContainer::DataBlockContainer(ReleaseCallback v_callback, DataBlock *v_data)
+: data(v_data), releaseCallback(v_callback) {
 }
 
 DataBlockContainer::~DataBlockContainer() {
+ if (releaseCallback != nullptr) {
+    releaseCallback();
+  }
 }
 
 DataBlock * DataBlockContainer::getData() {

test/testMemPool.cxx

@@ -4,6 +4,8 @@
 /// \author Sylvain Chapeland, CERN
 
 #include "Common/MemPool.h"
+#include "Common/DataBlockContainer.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <vector>
@@ -81,6 +83,13 @@ int main() {
     printf("%d errors\n",nErr);
   }
 
+  DataBlockContainer *bc=nullptr;
+  auto releaseCallback = [bc] (void) -> void {
+    printf("release callback for %p\n",bc);
+    return;
+  };
+  bc=new DataBlockContainer(releaseCallback,nullptr);
+  delete bc;
 
   printf("Delete pool\n");
   delete mp;