townforge/unbound
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compile fixes for pluggable event API from P.Y. Adi Prasaja.

Browse Source 
git-svn-id: https://unbound.nlnetlabs.nl/svn/trunk@3655 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
willem 2016-03-10 11:33:04 +00:00
parent a5c620d824
commit ea0611cdc1
2 changed files with 43 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
util/ub_event.c
View File

@ -44,6 +44,7 @@
#include <sys/time.h>
#include "util/ub_event.h"
#include "util/log.h"
#include "util/netevent.h"
/* We define libevent structures here to hide the libevent stuff. */
@ -152,6 +153,7 @@ struct ub_event_base *
ub_libevent_event_base(struct event_base* libevent_base)
{
#ifdef USE_MINI_EVENT
(void)libevent_base;
return NULL;
#else
return AS_UB_EVENT_BASE(libevent_base);
@ -159,12 +161,13 @@ ub_libevent_event_base(struct event_base* libevent_base)
}
struct event_base *
ub_libevent_get_event_base(struct ub_event_base* libevent_base)
ub_libevent_get_event_base(struct ub_event_base* base)
{
#ifdef USE_MINI_EVENT
(void)base;
return NULL;
#else
return AS_EVENT_BASE(libevent_base);
return AS_EVENT_BASE(base);
#endif
}

73
util/ub_event_pluggable.c
View File

@ -88,37 +88,6 @@ const char* ub_event_get_version()
return "pluggable-event"PACKAGE_VERSION;
}
void
ub_get_event_sys(struct ub_event_base* base, const char** n, const char** s,
const char** m)
{
(void)base;
*n = "pluggable-event";
#ifdef USE_WINSOCK
*s = "winsock";
*m = "WSAWaitForMultipleEvents";
#elif defined(USE_MINI_EVENT)
(void)base;
*s = "internal";
*m = "select";
#else
struct event_base* b = AS_MY_EVENT_BASE(base);
*s = event_get_version();
# ifdef HAVE_EVENT_BASE_GET_METHOD
*n = "pluggable-libevent";
if(!b)
b = event_base_new();
*m = event_base_get_method(b);
# elif defined(HAVE_EV_LOOP) || defined(HAVE_EV_DEFAULT_LOOP)
*n = "pluggable-libev";
*m = ev_backend2str(ev_backend((struct ev_loop*)b));
# else
*m = "not obtainable";
# endif
#endif
}
void
my_event_add_bits(struct ub_event* ev, short bits)
{
@ -333,9 +302,9 @@ ub_default_event_base(int sigs, time_t* time_secs, struct timeval* time_tv)
# if defined(HAVE_EV_LOOP) || defined(HAVE_EV_DEFAULT_LOOP)
/* libev */
if(sigs)
my_base->base = ev_default_loop(EVFLAG_AUTO);
my_base->base = (struct event_base*)ev_default_loop(EVFLAG_AUTO);
else
my_base->base = ev_loop_new(EVFLAG_AUTO);
my_base->base = (struct event_base*)ev_loop_new(EVFLAG_AUTO);
# else
(void)sigs;
# ifdef HAVE_EVENT_BASE_NEW
@ -374,10 +343,44 @@ ub_libevent_event_base(struct event_base* base)
struct event_base*
ub_libevent_get_event_base(struct ub_event_base* base)
{
#ifdef USE_MINI_EVENT
#ifndef USE_MINI_EVENT
if (base->vmt == &default_event_base_vmt)
return AS_MY_EVENT_BASE(base)->base;
#endif
return NULL;
}
void
ub_get_event_sys(struct ub_event_base* ub_base, const char** n, const char** s,
const char** m)
{
*n = "pluggable-event";
#ifdef USE_WINSOCK
(void)base;
*s = "winsock";
*m = "WSAWaitForMultipleEvents";
#elif defined(USE_MINI_EVENT)
(void)base;
*s = "internal";
*m = "select";
#else
return AS_MY_EVENT_BASE(base)->base;
struct event_base* b = ub_libevent_get_event_base(ub_base);
/* This function is only called from comm_base_create, so
* ub_base is guaranteed to exist and to be the default
* event base.
*/
assert(b);
*s = event_get_version();
# ifdef HAVE_EVENT_BASE_GET_METHOD
*n = "pluggable-libevent";
*m = event_base_get_method(b);
# elif defined(HAVE_EV_LOOP) || defined(HAVE_EV_DEFAULT_LOOP)
*n = "pluggable-libev";
*m = ev_backend2str(ev_backend((struct ev_loop*)b);
# else
*m = "not obtainable";
# endif
#endif
}