mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-12 10:54:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Support double-buffering for threaded slapadd

Browse Source
This commit is contained in:
Howard Chu 2012-04-14 07:54:26 -07:00
parent 5bbfd85a83
commit 519e2b34b5
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
servers/slapd/slapadd.c
View File

@ -331,6 +331,7 @@ slapadd( int argc, char **argv )
struct berval bvtext; struct berval bvtext;
ldap_pvt_thread_t thr; ldap_pvt_thread_t thr;
ID id; ID id;
Entry *prev = NULL;
int ldifrc; int ldifrc;
int rc = EXIT_SUCCESS; int rc = EXIT_SUCCESS;
@ -431,8 +432,11 @@ slapadd( int argc, char **argv )
"(line=%d): %s\n", progname, erec.e->e_dn, "(line=%d): %s\n", progname, erec.e->e_dn,
erec.lineno, bvtext.bv_val ); erec.lineno, bvtext.bv_val );
rc = EXIT_FAILURE; rc = EXIT_FAILURE;
entry_free( erec.e ); if( continuemode ) {
if( continuemode ) continue; if ( prev ) entry_free( prev );
prev = erec.e;
continue;
}
break; break;
} }
if ( verbose ) if ( verbose )
@ -444,7 +448,8 @@ slapadd( int argc, char **argv )
erec.e->e_dn ); erec.e->e_dn );
} }
entry_free( erec.e ); if ( prev ) entry_free( prev );
prev = erec.e;
} }
if ( slap_tool_thread_max > 1 ) { if ( slap_tool_thread_max > 1 ) {
@ -455,6 +460,7 @@ slapadd( int argc, char **argv )
ldap_pvt_thread_mutex_unlock( &add_mutex ); ldap_pvt_thread_mutex_unlock( &add_mutex );
ldap_pvt_thread_join( thr, NULL ); ldap_pvt_thread_join( thr, NULL );
} }
if ( erec.e ) entry_free( erec.e );
if ( ldifrc < 0 ) if ( ldifrc < 0 )
rc = EXIT_FAILURE; rc = EXIT_FAILURE;