--- parser3/src/main/pa_globals.C 2003/01/31 12:34:37 1.152.2.10 +++ parser3/src/main/pa_globals.C 2004/02/11 10:41:47 1.168 @@ -5,11 +5,12 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_GLOBALS_C="$Date: 2003/01/31 12:34:37 $"; +static const char * const IDENT_GLOBALS_C="$Date: 2004/02/11 10:41:47 $"; #include "pa_config_includes.h" #ifdef XML +#include "libxml/xmlversion.h" #include "libxslt/extensions.h" #include "libxslt/xsltutils.h" extern "C" { @@ -17,112 +18,22 @@ 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" -#ifdef XML -#include "pa_stylesheet_manager.h" -#endif - -#define AUTO_FILE_NAME "auto.p" - -#define BODY_NAME "body" -#define DOWNLOAD_NAME "download" - -#define CONF_METHOD_NAME "conf" -#define AUTO_METHOD_NAME "auto" - -#define MAIN_CLASS_NAME "MAIN" - -#define DEFAULTS_NAME "DEFAULTS" -#define CHARSETS_NAME "CHARSETS" -#define MIME_TYPES_NAME "MIME-TYPES" -#define ORIGINS_MODE_NAME "ORIGINS" - -#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 CONTENT_DISPOSITION_NAME "content-disposition" -#define CONTENT_DISPOSITION_VALUE "attachment" -#define CONTENT_DISPOSITION_FILENAME_NAME "filename" - -#define SWITCH_DATA_NAME "SWITCH-DATA" - -#define CACHE_DATA_NAME "CACHE-DATA" - -#define CLASS_PATH_NAME "CLASS_PATH" - -#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 body_name(new String(BODY_NAME)); -StringPtr download_name(new String(DOWNLOAD_NAME)); - -StringPtr content_disposition_name(new String(CONTENT_DISPOSITION_NAME)); -StringPtr content_disposition_value(new String(CONTENT_DISPOSITION_VALUE)); -StringPtr content_disposition_filename_name(new String(CONTENT_DISPOSITION_FILENAME_NAME)); - -StringPtr conf_method_name(new String(CONF_METHOD_NAME)); -StringPtr auto_method_name(new String(AUTO_METHOD_NAME)); - -StringPtr main_class_name(new String(MAIN_CLASS_NAME)); - -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)); - -StringPtr charsets_name(new String(CHARSETS_NAME)); -StringPtr mime_types_name(new String(MIME_TYPES_NAME)); -StringPtr origins_mode_name(new String(ORIGINS_MODE_NAME)); - -StringPtr class_path_name(new String(CLASS_PATH_NAME)); - -//^switch ^case -StringPtr switch_data_name(new String(SWITCH_DATA_NAME)); - -//^cache -StringPtr cache_data_name(new String(CACHE_DATA_NAME)); +#include "pa_cache_managers.h" -// 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)); +// defines -// hash -StringPtr hash_default_element_name(new String(HASH_DEFAULT_ELEMENT_NAME)); +//#define PA_DEBUG_XML_GC_MEMORY -// 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]; @@ -156,51 +67,57 @@ 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 -struct XML_Generic_error_info { - pa_thread_t thread_id; - char *message; -} 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; +class XML_Generic_error_info { +public: + char buf[MAX_STRING*5]; + size_t used; +public: + XML_Generic_error_info() { + reset(); } - return 0; -} + void reset() { + buf[used=0]=0; + } + const char* get_and_reset() { + if(used) { + char* result=pa_strdup(buf, used); + reset(); + return result; + } else + 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; - 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); + 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); - 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; @@ -208,118 +125,170 @@ 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(); - const char* result=p->message; + return 0; // no errors for our thread_id registered +} - // free slot up - memset(p, 0, sizeof(*p)); +#endif - // it is up to caller to free it - return result; +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) { +// SAPI::abort("pa_globals_destroy failed: %s", e.comment()); + } } -/** - * 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); -} +#ifdef XML -/** - * 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]); +static char *pa_GC_strdup(const char *s) { + if(!s) + return 0; -#ifdef WIN32 - fd = fopen(path, "rb"); -#else - fd = fopen(path, "r"); -#endif /* WIN32 */ - return((void *) fd); + 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; } -/** - * 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)); +#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 -/** - * xmlFileClose: - * @context: the I/O context - * - * Close an I/O channel - */ -static int -pa_xmlFileClose (void * context) { - return ( ( fclose((FILE *) context) == EOF ) ? -1 : 0 ); +inline void *check(void *result, const char *where, size_t size) { + if(!result) + SAPI::abort("out of memory (while %s [size=%d])", where, size); + + 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); } #endif +#endif -void pa_globals_destroy(void *) { - try { +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 - GdomeException exc; - gdome_di_unref (domimpl, &exc); + // 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 - } catch(const Exception& e) { - SAPI::die("pa_globals_destroy failed: %s", e.comment()); - } -} +#else + xmlMemSetup( + /*xmlFreeFunc */pa_gc_free, + /*xmlMallocFunc */pa_gc_malloc, + /*xmlReallocFunc */pa_gc_realloc, + /*xmlStrdupFunc */pa_GC_strdup); +#endif + +#endif -/// @test hint on one should call this for each thread xmlSubstituteEntitiesDefault(1); + // 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(); @@ -327,19 +296,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 @@ -360,7 +329,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; @@ -368,35 +337,81 @@ 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"); // xsltSetGenericDebugFunc(f/*stderr*/, 0); - // http://localhost/abc -> $ENV{DOCUMENT_ROOT}/abc | ./abc - xmlRegisterInputCallbacks( - xmlFileMatchLocalhost, xmlFileOpenLocalhost, - pa_xmlFileRead, pa_xmlFileClose); - - // XSLT stylesheet manager - cache_managers->put(*NEW String(pool, "stylesheet"), - stylesheet_manager=NEW Stylesheet_manager(pool)); + pa_xml_io_init(); #endif } -#if defined(XML) && defined(_MSC_VER) -# define GNOME_LIBS "/parser3project/win32xml/win32/gnome" -# pragma comment(lib, GNOME_LIBS "/glib/lib/libglib-1.3-11.lib") +#ifdef _MSC_VER + +#ifndef PA_DEBUG_DISABLE_GC +# define GC_LIB "../../../../win32/gc" # 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") +# pragma comment(lib, GC_LIB "/Debug/gc.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") +# pragma comment(lib, GC_LIB "/Release/gc.lib") # endif + +#endif + +#ifdef XML +# 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 "/libxml2-x.x.x/win32/debug/lib/libxml2_a.lib") +# else +# 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/debug/lib/libxslt_a.lib") +# else +# 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/debug/lib/libexslt_a.lib") +# else +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/debug/lib/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 "/libxml2-x.x.x/win32/release/lib/libxml2_a.lib") +# else +# 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/release/lib/libxslt_a.lib") +# else +# 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/release/lib/libexslt_a.lib") +# else +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/release/lib/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