Move backend_syncfreq code down into back-ldbm. Creates new configuration

[openldap] / servers / slapd / monitor.c

diff --git a/servers/slapd/monitor.c b/servers/slapd/monitor.c
index a7b042c8c17c5af4b4df5bd3d6df7a48f2041684..1c337c53b98cf290fe68fb95afd570605949b484 100644 (file)
--- a/servers/slapd/monitor.c
+++ b/servers/slapd/monitor.c
@@ -49,7 +49,6 @@ monitor_info(
        vals[1] = NULL;
 
        e = (Entry *) ch_calloc( 1, sizeof(Entry) );
-       /* initialize reader/writer lock */
        e->e_attrs = NULL;
        e->e_dn = ch_strdup( SLAPD_MONITOR_DN );
        e->e_ndn = ch_strdup(SLAPD_MONITOR_DN);
@@ -90,9 +89,8 @@ monitor_info(
        }
        attr_merge( e, "version", vals );
 
-       ldap_pvt_thread_mutex_lock( &active_threads_mutex );
-       sprintf( buf, "%d", active_threads );
-       ldap_pvt_thread_mutex_unlock( &active_threads_mutex );
+       sprintf( buf, "%d",
+               ldap_pvt_thread_pool_backload( &connection_pool) );
        val.bv_val = buf;
        val.bv_len = strlen( buf );
        attr_merge( e, "threads", vals );
@@ -148,7 +146,7 @@ monitor_info(
                        connection_state2str( c->c_conn_state ),
                        c->c_sasl_bind_in_progress ? "S" : "",
 
-                   c->c_cdn ? c->c_cdn : "<anonymous>",
+                   c->c_cdn ? c->c_cdn : SLAPD_ANONYMOUS,
 
                        c->c_listener_url,
                    c->c_peer_domain,