--- parser3/src/main/pa_globals.C 2002/09/17 10:58:24 1.139 +++ parser3/src/main/pa_globals.C 2003/02/14 16:52:21 1.152.2.15 @@ -1,11 +1,11 @@ /** @file Parser: globals. - Copyright (c) 2001, 2002 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: 2002/09/17 10:58:24 $"; +static const char* IDENT_GLOBALS_C="$Date: 2003/02/14 16:52:21 $"; #include "pa_config_includes.h" @@ -19,70 +19,12 @@ 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" -String *content_type_name; -String *charset_name; -String *body_name; -String *value_name; -String *expires_name; -String *path_name; -String *name_name; -String *size_name; -String *text_name; - -String *content_disposition_name; -String *content_disposition_filename_name; - -String *conf_method_name; -String *auto_method_name; - -String *main_class_name; - -String *result_var_name; -String *match_var_name; - -String *exception_var_name; -String *exception_type_part_name; -String *exception_source_part_name; -String *exception_comment_part_name; -String *exception_handled_part_name; - -String *charsets_name; -String *mime_types_name; -String *vfile_mime_type_name; -String *origins_mode_name; - -String *class_path_name; - -String *switch_data_name; - -String *cache_data_name; - -String *sql_limit_name; -String *sql_offset_name; -String *sql_default_name; -String *sql_distinct_name; - -String *charset_UTF8_name; - -String *hash_default_element_name; - -Table *string_match_table_template; - -Table *date_calendar_table_template; - -Hash *untaint_lang_name2enum; - -Charset *utf8_charset; +#ifdef XML +#include "pa_stylesheet_manager.h" +#endif short hex_value[0x100]; @@ -135,7 +77,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 @@ -175,7 +117,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 @@ -184,7 +126,7 @@ const char *xmlGenericErrors() { if(!p) // no errors for our thread_id registered return 0; - const char *result=p->message; + const char* result=p->message; // free slot up memset(p, 0, sizeof(*p)); @@ -202,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); @@ -221,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]; @@ -249,33 +191,18 @@ xmlFileOpenLocalhost (const char *filena * Returns the number of bytes written */ static int -xmlFileRead (void * context, char * buffer, int len) { +pa_xmlFileRead (void * context, char * buffer, int len) { return(fread(&buffer[0], 1, len, (FILE *) context)); } /** - * xmlFileWrite: - * @context: the I/O context - * @buffer: where to drop data - * @len: number of bytes to write - * - * Write @len bytes from @buffer to the I/O channel. - * - * Returns the number of bytes written - */ -static int -xmlFileWrite (void * context, const char * buffer, int len) { - return(fwrite(&buffer[0], 1, len, (FILE *) context)); -} - -/** * xmlFileClose: * @context: the I/O context * * Close an I/O channel */ static int -xmlFileClose (void * context) { +pa_xmlFileClose (void * context) { return ( ( fclose((FILE *) context) == EOF ) ? -1 : 0 ); } @@ -287,134 +214,18 @@ 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()); } } -/// @test hint on one should call this for each thread xmlSubstituteEntitiesDefault(1); -void pa_globals_init(Pool& pool) { - pool.register_cleanup(pa_globals_destroy, 0); - #undef NEW - #define NEW new(pool) +/// @test hint on one should call this for each thread xmlSubstituteEntitiesDefault(1); +void pa_globals_init() { // hex value setup_hex_value(); - // names - content_type_name=NEW String(pool, CONTENT_TYPE_NAME); - charset_name=NEW String(pool, CHARSET_NAME); - body_name=NEW String(pool, BODY_NAME); - value_name=NEW String(pool, VALUE_NAME); - expires_name=NEW String(pool, EXPIRES_NAME); - path_name=NEW String(pool, PATH_NAME); - name_name=NEW String(pool, NAME_NAME); - size_name=NEW String(pool, SIZE_NAME); - text_name=NEW String(pool, TEXT_NAME); - - content_disposition_name=NEW String(pool, CONTENT_DISPOSITION_NAME); - content_disposition_filename_name=NEW String(pool, CONTENT_DISPOSITION_FILENAME_NAME); - - conf_method_name=NEW String(pool, CONF_METHOD_NAME); - auto_method_name=NEW String(pool, AUTO_METHOD_NAME); - - main_class_name=NEW String(pool, MAIN_CLASS_NAME); - - result_var_name=NEW String(pool, RESULT_VAR_NAME); - match_var_name=NEW String(pool, MATCH_VAR_NAME); - - exception_var_name=NEW String(pool, EXCEPTION_VAR_NAME); - exception_type_part_name=NEW String(pool, EXCEPTION_TYPE_PART_NAME); - exception_source_part_name=NEW String(pool, EXCEPTION_SOURCE_PART_NAME); - exception_comment_part_name=NEW String(pool, EXCEPTION_COMMENT_PART_NAME); - exception_handled_part_name=NEW String(pool, EXCEPTION_HANDLED_PART_NAME); - - charsets_name=NEW String(pool, CHARSETS_NAME); - mime_types_name=NEW String(pool, MIME_TYPES_NAME); - origins_mode_name=NEW String(pool, ORIGINS_MODE_NAME); - - class_path_name=NEW String(pool, CLASS_PATH_NAME); - - //^switch ^case - switch_data_name=NEW String(pool, SWITCH_DATA_NAME); - - //^cache - cache_data_name=NEW String(pool, CACHE_DATA_NAME); - - // sql - sql_limit_name=NEW String(pool, SQL_LIMIT_NAME); - sql_offset_name=NEW String(pool, SQL_OFFSET_NAME); - sql_default_name=NEW String(pool, SQL_DEFAULT_NAME); - sql_distinct_name=NEW String(pool, SQL_DISTINCT_NAME); - - // charsets - charset_UTF8_name=NEW String(pool, CHARSET_UTF8_NAME); - - // hash - hash_default_element_name=NEW String(pool, HASH_DEFAULT_ELEMENT_NAME); - - // hashes - untaint_lang_name2enum=NEW Hash(pool); - #define ULN(cstr, LANG) \ - untaint_lang_name2enum->put(*NEW String(pool, cstr), (int)String::UL_##LANG); - ULN("as-is", AS_IS); - ULN("file-spec", FILE_SPEC); - ULN("http-header", HTTP_HEADER); - ULN("mail-header", MAIL_HEADER); - ULN("uri", URI); - ULN("table", TABLE); - ULN("sql", SQL); - ULN("js", JS); - ULN("xml", XML); - ULN("html", HTML); - ULN("optimized-html", HTML|String::UL_OPTIMIZE_BIT); - - // string_match_table_template - { - Array *columns=NEW Array(pool); - *columns+=NEW String(pool, STRING_PRE_MATCH_NAME); - *columns+=NEW String(pool, STRING_MATCH_NAME); - *columns+=NEW String(pool, STRING_POST_MATCH_NAME); - for(int i=1; i<=MAX_STRING_MATCH_TABLE_COLUMNS; i++) { - char *column=(char *)pool.malloc(MAX_NUMBER); - snprintf(column, MAX_NUMBER, "%d", i); - *columns+=NEW String(pool, column); // .i column name - } - string_match_table_template=NEW Table(pool, 0, columns); - } - - // 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 @@ -468,7 +279,7 @@ void pa_globals_init(Pool& pool) { // http://localhost/abc -> $ENV{DOCUMENT_ROOT}/abc | ./abc xmlRegisterInputCallbacks( xmlFileMatchLocalhost, xmlFileOpenLocalhost, - xmlFileRead, xmlFileClose); + pa_xmlFileRead, pa_xmlFileClose); // XSLT stylesheet manager cache_managers->put(*NEW String(pool, "stylesheet"),