Diff for /servers/slapd/back-bdb/dbcache.c between versions 1.15.2.2 and 1.44

version 1.15.2.2, 2002/07/28 19:16:57 version 1.44, 2007/01/02 19:01:07
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.15.2.1 2002/04/15 15:21:58 kurt Exp $ */  /* $OpenLDAP: pkg/ldap/servers/slapd/back-bdb/dbcache.c,v 1.43 2006/01/03 22:12:17 kurt Exp $ */
 /*  /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.   *
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file   * Copyright 2000-2007 The OpenLDAP Foundation.
    * All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted only as authorized by the OpenLDAP
    * Public License.
    *
    * A copy of this license is available in the file LICENSE in the
    * top-level directory of the distribution or, alternatively, at
    * <http://www.OpenLDAP.org/license.html>.
  */   */
   
 #include "portable.h"  #include "portable.h"
Line 19 Line 28
 #include "back-bdb.h"  #include "back-bdb.h"
 #include "lutil_hash.h"  #include "lutil_hash.h"
   
   #ifdef BDB_INDEX_USE_HASH
 /* Pass-thru hash function. Since the indexer is already giving us hash  /* Pass-thru hash function. Since the indexer is already giving us hash
  * values as keys, we don't need BDB to re-hash them.   * values as keys, we don't need BDB to re-hash them.
  */   */
Line 42  bdb_db_hash( Line 52  bdb_db_hash(
         }          }
         return ret;          return ret;
 }  }
   #define BDB_INDEXTYPE   DB_HASH
   #else
   #define BDB_INDEXTYPE   DB_BTREE
   #endif
   
 int  int
 bdb_db_cache(  bdb_db_cache(
Line 49  bdb_db_cache( Line 63  bdb_db_cache(
         const char *name,          const char *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 57  bdb_db_cache( Line 71  bdb_db_cache(
   
         *dbout = NULL;          *dbout = NULL;
   
         for( i=BDB_NDB; bdb->bi_databases[i]; i++ ) {          for( i=BDB_NDB; i < bdb->bi_ndatabases; i++ ) {
                 if( !strcmp( bdb->bi_databases[i]->bdi_name, name) ) {                  if( !strcmp( 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 67  bdb_db_cache( Line 81  bdb_db_cache(
         ldap_pvt_thread_mutex_lock( &bdb->bi_database_mutex );          ldap_pvt_thread_mutex_lock( &bdb->bi_database_mutex );
   
         /* check again! may have been added by another thread */          /* check again! may have been added by another thread */
         for( i=BDB_NDB; bdb->bi_databases[i]; i++ ) {          for( i=BDB_NDB; i < bdb->bi_ndatabases; i++ ) {
                 if( !strcmp( bdb->bi_databases[i]->bdi_name, name) ) {                  if( !strcmp( 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 );
Line 86  bdb_db_cache( Line 100  bdb_db_cache(
   
         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 ) {
 #ifdef NEW_LOGGING  
                 LDAP_LOG ( CACHE, ERR,   
                         "bdb_db_cache: db_create(%s) failed: %s (%d)\n",   
                         bdb->bi_dbenv_home, db_strerror(rc), rc );  
 #else  
                 Debug( LDAP_DEBUG_ANY,                  Debug( LDAP_DEBUG_ANY,
                         "bdb_db_cache: db_create(%s) failed: %s (%d)\n",                          "bdb_db_cache: db_create(%s) failed: %s (%d)\n",
                         bdb->bi_dbenv_home, db_strerror(rc), rc );                          bdb->bi_dbenv_home, db_strerror(rc), rc );
 #endif  
                 ldap_pvt_thread_mutex_unlock( &bdb->bi_database_mutex );                  ldap_pvt_thread_mutex_unlock( &bdb->bi_database_mutex );
                 return rc;                  return rc;
         }          }
   
         rc = db->bdi_db->set_pagesize( db->bdi_db, BDB_PAGESIZE );          rc = db->bdi_db->set_pagesize( db->bdi_db, BDB_PAGESIZE );
   #ifdef BDB_INDEX_USE_HASH
         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 );
 #ifdef BDB_IDL_MULTI  
         rc = db->bdi_db->set_flags( db->bdi_db, DB_DUP | DB_DUPSORT );  
         rc = db->bdi_db->set_dup_compare( db->bdi_db, bdb_bt_compare );  
 #endif  #endif
           rc = db->bdi_db->set_flags( db->bdi_db, DB_DUP | DB_DUPSORT );
   
         file = ch_malloc( strlen( name ) + sizeof(BDB_SUFFIX) );          file = ch_malloc( strlen( name ) + sizeof(BDB_SUFFIX) );
         sprintf( file, "%s" BDB_SUFFIX, name );          sprintf( file, "%s" BDB_SUFFIX, name );
   
         rc = db->bdi_db->open( db->bdi_db,  #ifdef HAVE_EBCDIC
                 file, name,          __atoe( file );
                 DB_HASH, bdb->bi_db_opflags | DB_CREATE | DB_THREAD,  #endif
                 bdb->bi_dbenv_mode );          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,
                   file, NULL /* name */,
                   BDB_INDEXTYPE, bdb->bi_db_opflags | flags, bdb->bi_dbenv_mode );
   
         ch_free( file );          ch_free( file );
   
         if( rc != 0 ) {          if( rc != 0 ) {
 #ifdef NEW_LOGGING  
                 LDAP_LOG ( CACHE, ERR,   
                         "bdb_db_cache: db_open(%s) failed: %s (%d)\n",   
                         name, db_strerror(rc), rc );  
 #else  
                 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, db_strerror(rc), rc );
 #endif  
                 ldap_pvt_thread_mutex_unlock( &bdb->bi_database_mutex );                  ldap_pvt_thread_mutex_unlock( &bdb->bi_database_mutex );
                 return rc;                  return rc;
         }          }
   
         bdb->bi_databases[i+1] = NULL;  
         bdb->bi_databases[i] = db;          bdb->bi_databases[i] = db;
         bdb->bi_ndatabases = i+1;          bdb->bi_ndatabases = i+1;
   

Removed from v.1.15.2.2  
changed lines
  Added in v.1.44


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