Removed unnecessary definition that is already in core.schema.

[openldap] / servers / slapd / init.c

diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index 2b6cd5a7256c6d7f5bbdcae53d1565497dcd6aab..0990d4b533bfa5f201ece1ffef1612042e9dd8c1 100644 (file)
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -8,7 +8,6 @@
 #include <ac/string.h>
 #include <ac/time.h>
 
-#include "portable.h"
 #include "slap.h"
 
 /*
@@ -25,8 +24,6 @@ int           ldap_syslog;
 
 int            ldap_syslog_level = LOG_DEBUG;
 char           *default_referral;
-time_t         starttime;
-ldap_pvt_thread_t      listener_tid;
 int            g_argc;
 char           **g_argv;
 
@@ -37,19 +34,15 @@ int                         active_threads;
 ldap_pvt_thread_mutex_t        active_threads_mutex;
 ldap_pvt_thread_cond_t active_threads_cond;
 
-time_t                 currenttime;
-ldap_pvt_thread_mutex_t        currenttime_mutex;
-
-ldap_pvt_thread_mutex_t        new_conn_mutex;
-
+ldap_pvt_thread_mutex_t        gmtime_mutex;
 #ifdef SLAPD_CRYPT
 ldap_pvt_thread_mutex_t        crypt_mutex;
 #endif
 
 int                            num_conns;
-long                   ops_initiated;
-long                   ops_completed;
-ldap_pvt_thread_mutex_t        ops_mutex;
+long                   num_ops_initiated;
+long                   num_ops_completed;
+ldap_pvt_thread_mutex_t        num_ops_mutex;
 
 long                   num_entries_sent;
 long                   num_bytes_sent;
@@ -61,21 +54,118 @@ ldap_pvt_thread_mutex_t    num_sent_mutex;
 ldap_pvt_thread_mutex_t        entry2str_mutex;
 ldap_pvt_thread_mutex_t        replog_mutex;
 
-void
-init( void )
+static char* slap_name;
+int slapMode = SLAP_UNDEFINED_MODE;
+
+static ldap_pvt_thread_mutex_t currenttime_mutex;
+
+int
+slap_init( int mode, char *name )
 {
-       (void) ldap_pvt_thread_initialize();
+       int rc;
+
+       if( slapMode != SLAP_UNDEFINED_MODE ) {
+               Debug( LDAP_DEBUG_ANY,
+                "%s init: init called twice (old=%d, new=%d)\n",
+                name, slapMode, mode );
+               return 1;
+       }
+
+       slapMode = mode;
+
+       switch ( slapMode ) {
+
+               case SLAP_SERVER_MODE:
+               case SLAP_TOOL_MODE:
+#ifdef SLAPD_BDB2
+               case SLAP_TIMEDSERVER_MODE:
+               case SLAP_TOOLID_MODE:
+#endif
 
-       ldap_pvt_thread_mutex_init( &active_threads_mutex );
-       ldap_pvt_thread_cond_init( &active_threads_cond );
+                       Debug( LDAP_DEBUG_TRACE,
+                               "%s init: initiated %s.\n",
+                               name, mode == SLAP_TOOL_MODE ? "tool" : "server", 0 );
 
-       ldap_pvt_thread_mutex_init( &new_conn_mutex );
-       ldap_pvt_thread_mutex_init( &currenttime_mutex );
-       ldap_pvt_thread_mutex_init( &entry2str_mutex );
-       ldap_pvt_thread_mutex_init( &replog_mutex );
-       ldap_pvt_thread_mutex_init( &ops_mutex );
-       ldap_pvt_thread_mutex_init( &num_sent_mutex );
+                       slap_name = name;
+       
+                       (void) ldap_pvt_thread_initialize();
+
+                       ldap_pvt_thread_mutex_init( &active_threads_mutex );
+                       ldap_pvt_thread_cond_init( &active_threads_cond );
+
+                       ldap_pvt_thread_mutex_init( &currenttime_mutex );
+                       ldap_pvt_thread_mutex_init( &entry2str_mutex );
+                       ldap_pvt_thread_mutex_init( &replog_mutex );
+                       ldap_pvt_thread_mutex_init( &num_ops_mutex );
+                       ldap_pvt_thread_mutex_init( &num_sent_mutex );
+
+                       ldap_pvt_thread_mutex_init( &gmtime_mutex );
 #ifdef SLAPD_CRYPT
-       ldap_pvt_thread_mutex_init( &crypt_mutex );
+                       ldap_pvt_thread_mutex_init( &crypt_mutex );
 #endif
+
+                       rc = backend_init();
+                       break;
+
+               default:
+                       Debug( LDAP_DEBUG_ANY,
+                               "%s init: undefined mode (%d).\n", name, mode, 0 );
+                       rc = 1;
+                       break;
+       }
+
+       return rc;
+}
+
+int slap_startup(int dbnum)
+{
+       int rc;
+
+       Debug( LDAP_DEBUG_TRACE,
+               "%s startup: initiated.\n",
+               slap_name, 0, 0 );
+
+       rc = backend_startup(dbnum);
+
+       return rc;
+}
+
+int slap_shutdown(int dbnum)
+{
+       int rc;
+
+       Debug( LDAP_DEBUG_TRACE,
+               "%s shutdown: initiated\n",
+               slap_name, 0, 0 );
+
+       /* let backends do whatever cleanup they need to do */
+       rc = backend_shutdown(dbnum); 
+
+       return rc;
+}
+
+int slap_destroy(void)
+{
+       int rc;
+
+       Debug( LDAP_DEBUG_TRACE,
+               "%s shutdown: freeing system resources.\n",
+               slap_name, 0, 0 );
+
+       rc = backend_destroy();
+
+       ldap_pvt_thread_destroy();
+
+       /* should destory the above mutex */
+       return rc;
+}
+
+/* should create a utils.c for these */
+time_t slap_get_time(void)
+{
+       time_t t;
+       ldap_pvt_thread_mutex_lock( &currenttime_mutex );
+       time( &t );
+       ldap_pvt_thread_mutex_unlock( &currenttime_mutex );
+       return t;
 }