--- parser3/src/main/pa_sql_driver_manager.C 2002/08/01 11:41:19 1.64 +++ parser3/src/main/pa_sql_driver_manager.C 2003/01/27 17:17:06 1.69.2.3 @@ -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="$Date: 2002/08/01 11:41:19 $"; +static const char* IDENT_SQL_DRIVER_MANAGER_C="$Date: 2003/01/27 17:17:06 $"; #include "pa_sql_driver_manager.h" #include "ltdl.h" @@ -13,13 +13,12 @@ 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 @@ -28,96 +27,55 @@ const int CHECK_EXPIRED_CONNECTIONS_SECO // 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 << url->mid(0, furl->pos(":")) << "://****"; - int at_pos=url.pos("@"); + int at_pos=url->pos("@"); if(at_pos>0) - result << url.mid(at_pos, url.size()); + *result << url->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, +SQL_ConnectionPtr SQL_Driver_manager::get_connection(Pool& pool, ConstStringPtr aurl, + 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, + aurl, "$"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); if(connection) { - connection->set_services(services); + connection->set_pool(pool); if(!connection->ping()) { // we have some cached connection, is it pingable? connection->disconnect(); // kill unpingabe=dead connection connection=0; @@ -222,33 +180,33 @@ SQL_Connection_ptr SQL_Driver_manager::g // 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->set_pool(pool); } // 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, +void SQL_Driver_manager::close_connection(ConstStringPtr url, SQL_Connection& connection) { // deassociate from services[request] - connection.set_services(0); + 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(ConstStringPtr protocol) { SYNCHRONIZED; return static_cast(driver_cache.get(protocol)); } -void SQL_Driver_manager::put_driver_to_cache(const String& protocol, +void SQL_Driver_manager::put_driver_to_cache(ConstStringPtr protocol, SQL_Driver& driver) { SYNCHRONIZED; @@ -257,7 +215,7 @@ 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) { +SQL_ConnectionPtr SQL_Driver_manager::get_connection_from_cache(ConstStringPtr url) { SYNCHRONIZED; if(Stack *connections=static_cast(connection_cache.get(url))) @@ -270,7 +228,7 @@ SQL_Connection *SQL_Driver_manager::get_ return 0; } -void SQL_Driver_manager::put_connection_to_cache(const String& url, +void SQL_Driver_manager::put_connection_to_cache(ConstStringPtr url, SQL_Connection& connection) { SYNCHRONIZED; @@ -320,7 +278,7 @@ static void add_connections_to_status_ca 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) { +ValuePtr SQL_Driver_manager::get_status(Pool& pool, ConstStringPtr source) { VHash& result=*new(pool) VHash(pool); // cache