Removed unnecessary definition that is already in core.schema.

[openldap] / servers / slapd / back-ldbm / init.c

diff --git a/servers/slapd/back-ldbm/init.c b/servers/slapd/back-ldbm/init.c
index aecffaddc60d6053c98f5018de605b563d57a8aa..34bceb7967a1dfade18a5ee929b31166a27a464a 100644 (file)
--- a/servers/slapd/back-ldbm/init.c
+++ b/servers/slapd/back-ldbm/init.c
@@ -10,25 +10,90 @@
 #include "slap.h"
 #include "back-ldbm.h"
 
-void
-ldbm_back_init(
+int
+ldbm_back_initialize(
+    BackendInfo        *bi
+)
+{
+       bi->bi_open = ldbm_back_open;
+       bi->bi_config = 0;
+       bi->bi_close = ldbm_back_close;
+       bi->bi_destroy = ldbm_back_destroy;
+
+       bi->bi_db_init = ldbm_back_db_init;
+       bi->bi_db_config = ldbm_back_db_config;
+       bi->bi_db_open = ldbm_back_db_open;
+       bi->bi_db_close = ldbm_back_db_close;
+       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_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_entry_release_rw = ldbm_back_entry_release_rw;
+#ifdef SLAPD_ACLGROUPS
+       bi->bi_acl_group = ldbm_back_group;
+#endif
+
+       return 0;
+}
+
+int
+ldbm_back_destroy(
+    BackendInfo        *bi
+)
+{
+       return 0;
+}
+
+int
+ldbm_back_open(
+    BackendInfo        *bi
+)
+{
+       int rc;
+
+       /* initialize the underlying database system */
+       rc = ldbm_initialize();
+
+       return rc;
+}
+
+int
+ldbm_back_close(
+    BackendInfo        *bi
+)
+{
+       /* terminate the underlying database system */
+       ldbm_shutdown();
+
+       return 0;
+}
+
+int
+ldbm_back_db_init(
     Backend    *be
 )
 {
        struct ldbminfo *li;
        char            *argv[ 4 ];
-       int             i;
-
-#ifdef HAVE_BERKELEY_DB2
-       extern pthread_mutex_t   dbEnvInit_mutex;
-#endif
 
-       /* allocate backend-specific stuff */
+       /* allocate backend-database-specific stuff */
        li = (struct ldbminfo *) ch_calloc( 1, sizeof(struct ldbminfo) );
 
        /* arrange to read nextid later (on first request for it) */
        li->li_nextid = NOID;
 
+#if SLAPD_NEXTID_CHUNK > 1
+       li->li_nextid_wrote = NOID;
+#endif
+
        /* default cache size */
        li->li_cache.c_maxsize = DEFAULT_CACHE_SIZE;
 
@@ -42,13 +107,15 @@ ldbm_back_init(
        li->li_mode = DEFAULT_MODE;
 
        /* default database directory */
-       li->li_directory = DEFAULT_DB_DIRECTORY;
+       li->li_directory = ch_strdup( DEFAULT_DB_DIRECTORY );
 
        /* always index dn, id2children, objectclass (used in some searches) */
-       argv[ 0 ] = "dn";
-       argv[ 1 ] = "dn";
-       argv[ 2 ] = NULL;
-       attr_syntax_config( "ldbm dn initialization", 0, 2, argv );
+       if ( !at_find( "dn" ) ) {
+               argv[ 0 ] = "dn";
+               argv[ 1 ] = "dn";
+               argv[ 2 ] = NULL;
+               attr_syntax_config( "ldbm dn initialization", 0, 2, argv );
+       }
        argv[ 0 ] = "dn";
        argv[ 1 ] = "sub";
        argv[ 2 ] = "eq";
@@ -67,21 +134,46 @@ ldbm_back_init(
        free( argv[ 1 ] );
 
        /* initialize various mutex locks & condition variables */
-       pthread_mutex_init( &li->li_root_mutex, pthread_mutexattr_default );
-       pthread_mutex_init( &li->li_add_mutex, pthread_mutexattr_default );
-       pthread_mutex_init( &li->li_cache.c_mutex, pthread_mutexattr_default );
-       pthread_mutex_init( &li->li_nextid_mutex, pthread_mutexattr_default );
-       pthread_mutex_init( &li->li_dbcache_mutex, pthread_mutexattr_default );
-       pthread_cond_init( &li->li_dbcache_cv, pthread_condattr_default );
-       for ( i = 0; i < MAXDBCACHE; i++ ) {
-               pthread_mutex_init( &li->li_dbcache[i].dbc_mutex,
-                   pthread_mutexattr_default );
-               pthread_cond_init( &li->li_dbcache[i].dbc_cv,
-                   pthread_condattr_default );
-       }
-#ifdef HAVE_BERKELEY_DB2
-       pthread_mutex_init( &dbEnvInit_mutex, pthread_mutexattr_default );
-#endif
+       ldap_pvt_thread_mutex_init( &li->li_root_mutex );
+       ldap_pvt_thread_mutex_init( &li->li_add_mutex );
+       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 );
 
        be->be_private = li;
+
+       return 0;
+}
+
+int
+ldbm_back_db_open(
+    BackendDB  *be
+)
+{
+       return 0;
+}
+
+int
+ldbm_back_db_destroy(
+    BackendDB  *be
+)
+{
+       /* should free/destroy every in be_private */
+#ifdef SLAP_CLEANUP
+       struct ldbminfo *li = (struct ldbminfo *) be->be_private;
+       free( li->li_nextid_file );
+       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_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 );
+#endif /* SLAP_CLEANUP */
+       free( be->be_private );
+       be->be_private = NULL;
+       return 0;
 }