--- parser3/src/main/pa_sql_driver_manager.C 2003/01/28 09:48:16 1.69.2.4 +++ parser3/src/main/pa_sql_driver_manager.C 2003/12/11 09:22:09 1.78 @@ -1,24 +1,24 @@ /** @file Parser: sql driver manager implementation. - Copyright (c) 2001, 2003 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: 2003/01/28 09:48:16 $"; +static const char * const IDENT_SQL_DRIVER_MANAGER_C="$Date: 2003/12/11 09:22:09 $"; #include "pa_sql_driver_manager.h" #include "ltdl.h" +#include "pa_threads.h" #include "pa_sql_connection.h" #include "pa_exception.h" #include "pa_common.h" -#include "pa_threads.h" #include "pa_vhash.h" #include "pa_vtable.h" // globals -SQL_Driver_manager SQL_driver_manager; +SQL_Driver_manager* SQL_driver_manager=0; // consts @@ -27,13 +27,13 @@ const time_t CHECK_EXPIRED_CONNECTIONS_S // helpers -ConstStringPtr SQL_Driver_services_impl::url_without_login() const { - StringPtr result(new String); - *result << furl->mid(0, furl->pos(":")) << "://****"; - - int at_pos=furl->pos("@"); - if(at_pos>0) - *result << furl->mid(at_pos, furl->size()); +const String& SQL_Driver_services_impl::url_without_login() const { + String& result=*new String; + result << furl->mid(0, furl->pos(':')) << "://****"; + + size_t at_pos=furl->pos('@'); + if(at_pos!=STRING_NOT_FOUND) + result << furl->mid(at_pos, furl->length()); return result; } @@ -44,92 +44,92 @@ static void expire_connection(SQL_Connec if(connection.connected() && connection.expired(older_dies)) connection.disconnect(); } -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++) +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(size_t i=0; itop_index(); i++) expire_connection(*stack->get(i), older_dies); } // SQL_Driver_manager SQL_Driver_manager::SQL_Driver_manager(): - prev_expiration_pass_time(0) { + is_dlinited(false), prev_expiration_pass_time(0) { } SQL_Driver_manager::~SQL_Driver_manager() { connection_cache.for_each(expire_connections, time(0)+(time_t)1/*=in future=expire all*/); + + if(is_dlinited) + lt_dlexit(); } /// @param aurl protocol://[driver-dependent] -SQL_ConnectionPtr SQL_Driver_manager::get_connection(Pool& apool, ConstStringPtr arequest_url, - ConstStringPtr aorigin, - Table *protocol2driver_and_client) { +SQL_Connection* SQL_Driver_manager::get_connection(const String& aurl, + Table *protocol2driver_and_client) { // we have table for locating protocol's library if(!protocol2driver_and_client) throw Exception("parser.runtime", - arequest_url, + &aurl, "$"MAIN_SQL_NAME":"MAIN_SQL_DRIVERS_NAME" table must be defined"); // first trying to get cached connection - SQL_ConnectionPtr connection=get_connection_from_cache(arequest_url); + SQL_Connection* connection=get_connection_from_cache(aurl); if(connection) { - connection->set_pool(&apool); + connection->set_url(); if(!connection->ping()) { // we have some cached connection, is it pingable? connection->disconnect(); // kill unpingabe=dead connection - connection=SQL_ConnectionPtr(0); + connection=0; } } - char *request_url_cstr; + char *url_cstr; if(connection) - request_url_cstr=0; // calm, compiler + url_cstr=0; // calm, compiler else { // no cached connection or it were unpingabe: connect/reconnect - if(arequest_url->pos("://")<0) + url_cstr=aurl.cstrm(); + if(!strstr(url_cstr, "://")) throw Exception("parser.runtime", - arequest_url->size()?arequest_url:aorigin, + aurl.length()?&aurl:0, "connection string must start with protocol://"); - // make global_url C-string on global pool - 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, ':'); + + char *protocol_cstr=lsplit(&url_cstr, ':'); // skip "//" after ':' - while(*request_url_cstr=='/') - request_url_cstr++; - // make global_protocol C-string on global pool - char *global_protocol_cstr=driver_cache_pool.copy(request_protocol_cstr); - // make global_protocol string on global pool - StringPtr global_protocol(new String(global_protocol_cstr)); + while(*url_cstr=='/') + url_cstr++; + const String& protocol=*new String(protocol_cstr); SQL_Driver *driver; // first trying to get cached driver - if(!(driver=get_driver_from_cache(global_protocol))) { + if(!(driver=get_driver_from_cache(protocol))) { // no cached - 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) + const String* library=0; + const String* dlopen_file_spec=0; + Table::Action_options options; + if(protocol2driver_and_client->locate(0, protocol, options)) { + if(!(library=protocol2driver_and_client->item(1)) || library->length()==0) throw Exception("parser.runtime", - protocol2driver_and_client->origin_string(), + 0, "driver library column for protocol '%s' is empty", - request_protocol_cstr); + protocol_cstr); dlopen_file_spec=protocol2driver_and_client->item(2); } else throw Exception("parser.runtime", - arequest_url, + &aurl, "undefined protocol '%s'", - request_protocol_cstr); + protocol_cstr); - if(lt_dlinit()) - throw Exception(0, - library, - "prepare to dynamic loading failed, %s", lt_dlerror()); + if(!is_dlinited) { + if(lt_dlinit()) + throw Exception(0, + library, + "prepare to dynamic loading failed, %s", lt_dlerror()); - const char *filename=library->cstr(String::UL_FILE_SPEC); + is_dlinited=true; + } + + const char* filename=library->cstr(String::L_FILE_SPEC); lt_dlhandle handle=lt_dlopen(filename); if (!handle) throw Exception(0, @@ -155,37 +155,34 @@ SQL_ConnectionPtr SQL_Driver_manager::ge driver_api_version, SQL_DRIVER_API_VERSION); // initialise by connecting to sql client dynamic link library - CharPtr dlopen_file_spec_cstr= - dlopen_file_spec && dlopen_file_spec->size()? - dlopen_file_spec->cstr(String::UL_AS_IS):CharPtrZero; - if(const char *error=driver->initialize( - dlopen_file_spec_cstr)) + char* dlopen_file_spec_cstr= + dlopen_file_spec && dlopen_file_spec->length()? + dlopen_file_spec->cstrm(String::L_AS_IS):0; + if(const char* error=driver->initialize(dlopen_file_spec_cstr)) throw Exception(0, library, "driver failed to initialize client library '%s', %s", - dlopen_file_spec_cstr?dlopen_file_spec_cstr:"unspecifed", + dlopen_file_spec_cstr?dlopen_file_spec_cstr:"unspecifed", error); // cache it - put_driver_to_cache(global_protocol, driver); + put_driver_to_cache(protocol, driver); } - connection=SQL_ConnectionPtr(new SQL_Connection(global_url, *driver)); + connection=new SQL_Connection(aurl, *driver); // associate with pool[request] (deassociates at close) - connection->set_pool(&apool); + connection->set_url(); } // if not connected yet, do that now, when connection has services if(!connection->connected()) - connection->connect(request_url_cstr); + connection->connect(url_cstr); // return autoclosing object for it - return SQL_ConnectionPtr(connection); + return connection; } void SQL_Driver_manager::close_connection(connection_cache_type::key_type url, - SQL_ConnectionPtr connection) { - // deassociate from pool[request] - connection->set_pool(0); + SQL_Connection* connection) { put_connection_to_cache(url, connection); } @@ -207,13 +204,13 @@ void SQL_Driver_manager::put_driver_to_c } // connection cache -SQL_ConnectionPtr SQL_Driver_manager::get_connection_from_cache( - connection_cache_type::key_type url) { +/// @todo get rid of memory spending Stack [zeros deep inside got accumulated] +SQL_Connection* SQL_Driver_manager::get_connection_from_cache(connection_cache_type::key_type url) { SYNCHRONIZED; if(connection_cache_type::value_type connections=connection_cache.get(url)) - while(connections->top_index()>=0) { // there are cached connections to that 'url' - SQL_ConnectionPtr result=connections->pop(); + while(!connections->is_empty()) { // there are cached connections to that 'url' + SQL_Connection* result=connections->pop(); if(result->connected()) // not expired? return result; } @@ -222,13 +219,13 @@ SQL_ConnectionPtr SQL_Driver_manager::ge } void SQL_Driver_manager::put_connection_to_cache( - connection_cache_type::key_type url, - SQL_ConnectionPtr connection) { + connection_cache_type::key_type url, + SQL_Connection* connection) { SYNCHRONIZED; connection_cache_type::value_type connections=connection_cache.get(url); if(!connections) { // there are no cached connections to that 'url' yet? - connections=connection_cache_type::value_type(new connection_cache_type::value_type::element_type); + connections=new connection_cache_element_base_type; connection_cache.put(url, connections); } connections->push(connection); @@ -243,49 +240,42 @@ void SQL_Driver_manager::maybe_expire_ca 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); +static void add_connection_to_status_cache_table(SQL_Connection& connection, Table* table) { if(connection.connected()) { - Pool& pool=table.pool(); - Array& row=*new(pool) Array(pool); + ArrayString& row=*new ArrayString; // url - row+=&url_without_login(pool, connection.get_url()); + row+=&connection.services().url_without_login(); // 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); + row+=new String(pa_strdup(ctime(&time_used))); - table+=&row; + *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); -}*/ -/// @todo convert to object_ptr -ValuePtr SQL_Driver_manager::get_status(Pool& pool, ConstStringPtr source) { - ValuePtr result(new VHash); - /* +static void add_connections_to_status_cache_table( + SQL_Driver_manager::connection_cache_type::key_type /*key*/, + SQL_Driver_manager::connection_cache_type::value_type stack, Table* table) +{ + for(Array_iterator i(*stack); i.has_next(); ) + add_connection_to_status_cache_table(*i.next(), table); +} + +Value* SQL_Driver_manager::get_status() { + Value* result=new VHash; + // 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()); + ArrayString& columns=*new ArrayString; + columns+=new String("url"); + columns+=new String("time"); + Table& table=*new Table(&columns, connection_cache.count()); 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)); - }*/ + result->get_hash()->put(*new String("cache"), new VTable(&table)); + } return result; }