--- parser3/src/main/pa_globals.C 2003/03/06 12:21:19 1.152.2.17 +++ parser3/src/main/pa_globals.C 2003/07/23 08:40:40 1.152.2.19.2.20 @@ -5,11 +5,12 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_GLOBALS_C="$Date: 2003/03/06 12:21:19 $"; +static const char* IDENT_GLOBALS_C="$Date: 2003/07/23 08:40:40 $"; #include "pa_config_includes.h" #ifdef XML +#include "libxml/xmlversion.h" #include "libxslt/extensions.h" #include "libxslt/xsltutils.h" extern "C" { @@ -17,14 +18,19 @@ extern "C" { }; #endif +#include "pcre.h" + #include "pa_globals.h" #include "pa_string.h" #include "pa_sapi.h" #include "pa_threads.h" -#ifdef XML -#include "pa_stylesheet_manager.h" -#endif + +// defines + +//#define PA_DEBUG_XML_GC_MEMORY + +// globals short hex_value[0x100]; @@ -75,9 +81,9 @@ public: thread_id=0; buf[used=0]=0; } - CharPtr get_and_reset() { - CharPtr result(new char[used+1]); - memcpy(result.get(), buf, used+1); + const char* get_and_reset() { + char* result=new(PointerFreeGC) char[used+1]; + memcpy(result, buf, used+1); reset(); return result; } @@ -94,7 +100,8 @@ XML_Generic_error_info *xml_generic_erro static void xmlParserGenericErrorFunc(void *ctx, const char* msg, ...) { - pa_thread_t thread_id=pa_get_thread_id(); + //_asm int 3; + pa_thread_t thread_id=pa_get_thread_id(); // infinitely looking for free slot to fill it while(true) { @@ -104,7 +111,7 @@ xmlParserGenericErrorFunc(void *ctx, con XML_Generic_error_info *p=xml_generic_error_info(thread_id); if(!p) { // occupy empty one p=xml_generic_error_info(0); - if(!p) // wait for empty for it to appear + if(!p) // wait for empty one to appear continue; } @@ -112,7 +119,7 @@ xmlParserGenericErrorFunc(void *ctx, con va_list args; va_start(args, msg); - vsnprintf(p->buf+p->used, sizeof(p->buf)-p->used, msg, args); + p->used+=vsnprintf(p->buf+p->used, sizeof(p->buf)-p->used, msg, args); va_end(args); break; @@ -120,21 +127,21 @@ xmlParserGenericErrorFunc(void *ctx, con } bool xmlHaveGenericErrors() { - pa_thread_t thread_id=pa_get_thread_id(); + pa_thread_t thread_id=pa_get_thread_id(); SYNCHRONIZED; // find blocked return xml_generic_error_info(thread_id)!=0; } -CharPtr xmlGenericErrors() { - pa_thread_t thread_id=pa_get_thread_id(); +const char* xmlGenericErrors() { + pa_thread_t thread_id=pa_get_thread_id(); SYNCHRONIZED; // find+free blocked XML_Generic_error_info *p=xml_generic_error_info(thread_id); if(!p) // no errors for our thread_id registered - return CharPtr(0); + return 0; return p->get_and_reset(); } @@ -149,9 +156,9 @@ CharPtr xmlGenericErrors() { */ static int xmlFileMatchLocalhost(const char* filename) { - if (!strncmp(filename, "http://localhost", 16)) - return(1); - return(0); + if (!strncmp(filename, "http://localhost", 16)) + return(1); + return(0); } @@ -168,20 +175,21 @@ xmlFileMatchLocalhost(const char* filena */ static void * xmlFileOpenLocalhost (const char* filename) { - FILE *fd; - const char* documentRoot; - char path[1000]; - + //_asm int 3; + FILE *fd; + const char* documentRoot; + char path[1000]; + path[0]=0; strcat(path, (documentRoot=getenv("DOCUMENT_ROOT"))?documentRoot:"."); strcat(path, &filename[16]); - + #ifdef WIN32 - fd = fopen(path, "rb"); + fd = fopen(path, "rb"); #else - fd = fopen(path, "r"); + fd = fopen(path, "r"); #endif /* WIN32 */ - return((void *) fd); + return((void *) fd); } /** @@ -196,7 +204,7 @@ xmlFileOpenLocalhost (const char* filena */ static int pa_xmlFileRead (void * context, char * buffer, int len) { - return(fread(&buffer[0], 1, len, (FILE *) context)); + return(fread(&buffer[0], 1, len, (FILE *) context)); } /** @@ -207,7 +215,7 @@ pa_xmlFileRead (void * context, char * b */ static int pa_xmlFileClose (void * context) { - return ( ( fclose((FILE *) context) == EOF ) ? -1 : 0 ); + return ( ( fclose((FILE *) context) == EOF ) ? -1 : 0 ); } #endif @@ -224,8 +232,113 @@ void pa_globals_destroy(void *) { } -/// @test hint on one should call this for each thread xmlSubstituteEntitiesDefault(1); +#ifdef XML + +static char *pa_GC_strdup(const char *s) { + if(!s) + return 0; + + size_t size=strlen(s)+1; + char *result=(char *)GC_malloc_atomic(size); + memcpy(result, s, size); + return result; +} + +#ifdef PA_DEBUG_XML_GC_MEMORY +void *pa_look_for[]={(void*)0x8abe000,(void*)0x0,(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) + 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); + return p; + +} +static void* pa_gc_malloc_atomic_log(size_t size){ + 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); + 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); + return p; +} +//static void pa_gc_free_ignore(void *){} +static void pa_gc_free_log(void *p){ + fprintf(stderr, "pa_gc_free_log(0x%p)\n", p); +// if(pa_looked(p)) +// fprintf(stderr,"catched debug free(0x%p)\n", p); + pa_gc_free(p); +} +#endif +#endif + +void pa_CORD_oom_fn(void) { + SAPI::abort("out of memory (while expanding string)"); +} + +/** + @todo LIBXML_VERSION with xmlGcMemSetup will be 2.5.7 + @todo gc: libltdl: substitute lt_dlmalloc & co +*/ +static void gc_substitute_memory_management_functions() { + // in libxml & libxslt +#ifdef XML + // asking to use GC memory +#if LIBXML_VERSION >= 20507 +#ifdef PA_DEBUG_XML_GC_MEMORY + xmlGcMemSetup( + /*xmlFreeFunc */pa_gc_free_log, + /*xmlMallocFunc */pa_gc_malloc_log, + /*xmlMallocFunc */pa_gc_malloc_atomic_log, + /*xmlReallocFunc */pa_gc_realloc_log, + /*xmlStrdupFunc */pa_GC_strdup); +#else + xmlGcMemSetup( + /*xmlFreeFunc */pa_gc_free, + /*xmlMallocFunc */pa_gc_malloc, + /*xmlMallocFunc */pa_gc_malloc_atomic, + /*xmlReallocFunc */pa_gc_realloc, + /*xmlStrdupFunc */pa_GC_strdup); +#endif + +#else + xmlMemSetup( + /*xmlFreeFunc */pa_gc_free, + /*xmlMallocFunc */pa_gc_malloc, + /*xmlReallocFunc */pa_gc_realloc, + /*xmlStrdupFunc */pa_GC_strdup); +#endif + +#endif + + // pcre + pcre_malloc=pa_gc_malloc; + pcre_free=pa_gc_free; + + + // cord + CORD_oom_fn=pa_CORD_oom_fn; +} + +/** + @test hint on one should call this for each thread xmlSubstituteEntitiesDefault(1); +*/ void pa_globals_init() { + // in various libraries + gc_substitute_memory_management_functions(); // hex value setup_hex_value(); @@ -233,19 +346,19 @@ void pa_globals_init() { #ifdef XML // initializing xml libs - /* First I get a DOMImplementation reference */ + /* First get a DOMImplementation reference */ domimpl = gdome_di_mkref (); - /* - * Register the EXSLT extensions and the test module - */ - exsltRegisterAll(); - xsltRegisterTestModule(); - xmlDefaultSAXHandlerInit(); - /* - * disable CDATA from being built in the document tree - */ - // never added yet xmlDefaultSAXHandler.cdataBlock = NULL; - + /* + * Register the EXSLT extensions and the test module + */ + exsltRegisterAll(); + xsltRegisterTestModule(); + xmlDefaultSAXHandlerInit(); + /* + * disable CDATA from being built in the document tree + */ + // never added yet xmlDefaultSAXHandler.cdataBlock = NULL; + /* * Initialization function for the XML parser. * This is not reentrant. Call once before processing in case of @@ -266,7 +379,7 @@ void pa_globals_init() { xmlLoadExtDtdDefaultValue |= XML_DETECT_IDS; // Bit in the loadsubset context field to tell to do complete the elements attributes lists // with the ones defaulted from the DTDs - xmlLoadExtDtdDefaultValue |= XML_COMPLETE_ATTRS; + xmlLoadExtDtdDefaultValue |= XML_COMPLETE_ATTRS; // validate each document after load/create (?) //xmlDoValidityCheckingDefaultValue = 1; @@ -283,25 +396,75 @@ void pa_globals_init() { xmlRegisterInputCallbacks( xmlFileMatchLocalhost, xmlFileOpenLocalhost, pa_xmlFileRead, pa_xmlFileClose); - - // XSLT stylesheet manager - cache_managers->put(*NEW String(pool, "stylesheet"), - stylesheet_manager=NEW Stylesheet_manager(pool)); #endif } -#if defined(XML) && defined(_MSC_VER) +#ifdef _MSC_VER + +#ifndef PA_DEBUG_DISABLE_GC +# define GC_LIB "/parser3project/win32/gc" +# ifdef _DEBUG +# pragma comment(lib, GC_LIB "/Debug/gc.lib") +# else +# pragma comment(lib, GC_LIB "/Release/gc.lib") +# endif + +#endif + +#ifdef XML # define GNOME_LIBS "/parser3project/win32xml/win32/gnome" # pragma comment(lib, GNOME_LIBS "/glib/lib/libglib-1.3-11.lib") # ifdef _DEBUG -# pragma comment(lib, GNOME_LIBS "/libxml2-x.x.x/win32/dsp/libxml2_so_debug/libxml2.lib") -# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libexslt_so_debug/libexslt.lib") -# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libxslt_so_debug/libxslt.lib") -# pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/dsp/Debug/libgdome.lib") -# else -# pragma comment(lib, GNOME_LIBS "/libxml2-x.x.x/win32/dsp/libxml2_so_release/libxml2.lib") -# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libexslt_so_release/libexslt.lib") -# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libxslt_so_release/libxslt.lib") -# pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/dsp/Release/libgdome.lib") + +# ifdef LIBXML_STATIC +# pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/binaries/libxml2_a.lib") +# else +# pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/binaries/libxml2.lib") +# endif + +# ifdef LIBXSLT_STATIC +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libxslt_DebugStatic/libxslt.lib") +# else +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libxslt_DebugDynamic/libxslt.lib") +# endif +# ifdef LIBEXSLT_STATIC +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libexslt_DebugStatic/libexslt.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") +# endif + +#else + +# ifdef LIBXML_STATIC +# pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/dsp/libxml2_ReleaseStatic/libxml2.lib") +# else +# pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/dsp/libxml2_ReleaseDynamic/libxml2.lib") +# endif + +# ifdef LIBXSLT_STATIC +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libxslt_ReleaseStatic/libxslt.lib") +# else +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libxslt_ReleaseDynamic/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") +# else +# pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/dsp/libgdome_ReleaseDynamic/libgdome.lib") +# endif + # endif #endif + +#endif