X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fctxcsn.c;h=6d29007b58ef542dedff258f4a381626f4540633;hb=5631f25839a4a83521993639a96909267ea7bce6;hp=3a6127d916839844582def6bfae3ea24845af734;hpb=72adc38cdfa4e4f42e0d5c8db70fff921c529c6f;p=openldap
diff --git a/servers/slapd/ctxcsn.c b/servers/slapd/ctxcsn.c
index 3a6127d916..6d29007b58 100644
--- a/servers/slapd/ctxcsn.c
+++ b/servers/slapd/ctxcsn.c
@@ -1,23 +1,18 @@
+/* ctxcsn.c -- Context CSN Management Routines */
/* $OpenLDAP$ */
-/*
- * Context CSN Management Routines
- */
-/* Copyright (c) 2003 by International Business Machines, Inc.
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 2003-2005 The OpenLDAP Foundation.
+ * Portions Copyright 2003 IBM Corporation.
+ * All rights reserved.
*
- * International Business Machines, Inc. (hereinafter called IBM) grants
- * permission under its copyrights to use, copy, modify, and distribute this
- * Software with or without fee, provided that the above copyright notice and
- * all paragraphs of this notice appear in all copies, and that the name of IBM
- * not be used in connection with the marketing of any product incorporating
- * the Software or modifications thereof, without specific, written prior
- * permission.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
*
- * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE. IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
- * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
- * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
*/
#include "portable.h"
@@ -26,86 +21,92 @@
#include
#include
-#include
-#include "ldap_pvt.h"
#include "lutil.h"
#include "slap.h"
#include "lutil_ldap.h"
-struct berval *
-slap_get_commit_csn( Operation *op )
-{
- struct berval *max_committed_csn = NULL;
- struct slap_csn_entry *csne = NULL, *committed_csne = NULL;
- int i = 0;
+const struct berval slap_ldapsync_bv = BER_BVC("ldapsync");
+const struct berval slap_ldapsync_cn_bv = BER_BVC("cn=ldapsync");
- ldap_pvt_thread_mutex_lock( &op->o_bd->be_pcl_mutex );
+void
+slap_get_commit_csn(
+ Operation *op,
+ struct berval *maxcsn,
+ struct berval *curcsn
+)
+{
+ 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 ) {
- max_committed_csn = ber_dupbv( NULL, 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;
}
- return max_committed_csn;
+ 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;
- ldap_pvt_thread_mutex_lock( &op->o_bd->be_pcl_mutex );
+ if ( op == NULL ) return;
+ if ( op->o_bd == NULL ) return;
- 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 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 );
- 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_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 );
+ ch_free( csne->ce_csn.bv_val );
+ ch_free( csne );
+ break;
+ }
}
- ldap_pvt_thread_mutex_unlock( &op->o_bd->be_pcl_mutex );
+ ldap_pvt_thread_mutex_unlock( op->o_bd->be_pcl_mutexp );
return;
}
@@ -114,58 +115,60 @@ 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 ));
-
- attr_merge( e, slap_schema.si_ad_objectClass, ocbva, NULL );
-
- bv.bv_val = "subentry";
- bv.bv_len = sizeof("subentry")-1;
+ e = (Entry *) ch_calloc( 1, sizeof( Entry ));
- attr_merge_one( e, slap_schema.si_ad_structuralObjectClass, &bv, NULL );
-
- attr_merge_one( e, slap_schema.si_ad_cn, &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], &slap_ldapsync_cn_bv );
- ber_dupbv( &e->e_name, &e->e_nname );
+ 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 );
+ 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
@@ -174,30 +177,21 @@ slap_get_csn(
char *csnbuf,
int len,
struct berval *csn,
- int manage_ctxcsn
-)
+ int manage_ctxcsn )
{
- struct slap_csn_entry *pending;
-
- if ( manage_ctxcsn ) {
- pending = (struct slap_csn_entry *) ch_calloc( 1, sizeof( struct slap_csn_entry ));
- }
-
- if ( csn == NULL )
- return LDAP_OTHER;
+ if ( csn == NULL ) return LDAP_OTHER;
+#ifndef HAVE_GMTIME_R
+ ldap_pvt_thread_mutex_lock( &gmtime_mutex );
+#endif
csn->bv_len = lutil_csnstr( csnbuf, len, 0, 0 );
+#ifndef HAVE_GMTIME_R
+ ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
+#endif
csn->bv_val = csnbuf;
- if ( manage_ctxcsn ) {
- ldap_pvt_thread_mutex_lock( &op->o_bd->be_pcl_mutex );
- 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 ( manage_ctxcsn )
+ slap_queue_csn( op, csn );
return LDAP_SUCCESS;
}