--- parser3/src/main/pa_sql_driver_manager.C	2001/10/19 12:43:30	1.41
+++ parser3/src/main/pa_sql_driver_manager.C	2001/10/30 15:08:20	1.46
@@ -4,7 +4,7 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_sql_driver_manager.C,v 1.41 2001/10/19 12:43:30 parser Exp $
+	$Id: pa_sql_driver_manager.C,v 1.46 2001/10/30 15:08:20 paf Exp $
 */
 
 #include "pa_sql_driver_manager.h"
@@ -13,6 +13,7 @@
 #include "pa_exception.h"
 #include "pa_common.h"
 #include "pa_threads.h"
+#include "pa_stack.h"
 
 // globals
 
@@ -31,24 +32,59 @@ public:
 		furl(aurl) {
 	}
 
-	/// allocates some bytes on pool
-	void *malloc(size_t size) { return Pooled::malloc(size); }
-	/// allocates some bytes clearing them with zeros
-	void *calloc(size_t size) { return Pooled::calloc(size); }
-
-	/// throw exception
-	void _throw(const char *comment) { 
-		throw Exception(0, 0, 
+	virtual void *malloc(size_t size) { return Pooled::malloc(size, 8); }
+	virtual void *calloc(size_t size) { return Pooled::calloc(size); }
+
+	/**
+		the idea is to #1 jump to C++ some function to main body, where
+		every function stack frame has exception unwind information
+		and from there... #2 propagate_exception()
+	*/
+	virtual void _throw(const char *comment) { 
+		e=Exception(0, 0, 
 			&furl, 
 			comment); 
+
+		longjmp(mark, 1);
+	}
+	virtual void propagate_exception() {
+		throw e;
 	}
 
 private:
 	const String& furl;
+	Exception e;
 };
 
+// helpers
+
+static void expire_connection(Array::Item *value, void *info) {
+	SQL_Connection& connection=*static_cast<SQL_Connection *>(value);
+	time_t older_dies=reinterpret_cast<time_t>(info);
+
+	if(connection.connected() && connection.expired(older_dies))
+		connection.disconnect();
+}
+static void expire_connections(const Hash::Key& key, Hash::Val *value, void *info) {
+	Stack& stack=*static_cast<Stack *>(value);
+	for(int i=0; i<=stack.top_index(); i++)
+		expire_connection(stack.get(i), info);
+}
+
 // SQL_Driver_manager
 
+SQL_Driver_manager::SQL_Driver_manager(Pool& pool) : Pooled(pool),
+		driver_cache(pool),
+		connection_cache(pool),
+		prev_expiration_pass_time(0) {
+	
+}
+
+SQL_Driver_manager::~SQL_Driver_manager() {
+	connection_cache.for_each(expire_connections, 
+		reinterpret_cast<void *>((time_t)0/*=in past=expire all*/));
+}
+
 /// @param request_url protocol://[driver-dependent]
 SQL_Connection& SQL_Driver_manager::get_connection(const String& request_url,
 												   const String& request_origin,
@@ -61,11 +97,17 @@ SQL_Connection& SQL_Driver_manager::get_
 			&request_url,
 			"$"MAIN_SQL_NAME":"MAIN_SQL_DRIVERS_NAME" table must be defined");
 
+	// construct services[request]  (deassociates at close)
+	SQL_Driver_services *services=new(pool) SQL_Driver_services_impl(pool, request_url); 
+
 	// first trying to get cached connection
 	SQL_Connection *result=get_connection_from_cache(request_url);
-	if(result && !result->ping()) { // we have some cached connection, is it pingable?
-		result->disconnect(); // kill unpingabe=dead connection
-		result=0;
+	if(result) {
+		result->set_services(services);
+		if(!result->ping()) { // we have some cached connection, is it pingable?
+			result->disconnect(); // kill unpingabe=dead connection
+			result=0;
+		}
 	}
 
 	char *request_url_cstr;
@@ -79,7 +121,7 @@ SQL_Connection& SQL_Driver_manager::get_
 				"connection string must start with protocol://"); // NOTE: not THROW, but PTHROW
 
 		// make global_url C-string on global pool
-		request_url_cstr=request_url.cstr(String::UL_AS_IS);
+		request_url_cstr=request_url.cstr();
 		char *global_url_cstr=(char *)malloc(strlen(request_url_cstr)+1);
 		strcpy(global_url_cstr, request_url_cstr);
 		// make global_url string on global pool
@@ -166,10 +208,10 @@ SQL_Connection& SQL_Driver_manager::get_
 		// associate with services[request]
 		// NOTE: never freed up!
 		result=new(this->pool()) SQL_Connection(this->pool(), global_url, *driver);
+		// associate with services[request]  (deassociates at close)
+		result->set_services(services); 
 	}
 
-	// associate with services[request]  (deassociates at close)
-	result->set_services(new(pool) SQL_Driver_services_impl(pool, request_url)); 
 	// if not connected yet, do that now, when result has services
 	if(!result->connected())
 		result->connect(request_url_cstr);
@@ -229,18 +271,6 @@ void SQL_Driver_manager::put_connection_
 	connections->push(&connection);
 }
 
-static void expire_connection(Array::Item *value, void *info) {
-	SQL_Connection& connection=*static_cast<SQL_Connection *>(value);
-	time_t older_dies=reinterpret_cast<time_t>(info);
-
-	if(connection.connected() && connection.expired(older_dies))
-		connection.disconnect();
-}
-static void expire_connections(const Hash::Key& key, Hash::Val *value, void *info) {
-	Stack& stack=*static_cast<Stack *>(value);
-	for(int i=0; i<=stack.top_index(); i++)
-		expire_connection(stack.get(i), info);
-}
 void SQL_Driver_manager::maybe_expire_connection_cache() {
 	time_t now=time(0);