upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fixup backend2str for libev.

Browse source 
git-svn-id: file:///svn/unbound/trunk@3660 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2016-03-10 14:39:48 +00:00
parent 856c37012b
commit 6a6cf23179
4 changed files with 25 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
daemon/unbound.c
View file

@ -92,21 +92,6 @@
void* unbound_start_brk = 0; void* unbound_start_brk = 0;
#endif #endif
#if !defined(HAVE_EVENT_BASE_GET_METHOD) && (defined(HAVE_EV_LOOP) || defined(HAVE_EV_DEFAULT_LOOP))
static const char* ev_backend2str(int b)
{
switch(b) {
case EVBACKEND_SELECT: return "select";
case EVBACKEND_POLL: return "poll";
case EVBACKEND_EPOLL: return "epoll";
case EVBACKEND_KQUEUE: return "kqueue";
case EVBACKEND_DEVPOLL: return "devpoll";
case EVBACKEND_PORT: return "evport";
}
return "unknown";
}
#endif
/** print usage. */ /** print usage. */
static void usage() static void usage()
{ {

3
doc/Changelog
View file

@ -1,3 +1,6 @@
10 March 2016: Wouter
- Fixup backend2str for libev.
09 March 2016: Willem 09 March 2016: Willem
- User defined pluggable event API for libunbound - User defined pluggable event API for libunbound
- Fixup of compile fix for pluggable event API from P.Y. Adi - Fixup of compile fix for pluggable event API from P.Y. Adi

2
util/netevent.c
View file

@ -2162,7 +2162,7 @@ comm_timer_is_set(struct comm_timer* timer)
} }
size_t size_t
comm_timer_get_mem(struct comm_timer* timer) comm_timer_get_mem(struct comm_timer* ATTR_UNUSED(timer))
{ {
return sizeof(struct internal_timer); return sizeof(struct internal_timer);
} }

27
util/ub_event.c
View file

@ -93,6 +93,21 @@ const char* ub_event_get_version()
return event_get_version(); return event_get_version();
} }
#if defined(HAVE_EV_LOOP) || defined(HAVE_EV_DEFAULT_LOOP)
static const char* ev_backend2str(int b)
{
switch(b) {
case EVBACKEND_SELECT: return "select";
case EVBACKEND_POLL: return "poll";
case EVBACKEND_EPOLL: return "epoll";
case EVBACKEND_KQUEUE: return "kqueue";
case EVBACKEND_DEVPOLL: return "devpoll";
case EVBACKEND_PORT: return "evport";
}
return "unknown";
}
#endif
void void
ub_get_event_sys(struct ub_event_base* base, const char** n, const char** s, ub_get_event_sys(struct ub_event_base* base, const char** n, const char** s,
const char** m) const char** m)
@ -110,16 +125,16 @@ ub_get_event_sys(struct ub_event_base* base, const char** n, const char** s,
#else #else
struct event_base* b = AS_EVENT_BASE(base); struct event_base* b = AS_EVENT_BASE(base);
*s = event_get_version(); *s = event_get_version();
# ifdef HAVE_EVENT_BASE_GET_METHOD # if defined(HAVE_EV_LOOP) || defined(HAVE_EV_DEFAULT_LOOP)
*n = "libevent";
if (!b)
b = event_base_new();
*m = event_base_get_method(b);
# elif defined(HAVE_EV_LOOP) || defined(HAVE_EV_DEFAULT_LOOP)
*n = "libev"; *n = "libev";
if (!b) if (!b)
b = (struct event_base*)ev_default_loop(EVFLAG_AUTO); b = (struct event_base*)ev_default_loop(EVFLAG_AUTO);
*m = ev_backend2str(ev_backend((struct ev_loop*)b)); *m = ev_backend2str(ev_backend((struct ev_loop*)b));
# elif defined(HAVE_EVENT_BASE_GET_METHOD)
*n = "libevent";
if (!b)
b = event_base_new();
*m = event_base_get_method(b);
# else # else
*n = "unknown"; *n = "unknown";
*m = "not obtainable"; *m = "not obtainable";