Add OpenLDAP RCSid to *.[ch] in clients, libraries, and servers.

[openldap] / servers / slurpd / fm.c

diff --git a/servers/slurpd/fm.c b/servers/slurpd/fm.c
index 04717dd06c94460ca34997f5d027e0e63ef97d49..75c1afed027b74da2036f8bc638b748c3adeab35 100644 (file)
--- a/servers/slurpd/fm.c
+++ b/servers/slurpd/fm.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
@@ -14,37 +15,24 @@
  * fm.c - file management routines.
  */
 
-#define DISABLE_BRIDGE
 #include "portable.h"
 
 #include <stdio.h>
+
+#include <ac/stdlib.h>
 #include <ac/string.h>
-#include <sys/signal.h>
+#include <ac/signal.h>
 
 #include "slurp.h"
 #include "globals.h"
 
 
-/*
- * Externs
- */
-extern void do_admin LDAP_P((void));
-extern int file_nonempty LDAP_P(( char * ));
-extern int acquire_lock LDAP_P((char *, FILE **, FILE ** ));
-extern int relinquish_lock LDAP_P((char *, FILE *, FILE * ));
-
 /*
  * Forward references
  */
 static char *get_record LDAP_P(( FILE * ));
 static void populate_queue LDAP_P(( char *f ));
-static void set_shutdown LDAP_P((void));
-void do_nothing LDAP_P((void));
-
-#ifndef DECL_SYS_ERRLIST
-extern char *sys_errlist[];
-#endif /* DECL_SYS_ERRLIST */
-
+static RETSIGTYPE set_shutdown LDAP_P((int));
 
 
 /*
@@ -55,7 +43,7 @@ extern char *sys_errlist[];
  *  - adds items to the internal queue of replication work to do
  *  - signals the replication threads to let them know new work has arrived.
  */
-void
+void *
 fm(
     void *arg
 )
@@ -64,23 +52,16 @@ fm(
 
     /* Set up our signal handlers:
      * SIG{TERM,INT,HUP} causes a shutdown
-     * SIG(STKFLT|USR1) - does nothing, used to wake up sleeping threads.
-     * SIG(UNUSED|USR2) - causes slurpd to read its administrative interface file.
-     *           (not yet implemented).
+     * LDAP_SIGUSR1 - does nothing, used to wake up sleeping threads.
+        * LDAP_SIGUSR2 - causes a shutdown
      */
-#ifdef SIGSTKFLT
-    (void) SIGNAL( SIGSTKFLT, (void *) do_nothing );
-#else
-    (void) SIGNAL( SIGUSR1, (void *) do_nothing );
-#endif
-#ifdef SIGUNUSED
-    (void) SIGNAL( SIGUNUSED, (void *) do_admin );
-#else
-    (void) SIGNAL( SIGUSR2, (void *) do_admin );
+    (void) SIGNAL( LDAP_SIGUSR1, do_nothing );
+    (void) SIGNAL( LDAP_SIGUSR2, set_shutdown );
+    (void) SIGNAL( SIGTERM, set_shutdown );
+    (void) SIGNAL( SIGINT, set_shutdown );
+#ifdef SIGHUP
+    (void) SIGNAL( SIGHUP, set_shutdown );
 #endif
-    (void) SIGNAL( SIGTERM, (void *) set_shutdown );
-    (void) SIGNAL( SIGINT, (void *) set_shutdown );
-    (void) SIGNAL( SIGHUP, (void *) set_shutdown );
 
     if ( sglob->one_shot_mode ) {
        if ( file_nonempty( sglob->slapd_replogfile )) {
@@ -91,7 +72,7 @@ fm(
                sglob->rq->rq_getcount( sglob->rq, RQ_COUNT_ALL ));
        printf( "%d replication records to process.\n",
                sglob->rq->rq_getcount( sglob->rq, RQ_COUNT_NZRC ));
-       return;
+       return NULL;
     }
     /*
      * There may be some leftover replication records in our own
@@ -120,7 +101,7 @@ fm(
                }
            }
        } else {
-           tsleep( sglob->no_work_interval );
+           ldap_pvt_thread_sleep( sglob->no_work_interval );
        }
 
        /* Garbage-collect queue */
@@ -141,6 +122,7 @@ fm(
        }
     }
     Debug( LDAP_DEBUG_ARGS, "fm: exiting\n", 0, 0, 0 );
+    return NULL;
 }
 
 
@@ -149,26 +131,20 @@ fm(
 /*
  * Set a global flag which signals that we're shutting down.
  */
-static void
-set_shutdown()
+static RETSIGTYPE
+set_shutdown(int sig)
 {
     int        i;
 
     sglob->slurpd_shutdown = 1;                                /* set flag */
-#ifdef SIGSTKFLT
-    pthread_kill( sglob->fm_tid, SIGSTKFLT );  /* wake up file mgr */
-#else
-    pthread_kill( sglob->fm_tid, SIGUSR1 );            /* wake up file mgr */
-#endif
+    ldap_pvt_thread_kill( sglob->fm_tid, LDAP_SIGUSR1 );       /* wake up file mgr */
     sglob->rq->rq_lock( sglob->rq );                   /* lock queue */
-    pthread_cond_broadcast( &(sglob->rq->rq_more) );   /* wake repl threads */
+    ldap_pvt_thread_cond_broadcast( &(sglob->rq->rq_more) );   /* wake repl threads */
     for ( i = 0; i < sglob->num_replicas; i++ ) {
        (sglob->replicas[ i ])->ri_wake( sglob->replicas[ i ]);
     }
     sglob->rq->rq_unlock( sglob->rq );                 /* unlock queue */
-    (void) SIGNAL( SIGTERM, (void *) set_shutdown );   /* reinstall handlers */
-    (void) SIGNAL( SIGINT, (void *) set_shutdown );
-    (void) SIGNAL( SIGHUP, (void *) set_shutdown );
+    (void) SIGNAL( sig, set_shutdown );        /* reinstall handlers */
 }
 
 
@@ -177,14 +153,10 @@ set_shutdown()
 /*
  * A do-nothing signal handler.
  */
-void
-do_nothing()
+RETSIGTYPE
+do_nothing(int sig)
 {
-#ifdef SIGSTKFLT
-    (void) SIGNAL( SIGSTKFLT, (void *) do_nothing );
-#else
-    (void) SIGNAL( SIGUSR1, (void *) do_nothing );
-#endif
+    (void) SIGNAL( sig, do_nothing );
 }
 
 
@@ -200,7 +172,6 @@ populate_queue(
 )
 {
     FILE       *fp, *lfp;
-    Rq         *rq = sglob->rq;
     char       *p;
 
     if ( acquire_lock( f, &fp, &lfp ) < 0 ) {
@@ -218,8 +189,7 @@ populate_queue(
        Debug( LDAP_DEBUG_ANY,
                "error: can't seek to offset %ld in file \"%s\"\n",
                sglob->srpos, f, 0 );
-       return;
-    }
+    } else {
     while (( p = get_record( fp )) != NULL ) {
        if ( sglob->rq->rq_add( sglob->rq, p ) < 0 ) {
            char *t;
@@ -232,9 +202,10 @@ populate_queue(
                    p, 0, 0 );
        }
        free( p );
-       pthread_yield();
+       ldap_pvt_thread_yield();
     }
     sglob->srpos = ftell( fp );
+    }
     (void) relinquish_lock( f, fp, lfp );
 }
     
@@ -259,13 +230,13 @@ get_record(
 
     while (( fgets( line, sizeof(line), fp ) != NULL ) &&
            (( len = strlen( line )) > 1 )) {
-       while ( lcur + len + 1 > lmax ) {
-           lmax += BUFSIZ;
-           buf = (char *) ch_realloc( buf, lmax );
-       }
-       strcpy( buf + lcur, line );
-       lcur += len;
+
+               while ( lcur + len + 1 > lmax ) {
+                   lmax += BUFSIZ;
+                   buf = (char *) ch_realloc( buf, lmax );
+               }
+               strcpy( buf + lcur, line );
+               lcur += len;
     }
     return( buf );
 }
-