--- parser3/src/include/pa_pool.h 2001/05/17 10:22:24 1.52 +++ parser3/src/include/pa_pool.h 2001/09/15 13:20:22 1.54 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_pool.h,v 1.52 2001/05/17 10:22:24 parser Exp $ + $Id: pa_pool.h,v 1.54 2001/09/15 13:20:22 parser Exp $ */ #ifndef PA_POOL_H @@ -38,9 +38,6 @@ public: void set_tag(void *atag) { ftag=atag; } void *tag() { return ftag; } - /// current exception object of the pool - Exception& exception() const { return *fexception; } - /// allocates some bytes on pool void *malloc(size_t size/*, int place=0*/) { return check(real_malloc(size/*, place*/), size); @@ -50,6 +47,15 @@ public: return check(real_calloc(size), size); } + /// registers a routine to clean up non-pooled allocations + void register_cleanup(void (*cleanup) (void *), void *data) { + if(!real_register_cleanup(cleanup, data)) + fail_register_cleanup(); + } + + /// current exception object of the pool + Exception& exception() const { return *fexception; } + private: void *fstorage; @@ -62,6 +68,7 @@ private: /// @name implementation defined void *real_malloc(size_t size/*, int place*/); void *real_calloc(size_t size); + bool real_register_cleanup(void (*cleanup) (void *), void *data); //} private: @@ -71,13 +78,16 @@ private: if(ptr) return ptr; - fail(size); + fail_alloc(size); // never reached return 0; } - /// throws proper exception - void fail(size_t size) const; + /// throws allocation exception + void fail_alloc(size_t size) const; + + /// throws register cleanup exception + void fail_register_cleanup() const; private: // exception handling @@ -136,6 +146,10 @@ public: /// useful wrapper around pool void *calloc(size_t size) const { return fpool->calloc(size); } /// useful wrapper around pool + void register_cleanup(void (*cleanup) (void *), void *data) { + fpool->register_cleanup(cleanup, data); + } + /// useful wrapper around pool Exception& exception() const { return fpool->exception(); } }; /// useful macro for creating objects on current Pooled object Pooled::pool()