--- parser3/src/include/pa_pool.h 2001/10/05 17:33:50 1.61 +++ parser3/src/include/pa_pool.h 2002/02/08 08:30:13 1.78 @@ -1,11 +1,11 @@ /** @file Parser: pool class decl. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) + Author: Alexandr Petrosian (http://paf.design.ru) - $Id: pa_pool.h,v 1.61 2001/10/05 17:33:50 parser Exp $ + $Id: pa_pool.h,v 1.78 2002/02/08 08:30:13 paf Exp $ */ #ifndef PA_POOL_H @@ -14,46 +14,41 @@ #include "pa_config_includes.h" #ifdef XML -#include -#include -#include -#include -#include -#include +# include "gdome.h" +// for xmlChar +# include "libxml/tree.h" #endif // forwards class Exception; -class Temp_exception; class String; +class Charset; +class GdomeDOMString_auto_ptr; /** Pool mechanizm allows users not to free up allocated memory, leaving that problem to 'pools'. - Also holds Exception object, which can be temporary set using - Temp_exception auto-object. - @see Pooled */ class Pool { - friend Temp_exception; public: Pool(void *astorage); - ~Pool(); - void set_context(void *acontext) { fcontext=acontext; } - void *context() { return fcontext; } + ///{@ statistics + size_t total_allocated() { return ftotal_allocated; } + unsigned int total_times() { return ftotal_times; } + ///}@ - void set_tag(void *atag) { ftag=atag; } - void *tag() { return ftag; } + void set_context(void *acontext) { fcontext=acontext; } + void *get_context() { return fcontext; } /// allocates some bytes on pool - void *malloc(size_t size/*, int place=0*/) { - return check(real_malloc(size/*, place*/), 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) { @@ -66,26 +61,43 @@ public: fail_register_cleanup(); } - /// current exception object of the pool - Exception& exception() const { return *fexception; } + ///{@ source charset + void set_source_charset(Charset& acharset); + Charset& get_source_charset(); + ///}@ + + ///{@ client charset + void set_client_charset(Charset& charset); + Charset& get_client_charset(); + ///}@ - /// resets transcoder if they change charset - void set_charset(const String &charset); - /// returns current charset - const String& get_charset() { return *charset; } +#ifdef XML + + /// @see Charset::transcode_cstr(xmlChar *s); + const char *transcode_cstr(xmlChar *s); + /// @see Charset::transcode(xmlChar *s); + String& transcode(xmlChar *s); + /// @see Charset::transcode_cstr(GdomeDOMString *s); + const char *transcode_cstr(GdomeDOMString *s); + /// @see Charset::transcode(GdomeDOMString *s); + String& transcode(GdomeDOMString *s); + /// @see Charset::transcode(const String& s) + GdomeDOMString_auto_ptr transcode(const String& s); + +#endif private: void *fstorage; void *fcontext; - void *ftag; - const String *charset; + Charset *source_charset; + Charset *client_charset; private: //{ /// @name implementation defined - void *real_malloc(size_t size/*, int place*/); + void *real_malloc(size_t size, int place); void *real_calloc(size_t size); bool real_register_cleanup(void (*cleanup) (void *), void *data); //} @@ -94,8 +106,11 @@ private: /// checks whether mem allocated OK. throws exception otherwise void *check(void *ptr, size_t size) { - if(ptr) + if(ptr) { + ftotal_allocated+=size; + ftotal_times++; return ptr; + } fail_alloc(size); @@ -108,57 +123,15 @@ private: /// throws register cleanup exception void fail_register_cleanup() const; -private: // exception handling - - // exception replacement mechanism is 'private'zed from direct usage - // Temp_exception object enforces paired set/restore - Exception *set_exception(Exception *e){ - Exception *r=fexception; - fexception=e; - return r; - } - void restore_exception(Exception *e) { - fexception=e; - } - -private: - - // current request's exception object - Exception *fexception; - -#ifdef XML - -public: - /// converts Xalan string to char * - const char *transcode_cstr(const XalanDOMString& s); - /// converts Xalan string to parser String - String& transcode(const XalanDOMString& s); - /// converts XSL exception to parser exception - void _throw(const String *source, const XSLException& e); - /// converts SAX exception to parser exception - void _throw(const String *source, const SAXException& e); - /// converts SAX parse exception to parser exception - void _throw(const String *source, const SAXParseException& e); - /// converts XML exception to parser exception - void _throw(const String *source, const XMLException& e); - /// converts Xalan DOM exception to parser exception - void _throw(const String *source, const XalanDOMException& e); - -private: - - void set_charset(const char *new_scharset); - void update_transcoder(); - -private: - - XMLTranscoder *transcoder; - -#endif +private: // statistics + + size_t ftotal_allocated; + unsigned int ftotal_times; private: //disabled - // Pool(const Pool&) {} - Pool& operator = (const Pool&) { return *this; } + Pool(const Pool&); + Pool& operator= (const Pool&); }; /** @@ -166,7 +139,7 @@ private: //disabled Holds Pool object. Contains useful wrappers to it's methods. - @see NEW, Temp_exception + @see NEW */ class Pooled { // the pool i'm allocated on @@ -175,7 +148,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/*, 1*/); + return apool.malloc(size, 1); } Pooled(Pool& apool) : fpool(&apool) {} @@ -191,82 +164,18 @@ public: //{ /// @name useful wrapper around pool - void *malloc(size_t size) const { return fpool->malloc(size); } + void *malloc(size_t size, int place=0) const { return fpool->malloc(size, place); } void *calloc(size_t size) const { return fpool->calloc(size); } void register_cleanup(void (*cleanup) (void *), void *data) { fpool->register_cleanup(cleanup, data); } - Exception& exception() const { return fpool->exception(); } #ifdef XML - const char *transcode_cstr(const XalanDOMString& s) { return fpool->transcode_cstr(s); } - String& transcode(const XalanDOMString& s) { return fpool->transcode(s); } - void _throw(const String *source, const XSLException& e) { fpool->_throw(source, e); } - void _throw(const String *source, const SAXException& e) { fpool->_throw(source, e); } - void _throw(const String *source, const SAXParseException& e) { fpool->_throw(source, e); } - void _throw(const String *source, const XMLException& e) { fpool->_throw(source, e); } - void _throw(const String *source, const XalanDOMException& e) { fpool->_throw(source, e); } + + const char *transcode_cstr(GdomeDOMString *s) { return fpool->transcode_cstr(s); } + String& transcode(GdomeDOMString *s) { return fpool->transcode(s); } + #endif //} }; /// useful macro for creating objects on current Pooled object Pooled::pool() #define NEW new(pool()) -/** - Auto-object used for temporary changing Pool's exception(). - - Use by with these macros: - @code - TRY { - // ... - if(?) - THROW(?); - // ... - } CATCH(e) { - // code, using e fields - // e.comment() - } - END_CATCH - @endcode - - @see TRY, THROW -*/ -class Temp_exception { - Pool& fpool; - Exception *saved_exception; -public: - Temp_exception(Pool& apool, Exception& exception) : - fpool(apool), - saved_exception(apool.set_exception(&exception)) { - } - ~Temp_exception() { - fpool.restore_exception(saved_exception); - } -}; - -#define XTRY(pool) \ - { \ - Exception temp_exception; \ - Temp_exception le(pool, temp_exception); \ - if(setjmp(temp_exception.mark)==0) - -#define XTHROW(exception) exception._throw -#define XCATCH(e) \ - else{ \ - Exception& e=temp_exception; - -#define XEND_CATCH \ - } \ - } - -//@{ -/// @see Temp_exception -#define TRY XTRY(pool()) -#define THROW XTHROW(exception()) -#define CATCH(e) XCATCH(e) -#define END_CATCH XEND_CATCH - -#define PTRY XTRY(pool) -#define PTHROW XTHROW(pool.exception()) -#define PCATCH(e) XCATCH(e) -#define PEND_CATCH XEND_CATCH -//@} - #endif