Code clean-up.

[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..d2666cee2b5cfa71369c9cdab403c23b65595be5 100644 (file)
--- a/servers/slapd/back-ldbm/init.c
+++ b/servers/slapd/back-ldbm/init.c
@@ -10,8 +10,73 @@
 #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 = NULL;
+       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;
+
+#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
+)
+{
+       /* initialize the underlying database system */
+       ldbm_shutdown();
+
+       return 0;
+}
+
+int
+ldbm_back_db_init(
     Backend    *be
 )
 {
@@ -19,16 +84,16 @@ ldbm_back_init(
        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;
 
@@ -67,21 +132,33 @@ 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 */
+       free( be->be_private );
+       be->be_private = NULL;
+       return 0;
 }