--- parser3/src/main/pa_globals.C 2003/02/03 11:40:57 1.152.2.12 +++ parser3/src/main/pa_globals.C 2003/05/11 12:37:07 1.152.2.19.2.19 @@ -5,11 +5,12 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_GLOBALS_C="$Date: 2003/02/03 11:40:57 $"; +static const char* IDENT_GLOBALS_C="$Date: 2003/05/11 12:37:07 $"; #include "pa_config_includes.h" #ifdef XML +#include "libxml/xmlversion.h" #include "libxslt/extensions.h" #include "libxslt/xsltutils.h" extern "C" { @@ -17,83 +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 - - - - -#define DEFAULTS_NAME "DEFAULTS" - -#define MATCH_VAR_NAME "match" - -#define EXCEPTION_VAR_NAME "exception" -#define EXCEPTION_TYPE_PART_NAME "type" -#define EXCEPTION_SOURCE_PART_NAME "source" -#define EXCEPTION_COMMENT_PART_NAME "comment" -#define EXCEPTION_HANDLED_PART_NAME "handled" - - -#define DATE_CALENDAR_WEEKNO_NAME "week" -#define DATE_CALENDAR_WEEKYEAR_NAME "year" - - -#define SWITCH_DATA_NAME "SWITCH-DATA" - -#define CACHE_DATA_NAME "CACHE-DATA" - -#define SQL_LIMIT_NAME "limit" -#define SQL_OFFSET_NAME "offset" -#define SQL_DEFAULT_NAME "default" -#define SQL_DISTINCT_NAME "distinct" - -#define HASH_DEFAULT_ELEMENT_NAME "_default" - -#define HTTP_METHOD_NAME "method" -#define HTTP_TIMEOUT_NAME "timeout" -#define HTTP_HEADERS_NAME "headers" -#define HTTP_ANY_STATUS_NAME "any-status" -#define FILE_STATUS_NAME "status" - - - - -StringPtr match_var_name(new String(MATCH_VAR_NAME)); -StringPtr exception_var_name(new String(EXCEPTION_VAR_NAME)); -StringPtr exception_type_part_name(new String(EXCEPTION_TYPE_PART_NAME)); -StringPtr exception_source_part_name(new String(EXCEPTION_SOURCE_PART_NAME)); -StringPtr exception_comment_part_name(new String(EXCEPTION_COMMENT_PART_NAME)); -StringPtr exception_handled_part_name(new String(EXCEPTION_HANDLED_PART_NAME)); +// defines +//#define PA_DEBUG_XML_GC_MEMORY -//^switch ^case -StringPtr switch_data_name(new String(SWITCH_DATA_NAME)); - -//^cache -StringPtr cache_data_name(new String(CACHE_DATA_NAME)); - -// sql -StringPtr sql_limit_name(new String(SQL_LIMIT_NAME)); -StringPtr sql_offset_name(new String(SQL_OFFSET_NAME)); -StringPtr sql_default_name(new String(SQL_DEFAULT_NAME)); -StringPtr sql_distinct_name(new String(SQL_DISTINCT_NAME)); - -// hash -StringPtr hash_default_element_name(new String(HASH_DEFAULT_ELEMENT_NAME)); - -// http -StringPtr http_method_name(new String(HTTP_METHOD_NAME)); -StringPtr http_timeout_name(new String(HTTP_TIMEOUT_NAME)); -StringPtr http_headers_name(new String(HTTP_HEADERS_NAME)); -StringPtr http_any_status_name(new String(HTTP_ANY_STATUS_NAME)); -StringPtr file_status_name(new String(FILE_STATUS_NAME)); +// globals short hex_value[0x100]; @@ -131,9 +68,25 @@ static void setup_hex_value() { const int MAX_CONCURRENT_XML_GENERIC_ERROR_THREADS=10; -struct XML_Generic_error_info { +class XML_Generic_error_info { +public: pa_thread_t thread_id; - char *message; + char buf[MAX_STRING]; + size_t used; +public: + XML_Generic_error_info() { + 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; + } } xml_generic_error_infos[MAX_CONCURRENT_XML_GENERIC_ERROR_THREADS]; XML_Generic_error_info *xml_generic_error_info(pa_thread_t thread_id) { @@ -162,16 +115,10 @@ xmlParserGenericErrorFunc(void *ctx, con } p->thread_id=thread_id; - size_t offset=p->message?strlen(p->message):0; - p->message=(char *)realloc(p->message, offset+MAX_STRING); - if(!p->message) - SAPI::die( - "out of memory in 'xmlParserGenericErrorFunc', failed to reallocate to %u bytes", - offset+MAX_STRING); va_list args; va_start(args, msg); - vsnprintf(p->message+offset, MAX_STRING, msg, args); + p->used+=vsnprintf(p->buf+p->used, sizeof(p->buf)-p->used, msg, args); va_end(args); break; @@ -195,13 +142,7 @@ const char* xmlGenericErrors() { if(!p) // no errors for our thread_id registered return 0; - const char* result=p->message; - - // free slot up - memset(p, 0, sizeof(*p)); - - // it is up to caller to free it - return result; + return p->getnd_reset(); } /** @@ -284,13 +225,118 @@ void pa_globals_destroy(void *) { gdome_di_unref (domimpl, &exc); #endif } catch(const Exception& e) { - SAPI::die("pa_globals_destroy failed: %s", e.comment()); + SAPI::abort("pa_globals_destroy failed: %s", e.comment()); } } -/// @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(); @@ -298,19 +344,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 @@ -331,7 +377,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; @@ -339,7 +385,6 @@ void pa_globals_init() { //regretfully this not only replaces entities on parse, but also on generate xmlSubstituteEntitiesDefault(1); // never switched this on xmlIndentTreeOutput=1; - memset(xml_generic_error_infos, 0, sizeof(xml_generic_error_infos)); xmlSetGenericErrorFunc(0, xmlParserGenericErrorFunc); xsltSetGenericErrorFunc(0, xmlParserGenericErrorFunc); // FILE *f=fopen("y:\\xslt.log", "wt"); @@ -349,25 +394,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