Diff for /servers/slapd/back-bdb/dbcache.c between versions 1.18 and 1.28.2.2

version 1.18, 2002/07/11 18:33:30 version 1.28.2.2, 2003/10/06 14:57:30
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.17 2002/04/05 03:59:04 hyc Exp $ */  /* $OpenLDAP: pkg/ldap/servers/slapd/back-bdb/dbcache.c,v 1.28.2.1 2003/09/18 15:43:36 kurt Exp $ */
 /*  /*
  * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.   * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file   * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */   */
   
Line 57  bdb_db_cache( Line 57  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 67  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 101  bdb_db_cache( Line 101  bdb_db_cache(
   
         rc = db->bdi_db->set_pagesize( db->bdi_db, BDB_PAGESIZE );          rc = db->bdi_db->set_pagesize( db->bdi_db, BDB_PAGESIZE );
         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_flags( db->bdi_db, DB_DUP | DB_DUPSORT );
         rc = db->bdi_db->set_dup_compare( db->bdi_db, bdb_bt_compare );          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( 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 );
   #endif
           rc = DB_OPEN( db->bdi_db,
                   file, NULL /* name */,
                 DB_HASH, bdb->bi_db_opflags | DB_CREATE | DB_THREAD,                  DB_HASH, bdb->bi_db_opflags | DB_CREATE | DB_THREAD,
                 bdb->bi_dbenv_mode );                  bdb->bi_dbenv_mode );
   
Line 130  bdb_db_cache( Line 131  bdb_db_cache(
                 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.18  
changed lines
  Added in v.1.28.2.2


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