[master] ade0db0 Stop the epoll_waiter from holding on to fd's while stuff happens, it is supected of being the cause of the race in #1675 amongst other evils.

[Poul-Henning Kamp]

commit ade0db0b9394449399332686bca47cc1c8e9f51c
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed May 13 08:05:52 2015 +0000

    Stop the epoll_waiter from holding on to fd's while stuff happens,
    it is supected of being the cause of the race in #1675 amongst other
    evils.

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 29aeaec..565a4bb 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -52,10 +52,6 @@
 #include <unistd.h>
 #include <math.h>
 
-#if defined(HAVE_EPOLL_CTL)
-#include <sys/epoll.h>
-#endif
-
 #include "common/params.h"
 
 /*--------------------------------------------------------------------*/
@@ -381,9 +377,6 @@ struct waited {
 	VTAILQ_ENTRY(waited)	list;
 	void			*ptr;
 	double			idle;
-#if defined(HAVE_EPOLL_CTL)
-	struct epoll_event ev;
-#endif
 };
 
 /* Stored object -----------------------------------------------------
diff --git a/bin/varnishd/waiter/cache_waiter_epoll.c b/bin/varnishd/waiter/cache_waiter_epoll.c
index 56987cd..f1e8bd9 100644
--- a/bin/varnishd/waiter/cache_waiter_epoll.c
+++ b/bin/varnishd/waiter/cache_waiter_epoll.c
@@ -65,37 +65,34 @@ static void
 vwe_inject(const struct waiter *w, struct waited *wp)
 {
 	struct vwe *vwe;
+	struct epoll_event ev;
 
 	CAST_OBJ_NOTNULL(vwe, w->priv, VWE_MAGIC);
 	CHECK_OBJ_NOTNULL(wp, WAITED_MAGIC);
 	assert(wp->fd >= 0);
 
-	if (wp->ev.data.ptr)
-		AZ(epoll_ctl(vwe->epfd, EPOLL_CTL_MOD, wp->fd, &wp->ev));
-	else {
-		wp->ev.data.ptr = wp;
-		wp->ev.events = EPOLLIN | EPOLLRDHUP;
-		if (wp != w->pipe_w)
-			wp->ev.events |= EPOLLONESHOT;
-		AZ(epoll_ctl(vwe->epfd, EPOLL_CTL_ADD, wp->fd, &wp->ev));
-	}
+	ev.data.ptr = wp;
+	ev.events = EPOLLIN | EPOLLRDHUP;
+	AZ(epoll_ctl(vwe->epfd, EPOLL_CTL_ADD, wp->fd, &ev));
 }
 
 static void
 vwe_eev(struct vwe *vwe, const struct epoll_event *ep, double now)
 {
-	struct waited *sp;
+	struct waited *wp;
 
 	AN(ep->data.ptr);
-	CAST_OBJ_NOTNULL(sp, ep->data.ptr, WAITED_MAGIC);
+	CAST_OBJ_NOTNULL(wp, ep->data.ptr, WAITED_MAGIC);
+	if (wp != vwe->waiter->pipe_w)
+		AZ(epoll_ctl(vwe->epfd, EPOLL_CTL_DEL, wp->fd, NULL));
 	if (ep->events & EPOLLIN) {
-		Wait_Handle(vwe->waiter, sp, WAITER_ACTION, now);
+		Wait_Handle(vwe->waiter, wp, WAITER_ACTION, now);
 	} else if (ep->events & EPOLLERR) {
-		Wait_Handle(vwe->waiter, sp, WAITER_REMCLOSE, now);
+		Wait_Handle(vwe->waiter, wp, WAITER_REMCLOSE, now);
 	} else if (ep->events & EPOLLHUP) {
-		Wait_Handle(vwe->waiter, sp, WAITER_REMCLOSE, now);
+		Wait_Handle(vwe->waiter, wp, WAITER_REMCLOSE, now);
 	} else if (ep->events & EPOLLRDHUP) {
-		Wait_Handle(vwe->waiter, sp, WAITER_REMCLOSE, now);
+		Wait_Handle(vwe->waiter, wp, WAITER_REMCLOSE, now);
 	}
 }