ITS#5322 don't try to free a NULL locker

[openldap] / servers / slapd / ctxcsn.c

diff --git a/servers/slapd/ctxcsn.c b/servers/slapd/ctxcsn.c
index 4672273293f078b2e0e6f3955e857642aa12bc13..493e972ec86a3736c3a640253041219bc2eba9be 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-2004 The OpenLDAP Foundation.
+ * Copyright 2003-2008 The OpenLDAP Foundation.
  * Portions Copyright 2003 IBM Corporation.
  * All rights reserved.
  *
@@ -22,24 +22,27 @@
 #include <ac/string.h>
 #include <ac/socket.h>
 
-#include "ldap_pvt.h"
 #include "lutil.h"
 #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;
 
 void
-slap_get_commit_csn( Operation *op, struct berval *csn )
+slap_get_commit_csn(
+       Operation *op,
+       struct berval *maxcsn
+)
 {
        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_mutex );
+       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 ) {
@@ -53,8 +56,8 @@ slap_get_commit_csn( Operation *op, struct berval *csn )
                if ( csne->ce_state == SLAP_CSN_PENDING ) break;
        }
 
-       if ( committed_csne ) ber_dupbv( csn, committed_csne->ce_csn );
-       ldap_pvt_thread_mutex_unlock( &op->o_bd->be_pcl_mutex );
+       if ( committed_csne && maxcsn ) *maxcsn = committed_csne->ce_csn;
+       ldap_pvt_thread_mutex_unlock( op->o_bd->be_pcl_mutexp );
 }
 
 void
@@ -62,7 +65,7 @@ slap_rewind_commit_csn( Operation *op )
 {
        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, ce_csn_link ) {
                if ( csne->ce_opid == op->o_opid && csne->ce_connid == op->o_connid ) {
@@ -71,7 +74,7 @@ slap_rewind_commit_csn( Operation *op )
                }
        }
 
-       ldap_pvt_thread_mutex_unlock( &op->o_bd->be_pcl_mutex );
+       ldap_pvt_thread_mutex_unlock( op->o_bd->be_pcl_mutexp );
 }
 
 void
@@ -82,20 +85,30 @@ slap_graduate_commit_csn( Operation *op )
        if ( op == NULL ) return;
        if ( op->o_bd == NULL ) return;
 
-       ldap_pvt_thread_mutex_lock( &op->o_bd->be_pcl_mutex );
+#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 );
-                       ch_free( csne->ce_csn->bv_val );
-                       ch_free( csne->ce_csn );
+                       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_mutex );
+       ldap_pvt_thread_mutex_unlock( op->o_bd->be_pcl_mutexp );
 
        return;
 }
@@ -104,7 +117,7 @@ static struct berval ocbva[] = {
        BER_BVC("top"),
        BER_BVC("subentry"),
        BER_BVC("syncProviderSubentry"),
-       {0,NULL}
+       BER_BVNULL
 };
 
 Entry *
@@ -113,11 +126,10 @@ slap_create_context_csn_entry(
        struct berval *context_csn )
 {
        Entry* e;
-       int rc;
 
        struct berval bv;
 
-       e = (Entry *) ch_calloc( 1, sizeof( Entry ));
+       e = entry_alloc();
 
        attr_merge( e, slap_schema.si_ad_objectClass,
                ocbva, NULL );
@@ -131,8 +143,7 @@ slap_create_context_csn_entry(
                        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],
@@ -142,34 +153,42 @@ slap_create_context_csn_entry(
        return e;
 }
 
+void
+slap_queue_csn(
+       Operation *op,
+       struct berval *csn )
+{
+       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 )
 {
-       struct slap_csn_entry *pending;
-
        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 );
+       ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
 
-       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->ce_csn = ber_dupbv( NULL, 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_mutex );
-       }
+       if ( manage_ctxcsn )
+               slap_queue_csn( op, csn );
 
        return LDAP_SUCCESS;
 }