X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslurpd%2Fmain.c;h=41d7fc3f2f35e2c762bfadfd03c31baa7402ef6c;hb=d19706634ca14afc9cbadd7b7b4dab74b84a6520;hp=d4eeb6335b2aaacdb88809f231fff2c1ae5bc850;hpb=dfeabf52139a18af713f31f54c16da0b679784a3;p=openldap diff --git a/servers/slurpd/main.c b/servers/slurpd/main.c index d4eeb6335b..41d7fc3f2f 100644 --- a/servers/slurpd/main.c +++ b/servers/slurpd/main.c @@ -1,3 +1,8 @@ +/* $OpenLDAP$ */ +/* + * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + */ /* * Copyright (c) 1996 Regents of the University of Michigan. * All rights reserved. @@ -15,35 +20,34 @@ * main.c - main routine for slurpd. */ +#include "portable.h" + #include +#include +#include #include "slurp.h" #include "globals.h" +#include "lutil.h" +#include -extern int doargs( int, char **, Globals * ); -extern void fm(); -extern int start_replica_thread( Ri * ); -extern Globals *init_globals(); -extern int sanity(); -#if defined( THREAD_SUNOS4_LWP ) -extern void start_lwp_scheduler(); -#endif /* THREAD_SUNOS4_LWP */ - +int main( int argc, char **argv ) { - pthread_attr_t attr; - int status; +#ifdef NO_THREADS + /* Haven't yet written the non-threaded version */ + fputs( "slurpd currently requires threads support\n", stderr ); + return( 1 ); +#else + int i; -#ifndef _THREAD - /* Haven't yet written the non-threaded version */ - fprintf( stderr, "slurpd currently requires threads support\n" ); - exit( 1 ); -#endif /* !_THREAD */ + /* initialize thread package */ + ldap_pvt_thread_initialize(); /* * Create and initialize globals. init_globals() also initializes @@ -51,14 +55,14 @@ main( */ if (( sglob = init_globals()) == NULL ) { fprintf( stderr, "Out of memory initializing globals\n" ); - exit( 1 ); + exit( EXIT_FAILURE ); } /* * Process command-line args and fill in globals. */ if ( doargs( argc, argv, sglob ) < 0 ) { - exit( 1 ); + exit( EXIT_FAILURE ); } /* @@ -68,6 +72,21 @@ main( fprintf( stderr, "Errors encountered while processing config file \"%s\"\n", sglob->slapd_configfile ); + exit( EXIT_FAILURE ); + } + +#ifdef HAVE_TLS + if( ldap_pvt_tls_init() || ldap_pvt_tls_init_def_ctx() ) { + fprintf( stderr, "TLS Initialization failed.\n" ); + exit( EXIT_FAILURE); + } +#endif + + /* + * Make sure our directory exists + */ + if ( mkdir(sglob->slurpd_rdir, 0755) == -1 && errno != EEXIST) { + perror(sglob->slurpd_rdir); exit( 1 ); } @@ -77,7 +96,7 @@ main( if ( sglob->st->st_read( sglob->st )) { fprintf( stderr, "Malformed slurpd status file \"%s\"\n", sglob->slurpd_status_file, 0, 0 ); - exit( 1 ); + exit( EXIT_FAILURE ); } /* @@ -85,95 +104,71 @@ main( * Check for any fatal error conditions before we get started */ if ( sanity() < 0 ) { - exit( 1 ); + exit( EXIT_FAILURE ); } /* - * Detach from the controlling terminal, if debug level = 0, - * and if not in one-shot mode. + * Detach from the controlling terminal + * unless the -d flag is given or in one-shot mode. */ -#ifdef LDAP_DEBUG - if (( ldap_debug == 0 ) && !sglob->one_shot_mode ) { -#else /* LDAP_DEBUG */ - if ( !sglob->one_shot_mode ) { -#endif /* LDAP_DEBUG */ - detach(); - } - -#ifdef _THREAD +#ifndef HAVE_WINSOCK + if ( ! (sglob->no_detach || sglob->one_shot_mode) ) + lutil_detach( 0, 0 ); +#endif -#if defined( THREAD_SUNOS4_LWP ) /* - * Need to start a scheduler thread under SunOS 4 + * Start the main file manager thread (in fm.c). */ - start_lwp_scheduler(); -#endif /* THREAD_SUNOS4_LWP */ - + if ( ldap_pvt_thread_create( &(sglob->fm_tid), + 0, fm, (void *) NULL ) != 0 ) + { +#ifdef NEW_LOGGING + LDAP_LOG ( SLURPD, ERR, + "main: file manager ldap_pvt_thread_create failed\n" , 0, 0, 0 ); +#else + Debug( LDAP_DEBUG_ANY, "file manager ldap_pvt_thread_create failed\n", + 0, 0, 0 ); +#endif + exit( EXIT_FAILURE ); - /* - * 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). - */ - pthread_attr_init( &attr ); -#ifndef THREAD_MIT_PTHREADS - /* POSIX_THREADS or compatible - * This is a draft 10 or standard pthreads implementation + * wait for fm to finish if in oneshot mode */ - if ( pthread_create( &(sglob->fm_tid), &attr, (void *) fm, (void *) NULL ) - != 0 ) { - Debug( LDAP_DEBUG_ANY, "file manager pthread_create failed\n", - 0, 0, 0 ); - exit( 1 ); - + if ( sglob->one_shot_mode ) { + ldap_pvt_thread_join( sglob->fm_tid, (void *) NULL ); } -#else /* !THREAD_MIT_PTHREADS */ + /* - * This is a draft 4 or earlier pthreads implementation + * Start threads - one thread for each replica */ - if ( pthread_create( &(sglob->fm_tid), attr, (void *) fm, (void *) NULL ) - != 0 ) { - Debug( LDAP_DEBUG_ANY, "file manager pthread_create failed\n", - 0, 0, 0 ); - exit( 1 ); - + for ( i = 0; sglob->replicas[ i ] != NULL; i++ ) { + start_replica_thread( sglob->replicas[ i ]); } -#endif /* !THREAD_MIT_PTHREADS */ - pthread_attr_destroy( &attr ); /* * Wait for the fm thread to finish. */ -#ifdef POSIX_THREADS - pthread_join( sglob->fm_tid, (void *) NULL ); -#else - pthread_join( sglob->fm_tid, (void *) &status ); -#endif + if ( !sglob->one_shot_mode ) { + ldap_pvt_thread_join( sglob->fm_tid, (void *) NULL ); + } + /* * Wait for the replica threads to finish. */ for ( i = 0; sglob->replicas[ i ] != NULL; i++ ) { -#ifdef POSIX_THREADS - pthread_join( sglob->replicas[ i ]->ri_tid, (void *) NULL ); -#else - pthread_join( sglob->replicas[ i ]->ri_tid, (void *) &status ); -#endif + ldap_pvt_thread_join( sglob->replicas[ i ]->ri_tid, (void *) NULL ); } - Debug( LDAP_DEBUG_ANY, "slurpd: terminating normally\n", 0, 0, 0 ); - sglob->slurpd_shutdown = 1; - pthread_exit( 0 ); -#else /* !_THREAD */ - /* - * Non-threaded case. - */ - exit( 0 ); + /* destroy the thread package */ + ldap_pvt_thread_destroy(); -#endif /* !_THREAD */ - +#ifdef NEW_LOGGING + LDAP_LOG ( SLURPD, RESULTS, "main: slurpd terminated\n", 0, 0, 0 ); +#else + Debug( LDAP_DEBUG_ANY, "slurpd: terminated.\n", 0, 0, 0 ); +#endif + return 0; +#endif /* !NO_THREADS */ }