Backend lock wasn't being released properly.

[openldap] / servers / slurpd / main.c

diff --git a/servers/slurpd/main.c b/servers/slurpd/main.c
index 85383dd9fc37f04f8211b56c84fa655beb27eb7d..9ba0a6c8be9798de800a0568226d2ee14c0130fe 100644 (file)
--- a/servers/slurpd/main.c
+++ b/servers/slurpd/main.c
@@ -21,33 +21,26 @@
 
 #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.
@@ -100,17 +93,7 @@ main(
 #else /* LDAP_DEBUG */
     if ( !sglob->one_shot_mode )
 #endif /* LDAP_DEBUG */
-       {
-               detach();
-    }
-
-#if defined( HAVE_LWP )
-    /*
-     * Need to start a scheduler thread under SunOS 4
-     */
-    start_lwp_scheduler();
-#endif /* HAVE_LWP */
-
+       lutil_detach( 0, 0 );
 
     /*
      * Start threads - one thread for each replica
@@ -122,55 +105,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, (void *) 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
-     */
-    if ( pthread_create( &(sglob->fm_tid), attr, (void *) 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 );
 
     }
-#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 */
 }