X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Finit.c;h=e81e38ab657f5696dc1ecf6ad264bb14e5a0effb;hb=0006ec0a46790567d3d49fcafce5ffaae08cdbf4;hp=e61960b28225631f655869cef2d9ee1e8891d31d;hpb=de97928160ce23c3ed797b4c0dccbcc0c0a7b20a;p=openldap diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c index e61960b282..e81e38ab65 100644 --- a/servers/slapd/back-bdb/init.c +++ b/servers/slapd/back-bdb/init.c @@ -1,7 +1,7 @@ /* 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 */ @@ -12,6 +12,8 @@ #include #include +#include + #include "back-bdb.h" #include "external.h" @@ -30,20 +32,18 @@ static struct bdbi_database { { 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; } @@ -64,21 +64,37 @@ bdb_db_init( BackendDB *be ) "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 @@ -87,21 +103,26 @@ bdb_db_init( BackendDB *be ) 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; @@ -154,18 +175,14 @@ bdb_db_open( BackendDB *be ) 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]->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 { @@ -261,7 +278,7 @@ bdb_db_open( BackendDB *be ) 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 @@ -304,7 +321,7 @@ bdb_db_open( BackendDB *be ) 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, @@ -332,6 +349,8 @@ bdb_db_close( BackendDB *be ) free( bdb->bi_databases ); bdb_attr_index_destroy( bdb->bi_attrs ); + bdb_cache_release_all (&bdb->bi_cache); + return 0; } @@ -341,18 +360,18 @@ bdb_db_destroy( BackendDB *be ) 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 ) { @@ -386,9 +405,17 @@ bdb_initialize( { 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 ); @@ -398,12 +425,12 @@ bdb_initialize( 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 ); } @@ -415,7 +442,12 @@ bdb_initialize( 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; @@ -440,11 +472,20 @@ bdb_initialize( bi->bi_op_abandon = 0; bi->bi_extended = bdb_extended; - bi->bi_acl_group = bdb_group; +#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; 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; /*