]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/init.c
Revert ITS#3353 patch, it needs to be reworked.
[openldap] / servers / slapd / init.c
index 46e5501126b2311b5149c213dcb353e4f148ed3e..b7a3fc3bac0a9d8e2094767c8c043049dba22550 100644 (file)
@@ -1,8 +1,27 @@
 /* init.c - initialize various things */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
  */
 
 #include "portable.h"
@@ -15,6 +34,9 @@
 
 #include "slap.h"
 #include "lber_pvt.h"
+#ifdef LDAP_SLAPI
+#include "slapi/slapi.h"
+#endif
 
 /*
  * read-only global variables or variables only written by the listener
@@ -43,24 +65,15 @@ struct berval NoAttrs = BER_BVC( LDAP_NO_ATTRS );
  */
 ldap_pvt_thread_pool_t connection_pool;
 int                    connection_pool_max = SLAP_MAX_WORKER_THREADS;
+#ifndef HAVE_GMTIME_R
 ldap_pvt_thread_mutex_t        gmtime_mutex;
+#endif
 #if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
 ldap_pvt_thread_mutex_t        passwd_mutex;
 #endif
 
-unsigned long                  num_ops_initiated = 0;
-unsigned long                  num_ops_completed = 0;
-#ifdef SLAPD_MONITOR
-unsigned long                  num_ops_initiated_[SLAP_OP_LAST];
-unsigned long                  num_ops_completed_[SLAP_OP_LAST];
-#endif /* SLAPD_MONITOR */
-ldap_pvt_thread_mutex_t        num_ops_mutex;
+slap_counters_t                        slap_counters;
 
-unsigned long                  num_entries_sent;
-unsigned long                  num_refs_sent;
-unsigned long                  num_bytes_sent;
-unsigned long                  num_pdu_sent;
-ldap_pvt_thread_mutex_t        num_sent_mutex;
 /*
  * these mutexes must be used when calling the entry2str()
  * routine since it returns a pointer to static data.
@@ -71,73 +84,18 @@ ldap_pvt_thread_mutex_t     replog_mutex;
 static const char* slap_name = NULL;
 int slapMode = SLAP_UNDEFINED_MODE;
 
-/*
- * all known control OIDs should be added to this list
- */
-char *slap_known_controls[] = {
-#ifdef LDAP_CONTROL_REFERRALS
-       LDAP_CONTROL_REFERRALS,
-#endif /* LDAP_CONTROL_REFERRALS */
-
-       LDAP_CONTROL_MANAGEDSAIT,
-
-#ifdef LDAP_CONTROL_SUBENTRIES
-       LDAP_CONTROL_SUBENTRIES,
-#endif /* LDAP_CONTROL_SUBENTRIES */
-
-       LDAP_CONTROL_NOOP,
-
-#ifdef LDAP_CONTROL_DUPENT_REQUEST
-       LDAP_CONTROL_DUPENT_REQUEST,
-#endif /* LDAP_CONTROL_DUPENT_REQUEST */
-
-#ifdef LDAP_CONTROL_DUPENT_RESPONSE
-       LDAP_CONTROL_DUPENT_RESPONSE,
-#endif /* LDAP_CONTROL_DUPENT_RESPONSE */
-
-#ifdef LDAP_CONTROL_DUPENT_ENTRY
-       LDAP_CONTROL_DUPENT_ENTRY,
-#endif /* LDAP_CONTROL_DUPENT_ENTRY */
-
-       LDAP_CONTROL_PAGEDRESULTS,
-
-#ifdef LDAP_CONTROL_SORTREQUEST
-       LDAP_CONTROL_SORTREQUEST,
-#endif /* LDAP_CONTROL_SORTREQUEST */
-
-#ifdef LDAP_CONTROL_SORTRESPONSE
-       LDAP_CONTROL_SORTRESPONSE,
-#endif /* LDAP_CONTROL_SORTRESPONSE */
-
-#ifdef LDAP_CONTROL_VLVREQUEST
-       LDAP_CONTROL_VLVREQUEST,
-#endif /* LDAP_CONTROL_VLVREQUEST */
-
-#ifdef LDAP_CONTROL_VLVRESPONSE
-       LDAP_CONTROL_VLVRESPONSE,
-#endif /* LDAP_CONTROL_VLVRESPONSE */
-
-       LDAP_CONTROL_VALUESRETURNFILTER,
-       NULL
-};
-
 int
 slap_init( int mode, const char *name )
 {
        int rc;
+       int i;
 
        assert( mode );
 
-       if( slapMode != SLAP_UNDEFINED_MODE ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( OPERATION, CRIT, 
-                       "init: %s init called twice (old=%d, new=%d)\n",
-                       name, slapMode, mode );
-#else
+       if ( slapMode != SLAP_UNDEFINED_MODE ) {
                Debug( LDAP_DEBUG_ANY,
                 "%s init: init called twice (old=%d, new=%d)\n",
                 name, slapMode, mode );
-#endif
 
                return 1;
        }
@@ -145,65 +103,60 @@ slap_init( int mode, const char *name )
        slapMode = mode;
 
        switch ( slapMode & SLAP_MODE ) {
-               case SLAP_SERVER_MODE:
-               case SLAP_TOOL_MODE:
-#ifdef NEW_LOGGING
-                       LDAP_LOG( OPERATION, DETAIL1, 
-                               "init: %s initiation, initiated %s.\n",
-                               name, (mode & SLAP_MODE) == SLAP_TOOL_MODE ? 
-                                 "tool" : "server", 0 );
-#else
-                       Debug( LDAP_DEBUG_TRACE,
-                               "%s init: initiated %s.\n",     name,
-                               (mode & SLAP_MODE) == SLAP_TOOL_MODE ? "tool" : "server",
-                               0 );
-#endif
+       case SLAP_SERVER_MODE:
+       case SLAP_TOOL_MODE:
+               Debug( LDAP_DEBUG_TRACE,
+                       "%s init: initiated %s.\n",     name,
+                       (mode & SLAP_MODE) == SLAP_TOOL_MODE ? "tool" : "server",
+                       0 );
+
 
+               slap_name = name;
 
-                       slap_name = name;
-       
-                       (void) ldap_pvt_thread_initialize();
+               ldap_pvt_thread_pool_init( &connection_pool,
+                               connection_pool_max, 0);
 
-                       ldap_pvt_thread_pool_init(&connection_pool, connection_pool_max, 0);
+               ldap_pvt_thread_mutex_init( &entry2str_mutex );
+               ldap_pvt_thread_mutex_init( &replog_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( &slap_counters.sc_sent_mutex );
+               ldap_pvt_thread_mutex_init( &slap_counters.sc_ops_mutex );
+               ldap_pvt_mp_init( slap_counters.sc_bytes );
+               ldap_pvt_mp_init( slap_counters.sc_pdu );
+               ldap_pvt_mp_init( slap_counters.sc_entries );
+               ldap_pvt_mp_init( slap_counters.sc_refs );
+
+               ldap_pvt_mp_init( slap_counters.sc_ops_completed );
+               ldap_pvt_mp_init( slap_counters.sc_ops_initiated );
 
 #ifdef SLAPD_MONITOR
-                       {
-                               int i;
-                               for ( i = 0; i < SLAP_OP_LAST; i++ ) {
-                                       num_ops_initiated_[ i ] = 0;
-                                       num_ops_completed_[ i ] = 0;
-                               }
-                       }
-#endif
+               for ( i = 0; i < SLAP_OP_LAST; i++ ) {
+                       ldap_pvt_mp_init( slap_counters.sc_ops_initiated_[ i ] );
+                       ldap_pvt_mp_init( slap_counters.sc_ops_completed_[ i ] );
+               }
+#endif /* SLAPD_MONITOR */
 
-                       ldap_pvt_thread_mutex_init( &gmtime_mutex );
+#ifndef HAVE_GMTIME_R
+               ldap_pvt_thread_mutex_init( &gmtime_mutex );
+#endif
 #if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
-                       ldap_pvt_thread_mutex_init( &passwd_mutex );
+               ldap_pvt_thread_mutex_init( &passwd_mutex );
 #endif
 
-                       rc = slap_sasl_init();
+               rc = slap_sasl_init();
 
-                       if( rc == 0 ) {
-                               rc = backend_init( );
-                       }
-                       break;
+               if( rc == 0 ) {
+                       rc = backend_init( );
+               }
 
-               default:
-#ifdef NEW_LOGGING
-                       LDAP_LOG( OPERATION, ERR, 
-                               "init: %s init, undefined mode (%d).\n", name, mode, 0 );
-#else
-                       Debug( LDAP_DEBUG_ANY,
-                               "%s init: undefined mode (%d).\n", name, mode, 0 );
-#endif
+               break;
+
+       default:
+               Debug( LDAP_DEBUG_ANY,
+                       "%s init: undefined mode (%d).\n", name, mode, 0 );
 
-                       rc = 1;
-                       break;
+               rc = 1;
+               break;
        }
 
        return rc;
@@ -213,60 +166,99 @@ int slap_startup( Backend *be )
 {
        int rc;
 
-#ifdef NEW_LOGGING
-       LDAP_LOG( OPERATION, CRIT, "slap_startup: %s started\n", slap_name, 0, 0 );
-#else
        Debug( LDAP_DEBUG_TRACE,
                "%s startup: initiated.\n",
                slap_name, 0, 0 );
-#endif
 
 
        rc = backend_startup( be );
 
+#ifdef LDAP_SLAPI
+       if( rc == 0 ) {
+               Slapi_PBlock *pb = slapi_pblock_new();
+
+               if ( slapi_int_call_plugins( NULL, SLAPI_PLUGIN_START_FN, pb ) < 0 ) {
+                       rc = -1;
+               }
+               slapi_pblock_destroy( pb );
+       }
+#endif /* LDAP_SLAPI */
+
        return rc;
 }
 
 int slap_shutdown( Backend *be )
 {
        int rc;
+#ifdef LDAP_SLAPI
+       Slapi_PBlock *pb;
+#endif
 
-#ifdef NEW_LOGGING
-       LDAP_LOG( OPERATION, CRIT, 
-               "slap_shutdown: %s shutdown initiated.\n", slap_name, 0, 0);
-#else
        Debug( LDAP_DEBUG_TRACE,
                "%s shutdown: initiated\n",
                slap_name, 0, 0 );
-#endif
-
-
-       slap_sasl_destroy();
 
        /* let backends do whatever cleanup they need to do */
        rc = backend_shutdown( be ); 
 
+#ifdef LDAP_SLAPI
+       pb = slapi_pblock_new();
+       (void) slapi_int_call_plugins( NULL, SLAPI_PLUGIN_CLOSE_FN, pb );
+       slapi_pblock_destroy( pb );
+#endif /* LDAP_SLAPI */
+
        return rc;
 }
 
 int slap_destroy(void)
 {
        int rc;
+       int i;
 
-#ifdef NEW_LOGGING
-       LDAP_LOG( OPERATION, INFO, 
-               "slap_destroy: %s freeing system resources.\n", slap_name, 0, 0);
-#else
        Debug( LDAP_DEBUG_TRACE,
-               "%s shutdown: freeing system resources.\n",
+               "%s destroy: freeing system resources.\n",
                slap_name, 0, 0 );
-#endif
 
+       if ( default_referral ) {
+               ber_bvarray_free( default_referral );
+       }
 
        rc = backend_destroy();
 
+       slap_sasl_destroy();
+
        entry_destroy();
 
+       switch ( slapMode & SLAP_MODE ) {
+       case SLAP_SERVER_MODE:
+       case SLAP_TOOL_MODE:
+
+               ldap_pvt_thread_mutex_destroy( &slap_counters.sc_sent_mutex );
+               ldap_pvt_thread_mutex_destroy( &slap_counters.sc_ops_mutex );
+               ldap_pvt_mp_clear( slap_counters.sc_bytes );
+               ldap_pvt_mp_clear( slap_counters.sc_pdu );
+               ldap_pvt_mp_clear( slap_counters.sc_entries );
+               ldap_pvt_mp_clear( slap_counters.sc_refs );
+               ldap_pvt_mp_clear( slap_counters.sc_ops_completed );
+               ldap_pvt_mp_clear( slap_counters.sc_ops_initiated );
+
+#ifdef SLAPD_MONITOR
+               for ( i = 0; i < SLAP_OP_LAST; i++ ) {
+                       ldap_pvt_mp_clear( slap_counters.sc_ops_initiated_[ i ] );
+                       ldap_pvt_mp_clear( slap_counters.sc_ops_completed_[ i ] );
+               }
+#endif /* SLAPD_MONITOR */
+               break;
+
+       default:
+               Debug( LDAP_DEBUG_ANY,
+                       "slap_destroy(): undefined mode (%d).\n", slapMode, 0, 0 );
+
+               rc = 1;
+               break;
+
+       }
+
        ldap_pvt_thread_destroy();
 
        /* should destory the above mutex */