Let slap_get_commit_csn return the current CSN as well

This commit is contained in:
Howard Chu 2004-12-08 00:46:14 +00:00
parent 33bb06475b
commit 99f2d0b49b
2 changed files with 12 additions and 5 deletions

View File

@ -30,18 +30,24 @@ 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, *committed_csne = NULL;
int i = 0;
csn->bv_val = NULL;
csn->bv_len = 0;
if ( maxcsn ) {
BER_BVZERO( maxcsn );
}
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 ) {
if ( curcsn ) *curcsn = csne->ce_csn;
csne->ce_state = SLAP_CSN_COMMIT;
break;
}
@ -52,7 +58,7 @@ slap_get_commit_csn( Operation *op, struct berval *csn )
if ( csne->ce_state == SLAP_CSN_PENDING ) break;
}
if ( committed_csne ) ber_dupbv_x( csn, &committed_csne->ce_csn, op->o_tmpmemctx );
if ( committed_csne && maxcsn ) *maxcsn = committed_csne->ce_csn;
ldap_pvt_thread_mutex_unlock( op->o_bd->be_pcl_mutexp );
}

View File

@ -482,7 +482,8 @@ LDAP_SLAPD_F (ContentRule *) cr_bvfind LDAP_P((
LDAP_SLAPD_V( const struct berval ) slap_ldapsync_bv;
LDAP_SLAPD_V( const struct berval ) slap_ldapsync_cn_bv;
LDAP_SLAPD_F (void) slap_get_commit_csn LDAP_P(( Operation *, struct berval * ));
LDAP_SLAPD_F (void) slap_get_commit_csn LDAP_P((
Operation *, struct berval *maxcsn, struct berval *curcsn ));
LDAP_SLAPD_F (void) slap_rewind_commit_csn LDAP_P(( Operation * ));
LDAP_SLAPD_F (void) slap_graduate_commit_csn LDAP_P(( Operation * ));
LDAP_SLAPD_F (Entry *) slap_create_context_csn_entry LDAP_P(( Backend *, struct berval *));