X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmonitor.c;h=698ac953a432d3f12c1068617eb7f06efb17f2a2;hb=3cbad7b4f10a28840b2209e6d11a93fc09b49cc4;hp=7dbabc93772c071c9c180645aa8cbef8b251227f;hpb=42e0d83cb3a1a1c5b25183f1ab74ce7edbe25de7;p=openldap

diff --git a/servers/slapd/monitor.c b/servers/slapd/monitor.c
index 7dbabc9377..698ac953a4 100644
--- a/servers/slapd/monitor.c
+++ b/servers/slapd/monitor.c
@@ -10,40 +10,31 @@
  * is provided ``as is'' without express or implied warranty.
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include "slap.h"
-#include "ldapconfig.h"
+/* Revision history
+ *
+ * 5-Jun-96	jeff.hodges@stanford.edu
+ *	Added locking of new_conn_mutex when traversing the c[] array.
+ *	Added locking of currenttime_mutex to protect call(s) to localtime().
+ */
 
-#if defined( SLAPD_MONITOR_DN )
+#include "portable.h"
 
-extern int		nbackends;
-extern Backend		*backends;
-extern int		active_threads;
-extern int		dtblsize;
-extern Connection	*c;
-extern long		ops_initiated;
-extern long		ops_completed;
-extern long		num_entries_sent;
-extern long		num_bytes_sent;
-extern time_t		currenttime;
-extern time_t		starttime;
-extern int		num_conns;
+#include <stdio.h>
 
+#include <ac/socket.h>
+#include <ac/string.h>
+#include <ac/time.h>
 
-extern char Versionstr[];
+#include "ldapconfig.h"
+#include "slap.h"
 
-/*
- * no mutex protection in here - take our chances!
- */
+#if defined( SLAPD_MONITOR_DN )
 
 void
 monitor_info( Connection *conn, Operation *op )
 {
 	Entry		*e;
-	char		buf[BUFSIZ], buf2[20];
+	char		buf[BUFSIZ], buf2[22];
 	struct berval	val;
 	struct berval	*vals[2];
 	int		i, nconns, nwritewaiters, nreadwaiters;
@@ -54,8 +45,10 @@ monitor_info( Connection *conn, Operation *op )
 	vals[1] = NULL;
 
 	e = (Entry *) ch_calloc( 1, sizeof(Entry) );
+	/* initialize reader/writer lock */
+	entry_rdwr_init(e);
 	e->e_attrs = NULL;
-	e->e_dn = strdup( SLAPD_MONITOR_DN );
+	e->e_dn = ch_strdup( SLAPD_MONITOR_DN );
 
 	val.bv_val = Versionstr;
 	if (( p = strchr( Versionstr, '\n' )) == NULL ) {
@@ -73,6 +66,8 @@ monitor_info( Connection *conn, Operation *op )
 	nconns = 0;
 	nwritewaiters = 0;
 	nreadwaiters = 0;
+
+	pthread_mutex_lock( &new_conn_mutex );
 	for ( i = 0; i < dtblsize; i++ ) {
 		if ( c[i].c_sb.sb_sd != -1 ) {
 			nconns++;
@@ -82,10 +77,18 @@ monitor_info( Connection *conn, Operation *op )
 			if ( c[i].c_gettingber ) {
 				nreadwaiters++;
 			}
+			pthread_mutex_lock( &currenttime_mutex );
+#ifndef LDAP_LOCALTIME
+			ltm = gmtime( &c[i].c_starttime );
+			strftime( buf2, sizeof(buf2), "%Y%m%d%H%M%SZ", ltm );
+#else
 			ltm = localtime( &c[i].c_starttime );
 			strftime( buf2, sizeof(buf2), "%y%m%d%H%M%SZ", ltm );
+#endif
+			pthread_mutex_unlock( &currenttime_mutex );
+
 			pthread_mutex_lock( &c[i].c_dnmutex );
-			sprintf( buf, "%d : %s : %ld : %ld : %s : %s%s", i,
+			sprintf( buf, "%d : %s : %d : %d : %s : %s%s", i,
 			    buf2, c[i].c_opsinitiated, c[i].c_opscompleted,
 			    c[i].c_dn ? c[i].c_dn : "NULLDN",
 			    c[i].c_gettingber ? "r" : "",
@@ -96,6 +99,8 @@ monitor_info( Connection *conn, Operation *op )
 			attr_merge( e, "connection", vals );
 		}
 	}
+	pthread_mutex_unlock( &new_conn_mutex );
+
 	sprintf( buf, "%d", nconns );
 	val.bv_val = buf;
 	val.bv_len = strlen( buf );
@@ -141,14 +146,28 @@ monitor_info( Connection *conn, Operation *op )
 	val.bv_len = strlen( buf );
 	attr_merge( e, "bytessent", vals );
 
-        ltm = localtime( &currenttime );
-        strftime( buf, sizeof(buf), "%y%m%d%H%M%SZ", ltm );
+	pthread_mutex_lock( &currenttime_mutex );
+#ifndef LDAP_LOCALTIME
+	ltm = gmtime( &currenttime );
+	strftime( buf, sizeof(buf), "%Y%m%d%H%M%SZ", ltm );
+#else
+	ltm = localtime( &currenttime );
+	strftime( buf, sizeof(buf), "%y%m%d%H%M%SZ", ltm );
+#endif
+	pthread_mutex_unlock( &currenttime_mutex );
 	val.bv_val = buf;
 	val.bv_len = strlen( buf );
 	attr_merge( e, "currenttime", vals );
 
-        ltm = localtime( &starttime );
-        strftime( buf, sizeof(buf), "%y%m%d%H%M%SZ", ltm );
+	pthread_mutex_lock( &currenttime_mutex );
+#ifndef LDAP_LOCALTIME
+	ltm = gmtime( &starttime );
+	strftime( buf, sizeof(buf), "%Y%m%d%H%M%SZ", ltm );
+#else
+	ltm = localtime( &starttime );
+	strftime( buf, sizeof(buf), "%y%m%d%H%M%SZ", ltm );
+#endif
+	pthread_mutex_unlock( &currenttime_mutex );
 	val.bv_val = buf;
 	val.bv_len = strlen( buf );
 	attr_merge( e, "starttime", vals );
@@ -158,7 +177,7 @@ monitor_info( Connection *conn, Operation *op )
 	val.bv_len = strlen( buf );
 	attr_merge( e, "nbackends", vals );
 
-#ifdef THREAD_SUNOS5_LWP
+#ifdef HAVE_THR
 	sprintf( buf, "%d", thr_getconcurrency() );
 	val.bv_val = buf;
 	val.bv_len = strlen( buf );