Re-enable the epoll waiter

757aef1f · Poul-Henning Kamp · ec5a9a3d · 757aef1f · 757aef1f
Commit 757aef1f authored Jan 27, 2015 by Poul-Henning Kamp
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

cache_waiter_epoll.c bin/varnishd/waiter/cache_waiter_epoll.c +2 -1

mgt_waiter.c bin/varnishd/waiter/mgt_waiter.c +1 -1

No files found.
--- 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);
 }

 /*--------------------------------------------------------------------*/

--- 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,