From 63922b076ceab973b25a415f45d433aaa8257586 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Fri, 15 Nov 2019 16:26:14 +0000 Subject: [PATCH] ITS#9119 fix global operation counter reporting --- servers/slapd/back-monitor/operation.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/servers/slapd/back-monitor/operation.c b/servers/slapd/back-monitor/operation.c index c18011a7db..85e82d900e 100644 --- a/servers/slapd/back-monitor/operation.c +++ b/servers/slapd/back-monitor/operation.c @@ -189,16 +189,12 @@ monitor_subsys_ops_update( ldap_pvt_mp_init( nCompleted ); ldap_pvt_thread_mutex_lock( &slap_counters.sc_mutex ); - for ( i = 0; i < SLAP_OP_LAST; i++ ) { - ldap_pvt_mp_add( nInitiated, slap_counters.sc_ops_initiated_[ i ] ); - ldap_pvt_mp_add( nCompleted, slap_counters.sc_ops_completed_[ i ] ); - } + ldap_pvt_mp_add( nInitiated, slap_counters.sc_ops_initiated ); + ldap_pvt_mp_add( nCompleted, slap_counters.sc_ops_completed ); for ( sc = slap_counters.sc_next; sc; sc = sc->sc_next ) { ldap_pvt_thread_mutex_lock( &sc->sc_mutex ); - for ( i = 0; i < SLAP_OP_LAST; i++ ) { - ldap_pvt_mp_add( nInitiated, sc->sc_ops_initiated_[ i ] ); - ldap_pvt_mp_add( nCompleted, sc->sc_ops_completed_[ i ] ); - } + ldap_pvt_mp_add( nInitiated, sc->sc_ops_initiated ); + ldap_pvt_mp_add( nCompleted, sc->sc_ops_completed ); ldap_pvt_thread_mutex_unlock( &sc->sc_mutex ); } ldap_pvt_thread_mutex_unlock( &slap_counters.sc_mutex );