--- parser3/src/main/pa_sql_driver_manager.C 2002/03/27 15:30:37 1.62 +++ parser3/src/main/pa_sql_driver_manager.C 2003/01/27 16:19:11 1.69.2.2 @@ -1,25 +1,24 @@ /** @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) - - $Id: pa_sql_driver_manager.C,v 1.62 2002/03/27 15:30:37 paf Exp $ */ +static const char* IDENT_SQL_DRIVER_MANAGER_C="$Date: 2003/01/27 16:19:11 $"; + #include "pa_sql_driver_manager.h" #include "ltdl.h" #include "pa_sql_connection.h" #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,7 +27,7 @@ const int CHECK_EXPIRED_CONNECTIONS_SECO // helpers -const String& url_without_login(Pool& pool, const String& url) { +ConstStringPtr url_without_login(Pool& pool, ConstStringPtr url) { String& result=*new(pool) String(pool); result << url.mid(0, url.pos(":")) << "://****"; @@ -42,7 +41,7 @@ const String& url_without_login(Pool& po /// 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), + SQL_Driver_services_impl(Pool& apool, ConstStringPtr aurl) : Pooled(apool), furl(aurl) { } @@ -50,25 +49,41 @@ public: virtual void *calloc(size_t size) { return Pooled::calloc(size); } /** + normally we can't 'throw' from dynamic library, so 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() + + but when parser configured --with-sjlj-exceptions + one can simply 'throw' from dynamic library. + [sad story: one can not longjump/throw due to some bug in gcc as of 3.2.1 version] */ - virtual void _throw(const char *comment) { + virtual void _throw(const SQL_Error& aexception) { + // converting SQL_exception to parser Exception // hiding passwords and addresses from accidental show [imagine user forgot @exception] - e=Exception("sql.connect", - &url_without_login(pool(), furl), - comment); +#ifdef PA_WITH_SJLJ_EXCEPTIONS + throw +#else + fexception= +#endif + Exception(aexception.type(), + aexception.problem_source()?static_cast(aexception.problem_source()) + :&url_without_login(pool(), furl), + aexception.comment()); +#ifndef PA_WITH_SJLJ_EXCEPTIONS longjmp(mark, 1); +#endif } virtual void propagate_exception() { - throw e; +#ifndef PA_WITH_SJLJ_EXCEPTIONS + throw fexception; +#endif } private: - const String& furl; - Exception e; + ConstStringPtr furl; + Exception fexception; }; // helpers @@ -88,10 +103,8 @@ static void expire_connections(const Has // 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() { @@ -100,8 +113,8 @@ SQL_Driver_manager::~SQL_Driver_manager( } /// @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(ConstStringPtr request_url, + ConstStringPtr request_origin, Table *protocol2driver_and_client) { Pool& pool=request_origin.pool(); // request pool @@ -229,10 +242,10 @@ SQL_Connection_ptr SQL_Driver_manager::g 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); @@ -242,13 +255,13 @@ void SQL_Driver_manager::close_connectio // 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 +270,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_Connection *SQL_Driver_manager::get_connection_from_cache(ConstStringPtr url) { SYNCHRONIZED; if(Stack *connections=static_cast(connection_cache.get(url))) @@ -270,7 +283,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 +333,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