From: Pierangelo Masarati Date: Sun, 30 Jan 2005 22:07:32 +0000 (+0000) Subject: counter cleanup X-Git-Tag: OPENLDAP_REL_ENG_2_3_BP~210 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b3c00deb3d5be5aa53cb5ecd99855cee457f33c2;p=openldap counter cleanup --- diff --git a/servers/slapd/init.c b/servers/slapd/init.c index 1c34f10d3e..e606e3da9e 100644 --- a/servers/slapd/init.c +++ b/servers/slapd/init.c @@ -126,8 +126,8 @@ slap_init( int mode, const char *name ) ldap_pvt_mp_init( slap_counters.sc_entries ); ldap_pvt_mp_init( slap_counters.sc_refs ); - ldap_pvt_mp_init( slap_counters.sc_ops_completed ); ldap_pvt_mp_init( slap_counters.sc_ops_initiated ); + ldap_pvt_mp_init( slap_counters.sc_ops_completed ); #ifdef SLAPD_MONITOR for ( i = 0; i < SLAP_OP_LAST; i++ ) { @@ -239,8 +239,8 @@ int slap_destroy(void) ldap_pvt_mp_clear( slap_counters.sc_pdu ); ldap_pvt_mp_clear( slap_counters.sc_entries ); ldap_pvt_mp_clear( slap_counters.sc_refs ); - ldap_pvt_mp_clear( slap_counters.sc_ops_completed ); ldap_pvt_mp_clear( slap_counters.sc_ops_initiated ); + ldap_pvt_mp_clear( slap_counters.sc_ops_completed ); #ifdef SLAPD_MONITOR for ( i = 0; i < SLAP_OP_LAST; i++ ) { diff --git a/servers/slapd/result.c b/servers/slapd/result.c index 9c9d2ea587..c2efc492fd 100644 --- a/servers/slapd/result.c +++ b/servers/slapd/result.c @@ -453,7 +453,7 @@ send_ldap_response( ldap_pvt_thread_mutex_lock( &slap_counters.sc_sent_mutex ); ldap_pvt_mp_add_ulong( slap_counters.sc_pdu, 1 ); - ldap_pvt_mp_add_ulong( slap_counters.sc_bytes, bytes ); + ldap_pvt_mp_add_ulong( slap_counters.sc_bytes, (unsigned long)bytes ); ldap_pvt_thread_mutex_unlock( &slap_counters.sc_sent_mutex ); cleanup:; @@ -1180,7 +1180,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) rs->sr_nentries++; ldap_pvt_thread_mutex_lock( &slap_counters.sc_sent_mutex ); - ldap_pvt_mp_add_ulong( slap_counters.sc_bytes, bytes ); + ldap_pvt_mp_add_ulong( slap_counters.sc_bytes, (unsigned long)bytes ); ldap_pvt_mp_add_ulong( slap_counters.sc_entries, 1 ); ldap_pvt_mp_add_ulong( slap_counters.sc_pdu, 1 ); ldap_pvt_thread_mutex_unlock( &slap_counters.sc_sent_mutex ); @@ -1369,7 +1369,7 @@ slap_send_search_reference( Operation *op, SlapReply *rs ) ber_free_buf( ber ); ldap_pvt_thread_mutex_lock( &slap_counters.sc_sent_mutex ); - ldap_pvt_mp_add_ulong( slap_counters.sc_bytes, bytes ); + ldap_pvt_mp_add_ulong( slap_counters.sc_bytes, (unsigned long)bytes ); ldap_pvt_mp_add_ulong( slap_counters.sc_refs, 1 ); ldap_pvt_mp_add_ulong( slap_counters.sc_pdu, 1 ); ldap_pvt_thread_mutex_unlock( &slap_counters.sc_sent_mutex );