r1043 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2006-09-17 08:45:22 +0200 (Sun, 17 Sep 2006)
New Revision: 1043

Modified:
   trunk/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c
Log:
Possibly better logic.


Modified: trunk/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c	2006-09-16 22:32:00 UTC (rev 1042)
+++ trunk/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c	2006-09-17 06:45:22 UTC (rev 1043)
@@ -41,8 +41,7 @@
 		return;
 	EV_SET(&ki[nki], sp->fd, EVFILT_READ, arm, 0, 0, sp);
 	if (++nki == NKEV) {
-		(void)kevent(kq, ki, nki, NULL, 0, NULL);
-		/* XXX: we could check the error returns here */
+		assert(kevent(kq, ki, nki, NULL, 0, NULL) <= 0);
 		nki = 0;
 	}
 }
@@ -84,14 +83,12 @@
 			SES_Delete(sp);
 		}
 		return;
-	}
-	if (kp->flags == EV_EOF) {
+	} else if (kp->flags == EV_EOF) {
 		TAILQ_REMOVE(&sesshead, sp, list);
 		vca_close_session(sp, "EOF");
 		SES_Delete(sp);
 		return;
 	}
-	INCOMPL();
 }
 
 /*--------------------------------------------------------------------*/