mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-02-05 13:40:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

revert: libevent 2.0 support

Browse Source
This commit is contained in:
Ondřej Kuzník 2021-02-08 10:29:27 +00:00 committed by Quanah Gibson-Mount
parent a3c49b8709
commit 5fa0a651f5
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -2146,11 +2146,12 @@ if test $ol_enable_balancer != no ; then
[have_libevent=yes
LEVENT_LIBS="$LEVENT_LIBS -levent"],
[have_libevent=no])])
AC_CHECK_LIB(event, libevent_global_shutdown, [], [have_libevent=no])
if test $have_libevent = yes ; then
AC_DEFINE(HAVE_LIBEVENT, 1, [define if you have -levent])
else
AC_MSG_ERROR([You need libevent 2.0 or later with DNS support to build the load balancer])
AC_MSG_ERROR([You need libevent 2.1 or later with DNS support to build the load balancer])
fi
fi

6
servers/lloadd/daemon.c
View File

@ -1266,10 +1266,6 @@ lloadd_daemon( struct event_base *daemon_base )
assert( daemon_base != NULL );
#ifndef EVDNS_BASE_INITIALIZE_NAMESERVERS /* libevent 2.0 support */
#define EVDNS_BASE_INITIALIZE_NAMESERVERS 1
#endif /* !EVDNS_BASE_INITIALIZE_NAMESERVERS */
dnsbase = evdns_base_new( daemon_base, EVDNS_BASE_INITIALIZE_NAMESERVERS );
if ( !dnsbase ) {
Debug( LDAP_DEBUG_ANY, "lloadd startup: "
@ -1326,7 +1322,7 @@ lloadd_daemon( struct event_base *daemon_base )
}
}
event = evtimer_new( daemon_base, operations_timeout, NULL );
event = evtimer_new( daemon_base, operations_timeout, event_self_cbarg() );
if ( !event ) {
Debug( LDAP_DEBUG_ANY, "lloadd: "
"failed to allocate timeout event\n" );

2
servers/lloadd/libevent_support.c
View File

@ -167,7 +167,5 @@ lload_libevent_init( void )
void
lload_libevent_destroy( void )
{
#if ( EVENT__NUMERIC_VERSION >= 0x02010000 )
libevent_global_shutdown();
#endif
}

3
servers/lloadd/operation.c
View File

@ -614,6 +614,7 @@ connection_timeout( LloadConnection *upstream, void *arg )
void
operations_timeout( evutil_socket_t s, short what, void *arg )
{
struct event *self = arg;
LloadBackend *b;
time_t threshold;
@ -652,7 +653,7 @@ operations_timeout( evutil_socket_t s, short what, void *arg )
done:
Debug( LDAP_DEBUG_TRACE, "operations_timeout: "
"timeout task finished\n" );
evtimer_add( lload_timeout_event, lload_timeout_api );
evtimer_add( self, lload_timeout_api );
}
void