/* init.c - initialize bdb backend */
/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
#include <stdio.h>
#include <ac/string.h>
+#include <ac/unistd.h>
+#include <ac/stdlib.h>
+
+#include <lutil.h>
#include "back-bdb.h"
#include "external.h"
{ NULL, NULL, 0, 0 }
};
-#if 0
+struct berval bdb_uuid = { 0, NULL };
+
static int
-bdb_destroy( BackendInfo *bi )
+bdb_open( BackendInfo *bi )
{
return 0;
}
+#if 0
static int
-bdb_open( BackendInfo *bi )
+bdb_destroy( BackendInfo *bi )
{
- /* initialize the underlying database system */
- Debug( LDAP_DEBUG_TRACE, "bdb_open: initialize BDB backend\n",
- 0, 0, 0 );
-
return 0;
}
"bdb_db_init: Initializing BDB database\n",
0, 0, 0 );
+ /* indicate system schema supported */
+ be->be_flags |=
+#ifdef BDB_SUBENTRIES
+ SLAP_BFLAG_SUBENTRIES |
+#endif
+#ifdef BDB_ALIASES
+ SLAP_BFLAG_ALIASES |
+#endif
+ SLAP_BFLAG_REFERRALS;
+
/* allocate backend-database-specific stuff */
bdb = (struct bdb_info *) ch_calloc( 1, sizeof(struct bdb_info) );
/* DBEnv parameters */
- bdb->bi_dbenv_home = ch_strdup( BDB_DBENV_HOME );
+ bdb->bi_dbenv_home = ch_strdup( SLAPD_DEFAULT_DB_DIR );
bdb->bi_dbenv_xflags = 0;
- bdb->bi_dbenv_mode = DEFAULT_MODE;
- bdb->bi_txn = 1; /* default to using transactions */
+ bdb->bi_dbenv_mode = SLAPD_DEFAULT_DB_MODE;
+
+ bdb->bi_cache.c_maxsize = DEFAULT_CACHE_SIZE;
#ifndef NO_THREADS
+#if 0
bdb->bi_lock_detect = DB_LOCK_NORUN;
+#else
+ bdb->bi_lock_detect = DB_LOCK_DEFAULT;
+#endif
#endif
ldap_pvt_thread_mutex_init( &bdb->bi_database_mutex );
ldap_pvt_thread_mutex_init( &bdb->bi_lastid_mutex );
+ ldap_pvt_thread_mutex_init( &bdb->bi_cache.c_mutex );
#ifdef BDB_HIER
ldap_pvt_thread_rdwr_init( &bdb->bi_tree_rdwr );
#endif
return 0;
}
-#ifndef NO_THREADS
+#if 0 /* ifndef NO_THREADS */
static void *lock_detect_task( void *arg )
{
struct bdb_info *bdb = (struct bdb_info *) arg;
while( bdb->bi_dbenv != NULL ) {
int rc;
+ int aborted;
sleep( bdb->bi_lock_detect_seconds );
rc = LOCK_DETECT( bdb->bi_dbenv, 0,
- bdb->bi_lock_detect, NULL );
+ bdb->bi_lock_detect, &aborted );
if( rc != 0 ) {
break;
}
+
+ Debug( LDAP_DEBUG_ANY,
+ "bdb_lock_detect: aborted %d locks\n",
+ aborted, 0, 0 );
}
return NULL;
Debug( LDAP_DEBUG_ARGS,
"bdb_db_open: %s\n",
- be->be_suffix[0], 0, 0 );
+ be->be_suffix[0]->bv_val, 0, 0 );
/* we should check existance of dbenv_home and db_directory */
return rc;
}
- flags = DB_INIT_MPOOL | DB_THREAD | DB_CREATE;
-
- if( bdb->bi_txn ) {
- flags |= DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_TXN | DB_RECOVER;
-
- } else {
- flags |= DB_INIT_CDB;
- bdb->bi_txn_cp = 0;
- }
+ flags = DB_INIT_MPOOL | DB_THREAD | DB_CREATE
+ | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_TXN | DB_RECOVER;
- bdb->bi_dbenv->set_errpfx( bdb->bi_dbenv, be->be_suffix[0] );
+ bdb->bi_dbenv->set_errpfx( bdb->bi_dbenv, be->be_suffix[0]->bv_val );
bdb->bi_dbenv->set_errcall( bdb->bi_dbenv, bdb_errcall );
+#ifndef NO_THREADS
+ bdb->bi_dbenv->set_lk_detect( bdb->bi_dbenv, bdb->bi_lock_detect );
+#endif
#ifdef BDB_SUBDIRS
{
bdb_bt_compare );
#elif defined(BDB_IDL_MULTI)
rc = db->bdi_db->set_flags( db->bdi_db,
- DB_DUP | DB_DUPSORT | DB_NODUPDATA );
+ DB_DUP | DB_DUPSORT );
rc = db->bdi_db->set_dup_compare( db->bdi_db,
bdb_bt_compare );
#endif
rc = bdb_build_tree( be );
#endif
-#ifndef NO_THREADS
+#if 0 /* ifndef NO_THREADS */
if( bdb->bi_lock_detect != DB_LOCK_NORUN ) {
/* listener as a separate THREAD */
rc = ldap_pvt_thread_create( &bdb->bi_lock_detect_tid,
while( bdb->bi_ndatabases-- ) {
db = bdb->bi_databases[bdb->bi_ndatabases];
rc = db->bdi_db->close( db->bdi_db, 0 );
- if( db->bdi_name )
+ /* Lower numbered names are not strdup'd */
+ if( bdb->bi_ndatabases >= BDB_NDB )
free( db->bdi_name );
free( db );
}
free( bdb->bi_databases );
bdb_attr_index_destroy( bdb->bi_attrs );
+ bdb_cache_release_all (&bdb->bi_cache);
+
return 0;
}
int rc;
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
- /* force a checkpoint */
- if( bdb->bi_txn ) {
+ /* close db environment */
+ if( bdb->bi_dbenv ) {
+ /* force a checkpoint */
rc = TXN_CHECKPOINT( bdb->bi_dbenv, 0, 0, DB_FORCE );
if( rc != 0 ) {
Debug( LDAP_DEBUG_ANY,
"bdb_db_destroy: txn_checkpoint failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
}
- }
- /* close db environment */
- if( bdb->bi_dbenv ) {
+ bdb_cache_release_all (&bdb->bi_cache);
+
rc = bdb->bi_dbenv->close( bdb->bi_dbenv, 0 );
bdb->bi_dbenv = NULL;
if( rc != 0 ) {
{
static char *controls[] = {
LDAP_CONTROL_MANAGEDSAIT,
+ LDAP_CONTROL_SUBENTRIES,
+ LDAP_CONTROL_NOOP,
NULL
};
+ bi->bi_controls = controls;
+
+ /* initialize the underlying database system */
+ Debug( LDAP_DEBUG_TRACE, "bdb_open: initialize BDB backend\n",
+ 0, 0, 0 );
+
{ /* version check */
int major, minor, patch;
char *version = db_version( &major, &minor, &patch );
patch < DB_VERSION_PATCH )
{
Debug( LDAP_DEBUG_ANY,
- "bi_back_initialize: version mismatch\n"
+ "bdb_open: version mismatch\n"
"\texpected: " DB_VERSION_STRING "\n"
"\tgot: %s \n", version, 0, 0 );
}
- Debug( LDAP_DEBUG_ANY, "bdb_initialize: %s\n",
+ Debug( LDAP_DEBUG_ANY, "bdb_open: %s\n",
version, 0, 0 );
}
db_env_set_func_yield( ldap_pvt_thread_yield );
- bi->bi_controls = controls;
+ {
+ static char uuidbuf[40];
+
+ bdb_uuid.bv_len = lutil_uuidstr( uuidbuf, sizeof( uuidbuf ));
+ bdb_uuid.bv_val = uuidbuf;
+ }
bi->bi_open = 0;
bi->bi_close = 0;
bi->bi_op_modrdn = bdb_modrdn;
bi->bi_op_search = bdb_search;
-#if 0
- bi->bi_op_unbind = bdb_unbind;
- bi->bi_op_abandon = bdb_abandon;
+ bi->bi_op_unbind = 0;
+ bi->bi_op_abandon = 0;
bi->bi_extended = bdb_extended;
+
+#if 0
+ /*
+ * these routines (and their callers) are not yet designed
+ * to work with transaction. Using them may cause deadlock.
+ */
bi->bi_acl_group = bdb_group;
-#endif
bi->bi_acl_attribute = bdb_attribute;
- bi->bi_chk_referrals = bdb_referrals;
+#else
+ bi->bi_acl_group = 0;
+ bi->bi_acl_attribute = 0;
+#endif
+ bi->bi_chk_referrals = bdb_referrals;
bi->bi_entry_release_rw = bdb_entry_release;
/*
projects / openldap / blobdiff