Rework test suite to use run script.

[openldap] / servers / slurpd / fm.c

diff --git a/servers/slurpd/fm.c b/servers/slurpd/fm.c
index 36fab6540e346a8588ca56e9adb4f3c1fcfeffea..164f407283c9f08948ce08749ed903de91049aa9 100644 (file)
--- a/servers/slurpd/fm.c
+++ b/servers/slurpd/fm.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*
@@ -26,6 +26,8 @@
 #include <ac/stdlib.h>
 #include <ac/string.h>
 #include <ac/signal.h>
+#include <ac/socket.h>
+#include <ac/unistd.h>
 
 #include "slurp.h"
 #include "globals.h"
@@ -36,7 +38,6 @@
  */
 static char *get_record LDAP_P(( FILE * ));
 static void populate_queue LDAP_P(( char *f ));
-static RETSIGTYPE set_shutdown LDAP_P((int));
 
 
 /*
@@ -53,18 +54,19 @@ fm(
 )
 {
     int rc;
+    int i;
+    fd_set readfds;
 
     /* Set up our signal handlers:
      * SIG{TERM,INT,HUP} causes a shutdown
-     * LDAP_SIGUSR1 - does nothing, used to wake up sleeping threads.
-        * LDAP_SIGUSR2 - causes a shutdown
      */
-    (void) SIGNAL( LDAP_SIGUSR1, do_nothing );
-    (void) SIGNAL( LDAP_SIGUSR2, set_shutdown );
-    (void) SIGNAL( SIGTERM, set_shutdown );
-    (void) SIGNAL( SIGINT, set_shutdown );
+    (void) SIGNAL( SIGTERM, slurp_set_shutdown );
+    (void) SIGNAL( SIGINT, slurp_set_shutdown );
 #ifdef SIGHUP
-    (void) SIGNAL( SIGHUP, set_shutdown );
+    (void) SIGNAL( SIGHUP, slurp_set_shutdown );
+#endif
+#if defined(SIGBREAK) && defined(HAVE_NT_SERVICE_MANAGER)
+    (void) SIGNAL( SIGBREAK, do_nothing );
 #endif
 
     if ( sglob->one_shot_mode ) {
@@ -87,13 +89,14 @@ fm(
        populate_queue( sglob->slurpd_replogfile );
     }
 
+    FD_ZERO( &readfds );
 
     while ( !sglob->slurpd_shutdown ) {
        if ( file_nonempty( sglob->slapd_replogfile )) {
            /* New work found - copy to slurpd replog file */
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "fm", LDAP_LEVEL_ARGS, 
-                       "fm: new work in %s\n", sglob->slapd_replogfile ));
+       LDAP_LOG ( SLURPD, ARGS, 
+                       "fm: new work in %s\n", sglob->slapd_replogfile, 0, 0 );
 #else
            Debug( LDAP_DEBUG_ARGS, "new work in %s\n",
                    sglob->slapd_replogfile, 0, 0 );
@@ -104,8 +107,8 @@ fm(
            } else {
                if ( rc < 0 ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "fm", LDAP_LEVEL_CRIT, 
-                       "fm: Fatal error while copying replication log\n" ));
+               LDAP_LOG ( SLURPD, CRIT, 
+                               "fm: Fatal error while copying replication log\n" , 0, 0, 0);
 #else
                    Debug( LDAP_DEBUG_ANY,
                            "Fatal error while copying replication log\n",
@@ -115,7 +118,13 @@ fm(
                }
            }
        } else {
-           ldap_pvt_thread_sleep( sglob->no_work_interval );
+           struct timeval tv;
+
+           FD_SET( sglob->wake_sds[0], &readfds );
+           tv.tv_sec = sglob->no_work_interval;
+           tv.tv_usec = 0;
+
+           rc = select( sglob->wake_sds[0]+1, &readfds, NULL, NULL, &tv );
        }
 
        /* Garbage-collect queue */
@@ -127,9 +136,9 @@ fm(
            if (( rc = acquire_lock( sglob->slurpd_replogfile, &fp,
                    &lfp )) < 0 ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "fm", LDAP_LEVEL_ERR, 
+               LDAP_LOG ( SLURPD, ERR, 
                        "fm: Error: cannot acquire lock on \"%s\" for trimming\n",
-                       sglob->slurpd_replogfile ));
+                       sglob->slurpd_replogfile, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "Error: cannot acquire lock on \"%s\" for trimming\n",
@@ -141,8 +150,14 @@ fm(
            }
        }
     }
+    sglob->rq->rq_lock( sglob->rq );                   /* lock queue */
+    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 */
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "fm", LDAP_LEVEL_RESULTS, "fm: exiting\n" ));
+       LDAP_LOG ( SLURPD, RESULTS, "fm: exiting\n", 0, 0, 0 );
 #else
     Debug( LDAP_DEBUG_ARGS, "fm: exiting\n", 0, 0, 0 );
 #endif
@@ -155,20 +170,13 @@ fm(
 /*
  * Set a global flag which signals that we're shutting down.
  */
-static RETSIGTYPE
-set_shutdown(int sig)
+RETSIGTYPE
+slurp_set_shutdown(int sig)
 {
-    int        i;
-
     sglob->slurpd_shutdown = 1;                                /* set flag */
-    ldap_pvt_thread_kill( sglob->fm_tid, LDAP_SIGUSR1 );       /* wake up file mgr */
-    sglob->rq->rq_lock( sglob->rq );                   /* lock queue */
-    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_REINSTALL( sig, set_shutdown );      /* reinstall handlers */
+    tcp_write( sglob->wake_sds[1], "0", 1);            /* wake up file mgr */
+
+    (void) SIGNAL_REINSTALL( sig, slurp_set_shutdown );        /* reinstall handlers */
 }
 
 
@@ -200,9 +208,9 @@ populate_queue(
 
     if ( acquire_lock( f, &fp, &lfp ) < 0 ) {
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "fm", LDAP_LEVEL_ERR, 
+       LDAP_LOG ( SLURPD, ERR, 
                "populate_queue: error: can't lock file \"%s\": %s\n", 
-               f, sys_errlist[ errno ] ));
+               f, sys_errlist[ errno ], 0 );
 #else
        Debug( LDAP_DEBUG_ANY,
                "error: can't lock file \"%s\": %s\n",
@@ -217,9 +225,9 @@ populate_queue(
      */
     if ( fseek( fp, sglob->srpos, 0 ) < 0 ) {
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "fm", LDAP_LEVEL_ERR, 
+       LDAP_LOG ( SLURPD, ERR, 
                "populate_queue: error: can't seek to offset %ld in file \"%s\"\n", 
-               sglob->srpos, f ));
+               sglob->srpos, f, 0 );
 #else
        Debug( LDAP_DEBUG_ANY,
                "error: can't seek to offset %ld in file \"%s\"\n",
@@ -234,9 +242,9 @@ populate_queue(
                *t = '\0';
            }
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "fm", LDAP_LEVEL_ERR, 
+               LDAP_LOG ( SLURPD, ERR, 
                        "populate_queue: error: malformed replog entry "
-                       "(begins with \"%s\")\n", p ));
+                       "(begins with \"%s\")\n", p, 0, 0 );
 #else
            Debug( LDAP_DEBUG_ANY,
                    "error: malformed replog entry (begins with \"%s\")\n",