--- parser3/src/main/pa_globals.C 2005/12/09 07:18:07 1.179 +++ parser3/src/main/pa_globals.C 2012/03/16 09:24:13 1.187 @@ -1,12 +1,10 @@ /** @file Parser: globals. - Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_GLOBALS_C="$Date: 2005/12/09 07:18:07 $"; - #include "pa_config_includes.h" #ifdef XML @@ -18,8 +16,6 @@ extern "C" { }; #endif -#include "pcre.h" - #include "pa_globals.h" #include "pa_string.h" #include "pa_sapi.h" @@ -29,6 +25,10 @@ extern "C" { #include "pa_cache_managers.h" +#include "pcre.h" + +volatile const char * IDENT_PA_GLOBALS_C="$Id: pa_globals.C,v 1.187 2012/03/16 09:24:13 moko Exp $" IDENT_PA_GLOBALS_H IDENT_PA_SAPI_H; + // defines //#define PA_DEBUG_XML_GC_MEMORY @@ -43,10 +43,6 @@ extern "C" { short hex_value[0x100]; -#ifdef XML -GdomeDOMImplementation *domimpl; -#endif - static void setup_hex_value() { memset(hex_value, 0, sizeof(hex_value)); hex_value['0'] = 0; @@ -73,14 +69,14 @@ static void setup_hex_value() { hex_value['f'] = 15; } +THREAD_LOCAL Request* thread_request=NULL; -Hash thread_request; void pa_register_thread_request(Request& r) { - thread_request.put(pa_get_thread_id(), &r); + thread_request=&r; } /// retrives request set by pa_set_request function, useful in contextless places [slow] Request& pa_thread_request() { - return *thread_request.get(pa_get_thread_id()); + return *thread_request; } #ifdef PA_RELEASE_ASSERTS @@ -105,21 +101,13 @@ public: } }; -static Hash xml_generic_error_infos; +THREAD_LOCAL XML_Generic_error_info* xml_generic_error_info = NULL; static void xmlParserGenericErrorFunc(void * /*ctx*/, const char* msg, ...) { -//_asm int 3; - pa_thread_t thread_id=pa_get_thread_id(); - XML_Generic_error_info* p; - { - SYNCHRONIZED; // find+fill blocked - - // first try to get existing for this thread_id - p=xml_generic_error_infos.get(thread_id); - if(!p) // occupy empty one - xml_generic_error_infos.put(thread_id, (p=new(PointerFreeGC) XML_Generic_error_info)); - } + + if(!(p=xml_generic_error_info)) // occupy empty one + p=xml_generic_error_info=new(PointerFreeGC) XML_Generic_error_info; va_list args; va_start(args, msg); @@ -128,20 +116,12 @@ static void xmlParserGenericErrorFunc(vo } bool xmlHaveGenericErrors() { - pa_thread_t thread_id=pa_get_thread_id(); - - SYNCHRONIZED; // find blocked - - return xml_generic_error_infos.get(thread_id)!=0; + return xml_generic_error_info!=0; } const char* xmlGenericErrors() { - pa_thread_t thread_id=pa_get_thread_id(); - - SYNCHRONIZED; // find+free blocked - - if(XML_Generic_error_info *p=xml_generic_error_infos.get(thread_id)) { - xml_generic_error_infos.remove(thread_id); + if(XML_Generic_error_info *p=xml_generic_error_info) { + xml_generic_error_info=0; return p->get(); } @@ -150,19 +130,6 @@ const char* xmlGenericErrors() { #endif -void pa_globals_destroy(void *) { - try { -#ifdef XML - GdomeException exc; - gdome_di_unref (domimpl, &exc); - // uncomment SAPI::abort below if adding potential-throw code here -#endif - } catch(.../*const Exception& e*/) { -// SAPI::abort("pa_globals_destroy failed: %s", e.comment()); - } -} - - #ifdef XML static char *pa_GC_strdup(const char *s) { @@ -172,7 +139,7 @@ static char *pa_GC_strdup(const char *s) size_t size=strlen(s)+1; char *result=(char *)GC_MALLOC_ATOMIC(size); if(!result) - SAPI::abort("out of memory (while duplicating XML string [size=%d])", size); + pa_fail_alloc("duplicate XML string",size); memcpy(result, s, size); #ifdef PA_DEBUG_XML_GC_MEMORY @@ -239,22 +206,22 @@ static void pa_gc_free_log(void *p){ inline void *check(void *result, const char *where, size_t size) { if(!result) - SAPI::abort("out of memory (while %s [size=%d])", where, size); + pa_fail_alloc(where, size); return result; } static void* pa_gc_malloc_nonull(size_t size) { - return check(pa_gc_malloc(size), "allocating XML compsite memory", size); + return check(pa_gc_malloc(size), "allocate XML compsite memory", size); } static void* pa_gc_malloc_atomic_nonull(size_t size) { #ifdef PA_WORKAROUND_BUGGY_MALLOCATOMIC_IN_LIBXML_GC_MEMORY - return check(pa_gc_malloc(size), "allocating XML composite memory (asked atomic)", size); + return check(pa_gc_malloc(size), "allocate XML composite memory (asked atomic)", size); #else - return check(pa_gc_malloc_atomic(size), "allocating XML atomic memory", size); + return check(pa_gc_malloc_atomic(size), "allocate XML atomic memory", size); #endif } static void* pa_gc_realloc_nonull(void* ptr, size_t size) { - return check(pa_gc_realloc(ptr, size), "reallocating XML memory", size); + return check(pa_gc_realloc(ptr, size), "reallocate XML memory", size); } static void pa_gc_free_maybeignore( @@ -272,7 +239,7 @@ static void pa_gc_free_maybeignore( #endif void pa_CORD_oom_fn(void) { - SAPI::abort("out of memory (while expanding string)"); + pa_fail_alloc("expand string", 0); } /** @@ -335,8 +302,6 @@ void pa_globals_init() { #ifdef XML // initializing xml libs - /* First get a DOMImplementation reference */ - domimpl = gdome_di_mkref (); /* * Register the EXSLT extensions and the test module */ @@ -401,9 +366,13 @@ void pa_globals_done() { #endif -#ifdef XML -# define GNOME_LIBS "../../../../win32/gnome" +#define GNOME_LIBS "../../../../win32/gnome" + +#ifdef WITH_MAILRECEIVE # pragma comment(lib, GNOME_LIBS "/glib/lib/libglib-1.3-11.lib") +#endif + +#ifdef XML # ifdef _DEBUG # ifdef LIBXML_STATIC @@ -423,12 +392,6 @@ void pa_globals_done() { # pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/debug/lib/libexslt.lib") # endif -# ifdef LIBGDOME_STATIC -# pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/DebugStatic/libgdome.lib") -# else -# pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/DebugDynamic/libgdome.lib") -# endif - #else # ifdef LIBXML_STATIC @@ -448,12 +411,6 @@ void pa_globals_done() { # pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/release/lib/libexslt.lib") # endif -# ifdef LIBGDOME_STATIC -# pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/ReleaseStatic/libgdome.lib") -# else -# pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/ReleaseDynamic/libgdome.lib") -# endif - # endif #endif