Cleanup

[openldap] / servers / slapd / ctxcsn.c

diff --git a/servers/slapd/ctxcsn.c b/servers/slapd/ctxcsn.c
index ce6356ab42f39267c898f6b94225ec6bbcd511e5..54118e76da730d794524ba24a7b71e56d0ecd6ef 100644 (file)
--- a/servers/slapd/ctxcsn.c
+++ b/servers/slapd/ctxcsn.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2003-2008 The OpenLDAP Foundation.
+ * Copyright 2003-2009 The OpenLDAP Foundation.
  * Portions Copyright 2003 IBM Corporation.
  * All rights reserved.
  *
@@ -30,34 +30,58 @@ const struct berval slap_ldapsync_bv = BER_BVC("ldapsync");
 const struct berval slap_ldapsync_cn_bv = BER_BVC("cn=ldapsync");
 int slap_serverID;
 
+/* maxcsn->bv_val must point to a char buf[LDAP_PVT_CSNSTR_BUFSIZE] */
 void
 slap_get_commit_csn(
        Operation *op,
-       struct berval *maxcsn
+       struct berval *maxcsn,
+       int *foundit
 )
 {
        struct slap_csn_entry *csne, *committed_csne = NULL;
        BackendDB *be = op->o_bd->bd_self;
+       int sid = -1;
 
        if ( maxcsn ) {
-               BER_BVZERO( maxcsn );
+               assert( maxcsn->bv_val != NULL );
+               assert( maxcsn->bv_len >= LDAP_PVT_CSNSTR_BUFSIZE );
+       }
+       if ( foundit ) {
+               *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_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;
+                       if ( foundit ) *foundit = 1;
                        break;
                }
        }
 
        LDAP_TAILQ_FOREACH( csne, be->be_pending_csn_list, ce_csn_link ) {
-               if ( csne->ce_state == SLAP_CSN_COMMIT ) committed_csne = csne;
-               if ( csne->ce_state == SLAP_CSN_PENDING ) break;
+               if ( sid != -1 && sid == csne->ce_sid ) {
+                       if ( csne->ce_state == SLAP_CSN_COMMIT ) committed_csne = csne;
+                       if ( csne->ce_state == SLAP_CSN_PENDING ) break;
+               }
        }
 
-       if ( committed_csne && maxcsn ) *maxcsn = committed_csne->ce_csn;
+       if ( maxcsn ) {
+               if ( committed_csne ) {
+                       if ( committed_csne->ce_csn.bv_len < maxcsn->bv_len )
+                               maxcsn->bv_len = committed_csne->ce_csn.bv_len;
+                       AC_MEMCPY( maxcsn->bv_val, committed_csne->ce_csn.bv_val,
+                               maxcsn->bv_len+1 );
+               } else {
+                       maxcsn->bv_len = 0;
+                       maxcsn->bv_val[0] = 0;
+               }
+       }
        ldap_pvt_thread_mutex_unlock( &be->be_pcl_mutex );
 }
 
@@ -168,6 +192,7 @@ slap_queue_csn(
 
        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;
@@ -184,11 +209,7 @@ slap_get_csn(
 {
        if ( csn == NULL ) return LDAP_OTHER;
 
-       /* gmtime doesn't always need a mutex, but lutil_csnstr does */
-       ldap_pvt_thread_mutex_lock( &gmtime_mutex );
-       csn->bv_len = lutil_csnstr( csn->bv_val, csn->bv_len, slap_serverID, 0 );
-       ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
-
+       csn->bv_len = ldap_pvt_csnstr( csn->bv_val, csn->bv_len, slap_serverID, 0 );
        if ( manage_ctxcsn )
                slap_queue_csn( op, csn );