--- 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/09/05 08:57:43 1.30 @@ -4,9 +4,8 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (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.30 2001/09/05 08:57:43 parser Exp $"; #include "pa_sql_driver_manager.h" #include "ltdl.h" @@ -23,8 +22,8 @@ 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=EXPIRE_UNUSED_CONNECTION_SECONDS*2; /// SQL_Driver_services Pooled implementation @@ -54,7 +53,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 +70,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) @@ -110,17 +108,18 @@ SQL_Connection& SQL_Driver_manager::get_ protocol2driver_and_client->origin_string(), "driver library column for protocol '%s' is empty", request_protocol_cstr); - if(!(dlopen_file_spec=protocol2driver_and_client->item(2)) || dlopen_file_spec->size()==0) - PTHROW(0, 0, - protocol2driver_and_client->origin_string(), - "client library column for protocol '%s' is empty", - request_protocol_cstr); + dlopen_file_spec=protocol2driver_and_client->item(2); } else PTHROW(0, 0, &request_url, "undefined protocol '%s'", request_protocol_cstr); + if(lt_dlinit()) + PTHROW(0, 0, + library, + "prepare to dynamic loading failed, %s", lt_dlerror()); + const char *filename=library->cstr(String::UL_FILE_NAME); lt_dlhandle handle=lt_dlopen(filename); if (!handle) @@ -129,11 +128,11 @@ SQL_Connection& SQL_Driver_manager::get_ "can not open the module, %s", lt_dlerror()); SQL_Driver_create_func create=(SQL_Driver_create_func)lt_dlsym(handle, - LIBRARY_CREATE_FUNC_NAME); + SQL_DRIVER_CREATE_FUNC_NAME); if(!create) PTHROW(0, 0, library, - "function '%s' was not found", LIBRARY_CREATE_FUNC_NAME); + "function '%s' was not found", SQL_DRIVER_CREATE_FUNC_NAME); // create library-driver! driver=(*create)(); @@ -147,13 +146,17 @@ SQL_Connection& SQL_Driver_manager::get_ driver_api_version, SQL_DRIVER_API_VERSION); // initialise by connecting to sql client dynamic link library - const char *dlopen_file_spec_cstr=dlopen_file_spec->cstr(String::UL_FILE_NAME); + bool specified_dlopen_file_spec=dlopen_file_spec && dlopen_file_spec->size(); + const char *dlopen_file_spec_cstr= + specified_dlopen_file_spec? + dlopen_file_spec->cstr(String::UL_FILE_NAME):0; if(const char *error=driver->initialize( dlopen_file_spec_cstr)) PTHROW(0, 0, library, "driver failed to initialize client library '%s', %s", - dlopen_file_spec_cstr, error); + specified_dlopen_file_spec?dlopen_file_spec_cstr:"unspecifed", + error); // cache it put_driver_to_cache(global_protocol, *driver); @@ -161,13 +164,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; @@ -197,18 +201,22 @@ void SQL_Driver_manager::put_driver_to_c } // connection cache - +/// @todo get rid of memory spending Stack [zeros deep inside got accumulated] SQL_Connection *SQL_Driver_manager::get_connection_from_cache(const String& url) { SYNCHRONIZED; + maybe_expire_connection_cache(); + if(Stack *connections=static_cast(connection_cache.get(url))) - if(connections->top_index()>=0) // there are cached connections to that 'url' - return static_cast(connections->pop()); + while(connections->top_index()>=0) { // there are cached connections to that 'url' + SQL_Connection *result=static_cast(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 +228,26 @@ void SQL_Driver_manager::put_connection_ } connections->push(&connection); } + +static void expire_connection(Array::Item *value, void *info) { + SQL_Connection& connection=*static_cast(value); + time_t older_dies=reinterpret_cast(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(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-EXPIRE_UNUSED_CONNECTION_SECONDS)); + + prev_expiration_pass_time=now; + } +}