custom free func

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@511 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/ceph/include/buffer.h b/ceph/include/buffer.h
index 85fd2a9b6d1e5ecd173eff78ef213930961a6c41..91293b578556f25fbc89157c48564f9a1c7cf70e 100644 (file)
--- a/ceph/include/buffer.h
+++ b/ceph/include/buffer.h
@@ -14,8 +14,11 @@ using namespace std;
 #define BUFFER_MODE_NOFREE 0
 #define BUFFER_MODE_FREE   2
 
+#define BUFFER_MODE_CUSTOMFREE 4
+
 #define BUFFER_MODE_DEFAULT 3//(BUFFER_MODE_COPY|BUFFER_MODE_FREE)
 
+
 // debug crap
 #include "config.h"
 #define bdbout(x) if (x <= g_conf.debug_buffer) cout
@@ -40,6 +43,8 @@ extern Mutex bufferlock;
 extern long buffer_total_alloc;
 
 
+typedef void (buffer_free_func_t)(void*,char*);
+
 
 /*
  * buffer  - the underlying buffer container.  with a reference count.
@@ -69,15 +74,19 @@ class buffer {
        assert(_ref > 0);
        return --_ref;
   }
+
+  // custom (de!)allocator
+  buffer_free_func_t *free_func;
+  void *free_func_arg;
   
   friend class bufferptr;
 
  public:
   // constructors
-  buffer() : _dataptr(0), _myptr(true), _len(0), _alloc_len(0), _ref(0) { 
+  buffer() : _dataptr(0), _myptr(true), _len(0), _alloc_len(0), _ref(0), free_func(0), free_func_arg(0) { 
        bdbout(1) << "buffer.cons " << *this << endl;
   }
-  buffer(unsigned a) : _dataptr(0), _myptr(true), _len(a), _alloc_len(a), _ref(0) {
+  buffer(unsigned a) : _dataptr(0), _myptr(true), _len(a), _alloc_len(a), _ref(0), free_func(0), free_func_arg(0) {
        bdbout(1) << "buffer.cons " << *this << endl;
        _dataptr = new char[a];
        bufferlock.Lock();
@@ -87,18 +96,24 @@ class buffer {
   }
   ~buffer() {
        bdbout(1) << "buffer.des " << *this << endl;
-       if (_dataptr && _myptr) {
+       if (free_func) {
+         bdbout(1) << "buffer.custom_free_func " << free_func_arg << " " << (void*)_dataptr << endl;
+         free_func( free_func_arg, _dataptr );
+       }
+       else if (_dataptr && _myptr) {
          bdbout(1) << "buffer.free " << (void*)_dataptr << endl;
          delete[] _dataptr;
          buffer_total_alloc -= _alloc_len;
        }
   }
   
-  buffer(const char *p, int l, int mode=BUFFER_MODE_DEFAULT, int alloc_len=0) : 
+  buffer(const char *p, int l, int mode=BUFFER_MODE_DEFAULT, int alloc_len=0,
+                buffer_free_func_t free_func=0, void* free_func_arg=0) : 
        _dataptr(0), 
        _myptr(false),
        _len(l), 
-       _ref(0) {
+       _ref(0), 
+       free_func(0), free_func_arg(0) {
        
        if (alloc_len) 
          _alloc_len = alloc_len;
@@ -119,6 +134,11 @@ class buffer {
          _dataptr = (char*)p;                              // ugly
          bdbout(1) << "buffer.claim " << *this << " myptr=" << _myptr << endl;
        }
+
+       if (mode & BUFFER_MODE_CUSTOMFREE && free_func) {
+         this->free_func = free_func;
+         this->free_func_arg = free_func_arg;
+       }
   }
 
   // operators