upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-20 22:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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 [have_libevent=yes
LEVENT_LIBS="$LEVENT_LIBS -levent"], LEVENT_LIBS="$LEVENT_LIBS -levent"],
[have_libevent=no])]) [have_libevent=no])])
AC_CHECK_LIB(event, libevent_global_shutdown, [], [have_libevent=no])
if test $have_libevent = yes ; then if test $have_libevent = yes ; then
AC_DEFINE(HAVE_LIBEVENT, 1, [define if you have -levent]) AC_DEFINE(HAVE_LIBEVENT, 1, [define if you have -levent])
else 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
fi fi

6
servers/lloadd/daemon.c
View file

@ -1266,10 +1266,6 @@ lloadd_daemon( struct event_base *daemon_base )
assert( daemon_base != NULL ); 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 ); dnsbase = evdns_base_new( daemon_base, EVDNS_BASE_INITIALIZE_NAMESERVERS );
if ( !dnsbase ) { if ( !dnsbase ) {
Debug( LDAP_DEBUG_ANY, "lloadd startup: " 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 ) { if ( !event ) {
Debug( LDAP_DEBUG_ANY, "lloadd: " Debug( LDAP_DEBUG_ANY, "lloadd: "
"failed to allocate timeout event\n" ); "failed to allocate timeout event\n" );

2
servers/lloadd/libevent_support.c
View file

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

3
servers/lloadd/operation.c
View file

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