initialize AttributeAssertion before using

[openldap] / servers / slapd / slapadd.c

diff --git a/servers/slapd/slapadd.c b/servers/slapd/slapadd.c
index 788100e615605c8b0d9a4f94986762ede874844a..09734c6a2d22000af907ce35efd47e8008440b3e 100644 (file)
--- a/servers/slapd/slapadd.c
+++ b/servers/slapd/slapadd.c
@@ -40,6 +40,67 @@
 
 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_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 void *do_put(void *ptr)
+{
+       ID id;
+       Entry *e;
+       int lineno;
+
+       ldap_pvt_thread_mutex_lock( &put_mutex1 );
+       do {
+               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;
+
+               if ( !dryrun ) {
+                       id = be->be_entry_put( be, e, &bvtext );
+                       if( id == NOID ) {
+                               fprintf( stderr, "%s: could not add entry dn=\"%s\" "
+                                                                "(line=%d): %s\n", progname, e->e_dn,
+                                                                lineno, bvtext.bv_val );
+                               entry_free( e );
+                               if ( continuemode ) continue;
+                               put_rc = EXIT_FAILURE;
+                               break;
+                       }
+               }
+
+               if ( verbose ) {
+                       if ( dryrun ) {
+                               fprintf( stderr, "added: \"%s\"\n",
+                                       e->e_dn );
+                       } else {
+                               fprintf( stderr, "added: \"%s\" (%08lx)\n",
+                                       e->e_dn, (long) id );
+                       }
+               }
+
+               entry_free( e );
+
+       } while (1);
+       ldap_pvt_thread_mutex_unlock( &put_mutex1 );
+       return NULL;
+}
 
 int
 slapadd( int argc, char **argv )
@@ -52,7 +113,6 @@ slapadd( int argc, char **argv )
        const char *text;
        char textbuf[SLAP_TEXT_BUFLEN] = { '\0' };
        size_t textlen = sizeof textbuf;
-       const char *progname = "slapadd";
 
        struct berval csn;
        struct berval maxcsn;
@@ -61,9 +121,10 @@ slapadd( int argc, char **argv )
        Entry *ctxcsn_e;
        ID      ctxcsn_id, id;
        int ret;
-       struct berval bvtext;
-       int i;
+       int i, checkvals;
        struct berval mc;
+       ldap_pvt_thread_t put_tid;
+
        slap_tool_init( progname, SLAPADD, argc, argv );
 
        if( !be->be_entry_open ||
@@ -80,6 +141,23 @@ 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_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;
        lineno = 0;
 
@@ -95,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
@@ -292,6 +370,22 @@ slapadd( int argc, char **argv )
                        }
                }
 
+               if ( use_thread ) {
+                       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;
+                       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;
+               }
+
                if ( !dryrun ) {
                        id = be->be_entry_put( be, e, &bvtext );
                        if( id == NOID ) {
@@ -315,15 +409,30 @@ slapadd( int argc, char **argv )
                        }
                }
 
-done:;
                entry_free( e );
        }
 
+       if ( use_thread ) {
+               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 );