Diff for /parser3/src/main/pa_sql_driver_manager.C between versions 1.47 and 1.49

version 1.47, 2001/10/31 14:42:05 version 1.49, 2001/11/05 10:21:28
Line 14 Line 14
 #include "pa_common.h"  #include "pa_common.h"
 #include "pa_threads.h"  #include "pa_threads.h"
 #include "pa_stack.h"  #include "pa_stack.h"
   #include "pa_vhash.h"
   #include "pa_vtable.h"
   
 // globals  // globals
   
Line 24  SQL_Driver_manager *SQL_driver_manager; Line 26  SQL_Driver_manager *SQL_driver_manager;
 const int EXPIRE_UNUSED_CONNECTION_SECONDS=60;  const int EXPIRE_UNUSED_CONNECTION_SECONDS=60;
 const int CHECK_EXPIRED_CONNECTIONS_SECONDS=EXPIRE_UNUSED_CONNECTION_SECONDS*2;  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  /// SQL_Driver_services Pooled implementation
 class SQL_Driver_services_impl : public SQL_Driver_services, public Pooled {  class SQL_Driver_services_impl : public SQL_Driver_services, public Pooled {
Line 41  public: Line 55  public:
                 and from there... #2 propagate_exception()                  and from there... #2 propagate_exception()
         */          */
         virtual void _throw(const char *comment) {           virtual void _throw(const char *comment) { 
                 String& protocol=*NEW String(pool());                  // hiding passwords and addresses from accidental show [imagine user forgot @exception]
                 /// hiding passwords and addresses from accidental show [imagine user forgot @exception]  
                 protocol << furl.mid(0, furl.pos(":")) << "...";  
                 e=Exception(0, 0,                   e=Exception(0, 0, 
                         &protocol,                          &url_without_login(pool(), furl),
                         comment);                           comment); 
   
                 longjmp(mark, 1);                  longjmp(mark, 1);
Line 76  static void expire_connections(const Has Line 88  static void expire_connections(const Has
   
 // SQL_Driver_manager  // SQL_Driver_manager
   
 SQL_Driver_manager::SQL_Driver_manager(Pool& pool) : Pooled(pool),  SQL_Driver_manager::SQL_Driver_manager(Pool& apool) : Pooled(apool),
                 driver_cache(pool),                  driver_cache(apool),
                 connection_cache(pool),                  connection_cache(apool),
                 prev_expiration_pass_time(0) {                  prev_expiration_pass_time(0) {
           
           status_providers->put(*NEW String(pool(), "sql"), this);
 }  }
   
 SQL_Driver_manager::~SQL_Driver_manager() {  SQL_Driver_manager::~SQL_Driver_manager() {
Line 284  void SQL_Driver_manager::maybe_expire_co Line 297  void SQL_Driver_manager::maybe_expire_co
                 prev_expiration_pass_time=now;                  prev_expiration_pass_time=now;
         }          }
 }  }
   
   static void add_connection_to_status_cache_table(Array::Item *value, void *info) {
           SQL_Connection& connection=*static_cast<SQL_Connection *>(value);
           Table& table=*static_cast<Table *>(info);
   
           if(connection.connected()) {
                   Pool& pool=table.pool();
                   Array& row=*new(pool) Array(pool, 3);
   
                   row+=&url_without_login(pool, connection.get_url());
                   time_t time_stamp=connection.get_time_stamp();
                   const char *unsafe_time_cstr=ctime(&time_stamp);
                   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<Stack *>(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, 3);
                   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;
   }
   

Removed from v.1.47  
changed lines
  Added in v.1.49


E-mail: