--- parser3/src/main/pa_sql_driver_manager.C	2001/05/17 13:23:28	1.16
+++ parser3/src/main/pa_sql_driver_manager.C	2001/06/28 07:44:17	1.22
@@ -4,9 +4,8 @@
 	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.16 2001/05/17 13:23:28 parser Exp $
 */
+static const char *RCSId="$Id: pa_sql_driver_manager.C,v 1.22 2001/06/28 07:44:17 parser Exp $"; 
 
 #include "pa_sql_driver_manager.h"
 #include "ltdl.h"
@@ -23,8 +22,9 @@ SQL_Driver_manager *SQL_driver_manager;
 
 // consts
 
-const int MAX_PROTOCOL=20;
 const char *LIBRARY_CREATE_FUNC_NAME="create";
+const int EXPIRE_UNUSED_CONNECTION_SECONDS=60;
+const int CHECK_EXPIRED_CONNECTIONS_SECONDS=60*2;
 
 
 /// SQL_Driver_services Pooled implementation
@@ -54,7 +54,6 @@ private:
 /// @param request_url protocol://[driver-dependent]
 SQL_Connection& SQL_Driver_manager::get_connection(const String& request_url, 
 												   Table *protocol2driver_and_client) {
-////__asm int 3;
 	Pool& pool=request_url.pool(); // request pool											   
 
 	// we have table for locating protocol's library
@@ -72,7 +71,7 @@ SQL_Connection& SQL_Driver_manager::get_
 
 	char *request_url_cstr;
 	if(result)
-		request_url_cstr=0; // no need to connect, just reassign services & they can use
+		request_url_cstr=0; // calm, compiler
 	else { // no cached connection or it were unpingabe: connect/reconnect
 		int pos=request_url.pos("://", 3);
 		if(pos<0)
@@ -161,13 +160,14 @@ SQL_Connection& SQL_Driver_manager::get_
 	
 		// allocate in global pool 
 		// 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(new(pool) SQL_Driver_services_impl(pool, request_url)); 
 	// if not connected yet, do that now, when result has services
-	if(request_url_cstr)
+	if(!result->connected())
 		result->connect(request_url_cstr);
 	// return it
 	return *result;
@@ -201,14 +201,18 @@ void SQL_Driver_manager::put_driver_to_c
 SQL_Connection *SQL_Driver_manager::get_connection_from_cache(const String& url) { 
 	SYNCHRONIZED;
 
+	maybe_expire_connection_cache();
+
 	if(Stack *connections=static_cast<Stack *>(connection_cache.get(url)))
-		if(connections->top_index()>=0) // there are cached connections to that 'url'
-			return static_cast<SQL_Connection *>(connections->pop());
+		while(connections->top_index()>=0) { // there are cached connections to that 'url'
+			SQL_Connection *result=static_cast<SQL_Connection *>(connections->pop());
+			if(result->connected()) // not expired?
+				return result;
+		}
 
 	return 0;
 }
 
-/// @todo cache expiration[use SQL_Driver::disconnect]
 void SQL_Driver_manager::put_connection_to_cache(const String& url, 
 												 SQL_Connection& connection) { 
 	SYNCHRONIZED;
@@ -220,3 +224,26 @@ 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.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);
+
+	if(prev_expiration_pass_time<now-CHECK_EXPIRED_CONNECTIONS_SECONDS) {
+		connection_cache.for_each(expire_connections, 
+			reinterpret_cast<void *>(now-EXPIRE_UNUSED_CONNECTION_SECONDS));
+
+		prev_expiration_pass_time=now;
+	}
+}