--- parser3/src/main/pa_globals.C 2003/04/01 12:05:46 1.152.2.19.2.12 +++ parser3/src/main/pa_globals.C 2003/12/17 07:33:53 1.165 @@ -5,11 +5,12 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_GLOBALS_C="$Date: 2003/04/01 12:05:46 $"; +static const char * const IDENT_GLOBALS_C="$Date: 2003/12/17 07:33:53 $"; #include "pa_config_includes.h" #ifdef XML +#include "libxml/xmlversion.h" #include "libxslt/extensions.h" #include "libxslt/xsltutils.h" extern "C" { @@ -17,15 +18,20 @@ extern "C" { }; #endif +#include "pcre.h" + #include "pa_globals.h" #include "pa_string.h" #include "pa_sapi.h" #include "pa_threads.h" +#include "pa_xml_io.h" +#include "pa_common.h" +#include "pa_cache_managers.h" // defines -#define PA_DEBUG_XML_GC_MEMORY +//#define PA_DEBUG_XML_GC_MEMORY // globals @@ -61,13 +67,20 @@ static void setup_hex_value() { hex_value['f'] = 15; } -#ifdef XML -const int MAX_CONCURRENT_XML_GENERIC_ERROR_THREADS=10; +Hash thread_request; +void pa_register_thread_request(Request& r) { + thread_request.put(pa_get_thread_id(), &r); +} +/// retrives request set by pa_set_request function, useful in contextless places [slow] +Request& pa_thread_request() { + return *thread_request.get(pa_get_thread_id()); +} + +#ifdef XML class XML_Generic_error_info { public: - pa_thread_t thread_id; char buf[MAX_STRING]; size_t used; public: @@ -75,43 +88,32 @@ public: reset(); } void reset() { - thread_id=0; buf[used=0]=0; } - const char* getnd_reset() { - char* result=new(PointerFreeGC) char[used+1]; - memcpy(result, buf, used+1); - reset(); - return result; + const char* get_and_reset() { + if(used) { + char* result=pa_strdup(buf, used); + reset(); + return result; + } else + return 0; } -} xml_generic_error_infos[MAX_CONCURRENT_XML_GENERIC_ERROR_THREADS]; +}; -XML_Generic_error_info *xml_generic_error_info(pa_thread_t thread_id) { - for(int i=0; ithread_id==thread_id) - return p; - } - return 0; -} +Hash xml_generic_error_infos; -static void -xmlParserGenericErrorFunc(void *ctx, const char* msg, ...) { - pa_thread_t thread_id=pa_get_thread_id(); +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) { SYNCHRONIZED; // find+fill blocked // first try to get existing for this thread_id - 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 - continue; - } - - p->thread_id=thread_id; + XML_Generic_error_info *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); @@ -123,94 +125,22 @@ 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; + return xml_generic_error_infos.get(thread_id)!=0; } const char* xmlGenericErrors() { - pa_thread_t thread_id=pa_get_thread_id(); + 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 0; + if(XML_Generic_error_info *p=xml_generic_error_infos.get(thread_id)) + return p->get_and_reset(); - return p->getnd_reset(); -} - -/** - * xmlFileMatchWithLocalhostEqDocumentRoot: - * filename: the URI for matching - * - * check if the URI matches an HTTP one - * - * Returns 1 if matches, 0 otherwise - */ -static int -xmlFileMatchLocalhost(const char* filename) { - if (!strncmp(filename, "http://localhost", 16)) - return(1); - return(0); -} - - -/** - * xmlFileOpenHttpLocalhost : - * filename: the URI for matching - * - * http://localhost/abc -> $ENV{DOCUMENT_ROOT}/abc | ./abc - * - * input from FILE *, supports compressed input - * if filename is " " then the standard input is used - * - * Returns an I/O context or NULL in case of error - */ -static void * -xmlFileOpenLocalhost (const char* filename) { - 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"); -#else - fd = fopen(path, "r"); -#endif /* WIN32 */ - return((void *) fd); -} - -/** - * xmlFileRead: - * @context: the I/O context - * @buffer: where to drop data - * @len: number of bytes to write - * - * Read @len bytes to @buffer from the I/O channel. - * - * Returns the number of bytes written - */ -static int -pa_xmlFileRead (void * context, char * buffer, int len) { - return(fread(&buffer[0], 1, len, (FILE *) context)); -} - -/** - * xmlFileClose: - * @context: the I/O context - * - * Close an I/O channel - */ -static int -pa_xmlFileClose (void * context) { - return ( ( fclose((FILE *) context) == EOF ) ? -1 : 0 ); + return 0; // no errors for our thread_id registered } #endif @@ -220,37 +150,117 @@ void pa_globals_destroy(void *) { #ifdef XML GdomeException exc; gdome_di_unref (domimpl, &exc); + // uncomment SAPI::abort below if adding potential-throw code here #endif } catch(const Exception& e) { - SAPI::abort("pa_globals_destroy failed: %s", e.comment()); +// SAPI::abort("pa_globals_destroy failed: %s", e.comment()); } } #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); + if(!result) + SAPI::abort("out of memory (while duplicating XML string [size=%d])", size); + memcpy(result, s, size); return result; } -#endif -/// @test hint on one should call this for each thread xmlSubstituteEntitiesDefault(1); -void pa_globals_init() { +#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); +} +#else - // hex value - setup_hex_value(); +inline void *check(void *result, const char *where, size_t size) { + if(!result) + SAPI::abort("out of memory (while %s [size=%d])", where, size); -#ifdef XML + return result; +} +static void* pa_gc_malloc_nonull(size_t size) { + return check(pa_gc_malloc(size), "allocating XML compsite memory", size); +} +static void* pa_gc_malloc_atomic_nonull(size_t size) { + return check(pa_gc_malloc_atomic(size), "allocating XML atomic memory", size); +} +static void* pa_gc_realloc_nonull(void* ptr, size_t size) { + return check(pa_gc_realloc(ptr, size), "reallocating XML memory", size); +} - // initializing xml libs +#endif +#endif -#ifndef PA_DEBUG_DISABLE_GC +void pa_CORD_oom_fn(void) { + SAPI::abort("out of memory (while expanding string)"); +} + +/** + @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_nonull, + /*xmlMallocFunc */pa_gc_malloc_atomic_nonull, + /*xmlReallocFunc */pa_gc_realloc_nonull, + /*xmlStrdupFunc */pa_GC_strdup); +#endif + +#else xmlMemSetup( /*xmlFreeFunc */pa_gc_free, /*xmlMallocFunc */pa_gc_malloc, @@ -258,6 +268,34 @@ void pa_globals_init() { /*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() { + // global variables + cache_managers=new Cache_managers; + + + // in various libraries + gc_substitute_memory_management_functions(); + + // hex value + setup_hex_value(); + +#ifdef XML + // initializing xml libs + /* First get a DOMImplementation reference */ domimpl = gdome_di_mkref (); /* @@ -304,17 +342,14 @@ void pa_globals_init() { // FILE *f=fopen("y:\\xslt.log", "wt"); // xsltSetGenericDebugFunc(f/*stderr*/, 0); - // http://localhost/abc -> $ENV{DOCUMENT_ROOT}/abc | ./abc - xmlRegisterInputCallbacks( - xmlFileMatchLocalhost, xmlFileOpenLocalhost, - pa_xmlFileRead, pa_xmlFileClose); + pa_xml_io_init(); #endif } #ifdef _MSC_VER #ifndef PA_DEBUG_DISABLE_GC -# define GC_LIB "/parser3project/win32/gc" +# define GC_LIB "../../../../win32/gc" # ifdef _DEBUG # pragma comment(lib, GC_LIB "/Debug/gc.lib") # else @@ -324,14 +359,14 @@ void pa_globals_init() { #endif #ifdef XML -# define GNOME_LIBS "/parser3project/win32xml/win32/gnome" +# define GNOME_LIBS "../../../../win32/gnome" # pragma comment(lib, GNOME_LIBS "/glib/lib/libglib-1.3-11.lib") # ifdef _DEBUG # ifdef LIBXML_STATIC -# pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/dsp/libxml2_DebugStatic/libxml2.lib") +# pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/binaries-debug/libxml2_a.lib") # else -# pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/dsp/libxml2_DebugDynamic/libxml2.lib") +# pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/binaries-debug/libxml2.lib") # endif # ifdef LIBXSLT_STATIC @@ -354,9 +389,9 @@ void pa_globals_init() { #else # ifdef LIBXML_STATIC -# pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/dsp/libxml2_ReleaseStatic/libxml2.lib") +# pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/binaries-release/libxml2_a.lib") # else -# pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/dsp/lixml2_ReleaseDynamic/libxml2.lib") +# pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/binaries-release/libxml2.lib") # endif # ifdef LIBXSLT_STATIC