From: Howard Chu <hyc@openldap.org>
Date: Sat, 17 Aug 2013 01:56:31 +0000 (-0700)
Subject: Tweak mutex acquisition
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f230503b108b1c1fd2dec072b0ad5d6785da4968;p=openldap

Tweak mutex acquisition

Slightly reduce held time.
---

diff --git a/servers/slapd/ctxcsn.c b/servers/slapd/ctxcsn.c
index c67bc886ee..1331f338c4 100644
--- a/servers/slapd/ctxcsn.c
+++ b/servers/slapd/ctxcsn.c
@@ -50,12 +50,12 @@ slap_get_commit_csn(
 		*foundit = 0;
 	}
 
-	ldap_pvt_thread_mutex_lock( &be->be_pcl_mutex );
-
 	if ( !BER_BVISEMPTY( &op->o_csn )) {
 		sid = slap_parse_csn_sid( &op->o_csn );
 	}
 
+	ldap_pvt_thread_mutex_lock( &be->be_pcl_mutex );
+
 	LDAP_TAILQ_FOREACH( csne, be->be_pending_csn_list, ce_csn_link ) {
 		if ( csne->ce_opid == op->o_opid && csne->ce_connid == op->o_connid ) {
 			csne->ce_state = SLAP_CSN_COMMIT;
@@ -188,14 +188,14 @@ slap_queue_csn(
 
 	Debug( LDAP_DEBUG_SYNC, "slap_queue_csn: queing %p %s\n", csn->bv_val, csn->bv_val, 0 );
 
-	ldap_pvt_thread_mutex_lock( &be->be_pcl_mutex );
-
 	ber_dupbv( &pending->ce_csn, csn );
 	ber_bvreplace_x( &op->o_csn, &pending->ce_csn, op->o_tmpmemctx );
 	pending->ce_sid = slap_parse_csn_sid( csn );
 	pending->ce_connid = op->o_connid;
 	pending->ce_opid = op->o_opid;
 	pending->ce_state = SLAP_CSN_PENDING;
+
+	ldap_pvt_thread_mutex_lock( &be->be_pcl_mutex );
 	LDAP_TAILQ_INSERT_TAIL( be->be_pending_csn_list,
 		pending, ce_csn_link );
 	ldap_pvt_thread_mutex_unlock( &be->be_pcl_mutex );
diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index a2644efbae..1d83ffd4b2 100644
--- a/servers/slapd/operation.c
+++ b/servers/slapd/operation.c
@@ -159,8 +159,8 @@ slap_op_free( Operation *op, void *ctx )
 void
 slap_op_time(time_t *t, int *nop)
 {
-	ldap_pvt_thread_mutex_lock( &slap_op_mutex );
 	*t = slap_get_time();
+	ldap_pvt_thread_mutex_lock( &slap_op_mutex );
 	if ( *t == last_time ) {
 		*nop = ++last_incr;
 	} else {