--- parser3/src/main/pa_sql_driver_manager.C 2009/07/06 12:07:04 1.90 +++ parser3/src/main/pa_sql_driver_manager.C 2013/07/05 21:09:58 1.92 @@ -1,12 +1,10 @@ /** @file Parser: sql driver manager implementation. - Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_SQL_DRIVER_MANAGER_C="$Date: 2009/07/06 12:07:04 $"; - #include "pa_sql_driver_manager.h" #include "ltdl.h" #include "pa_threads.h" @@ -17,6 +15,8 @@ static const char * const IDENT_SQL_DRIV #include "pa_vtable.h" #include "pa_charsets.h" +volatile const char * IDENT_PA_SQL_DRIVER_MANAGER_C="$Id: pa_sql_driver_manager.C,v 1.92 2013/07/05 21:09:58 moko Exp $" IDENT_PA_SQL_DRIVER_MANAGER_H IDENT_PA_SQL_CONNECTION_H; + // globals SQL_Driver_manager* SQL_driver_manager=0; @@ -101,15 +101,10 @@ static void expire_connections(SQL_Drive // SQL_Driver_manager -SQL_Driver_manager::SQL_Driver_manager(): - is_dlinited(false), 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, time(0)+(time_t)10/*=in future=expire all*/); - - if(is_dlinited) - lt_dlexit(); } /// @param aurl protocol://[driver-dependent] @@ -170,14 +165,7 @@ SQL_Connection* SQL_Driver_manager::get_ "undefined protocol '%s'", protocol_cstr); - if(!is_dlinited) { - if(lt_dlinit()) - throw Exception(0, - library, - "prepare to dynamic loading failed, %s", lt_dlerror()); - - is_dlinited=true; - } + pa_dlinit(); const char* filename=library->taint_cstr(String::L_FILE_SPEC); lt_dlhandle handle=lt_dlopen(filename);