--- parser3/src/main/pa_globals.C 2001/12/28 14:06:52 1.97 +++ parser3/src/main/pa_globals.C 2002/01/23 11:59:59 1.106 @@ -4,32 +4,38 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://paf.design.ru) - $Id: pa_globals.C,v 1.97 2001/12/28 14:06:52 paf Exp $ + $Id: pa_globals.C,v 1.106 2002/01/23 11:59:59 paf Exp $ */ +#include "pa_config_includes.h" + +#ifdef XML +//#include "libxml/parser.h" +//#include "libxslt/xslt.h" +//#include "libxslt/libxslt.h" +#include "libxslt/extensions.h" +#include "libxslt/xsltutils.h" +extern "C" { +#include "libexslt/exslt.h" +}; +#endif + #include "pa_globals.h" #include "pa_string.h" #include "pa_hash.h" #include "pa_sql_driver_manager.h" #include "pa_dictionary.h" -//#include "pa_stylesheet_manager.h" +#include "pa_stylesheet_manager.h" #include "pa_sapi.h" #include "pa_cache_managers.h" #include "pa_charsets.h" #include "pa_charset.h" +#include "pa_threads.h" #ifdef DB2 #include "pa_db_manager.h" #endif -#ifdef XML -//#include "libxml/parser.h" -//#include "libxslt/xslt.h" -//#include "libxslt/libxslt.h" -#include "libxslt/extensions.h" -#include "libexslt/exslt.h" -#endif - String *content_type_name; String *charset_name; String *body_name; @@ -111,6 +117,84 @@ static void setup_hex_value() { hex_value['f'] = 15; } +#ifdef XML + +const int MAX_CONCURRENT_XML_GENERIC_ERROR_THREADS=10; + +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; + } + return 0; +} + +static void +xmlParserGenericErrorFunc(void *ctx, const char *msg, ...) { + 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); + + va_list args; + va_start(args, msg); + vsnprintf(p->message+offset, MAX_STRING, msg, args); + va_end(args); + + break; + } +} + +bool xmlHaveGenericErrors() { + pa_thread_t thread_id=pa_get_thread_id(); + + SYNCHRONIZED; // find blocked + + return xml_generic_error_info(thread_id)!=0; +} + +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 0; + + const char *result=p->message; + + // free slot up + memset(p, 0, sizeof(*p)); + + // it is up to caller to free it + return result; +} +#endif + void pa_globals_destroy(void *) { try { #ifdef XML @@ -127,7 +211,7 @@ void pa_globals_destroy(void *) { } } - +/// @test // replace entities on load. WARNING: in sources there is a hint on one should call this for each thread xmlSubstituteEntitiesDefault(1); void pa_globals_init(Pool& pool) { pool.register_cleanup(pa_globals_destroy, 0); @@ -212,6 +296,7 @@ void pa_globals_init(Pool& pool) { charsets->put(*charset_UTF8_name, utf8_charset=NEW Charset(pool, *charset_UTF8_name, 0/*no file=system*/)); + // Status registration, must be initialized before all registrants cache_managers=NEW Cache_managers(pool); @@ -239,13 +324,33 @@ void pa_globals_init(Pool& pool) { /* * disable CDATA from being built in the document tree */ - xmlDefaultSAXHandler.cdataBlock = NULL; + // never added yet xmlDefaultSAXHandler.cdataBlock = NULL; + + /* + * Initialization function for the XML parser. + * This is not reentrant. Call once before processing in case of + * use in multithreaded programs. + */ + xmlInitParser(); + + // Bit in the loadsubset context field to tell to do ID/REFs lookups + 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 + //never added yet xmlLoadExtDtdDefaultValue |= XML_COMPLETE_ATTRS; + +//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); -/* // XSLT stylesheet manager cache_managers->put(*NEW String(pool, "stylesheet"), stylesheet_manager=NEW Stylesheet_manager(pool)); - */ #endif } @@ -254,11 +359,11 @@ void pa_globals_init(Pool& pool) { # pragma comment(lib, XML_LIBS "/glib/lib/libglib-1.3-11.lib") # pragma comment(lib, XML_LIBS "/libxml2-2.4.12/win32/dsp/libxml2_so/libxml2.lib") # pragma comment(lib, XML_LIBS "/libxslt-1.0.9/win32/dsp/libexslt_so/libexslt.lib") -# pragma comment(lib, XML_LIBS "/libxslt-1.0.9/win32/dsp/libxslt_a/libxslt.lib") +# pragma comment(lib, XML_LIBS "/libxslt-1.0.9/win32/dsp/libxslt_so/libxslt.lib") # ifdef _DEBUG -# pragma comment(lib, XML_LIBS "/gdome2-0.7.0/win32/dsp/Debug/gdome.lib") +# pragma comment(lib, XML_LIBS "/gdome2-0.7.0/win32/dsp/Debug/libgdome.lib") # else -# pragma comment(lib, XML_LIBS "/gdome2-0.7.0/win32/dsp/Release/gdome.lib") +# pragma comment(lib, XML_LIBS "/gdome2-0.7.0/win32/dsp/Release/libgdome.lib") # endif #endif