]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/ctxcsn.c
ITS#6101, reset rs->sr_rspdata in send_ldap_disconnect()
[openldap] / servers / slapd / ctxcsn.c
index 340f21db4b0e975fef2f2cdc9648e6f27eb7c8f8..cb828999ccfea8d971949cf05858ae5358cfcf7f 100644 (file)
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2003-2004 The OpenLDAP Foundation.
+ * Copyright 2003-2009 The OpenLDAP Foundation.
  * Portions Copyright 2003 IBM Corporation.
  * All rights reserved.
  *
 #include "slap.h"
 #include "lutil_ldap.h"
 
-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_LUTIL_CSNSTR_BUFSIZE] */
 void
-slap_get_commit_csn( Operation *op, struct berval *csn )
+slap_get_commit_csn(
+       Operation *op,
+       struct berval *maxcsn,
+       int *foundit
+)
 {
        struct slap_csn_entry *csne, *committed_csne = NULL;
-       int i = 0;
+       BackendDB *be = op->o_bd->bd_self;
+       int sid = -1;
+
+       if ( maxcsn ) {
+               assert( maxcsn->bv_val != NULL );
+               assert( maxcsn->bv_len >= LDAP_LUTIL_CSNSTR_BUFSIZE );
+       }
+       if ( foundit ) {
+               *foundit = 0;
+       }
 
-       csn->bv_val = NULL;
-       csn->bv_len = 0;
+       ldap_pvt_thread_mutex_lock( &be->be_pcl_mutex );
 
-       ldap_pvt_thread_mutex_lock( op->o_bd->be_pcl_mutexp );
+       if ( !BER_BVISEMPTY( &op->o_csn )) {
+               sid = slap_parse_csn_sid( &op->o_csn );
+       }
 
-       LDAP_TAILQ_FOREACH( csne, op->o_bd->be_pending_csn_list, ce_csn_link ) {
+       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, 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;
+       LDAP_TAILQ_FOREACH( csne, be->be_pending_csn_list, ce_csn_link ) {
+               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 ) ber_dupbv_x( csn, committed_csne->ce_csn, op->o_tmpmemctx );
-       ldap_pvt_thread_mutex_unlock( op->o_bd->be_pcl_mutexp );
+       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 );
 }
 
 void
 slap_rewind_commit_csn( Operation *op )
 {
        struct slap_csn_entry *csne;
+       BackendDB *be = op->o_bd->bd_self;
 
-       ldap_pvt_thread_mutex_lock( op->o_bd->be_pcl_mutexp );
+       ldap_pvt_thread_mutex_lock( &be->be_pcl_mutex );
 
-       LDAP_TAILQ_FOREACH( csne, op->o_bd->be_pending_csn_list, ce_csn_link ) {
+       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_PENDING;
                        break;
                }
        }
 
-       ldap_pvt_thread_mutex_unlock( op->o_bd->be_pcl_mutexp );
+       ldap_pvt_thread_mutex_unlock( &be->be_pcl_mutex );
 }
 
 void
 slap_graduate_commit_csn( Operation *op )
 {
        struct slap_csn_entry *csne;
+       BackendDB *be;
 
        if ( op == NULL ) return;
        if ( op->o_bd == NULL ) return;
+       be = op->o_bd->bd_self;
 
-       ldap_pvt_thread_mutex_lock( op->o_bd->be_pcl_mutexp );
+       ldap_pvt_thread_mutex_lock( &be->be_pcl_mutex );
 
-       LDAP_TAILQ_FOREACH( csne, op->o_bd->be_pending_csn_list, ce_csn_link ) {
+       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 ) {
-                       LDAP_TAILQ_REMOVE( op->o_bd->be_pending_csn_list,
+                       LDAP_TAILQ_REMOVE( be->be_pending_csn_list,
                                csne, ce_csn_link );
-                       ch_free( csne->ce_csn->bv_val );
-                       ch_free( csne->ce_csn );
+                       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 );
+                       }
+                       ch_free( csne->ce_csn.bv_val );
                        ch_free( csne );
                        break;
                }
        }
 
-       ldap_pvt_thread_mutex_unlock( op->o_bd->be_pcl_mutexp );
+       ldap_pvt_thread_mutex_unlock( &be->be_pcl_mutex );
 
        return;
 }
 
-static struct berval ocbva[] = {
-       BER_BVC("top"),
-       BER_BVC("subentry"),
-       BER_BVC("syncProviderSubentry"),
-       BER_BVNULL
-};
-
-Entry *
-slap_create_context_csn_entry(
-       Backend *be,
-       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 );
-       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 );
-       }
-
-       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 );
-       ber_dupbv( &e->e_nname, &e->e_name );
-
-       return e;
-}
-
 void
 slap_queue_csn(
        Operation *op,
        struct berval *csn )
 {
        struct slap_csn_entry *pending;
+       BackendDB *be = op->o_bd->bd_self;
 
        pending = (struct slap_csn_entry *) ch_calloc( 1,
                        sizeof( struct slap_csn_entry ));
-       ldap_pvt_thread_mutex_lock( op->o_bd->be_pcl_mutexp );
 
-       pending->ce_csn = ber_dupbv( NULL, 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_TAILQ_INSERT_TAIL( op->o_bd->be_pending_csn_list,
+       LDAP_TAILQ_INSERT_TAIL( be->be_pending_csn_list,
                pending, ce_csn_link );
-       ldap_pvt_thread_mutex_unlock( op->o_bd->be_pcl_mutexp );
+       ldap_pvt_thread_mutex_unlock( &be->be_pcl_mutex );
 }
 
 int
 slap_get_csn(
        Operation *op,
-       char *csnbuf,
-       int     len,
        struct berval *csn,
        int manage_ctxcsn )
 {
        if ( csn == NULL ) return LDAP_OTHER;
 
-       csn->bv_len = lutil_csnstr( csnbuf, len, 0, 0 );
-       csn->bv_val = csnbuf;
-
+       /* 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 );
        if ( manage_ctxcsn )
                slap_queue_csn( op, csn );
 
+       ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
+
        return LDAP_SUCCESS;
 }