Partially revert prev, redundant.

[openldap] / servers / slapd / ctxcsn.c

diff --git a/servers/slapd/ctxcsn.c b/servers/slapd/ctxcsn.c
index 16b8dff1502a1821baad8bdaf4c30558e4e72696..a5958be6b3da38c32d4ebfc627adaa5ba855957a 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-2006 The OpenLDAP Foundation.
+ * Copyright 2003-2008 The OpenLDAP Foundation.
  * Portions Copyright 2003 IBM Corporation.
  * All rights reserved.
  *
@@ -28,12 +28,12 @@
 
 const struct berval slap_ldapsync_bv = BER_BVC("ldapsync");
 const struct berval slap_ldapsync_cn_bv = BER_BVC("cn=ldapsync");
+int slap_serverID;
 
 void
 slap_get_commit_csn(
        Operation *op,
-       struct berval *maxcsn,
-       struct berval *curcsn
+       struct berval *maxcsn
 )
 {
        struct slap_csn_entry *csne, *committed_csne = NULL;
@@ -46,7 +46,6 @@ slap_get_commit_csn(
 
        LDAP_TAILQ_FOREACH( csne, op->o_bd->be_pending_csn_list, ce_csn_link ) {
                if ( csne->ce_opid == op->o_opid && csne->ce_connid == op->o_connid ) {
-                       if ( curcsn ) *curcsn = csne->ce_csn;
                        csne->ce_state = SLAP_CSN_COMMIT;
                        break;
                }
@@ -100,6 +99,8 @@ slap_graduate_commit_csn( Operation *op )
                if ( csne->ce_opid == op->o_opid && csne->ce_connid == op->o_connid ) {
                        LDAP_TAILQ_REMOVE( op->o_bd->be_pending_csn_list,
                                csne, ce_csn_link );
+                       Debug( LDAP_DEBUG_SYNC, "slap_graduate_commit_csn: removing %p %s\n",
+                               csne->ce_csn.bv_val, csne->ce_csn.bv_val, 0 );
                        if ( op->o_csn.bv_val == csne->ce_csn.bv_val ) {
                                BER_BVZERO( &op->o_csn );
                        }
@@ -130,7 +131,7 @@ slap_create_context_csn_entry(
 
        struct berval bv;
 
-       e = (Entry *) ch_calloc( 1, sizeof( Entry ));
+       e = entry_alloc();
 
        attr_merge( e, slap_schema.si_ad_objectClass,
                ocbva, NULL );
@@ -163,10 +164,13 @@ slap_queue_csn(
 
        pending = (struct slap_csn_entry *) ch_calloc( 1,
                        sizeof( struct slap_csn_entry ));
+
+       Debug( LDAP_DEBUG_SYNC, "slap_queue_csn: queing %p %s\n", csn->bv_val, csn->bv_val, 0 );
+
        ldap_pvt_thread_mutex_lock( op->o_bd->be_pcl_mutexp );
 
        ber_dupbv( &pending->ce_csn, csn );
-       ber_dupbv_x( &op->o_csn, &pending->ce_csn, op->o_tmpmemctx );
+       ber_bvreplace_x( &op->o_csn, &pending->ce_csn, op->o_tmpmemctx );
        pending->ce_connid = op->o_connid;
        pending->ce_opid = op->o_opid;
        pending->ce_state = SLAP_CSN_PENDING;
@@ -183,13 +187,10 @@ slap_get_csn(
 {
        if ( csn == NULL ) return LDAP_OTHER;
 
-#ifndef HAVE_GMTIME_R
+       /* gmtime doesn't always need a mutex, but lutil_csnstr does */
        ldap_pvt_thread_mutex_lock( &gmtime_mutex );
-#endif
-       csn->bv_len = lutil_csnstr( csn->bv_val, csn->bv_len, 0, 0 );
-#ifndef HAVE_GMTIME_R
+       csn->bv_len = lutil_csnstr( csn->bv_val, csn->bv_len, slap_serverID, 0 );
        ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
-#endif
 
        if ( manage_ctxcsn )
                slap_queue_csn( op, csn );