X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=inline;f=servers%2Fslapd%2Fback-ldbm%2Finit.c;h=05be1e0989ad0d5a976cabeb97bc0a71a0158a7c;hb=aa3b69eb32f3292340b1af8c7733aafaf6f2f6e5;hp=110647f7a3244ceb9f3750f125115e13ff06fb1f;hpb=35655c056f2ea487ec5bbf53026bfef59be12bbf;p=openldap diff --git a/servers/slapd/back-ldbm/init.c b/servers/slapd/back-ldbm/init.c index 110647f7a3..05be1e0989 100644 --- a/servers/slapd/back-ldbm/init.c +++ b/servers/slapd/back-ldbm/init.c @@ -1,7 +1,7 @@ /* init.c - initialize ldbm backend */ /* $OpenLDAP$ */ /* - * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ @@ -17,10 +17,10 @@ #ifdef SLAPD_LDBM_DYNAMIC -int back_ldbm_LTX_init_module(int argc, char *argv[]) { +int init_module(int argc, char *argv[]) { BackendInfo bi; - memset( &bi, 0, sizeof(bi) ); + memset( &bi, '\0', sizeof(bi) ); bi.bi_type = "ldbm"; bi.bi_init = ldbm_back_initialize; @@ -35,8 +35,16 @@ ldbm_back_initialize( BackendInfo *bi ) { + static char *controls[] = { + LDAP_CONTROL_MANAGEDSAIT, + LDAP_CONTROL_VALUESRETURNFILTER, + NULL + }; + + bi->bi_controls = controls; + bi->bi_open = ldbm_back_open; - bi->bi_config = 0; + bi->bi_config = NULL; bi->bi_close = ldbm_back_close; bi->bi_destroy = ldbm_back_destroy; @@ -47,17 +55,22 @@ ldbm_back_initialize( bi->bi_db_destroy = ldbm_back_db_destroy; bi->bi_op_bind = ldbm_back_bind; - bi->bi_op_unbind = ldbm_back_unbind; + bi->bi_op_unbind = 0; bi->bi_op_search = ldbm_back_search; bi->bi_op_compare = ldbm_back_compare; bi->bi_op_modify = ldbm_back_modify; bi->bi_op_modrdn = ldbm_back_modrdn; bi->bi_op_add = ldbm_back_add; bi->bi_op_delete = ldbm_back_delete; - bi->bi_op_abandon = ldbm_back_abandon; + bi->bi_op_abandon = 0; + + bi->bi_extended = ldbm_back_extended; bi->bi_entry_release_rw = ldbm_back_entry_release_rw; - bi->bi_acl_group = ldbm_back_group; + bi->bi_entry_get_rw = ldbm_back_entry_get; + bi->bi_chk_referrals = ldbm_back_referrals; + bi->bi_operational = ldbm_back_operational; + bi->bi_has_subordinates = ldbm_back_hasSubordinates; /* * hooks for slap tools @@ -68,8 +81,7 @@ ldbm_back_initialize( bi->bi_tool_entry_next = ldbm_tool_entry_next; bi->bi_tool_entry_get = ldbm_tool_entry_get; bi->bi_tool_entry_put = ldbm_tool_entry_put; - bi->bi_tool_index_attr = ldbm_tool_index_attr; - bi->bi_tool_index_change = ldbm_tool_index_change; + bi->bi_tool_entry_reindex = ldbm_tool_entry_reindex; bi->bi_tool_sync = ldbm_tool_sync; bi->bi_connection_init = 0; @@ -94,8 +106,7 @@ ldbm_back_open( int rc; /* initialize the underlying database system */ - rc = ldbm_initialize(); - + rc = ldbm_initialize( NULL ); return rc; } @@ -106,7 +117,6 @@ ldbm_back_close( { /* terminate the underlying database system */ ldbm_shutdown(); - return 0; } @@ -116,7 +126,11 @@ ldbm_back_db_init( ) { struct ldbminfo *li; - char *argv[ 4 ]; + + /* indicate system schema supported */ + be->be_flags |= + SLAP_BFLAG_ALIASES | + SLAP_BFLAG_REFERRALS; /* allocate backend-database-specific stuff */ li = (struct ldbminfo *) ch_calloc( 1, sizeof(struct ldbminfo) ); @@ -137,22 +151,32 @@ ldbm_back_db_init( li->li_dbwritesync = 1; /* default file creation mode */ - li->li_mode = DEFAULT_MODE; + li->li_mode = SLAPD_DEFAULT_DB_MODE; /* default database directory */ - li->li_directory = ch_strdup( DEFAULT_DB_DIRECTORY ); + li->li_directory = ch_strdup( SLAPD_DEFAULT_DB_DIR ); + + /* DB_ENV environment pointer for DB3 */ + li->li_dbenv = 0; - argv[ 0 ] = "objectclass"; - argv[ 1 ] = "pres,eq"; - argv[ 2 ] = NULL; - attr_index_config( li, "ldbm objectclass initialization", - 0, 2, argv, 1 ); + /* envdirok is turned on by ldbm_initialize_env if DB3 */ + li->li_envdirok = 0; + + /* syncfreq is 0 if disabled, or # seconds */ + li->li_dbsyncfreq = 0; + + /* wait up to dbsyncwaitn times if server is busy */ + li->li_dbsyncwaitn = 12; + + /* delay interval */ + li->li_dbsyncwaitinterval = 5; + + /* flag to notify ldbm_cache_sync_daemon to shut down */ + li->li_dbshutdown = 0; /* initialize various mutex locks & condition variables */ - ldap_pvt_thread_mutex_init( &li->li_root_mutex ); - ldap_pvt_thread_mutex_init( &li->li_add_mutex ); + ldap_pvt_thread_rdwr_init( &li->li_giant_rwlock ); ldap_pvt_thread_mutex_init( &li->li_cache.c_mutex ); - ldap_pvt_thread_mutex_init( &li->li_nextid_mutex ); ldap_pvt_thread_mutex_init( &li->li_dbcache_mutex ); ldap_pvt_thread_cond_init( &li->li_dbcache_cv ); @@ -166,6 +190,30 @@ ldbm_back_db_open( BackendDB *be ) { + struct ldbminfo *li = (struct ldbminfo *) be->be_private; + li->li_dbenv = ldbm_initialize_env( li->li_directory, + li->li_dbcachesize, &li->li_envdirok ); + + /* sync thread */ + if ( li->li_dbsyncfreq > 0 ) + { + int rc; + rc = ldap_pvt_thread_create( &li->li_dbsynctid, + 0, ldbm_cache_sync_daemon, (void*)be ); + + if ( rc != 0 ) + { +#ifdef NEW_LOGGING + LDAP_LOG ( BACK_LDBM, ERR, "ldbm_back_db_open: sync " + "ldap_pvt_thread_create failed (%d)\n", rc, 0, 0 ); +#else + Debug( LDAP_DEBUG_ANY, + "sync ldap_pvt_thread_create failed (%d)\n", rc, 0, 0 ); +#endif + return 1; + } + } + return 0; } @@ -176,13 +224,15 @@ ldbm_back_db_destroy( { /* should free/destroy every in be_private */ struct ldbminfo *li = (struct ldbminfo *) be->be_private; + + if (li->li_dbenv) + ldbm_shutdown_env(li->li_dbenv); + free( li->li_directory ); attr_index_destroy( li->li_attrs ); - ldap_pvt_thread_mutex_destroy( &li->li_root_mutex ); - ldap_pvt_thread_mutex_destroy( &li->li_add_mutex ); + ldap_pvt_thread_rdwr_destroy( &li->li_giant_rwlock ); ldap_pvt_thread_mutex_destroy( &li->li_cache.c_mutex ); - ldap_pvt_thread_mutex_destroy( &li->li_nextid_mutex ); ldap_pvt_thread_mutex_destroy( &li->li_dbcache_mutex ); ldap_pvt_thread_cond_destroy( &li->li_dbcache_cv );