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 a3b935faa578f384b348171f9122abe6aa06c260..9ba0a6c8be9798de800a0568226d2ee14c0130fe 100644 (file)
--- a/servers/slurpd/main.c
+++ b/servers/slurpd/main.c
@@ -15,35 +15,31 @@
  * main.c - main routine for slurpd.
  */
 
+#include "portable.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( 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
@@ -93,22 +89,11 @@ main(
      * and if not in one-shot mode.
      */
 #ifdef LDAP_DEBUG
-    if (( ldap_debug == 0 )  && !sglob->one_shot_mode ) {
+    if (( ldap_debug == 0 )  && !sglob->one_shot_mode )
 #else /* LDAP_DEBUG */
-    if ( !sglob->one_shot_mode ) {
+    if ( !sglob->one_shot_mode )
 #endif /* LDAP_DEBUG */
-       detach();
-    }
-
-#ifdef _THREAD
-
-#if defined( THREAD_SUNOS4_LWP )
-    /*
-     * Need to start a scheduler thread under SunOS 4
-     */
-    start_lwp_scheduler();
-#endif /* THREAD_SUNOS4_LWP */
-
+       lutil_detach( 0, 0 );
 
     /*
      * Start threads - one thread for each replica
@@ -120,36 +105,31 @@ main(
     /*
      * Start the main file manager thread (in fm.c).
      */
-    pthread_attr_init( &attr );
-    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 );
 
     }
-    pthread_attr_destroy( &attr );
 
     /*
      * Wait for the fm thread to finish.
      */
-    pthread_join( sglob->fm_tid, (void *) &status );
+    ldap_pvt_thread_join( sglob->fm_tid, (void *) NULL );
+
     /*
      * Wait for the replica threads to finish.
      */
     for ( i = 0; sglob->replicas[ i ] != NULL; i++ ) {
-       pthread_join( sglob->replicas[ i ]->ri_tid, (void *) &status );
+       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 */
-    
+    Debug( LDAP_DEBUG_ANY, "slurpd: terminated.\n", 0, 0, 0 );
+       return 0;
+#endif /* !NO_THREADS */
 }