Rework ac/socket.h for HAVE_WINSOCK:

[openldap] / servers / slapd / monitor.c

diff --git a/servers/slapd/monitor.c b/servers/slapd/monitor.c
index 65594af1833076b6533f1125c4047d8c1fd08a19..658db39791a977e6a79b6b1016487a497a4c1900 100644 (file)
--- a/servers/slapd/monitor.c
+++ b/servers/slapd/monitor.c
@@ -87,12 +87,12 @@ monitor_info( Connection *conn, Operation *op )
                ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
 
                sprintf( buf, "%d : %s : %d : %d : %s : %s%s%s%s", i,
-                   buf2, c[i].c_ops_received, c[i].c_ops_completed,
+                   buf2, c[i].c_n_ops_received, c[i].c_n_ops_completed,
                    c[i].c_cdn ? c[i].c_cdn : "NULLDN",
-                   c[i].c_gettingber ? "r" : "",
+                   c[i].c_currentber ? "r" : "",
                    c[i].c_writewaiter ? "w" : "",
-                   c[i].c_ops_executing ? "x" : "",
-                   c[i].c_ops_pending ? "p" : ""
+                   c[i].c_ops != NULL ? "x" : "",
+                   c[i].c_pending_ops != NULL ? "p" : ""
                );
 
                val.bv_val = buf;
@@ -128,28 +128,35 @@ monitor_info( Connection *conn, Operation *op )
        attr_merge( e, "readwaiters", vals );
 
 #ifdef LDAP_COUNTERS
-       sprintf( buf, "%ld", ops_initiated );
+       ldap_pvt_thread_mutex_lock(&num_ops_mutex);
+       sprintf( buf, "%ld", num_ops_initiated );
+       ldap_pvt_thread_mutex_unlock(&num_ops_mutex);
        val.bv_val = buf;
        val.bv_len = strlen( buf );
        attr_merge( e, "opsinitiated", vals );
 
-       sprintf( buf, "%ld", ops_completed );
+       ldap_pvt_thread_mutex_lock(&num_ops_mutex);
+       sprintf( buf, "%ld", num_ops_completed );
+       ldap_pvt_thread_mutex_unlock(&num_ops_mutex);
        val.bv_val = buf;
        val.bv_len = strlen( buf );
        attr_merge( e, "opscompleted", vals );
 
+       ldap_pvt_thread_mutex_lock(&num_sent_mutex);
        sprintf( buf, "%ld", num_entries_sent );
+       ldap_pvt_thread_mutex_unlock(&num_sent_mutex);
        val.bv_val = buf;
        val.bv_len = strlen( buf );
        attr_merge( e, "entriessent", vals );
 
+       ldap_pvt_thread_mutex_lock(&num_sent_mutex);
        sprintf( buf, "%ld", num_bytes_sent );
+       ldap_pvt_thread_mutex_unlock(&num_sent_mutex);
        val.bv_val = buf;
        val.bv_len = strlen( buf );
        attr_merge( e, "bytessent", vals );
 #endif
 
-       slap_set_time();
        currenttime = slap_get_time();
 
        ldap_pvt_thread_mutex_lock( &gmtime_mutex );