--- parser3/src/main/pa_globals.C 2013/07/30 22:35:43 1.191 +++ parser3/src/main/pa_globals.C 2020/12/15 00:21:33 1.210 @@ -1,7 +1,7 @@ /** @file Parser: globals. - Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ @@ -13,70 +13,50 @@ #include "libxslt/xsltutils.h" extern "C" { #include "libexslt/exslt.h" -}; +} #endif #include "pa_globals.h" -#include "pa_string.h" +#include "pa_socks.h" #include "pa_sapi.h" #include "pa_threads.h" #include "pa_xml_io.h" #include "pa_common.h" +#include "pa_symbols.h" #include "pa_cache_managers.h" #include "ltdl.h" #include "pcre.h" -volatile const char * IDENT_PA_GLOBALS_C="$Id: pa_globals.C,v 1.191 2013/07/30 22:35:43 moko Exp $" IDENT_PA_GLOBALS_H IDENT_PA_SAPI_H; +volatile const char * IDENT_PA_GLOBALS_C="$Id: pa_globals.C,v 1.210 2020/12/15 00:21:33 moko Exp $" IDENT_PA_GLOBALS_H IDENT_PA_SAPI_H; // defines //#define PA_DEBUG_XML_GC_MEMORY -//20051130 trying to remove this, author claims that fixed a lot there // 20040920 for now both workarounds needed. wait for new libxml/xsl versions -// // there is a problem with testcase, it's unstable. -// // see paf@six/bug20040920/cgi-bin/t for it-showed-bug-on-20040920-day -// #define PA_WORKAROUND_BUGGY_FREE_IN_LIBXML_GC_MEMORY -// #define PA_WORKAROUND_BUGGY_MALLOCATOMIC_IN_LIBXML_GC_MEMORY - // globals -short hex_value[0x100]; - -static void setup_hex_value() { - memset(hex_value, 0, sizeof(hex_value)); - hex_value['0'] = 0; - hex_value['1'] = 1; - hex_value['2'] = 2; - hex_value['3'] = 3; - hex_value['4'] = 4; - hex_value['5'] = 5; - hex_value['6'] = 6; - hex_value['7'] = 7; - hex_value['8'] = 8; - hex_value['9'] = 9; - hex_value['A'] = 10; - hex_value['B'] = 11; - hex_value['C'] = 12; - hex_value['D'] = 13; - hex_value['E'] = 14; - hex_value['F'] = 15; - hex_value['a'] = 10; - hex_value['b'] = 11; - hex_value['c'] = 12; - hex_value['d'] = 13; - hex_value['e'] = 14; - hex_value['f'] = 15; -} +short hex_value[0x100] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, + 0, 10, 11, 12, 13, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 10, 11, 12, 13, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; -THREAD_LOCAL Request* thread_request=NULL; +THREAD_LOCAL Request* thread_request=NULL; // every TLS should be referenced elsewhere, or GC will collect it void pa_register_thread_request(Request& r) { thread_request=&r; } + /// retrives request set by pa_set_request function, useful in contextless places [slow] Request& pa_thread_request() { + if(!thread_request) + throw Exception(0, 0, "request is not initialized"); return *thread_request; } @@ -123,7 +103,7 @@ const char* xmlGenericErrors() { return 0; // no errors for our thread_id registered } -#endif +#endif // XML #ifdef XML @@ -132,7 +112,8 @@ static char *pa_GC_strdup(const char *s) return 0; size_t size=strlen(s)+1; - char *result=(char *)pa_gc_malloc_atomic(size); + char *result=(char *)GC_MALLOC_ATOMIC(size); + if(!result) pa_fail_alloc("duplicate XML string",size); @@ -146,27 +127,27 @@ static char *pa_GC_strdup(const char *s) #ifdef PA_DEBUG_XML_GC_MEMORY static void* pa_gc_malloc_log(size_t size){ - void *p=pa_gc_malloc(size); + void *p=GC_MALLOC(size); fprintf(stderr, "pa_gc_malloc_log(%d)=0x%p\n", size, p); return p; } static void* pa_gc_malloc_atomic_log(size_t size){ - void *p=pa_gc_malloc_atomic(size); + void *p=GC_MALLOC_ATOMIC(size); fprintf(stderr, "pa_gc_malloc_atomic_log(%d)=0x%p\n", size, p); return p; } static void* pa_gc_realloc_log(void *ptr, size_t size){ - void *p=pa_gc_realloc(ptr, size); + void *p=GC_REALLOC(ptr, size); fprintf(stderr, "pa_gc_realloc_log(0x%p, %d)=0x%p\n", ptr, size, p); return p; } static void pa_gc_free_log(void *p){ fprintf(stderr, "pa_gc_free_log(0x%p)\n", p); - pa_gc_free(p); + GC_FREE(p); } #else @@ -178,23 +159,24 @@ inline void *check(void *result, const c } static void* pa_gc_malloc_nonull(size_t size) { - return check(pa_gc_malloc(size), "allocate XML compsite memory", size); + return check(GC_MALLOC(size), "allocate XML compsite memory", size); } static void* pa_gc_malloc_atomic_nonull(size_t size) { - return check(pa_gc_malloc_atomic(size), "allocate XML atomic memory", size); + return check(GC_MALLOC_ATOMIC(size), "allocate XML atomic memory", size); } static void* pa_gc_realloc_nonull(void* ptr, size_t size) { - return check(pa_gc_realloc(ptr, size), "reallocate XML memory", size); + return check(GC_REALLOC(ptr, size), "reallocate XML memory", size); } static void pa_gc_free_maybeignore(void* ptr) { - pa_gc_free(ptr); + GC_FREE(ptr); } #endif -#endif + +#endif // XML void pa_CORD_oom_fn(void) { pa_fail_alloc("expand string", 0); @@ -226,8 +208,8 @@ static void gc_substitute_memory_managem #endif // pcre - pcre_malloc=pa_gc_malloc; - pcre_free=pa_gc_free; + pcre_malloc=pa_malloc; + pcre_free=pa_free; // cord CORD_oom_fn=pa_CORD_oom_fn; @@ -237,15 +219,28 @@ static void gc_substitute_memory_managem @test hint on one should call this for each thread xmlSubstituteEntitiesDefault(1); */ void pa_globals_init() { - // global variables - cache_managers=new Cache_managers; +#ifndef PA_DEBUG_DISABLE_GC + // Dont collect unless explicitly requested. This is quicker (~30% ), + // but less memory-efficient(~8%), so deciding for speed. + GC_disable(); + // as we log allocation errors, we don't need default gc warnings (without timestamp and URI) + GC_set_warn_proc(GC_ignore_warn_proc); +#endif + + // init socks + pa_socks_init(); + + // global variables + cache_managers=new Cache_managers; // in various libraries gc_substitute_memory_management_functions(); - // hex value - setup_hex_value(); +#ifdef SYMBOLS_CACHING + // symbols cache + Symbols::init(); +#endif #ifdef XML // initializing xml libs @@ -286,7 +281,7 @@ void pa_globals_init() { xmlSetGenericErrorFunc(0, xmlParserGenericErrorFunc); xsltSetGenericErrorFunc(0, xmlParserGenericErrorFunc); -// FILE *f=fopen("y:\\xslt.log", "wt"); +// FILE *f=fopen("xslt.log", "wt"); // xsltSetGenericDebugFunc(f/*stderr*/, 0); pa_xml_io_init(); @@ -301,60 +296,67 @@ void pa_globals_done() { if(is_dlinited) lt_dlexit(); + + pa_socks_done(); } void pa_dlinit() { if(!is_dlinited){ if(lt_dlinit()) - throw Exception(0,0,"prepare to dynamic libary loading failed, %s", lt_dlerror()); + throw Exception(0,0,"preparation for dynamic library loading failed, %s", lt_dlerror()); is_dlinited=true; } } #ifdef _MSC_VER -#ifndef PA_DEBUG_DISABLE_GC +#define PREFIX "../../../../win32/" -#define GC_LIB "../../../../win32/gc" #ifdef _DEBUG -#pragma comment(lib, GC_LIB "/Debug/gc.lib") +#define CONFIGURATION "Debug" #else -#pragma comment(lib, GC_LIB "/Release/gc.lib") +#define CONFIGURATION "Release" #endif +#ifdef _WIN64 +#define PLATFORM_64 "x64/" +#define PLATFORM_32 "" +#else +#define PLATFORM_64 "" +#define PLATFORM_32 "win32/" #endif +#pragma comment(lib, PREFIX "pcre/" PLATFORM_64 CONFIGURATION "/pcre.lib") + +#ifndef PA_DEBUG_DISABLE_GC + +#pragma comment(lib, PREFIX "gc/" PLATFORM_64 CONFIGURATION "/gc.lib") + +#endif // PA_DEBUG_DISABLE_GC + #ifdef XML -#define GNOME_LIBS "../../../../win32/gnome" +#define GNOME_LIBS PREFIX "gnome" -#ifdef _DEBUG -#define LIB_XML GNOME_LIBS "/libxml2-x.x.x/win32/debug/lib/" -#define LIB_XSLT GNOME_LIBS "/libxslt-x.x.x/win32/debug/lib/" -#else -#define LIB_XML GNOME_LIBS "/libxml2-x.x.x/win32/release/lib/" -#define LIB_XSLT GNOME_LIBS "/libxslt-x.x.x/win32/release/lib/" -#endif +#define LIB_XML PREFIX "gnome/libxml2-x.x.x/" PLATFORM_64 PLATFORM_32 CONFIGURATION "/lib/" +#define LIB_XSLT PREFIX "gnome/libxslt-x.x.x/" PLATFORM_64 PLATFORM_32 CONFIGURATION "/lib/" -#ifdef LIBXML_STATIC +#ifdef XML_STATIC #pragma comment(lib, LIB_XML "libxml2_a.lib") -#else -#pragma comment(lib, LIB_XML "libxml2.lib") -#endif - -#ifdef LIBXSLT_STATIC #pragma comment(lib, LIB_XSLT "libxslt_a.lib") -#else -#pragma comment(lib, LIB_XSLT "libxslt.lib") -#endif - -#ifdef LIBEXSLT_STATIC #pragma comment(lib, LIB_XSLT "libexslt_a.lib") #else +#pragma comment(lib, LIB_XML "libxml2.lib") +#pragma comment(lib, LIB_XSLT "libxslt.lib") #pragma comment(lib, LIB_XSLT "libexslt.lib") #endif -#endif +#endif // XML +// defines for VS2015 to link with gc/xml libs compiled in the previous VS versions +#if _MSC_VER >= 1900 +#pragma comment(lib,"legacy_stdio_definitions.lib") #endif + +#endif // _MSC_VER