From: Howard Chu Date: Tue, 23 Oct 2007 20:57:13 +0000 (+0000) Subject: Forced commit, partially revert prev commit X-Git-Tag: OPENLDAP_REL_ENG_2_4_9~20^2~486 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=faa76b761db122d0a5cd9326621394549ba387f0;p=openldap Forced commit, partially revert prev commit --- diff --git a/servers/slapd/result.c b/servers/slapd/result.c index 2e2dc8c565..9d1ed0e34a 100644 --- a/servers/slapd/result.c +++ b/servers/slapd/result.c @@ -508,10 +508,10 @@ send_ldap_response( goto cleanup; } - /* ldap_pvt_thread_mutex_lock( &slap_counters.sc_sent_mutex ); */ + 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, (unsigned long)bytes ); - /* ldap_pvt_thread_mutex_unlock( &slap_counters.sc_sent_mutex ); */ + ldap_pvt_thread_mutex_unlock( &slap_counters.sc_sent_mutex ); cleanup:; /* Tell caller that we did this for real, as opposed to being @@ -1196,11 +1196,11 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) } rs->sr_nentries++; - /* ldap_pvt_thread_mutex_lock( &slap_counters.sc_sent_mutex ); */ + ldap_pvt_thread_mutex_lock( &slap_counters.sc_sent_mutex ); 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 ); */ + ldap_pvt_thread_mutex_unlock( &slap_counters.sc_sent_mutex ); } Statslog( LDAP_DEBUG_STATS2, "%s ENTRY dn=\"%s\"\n", @@ -1363,11 +1363,11 @@ slap_send_search_reference( Operation *op, SlapReply *rs ) if ( bytes < 0 ) { rc = LDAP_UNAVAILABLE; } else { - /* ldap_pvt_thread_mutex_lock( &slap_counters.sc_sent_mutex ); */ + ldap_pvt_thread_mutex_lock( &slap_counters.sc_sent_mutex ); 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 ); */ + ldap_pvt_thread_mutex_unlock( &slap_counters.sc_sent_mutex ); } #ifdef LDAP_CONNECTIONLESS }