--- parser3/src/main/pa_sql_driver_manager.C 2002/08/01 11:26:51 1.63 +++ parser3/src/main/pa_sql_driver_manager.C 2003/01/28 09:48:16 1.69.2.4 @@ -1,11 +1,11 @@ /** @file Parser: sql driver manager implementation. - Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_SQL_DRIVER_MANAGER_C="$Id: pa_sql_driver_manager.C,v 1.63 2002/08/01 11:26:51 paf Exp $"; +static const char* IDENT_SQL_DRIVER_MANAGER_C="$Date: 2003/01/28 09:48:16 $"; #include "pa_sql_driver_manager.h" #include "ltdl.h" @@ -13,114 +13,72 @@ static const char* IDENT_SQL_DRIVER_MANA #include "pa_exception.h" #include "pa_common.h" #include "pa_threads.h" -#include "pa_stack.h" #include "pa_vhash.h" #include "pa_vtable.h" // globals -SQL_Driver_manager *SQL_driver_manager; +SQL_Driver_manager SQL_driver_manager; // consts -const int EXPIRE_UNUSED_CONNECTION_SECONDS=60; -const int CHECK_EXPIRED_CONNECTIONS_SECONDS=EXPIRE_UNUSED_CONNECTION_SECONDS*2; +const time_t EXPIRE_UNUSED_CONNECTION_SECONDS=60; +const time_t CHECK_EXPIRED_CONNECTIONS_SECONDS=EXPIRE_UNUSED_CONNECTION_SECONDS*2; // helpers -const String& url_without_login(Pool& pool, const String& url) { - String& result=*new(pool) String(pool); - result << url.mid(0, url.pos(":")) << "://****"; +ConstStringPtr SQL_Driver_services_impl::url_without_login() const { + StringPtr result(new String); + *result << furl->mid(0, furl->pos(":")) << "://****"; - int at_pos=url.pos("@"); + int at_pos=furl->pos("@"); if(at_pos>0) - result << url.mid(at_pos, url.size()); + *result << furl->mid(at_pos, furl->size()); return result; } -/// SQL_Driver_services Pooled implementation -class SQL_Driver_services_impl : public SQL_Driver_services, public Pooled { -public: - SQL_Driver_services_impl(Pool& apool, const String& aurl) : Pooled(apool), - furl(aurl) { - } - - 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) { - // hiding passwords and addresses from accidental show [imagine user forgot @exception] - e=Exception("sql.connect", - &url_without_login(pool(), 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(value); - time_t older_dies=reinterpret_cast(info); - +static void expire_connection(SQL_Connection& connection, time_t older_dies) { 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); +static void expire_connections( + SQL_Driver_manager::connection_cache_type::key_type /*key*/, + SQL_Driver_manager::connection_cache_type::value_type stack, + time_t older_dies) { + for(int i=0; i<=stack->top_index(); i++) + expire_connection(*stack->get(i), older_dies); } // SQL_Driver_manager -SQL_Driver_manager::SQL_Driver_manager(Pool& apool) : Cache_manager(apool), - driver_cache(apool), - connection_cache(apool), - prev_expiration_pass_time(0) { +SQL_Driver_manager::SQL_Driver_manager(): + prev_expiration_pass_time(0) { } SQL_Driver_manager::~SQL_Driver_manager() { - connection_cache.for_each(expire_connections, - reinterpret_cast(time(0)+1/*=in future=expire all*/)); + connection_cache.for_each(expire_connections, time(0)+(time_t)1/*=in future=expire all*/); } -/// @param request_url protocol://[driver-dependent] -SQL_Connection_ptr SQL_Driver_manager::get_connection(const String& request_url, - const String& request_origin, +/// @param aurl protocol://[driver-dependent] +SQL_ConnectionPtr SQL_Driver_manager::get_connection(Pool& apool, ConstStringPtr arequest_url, + ConstStringPtr aorigin, Table *protocol2driver_and_client) { - Pool& pool=request_origin.pool(); // request pool - // we have table for locating protocol's library if(!protocol2driver_and_client) throw Exception("parser.runtime", - &request_url, + arequest_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 *connection=get_connection_from_cache(request_url); + SQL_ConnectionPtr connection=get_connection_from_cache(arequest_url); if(connection) { - connection->set_services(services); + connection->set_pool(&apool); if(!connection->ping()) { // we have some cached connection, is it pingable? connection->disconnect(); // kill unpingabe=dead connection - connection=0; + connection=SQL_ConnectionPtr(0); } } @@ -128,36 +86,31 @@ SQL_Connection_ptr SQL_Driver_manager::g if(connection) 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) + if(arequest_url->pos("://")<0) throw Exception("parser.runtime", - request_url.size()?&request_url:&request_origin, + arequest_url->size()?arequest_url:aorigin, "connection string must start with protocol://"); // make global_url C-string on global pool - 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 - String& global_url=*new(this->pool()) String(this->pool(), global_url_cstr); + char *global_url_cstr=arequest_url->cstr(driver_cache_pool); + StringPtr global_url(new String(global_url_cstr)); + request_url_cstr=arequest_url->cstr(); char *request_protocol_cstr=lsplit(&request_url_cstr, ':'); // skip "//" after ':' while(*request_url_cstr=='/') request_url_cstr++; // make global_protocol C-string on global pool - char *global_protocol_cstr=(char *)malloc(strlen(request_protocol_cstr)+1); - strcpy(global_protocol_cstr, request_protocol_cstr); + char *global_protocol_cstr=driver_cache_pool.copy(request_protocol_cstr); // make global_protocol string on global pool - String& global_protocol=*new(this->pool()) String(this->pool(), - global_protocol_cstr); + StringPtr global_protocol(new String(global_protocol_cstr)); SQL_Driver *driver; // first trying to get cached driver if(!(driver=get_driver_from_cache(global_protocol))) { // no cached - const String *library=0; - const String *dlopen_file_spec=0; + ConstStringPtr library(0); + ConstStringPtr dlopen_file_spec(0); if(protocol2driver_and_client->locate(0, global_protocol)) { if(!(library=protocol2driver_and_client->item(1)) || library->size()==0) throw Exception("parser.runtime", @@ -167,7 +120,7 @@ SQL_Connection_ptr SQL_Driver_manager::g dlopen_file_spec=protocol2driver_and_client->item(2); } else throw Exception("parser.runtime", - &request_url, + arequest_url, "undefined protocol '%s'", request_protocol_cstr); @@ -202,9 +155,9 @@ SQL_Connection_ptr SQL_Driver_manager::g driver_api_version, SQL_DRIVER_API_VERSION); // initialise by connecting to sql client dynamic link library - char *dlopen_file_spec_cstr= + CharPtr dlopen_file_spec_cstr= dlopen_file_spec && dlopen_file_spec->size()? - dlopen_file_spec->cstr(String::UL_AS_IS):0; + dlopen_file_spec->cstr(String::UL_AS_IS):CharPtrZero; if(const char *error=driver->initialize( dlopen_file_spec_cstr)) throw Exception(0, @@ -214,55 +167,53 @@ SQL_Connection_ptr SQL_Driver_manager::g error); // cache it - put_driver_to_cache(global_protocol, *driver); + put_driver_to_cache(global_protocol, driver); } - // allocate in global pool - // associate with services[request] - // NOTE: never freed up! - connection=new(this->pool()) SQL_Connection(this->pool(), global_url, *driver); - // associate with services[request] (deassociates at close) - connection->set_services(services); + connection=SQL_ConnectionPtr(new SQL_Connection(global_url, *driver)); + // associate with pool[request] (deassociates at close) + connection->set_pool(&apool); } // if not connected yet, do that now, when connection has services if(!connection->connected()) connection->connect(request_url_cstr); // return autoclosing object for it - return SQL_Connection_ptr(connection); + return SQL_ConnectionPtr(connection); } -void SQL_Driver_manager::close_connection(const String& url, - SQL_Connection& connection) { - // deassociate from services[request] - connection.set_services(0); +void SQL_Driver_manager::close_connection(connection_cache_type::key_type url, + SQL_ConnectionPtr connection) { + // deassociate from pool[request] + connection->set_pool(0); put_connection_to_cache(url, connection); } // driver cache -SQL_Driver *SQL_Driver_manager::get_driver_from_cache(const String& protocol) { +SQL_Driver *SQL_Driver_manager::get_driver_from_cache(driver_cache_type::key_type protocol) { SYNCHRONIZED; - return static_cast(driver_cache.get(protocol)); + return driver_cache.get(protocol); } -void SQL_Driver_manager::put_driver_to_cache(const String& protocol, - SQL_Driver& driver) { +void SQL_Driver_manager::put_driver_to_cache( + driver_cache_type::key_type protocol, + driver_cache_type::value_type driver) { SYNCHRONIZED; - driver_cache.put(protocol, &driver); + driver_cache.put(protocol, driver); } // 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) { +SQL_ConnectionPtr SQL_Driver_manager::get_connection_from_cache( + connection_cache_type::key_type url) { SYNCHRONIZED; - if(Stack *connections=static_cast(connection_cache.get(url))) + if(connection_cache_type::value_type connections=connection_cache.get(url)) while(connections->top_index()>=0) { // there are cached connections to that 'url' - SQL_Connection *result=static_cast(connections->pop()); + SQL_ConnectionPtr result=connections->pop(); if(result->connected()) // not expired? return result; } @@ -270,29 +221,29 @@ SQL_Connection *SQL_Driver_manager::get_ return 0; } -void SQL_Driver_manager::put_connection_to_cache(const String& url, - SQL_Connection& connection) { +void SQL_Driver_manager::put_connection_to_cache( + connection_cache_type::key_type url, + SQL_ConnectionPtr connection) { SYNCHRONIZED; - Stack *connections=static_cast(connection_cache.get(url)); + connection_cache_type::value_type connections=connection_cache.get(url); if(!connections) { // there are no cached connections to that 'url' yet? - connections=NEW Stack(pool()); // NOTE: never freed up! + connections=connection_cache_type::value_type(new connection_cache_type::value_type::element_type); connection_cache.put(url, connections); } - connections->push(&connection); + connections->push(connection); } void SQL_Driver_manager::maybe_expire_cache() { time_t now=time(0); if(prev_expiration_pass_time(now-EXPIRE_UNUSED_CONNECTION_SECONDS)); + connection_cache.for_each(expire_connections, time_t(now-EXPIRE_UNUSED_CONNECTION_SECONDS)); prev_expiration_pass_time=now; } } - +/* static void add_connection_to_status_cache_table(Array::Item *value, void *info) { SQL_Connection& connection=*static_cast(value); Table& table=*static_cast(info); @@ -319,10 +270,11 @@ static void add_connections_to_status_ca Array_iter iter(stack); for(int countdown=stack.top_index(); countdown-->=0; ) add_connection_to_status_cache_table(iter.next(), info); -} -Value& SQL_Driver_manager::get_status(Pool& pool, const String *source) { - VHash& result=*new(pool) VHash(pool); - +}*/ +/// @todo convert to object_ptr +ValuePtr SQL_Driver_manager::get_status(Pool& pool, ConstStringPtr source) { + ValuePtr result(new VHash); + /* // cache { Array& columns=*new(pool) Array(pool); @@ -333,7 +285,7 @@ Value& SQL_Driver_manager::get_status(Po connection_cache.for_each(add_connections_to_status_cache_table, &table); result.hash(source).put(*new(pool) String(pool, "cache"), new(pool) VTable(pool, &table)); - } + }*/ return result; }