X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslurpd%2Fmain.c;h=5a5a61fdb1d6fd146d4fd670a386de7db066792d;hb=84583b6494bb063a6d8d06150449c09a5f14b25f;hp=d780ed30384bcae27182f50233b579f8933417d5;hpb=af77c232f57dc70c472e10828ae121c4cda50e39;p=openldap

diff --git a/servers/slurpd/main.c b/servers/slurpd/main.c
index d780ed3038..5a5a61fdb1 100644
--- a/servers/slurpd/main.c
+++ b/servers/slurpd/main.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
@@ -17,51 +18,46 @@
 
 #include "portable.h"
 
+#include <ac/stdlib.h>
+
 #include <stdio.h>
 
 #include "slurp.h"
 #include "globals.h"
+#include "lutil.h"
 
 
-extern int		doargs( int, char **, Globals * );
-extern void		fm();
-extern int		start_replica_thread( Ri * );
-extern Globals		*init_globals();
-extern int		sanity();
-
-#if defined( HAVE_LWP )
-extern void		start_lwp_scheduler();
-#endif /* HAVE_LWP */
-
+int
 main(
     int		argc,
     char	**argv
 )
 {
-    pthread_attr_t	attr;
-    int			status;
-    int			i;
-
 #ifdef NO_THREADS
     /* Haven't yet written the non-threaded version */
-    fprintf( stderr, "slurpd currently requires threads support\n" );
-    exit( 1 );
+    fputs( "slurpd currently requires threads support\n", stderr );
+    return( 1 );
 #else
 
+    int			i;
+
+    /* initialize thread package */
+    ldap_pvt_thread_initialize();
+
     /* 
      * Create and initialize globals.  init_globals() also initializes
      * the main replication queue.
      */
     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 );
     }
 
     /*
@@ -71,6 +67,14 @@ main(
 	fprintf( stderr,
 		"Errors encountered while processing config file \"%s\"\n",
 		sglob->slapd_configfile );
+	exit( EXIT_FAILURE );
+    }
+
+    /* 
+     * Make sure our directory exists
+     */
+    if ( mkdir(sglob->slurpd_rdir, 0755) == -1 && errno != EEXIST) {
+	perror(sglob->slurpd_rdir);
 	exit( 1 );
     }
 
@@ -80,7 +84,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 );
     }
 
     /*
@@ -88,29 +92,34 @@ 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 */
+    if ( ! (sglob->no_detach || sglob->one_shot_mode) )
+	lutil_detach( 0, 0 );
+
+    /*
+     * Start the main file manager thread (in fm.c).
+     */
+    if ( ldap_pvt_thread_create( &(sglob->fm_tid),
+		0, fm, (void *) NULL ) != 0 )
 	{
-		detach();
+	Debug( LDAP_DEBUG_ANY, "file manager ldap_pvt_thread_create failed\n",
+		0, 0, 0 );
+	exit( EXIT_FAILURE );
+
     }
 
-#if defined( HAVE_LWP )
     /*
-     * Need to start a scheduler thread under SunOS 4
+     * wait for fm to finish if in oneshot mode
      */
-    start_lwp_scheduler();
-#endif /* HAVE_LWP */
-
+    if ( sglob->one_shot_mode ) {
+	ldap_pvt_thread_join( sglob->fm_tid, (void *) NULL );
+    }
 
     /*
      * Start threads - one thread for each replica
@@ -120,57 +129,23 @@ main(
     }
 
     /*
-     * Start the main file manager thread (in fm.c).
-     */
-    pthread_attr_init( &attr );
-
-#if !defined(HAVE_PTHREADS_D4) && !defined(HAVE_DCE)
-    /* POSIX_THREADS or compatible
-     * This is a draft 10 or standard pthreads implementation
-     */
-    if ( pthread_create( &(sglob->fm_tid), &attr, fm, (void *) NULL )
-	    != 0 ) {
-	Debug( LDAP_DEBUG_ANY, "file manager pthread_create failed\n",
-		0, 0, 0 );
-	exit( 1 );
-
-    }
-#else /* !PTHREADS_FINAL */
-    /*
-     * This is a draft 4 or earlier pthreads implementation
+     * Wait for the fm thread to finish.
      */
-    if ( pthread_create( &(sglob->fm_tid), attr, 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 );
     }
-#endif /* !PTHREADS_FINAL */
-
-    pthread_attr_destroy( &attr );
 
-    /*
-     * Wait for the fm thread to finish.
-     */
-#ifdef HAVE_PTHREADS_FINAL
-    pthread_join( sglob->fm_tid, (void *) NULL );
-#else
-    pthread_join( sglob->fm_tid, (void *) &status );
-#endif
     /*
      * Wait for the replica threads to finish.
      */
     for ( i = 0; sglob->replicas[ i ] != NULL; i++ ) {
-#ifdef HAVE_PTHREADS_FINAL
-	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 );
 
+    /* destroy the thread package */
+    ldap_pvt_thread_destroy();
+
+    Debug( LDAP_DEBUG_ANY, "slurpd: terminated.\n", 0, 0, 0 );
+	return 0;
 #endif /* !NO_THREADS */
 }