--- parser3/src/main/pa_pool.C	2002/02/08 07:27:48	1.50
+++ parser3/src/main/pa_pool.C	2003/11/20 16:34:26	1.62
@@ -1,79 +1,57 @@
 /** @file
 	Parser: pool class.
 
-	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
-
-	$Id: pa_pool.C,v 1.50 2002/02/08 07:27:48 paf Exp $
+	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
+static const char * const IDENT_POOL_C="$Date: 2003/11/20 16:34:26 $";
+
 #include "pa_pool.h"
 #include "pa_exception.h"
 #include "pa_common.h"
 #include "pa_sapi.h"
 #include "pa_charset.h"
 
-Pool::Pool(void *astorage) : 
-	fstorage(astorage), fcontext(0), 
-	ftotal_allocated(0), ftotal_times(0),
-	source_charset(0), client_charset(0)
-	{
-}
-
-void Pool::fail_alloc(size_t size) const {
-	SAPI::die("out of pool memory: failed to allocate %u bytes; "
-		"already allocated on pool: %u bytes in %u times", 
-		size, 
-		ftotal_allocated, ftotal_times);
-}
+// Pool
 
-void Pool::fail_register_cleanup() const {
-	SAPI::die("failed to register cleanup");
-}
+Pool::Pool(){}
 
-void Pool::set_source_charset(Charset& acharset) { 
-	source_charset=&acharset; 
+static void cleanup(Pool::Cleanup item, int) {
+	if(item.cleanup)
+		item.cleanup(item.data);
 }
-Charset& Pool::get_source_charset() { 
-	if(!source_charset)
-		throw Exception(0, 0,
-			0,
-			"no source charset defined yet");
-	return *source_charset; 
+Pool::~Pool() {
+	//__asm__("int3");
+	//_asm int 3;
+	//fprintf(stderr, "cleanups: %d\n", cleanups.size());
+	// cleanups first, because they use some object's memory pointers
+	cleanups.for_each(cleanup, 0);
 }
 
-void Pool::set_client_charset(Charset& acharset) { 
-	client_charset=&acharset; 
+void Pool::register_cleanup(void (*cleanup) (void *), void *data) {
+	cleanups+=Cleanup(cleanup, data);
 }
-Charset& Pool::get_client_charset() { 
-	if(!client_charset)
-		throw Exception(0, 0,
-			0,
-			"no client charset defined yet");
-	return *client_charset; 
-}
-
-#ifdef XML
 
-const char *Pool::transcode_cstr(xmlChar *s) {
-	return get_source_charset().transcode_cstr(s); 
+static void unregister_cleanup(Pool::Cleanup& item, void* cleanup_data) {
+	if(item.data==cleanup_data)
+		item.cleanup=0;
 }
-
-String& Pool::transcode(xmlChar *s) {
-	return get_source_charset().transcode(s); 
+void Pool::unregister_cleanup(void *cleanup_data) {
+	cleanups.for_each_ref(::unregister_cleanup, cleanup_data);
 }
 
-const char *Pool::transcode_cstr(GdomeDOMString *s) { 
-	return get_source_charset().transcode_cstr(s); 
-}
+// Pooled
 
-String& Pool::transcode(GdomeDOMString *s) { 
-	return get_source_charset().transcode(s); 
+static void cleanup(void *data) {
+	static_cast<Pooled*>(data)->~Pooled();
 }
 
-GdomeDOMString_auto_ptr Pool::transcode(const String& s) {
-	return get_source_charset().transcode(s); 
+Pooled::Pooled(Pool& apool): fpool(apool) {
+	fpool.register_cleanup(cleanup, this);
 }
 
-
-#endif
+/// Sole: this got called automatically from Pool::~Pool()
+Pooled::~Pooled() {
+	fpool.unregister_cleanup(this);
+}