--- parser3/src/main/pa_globals.C	2002/06/24 11:59:32	1.131
+++ parser3/src/main/pa_globals.C	2003/04/01 11:11:55	1.152.2.19.2.11
@@ -1,12 +1,12 @@
 /** @file
 	Parser: globals.
 
-	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
-
-	$Id: pa_globals.C,v 1.131 2002/06/24 11:59:32 paf Exp $
 */
 
+static const char* IDENT_GLOBALS_C="$Date: 2003/04/01 11:11:55 $";
+
 #include "pa_config_includes.h"
 
 #ifdef XML
@@ -19,67 +19,15 @@ extern "C" {
 
 #include "pa_globals.h"
 #include "pa_string.h"
-#include "pa_hash.h"
-#include "pa_sql_driver_manager.h"
-#include "pa_dictionary.h"
-#include "pa_stylesheet_manager.h"
 #include "pa_sapi.h"
-#include "pa_cache_managers.h"
-#include "pa_charsets.h"
-#include "pa_charset.h"
 #include "pa_threads.h"
 
-String *content_type_name;
-String *charset_name;
-String *body_name;
-String *value_name;
-String *expires_name;
-String *path_name;
-String *name_name;
-String *size_name;
-String *text_name;
-
-String *content_disposition_name;
-String *content_disposition_filename_name;
-
-String *conf_method_name;
-String *auto_method_name;
-
-String *main_class_name;
-
-String *result_var_name;
-String *match_var_name;
-
-String *exception_var_name;
-String *exception_type_part_name;
-String *exception_source_part_name;
-String *exception_comment_part_name;
-String *exception_handled_part_name;
-
-String *charsets_name;
-String *mime_types_name;
-String *vfile_mime_type_name;
-String *origins_mode_name;
-
-String *class_path_name;
-
-String *switch_data_name;
-
-String *cache_data_name;
 
-String *sql_limit_name;
-String *sql_offset_name;
-String *sql_default_name;
+// defines
 
-String *charset_UTF8_name;
+#define PA_DEBUG_XML_GC_MEMORY
 
-String *hash_default_element_name;
-
-Table *string_match_table_template;
-
-Hash *untaint_lang_name2enum;
-
-Charset *utf8_charset;
+// globals
 
 short hex_value[0x100];
 
@@ -117,9 +65,25 @@ static void setup_hex_value() {
 
 const int MAX_CONCURRENT_XML_GENERIC_ERROR_THREADS=10;
 
-struct XML_Generic_error_info {
+class XML_Generic_error_info {
+public:
 	pa_thread_t thread_id;
-	char *message;
+	char buf[MAX_STRING];
+	size_t used;
+public:
+	XML_Generic_error_info() {
+		reset();
+	}
+	void reset() { 
+		thread_id=0; 
+		buf[used=0]=0;
+	}
+	const char* getnd_reset() {
+		char* result=new(PointerFreeGC) char[used+1];
+		memcpy(result, buf, used+1);
+		reset();
+		return result;
+	}
 } xml_generic_error_infos[MAX_CONCURRENT_XML_GENERIC_ERROR_THREADS];
 
 XML_Generic_error_info *xml_generic_error_info(pa_thread_t thread_id) {
@@ -132,7 +96,7 @@ XML_Generic_error_info *xml_generic_erro
 }
 
 static void
-xmlParserGenericErrorFunc(void *ctx, const char *msg, ...) { 
+xmlParserGenericErrorFunc(void *ctx, const char* msg, ...) { 
     pa_thread_t thread_id=pa_get_thread_id();
 
 	// infinitely looking for free slot to fill it
@@ -148,16 +112,10 @@ xmlParserGenericErrorFunc(void *ctx, con
 		}
 
 		p->thread_id=thread_id;
-		size_t offset=p->message?strlen(p->message):0;
-		p->message=(char *)realloc(p->message, offset+MAX_STRING);
-		if(!p->message)
-			SAPI::die(
-				"out of memory in 'xmlParserGenericErrorFunc', failed to reallocate to %u bytes", 
-				offset+MAX_STRING);
 		
 		va_list args;
 		va_start(args, msg);
-		vsnprintf(p->message+offset, MAX_STRING, msg, args);
+		p->used+=vsnprintf(p->buf+p->used, sizeof(p->buf)-p->used, msg, args);
 		va_end(args);
 
 		break;
@@ -172,7 +130,7 @@ bool xmlHaveGenericErrors() {
 	return xml_generic_error_info(thread_id)!=0;
 }
 
-const char *xmlGenericErrors() {
+const char* xmlGenericErrors() {
     pa_thread_t thread_id=pa_get_thread_id();
 
 	SYNCHRONIZED;  // find+free blocked
@@ -181,13 +139,7 @@ const char *xmlGenericErrors() {
 	if(!p) // no errors for our thread_id registered
 		return 0;
 
-	const char *result=p->message;
-
-	// free slot up 
-	memset(p, 0, sizeof(*p));
-
-	// it is up to caller to free it
-	return result;
+	return p->getnd_reset();
 }
 
 /**
@@ -199,7 +151,7 @@ const char *xmlGenericErrors() {
  * Returns 1 if matches, 0 otherwise
  */
 static int
-xmlFileMatchLocalhost(const char *filename) {
+xmlFileMatchLocalhost(const char* filename) {
     if (!strncmp(filename, "http://localhost", 16))
 	return(1);
     return(0);
@@ -218,7 +170,7 @@ xmlFileMatchLocalhost(const char *filena
  * Returns an I/O context or NULL in case of error
  */
 static void *
-xmlFileOpenLocalhost (const char *filename) {
+xmlFileOpenLocalhost (const char* filename) {
     FILE *fd;
     const char* documentRoot;
     char path[1000];
@@ -246,33 +198,18 @@ xmlFileOpenLocalhost (const char *filena
  * Returns the number of bytes written
  */
 static int
-xmlFileRead (void * context, char * buffer, int len) {
+pa_xmlFileRead (void * context, char * buffer, int len) {
     return(fread(&buffer[0], 1,  len, (FILE *) context));
 }
 
 /**
- * xmlFileWrite:
- * @context:  the I/O context
- * @buffer:  where to drop data
- * @len:  number of bytes to write
- *
- * Write @len bytes from @buffer to the I/O channel.
- *
- * Returns the number of bytes written
- */
-static int
-xmlFileWrite (void * context, const char * buffer, int len) {
-    return(fwrite(&buffer[0], 1,  len, (FILE *) context));
-}
-
-/**
  * xmlFileClose:
  * @context:  the I/O context
  *
  * Close an I/O channel
  */
 static int
-xmlFileClose (void * context) {
+pa_xmlFileClose (void * context) {
     return ( ( fclose((FILE *) context) == EOF ) ? -1 : 0 );
 }
 
@@ -284,137 +221,164 @@ void pa_globals_destroy(void *) {
 		GdomeException exc;
 		gdome_di_unref (domimpl, &exc);
 #endif
-		if(cache_managers)
-			cache_managers->~Cache_managers();
-
-		charsets->~Charsets();
-		
 	} catch(const Exception& e) {
-		SAPI::die("pa_globals_destroy failed: %s", e.comment());
+		SAPI::abort("pa_globals_destroy failed: %s", e.comment());
 	}
 }
 
-/// @test hint on one should call this for each thread xmlSubstituteEntitiesDefault(1);
-void pa_globals_init(Pool& pool) {
-	pool.register_cleanup(pa_globals_destroy, 0);
 
-	#undef NEW
-	#define NEW new(pool)
+#ifdef XML
+static char *pa_GC_strdup(const char *s) {
+	if(!s)
+		return 0;
 
-	// hex value
-	setup_hex_value();
+	size_t size=strlen(s)+1;
+	char *result=(char *)GC_malloc_atomic(size);
+	memcpy(result, s, size);
+	return result;
+}
 
-	// names
-	content_type_name=NEW String(pool, CONTENT_TYPE_NAME);
-	charset_name=NEW String(pool, CHARSET_NAME);
-	body_name=NEW String(pool, BODY_NAME);
-	value_name=NEW String(pool, VALUE_NAME);
-	expires_name=NEW String(pool, EXPIRES_NAME);
-	path_name=NEW String(pool, PATH_NAME);
-	name_name=NEW String(pool, NAME_NAME);
-	size_name=NEW String(pool, SIZE_NAME);
-	text_name=NEW String(pool, TEXT_NAME);
-
-	content_disposition_name=NEW String(pool, CONTENT_DISPOSITION_NAME);
-	content_disposition_filename_name=NEW String(pool, CONTENT_DISPOSITION_FILENAME_NAME);
-
-	conf_method_name=NEW String(pool, CONF_METHOD_NAME);
-	auto_method_name=NEW String(pool, AUTO_METHOD_NAME);
-
-	main_class_name=NEW String(pool, MAIN_CLASS_NAME);
-
-	result_var_name=NEW String(pool, RESULT_VAR_NAME);
-	match_var_name=NEW String(pool, MATCH_VAR_NAME);
-
-	exception_var_name=NEW String(pool, EXCEPTION_VAR_NAME);
-	exception_type_part_name=NEW String(pool, EXCEPTION_TYPE_PART_NAME);
-	exception_source_part_name=NEW String(pool, EXCEPTION_SOURCE_PART_NAME);
-	exception_comment_part_name=NEW String(pool, EXCEPTION_COMMENT_PART_NAME);
-	exception_handled_part_name=NEW String(pool, EXCEPTION_HANDLED_PART_NAME);
-
-	charsets_name=NEW String(pool, CHARSETS_NAME);
-	mime_types_name=NEW String(pool, MIME_TYPES_NAME);
-	vfile_mime_type_name=NEW String(pool, VFILE_MIME_TYPE_NAME);
-	origins_mode_name=NEW String(pool, ORIGINS_MODE_NAME);
-
-	class_path_name=NEW String(pool, CLASS_PATH_NAME);
-
-	//^switch ^case
-	switch_data_name=NEW String(pool, SWITCH_DATA_NAME);
-
-	//^cache
-	cache_data_name=NEW String(pool, CACHE_DATA_NAME);
-
-	// sql
-	sql_limit_name=NEW String(pool, SQL_LIMIT_NAME);
-	sql_offset_name=NEW String(pool, SQL_OFFSET_NAME);
-	sql_default_name=NEW String(pool, SQL_DEFAULT_NAME);
-
-	// charsets
-	charset_UTF8_name=NEW String(pool, CHARSET_UTF8_NAME);
-
-	// hash
-	hash_default_element_name=NEW String(pool, HASH_DEFAULT_ELEMENT_NAME);
-
-	// hashes
-	untaint_lang_name2enum=NEW Hash(pool);
-	#define ULN(cstr, LANG) \
-		untaint_lang_name2enum->put(*NEW String(pool, cstr), (int)String::UL_##LANG);
-	ULN("as-is", AS_IS);
-	ULN("file-spec", FILE_SPEC);
-	ULN("http-header", HTTP_HEADER);
-	ULN("mail-header", MAIL_HEADER);
-	ULN("uri", URI);
-	ULN("table", TABLE);
-	ULN("sql", SQL);
-	ULN("js", JS);
-	ULN("xml", XML);
-	ULN("html", HTML);
-	ULN("optimized-html", HTML|String::UL_OPTIMIZE_BIT);
-
-	// table
-	{ // create table
-		Array *string_match_table_columns=NEW Array(pool);
-		*string_match_table_columns+=NEW String(pool, STRING_PRE_MATCH_NAME);
-		*string_match_table_columns+=NEW String(pool, STRING_MATCH_NAME);
-		*string_match_table_columns+=NEW String(pool, STRING_POST_MATCH_NAME);
-		for(int i=1; i<=MAX_STRING_MATCH_TABLE_COLUMNS; i++) {
-			char *column=(char *)pool.malloc(MAX_NUMBER);
-			snprintf(column, MAX_NUMBER, "%d", i);
-			*string_match_table_columns+=NEW String(pool, column); // .i column name
-		}
-		string_match_table_template=NEW Table(pool, 0, string_match_table_columns);
-	}
+#ifdef PA_DEBUG_XML_GC_MEMORY
 
-	// charsets
-	charsets=NEW Charsets(pool);
-	charsets->put(*charset_UTF8_name, 
-		utf8_charset=NEW Charset(pool, *charset_UTF8_name, 0/*no file=system*/));
+static char *
+pa_xmlStrndup(const char *cur, int len) {
+    char*ret;
+    
+    if ((cur == NULL) || (len < 0)) return(NULL);
+    ret = (char *) xmlMalloc((len + 1) * sizeof(char));
+    if (ret == NULL) {
+        xmlGenericError(xmlGenericErrorContext,
+		"malloc of %ld byte failed\n",
+	        (len + 1) * (long)sizeof(char));
+        return(NULL);
+    }
+    memcpy(ret, cur, len * sizeof(char));
+    ret[len] = 0;
+    return(ret);
+}
+
+static char *
+pa_debug_xmlStrdup(const char *cur) {
+    const char *p = cur;
+
+    if (cur == NULL) return(NULL);
+    while (*p != 0) p++; /* non input consuming */
+    return(pa_xmlStrndup(cur, p - cur));
+}
+
+const size_t HEADTAIL_SIZE=4;
+
+static size_t debug_size(size_t user_size) {
+	return user_size+HEADTAIL_SIZE*2;
+}
+
+static void* fill_return_user(void* adebug_ptr, size_t pure_debug_size) {
+	char* debug_ptr=(char*)adebug_ptr;
+	memcpy(debug_ptr, "\xBB\xEE\xFF\x00", HEADTAIL_SIZE);
+	memcpy(debug_ptr+pure_debug_size-HEADTAIL_SIZE, "\xBB\xEE\xFF\x00", HEADTAIL_SIZE);
+
+	// pAD
+	size_t raw_debug_size=GC_size(adebug_ptr);
+	for(size_t i=pure_debug_size; i<raw_debug_size; i++)
+		debug_ptr[i]='\xAD';
+
+	return debug_ptr+HEADTAIL_SIZE;
+}
+static void* check_return_debug(void* auser_ptr) {
+	char* user_ptr=(char*)auser_ptr;
+	char* debug_ptr=user_ptr-HEADTAIL_SIZE;
+
+	size_t raw_debug_size=GC_size(debug_ptr);
+	if(raw_debug_size==0)
+		_asm int 3;
+
+	size_t pure_debug_size=raw_debug_size;
+	while(debug_ptr[pure_debug_size-1]=='\xAD')
+		pure_debug_size--;
+
+	if(memcmp(debug_ptr, "\xBB\xEE\xFF\x00", HEADTAIL_SIZE)!=0)
+		_asm int 3;
+	if(memcmp(debug_ptr+pure_debug_size-HEADTAIL_SIZE, "\xBB\xEE\xFF\x00", HEADTAIL_SIZE)!=0)
+		_asm int 3;
+
+	return debug_ptr;
+}
+
+static bool pa_debug_xml=true;
+static void* pa_debug_GC_malloc(size_t size) {
+	if(pa_debug_xml) {
+		size=debug_size(size);
+		return fill_return_user(GC_malloc(size), size);
+	} else
+		return GC_malloc(size);
+}
+
+static void *pa_debug_GC_realloc(void *user_ptr, size_t size) {
+	if(!GC_is_visible(user_ptr))
+		_asm int 3;
+	//printf("realloc: 0x%p -> %u\n", ptr, size);
+	if(pa_debug_xml) {
+		size=debug_size(size);
+		return fill_return_user(
+			GC_realloc(
+				check_return_debug(user_ptr), 
+				size),
+			size);
+	} else
+		return GC_realloc(user_ptr, size);
+}
+
+static void pa_debug_GC_free(void*) {
+	// ignore free
+}
+
+#endif
 
 
-	// Status registration, must be initialized before all registrants
-	cache_managers=NEW Cache_managers(pool);
-
-	// SQL driver manager
-	cache_managers->put(*NEW String(pool, "sql"), 
-		SQL_driver_manager=NEW SQL_Driver_manager(pool));
+#endif
+
+/// @test hint on one should call this for each thread xmlSubstituteEntitiesDefault(1);
+void pa_globals_init() {
+
+	// hex value
+	setup_hex_value();
 
 #ifdef XML
+
 	// initializing xml libs
 
-	/* First I get a DOMImplementation reference */
-	domimpl = gdome_di_mkref ();
-    /*
-     * Register the EXSLT extensions and the test module
-     */
-    exsltRegisterAll();
-    xsltRegisterTestModule();
-    xmlDefaultSAXHandlerInit();
-    /*
-     * disable CDATA from being built in the document tree
-     */
-    // never added yet  xmlDefaultSAXHandler.cdataBlock = NULL;
+#ifndef PA_DEBUG_DISABLE_GC
+
+	// asking to use GC memory
+#ifndef PA_DEBUG_XML_GC_MEMORY
+	xmlMemSetup(
+		/*xmlFreeFunc */GC_free,
+		/*xmlMallocFunc */GC_malloc,
+		/*xmlReallocFunc */GC_realloc,
+		/*xmlStrdupFunc */pa_GC_strdup);
+#else
+	xmlMemSetup(
+		/*xmlFreeFunc */pa_debug_GC_free,
+		/*xmlMallocFunc */pa_debug_GC_malloc,
+		/*xmlReallocFunc */pa_debug_GC_realloc,
+		/*xmlStrdupFunc */pa_debug_xmlStrdup);
+#endif
 
+#endif
+
+	/* First get a DOMImplementation reference */
+	domimpl = gdome_di_mkref ();
+	/*
+	* Register the EXSLT extensions and the test module
+	*/
+	exsltRegisterAll();
+	xsltRegisterTestModule();
+	xmlDefaultSAXHandlerInit();
+	/*
+	* 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
@@ -435,12 +399,14 @@ void pa_globals_init(Pool& pool) {
 	xmlLoadExtDtdDefaultValue |= XML_DETECT_IDS;
 	// Bit in the loadsubset context field to tell to do complete the elements attributes lists 
 	// with the ones defaulted from the DTDs 
-    //never added yet xmlLoadExtDtdDefaultValue |= XML_COMPLETE_ATTRS;
+	xmlLoadExtDtdDefaultValue |= XML_COMPLETE_ATTRS;
+
+	// validate each document after load/create (?)
+	//xmlDoValidityCheckingDefaultValue = 1;
 
 //regretfully this not only replaces entities on parse, but also on generate	xmlSubstituteEntitiesDefault(1);
 	// never switched this on xmlIndentTreeOutput=1;
 
-	memset(xml_generic_error_infos, 0, sizeof(xml_generic_error_infos));
 	xmlSetGenericErrorFunc(0, xmlParserGenericErrorFunc);
 	xsltSetGenericErrorFunc(0, xmlParserGenericErrorFunc);
 //	FILE *f=fopen("y:\\xslt.log", "wt");
@@ -449,26 +415,76 @@ void pa_globals_init(Pool& pool) {
 	// http://localhost/abc -> $ENV{DOCUMENT_ROOT}/abc | ./abc
 	xmlRegisterInputCallbacks(
 		xmlFileMatchLocalhost, xmlFileOpenLocalhost,
-		xmlFileRead, xmlFileClose);
-
-	// XSLT stylesheet manager
-	cache_managers->put(*NEW String(pool, "stylesheet"), 
-		stylesheet_manager=NEW Stylesheet_manager(pool));
+		pa_xmlFileRead, pa_xmlFileClose);
 #endif
 }
 
-#if defined(XML) && defined(_MSC_VER)
-#	define GNOME_LIBS "/parser3project/win32/gnome"
-#	pragma comment(lib, GNOME_LIBS "/glib/lib/libglib-1.3-11.lib")
+#ifdef _MSC_VER
+
+#ifndef PA_DEBUG_DISABLE_GC
+#	define GC_LIB "/parser3project/win32/gc"
 #	ifdef _DEBUG
-#		pragma comment(lib, GNOME_LIBS "/libxml2-x.x.x/win32/dsp/libxml2_so_debug/libxml2.lib")
-#		pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libexslt_so_debug/libexslt.lib")
-#		pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libxslt_so_debug/libxslt.lib")
-#		pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/dsp/Debug/libgdome.lib")
+#		pragma comment(lib, GC_LIB "/Debug/gc.lib")
 #	else
-#		pragma comment(lib, GNOME_LIBS "/libxml2-x.x.x/win32/dsp/libxml2_so_release/libxml2.lib")
-#		pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libexslt_so_release/libexslt.lib")
-#		pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libxslt_so_release/libxslt.lib")
-#		pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/dsp/Release/libgdome.lib")
+#		pragma comment(lib, GC_LIB "/Release/gc.lib")
 #	endif
+
+#endif
+
+#ifdef XML
+#	define GNOME_LIBS "/parser3project/win32xml/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")
+#		else
+#			pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/dsp/libxml2_DebugDynamic/libxml2.lib")
+#		endif
+
+#		ifdef LIBXSLT_STATIC
+#			pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libxslt_DebugStatic/libxslt.lib")
+#		else
+#			pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libxslt_DebugDynamic/libxslt.lib")
+#		endif
+#		ifdef LIBEXSLT_STATIC
+#			pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libexslt_DebugStatic/libexslt.lib")
+#		else
+#			pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libexslt_DebugDynamic/libexslt.lib")
+#		endif
+
+#		ifdef LIBGDOME_STATIC
+#			pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/dsp/libgdome_DebugStatic/libgdome.lib")
+#		else
+#			pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/dsp/libgdome_DebugDynamic/libgdome.lib")
+#		endif
+
+#else
+
+#		ifdef LIBXML_STATIC
+#			pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/dsp/libxml2_ReleaseStatic/libxml2.lib")
+#		else
+#			pragma comment(lib, GNOME_LIBS "/gnome-xml/win32/dsp/lixml2_ReleaseDynamic/libxml2.lib")
+#		endif
+
+#		ifdef LIBXSLT_STATIC
+#			pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libxslt_ReleaseStatic/libxslt.lib")
+#		else
+#			pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libxslt_ReleaseDynamic/libxslt.lib")
+#		endif
+#		ifdef LIBEXSLT_STATIC
+#			pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libexslt_ReleaseStatic/libexslt.lib")
+#		else
+#			pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libexslt_ReleaseDynamic/libexslt.lib")
+#		endif
+
+#		ifdef LIBGDOME_STATIC
+#			pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/dsp/libgdome_ReleaseStatic/libgdome.lib")
+#		else
+#			pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/dsp/libgdome_ReleaseDynamic/libgdome.lib")
+#		endif
+
+#	endif
+#endif
+
 #endif