r4560 - trunk/varnish-cache/bin/varnishd

phk at projects.linpro.no phk at projects.linpro.no
Sat Feb 13 09:55:05 CET 2010


Author: phk
Date: 2010-02-13 09:55:05 +0100 (Sat, 13 Feb 2010)
New Revision: 4560

Modified:
   trunk/varnish-cache/bin/varnishd/cache_waiter_poll.c
Log:
Assert that we found all active fd's



Modified: trunk/varnish-cache/bin/varnishd/cache_waiter_poll.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_waiter_poll.c	2010-02-13 08:31:04 UTC (rev 4559)
+++ trunk/varnish-cache/bin/varnishd/cache_waiter_poll.c	2010-02-13 08:55:05 UTC (rev 4560)
@@ -156,6 +156,9 @@
 			if (pollfd[fd].revents) {
 				v--;
 				i = HTC_Rx(sp->htc);
+				if (pollfd[fd].revents != POLLIN)
+					VSL(SLT_Debug, fd, "Poll: %x / %d",
+					    pollfd[fd].revents, i);
 				VTAILQ_REMOVE(&sesshead, sp, list);
 				if (i == 0) {
 					/* Mov to front of list for speed */
@@ -172,6 +175,7 @@
 				SES_Delete(sp);
 			}
 		}
+		assert(v == 0);
 	}
 	NEEDLESS_RETURN(NULL);
 }



More information about the varnish-commit mailing list