X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Finit.c;h=b860b3f673bdce6e7935f3aadc39a00100d44873;hb=f8c0481dd47a78d24a57e9872e8b775a7152b4d2;hp=18bcf152bacc4b7345fcbcba8c8c2898f3d99d93;hpb=0e2af54a3ffdeebe3901370683be56fcc53023b0;p=openldap

diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index 18bcf152ba..b860b3f673 100644
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -31,7 +31,7 @@ int		ldap_syslog;
 int		ldap_syslog_level = LOG_DEBUG;
 #endif
 
-BVarray default_referral = NULL;
+BerVarray default_referral = NULL;
 
 /*
  * global variables that need mutex protection
@@ -43,8 +43,12 @@ ldap_pvt_thread_mutex_t	gmtime_mutex;
 ldap_pvt_thread_mutex_t	passwd_mutex;
 #endif
 
-unsigned long			num_ops_initiated;
-unsigned long			num_ops_completed;
+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;
 
 unsigned long			num_entries_sent;
@@ -71,9 +75,9 @@ slap_init( int mode, const char *name )
 
 	if( slapMode != SLAP_UNDEFINED_MODE ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
-			   "init: %s init called twice (old=%d, new=%d)\n",
-			   name, slapMode, mode ));
+		LDAP_LOG( OPERATION, CRIT, 
+			"init: %s init called twice (old=%d, new=%d)\n",
+			name, slapMode, mode );
 #else
 		Debug( LDAP_DEBUG_ANY,
 		 "%s init: init called twice (old=%d, new=%d)\n",
@@ -89,9 +93,10 @@ slap_init( int mode, const char *name )
 		case SLAP_SERVER_MODE:
 		case SLAP_TOOL_MODE:
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
-				   "init: %s initiation, initiated %s.\n",
-				   name, (mode & SLAP_MODE) == SLAP_TOOL_MODE ? "tool" : "server" ));
+			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,
@@ -111,6 +116,16 @@ slap_init( int mode, const char *name )
 			ldap_pvt_thread_mutex_init( &num_ops_mutex );
 			ldap_pvt_thread_mutex_init( &num_sent_mutex );
 
+#ifdef SLAPD_MONITOR
+			{
+				int i;
+				for ( i = 0; i < SLAP_OP_LAST; i++ ) {
+					num_ops_initiated_[ i ] = 0;
+					num_ops_completed_[ i ] = 0;
+				}
+			}
+#endif
+
 			ldap_pvt_thread_mutex_init( &gmtime_mutex );
 #if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
 			ldap_pvt_thread_mutex_init( &passwd_mutex );
@@ -125,8 +140,8 @@ slap_init( int mode, const char *name )
 
 		default:
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-				   "init: %s init, undefined mode (%d).\n", name, mode ));
+			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 );
@@ -144,8 +159,7 @@ int slap_startup( Backend *be )
 	int rc;
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
-		   "slap_startup: %s started\n", slap_name ));
+	LDAP_LOG( OPERATION, CRIT, "slap_startup: %s started\n", slap_name, 0, 0 );
 #else
 	Debug( LDAP_DEBUG_TRACE,
 		"%s startup: initiated.\n",
@@ -163,8 +177,8 @@ int slap_shutdown( Backend *be )
 	int rc;
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
-		   "slap_shutdown: %s shutdown initiated.\n", slap_name));
+	LDAP_LOG( OPERATION, CRIT, 
+		"slap_shutdown: %s shutdown initiated.\n", slap_name, 0, 0);
 #else
 	Debug( LDAP_DEBUG_TRACE,
 		"%s shutdown: initiated\n",
@@ -185,9 +199,8 @@ int slap_destroy(void)
 	int rc;
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-		   "slap_destroy: %s freeing system resources.\n",
-		   slap_name ));
+	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",