mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-12 10:54:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revised lightweight dispatcher -- writers moved into worker threads

Browse Source 
Presently spawns operations in separate thread to ease clr_read/wake handling.
Seems to perform reasonable well...
This commit is contained in:
Kurt Zeilenga 2005-10-15 06:54:55 +00:00
parent 1770f23b85
commit 9bc19c5232
4 changed files with 202 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
servers/slapd/connection.c
View File

@ -103,7 +103,7 @@ connection_state2str( int state )
static Connection* connection_get( ber_socket_t s );
#ifdef SLAP_LIGHTWEIGHT_LISTENER
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
static int connection_input( Connection *c, Operation** op );
#else
static int connection_input( Connection *c );
@ -111,7 +111,7 @@ static int connection_input( Connection *c );
static void connection_close( Connection *c );
static int connection_op_activate( Operation *op );
#ifdef SLAP_LIGHTWEIGHT_LISTENER
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
static void connection_op_queue( Operation *op );
#endif
static int connection_resched( Connection *conn );
@ -1408,7 +1408,9 @@ void connection_client_stop(
slapd_remove( s, 0, 1 );
}
#ifdef SLAP_LIGHTWEIGHT_LISTENER
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
static int connection_read( ber_socket_t s, Operation** op );
static void* connection_read_thread( void* ctx, void* argv )
{
int rc ;
@ -1436,40 +1438,37 @@ static void* connection_read_thread( void* ctx, void* argv )
int connection_read_activate( ber_socket_t s )
{
int status;
int rc;
/*
* suspend reading on this file descriptor until a connection processing
* thread reads data on it. Otherwise the listener thread will repeatedly
* submit the same event on it to the pool.
*/
if( !slapd_suspend( s ) ) return 0;
slapd_clr_read( s, 0 );
status = ldap_pvt_thread_pool_submit( &connection_pool,
rc = ldap_pvt_thread_pool_submit( &connection_pool,
connection_read_thread, (void *) s );
if( status != 0 ) {
Debug( LDAP_DEBUG_ANY, "connection_processing_activiate(%d): "
"ldap_pvt_thread_pool_submit failed\n",
s, 0, 0 );
return -1;
if( rc != 0 ) {
Debug( LDAP_DEBUG_ANY,
"connection_read_activiate(%d): submit failed (%d)\n",
s, rc, 0 );
}
return 1;
return rc;
}
#endif
#ifdef SLAP_LIGHTWEIGHT_LISTENER
int connection_read( ber_socket_t s, Operation** op )
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
static int
connection_read( ber_socket_t s, Operation** op )
#else
int connection_read(ber_socket_t s)
#endif
{
int rc = 0;
Connection *c;
#ifdef SLAP_LIGHTWEIGHT_LISTENER
int need_resume = 1;
#endif
assert( connections != NULL );
@ -1497,17 +1496,18 @@ int connection_read(ber_socket_t s)
connection_return( c );
ldap_pvt_thread_mutex_unlock( MCA_GET_CONN_MUTEX(s) );
#ifdef SLAP_LIGHTWEIGHT_LISTENER
slapd_resume( s, 1 );
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
slapd_set_read( s, 1);
#endif
return 0;
}
if ( c->c_conn_state == SLAP_C_CLIENT ) {
#ifdef SLAP_LIGHTWEIGHT_LISTENER
slapd_resume( s, 1 );
#endif
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
/* read should already be cleared */
#else
slapd_clr_read( s, 0 );
#endif
ldap_pvt_thread_pool_submit( &connection_pool,
c->c_clientfunc, c->c_clientarg );
@ -1588,8 +1588,8 @@ int connection_read(ber_socket_t s)
connection_return( c );
ldap_pvt_thread_mutex_unlock( MCA_GET_CONN_MUTEX(s) );
#ifdef SLAP_LIGHTWEIGHT_LISTENER
slapd_resume( s, 1 );
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
slapd_set_read( s, 1 );
#endif
return 0;
}
@ -1603,8 +1603,8 @@ int connection_read(ber_socket_t s)
connection_return( c );
ldap_pvt_thread_mutex_unlock( MCA_GET_CONN_MUTEX(s) );
#ifdef SLAP_LIGHTWEIGHT_LISTENER
slapd_resume( s, 1 );
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
slapd_set_read( s, 1 );
#endif
return 0;
}
@ -1620,9 +1620,10 @@ int connection_read(ber_socket_t s)
/* connections_mutex and c_mutex are locked */
#ifdef SLAP_LIGHTWEIGHT_LISTENER
slapd_resume( s, 1 );
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
slapd_set_read( s, 1 );
#endif
connection_closing( c, "SASL layer install failure" );
connection_close( c );
connection_return( c );
@ -1637,22 +1638,11 @@ int connection_read(ber_socket_t s)
do {
/* How do we do this without getting into a busy loop ? */
#ifdef SLAP_LIGHTWEIGHT_LISTENER
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
rc = connection_input( c, op );
#else
rc = connection_input( c );
#endif
#ifdef SLAP_LIGHTWEIGHT_LISTENER
if( *op && (*op)->o_tag == LDAP_REQ_UNBIND ) {
/*
* After the reception of an unbind request,
* no more incoming requests via the connection
* is expected. Therefore, don't resume connection reading.
*/
need_resume = 0;
}
#endif
}
#ifdef DATA_READY_LOOP
while( !rc && ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_DATA_READY, NULL ));
@ -1675,10 +1665,13 @@ int connection_read(ber_socket_t s)
return 0;
}
#ifdef SLAP_LIGHTWEIGHT_LISTENER
if ( need_resume ) slapd_resume( s, 1 );
#endif
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
if ( ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_NEEDS_WRITE, NULL ) ) {
slapd_set_write( s, 0 );
}
slapd_set_read( s, 1 );
#else
if ( ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_NEEDS_READ, NULL ) ) {
slapd_set_read( s, 1 );
}
@ -1686,6 +1679,7 @@ int connection_read(ber_socket_t s)
if ( ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_NEEDS_WRITE, NULL ) ) {
slapd_set_write( s, 1 );
}
#endif
connection_return( c );
ldap_pvt_thread_mutex_unlock( MCA_GET_CONN_MUTEX(s) );
@ -1694,7 +1688,7 @@ int connection_read(ber_socket_t s)
}
static int
#ifdef SLAP_LIGHTWEIGHT_LISTENER
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
connection_input( Connection *conn , Operation** c_op )
#else
connection_input( Connection *conn )
@ -1884,7 +1878,7 @@ connection_input( Connection *conn )
} else {
conn->c_n_ops_executing++;
#ifdef SLAP_LIGHTWEIGHT_LISTENER
#if 0
/*
* The first op will be processed in the same thread context,
* Subsequent ops will be submitted to the pool by
@ -2033,24 +2027,53 @@ static void connection_op_queue( Operation *op )
static int connection_op_activate( Operation *op )
{
int status;
int rc;
ber_tag_t tag = op->o_tag;
connection_op_queue( op );
status = ldap_pvt_thread_pool_submit( &connection_pool,
rc = ldap_pvt_thread_pool_submit( &connection_pool,
connection_operation, (void *) op );
if ( status != 0 ) {
if ( rc != 0 ) {
Debug( LDAP_DEBUG_ANY,
"ldap_pvt_thread_pool_submit: failed (%d) for conn=%lu\n",
status, op->o_connid, 0 );
"connection_op_activate: submit failed (%d) for conn=%lu\n",
rc, op->o_connid, 0 );
/* should move op to pending list */
}
return status;
return rc;
}
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
int connection_write_activate( ber_socket_t s )
{
int rc;
/*
* suspend reading on this file descriptor until a connection processing
* thread write data on it. Otherwise the listener thread will repeatedly
* submit the same event on it to the pool.
*/
#ifndef SLAP_LIGHTWEIGHT_DISPATCHER
slapd_clr_write( s, 0);
c->c_n_write++;
#endif
rc = ldap_pvt_thread_pool_submit( &connection_pool,
connection_read_thread, (void *) s );
if( rc != 0 ) {
Debug( LDAP_DEBUG_ANY,
"connection_write_activiate(%d): submit failed (%d)\n",
(int) s, rc, 0 );
}
return rc;
}
static
#endif
int connection_write(ber_socket_t s)
{
Connection *c;
@ -2070,8 +2093,10 @@ int connection_write(ber_socket_t s)
return -1;
}
#ifndef SLAP_LIGHTWEIGHT_DISPATCHER
slapd_clr_write( s, 0);
c->c_n_write++;
#endif
Debug( LDAP_DEBUG_TRACE,
"connection_write(%d): waking output for id=%lu\n",

300
servers/slapd/daemon.c
View File

@ -105,10 +105,6 @@ static struct slap_daemon {
int *sd_index;
int sd_epfd;
int sd_nfds;
# ifdef SLAP_LIGHTWEIGHT_LISTENER
int *sd_suspend; /* 0: suspended, 1: not suspended */
# endif
#else
#ifndef HAVE_WINSOCK
/* In winsock, accept() returns values higher than dtblsize
@ -118,9 +114,6 @@ static struct slap_daemon {
fd_set sd_actives;
fd_set sd_readers;
fd_set sd_writers;
# ifdef SLAP_LIGHTWEIGHT_LISTENER
fd_set sd_suspend; /* unset: suspended, set: not suspended */
# endif
#endif
} slap_daemon;
@ -155,7 +148,7 @@ static struct slap_daemon {
# define SLAP_SOCK_SET_READ(s) SLAP_SET_SOCK(s, EPOLLIN)
# define SLAP_SOCK_SET_WRITE(s) SLAP_SET_SOCK(s, EPOLLOUT)
# ifdef SLAP_LIGHTWEIGHT_LISTENER
# ifdef SLAP_LIGHTWEIGHT_DISPATCHER
# define SLAP_SOCK_SET_SUSPEND(s) \
( slap_daemon.sd_suspend[SLAP_SOCK_IX(s)] = 1 )
# define SLAP_SOCK_CLR_SUSPEND(s) \
@ -199,23 +192,7 @@ static struct slap_daemon {
# define SLAP_EV_PTRFD(ptr) (SLAP_EV_LISTENER(ptr) ? \
((Listener *)ptr)->sl_sd : (int *)(ptr) - slap_daemon.sd_index)
# ifdef SLAP_LIGHTWEIGHT_LISTENER
# define SLAP_DEL_SOCK(s) do { \
int fd, rc, suspend, index = SLAP_SOCK_IX((s)); \
rc = epoll_ctl(slap_daemon.sd_epfd, EPOLL_CTL_DEL, \
(s), &SLAP_SOCK_EP((s))); \
slap_daemon.sd_epolls[index] = \
slap_daemon.sd_epolls[slap_daemon.sd_nfds-1]; \
fd = SLAP_EV_PTRFD(slap_daemon.sd_epolls[index].data.ptr); \
slap_daemon.sd_suspend[index] = \
slap_daemon.sd_suspend[slap_daemon.sd_nfds-1]; \
slap_daemon.sd_suspend[slap_daemon.sd_nfds-1] = 0; \
slap_daemon.sd_index[fd] = index; \
slap_daemon.sd_index[(s)] = -1; \
slap_daemon.sd_nfds--; \
} while (0)
# else
# define SLAP_DEL_SOCK(s) do { \
# define SLAP_DEL_SOCK(s) do { \
int fd, rc, index = SLAP_SOCK_IX((s)); \
rc = epoll_ctl(slap_daemon.sd_epfd, EPOLL_CTL_DEL, \
(s), &SLAP_SOCK_EP((s))); \
@ -226,7 +203,6 @@ static struct slap_daemon {
slap_daemon.sd_index[(s)] = -1; \
slap_daemon.sd_nfds--; \
} while (0)
# endif
# define SLAP_EVENT_CLR_READ(i) SLAP_CLR_EVENT((i), EPOLLIN)
# define SLAP_EVENT_CLR_WRITE(i) SLAP_CLR_EVENT((i), EPOLLOUT)
@ -239,29 +215,14 @@ static struct slap_daemon {
# define SLAP_EVENT_LISTENER(i) (revents[(i)].data.ptr)
# define SLAP_EVENT_FD(i) SLAP_EV_PTRFD(revents[(i)].data.ptr)
# define SLAP_SOCK_SET_MUTE(s) SLAP_SOCK_CLR_READ((s))
# define SLAP_SOCK_CLR_MUTE(s) SLAP_SOCK_SET_READ((s))
# define SLAP_SOCK_IS_MUTE(s) (!SLAP_SOCK_IS_READ((s)))
# ifdef SLAP_LIGHTWEIGHT_LISTENER
# define SLAP_SOCK_SET_INIT do { \
slap_daemon.sd_epolls = \
ch_malloc( sizeof(struct epoll_event) * dtblsize * 2 ); \
slap_daemon.sd_index = ch_malloc(sizeof(int) * dtblsize); \
slap_daemon.sd_epfd = epoll_create( dtblsize ); \
for (i=0; i<dtblsize; i++) slap_daemon.sd_index[i] = -1; \
slap_daemon.sd_suspend = ch_malloc(sizeof(int) * dtblsize); \
for (i=0; i<dtblsize; i++) slap_daemon.sd_suspend[i] = 0; \
} while (0)
# else
# define SLAP_SOCK_SET_INIT do { \
# define SLAP_SOCK_SET_INIT do { \
slap_daemon.sd_epolls = ch_calloc(1, \
sizeof(struct epoll_event) * dtblsize * 2); \
slap_daemon.sd_index = ch_malloc(sizeof(int) * dtblsize); \
slap_daemon.sd_epfd = epoll_create( dtblsize ); \
for (i=0; i<dtblsize; i++) slap_daemon.sd_index[i] = -1; \
} while (0)
# endif
# define SLAP_EVENT_DECL struct epoll_event *revents
@ -297,20 +258,11 @@ static struct slap_daemon {
# define CHK_SETSIZE do { ; } while (0)
# endif
# ifdef SLAP_LIGHTWEIGHT_LISTENER
# define SLAP_SOCK_SET_INIT do { \
CHK_SETSIZE; \
FD_ZERO(&slap_daemon.sd_readers); \
FD_ZERO(&slap_daemon.sd_writers); \
FD_ZERO(&slap_daemon.sd_suspend); \
} while (0)
# else
# define SLAP_SOCK_SET_INIT do { \
# define SLAP_SOCK_SET_INIT do { \
CHK_SETSIZE; \
FD_ZERO(&slap_daemon.sd_readers); \
FD_ZERO(&slap_daemon.sd_writers); \
} while (0)
# endif
# define SLAP_SOCK_IS_ACTIVE(fd) FD_ISSET((fd), &slap_daemon.sd_actives)
# define SLAP_SOCK_IS_READ(fd) FD_ISSET((fd), &slap_daemon.sd_readers)
@ -319,12 +271,6 @@ static struct slap_daemon {
# define SLAP_SOCK_NOT_ACTIVE(fd) (!SLAP_SOCK_IS_ACTIVE(fd) && \
!SLAP_SOCK_IS_READ(fd) && !SLAP_SOCK_IS_WRITE(fd))
# ifdef SLAP_LIGHTWEIGHT_LISTENER
# define SLAP_SOCK_SET_SUSPEND(s) FD_SET((s), &slap_daemon.sd_suspend)
# define SLAP_SOCK_CLR_SUSPEND(s) FD_CLR((s), &slap_daemon.sd_suspend)
# define SLAP_SOCK_IS_SUSPEND(s) FD_ISSET((s), &slap_daemon.sd_suspend)
# endif
# ifdef HAVE_WINSOCK
# define SLAP_SOCK_SET_READ(fd) do { \
if (!SLAP_SOCK_IS_READ(fd)) { FD_SET((fd), &slap_daemon.sd_readers); } \
@ -369,10 +315,6 @@ static struct slap_daemon {
# define SLAP_EVENT_WAIT(tvp) \
select( SLAP_EVENT_MAX, &readfds, \
nwriters > 0 ? &writefds : NULL, NULL, (tvp) )
# define SLAP_SOCK_SET_MUTE(s) FD_CLR((s), &readfds)
# define SLAP_SOCK_CLR_MUTE(s) FD_SET((s), &readfds)
# define SLAP_SOCK_IS_MUTE(s) (!FD_ISSET((s), &readfds))
#endif
#ifdef HAVE_SLP
@ -504,7 +446,7 @@ static void slapd_add(ber_socket_t s, int isactive, Listener *sl) {
ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
#ifdef SLAP_LIGHTWEIGHT_LISTENER
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
WAKE_LISTENER(1);
#endif
}
@ -518,22 +460,24 @@ void slapd_remove(
int wake )
{
int waswriter;
int wasreader;
ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
if ( wasactive ) slap_daemon.sd_nactives--;
waswriter = SLAP_SOCK_IS_WRITE(s);
wasreader = SLAP_SOCK_IS_READ(s);
Debug( LDAP_DEBUG_CONNS, "daemon: removing %ld%s%s\n",
(long) s, SLAP_SOCK_IS_READ(s) ? "r" : "",
(long) s,
wasreader ? "r" : "",
waswriter ? "w" : "" );
if ( waswriter ) slap_daemon.sd_nwriters--;
#ifdef SLAP_LIGHTWEIGHT_LISTENER
SLAP_SOCK_CLR_SUSPEND(s);
#endif
SLAP_DEL_SOCK(s);
/* If we ran out of file descriptors, we dropped a listener from
* the select() loop. Now that we're removing a session from our
* control, we can try to resume a dropped listener to use.
@ -541,14 +485,14 @@ void slapd_remove(
if ( emfile ) {
int i;
for ( i = 0; slap_listeners[i] != NULL; i++ ) {
if ( slap_listeners[i]->sl_sd != AC_SOCKET_INVALID ) {
if ( slap_listeners[i]->sl_sd == s ) continue;
Listener *lr = slap_listeners[i];
if ( slap_listeners[i]->sl_is_mute ) {
slap_listeners[i]->sl_is_mute = 0;
emfile--;
break;
}
if ( lr->sl_sd == AC_SOCKET_INVALID ) continue;
if ( lr->sl_sd == s ) continue;
if ( lr->sl_mute ) {
lr->sl_mute = 0;
emfile--;
break;
}
}
/* Walked the entire list without enabling anything; emfile
@ -560,45 +504,6 @@ void slapd_remove(
WAKE_LISTENER(wake || slapd_gentle_shutdown == 2);
}
#ifdef SLAP_LIGHTWEIGHT_LISTENER
/*
* Temporarily suspend submitting events on the descriptor to the pool.
* Reading on the descriptor will be resumed by a connection procseeing thread
* when data (LDAP requests) on it are read.
* slapd_suspend() returns 1 when it is suspended otherwise returns 0
*/
int slapd_suspend(ber_socket_t s) {
int rc = 0;
ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
if ( !SLAP_SOCK_IS_SUSPEND( s ) && SLAP_SOCK_IS_ACTIVE( s ) &&
SLAP_SOCK_IS_READ( s ) )
{
SLAP_SOCK_SET_SUSPEND( s );
SLAP_SOCK_CLR_READ( s );
rc = 1;
}
ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
return rc;
}
void slapd_resume ( ber_socket_t s, int wake ) {
ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
SLAP_SOCK_SET_READ( s );
assert( SLAP_SOCK_IS_SUSPEND( s ) );
SLAP_SOCK_CLR_SUSPEND ( s );
ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
WAKE_LISTENER(wake);
}
#endif
void slapd_clr_write(ber_socket_t s, int wake) {
ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
@ -653,8 +558,7 @@ static void slapd_close(ber_socket_t s) {
tcp_close(s);
}
static void slap_free_listener_addresses(struct sockaddr **sal)
{
static void slap_free_listener_addresses(struct sockaddr **sal) {
struct sockaddr **sap;
if (sal == NULL) return;
for (sap = sal; *sap != NULL; sap++) ch_free(*sap);
@ -919,7 +823,10 @@ static int slap_open_listener(
}
l.sl_url.bv_val = NULL;
l.sl_is_mute = 0;
l.sl_mute = 0;
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
l.sl_busy = 0;
#endif
#ifndef HAVE_TLS
if( ldap_pvt_url_scheme2tls( lud->lud_scheme ) ) {
@ -1301,33 +1208,35 @@ close_listeners(
int l;
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, 0 );
Listener *lr = slap_listeners[l];
if ( lr->sl_sd != AC_SOCKET_INVALID ) {
if ( remove ) slapd_remove( lr->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 );
if ( lr->sl_sa.sa_addr.sa_family == AF_LOCAL ) {
unlink( lr->sl_sa.sa_un_addr.sun_path );
}
#endif /* LDAP_PF_LOCAL */
slapd_close( slap_listeners[l]->sl_sd );
slapd_close( lr->sl_sd );
}
if ( slap_listeners[l]->sl_url.bv_val ) {
ber_memfree( slap_listeners[l]->sl_url.bv_val );
if ( lr->sl_url.bv_val ) {
ber_memfree( lr->sl_url.bv_val );
}
if ( slap_listeners[l]->sl_name.bv_val ) {
ber_memfree( slap_listeners[l]->sl_name.bv_val );
if ( lr->sl_name.bv_val ) {
ber_memfree( lr->sl_name.bv_val );
}
free ( slap_listeners[l] );
free( lr );
slap_listeners[l] = NULL;
}
}
static int
connection_accept(
slap_listener(
Listener *sl )
{
Sockaddr from;
@ -1365,11 +1274,12 @@ connection_accept(
s = accept( sl->sl_sd, (struct sockaddr *) &from, &len );
#ifdef SLAP_LIGHTWEIGHT_LISTENER
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
/* Resume the listener FD to allow concurrent-processing of
* additional incoming connections.
*/
slapd_resume( sl->sl_sd, 1 );
sl->sl_busy = 0;
WAKE_LISTENER(1);
#endif
if ( s == AC_SOCKET_INVALID ) {
@ -1387,14 +1297,13 @@ connection_accept(
ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
emfile++;
/* Stop listening until an existing session closes */
sl->sl_is_mute = 1;
sl->sl_mute = 1;
ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
}
Debug( LDAP_DEBUG_ANY,
"daemon: accept(%ld) failed errno=%d (%s)\n",
(long) sl->sl_sd, err,
sock_errstr(err) );
(long) sl->sl_sd, err, sock_errstr(err) );
ldap_pvt_thread_yield();
return 0;
}
@ -1454,8 +1363,10 @@ connection_accept(
}
#endif
Debug( LDAP_DEBUG_CONNS, "daemon: new connection on %ld\n",
(long) s, 0, 0 );
Debug( LDAP_DEBUG_CONNS,
"daemon: listen=%ld, new connection on %ld\n",
(long) sl->sl_sd, (long) s, 0 );
switch ( from.sa_addr.sa_family ) {
# ifdef LDAP_PF_LOCAL
case AF_LOCAL:
@ -1590,43 +1501,44 @@ connection_accept(
return 0;
}
#ifdef SLAP_LIGHTWEIGHT_LISTENER
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
static void*
connection_accept_thread(
slap_listener_thread(
void* ctx,
void* ptr )
{
int rc;
rc = connection_accept( (Listener*)ptr );
rc = slap_listener( (Listener*)ptr );
if( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY,
"connection_accept_thread: failed %d", rc, 0, 0 );
"listener_thread: failed %d", rc, 0, 0 );
}
return (void*)NULL;
}
static int
connection_accept_activate(
slap_listener_activate(
Listener* sl )
{
int status;
int rc;
if( !slapd_suspend( sl->sl_sd ) ) return (0);
Debug( LDAP_DEBUG_TRACE, "slap_listener_activate(%d): %s\n",
sl->sl_sd, sl->sl_busy ? "busy" : "", 0 );
status = ldap_pvt_thread_pool_submit( &connection_pool,
connection_accept_thread, (void *) sl );
sl->sl_busy++;
if( status != 0 ) {
rc = ldap_pvt_thread_pool_submit( &connection_pool,
slap_listener_thread, (void *) sl );
if( rc != 0 ) {
Debug( LDAP_DEBUG_ANY,
"connection_accept_activate: ldap_pvt_thread_pool_submit failed\n",
0, 0, 0 );
return (-1);
"listener_activate(%d): submit failed (%d)\n",
sl->sl_sd, rc, 0 );
}
return (0);
return rc;
}
#endif
@ -1717,7 +1629,7 @@ slapd_daemon_task(
return (void*)-1;
}
#ifdef SLAP_LIGHTWEIGHT_LISTENER
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
/* make the listening socket non-blocking */
if ( ber_pvt_socket_set_nonblock( slap_listeners[l]->sl_sd, 1 ) < 0 ) {
Debug( LDAP_DEBUG_ANY, "slapd_daemon_task: "
@ -1807,12 +1719,14 @@ slapd_daemon_task(
SLAP_EVENT_INIT;
for ( l = 0; slap_listeners[l] != NULL; l++ ) {
if ( slap_listeners[l]->sl_sd == AC_SOCKET_INVALID ) continue;
Listener *lr = slap_listeners[l];
if ( slap_listeners[l]->sl_is_mute ) {
SLAP_SOCK_SET_MUTE( slap_listeners[l]->sl_sd );
} else if ( SLAP_SOCK_IS_MUTE( slap_listeners[l]->sl_sd )) {
SLAP_SOCK_CLR_MUTE( slap_listeners[l]->sl_sd );
if ( lr->sl_sd == AC_SOCKET_INVALID ) continue;
if ( lr->sl_mute || lr->sl_busy ) {
SLAP_SOCK_CLR_READ( lr->sl_sd );
} else {
SLAP_SOCK_SET_READ( lr->sl_sd );
}
}
@ -1861,16 +1775,29 @@ slapd_daemon_task(
}
for ( l = 0; slap_listeners[l] != NULL; l++ ) {
if ( slap_listeners[l]->sl_sd == AC_SOCKET_INVALID ||
slap_listeners[l]->sl_is_mute )
{
Listener *lr = slap_listeners[l];
if ( lr->sl_sd == AC_SOCKET_INVALID ) {
continue;
}
if ( lr->sl_mute ) {
Debug( LDAP_DEBUG_CONNS,
"daemon: select: listen=%d muted\n",
lr->sl_sd, 0, 0 );
continue;
}
if ( lr->sl_busy ) {
Debug( LDAP_DEBUG_CONNS,
"daemon: select: listen=%d busy\n",
lr->sl_sd, 0, 0 );
continue;
}
Debug( LDAP_DEBUG_CONNS,
"daemon: select: listen=%d active_threads=%d tvp=%s\n",
slap_listeners[l]->sl_sd, at,
tvp == NULL ? "NULL" : "zero" );
lr->sl_sd, at, tvp == NULL ? "NULL" : "zero" );
}
switch(ns = SLAP_EVENT_WAIT(tvp)) {
@ -1910,18 +1837,22 @@ slapd_daemon_task(
if( slapd_shutdown ) continue;
ebadf = 0;
Debug( LDAP_DEBUG_CONNS, "daemon: activity on %d descriptors\n",
ns, 0, 0 );
Debug( LDAP_DEBUG_CONNS,
"daemon: activity on %d descriptor%s\n",
ns, ns != 1 ? "s" : "", 0 );
/* FALL THRU */
}
#if SLAP_EVENTS_ARE_INDEXED
if ( SLAP_EVENT_IS_READ( wake_sds[0] )) {
char c[BUFSIZ];
tcp_read( wake_sds[0], c, sizeof(c) );
waking = 0;
ns--;
SLAP_EVENT_CLR_READ( wake_sds[0] );
ns--;
{
char c[BUFSIZ];
tcp_read( wake_sds[0], c, sizeof(c) );
}
Debug( LDAP_DEBUG_CONNS, "daemon: waked\n", 0, 0, 0 );
waking = 0;
continue;
}
@ -1944,10 +1875,10 @@ slapd_daemon_task(
SLAP_EVENT_CLR_WRITE( slap_listeners[l]->sl_sd );
ns--;
#ifdef SLAP_LIGHTWEIGHT_LISTENER
rc = connection_accept_activate(slap_listeners[l]);
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
rc = slap_listener_activate(slap_listeners[l]);
#else
rc = connection_accept(slap_listeners[l]);
rc = slap_listener(slap_listeners[l]);
#endif
}
@ -2016,10 +1947,9 @@ slapd_daemon_task(
"daemon: write active on %d\n",
wd, 0, 0 );
#ifdef SLAP_LIGHTWEIGHT_LISTENER
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
connection_write_activate( wd );
#else
#endif
/*
* NOTE: it is possible that the connection was closed
* and that the stream is now inactive.
@ -2033,6 +1963,7 @@ slapd_daemon_task(
}
slapd_close( wd );
}
#endif
}
for ( i = 0; nrfds > 0; i++ ) {
@ -2055,7 +1986,7 @@ slapd_daemon_task(
* active.
*/
#ifdef SLAP_LIGHTWEIGHT_LISTENER
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
connection_read_activate( rd );
#else
if ( connection_read( rd ) < 0 ) {
@ -2120,12 +2051,13 @@ slapd_daemon_task(
int rc = 1, fd;
if ( SLAP_EVENT_IS_LISTENER(i) ) {
#ifdef SLAP_LIGHTWEIGHT_LISTENER
rc = connection_accept_activate( SLAP_EVENT_LISTENER( i ));
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
rc = slap_listener_activate( SLAP_EVENT_LISTENER( i ));
#else
rc = connection_accept( SLAP_EVENT_LISTENER( i ));
rc = slap_listener( SLAP_EVENT_LISTENER( i ));
#endif
}
/* If we found a regular listener, rc is now zero, and we
* can skip the data portion. But if it was a UDP listener
* then rc is still 1, and we want to handle the data.
@ -2140,32 +2072,36 @@ slapd_daemon_task(
Debug( LDAP_DEBUG_CONNS,
"daemon: write active on %d\n",
fd, 0, 0 );
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
connection_write_activate( fd );
#else
/*
* NOTE: it is possible that the connection was closed
* and that the stream is now inactive.
* connection_write() must valid the stream is still
* active.
*/
if ( connection_write( fd ) < 0 ) {
slapd_close( fd );
continue;
}
#endif
}
if( SLAP_EVENT_IS_READ( i ) ) {
Debug( LDAP_DEBUG_CONNS,
"daemon: read active on %d\n",
fd, 0, 0 );
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
connection_read_activate( fd );
#else
/*
* NOTE: it is possible that the connection was closed
* and that the stream is now inactive.
* connection_read() must valid the stream is still
* active.
*/
#ifdef SLAP_LIGHTWEIGHT_LISTENER
connection_read_activate( fd );
#else
if ( connection_read( fd ) < 0 ) slapd_close( fd );
#endif
}

12
servers/slapd/proto-slap.h
View File

@ -651,12 +651,11 @@ LDAP_SLAPD_F (int) connection_state_closing LDAP_P(( Connection *c ));
LDAP_SLAPD_F (const char *) connection_state2str LDAP_P(( int state ))
LDAP_GCCATTR((const));
LDAP_SLAPD_F (int) connection_write LDAP_P((ber_socket_t s));
#ifdef SLAP_LIGHTWEIGHT_LISTENER
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
LDAP_SLAPD_F (int) connection_write_activate LDAP_P((ber_socket_t s));
LDAP_SLAPD_F (int) connection_read_activate LDAP_P((ber_socket_t s));
LDAP_SLAPD_F (int) connection_read LDAP_P((ber_socket_t, Operation **));
#else
LDAP_SLAPD_F (int) connection_write LDAP_P((ber_socket_t s));
LDAP_SLAPD_F (int) connection_read LDAP_P((ber_socket_t s));
#endif
@ -722,11 +721,6 @@ LDAP_SLAPD_F (RETSIGTYPE) slap_sig_shutdown LDAP_P((int sig));
LDAP_SLAPD_F (RETSIGTYPE) slap_sig_wake LDAP_P((int sig));
LDAP_SLAPD_F (void) slap_wake_listener LDAP_P((void));
#ifdef SLAP_LIGHTWEIGHT_LISTENER
LDAP_SLAPD_F (int) slapd_suspend LDAP_P((ber_socket_t s));
LDAP_SLAPD_F (void) slapd_resume LDAP_P((ber_socket_t s, int wake ));
#endif
LDAP_SLAPD_F (void) slapd_set_write LDAP_P((ber_socket_t s, int wake));
LDAP_SLAPD_F (void) slapd_clr_write LDAP_P((ber_socket_t s, int wake));
LDAP_SLAPD_F (void) slapd_set_read LDAP_P((ber_socket_t s, int wake));

7
servers/slapd/slap.h
View File

@ -60,7 +60,7 @@ LDAP_BEGIN_DECL
#ifdef LDAP_DEVEL
#define SLAP_LIGHTWEIGHT_LISTENER /* experimental slapd architecture */
#define SLAP_LIGHTWEIGHT_DISPATCHER /* experimental slapd architecture */
#define SLAP_SEM_LOAD_CONTROL /* must also be defined in libldap_r/tpool.c */
#define SLAP_MULTI_CONN_ARRAY
@ -2740,7 +2740,10 @@ struct slap_listener {
#ifdef LDAP_CONNECTIONLESS
int sl_is_udp; /* UDP listener is also data port */
#endif
int sl_is_mute; /* Listening is temporarily disabled */
int sl_mute; /* Listener is temporarily disabled due to emfile */
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
int sl_busy; /* Listener is busy (accept thread activated */
#endif
ber_socket_t sl_sd;
Sockaddr sl_sa;
#define sl_addr sl_sa.sa_in_addr