--- parser3/src/main/pa_globals.C 2003/02/04 12:08:57 1.152.2.13 +++ parser3/src/main/pa_globals.C 2003/03/25 13:58:38 1.152.2.19.2.5 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_GLOBALS_C="$Date: 2003/02/04 12:08:57 $"; +static const char* IDENT_GLOBALS_C="$Date: 2003/03/25 13:58:38 $"; #include "pa_config_includes.h" @@ -22,64 +22,6 @@ extern "C" { #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" - - -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)); - - -//^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)); - short hex_value[0x100]; #ifdef XML @@ -116,9 +58,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* get_and_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) { @@ -147,16 +105,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; @@ -180,13 +132,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->get_and_reset(); } /** @@ -269,7 +215,7 @@ 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()); } } @@ -285,17 +231,17 @@ void pa_globals_init() { /* First I 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 @@ -316,7 +262,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; @@ -324,7 +270,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"); @@ -334,10 +279,6 @@ 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 }