upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-19 13:23:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Mostly revert prev commit

Browse source
This commit is contained in:
Howard Chu 2009-01-27 18:18:39 +00:00
parent 1a1d226dad
commit d3f1921cc9
1 changed files with 1 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
servers/slapd/daemon.c
View file

@ -161,9 +161,6 @@ static struct slap_daemon {
/***************************************
* Use epoll infrastructure - epoll(4) *
***************************************/
#undef SLAP_EVENT_ACK /* events trigger once per descriptor */
# define SLAP_EVENT_FNAME "epoll"
# define SLAP_EVENTS_ARE_INDEXED 0
# define SLAP_EPOLL_SOCK_IX(s) (slap_daemon.sd_index[(s)])
@ -294,12 +291,10 @@ static struct slap_daemon {
} while (0)
#elif defined(SLAP_X_DEVPOLL) && defined(HAVE_DEVPOLL)
/*************************************************************
* Use Solaris' (>= 2.7) /dev/poll infrastructure - poll(7d) *
*************************************************************/
#define SLAP_EVENT_ACK 1 /* events keep signalling unless we stop them */
# define SLAP_EVENT_FNAME "/dev/poll"
# define SLAP_EVENTS_ARE_INDEXED 0
/*
@ -475,9 +470,6 @@ static struct slap_daemon {
} while (0)
#else /* ! epoll && ! /dev/poll */
#define SLAP_EVENT_ACK 1 /* events keep signalling unless we stop them */
# ifdef HAVE_WINSOCK
# define SLAP_EVENT_FNAME "WSselect"
/* Winsock provides a "select" function but its fd_sets are
@ -935,24 +927,6 @@ slapd_remove(
WAKE_LISTENER(wake || slapd_gentle_shutdown == 2);
}
void
slapd_ack_write( ber_socket_t s, int wake )
{
#ifdef SLAP_EVENT_ACK
ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
if ( SLAP_SOCK_IS_WRITE( s )) {
assert( SLAP_SOCK_IS_ACTIVE( s ));
SLAP_SOCK_CLR_WRITE( s );
slap_daemon.sd_nwriters--;
}
ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
#endif
WAKE_LISTENER(wake);
}
void
slapd_clr_write( ber_socket_t s, int wake )
{
@ -985,26 +959,6 @@ slapd_set_write( ber_socket_t s, int wake )
WAKE_LISTENER(wake);
}
int
slapd_ack_read( ber_socket_t s, int wake )
{
#ifdef SLAP_EVENT_ACK
int rc = 1;
ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
if ( SLAP_SOCK_IS_ACTIVE( s )) {
SLAP_SOCK_CLR_READ( s );
rc = 0;
}
ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
if ( !rc )
WAKE_LISTENER(wake);
return rc;
#else
return 0;
#endif
}
int
slapd_clr_read( ber_socket_t s, int wake )
{