Diff for /servers/slapd/back-bdb/dbcache.c between versions 1.38 and 1.43.2.4

version 1.38, 2004/12/06 06:28:47 version 1.43.2.4, 2007/11/26 04:08:37
Line 1 Line 1
 /* dbcache.c - manage cache of open databases */  /* dbcache.c - manage cache of open databases */
 /* $OpenLDAP: pkg/ldap/servers/slapd/back-bdb/dbcache.c,v 1.37 2004/09/04 02:54:31 kurt Exp $ */  /* $OpenLDAP: pkg/ldap/servers/slapd/back-bdb/dbcache.c,v 1.43.2.3 2007/11/21 18:18:32 quanah Exp $ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.  /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *   *
  * Copyright 2000-2004 The OpenLDAP Foundation.   * Copyright 2000-2007 The OpenLDAP Foundation.
  * All rights reserved.   * All rights reserved.
  *   *
  * Redistribution and use in source and binary forms, with or without   * Redistribution and use in source and binary forms, with or without
Line 60  bdb_db_hash( Line 60  bdb_db_hash(
 int  int
 bdb_db_cache(  bdb_db_cache(
         Backend *be,          Backend *be,
         const char *name,          struct berval *name,
         DB **dbout )          DB **dbout )
 {  {
         int i;          int i, flags;
         int rc;          int rc;
         struct bdb_info *bdb = (struct bdb_info *) be->be_private;          struct bdb_info *bdb = (struct bdb_info *) be->be_private;
         struct bdb_db_info *db;          struct bdb_db_info *db;
Line 72  bdb_db_cache( Line 72  bdb_db_cache(
         *dbout = NULL;          *dbout = NULL;
   
         for( i=BDB_NDB; i < bdb->bi_ndatabases; i++ ) {          for( i=BDB_NDB; i < bdb->bi_ndatabases; i++ ) {
                 if( !strcmp( bdb->bi_databases[i]->bdi_name, name) ) {                  if( !ber_bvcmp( &bdb->bi_databases[i]->bdi_name, name) ) {
                         *dbout = bdb->bi_databases[i]->bdi_db;                          *dbout = bdb->bi_databases[i]->bdi_db;
                         return 0;                          return 0;
                 }                  }
Line 82  bdb_db_cache( Line 82  bdb_db_cache(
   
         /* check again! may have been added by another thread */          /* check again! may have been added by another thread */
         for( i=BDB_NDB; i < bdb->bi_ndatabases; i++ ) {          for( i=BDB_NDB; i < bdb->bi_ndatabases; i++ ) {
                 if( !strcmp( bdb->bi_databases[i]->bdi_name, name) ) {                  if( !ber_bvcmp( &bdb->bi_databases[i]->bdi_name, name) ) {
                         *dbout = bdb->bi_databases[i]->bdi_db;                          *dbout = bdb->bi_databases[i]->bdi_db;
                         ldap_pvt_thread_mutex_unlock( &bdb->bi_database_mutex );                          ldap_pvt_thread_mutex_unlock( &bdb->bi_database_mutex );
                         return 0;                          return 0;
Line 96  bdb_db_cache( Line 96  bdb_db_cache(
   
         db = (struct bdb_db_info *) ch_calloc(1, sizeof(struct bdb_db_info));          db = (struct bdb_db_info *) ch_calloc(1, sizeof(struct bdb_db_info));
   
         db->bdi_name = ch_strdup( name );          ber_dupbv( &db->bdi_name, name );
   
         rc = db_create( &db->bdi_db, bdb->bi_dbenv, 0 );          rc = db_create( &db->bdi_db, bdb->bi_dbenv, 0 );
         if( rc != 0 ) {          if( rc != 0 ) {
Line 112  bdb_db_cache( Line 112  bdb_db_cache(
         rc = db->bdi_db->set_h_hash( db->bdi_db, bdb_db_hash );          rc = db->bdi_db->set_h_hash( db->bdi_db, bdb_db_hash );
 #endif  #endif
         rc = db->bdi_db->set_flags( db->bdi_db, DB_DUP | DB_DUPSORT );          rc = db->bdi_db->set_flags( db->bdi_db, DB_DUP | DB_DUPSORT );
 #if 0  
         rc = db->bdi_db->set_dup_compare( db->bdi_db, bdb_bt_compare );  
 #endif  
   
         file = ch_malloc( strlen( name ) + sizeof(BDB_SUFFIX) );          file = ch_malloc( db->bdi_name.bv_len + sizeof(BDB_SUFFIX) );
         sprintf( file, "%s" BDB_SUFFIX, name );          strcpy( file, db->bdi_name.bv_val );
           strcpy( file+db->bdi_name.bv_len, BDB_SUFFIX );
   
 #ifdef HAVE_EBCDIC  #ifdef HAVE_EBCDIC
         __atoe( file );          __atoe( file );
 #endif  #endif
           flags = DB_CREATE | DB_THREAD;
   #ifdef DB_AUTO_COMMIT
           if ( !( slapMode & SLAP_TOOL_QUICK ))
                   flags |= DB_AUTO_COMMIT;
   #endif
           /* Cannot Truncate when Transactions are in use */
           if ( (slapMode & (SLAP_TOOL_QUICK|SLAP_TRUNCATE_MODE)) ==
                   (SLAP_TOOL_QUICK|SLAP_TRUNCATE_MODE))
                           flags |= DB_TRUNCATE;
   
         rc = DB_OPEN( db->bdi_db,          rc = DB_OPEN( db->bdi_db,
                 file, NULL /* name */,                  file, NULL /* name */,
                 BDB_INDEXTYPE, bdb->bi_db_opflags | DB_CREATE | DB_THREAD,                  BDB_INDEXTYPE, bdb->bi_db_opflags | flags, bdb->bi_dbenv_mode );
                 bdb->bi_dbenv_mode );  
   
         ch_free( file );          ch_free( file );
   
         if( rc != 0 ) {          if( rc != 0 ) {
                 Debug( LDAP_DEBUG_ANY,                  Debug( LDAP_DEBUG_ANY,
                         "bdb_db_cache: db_open(%s) failed: %s (%d)\n",                          "bdb_db_cache: db_open(%s) failed: %s (%d)\n",
                         name, db_strerror(rc), rc );                          name->bv_val, db_strerror(rc), rc );
                 ldap_pvt_thread_mutex_unlock( &bdb->bi_database_mutex );                  ldap_pvt_thread_mutex_unlock( &bdb->bi_database_mutex );
                 return rc;                  return rc;
         }          }

Removed from v.1.38  
changed lines
  Added in v.1.43.2.4


______________
© Copyright 1998-2020, OpenLDAP Foundation, info@OpenLDAP.org