+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
/*
* Copyright (c) 1996 Regents of the University of Michigan.
* All rights reserved.
#include "portable.h"
#include <stdio.h>
-#include <stdlib.h> /* get free() */
+#include <ac/stdlib.h>
#include <ac/string.h>
#include <ac/signal.h>
/* 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 HAVE_LINUX_THREADS
- (void) SIGNAL( SIGSTKFLT, do_nothing );
- (void) SIGNAL( SIGUNUSED, do_admin );
-#else
- (void) SIGNAL( SIGUSR1, do_nothing );
- (void) SIGNAL( SIGUSR2, do_admin );
-#endif
+ (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
if ( sglob->one_shot_mode ) {
if ( file_nonempty( sglob->slapd_replogfile )) {
while ( !sglob->slurpd_shutdown ) {
if ( file_nonempty( sglob->slapd_replogfile )) {
/* New work found - copy to slurpd replog file */
+#ifdef NEW_LOGGING
+ 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 );
+#endif
if (( rc = copy_replog( sglob->slapd_replogfile,
sglob->slurpd_replogfile )) == 0 ) {
populate_queue( sglob->slurpd_replogfile );
} else {
if ( rc < 0 ) {
+#ifdef NEW_LOGGING
+ 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",
0, 0, 0 );
+#endif
sglob->slurpd_shutdown = 1;
}
}
} else {
- tsleep( sglob->no_work_interval );
+ ldap_pvt_thread_sleep( sglob->no_work_interval );
}
/* Garbage-collect queue */
FILE *fp, *lfp;
if (( rc = acquire_lock( sglob->slurpd_replogfile, &fp,
&lfp )) < 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( SLURPD, ERR,
+ "fm: Error: cannot acquire lock on \"%s\" for trimming\n",
+ sglob->slurpd_replogfile, 0, 0 );
+#else
Debug( LDAP_DEBUG_ANY,
"Error: cannot acquire lock on \"%s\" for trimming\n",
sglob->slurpd_replogfile, 0, 0 );
+#endif
} else {
sglob->rq->rq_write( sglob->rq, fp );
(void) relinquish_lock( sglob->slurpd_replogfile, fp, lfp );
}
}
}
+#ifdef NEW_LOGGING
+ LDAP_LOG ( SLURPD, RESULTS, "fm: exiting\n", 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_ARGS, "fm: exiting\n", 0, 0, 0 );
+#endif
return NULL;
}
* Set a global flag which signals that we're shutting down.
*/
static RETSIGTYPE
-set_shutdown(int x)
+set_shutdown(int sig)
{
int i;
sglob->slurpd_shutdown = 1; /* set flag */
-#ifdef HAVE_LINUX_THREADS
- 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, set_shutdown ); /* reinstall handlers */
- (void) SIGNAL( SIGINT, set_shutdown );
- (void) SIGNAL( SIGHUP, set_shutdown );
+ (void) SIGNAL_REINSTALL( sig, set_shutdown ); /* reinstall handlers */
}
* A do-nothing signal handler.
*/
RETSIGTYPE
-do_nothing(int i)
+do_nothing(int sig)
{
-#ifdef HAVE_LINUX_THREADS
- (void) SIGNAL( SIGSTKFLT, do_nothing );
-#else
- (void) SIGNAL( SIGUSR1, 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 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( SLURPD, ERR,
+ "populate_queue: error: can't lock file \"%s\": %s\n",
+ f, sys_errlist[ errno ], 0 );
+#else
Debug( LDAP_DEBUG_ANY,
"error: can't lock file \"%s\": %s\n",
f, sys_errlist[ errno ], 0 );
+#endif
return;
}
* the queue.
*/
if ( fseek( fp, sglob->srpos, 0 ) < 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( SLURPD, ERR,
+ "populate_queue: error: can't seek to offset %ld in file \"%s\"\n",
+ sglob->srpos, f, 0 );
+#else
Debug( LDAP_DEBUG_ANY,
"error: can't seek to offset %ld in file \"%s\"\n",
sglob->srpos, f, 0 );
+#endif
} else {
while (( p = get_record( fp )) != NULL ) {
if ( sglob->rq->rq_add( sglob->rq, p ) < 0 ) {
if (( t = strchr( p, '\n' )) != NULL ) {
*t = '\0';
}
+#ifdef NEW_LOGGING
+ LDAP_LOG ( SLURPD, ERR,
+ "populate_queue: error: malformed replog entry "
+ "(begins with \"%s\")\n", p, 0, 0 );
+#else
Debug( LDAP_DEBUG_ANY,
"error: malformed replog entry (begins with \"%s\")\n",
p, 0, 0 );
+#endif
}
free( p );
- pthread_yield();
+ ldap_pvt_thread_yield();
}
sglob->srpos = ftell( fp );
}
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