[master] 757aef1 Re-enable the epoll waiter

[Poul-Henning Kamp]

commit 757aef1ff269365df51a4d8e0a1261089419e5c2
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Jan 27 10:19:04 2015 +0000

    Re-enable the epoll waiter

diff --git a/bin/varnishd/waiter/cache_waiter_epoll.c b/bin/varnishd/waiter/cache_waiter_epoll.c
index ef4055e..3d55bc0 100644
--- a/bin/varnishd/waiter/cache_waiter_epoll.c
+++ b/bin/varnishd/waiter/cache_waiter_epoll.c
@@ -154,7 +154,8 @@ vwe_fini(struct waiter *w)
 	CAST_OBJ_NOTNULL(vwe, w->priv, VWE_MAGIC);
 
 	AZ(pthread_join(vwe->thread, &vp));
-	WRONG("Not Yet Implemented");
+	AZ(close(vwe->epfd));
+	FREE_OBJ(vwe);
 }
 
 /*--------------------------------------------------------------------*/
diff --git a/bin/varnishd/waiter/mgt_waiter.c b/bin/varnishd/waiter/mgt_waiter.c
index efa5942..18e370c 100644
--- a/bin/varnishd/waiter/mgt_waiter.c
+++ b/bin/varnishd/waiter/mgt_waiter.c
@@ -43,7 +43,7 @@ static const struct waiter_impl *const waiter_impls[] = {
 	&waiter_kqueue,
     #endif
     #if defined(HAVE_EPOLL_CTL)
-//	&waiter_epoll,
+	&waiter_epoll,
     #endif
     #if defined(HAVE_PORT_CREATE)
 	&waiter_ports,