initialize AttributeAssertion before using

[openldap] / servers / slapd / slapadd.c

diff --git a/servers/slapd/slapadd.c b/servers/slapd/slapadd.c
index f634683a4600692d75ef016dc7d9dee2351d247d..09734c6a2d22000af907ce35efd47e8008440b3e 100644 (file)
--- a/servers/slapd/slapadd.c
+++ b/servers/slapd/slapadd.c
@@ -42,15 +42,16 @@ static char csnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE ];
 static char maxcsnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE ];
 static const char *progname = "slapadd";
 
-static ldap_pvt_thread_cond_t put_cond;
-static ldap_pvt_thread_mutex_t put_mutex;
+static ldap_pvt_thread_cond_t put_cond1;
+static ldap_pvt_thread_cond_t put_cond2;
+static ldap_pvt_thread_mutex_t put_mutex1;
+static ldap_pvt_thread_mutex_t put_mutex2;
 static Entry *put_e;
 static struct berval bvtext;
 static int put_lineno;
 static int put_rc;
 
 static int use_thread = 0;     /*FIXME need a new switch for this */
-static int put_wait;
 
 static void *do_put(void *ptr)
 {
@@ -58,10 +59,15 @@ static void *do_put(void *ptr)
        Entry *e;
        int lineno;
 
-
+       ldap_pvt_thread_mutex_lock( &put_mutex1 );
        do {
-               ldap_pvt_thread_cond_wait( &put_cond, &put_mutex );
-               if ( put_rc ) break;
+               ldap_pvt_thread_cond_wait( &put_cond1, &put_mutex1 );
+               if ( put_rc ) {
+                       break;
+               }
+               ldap_pvt_thread_mutex_lock( &put_mutex2 );
+               ldap_pvt_thread_cond_signal( &put_cond2 );
+               ldap_pvt_thread_mutex_unlock( &put_mutex2 );
 
                e = put_e;
                lineno = put_lineno;
@@ -90,9 +96,10 @@ static void *do_put(void *ptr)
                }
 
                entry_free( e );
-               ldap_pvt_thread_cond_signal( &put_cond );
 
        } while (1);
+       ldap_pvt_thread_mutex_unlock( &put_mutex1 );
+       return NULL;
 }
 
 int
@@ -114,7 +121,7 @@ slapadd( int argc, char **argv )
        Entry *ctxcsn_e;
        ID      ctxcsn_id, id;
        int ret;
-       int i;
+       int i, checkvals;
        struct berval mc;
        ldap_pvt_thread_t put_tid;
 
@@ -134,16 +141,21 @@ slapadd( int argc, char **argv )
                }
        }
 
+       checkvals = (slapMode & SLAP_TOOL_QUICK) ? 0 : 1;
+
        if ( use_thread ) {
                ldap_pvt_thread_initialize();
-               ldap_pvt_thread_cond_init( &put_cond );
-               ldap_pvt_thread_mutex_init( &put_mutex );
+               ldap_pvt_thread_cond_init( &put_cond1 );
+               ldap_pvt_thread_cond_init( &put_cond2 );
+               ldap_pvt_thread_mutex_init( &put_mutex1 );
+               ldap_pvt_thread_mutex_init( &put_mutex2 );
                rc = ldap_pvt_thread_create( &put_tid, 0, do_put, NULL );
                if ( rc ) {
                        fprintf( stderr, "%s: could not create thread.\n",
                                progname );
                        exit( EXIT_FAILURE );
                }
+               ldap_pvt_thread_mutex_lock( &put_mutex2 );
        }
 
        lmax = 0;
@@ -161,7 +173,7 @@ slapadd( int argc, char **argv )
        }
 
        while( ldif_read_record( ldiffp, &lineno, &buf, &lmax ) ) {
-               Entry *e = str2entry( buf );
+               Entry *e = str2entry2( buf, checkvals );
 
                /*
                 * Initialize text buffer
@@ -359,17 +371,18 @@ slapadd( int argc, char **argv )
                }
 
                if ( use_thread ) {
-                       if ( put_wait ) {
-                               ldap_pvt_thread_cond_wait( &put_cond, &put_mutex );
-                               if (put_rc) {
-                                       rc = put_rc;
-                                       break;
-                               }
+                       ldap_pvt_thread_mutex_lock( &put_mutex1 );
+                       if (put_rc) {
+                               rc = put_rc;
+                               ldap_pvt_thread_mutex_unlock( &put_mutex1 );
+                               break;
                        }
                        put_e = e;
                        put_lineno = lineno;
-                       put_wait = 1;
-                       ldap_pvt_thread_cond_signal( &put_cond );
+                       ldap_pvt_thread_cond_signal( &put_cond1 );
+                       ldap_pvt_thread_mutex_unlock( &put_mutex1 );
+                       /* Make sure writer wakes up */
+                       ldap_pvt_thread_cond_wait( &put_cond2, &put_mutex2 );
                        continue;
                }
 
@@ -400,16 +413,26 @@ slapadd( int argc, char **argv )
        }
 
        if ( use_thread ) {
-               put_rc = EXIT_FAILURE;
-               ldap_pvt_thread_cond_signal( &put_cond );
+               ldap_pvt_thread_mutex_unlock( &put_mutex2 );
+               ldap_pvt_thread_mutex_lock( &put_mutex1 );
+               /* Tell child thread to stop if it hasn't aborted */
+               if ( !put_rc ) {
+                       put_rc = EXIT_FAILURE;
+                       ldap_pvt_thread_cond_signal( &put_cond1 );
+               }
+               ldap_pvt_thread_mutex_unlock( &put_mutex1 );
                ldap_pvt_thread_join( put_tid, NULL );
+               ldap_pvt_thread_mutex_destroy( &put_mutex2 );
+               ldap_pvt_thread_mutex_destroy( &put_mutex1 );
+               ldap_pvt_thread_cond_destroy( &put_cond2 );
+               ldap_pvt_thread_cond_destroy( &put_cond1 );
        }
 
        bvtext.bv_len = textlen;
        bvtext.bv_val = textbuf;
        bvtext.bv_val[0] = '\0';
 
-       if ( update_ctxcsn && !dryrun && maxcsn.bv_len ) {
+       if ( rc == EXIT_SUCCESS && update_ctxcsn && !dryrun && maxcsn.bv_len ) {
                ctxcsn_id = be->be_dn2id_get( be, be->be_nsuffix );
                if ( ctxcsn_id == NOID ) {
                        fprintf( stderr, "%s: context entry is missing\n", progname );