--- parser3/src/main/pa_sql_driver_manager.C 2001/10/29 10:06:36 1.44 +++ parser3/src/main/pa_sql_driver_manager.C 2002/01/21 16:44:49 1.59 @@ -2,9 +2,9 @@ Parser: sql driver manager implementation. Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) + Author: Alexander Petrosyan (http://paf.design.ru) - $Id: pa_sql_driver_manager.C,v 1.44 2001/10/29 10:06:36 paf Exp $ + $Id: pa_sql_driver_manager.C,v 1.59 2002/01/21 16:44:49 paf Exp $ */ #include "pa_sql_driver_manager.h" @@ -14,6 +14,8 @@ #include "pa_common.h" #include "pa_threads.h" #include "pa_stack.h" +#include "pa_vhash.h" +#include "pa_vtable.h" // globals @@ -24,6 +26,18 @@ SQL_Driver_manager *SQL_driver_manager; const int EXPIRE_UNUSED_CONNECTION_SECONDS=60; const int 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(":")) << "://****"; + + int at_pos=url.pos("@"); + if(at_pos>0) + result << url.mid(at_pos, url.size()); + + return result; +} /// SQL_Driver_services Pooled implementation class SQL_Driver_services_impl : public SQL_Driver_services, public Pooled { @@ -32,7 +46,7 @@ public: furl(aurl) { } - virtual void *malloc(size_t size) { return Pooled::malloc(size); } + virtual void *malloc(size_t size) { return Pooled::malloc(size, 8); } virtual void *calloc(size_t size) { return Pooled::calloc(size); } /** @@ -41,8 +55,9 @@ public: 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(0, 0, - &furl, + &url_without_login(pool(), furl), comment); longjmp(mark, 1); @@ -73,20 +88,19 @@ static void expire_connections(const Has // SQL_Driver_manager -SQL_Driver_manager::SQL_Driver_manager(Pool& pool) : Pooled(pool), - driver_cache(pool), - connection_cache(pool), +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() { connection_cache.for_each(expire_connections, - reinterpret_cast((time_t)0/*=in past=expire all*/)); + reinterpret_cast(time(0)+1/*=in future=expire all*/)); } /// @param request_url protocol://[driver-dependent] -SQL_Connection& SQL_Driver_manager::get_connection(const String& request_url, +SQL_Connection_ptr SQL_Driver_manager::get_connection(const String& request_url, const String& request_origin, Table *protocol2driver_and_client) { Pool& pool=request_origin.pool(); // request pool @@ -101,17 +115,17 @@ SQL_Connection& SQL_Driver_manager::get_ SQL_Driver_services *services=new(pool) SQL_Driver_services_impl(pool, request_url); // first trying to get cached connection - SQL_Connection *result=get_connection_from_cache(request_url); - if(result) { - result->set_services(services); - if(!result->ping()) { // we have some cached connection, is it pingable? - result->disconnect(); // kill unpingabe=dead connection - result=0; + SQL_Connection *connection=get_connection_from_cache(request_url); + if(connection) { + connection->set_services(services); + if(!connection->ping()) { // we have some cached connection, is it pingable? + connection->disconnect(); // kill unpingabe=dead connection + connection=0; } } char *request_url_cstr; - if(result) + if(connection) request_url_cstr=0; // calm, compiler else { // no cached connection or it were unpingabe: connect/reconnect int pos=request_url.pos("://", 3); @@ -121,7 +135,7 @@ SQL_Connection& SQL_Driver_manager::get_ "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); + 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 @@ -139,11 +153,11 @@ SQL_Connection& SQL_Driver_manager::get_ global_protocol_cstr); SQL_Driver *driver; - const String *dlopen_file_spec=0; // 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; if(protocol2driver_and_client->locate(0, global_protocol)) { if(!(library=protocol2driver_and_client->item(1)) || library->size()==0) throw Exception(0, 0, @@ -188,16 +202,15 @@ SQL_Connection& SQL_Driver_manager::get_ driver_api_version, SQL_DRIVER_API_VERSION); // initialise by connecting to sql client dynamic link library - 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; + char *dlopen_file_spec_cstr= + dlopen_file_spec && dlopen_file_spec->size()? + dlopen_file_spec->cstr(String::UL_AS_IS):0; if(const char *error=driver->initialize( dlopen_file_spec_cstr)) throw Exception(0, 0, library, "driver failed to initialize client library '%s', %s", - specified_dlopen_file_spec?dlopen_file_spec_cstr:"unspecifed", + dlopen_file_spec_cstr?dlopen_file_spec_cstr:"unspecifed", error); // cache it @@ -207,16 +220,16 @@ 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); + connection=new(this->pool()) SQL_Connection(this->pool(), global_url, *driver); // associate with services[request] (deassociates at close) - result->set_services(services); + connection->set_services(services); } - // if not connected yet, do that now, when result has services - if(!result->connected()) - result->connect(request_url_cstr); - // return it - return *result; + // 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); } void SQL_Driver_manager::close_connection(const String& url, @@ -247,8 +260,6 @@ void SQL_Driver_manager::put_driver_to_c 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()); @@ -271,7 +282,7 @@ void SQL_Driver_manager::put_connection_ connections->push(&connection); } -void SQL_Driver_manager::maybe_expire_connection_cache() { +void SQL_Driver_manager::maybe_expire_cache() { time_t now=time(0); if(prev_expiration_pass_time(value); + Table& table=*static_cast(info); + + if(connection.connected()) { + Pool& pool=table.pool(); + Array& row=*new(pool) Array(pool); + + // url + row+=&url_without_login(pool, connection.get_url()); + // time + time_t time_used=connection.get_time_used(); + const char *unsafe_time_cstr=ctime(&time_used); + int time_buf_size=strlen(unsafe_time_cstr); + char *safe_time_buf=(char *)pool.malloc(time_buf_size); + memcpy(safe_time_buf, unsafe_time_cstr, time_buf_size); + row+=new(pool) String(pool, safe_time_buf, time_buf_size); + + table+=&row; + } +} +static void add_connections_to_status_cache_table(const Hash::Key& key, Hash::Val *value, void *info) { + Stack& stack=*static_cast(value); + 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); + + // cache + { + Array& columns=*new(pool) Array(pool); + columns+=new(pool) String(pool, "url"); + columns+=new(pool) String(pool, "time"); + Table& table=*new(pool) Table(pool, 0, &columns, connection_cache.size()); + + 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; +}