--- parser3/src/include/pa_pool.h 2001/04/04 10:50:34 1.49 +++ parser3/src/include/pa_pool.h 2001/09/15 11:48:41 1.53 @@ -5,13 +5,13 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_pool.h,v 1.49 2001/04/04 10:50:34 paf Exp $ + $Id: pa_pool.h,v 1.53 2001/09/15 11:48:41 parser Exp $ */ #ifndef PA_POOL_H #define PA_POOL_H -#include +#include "pa_config_includes.h" class Exception; class Temp_exception; @@ -38,28 +38,34 @@ 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) { - return check(real_malloc(size), size); + void *malloc(size_t size/*, int place=0*/) { + return check(real_malloc(size/*, place*/), size); } /// allocates some bytes clearing them with zeros void *calloc(size_t size) { return check(real_calloc(size), size); } + /// registers a routine to clean up non-pooled allocations + void register_cleanup(void (*cleanup) (void *), void *data); + + /// current exception object of the pool + Exception& exception() const { return *fexception; } + private: void *fstorage; void *fcontext; void *ftag; -private: // implementation defined - - void *real_malloc(size_t size); +private: + + //{ + /// @name implementation defined + void *real_malloc(size_t size/*, int place*/); void *real_calloc(size_t size); + //} private: @@ -114,7 +120,7 @@ public: /// the Pooled-sole: Pooled instances can be allocated in Pool rather then on heap static void *operator new(size_t size, Pool& apool) { - return apool.malloc(size); + return apool.malloc(size/*, 1*/); } Pooled(Pool& apool) : fpool(&apool) {} @@ -133,6 +139,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()