--- parser3/src/main/pa_globals.C 2001/09/20 14:25:06 1.75 +++ parser3/src/main/pa_globals.C 2001/11/19 12:17:06 1.92 @@ -2,27 +2,25 @@ Parser: globals. Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexander Petrosyan (http://paf.design.ru) - Author: Alexander Petrosyan (http://design.ru/paf) + $Id: pa_globals.C,v 1.92 2001/11/19 12:17:06 paf Exp $ */ -static const char *RCSId="$Id: pa_globals.C,v 1.75 2001/09/20 14:25:06 parser Exp $"; - -#if _MSC_VER -# pragma warning(disable:4291) // disable warning -// "no matching operator delete found; memory will not be freed if initialization throws an exception -#endif - -#include -#include #include "pa_globals.h" #include "pa_string.h" #include "pa_hash.h" #include "pa_sql_driver_manager.h" -#include "pa_xslt_stylesheet_manager.h" #include "pa_dictionary.h" +#include "pa_stylesheet_manager.h" +#include "pa_charset_manager.h" +#include "pa_sapi.h" +#include "pa_cache_managers.h" + +#ifdef DB2 +#include "pa_db_manager.h" +#endif -String *user_html_name; String *content_type_name; String *charset_name; String *body_name; @@ -40,7 +38,6 @@ String *content_disposition_name; String *content_disposition_filename_name; String *unnamed_name; -String *empty_string; String *auto_method_name; String *main_method_name; @@ -54,13 +51,7 @@ String *string_match_name; String *string_post_match_name; String *defaults_name; -String *ctype_name; -String *ctype_white_space_name; -String *ctype_digit_name; -String *ctype_hex_digit_name; -String *ctype_letter_name; -String *ctype_word_name; -String *ctype_lowercase_name; +String *charsets_name; String *mime_types_name; String *vfile_mime_type_name; String *origins_mode_name; @@ -108,7 +99,37 @@ static void setup_hex_value() { hex_value['f'] = 15; } +void pa_globals_destroy(void *) { + try { + // SQL driver manager + if(SQL_driver_manager) + SQL_driver_manager->~SQL_Driver_manager(); + +#ifdef DB2 + // DB driver manager + if(DB_manager) + DB_manager->~DB_Manager(); +#endif + +#ifdef XML + // XSLT stylesheet driver manager + if(stylesheet_manager) + stylesheet_manager->~Stylesheet_manager(); +#endif + + // Charset manager + if(charset_manager) + charset_manager->~Charset_manager(); + + } catch(const Exception& e) { + SAPI::die("pa_globals_destroy failed: %s", e.comment()); + } +} + + void pa_globals_init(Pool& pool) { + pool.register_cleanup(pa_globals_destroy, 0); + #undef NEW #define NEW new(pool) @@ -116,7 +137,6 @@ void pa_globals_init(Pool& pool) { setup_hex_value(); // names - user_html_name=NEW String(pool, USER_HTML_NAME); content_type_name=NEW String(pool, CONTENT_TYPE_NAME); charset_name=NEW String(pool, CHARSET_NAME); body_name=NEW String(pool, BODY_NAME); @@ -134,7 +154,6 @@ void pa_globals_init(Pool& pool) { content_disposition_filename_name=NEW String(pool, CONTENT_DISPOSITION_FILENAME_NAME); unnamed_name=NEW String(pool, UNNAMED_NAME); - empty_string=NEW String(pool); auto_method_name=NEW String(pool, AUTO_METHOD_NAME); main_method_name=NEW String(pool, MAIN_METHOD_NAME); @@ -149,13 +168,7 @@ void pa_globals_init(Pool& pool) { defaults_name=NEW String(pool, DEFAULTS_NAME); - ctype_name=NEW String(pool, CTYPE_NAME); - ctype_white_space_name=NEW String(pool, CTYPE_WHITE_SPACE_NAME); - ctype_digit_name=NEW String(pool, CTYPE_DIGIT_NAME); - ctype_hex_digit_name=NEW String(pool, CTYPE_HEX_DIGIT_NAME); - ctype_letter_name=NEW String(pool, CTYPE_LETTER_NAME); - ctype_word_name=NEW String(pool, CTYPE_WORD_NAME); - ctype_lowercase_name=NEW String(pool, CTYPE_LOWERCASE_NAME); + charsets_name=NEW String(pool, CHARSETS_NAME); mime_types_name=NEW String(pool, MIME_TYPES_NAME); vfile_mime_type_name=NEW String(pool, VFILE_MIME_TYPE_NAME); origins_mode_name=NEW String(pool, ORIGINS_MODE_NAME); @@ -177,20 +190,19 @@ void pa_globals_init(Pool& pool) { // hashes untaint_lang_name2enum=NEW Hash(pool); - #define ULN(var, cstr, LANG) \ - String var(pool, cstr); \ - untaint_lang_name2enum->put(var, (int)String::UL_##LANG); - ULN(as_is, "as-is", AS_IS); - ULN(file_name, "file-spec", FILE_SPEC); - ULN(http_header, "http-header", HTTP_HEADER); - ULN(mail_header, "mail-header", MAIL_HEADER); - ULN(uri, "uri", URI); - ULN(table, "table", TABLE); - ULN(sql, "sql", SQL); - ULN(js, "js", JS); - ULN(xml, "xml", XML); - ULN(html, "html", HTML); - ULN(user_html, "user-html", USER_HTML); + #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); // tables Table *default_typo_table=NEW Table(pool, 0, 0); @@ -208,16 +220,65 @@ void pa_globals_init(Pool& pool) { DT_ROW("\\n", "
"); default_typo_dict=NEW Dictionary(*default_typo_table); - // SQL driver manager - SQL_driver_manager=NEW SQL_Driver_manager(pool); + // Status registration, must be initialized before all registrants + cache_managers=NEW Cache_managers(pool); - // Xerces & Xalan + // SQL driver manager + cache_managers->put(*NEW String(pool, "sql"), + SQL_driver_manager=NEW SQL_Driver_manager(pool)); - // Use the static initializers to initialize the Xalan-C++ and Xerces-C++ platforms. - // You must initialize Xerces-C++ once per process - XMLPlatformUtils::Initialize(); - XalanTransformer::initialize(); +#ifdef DB2 + // DB driver manager + cache_managers->put(*NEW String(pool, "db"), + DB_manager=NEW DB_Manager(pool)); +#endif +#ifdef XML // XSLT stylesheet driver manager - XSLT_stylesheet_manager=NEW XSLT_Stylesheet_manager(pool); + cache_managers->put(*NEW String(pool, "stylesheet"), + stylesheet_manager=NEW Stylesheet_manager(pool)); +#endif + + // Charset manager + cache_managers->put(*NEW String(pool, "charset"), + charset_manager=NEW Charset_manager(pool)); } + +#if defined(XML) && defined(_MSC_VER) +# define XERCES_BUILD_WIN32_BUILD "/parser3project/win32xml/xml-xerces/c/Build/Win32/VC6" +# define XALAN_BUILD_WIN32_BUILD "/parser3project/win32xml/xml-xalan/c/Build/Win32/VC6" +# ifdef _DEBUG +# pragma comment(lib, XERCES_BUILD_WIN32_BUILD "/Debug/xerces-c_1D.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Debug/XSLTD.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Debug/XPathD.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Debug/XalanTransformerD.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Debug/XalanDOMD.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Debug/DOMSupportD.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Debug/PlatformSupportD.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Debug/XMLSupportD.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Debug/XercesParserLiaisonD.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Debug/XalanSourceTreeD.lib") +# else +# pragma comment(lib, XERCES_BUILD_WIN32_BUILD "/Release/xerces-c_1.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Release/XalanSourceTree.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Release/PlatformSupport.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Release/XalanDOM.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Release/DOMSupport.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Release/XalanTransformer.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Release/XercesParserLiaison.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Release/XMLSupport.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Release/XPath.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Release/XSLT.lib") +# endif +#endif + + +#if defined(DB2) && defined(_MSC_VER) +# define LIBDB2_WIN32_BUILD "/parser3project/win32db/lib" +# ifdef _DEBUG +# pragma comment(lib, LIBDB2_WIN32_BUILD "/debug/libdb.lib") +# else +# pragma comment(lib, LIBDB2_WIN32_BUILD "/release/libdb.lib") +# endif +#endif +