--- parser3/src/main/pa_globals.C 2003/01/23 17:05:34 1.152.2.2 +++ parser3/src/main/pa_globals.C 2003/03/28 07:51:38 1.152.2.19.2.8 @@ -1,11 +1,11 @@ /** @file Parser: globals. - Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_GLOBALS_C="$Date: 2003/01/23 17:05:34 $"; +static const char* IDENT_GLOBALS_C="$Date: 2003/03/28 07:51:38 $"; #include "pa_config_includes.h" @@ -19,144 +19,9 @@ extern "C" { #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_sapi.h" -#include "pa_cache_managers.h" -#include "pa_charsets.h" -#include "pa_charset.h" #include "pa_threads.h" -#define AUTO_FILE_NAME "auto.p" - -#define CONTENT_TYPE_NAME "content-type" -#define CHARSET_NAME "charset" -#define BODY_NAME "body" -#define DOWNLOAD_NAME "download" -#define VALUE_NAME "value" -#define EXPIRES_NAME "expires" -#define PATH_NAME "path" -#define NAME_NAME "name" -#define NONAME_DAT "noname.dat" -#define SIZE_NAME "size" -#define TEXT_NAME "text" - -#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 RESULT_VAR_NAME "result" -#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 CHARSET_UTF8_NAME "UTF-8" - -#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" - -String content_type_name(CONTENT_TYPE_NAME); -String charset_name(CHARSET_NAME); -String body_name(BODY_NAME); -String download_name(DOWNLOAD_NAME); -String value_name(VALUE_NAME); -String expires_name(EXPIRES_NAME); -String path_name(PATH_NAME); -String name_name(NAME_NAME); -String size_name(SIZE_NAME); -String text_name(TEXT_NAME); - -String content_disposition_name(CONTENT_DISPOSITION_NAME); -String content_disposition_value(CONTENT_DISPOSITION_VALUE); -String content_disposition_filename_name(CONTENT_DISPOSITION_FILENAME_NAME); - -String conf_method_name(CONF_METHOD_NAME); -String auto_method_name(AUTO_METHOD_NAME); - -String main_class_name(MAIN_CLASS_NAME); - -String result_var_name(RESULT_VAR_NAME); -String match_var_name(MATCH_VAR_NAME); - -String exception_var_name(EXCEPTION_VAR_NAME); -String exception_type_part_name(EXCEPTION_TYPE_PART_NAME); -String exception_source_part_name(EXCEPTION_SOURCE_PART_NAME); -String exception_comment_part_name(EXCEPTION_COMMENT_PART_NAME); -String exception_handled_part_name(EXCEPTION_HANDLED_PART_NAME); - -String charsets_name(CHARSETS_NAME); -String mime_types_name(MIME_TYPES_NAME); -String vfile_mime_type_name(VFILE_MIME_TYPE_NAME); -String origins_mode_name(ORIGINS_MODE_NAME); - -String class_path_name(CLASS_PATH_NAME); - -//^switch ^case -String switch_data_name(SWITCH_DATA_NAME); - -//^cache -String cache_data_name(CACHE_DATA_NAME); - -// sql -String sql_limit_name(SQL_LIMIT_NAME); -String sql_offset_name(SQL_OFFSET_NAME); -String sql_default_name(SQL_DEFAULT_NAME); -String sql_distinct_name(SQL_DISTINCT_NAME); - -// charsets -String charset_UTF8_name(CHARSET_UTF8_NAME); - -// hash -String hash_default_element_name(HASH_DEFAULT_ELEMENT_NAME); - -// http -String http_method_name(HTTP_METHOD_NAME); -String http_timeout_name(HTTP_TIMEOUT_NAME); -String http_headers_name(HTTP_HEADERS_NAME); -String http_any_status_name(HTTP_ANY_STATUS_NAME); -String file_status_name(FILE_STATUS_NAME); - - -Table date_calendar_table_template; - -Charset utf8_charset; - short hex_value[0x100]; #ifdef XML @@ -193,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) { @@ -208,7 +89,7 @@ XML_Generic_error_info *xml_generic_erro } static void -xmlParserGenericErrorFunc(void *ctx, const char *msg, ...) { +xmlParserGenericErrorFunc(void *ctx, const char* msg, ...) { pa_thread_t thread_id=pa_get_thread_id(); // infinitely looking for free slot to fill it @@ -224,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; @@ -248,7 +123,7 @@ bool xmlHaveGenericErrors() { return xml_generic_error_info(thread_id)!=0; } -const char *xmlGenericErrors() { +const char* xmlGenericErrors() { pa_thread_t thread_id=pa_get_thread_id(); SYNCHRONIZED; // find+free blocked @@ -257,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(); } /** @@ -275,7 +144,7 @@ const char *xmlGenericErrors() { * Returns 1 if matches, 0 otherwise */ static int -xmlFileMatchLocalhost(const char *filename) { +xmlFileMatchLocalhost(const char* filename) { if (!strncmp(filename, "http://localhost", 16)) return(1); return(0); @@ -294,7 +163,7 @@ xmlFileMatchLocalhost(const char *filena * Returns an I/O context or NULL in case of error */ static void * -xmlFileOpenLocalhost (const char *filename) { +xmlFileOpenLocalhost (const char* filename) { FILE *fd; const char* documentRoot; char path[1000]; @@ -345,65 +214,55 @@ void pa_globals_destroy(void *) { GdomeException exc; gdome_di_unref (domimpl, &exc); #endif - if(cache_managers) - cache_managers->~Cache_managers(); - - charsets->~Charsets(); - } catch(const Exception& e) { - SAPI::die("pa_globals_destroy failed: %s", e.comment()); + SAPI::abort("pa_globals_destroy failed: %s", e.comment()); } } +#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; +} +//static void pa_GC_nofree(void *) {} +#endif + /// @test hint on one should call this for each thread xmlSubstituteEntitiesDefault(1); void pa_globals_init() { // hex value setup_hex_value(); - // date_calendar_table_template - { - Array *columns=NEW Array(pool); - for(int i=0; i<=6; i++) { - char *column=(char *)pool.malloc(MAX_NUMBER); - snprintf(column, MAX_NUMBER, "%d", i); - *columns+=NEW String(pool, column); // .i column name - } - *columns+=NEW String(pool, DATE_CALENDAR_WEEKNO_NAME); - *columns+=NEW String(pool, DATE_CALENDAR_WEEKYEAR_NAME); - date_calendar_table_template=NEW Table(pool, 0, columns); - } - - // charsets - charsets=NEW Charsets(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); - - // SQL driver manager - cache_managers->put(*NEW String(pool, "sql"), - SQL_driver_manager=NEW SQL_Driver_manager(pool)); - #ifdef XML + // initializing xml libs - /* First I get a DOMImplementation reference */ + // asking to use GC memory + xmlMemSetup( + /*xmlFreeFunc */GC_free,//pa_GC_nofree + /*xmlMallocFunc */GC_malloc, + /*xmlReallocFunc */GC_realloc, + /*xmlStrdupFunc */pa_GC_strdup); + + /* 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 @@ -424,7 +283,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; @@ -432,7 +291,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"); @@ -442,10 +300,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 }