--- parser3/src/main/pa_globals.C 2003/11/20 16:34:26 1.161 +++ parser3/src/main/pa_globals.C 2004/02/13 14:01:08 1.172 @@ -1,11 +1,11 @@ /** @file Parser: globals. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_GLOBALS_C="$Date: 2003/11/20 16:34:26 $"; +static const char * const IDENT_GLOBALS_C="$Date: 2004/02/13 14:01:08 $"; #include "pa_config_includes.h" @@ -24,7 +24,10 @@ extern "C" { #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 @@ -64,66 +67,59 @@ 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]; + char buf[MAX_STRING*5]; size_t used; public: XML_Generic_error_info() { reset(); } void reset() { - thread_id=0; buf[used=0]=0; } const char* get_and_reset() { - char* result=new(PointerFreeGC) char[used+1]; - memcpy(result, buf, used+1); - reset(); - return result; + 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; -} +static Hash xml_generic_error_infos; -static void -xmlParserGenericErrorFunc(void * /*ctx*/, const char* msg, ...) { - //_asm int 3; +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_info(thread_id); - if(!p) { // occupy empty one - p=xml_generic_error_info(0); - if(!p) // wait for empty one to appear - continue; - } - - p->thread_id=thread_id; - - 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; + 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); } bool xmlHaveGenericErrors() { @@ -131,7 +127,7 @@ bool xmlHaveGenericErrors() { SYNCHRONIZED; // find blocked - return xml_generic_error_info(thread_id)!=0; + return xml_generic_error_infos.get(thread_id)!=0; } const char* xmlGenericErrors() { @@ -139,83 +135,10 @@ const char* xmlGenericErrors() { 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; - - return p->get_and_reset(); -} + if(XML_Generic_error_info *p=xml_generic_error_infos.get(thread_id)) + return p->get_and_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) { - //_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"); -#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 @@ -240,11 +163,14 @@ 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; } @@ -358,6 +284,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(); @@ -413,10 +343,7 @@ 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 } @@ -438,51 +365,51 @@ void pa_globals_init() { # 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") +# 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") +# pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/DebugStatic/libgdome.lib") # else -# pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/dsp/libgdome_DebugDynamic/libgdome.lib") +# pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/DebugDynamic/libgdome.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") +# 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/dsp/libexslt_ReleaseDynamic/libexslt.lib") +# 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") +# pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/ReleaseStatic/libgdome.lib") # else -# pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/dsp/libgdome_ReleaseDynamic/libgdome.lib") +# pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/ReleaseDynamic/libgdome.lib") # endif # endif