-/*
- * Copyright (c) 1996 Regents of the University of Michigan.
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2006 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1996 Regents of the University of Michigan.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
* software without specific prior written permission. This software
* is provided ``as is'' without express or implied warranty.
*/
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by the University of Michigan
+ * (as part of U-MICH LDAP).
+ */
/*
* 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 <ac/socket.h>
+#include <ac/unistd.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));
-
-#ifdef DECL_SYS_ERRLIST
-extern char *sys_errlist[];
-#endif /* DECL_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
)
{
int rc;
+ int i;
+ fd_set readfds;
/* 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).
*/
-#ifdef SIGSTKFLT
- (void) SIGNAL( SIGSTKFLT, (void *) do_nothing );
-#else
- (void) SIGNAL( SIGUSR1, (void *) do_nothing );
+ (void) SIGNAL( SIGTERM, slurp_set_shutdown );
+ (void) SIGNAL( SIGINT, slurp_set_shutdown );
+#ifdef SIGHUP
+ (void) SIGNAL( SIGHUP, slurp_set_shutdown );
#endif
-#ifdef SIGUNUSED
- (void) SIGNAL( SIGUNUSED, (void *) do_admin );
-#else
- (void) SIGNAL( SIGUSR2, (void *) do_admin );
+#if defined(SIGBREAK) && defined(HAVE_NT_SERVICE_MANAGER)
+ (void) SIGNAL( SIGBREAK, do_nothing );
#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 )) {
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
populate_queue( sglob->slurpd_replogfile );
}
+ FD_ZERO( &readfds );
while ( !sglob->slurpd_shutdown ) {
if ( file_nonempty( sglob->slapd_replogfile )) {
}
}
} else {
- tsleep( 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 */
}
}
}
+ 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 */
Debug( LDAP_DEBUG_ARGS, "fm: exiting\n", 0, 0, 0 );
+ return NULL;
}
/*
* Set a global flag which signals that we're shutting down.
*/
-static void
-set_shutdown()
+RETSIGTYPE
+slurp_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
- sglob->rq->rq_lock( sglob->rq ); /* lock queue */
- pthread_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 );
+ tcp_write( sglob->wake_sds[1], "0", 1); /* wake up file mgr */
+
+ (void) SIGNAL_REINSTALL( sig, slurp_set_shutdown ); /* reinstall handlers */
}
/*
* 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_REINSTALL( sig, do_nothing );
}
)
{
FILE *fp, *lfp;
- Rq *rq = sglob->rq;
char *p;
if ( acquire_lock( f, &fp, &lfp ) < 0 ) {
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;
p, 0, 0 );
}
free( p );
- pthread_yield();
+ ldap_pvt_thread_yield();
}
sglob->srpos = ftell( fp );
+ }
(void) relinquish_lock( f, fp, lfp );
}
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 );
}
-
projects / openldap / blobdiff