X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fctxcsn.c;h=d00eff2bfc7eca5867188098f9c3ee5f3d0e0339;hb=51c5916149f3652345905f21a6c79dd23ab32fb0;hp=0fe59b9f00b48e34d85091f5e83f86057d652915;hpb=4e15a84452f0493b1b5bc7b779c7bd1cd4fa4b73;p=openldap

diff --git a/servers/slapd/ctxcsn.c b/servers/slapd/ctxcsn.c
index 0fe59b9f00..d00eff2bfc 100644
--- 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 The OpenLDAP Foundation.
+ * Copyright 2003-2006 The OpenLDAP Foundation.
  * Portions Copyright 2003 IBM Corporation.
  * All rights reserved.
  *
@@ -22,7 +22,6 @@
 #include <ac/string.h>
 #include <ac/socket.h>
 
-#include "ldap_pvt.h"
 #include "lutil.h"
 #include "slap.h"
 #include "lutil_ldap.h"
@@ -31,84 +30,86 @@ const struct berval slap_ldapsync_bv = BER_BVC("ldapsync");
 const struct berval slap_ldapsync_cn_bv = BER_BVC("cn=ldapsync");
 
 void
-slap_get_commit_csn( Operation *op, struct berval *csn )
+slap_get_commit_csn(
+	Operation *op,
+	struct berval *maxcsn,
+	struct berval *curcsn
+)
 {
-	struct slap_csn_entry *csne = NULL, *committed_csne = NULL;
-	int i = 0;
-
-	csn->bv_val = NULL;
-	csn->bv_len = 0;
-
-	ldap_pvt_thread_mutex_lock( &op->o_bd->be_pcl_mutex );
+	struct slap_csn_entry *csne, *committed_csne = NULL;
 
-	LDAP_TAILQ_FOREACH( csne, &op->o_bd->be_pending_csn_list, csn_link ) {
-		if ( csne->opid == op->o_opid && csne->connid == op->o_connid )
-			break;
+	if ( maxcsn ) {
+		BER_BVZERO( maxcsn );
 	}
 
-	if ( csne ) {
-		csne->state = SLAP_CSN_COMMIT;
-	}
+	ldap_pvt_thread_mutex_lock( op->o_bd->be_pcl_mutexp );
 
-	LDAP_TAILQ_FOREACH( csne, &op->o_bd->be_pending_csn_list, csn_link ) {
-		if ( csne->state == SLAP_CSN_COMMIT )
-			committed_csne = csne;
-		if ( csne->state == SLAP_CSN_PENDING )
+	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;
+		}
 	}
 
-	ldap_pvt_thread_mutex_unlock( &op->o_bd->be_pcl_mutex );
-
-	if ( committed_csne ) {
-		ber_dupbv( csn, committed_csne->csn );
+	LDAP_TAILQ_FOREACH( csne, op->o_bd->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 ( committed_csne && maxcsn ) *maxcsn = committed_csne->ce_csn;
+	ldap_pvt_thread_mutex_unlock( op->o_bd->be_pcl_mutexp );
 }
 
 void
 slap_rewind_commit_csn( Operation *op )
 {
-	struct slap_csn_entry *csne = NULL;
+	struct slap_csn_entry *csne;
 
-	ldap_pvt_thread_mutex_lock( &op->o_bd->be_pcl_mutex );
+	ldap_pvt_thread_mutex_lock( op->o_bd->be_pcl_mutexp );
 
-	LDAP_TAILQ_FOREACH( csne, &op->o_bd->be_pending_csn_list, csn_link ) {
-		if ( csne->opid == op->o_opid && csne->connid == op->o_connid )
+	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 ) {
+			csne->ce_state = SLAP_CSN_PENDING;
 			break;
+		}
 	}
 
-	if ( csne ) {
-		csne->state = SLAP_CSN_PENDING;
-	}
-	
-	ldap_pvt_thread_mutex_unlock( &op->o_bd->be_pcl_mutex );
+	ldap_pvt_thread_mutex_unlock( op->o_bd->be_pcl_mutexp );
 }
 
 void
 slap_graduate_commit_csn( Operation *op )
 {
-	struct slap_csn_entry *csne = NULL;
+	struct slap_csn_entry *csne;
 
-	if ( op == NULL )
-		return;
+	if ( op == NULL ) return;
+	if ( op->o_bd == NULL ) return;
 
-	if ( op->o_bd == NULL )
-		return;
-
-	ldap_pvt_thread_mutex_lock( &op->o_bd->be_pcl_mutex );
-
-	LDAP_TAILQ_FOREACH( csne, &op->o_bd->be_pending_csn_list, csn_link ) {
-		if ( csne->opid == op->o_opid && csne->connid == op->o_connid )
+#if 0
+	/* it is NULL when we get here from the frontendDB;
+	 * alternate fix: initialize frontendDB like all other backends */
+	assert( op->o_bd->be_pcl_mutexp != NULL );
+#endif
+	
+	if ( op->o_bd->be_pcl_mutexp == NULL ) return;
+
+	ldap_pvt_thread_mutex_lock( op->o_bd->be_pcl_mutexp );
+
+	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 ) {
+			LDAP_TAILQ_REMOVE( op->o_bd->be_pending_csn_list,
+				csne, ce_csn_link );
+			if ( op->o_csn.bv_val == csne->ce_csn.bv_val ) {
+				BER_BVZERO( &op->o_csn );
+			}
+			ch_free( csne->ce_csn.bv_val );
+			ch_free( csne );
 			break;
+		}
 	}
 
-	if ( csne ) {
-		LDAP_TAILQ_REMOVE( &op->o_bd->be_pending_csn_list, csne, csn_link );
-		ch_free( csne->csn->bv_val );
-		ch_free( csne->csn );
-		ch_free( csne );
-	}
-
-	ldap_pvt_thread_mutex_unlock( &op->o_bd->be_pcl_mutex );
+	ldap_pvt_thread_mutex_unlock( op->o_bd->be_pcl_mutexp );
 
 	return;
 }
@@ -117,85 +118,81 @@ static struct berval ocbva[] = {
 	BER_BVC("top"),
 	BER_BVC("subentry"),
 	BER_BVC("syncProviderSubentry"),
-	{0,NULL}
+	BER_BVNULL
 };
 
 Entry *
 slap_create_context_csn_entry(
 	Backend *be,
-	struct berval *context_csn
-)
+	struct berval *context_csn )
 {
 	Entry* e;
-	int rc;
 
 	struct berval bv;
 
-	e = ( Entry * ) ch_calloc( 1, sizeof( Entry ));
+	e = (Entry *) ch_calloc( 1, sizeof( Entry ));
 
-	attr_merge( e, slap_schema.si_ad_objectClass, ocbva, NULL );
-
-	attr_merge_one( e, slap_schema.si_ad_structuralObjectClass, &ocbva[1], NULL );
-
-	attr_merge_one( e, slap_schema.si_ad_cn, (struct berval *)&slap_ldapsync_bv, NULL );
+	attr_merge( e, slap_schema.si_ad_objectClass,
+		ocbva, NULL );
+	attr_merge_one( e, slap_schema.si_ad_structuralObjectClass,
+		&ocbva[1], NULL );
+	attr_merge_one( e, slap_schema.si_ad_cn,
+		(struct berval *)&slap_ldapsync_bv, NULL );
 
 	if ( context_csn ) {
 		attr_merge_one( e, slap_schema.si_ad_contextCSN,
 			context_csn, NULL );
 	}
 
-	bv.bv_val = "{}";
-	bv.bv_len = sizeof("{}")-1;
+	BER_BVSTR( &bv, "{}" );
 	attr_merge_one( e, slap_schema.si_ad_subtreeSpecification, &bv, NULL );
 
-	build_new_dn( &e->e_name, &be->be_nsuffix[0], (struct berval *)&slap_ldapsync_cn_bv, NULL );
+	build_new_dn( &e->e_name, &be->be_nsuffix[0],
+		(struct berval *)&slap_ldapsync_cn_bv, NULL );
 	ber_dupbv( &e->e_nname, &e->e_name );
 
 	return e;
 }
 
-static int
-slap_contextcsn_callback(
-	Operation* op,
-	SlapReply* rs
-)
+void
+slap_queue_csn(
+	Operation *op,
+	struct berval *csn )
 {
-	if ( rs->sr_type != REP_SEARCH ) {
-		*((int*)op->o_callback->sc_private) = 0;
-	} else {
-		*((int*)op->o_callback->sc_private) = 1;
-	}
-	return LDAP_SUCCESS;
+	struct slap_csn_entry *pending;
+
+	pending = (struct slap_csn_entry *) ch_calloc( 1,
+			sizeof( struct slap_csn_entry ));
+	ldap_pvt_thread_mutex_lock( op->o_bd->be_pcl_mutexp );
+
+	ber_dupbv( &pending->ce_csn, csn );
+	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;
+	LDAP_TAILQ_INSERT_TAIL( op->o_bd->be_pending_csn_list,
+		pending, ce_csn_link );
+	ldap_pvt_thread_mutex_unlock( op->o_bd->be_pcl_mutexp );
 }
 
 int
 slap_get_csn(
 	Operation *op,
-	char *csnbuf,
-	int	len,
 	struct berval *csn,
-	int manage_ctxcsn
-)
+	int manage_ctxcsn )
 {
-	struct	slap_csn_entry *pending;
-
-	if ( csn == NULL )
-		return LDAP_OTHER;
-
-	csn->bv_len = lutil_csnstr( csnbuf, len, 0, 0 );
-	csn->bv_val = csnbuf;
-
-	if ( manage_ctxcsn ) {
-		pending = (struct slap_csn_entry *) ch_calloc( 1, sizeof( struct slap_csn_entry ));
-		ldap_pvt_thread_mutex_lock( &op->o_bd->be_pcl_mutex );
-		ber_dupbv( &op->o_sync_csn, csn );
-		pending->csn = ber_dupbv( NULL, csn );
-		pending->connid = op->o_connid;
-		pending->opid = op->o_opid;
-		pending->state = SLAP_CSN_PENDING;
-		LDAP_TAILQ_INSERT_TAIL( &op->o_bd->be_pending_csn_list, pending, csn_link );
-		ldap_pvt_thread_mutex_unlock( &op->o_bd->be_pcl_mutex );
-	}
+	if ( csn == NULL ) return LDAP_OTHER;
+
+#ifndef HAVE_GMTIME_R
+	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
+	ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
+#endif
+
+	if ( manage_ctxcsn )
+		slap_queue_csn( op, csn );
 
 	return LDAP_SUCCESS;
 }