Change 'attribute' directive to 'attributetype'

[openldap] / servers / slurpd / main.c

diff --git a/servers/slurpd/main.c b/servers/slurpd/main.c
index 632372f2e2ea94c4d415919c10a0dec2879c0f5d..2aa86e75c9bb3789fd0c5d5a7198c741bfd46399 100644 (file)
--- 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,6 +18,8 @@
 
 #include "portable.h"
 
+#include <ac/stdlib.h>
+
 #include <stdio.h>
 
 #include "slurp.h"
@@ -24,16 +27,6 @@
 #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,
@@ -46,24 +39,25 @@ main(
     return( 1 );
 #else
 
-    pthread_attr_t     attr;
-    int                        status;
     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 );
     }
 
     /*
@@ -73,7 +67,7 @@ main(
        fprintf( stderr,
                "Errors encountered while processing config file \"%s\"\n",
                sglob->slapd_configfile );
-       exit( 1 );
+       exit( EXIT_FAILURE );
     }
 
     /*
@@ -82,7 +76,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 );
     }
 
     /*
@@ -90,28 +84,16 @@ 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 );
 
-#if defined( HAVE_LWP )
-    /*
-     * Need to start a scheduler thread under SunOS 4
-     */
-    start_lwp_scheduler();
-#endif /* HAVE_LWP */
-
-
     /*
      * Start threads - one thread for each replica
      */
@@ -122,55 +104,31 @@ 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",
+    if ( ldap_pvt_thread_create( &(sglob->fm_tid),
+               0, fm, (void *) NULL ) != 0 )
+       {
+       Debug( LDAP_DEBUG_ANY, "file manager ldap_pvt_thread_create failed\n",
                0, 0, 0 );
-       exit( 1 );
+       exit( EXIT_FAILURE );
 
     }
-#else /* !PTHREADS_FINAL */
-    /*
-     * This is a draft 4 or earlier 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 );
-
-    }
-#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
+    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 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 */
 }