Forced commit, partially revert prev commit

This commit is contained in:
Howard Chu 2007-10-23 20:57:13 +00:00
parent 3877fc9359
commit faa76b761d

View File

@ -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
}