--- parser3/src/main/pa_sql_driver_manager.C 2001/05/17 18:36:33 1.18 +++ parser3/src/main/pa_sql_driver_manager.C 2001/10/15 11:48:04 1.40 @@ -2,10 +2,9 @@ Parser: sql driver manager implementation. Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_sql_driver_manager.C,v 1.18 2001/05/17 18:36:33 parser Exp $ + $Id: pa_sql_driver_manager.C,v 1.40 2001/10/15 11:48:04 parser Exp $ */ #include "pa_sql_driver_manager.h" @@ -15,17 +14,14 @@ #include "pa_common.h" #include "pa_threads.h" -#include "pa_sapi.h" - // globals SQL_Driver_manager *SQL_driver_manager; // consts -const char *LIBRARY_CREATE_FUNC_NAME="create"; const int EXPIRE_UNUSED_CONNECTION_SECONDS=60; -const int CHECK_EXPIRED_CONNECTIONS_SECONDS=60*2; +const int CHECK_EXPIRED_CONNECTIONS_SECONDS=EXPIRE_UNUSED_CONNECTION_SECONDS*2; /// SQL_Driver_services Pooled implementation @@ -39,6 +35,7 @@ public: 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(0, 0, @@ -53,16 +50,16 @@ private: // SQL_Driver_manager /// @param request_url protocol://[driver-dependent] -SQL_Connection& SQL_Driver_manager::get_connection(const String& request_url, +SQL_Connection& SQL_Driver_manager::get_connection(const String& request_url, + const String& request_origin, Table *protocol2driver_and_client) { -////__asm int 3; - Pool& pool=request_url.pool(); // request pool + Pool& pool=request_origin.pool(); // request pool // we have table for locating protocol's library if(!protocol2driver_and_client) PTHROW(0, 0, &request_url, - "$SQL:drivers table must be defined"); + "$"MAIN_SQL_NAME":"MAIN_SQL_DRIVERS_NAME" table must be defined"); // first trying to get cached connection SQL_Connection *result=get_connection_from_cache(request_url); @@ -78,8 +75,8 @@ SQL_Connection& SQL_Driver_manager::get_ int pos=request_url.pos("://", 3); if(pos<0) PTHROW(0, 0, - &request_url, - "no protocol specified"); // NOTE: not THROW, but PTHROW + request_url.size()?&request_url:&request_origin, + "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); @@ -111,18 +108,19 @@ 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); - const char *filename=library->cstr(String::UL_FILE_NAME); + if(lt_dlinit()) + PTHROW(0, 0, + library, + "prepare to dynamic loading failed, %s", lt_dlerror()); + + const char *filename=library->cstr(String::UL_FILE_SPEC); lt_dlhandle handle=lt_dlopen(filename); if (!handle) PTHROW(0, 0, @@ -130,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_NAME); if(!create) PTHROW(0, 0, library, - "function '%s' was not found", LIBRARY_CREATE_FUNC_NAME); + "function '"SQL_DRIVER_CREATE_NAME"' was not found"); // create library-driver! driver=(*create)(); @@ -148,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_SPEC):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); @@ -199,10 +201,12 @@ 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))) while(connections->top_index()>=0) { // there are cached connections to that 'url' SQL_Connection *result=static_cast(connections->pop()); @@ -217,8 +221,6 @@ void SQL_Driver_manager::put_connection_ SQL_Connection& connection) { SYNCHRONIZED; - maybe_expire_connection_cache(); - Stack *connections=static_cast(connection_cache.get(url)); if(!connections) { // there are no cached connections to that 'url' yet? connections=NEW Stack(pool()); // NOTE: never freed up! @@ -231,7 +233,7 @@ static void expire_connection(Array::Ite SQL_Connection& connection=*static_cast(value); time_t older_dies=reinterpret_cast(info); - if(connection.expired(older_dies)) + if(connection.connected() && connection.expired(older_dies)) connection.disconnect(); } static void expire_connections(const Hash::Key& key, Hash::Val *value, void *info) {