X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fdbcache.c;h=c6b8b2368411553f0753309d44a4c5568baaa789;hb=3bf9998d7885ef6bbc4690d4229e5cb5068a35de;hp=6d4456bde6b229eb28bfddd07c8aeb93c9aca5d1;hpb=0be6cb5a67c40c5b9886bf4d0bcca398ea210ddd;p=openldap
diff --git a/servers/slapd/back-bdb/dbcache.c b/servers/slapd/back-bdb/dbcache.c
index 6d4456bde6..c6b8b23684 100644
--- a/servers/slapd/back-bdb/dbcache.c
+++ b/servers/slapd/back-bdb/dbcache.c
@@ -1,8 +1,17 @@
/* dbcache.c - manage cache of open databases */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 2000-2008 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
+ * .
*/
#include "portable.h"
@@ -19,6 +28,7 @@
#include "back-bdb.h"
#include "lutil_hash.h"
+#ifdef BDB_INDEX_USE_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.
*/
@@ -42,122 +52,117 @@ bdb_db_hash(
}
return ret;
}
+#define BDB_INDEXTYPE DB_HASH
+#else
+#define BDB_INDEXTYPE DB_BTREE
+#endif
int
bdb_db_cache(
Backend *be,
- DB_TXN *tid,
- const char *name,
+ struct berval *name,
DB **dbout )
{
- int i;
+ int i, flags;
int rc;
- int flags;
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
struct bdb_db_info *db;
char *file;
- DBT lockobj;
- DB_LOCK lock;
- u_int32_t locker = 0;
*dbout = NULL;
- for( i=BDB_NDB; bdb->bi_databases[i]; i++ ) {
- if( !strcmp( bdb->bi_databases[i]->bdi_name, name) ) {
+ for( i=BDB_NDB; i < bdb->bi_ndatabases; i++ ) {
+ if( !ber_bvcmp( &bdb->bi_databases[i]->bdi_name, name) ) {
*dbout = bdb->bi_databases[i]->bdi_db;
return 0;
}
}
- lockobj.data = "bdb_db_cache";
- lockobj.size = sizeof("bdb_db_cache");
-
- if (tid) {
- locker = TXN_ID( tid );
- } else {
-#ifdef BDB_REUSE_LOCKERS
-#define op NULL /* implicit arg in LOCK_ID */
-#endif
- rc = LOCK_ID( bdb->bi_dbenv, &locker );
- if (rc) return rc;
- }
- rc = LOCK_GET( bdb->bi_dbenv, locker, 0, &lockobj,
- DB_LOCK_WRITE, &lock );
- if (rc) return rc;
+ ldap_pvt_thread_mutex_lock( &bdb->bi_database_mutex );
/* check again! may have been added by another thread */
- for( i=BDB_NDB; bdb->bi_databases[i]; i++ ) {
- if( !strcmp( bdb->bi_databases[i]->bdi_name, name) ) {
+ for( i=BDB_NDB; i < bdb->bi_ndatabases; i++ ) {
+ if( !ber_bvcmp( &bdb->bi_databases[i]->bdi_name, name) ) {
*dbout = bdb->bi_databases[i]->bdi_db;
- LOCK_PUT( bdb->bi_dbenv, &lock);
+ ldap_pvt_thread_mutex_unlock( &bdb->bi_database_mutex );
return 0;
}
}
if( i >= BDB_INDICES ) {
- LOCK_PUT( bdb->bi_dbenv, &lock);
+ ldap_pvt_thread_mutex_unlock( &bdb->bi_database_mutex );
return -1;
}
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 );
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,
"bdb_db_cache: db_create(%s) failed: %s (%d)\n",
bdb->bi_dbenv_home, db_strerror(rc), rc );
-#endif
- LOCK_PUT( bdb->bi_dbenv, &lock);
+ ldap_pvt_thread_mutex_unlock( &bdb->bi_database_mutex );
+ ch_free( db );
return rc;
}
+ if( !BER_BVISNULL( &bdb->bi_db_crypt_key )) {
+ rc = db->bdi_db->set_flags( db->bdi_db, DB_ENCRYPT );
+ if ( rc ) {
+ Debug( LDAP_DEBUG_ANY,
+ "bdb_db_cache: db set_flags(DB_ENCRYPT)(%s) failed: %s (%d)\n",
+ bdb->bi_dbenv_home, db_strerror(rc), rc );
+ ldap_pvt_thread_mutex_unlock( &bdb->bi_database_mutex );
+ db->bdi_db->close( db->bdi_db, 0 );
+ ch_free( db );
+ return rc;
+ }
+ }
+
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 );
+#endif
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 );
- file = ch_malloc( strlen( name ) + sizeof(BDB_SUFFIX) );
- sprintf( file, "%s" BDB_SUFFIX, name );
+ file = ch_malloc( db->bdi_name.bv_len + sizeof(BDB_SUFFIX) );
+ strcpy( file, db->bdi_name.bv_val );
+ strcpy( file+db->bdi_name.bv_len, BDB_SUFFIX );
#ifdef HAVE_EBCDIC
__atoe( file );
#endif
- flags = bdb->bi_db_opflags | DB_CREATE | DB_THREAD;
- if ( !tid ) flags |= DB_AUTO_COMMIT;
- rc = DB_OPEN( db->bdi_db, tid,
+ 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 */,
- DB_HASH, flags,
- bdb->bi_dbenv_mode );
+ BDB_INDEXTYPE, bdb->bi_db_opflags | flags, bdb->bi_dbenv_mode );
ch_free( file );
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,
"bdb_db_cache: db_open(%s) failed: %s (%d)\n",
- name, db_strerror(rc), rc );
-#endif
- LOCK_PUT( bdb->bi_dbenv, &lock);
+ name->bv_val, db_strerror(rc), rc );
+ ldap_pvt_thread_mutex_unlock( &bdb->bi_database_mutex );
return rc;
}
- bdb->bi_databases[i+1] = NULL;
bdb->bi_databases[i] = db;
bdb->bi_ndatabases = i+1;
*dbout = db->bdi_db;
- LOCK_PUT( bdb->bi_dbenv, &lock );
+ ldap_pvt_thread_mutex_unlock( &bdb->bi_database_mutex );
return 0;
}