/* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 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 the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
*/
#include "portable.h"
#include "lutil.h"
#include "slap.h"
-#ifdef LDAP_SYNCREPL
#include "ldap_rq.h"
-#endif
#ifdef HAVE_TCPD
#include <tcpd.h>
static
#endif
volatile sig_atomic_t slapd_shutdown = 0, slapd_gentle_shutdown = 0;
+volatile sig_atomic_t slapd_abrupt_shutdown = 0;
static struct slap_daemon {
ldap_pvt_thread_mutex_t sd_mutex;
/*
* Add a descriptor to daemon control
+ *
+ * If isactive, the descriptor is a live server session and is subject
+ * to idletimeout control. Otherwise, the descriptor is a passive
+ * listener or an outbound client session, and not subject to
+ * idletimeout.
*/
-static void slapd_add(ber_socket_t s) {
+static void slapd_add(ber_socket_t s, int isactive) {
ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
assert( !FD_ISSET( s, &slap_daemon.sd_actives ));
}
#endif
- slap_daemon.sd_nactives++;
+ if ( isactive ) {
+ slap_daemon.sd_nactives++;
+ }
FD_SET( s, &slap_daemon.sd_actives );
FD_SET( s, &slap_daemon.sd_readers );
/*
* Remove the descriptor from daemon control
*/
-void slapd_remove(ber_socket_t s, int wake) {
+void slapd_remove(ber_socket_t s, int wasactive, int wake) {
ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
- slap_daemon.sd_nactives--;
+ if ( wasactive ) {
+ slap_daemon.sd_nactives--;
+ }
#ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, DETAIL1,
for ( l = 0; slap_listeners[l] != NULL; l++ ) {
if ( slap_listeners[l]->sl_sd != AC_SOCKET_INVALID ) {
if ( remove )
- slapd_remove( slap_listeners[l]->sl_sd, 0 );
+ slapd_remove( slap_listeners[l]->sl_sd, 0, 0 );
#ifdef LDAP_PF_LOCAL
if ( slap_listeners[l]->sl_sa.sa_addr.sa_family == AF_LOCAL ) {
unlink( slap_listeners[l]->sl_sa.sa_un_addr.sun_path );
* are unnecessary.
*/
if ( slap_listeners[l]->sl_is_udp ) {
- slapd_add( slap_listeners[l]->sl_sd );
+ slapd_add( slap_listeners[l]->sl_sd, 1 );
continue;
}
#endif
return( (void*)-1 );
}
- slapd_add( slap_listeners[l]->sl_sd );
+ slapd_add( slap_listeners[l]->sl_sd, 0 );
}
#ifdef HAVE_NT_SERVICE_MANAGER
struct timeval tv;
struct timeval *tvp;
-#ifdef LDAP_SYNCREPL
struct timeval *cat;
time_t tdelta = 1;
struct re_s* rtask;
-#endif
now = slap_get_time();
if( ( global_idletimeout > 0 ) &&
ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
- if ( !at ) {
- at = ldap_pvt_thread_pool_backload(&connection_pool) -
- ldap_pvt_runqueue_persistent_backload( &syncrepl_rq );
- }
-
if ( at
#if defined(HAVE_YIELDING_SELECT) || defined(NO_THREADS)
&& ( tv.tv_sec || tv.tv_usec )
else
tvp = NULL;
-#ifdef LDAP_SYNCREPL
ldap_pvt_thread_mutex_lock( &syncrepl_rq.rq_mutex );
rtask = ldap_pvt_runqueue_next_sched( &syncrepl_rq, &cat );
while ( cat && cat->tv_sec && cat->tv_sec <= now ) {
if ( ldap_pvt_runqueue_isrunning( &syncrepl_rq, rtask )) {
- ldap_pvt_runqueue_resched( &syncrepl_rq, rtask );
+ ldap_pvt_runqueue_resched( &syncrepl_rq, rtask, 0 );
} else {
ldap_pvt_runqueue_runtask( &syncrepl_rq, rtask );
- ldap_pvt_runqueue_resched( &syncrepl_rq, rtask );
+ ldap_pvt_runqueue_resched( &syncrepl_rq, rtask, 0 );
ldap_pvt_thread_mutex_unlock( &syncrepl_rq.rq_mutex );
ldap_pvt_thread_pool_submit( &connection_pool,
rtask->routine, (void *) rtask );
+ ldap_pvt_thread_mutex_lock( &syncrepl_rq.rq_mutex );
}
rtask = ldap_pvt_runqueue_next_sched( &syncrepl_rq, &cat );
}
- rtask = ldap_pvt_runqueue_next_sched( &syncrepl_rq, &cat );
ldap_pvt_thread_mutex_unlock( &syncrepl_rq.rq_mutex );
if ( cat != NULL ) {
tvp = &tv;
}
}
-#endif
for ( l = 0; slap_listeners[l] != NULL; l++ ) {
if ( slap_listeners[l]->sl_sd == AC_SOCKET_INVALID ||
id = connection_init(
slap_listeners[l]->sl_sd,
slap_listeners[l], "", "",
- 2, ssf, authid );
+ CONN_IS_UDP, ssf, authid );
slap_listeners[l]->sl_is_udp++;
}
continue;
dnsname != NULL ? dnsname : SLAP_STRING_UNKNOWN,
peername,
#ifdef HAVE_TLS
- slap_listeners[l]->sl_is_tls,
+ slap_listeners[l]->sl_is_tls ? CONN_IS_TLS : 0,
#else
0,
#endif
slap_listeners[l]->sl_name.bv_val,
0 );
- slapd_add( s );
+ slapd_add( s, 1 );
continue;
}
slap_listeners = NULL;
if( !slapd_gentle_shutdown ) {
+ slapd_abrupt_shutdown = 1;
connections_shutdown();
}
* SIGBREAK is generated when a user logs out.
*/
-#if 0
#if HAVE_NT_SERVICE_MANAGER && SIGBREAK
if (is_NT_Service && sig == SIGBREAK)
-#ifdef NEW_LOGGING
- LDAP_LOG( CONNECTION, CRIT,
- "slap_sig_shutdown: SIGBREAK ignored.\n", 0, 0, 0 );
-#else
- Debug(LDAP_DEBUG_TRACE, "slap_sig_shutdown: SIGBREAK ignored.\n",
- 0, 0, 0);
-#endif
+ ;
else
#endif
-#endif
#ifdef SIGHUP
if (sig == SIGHUP && global_gentlehup && slapd_gentle_shutdown == 0)
slapd_gentle_shutdown = 1;
}
-void slapd_add_internal(ber_socket_t s) {
- slapd_add(s);
+void slapd_add_internal(ber_socket_t s, int isactive) {
+ slapd_add(s, isactive);
}
Listener ** slapd_get_listeners(void) {
projects / openldap / blobdiff