--- parser3/src/main/pa_globals.C 2013/07/23 15:08:44 1.190 +++ parser3/src/main/pa_globals.C 2016/05/24 11:01:19 1.195 @@ -1,7 +1,7 @@ /** @file Parser: globals. - Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ @@ -13,11 +13,10 @@ #include "libxslt/xsltutils.h" extern "C" { #include "libexslt/exslt.h" -}; +} #endif #include "pa_globals.h" -#include "pa_string.h" #include "pa_sapi.h" #include "pa_threads.h" #include "pa_xml_io.h" @@ -28,33 +27,26 @@ extern "C" { #include "ltdl.h" #include "pcre.h" -volatile const char * IDENT_PA_GLOBALS_C="$Id: pa_globals.C,v 1.190 2013/07/23 15:08:44 moko Exp $" IDENT_PA_GLOBALS_H IDENT_PA_SAPI_H; +volatile const char * IDENT_PA_GLOBALS_C="$Id: pa_globals.C,v 1.195 2016/05/24 11:01:19 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]; +short hex_value[0x100]={0}; 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['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; @@ -123,7 +115,7 @@ const char* xmlGenericErrors() { return 0; // no errors for our thread_id registered } -#endif +#endif // XML #ifdef XML @@ -133,6 +125,7 @@ static char *pa_GC_strdup(const char *s) size_t size=strlen(s)+1; char *result=(char *)pa_gc_malloc_atomic(size); + if(!result) pa_fail_alloc("duplicate XML string",size); @@ -144,94 +137,58 @@ static char *pa_GC_strdup(const char *s) } #ifdef PA_DEBUG_XML_GC_MEMORY -void *pa_look_for[]={(void*)0x84ba980,(void*)0x8969460,(void*)0x0,(void*)0x0, - (void*)0x0,(void*)0x0,(void*)0x0,(void*)0x0}; -bool pa_looked(void*p) { - for(int i=0; i<8; i++) - if(pa_look_for[i]==p) { - __asm__("int $3"); - return true; - } - if((((int)p)&~0xFF)==0x89a7700) { - __asm__("int $3"); - return true; - } - return false; -} + static void* pa_gc_malloc_log(size_t size){ void *p=pa_gc_malloc(size); fprintf(stderr, "pa_gc_malloc_log(%d)=0x%p\n", size, p); - if(pa_looked(p)) - fprintf(stderr,"catched debug malloc(%d)=0x%p\n", size, p); return p; } + static void* pa_gc_malloc_atomic_log(size_t size){ -#ifdef PA_WORKAROUND_BUGGY_MALLOCATOMIC_IN_LIBXML_GC_MEMORY - void *p=pa_gc_malloc(size); - fprintf(stderr, "pa_gc_malloc_atomicFAKE_log(%d)=0x%p\n", size, p); -#else void *p=pa_gc_malloc_atomic(size); fprintf(stderr, "pa_gc_malloc_atomic_log(%d)=0x%p\n", size, p); -#endif - if(pa_looked(p)) - fprintf(stderr,"catched debug malloc atomic(%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); fprintf(stderr, "pa_gc_realloc_log(0x%p, %d)=0x%p\n", ptr, size, p); - if(pa_looked(p)) - fprintf(stderr,"catched debug realloc(%d)=0x%p\n", size, p); return p; } + static void pa_gc_free_log(void *p){ -#ifdef PA_WORKAROUND_BUGGY_FREE_IN_LIBXML_GC_MEMORY - fprintf(stderr, "pa_gc_freeIGNORE_log(0x%p)\n", p); -#else fprintf(stderr, "pa_gc_free_log(0x%p)\n", p); -#endif - if(pa_looked(p)) - fprintf(stderr,"catched debug free(0x%p)\n", p); -#ifndef PA_WORKAROUND_BUGGY_FREE_IN_LIBXML_GC_MEMORY pa_gc_free(p); -#endif } + #else inline void *check(void *result, const char *where, size_t size) { if(!result) pa_fail_alloc(where, size); - return result; } + static void* pa_gc_malloc_nonull(size_t 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), "allocate XML composite memory (asked atomic)", size); -#else 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), "reallocate XML memory", size); } -static void pa_gc_free_maybeignore( - void* -#ifndef PA_WORKAROUND_BUGGY_FREE_IN_LIBXML_GC_MEMORY - ptr -#endif - ) { -#ifndef PA_WORKAROUND_BUGGY_FREE_IN_LIBXML_GC_MEMORY +static void pa_gc_free_maybeignore(void* ptr) { pa_gc_free(ptr); -#endif } #endif -#endif + +#endif // XML void pa_CORD_oom_fn(void) { pa_fail_alloc("expand string", 0); @@ -244,7 +201,6 @@ static void gc_substitute_memory_managem // in libxml & libxslt #ifdef XML // asking to use GC memory -#if LIBXML_VERSION >= 20507 #ifdef PA_DEBUG_XML_GC_MEMORY xmlGcMemSetup( /*xmlFreeFunc */pa_gc_free_log, @@ -261,21 +217,12 @@ static void gc_substitute_memory_managem /*xmlStrdupFunc */pa_GC_strdup); #endif -#else - xmlMemSetup( - /*xmlFreeFunc */pa_gc_free_maybeignore, - /*xmlMallocFunc */pa_gc_malloc, - /*xmlReallocFunc */pa_gc_realloc, - /*xmlStrdupFunc */pa_GC_strdup); -#endif - #endif // pcre pcre_malloc=pa_gc_malloc; pcre_free=pa_gc_free; - // cord CORD_oom_fn=pa_CORD_oom_fn; } @@ -297,22 +244,16 @@ void pa_globals_init() { #ifdef XML // initializing xml libs - /* - * Register the EXSLT extensions and the test module - */ + // Register the EXSLT extensions and the test module exsltRegisterAll(); xsltRegisterTestModule(); xmlDefaultSAXHandlerInit(); - /* - * disable CDATA from being built in the document tree - */ + + // 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 - * use in multithreaded programs. - */ + // Initialization function for the XML parser. This is not reentrant. + // Call once before processing in case of use in multithreaded programs. xmlInitParser(); // 1. this is needed for proper parsing of stylesheets @@ -331,14 +272,15 @@ void pa_globals_init() { xmlLoadExtDtdDefaultValue |= XML_COMPLETE_ATTRS; // validate each document after load/create (?) - //xmlDoValidityCheckingDefaultValue = 1; + // xmlDoValidityCheckingDefaultValue = 1; -//regretfully this not only replaces entities on parse, but also on generate xmlSubstituteEntitiesDefault(1); + // regretfully this not only replaces entities on parse, but also on generate xmlSubstituteEntitiesDefault(1); // never switched this on xmlIndentTreeOutput=1; 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(); @@ -348,7 +290,9 @@ void pa_globals_init() { static bool is_dlinited=false; void pa_globals_done() { - delete cache_managers; cache_managers=0; + delete cache_managers; + cache_managers=0; + if(is_dlinited) lt_dlexit(); } @@ -356,7 +300,7 @@ void pa_globals_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; } } @@ -364,61 +308,47 @@ void pa_dlinit() { #ifdef _MSC_VER #ifndef PA_DEBUG_DISABLE_GC -# define GC_LIB "../../../../win32/gc" -# ifdef _DEBUG -# pragma comment(lib, GC_LIB "/Debug/gc.lib") -# else -# pragma comment(lib, GC_LIB "/Release/gc.lib") -# endif +#define GC_LIB "../../../../win32/gc" +#ifdef _DEBUG +#pragma comment(lib, GC_LIB "/Debug/gc.lib") +#else +#pragma comment(lib, GC_LIB "/Release/gc.lib") #endif -#define GNOME_LIBS "../../../../win32/gnome" +#endif // PA_DEBUG_DISABLE_GC -#ifdef WITH_MAILRECEIVE -# pragma comment(lib, GNOME_LIBS "/glib/lib/libglib-1.3-11.lib") -#endif #ifdef XML -# ifdef _DEBUG -# ifdef LIBXML_STATIC -# pragma comment(lib, GNOME_LIBS "/libxml2-x.x.x/win32/debug/lib/libxml2_a.lib") -# else -# pragma comment(lib, GNOME_LIBS "/libxml2-x.x.x/win32/debug/lib/libxml2.lib") -# endif - -# ifdef LIBXSLT_STATIC -# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/debug/lib/libxslt_a.lib") -# else -# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/debug/lib/libxslt.lib") -# endif -# ifdef LIBEXSLT_STATIC -# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/debug/lib/libexslt_a.lib") -# else -# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/debug/lib/libexslt.lib") -# endif +#define GNOME_LIBS "../../../../win32/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 -# ifdef LIBXML_STATIC -# pragma comment(lib, GNOME_LIBS "/libxml2-x.x.x/win32/release/lib/libxml2_a.lib") -# else -# pragma comment(lib, GNOME_LIBS "/libxml2-x.x.x/win32/release/lib/libxml2.lib") -# endif - -# ifdef LIBXSLT_STATIC -# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/release/lib/libxslt_a.lib") -# else -# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/release/lib/libxslt.lib") -# endif -# ifdef LIBEXSLT_STATIC -# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/release/lib/libexslt_a.lib") -# else -# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/release/lib/libexslt.lib") -# endif +#ifdef LIBXML_STATIC +#pragma comment(lib, LIB_XML "libxml2_a.lib") +#else +#pragma comment(lib, LIB_XML "libxml2.lib") +#endif -# 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_XSLT "libexslt.lib") #endif + +#endif // XML + +#endif // _MSC_VER