--- parser3/src/main/pa_globals.C	2003/04/09 08:40:25	1.152.2.19.2.15
+++ parser3/src/main/pa_globals.C	2003/11/20 16:34:26	1.161
@@ -5,11 +5,12 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_GLOBALS_C="$Date: 2003/04/09 08:40:25 $";
+static const char * const IDENT_GLOBALS_C="$Date: 2003/11/20 16:34:26 $";
 
 #include "pa_config_includes.h"
 
 #ifdef XML
+#include "libxml/xmlversion.h"
 #include "libxslt/extensions.h"
 #include "libxslt/xsltutils.h"
 extern "C" {
@@ -17,6 +18,8 @@ extern "C" {
 };
 #endif
 
+#include "pcre.h"
+
 #include "pa_globals.h"
 #include "pa_string.h"
 #include "pa_sapi.h"
@@ -25,7 +28,7 @@ extern "C" {
 
 // defines
 
-#define PA_DEBUG_XML_GC_MEMORY
+//#define PA_DEBUG_XML_GC_MEMORY
 
 // globals
 
@@ -78,7 +81,7 @@ public:
 		thread_id=0; 
 		buf[used=0]=0;
 	}
-	const char* getnd_reset() {
+	const char* get_and_reset() {
 		char* result=new(PointerFreeGC) char[used+1];
 		memcpy(result, buf, used+1);
 		reset();
@@ -96,8 +99,9 @@ XML_Generic_error_info *xml_generic_erro
 }
 
 static void
-xmlParserGenericErrorFunc(void *ctx, const char* msg, ...) { 
-    pa_thread_t thread_id=pa_get_thread_id();
+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) {
@@ -107,7 +111,7 @@ xmlParserGenericErrorFunc(void *ctx, con
 		XML_Generic_error_info *p=xml_generic_error_info(thread_id);
 		if(!p) { // occupy empty one
 			p=xml_generic_error_info(0);
-			if(!p) // wait for empty for it to appear
+			if(!p) // wait for empty one to appear
 				continue;
 		}
 
@@ -123,7 +127,7 @@ xmlParserGenericErrorFunc(void *ctx, con
 }
 
 bool xmlHaveGenericErrors() {
-    pa_thread_t thread_id=pa_get_thread_id();
+	pa_thread_t thread_id=pa_get_thread_id();
 
 	SYNCHRONIZED;  // find blocked
 
@@ -131,7 +135,7 @@ bool xmlHaveGenericErrors() {
 }
 
 const char* xmlGenericErrors() {
-    pa_thread_t thread_id=pa_get_thread_id();
+	pa_thread_t thread_id=pa_get_thread_id();
 
 	SYNCHRONIZED;  // find+free blocked
 
@@ -139,7 +143,7 @@ const char* xmlGenericErrors() {
 	if(!p) // no errors for our thread_id registered
 		return 0;
 
-	return p->getnd_reset();
+	return p->get_and_reset();
 }
 
 /**
@@ -152,9 +156,9 @@ const char* xmlGenericErrors() {
  */
 static int
 xmlFileMatchLocalhost(const char* filename) {
-    if (!strncmp(filename, "http://localhost", 16))
-	return(1);
-    return(0);
+	if (!strncmp(filename, "http://localhost", 16))
+		return(1);
+	return(0);
 }
 
 
@@ -171,20 +175,21 @@ xmlFileMatchLocalhost(const char* filena
  */
 static void *
 xmlFileOpenLocalhost (const char* filename) {
-    FILE *fd;
-    const char* documentRoot;
-    char path[1000];
-
+	//_asm int 3;
+	FILE *fd;
+	const char* documentRoot;
+	char path[1000];
+	
 	path[0]=0;
 	strcat(path, (documentRoot=getenv("DOCUMENT_ROOT"))?documentRoot:".");
 	strcat(path, &filename[16]);
-
+	
 #ifdef WIN32
-    fd = fopen(path, "rb");
+	fd = fopen(path, "rb");
 #else
-    fd = fopen(path, "r");
+	fd = fopen(path, "r");
 #endif /* WIN32 */
-    return((void *) fd);
+	return((void *) fd);
 }
 
 /**
@@ -199,7 +204,7 @@ xmlFileOpenLocalhost (const char* filena
  */
 static int
 pa_xmlFileRead (void * context, char * buffer, int len) {
-    return(fread(&buffer[0], 1,  len, (FILE *) context));
+	return(fread(&buffer[0], 1,  len, (FILE *) context));
 }
 
 /**
@@ -210,7 +215,7 @@ pa_xmlFileRead (void * context, char * b
  */
 static int
 pa_xmlFileClose (void * context) {
-    return ( ( fclose((FILE *) context) == EOF ) ? -1 : 0 );
+	return ( ( fclose((FILE *) context) == EOF ) ? -1 : 0 );
 }
 
 #endif
@@ -220,23 +225,86 @@ void pa_globals_destroy(void *) {
 #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());
+//		SAPI::abort("pa_globals_destroy failed: %s", e.comment());
 	}
 }
 
 
 #ifdef XML
+
 static char *pa_GC_strdup(const char *s) {
 	if(!s)
 		return 0;
 
 	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);
+
 	memcpy(result, s, size);
 	return result;
 }
+
+#ifdef PA_DEBUG_XML_GC_MEMORY
+void *pa_look_for[]={(void*)0x8abe000,(void*)0x0,(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)
+			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){
+	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);
+	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_ignore(void *){}
+static void pa_gc_free_log(void *p){
+        fprintf(stderr, "pa_gc_free_log(0x%p)\n", p);
+//	if(pa_looked(p))
+//		fprintf(stderr,"catched debug free(0x%p)\n", p);
+        pa_gc_free(p);
+}
+#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);
+
+	return result;
+}
+static void* pa_gc_malloc_nonull(size_t size) { 
+	return check(pa_gc_malloc(size), "allocating 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);
+}
+static void* pa_gc_realloc_nonull(void* ptr, size_t size) { 
+	return check(pa_gc_realloc(ptr, size), "reallocating XML memory", size);
+}
+
+#endif
 #endif
 
 void pa_CORD_oom_fn(void) {
@@ -244,14 +312,30 @@ void pa_CORD_oom_fn(void) {
 }
 
 /**
-	@todo gc: pcre: substitute pcre_malloc &co
 	@todo gc: libltdl: substitute lt_dlmalloc & co
-	@todo gc: figure out how to substitute glib memory allocator
 */
 static void gc_substitute_memory_management_functions() {
 	// 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,
+		/*xmlMallocFunc */pa_gc_malloc_log,
+		/*xmlMallocFunc */pa_gc_malloc_atomic_log,
+		/*xmlReallocFunc */pa_gc_realloc_log,
+		/*xmlStrdupFunc */pa_GC_strdup);
+#else
+	xmlGcMemSetup(
+		/*xmlFreeFunc */pa_gc_free,
+		/*xmlMallocFunc */pa_gc_malloc_nonull,
+		/*xmlMallocFunc */pa_gc_malloc_atomic_nonull,
+		/*xmlReallocFunc */pa_gc_realloc_nonull,
+		/*xmlStrdupFunc */pa_GC_strdup);
+#endif
+
+#else
 	xmlMemSetup(
 		/*xmlFreeFunc */pa_gc_free,
 		/*xmlMallocFunc */pa_gc_malloc,
@@ -259,6 +343,14 @@ static void gc_substitute_memory_managem
 		/*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;
 }
 
@@ -331,7 +423,7 @@ void pa_globals_init() {
 #ifdef _MSC_VER
 
 #ifndef PA_DEBUG_DISABLE_GC
-#	define GC_LIB "/parser3project/win32/gc"
+#	define GC_LIB "../../../../win32/gc"
 #	ifdef _DEBUG
 #		pragma comment(lib, GC_LIB "/Debug/gc.lib")
 #	else
@@ -341,14 +433,14 @@ void pa_globals_init() {
 #endif
 
 #ifdef XML
-#	define GNOME_LIBS "/parser3project/win32xml/win32/gnome"
+#	define GNOME_LIBS "../../../../win32/gnome"
 #	pragma comment(lib, GNOME_LIBS "/glib/lib/libglib-1.3-11.lib")
 #	ifdef _DEBUG
 
 #		ifdef LIBXML_STATIC
-#			pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/dsp/libxml2_DebugStatic/libxml2.lib")
+#			pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/binaries-debug/libxml2_a.lib")
 #		else
-#			pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/dsp/libxml2_DebugDynamic/libxml2.lib")
+#			pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/binaries-debug/libxml2.lib")
 #		endif
 
 #		ifdef LIBXSLT_STATIC
@@ -371,9 +463,9 @@ void pa_globals_init() {
 #else
 
 #		ifdef LIBXML_STATIC
-#			pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/dsp/libxml2_ReleaseStatic/libxml2.lib")
+#			pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/binaries-release/libxml2_a.lib")
 #		else
-#			pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/dsp/libxml2_ReleaseDynamic/libxml2.lib")
+#			pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/binaries-release/libxml2.lib")
 #		endif
 
 #		ifdef LIBXSLT_STATIC