--- parser3/src/main/pa_globals.C 2003/12/01 14:20:44 1.163 +++ parser3/src/main/pa_globals.C 2005/12/19 14:22:01 1.181 @@ -1,11 +1,11 @@ /** @file Parser: globals. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_GLOBALS_C="$Date: 2003/12/01 14:20:44 $"; +static const char * const IDENT_GLOBALS_C="$Date: 2005/12/19 14:22:01 $"; #include "pa_config_includes.h" @@ -27,18 +27,22 @@ extern "C" { #include "pa_xml_io.h" #include "pa_common.h" +#include "pa_cache_managers.h" + // defines //#define PA_DEBUG_XML_GC_MEMORY +//20051130 trying to remove this, author claims that fixed a lot there // 20040920 for now both workarounds needed. wait for new libxml/xsl versions +// // there is a problem with testcase, it's unstable. +// // see paf@six/bug20040920/cgi-bin/t for it-showed-bug-on-20040920-day +// #define PA_WORKAROUND_BUGGY_FREE_IN_LIBXML_GC_MEMORY +// #define PA_WORKAROUND_BUGGY_MALLOCATOMIC_IN_LIBXML_GC_MEMORY + // globals short hex_value[0x100]; -#ifdef XML -GdomeDOMImplementation *domimpl; -#endif - static void setup_hex_value() { memset(hex_value, 0, sizeof(hex_value)); hex_value['0'] = 0; @@ -75,49 +79,48 @@ Request& pa_thread_request() { return *thread_request.get(pa_get_thread_id()); } +#ifdef PA_RELEASE_ASSERTS +void pa_release_assert(const char* str, const char* file, int line) { + SAPI::die("%s at %s:%d", str, file, line); +} +#endif + + #ifdef XML class XML_Generic_error_info { -public: - char buf[MAX_STRING]; +public:/*internal, actually*/ + char buf[MAX_STRING*5]; size_t used; public: XML_Generic_error_info() { - reset(); - } - void reset() { buf[used=0]=0; } - const char* get_and_reset() { - char* result=new(PointerFreeGC) char[used+1]; - memcpy(result, buf, used+1); - reset(); - return result; + const char* get() { + return used? buf: 0; } }; -Hash xml_generic_error_infos; +static Hash xml_generic_error_infos; static void xmlParserGenericErrorFunc(void * /*ctx*/, const char* msg, ...) { //_asm int 3; pa_thread_t thread_id=pa_get_thread_id(); - // infinitely looking for free slot to fill it - while(true) { + XML_Generic_error_info* p; + { SYNCHRONIZED; // find+fill blocked // first try to get existing for this thread_id - XML_Generic_error_info *p=xml_generic_error_infos.get(thread_id); + p=xml_generic_error_infos.get(thread_id); if(!p) // occupy empty one xml_generic_error_infos.put(thread_id, (p=new(PointerFreeGC) XML_Generic_error_info)); - - va_list args; - va_start(args, msg); - p->used+=vsnprintf(p->buf+p->used, sizeof(p->buf)-p->used, msg, args); - va_end(args); - - break; } + + va_list args; + va_start(args, msg); + p->used+=vsnprintf(p->buf+p->used, sizeof(p->buf)-p->used, msg, args); + va_end(args); } bool xmlHaveGenericErrors() { @@ -133,8 +136,10 @@ const char* xmlGenericErrors() { SYNCHRONIZED; // find+free blocked - if(XML_Generic_error_info *p=xml_generic_error_infos.get(thread_id)) - return p->get_and_reset(); + if(XML_Generic_error_info *p=xml_generic_error_infos.get(thread_id)) { + xml_generic_error_infos.remove(thread_id); + return p->get(); + } return 0; // no errors for our thread_id registered } @@ -142,15 +147,14 @@ const char* xmlGenericErrors() { #endif void pa_globals_destroy(void *) { +/* try { #ifdef XML - GdomeException exc; - gdome_di_unref (domimpl, &exc); - // uncomment SAPI::abort below if adding potential-throw code here #endif - } catch(const Exception& e) { + } catch(.../*const Exception& e* /) { // SAPI::abort("pa_globals_destroy failed: %s", e.comment()); } +*/ } @@ -161,51 +165,70 @@ static char *pa_GC_strdup(const char *s) return 0; size_t size=strlen(s)+1; - char *result=(char *)GC_malloc_atomic(size); + char *result=(char *)GC_MALLOC_ATOMIC(size); if(!result) SAPI::abort("out of memory (while duplicating XML string [size=%d])", size); memcpy(result, s, size); +#ifdef PA_DEBUG_XML_GC_MEMORY + fprintf(stderr, "pa_GC_strdup(%p=%s, length=%d)=0x%p\n", s, s, size, result); +#endif return result; } #ifdef PA_DEBUG_XML_GC_MEMORY -void *pa_look_for[]={(void*)0x8abe000,(void*)0x0,(void*)0x0,(void*)0x0, +void *pa_look_for[]={(void*)0x84ba980,(void*)0x8969460,(void*)0x0,(void*)0x0, (void*)0x0,(void*)0x0,(void*)0x0,(void*)0x0}; bool pa_looked(void*p) { for(int i=0; i<8; i++) - if(pa_look_for[i]==p) + if(pa_look_for[i]==p) { + __asm__("int $3"); return true; + } + if((((int)p)&~0xFF)==0x89a7700) { + __asm__("int $3"); + return true; + } return false; } static void* pa_gc_malloc_log(size_t size){ void *p=pa_gc_malloc(size); fprintf(stderr, "pa_gc_malloc_log(%d)=0x%p\n", size, p); -// if(pa_looked(p)) -// fprintf(stderr,"catched debug malloc(%d)=0x%p\n", size, p); + if(pa_looked(p)) + fprintf(stderr,"catched debug malloc(%d)=0x%p\n", size, p); return p; } static void* pa_gc_malloc_atomic_log(size_t size){ +#ifdef PA_WORKAROUND_BUGGY_MALLOCATOMIC_IN_LIBXML_GC_MEMORY + void *p=pa_gc_malloc(size); + fprintf(stderr, "pa_gc_malloc_atomicFAKE_log(%d)=0x%p\n", size, p); +#else void *p=pa_gc_malloc_atomic(size); fprintf(stderr, "pa_gc_malloc_atomic_log(%d)=0x%p\n", size, p); -// if(pa_looked(p)) -// fprintf(stderr,"catched debug malloc atomic(%d)=0x%p\n", size, p); +#endif + if(pa_looked(p)) + fprintf(stderr,"catched debug malloc atomic(%d)=0x%p\n", size, p); return p; } static void* pa_gc_realloc_log(void *ptr, size_t size){ void *p=pa_gc_realloc(ptr, size); fprintf(stderr, "pa_gc_realloc_log(0x%p, %d)=0x%p\n", ptr, size, p); -// if(pa_looked(p)) -// fprintf(stderr,"catched debug realloc(%d)=0x%p\n", size, p); + if(pa_looked(p)) + fprintf(stderr,"catched debug realloc(%d)=0x%p\n", size, p); return p; } -//static void pa_gc_free_ignore(void *){} static void pa_gc_free_log(void *p){ +#ifdef PA_WORKAROUND_BUGGY_FREE_IN_LIBXML_GC_MEMORY + fprintf(stderr, "pa_gc_freeIGNORE_log(0x%p)\n", p); +#else fprintf(stderr, "pa_gc_free_log(0x%p)\n", p); -// if(pa_looked(p)) -// fprintf(stderr,"catched debug free(0x%p)\n", p); +#endif + if(pa_looked(p)) + fprintf(stderr,"catched debug free(0x%p)\n", p); +#ifndef PA_WORKAROUND_BUGGY_FREE_IN_LIBXML_GC_MEMORY pa_gc_free(p); +#endif } #else @@ -219,12 +242,27 @@ static void* pa_gc_malloc_nonull(size_t return check(pa_gc_malloc(size), "allocating XML compsite memory", size); } static void* pa_gc_malloc_atomic_nonull(size_t size) { +#ifdef PA_WORKAROUND_BUGGY_MALLOCATOMIC_IN_LIBXML_GC_MEMORY + return check(pa_gc_malloc(size), "allocating XML composite memory (asked atomic)", size); +#else return check(pa_gc_malloc_atomic(size), "allocating XML atomic memory", size); +#endif } static void* pa_gc_realloc_nonull(void* ptr, size_t size) { return check(pa_gc_realloc(ptr, size), "reallocating XML memory", size); } +static void pa_gc_free_maybeignore( + void* +#ifndef PA_WORKAROUND_BUGGY_FREE_IN_LIBXML_GC_MEMORY + ptr +#endif + ) { +#ifndef PA_WORKAROUND_BUGGY_FREE_IN_LIBXML_GC_MEMORY + pa_gc_free(ptr); +#endif +} + #endif #endif @@ -249,7 +287,7 @@ static void gc_substitute_memory_managem /*xmlStrdupFunc */pa_GC_strdup); #else xmlGcMemSetup( - /*xmlFreeFunc */pa_gc_free, + /*xmlFreeFunc */pa_gc_free_maybeignore, /*xmlMallocFunc */pa_gc_malloc_nonull, /*xmlMallocFunc */pa_gc_malloc_atomic_nonull, /*xmlReallocFunc */pa_gc_realloc_nonull, @@ -258,7 +296,7 @@ static void gc_substitute_memory_managem #else xmlMemSetup( - /*xmlFreeFunc */pa_gc_free, + /*xmlFreeFunc */pa_gc_free_maybeignore, /*xmlMallocFunc */pa_gc_malloc, /*xmlReallocFunc */pa_gc_realloc, /*xmlStrdupFunc */pa_GC_strdup); @@ -279,6 +317,10 @@ static void gc_substitute_memory_managem @test hint on one should call this for each thread xmlSubstituteEntitiesDefault(1); */ void pa_globals_init() { + // global variables + cache_managers=new Cache_managers; + + // in various libraries gc_substitute_memory_management_functions(); @@ -288,8 +330,6 @@ void pa_globals_init() { #ifdef XML // initializing xml libs - /* First get a DOMImplementation reference */ - domimpl = gdome_di_mkref (); /* * Register the EXSLT extensions and the test module */ @@ -338,6 +378,10 @@ void pa_globals_init() { #endif } +void pa_globals_done() { + delete cache_managers; cache_managers=0; +} + #ifdef _MSC_VER #ifndef PA_DEBUG_DISABLE_GC @@ -350,57 +394,49 @@ void pa_globals_init() { #endif -#ifdef XML -# define GNOME_LIBS "../../../../win32/gnome" +#define GNOME_LIBS "../../../../win32/gnome" + +#ifdef WITH_MAILRECEIVE # pragma comment(lib, GNOME_LIBS "/glib/lib/libglib-1.3-11.lib") +#endif + +#ifdef XML # ifdef _DEBUG # ifdef LIBXML_STATIC -# pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/binaries-debug/libxml2_a.lib") +# pragma comment(lib, GNOME_LIBS "/libxml2-x.x.x/win32/debug/lib/libxml2_a.lib") # else -# pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/binaries-debug/libxml2.lib") +# pragma comment(lib, GNOME_LIBS "/libxml2-x.x.x/win32/debug/lib/libxml2.lib") # endif # ifdef LIBXSLT_STATIC -# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libxslt_DebugStatic/libxslt.lib") +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/debug/lib/libxslt_a.lib") # else -# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libxslt_DebugDynamic/libxslt.lib") +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/debug/lib/libxslt.lib") # endif # ifdef LIBEXSLT_STATIC -# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libexslt_DebugStatic/libexslt.lib") +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/debug/lib/libexslt_a.lib") # else -# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libexslt_DebugDynamic/libexslt.lib") -# endif - -# ifdef LIBGDOME_STATIC -# pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/dsp/libgdome_DebugStatic/libgdome.lib") -# else -# pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/dsp/libgdome_DebugDynamic/libgdome.lib") +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/debug/lib/libexslt.lib") # endif #else # ifdef LIBXML_STATIC -# pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/binaries-release/libxml2_a.lib") +# pragma comment(lib, GNOME_LIBS "/libxml2-x.x.x/win32/release/lib/libxml2_a.lib") # else -# pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/binaries-release/libxml2.lib") +# pragma comment(lib, GNOME_LIBS "/libxml2-x.x.x/win32/release/lib/libxml2.lib") # endif # ifdef LIBXSLT_STATIC -# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libxslt_ReleaseStatic/libxslt.lib") +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/release/lib/libxslt_a.lib") # else -# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libxslt_ReleaseDynamic/libxslt.lib") +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/release/lib/libxslt.lib") # endif # ifdef LIBEXSLT_STATIC -# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libexslt_ReleaseStatic/libexslt.lib") -# else -# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libexslt_ReleaseDynamic/libexslt.lib") -# endif - -# ifdef LIBGDOME_STATIC -# pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/dsp/libgdome_ReleaseStatic/libgdome.lib") +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/release/lib/libexslt_a.lib") # else -# pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/dsp/libgdome_ReleaseDynamic/libgdome.lib") +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/release/lib/libexslt.lib") # endif # endif