--- parser3/src/main/pa_globals.C	2004/02/11 15:33:16	1.171
+++ parser3/src/main/pa_globals.C	2010/11/24 00:20:47	1.185
@@ -1,11 +1,11 @@
 /** @file
 	Parser: globals.
 
-	Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_GLOBALS_C="$Date: 2004/02/11 15:33:16 $";
+static const char * const IDENT_GLOBALS_C="$Date: 2010/11/24 00:20:47 $";
 
 #include "pa_config_includes.h"
 
@@ -18,8 +18,6 @@ extern "C" {
 };
 #endif
 
-#include "pcre.h"
-
 #include "pa_globals.h"
 #include "pa_string.h"
 #include "pa_sapi.h"
@@ -29,18 +27,22 @@ extern "C" {
 
 #include "pa_cache_managers.h"
 
+#include "pcre.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];
 
-#ifdef XML
-GdomeDOMImplementation *domimpl;
-#endif
-
 static void setup_hex_value() {
 	memset(hex_value, 0, sizeof(hex_value));
 	hex_value['0'] = 0;	
@@ -67,61 +69,58 @@ static void setup_hex_value() {
 	hex_value['f'] = 15;
 }
 
+THREAD_LOCAL Request* thread_request=NULL;
 
-Hash<pa_thread_t, Request*> 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
+void pa_release_assert(const char* str, const char* file, int line) {
+	SAPI::die("%s at %s:%d", str, file, line); 
 }
+#endif
+
 
 #ifdef XML
 
 class XML_Generic_error_info {
-public:
+public:/*internal, actually*/
 	char buf[MAX_STRING*5];
 	size_t used;
 public:
 	XML_Generic_error_info() {
-		reset();
-	}
-	void reset() { 
 		buf[used=0]=0;
 	}
-	const char* get_and_reset() {
-		if(used) {
-			char* result=pa_strdup(buf, used);
-			reset();
-			return result;
-		} else
-			return 0;		
+	const char* get() {
+		return used? buf: 0;
 	}
 };
 
-Hash<pa_thread_t, XML_Generic_error_info*> xml_generic_error_infos;
+static Hash<pa_thread_t, XML_Generic_error_info*> xml_generic_error_infos;
 
 static void xmlParserGenericErrorFunc(void *  /*ctx*/, const char* msg, ...) { 
 //_asm int 3;
 	pa_thread_t thread_id=pa_get_thread_id();
 
-	// infinitely looking for free slot to fill it
-	while(true) {
+	XML_Generic_error_info* p;
+	{
 		SYNCHRONIZED;  // find+fill blocked
 
 		// first try to get existing for this thread_id
-		XML_Generic_error_info *p=xml_generic_error_infos.get(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));
-		
-		va_list args;
-		va_start(args, msg);
-		p->used+=vsnprintf(p->buf+p->used, sizeof(p->buf)-p->used, msg, args);
-		va_end(args);
-
-		break;
 	}
+		
+	va_list args;
+	va_start(args, msg);
+	p->used+=vsnprintf(p->buf+p->used, sizeof(p->buf)-p->used, msg, args);
+	va_end(args);
 }
 
 bool xmlHaveGenericErrors() {
@@ -137,8 +136,10 @@ const char* xmlGenericErrors() {
 
 	SYNCHRONIZED;  // find+free blocked
 
-	if(XML_Generic_error_info *p=xml_generic_error_infos.get(thread_id))
-		return p->get_and_reset();
+	if(XML_Generic_error_info *p=xml_generic_error_infos.get(thread_id)) {
+		xml_generic_error_infos.remove(thread_id);
+		return p->get();
+	}
 
 	return 0; // no errors for our thread_id registered
 }
@@ -146,15 +147,14 @@ 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) {
+	} catch(.../*const Exception& e* /) {
 //		SAPI::abort("pa_globals_destroy failed: %s", e.comment());
 	}
+*/
 }
 
 
@@ -167,7 +167,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
@@ -177,66 +177,97 @@ static char *pa_GC_strdup(const char *s)
 }
 
 #ifdef PA_DEBUG_XML_GC_MEMORY
-void *pa_look_for[]={(void*)0x8abe000,(void*)0x0,(void*)0x0,(void*)0x0,
+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)
+		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);
+	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);
-//	if(pa_looked(p))
-//		fprintf(stderr,"catched debug malloc atomic(%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);
+	if(pa_looked(p))
+		fprintf(stderr,"catched debug realloc(%d)=0x%p\n", size, p);
 	return p;
 }
-//static void pa_gc_free_ignore(void *){}
 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);
-//	if(pa_looked(p))
-//		fprintf(stderr,"catched debug free(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)
-		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) { 
-	return check(pa_gc_malloc_atomic(size), "allocating XML atomic memory", 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), "reallocating XML memory", 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
+	pa_gc_free(ptr);
+#endif
 }
 
 #endif
 #endif
 
 void pa_CORD_oom_fn(void) {
-	SAPI::abort("out of memory (while expanding string)");
+	pa_fail_alloc("expand string", 0);
 }
 
 /**
@@ -256,7 +287,7 @@ static void gc_substitute_memory_managem
 		/*xmlStrdupFunc */pa_GC_strdup);
 #else
 	xmlGcMemSetup(
-		/*xmlFreeFunc */pa_gc_free,
+		/*xmlFreeFunc */pa_gc_free_maybeignore,
 		/*xmlMallocFunc */pa_gc_malloc_nonull,
 		/*xmlMallocFunc */pa_gc_malloc_atomic_nonull,
 		/*xmlReallocFunc */pa_gc_realloc_nonull,
@@ -265,7 +296,7 @@ static void gc_substitute_memory_managem
 
 #else
 	xmlMemSetup(
-		/*xmlFreeFunc */pa_gc_free,
+		/*xmlFreeFunc */pa_gc_free_maybeignore,
 		/*xmlMallocFunc */pa_gc_malloc,
 		/*xmlReallocFunc */pa_gc_realloc,
 		/*xmlStrdupFunc */pa_GC_strdup);
@@ -299,8 +330,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
 	*/
@@ -349,6 +378,10 @@ void pa_globals_init() {
 #endif
 }
 
+void pa_globals_done() {
+	delete cache_managers;  cache_managers=0;
+}
+
 #ifdef _MSC_VER
 
 #ifndef PA_DEBUG_DISABLE_GC
@@ -361,9 +394,13 @@ void pa_globals_init() {
 
 #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
@@ -383,12 +420,6 @@ void pa_globals_init() {
 #			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
@@ -408,12 +439,6 @@ void pa_globals_init() {
 #			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