upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-05 22:50:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rework order of things to allow restart in oneshot mode.

Browse source
This commit is contained in:
Randy Kunkee 2000-04-26 09:24:12 +00:00
parent 0d1e76246a
commit 75467fb340
1 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
servers/slurpd/main.c
View file

@ -102,13 +102,6 @@ main(
if ( ! (sglob->no_detach || sglob->one_shot_mode) )
lutil_detach( 0, 0 );
/*
* Start threads - one thread for each replica
*/
for ( i = 0; sglob->replicas[ i ] != NULL; i++ ) {
start_replica_thread( sglob->replicas[ i ]);
}
/*
* Start the main file manager thread (in fm.c).
*/
@ -121,10 +114,26 @@ main(
}
/*
* wait for fm to finish if in oneshot mode
*/
if ( sglob->one_shot_mode ) {
ldap_pvt_thread_join( sglob->fm_tid, (void *) NULL );
}
/*
* Start threads - one thread for each replica
*/
for ( i = 0; sglob->replicas[ i ] != NULL; i++ ) {
start_replica_thread( sglob->replicas[ i ]);
}
/*
* Wait for the fm thread to finish.
*/
ldap_pvt_thread_join( sglob->fm_tid, (void *) NULL );
if ( !sglob->one_shot_mode ) {
ldap_pvt_thread_join( sglob->fm_tid, (void *) NULL );
}
/*
* Wait for the replica threads to finish.
@ -133,8 +142,8 @@ main(
ldap_pvt_thread_join( sglob->replicas[ i ]->ri_tid, (void *) NULL );
}
/* destroy the thread package */
ldap_pvt_thread_destroy();
/* destroy the thread package */
ldap_pvt_thread_destroy();
Debug( LDAP_DEBUG_ANY, "slurpd: terminated.\n", 0, 0, 0 );
return 0;