r3645 - branches/2.0/varnish-cache/bin/varnishd

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2009-02-06 11:28:54 +0100 (Fri, 06 Feb 2009)
New Revision: 3645

Modified:
   branches/2.0/varnish-cache/bin/varnishd/cache_center.c
   branches/2.0/varnish-cache/bin/varnishd/cache_pool.c
Log:
Merge r3445: Add asserts to find where WRW is leaking in ticket 390



Modified: branches/2.0/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/cache_center.c	2009-02-06 10:25:20 UTC (rev 3644)
+++ branches/2.0/varnish-cache/bin/varnishd/cache_center.c	2009-02-06 10:28:54 UTC (rev 3645)
@@ -176,6 +176,7 @@
 	sp->restarts = 0;
 
 	RES_WriteObj(sp);
+	AZ(sp->wrk->wfd);
 	HSH_Deref(sp->obj);
 	sp->obj = NULL;
 	sp->step = STP_DONE;
@@ -383,6 +384,7 @@
 	AN(sp->director);
 	AZ(sp->vbe);
 	i = Fetch(sp);
+	AZ(sp->wrk->wfd);
 	AZ(sp->vbe);
 	AN(sp->director);
 
@@ -799,6 +801,7 @@
 	assert(sp->handling == VCL_RET_PIPE);
 
 	PipeSession(sp);
+	AZ(sp->wrk->wfd);
 	sp->step = STP_DONE;
 	return (0);
 }
@@ -1025,6 +1028,7 @@
 		CHECK_OBJ_ORNULL(w->nobjhead, OBJHEAD_MAGIC);
 	}
 	WSL_Flush(w, 0);
+	AZ(w->wfd);
 }
 
 /*

Modified: branches/2.0/varnish-cache/bin/varnishd/cache_pool.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/cache_pool.c	2009-02-06 10:25:20 UTC (rev 3644)
+++ branches/2.0/varnish-cache/bin/varnishd/cache_pool.c	2009-02-06 10:28:54 UTC (rev 3645)
@@ -308,6 +308,8 @@
 		AN(w->wrq->func);
 		w->lastused = NAN;
 		w->wrq->func(w, w->wrq->priv);
+		AZ(w->wfd);
+		assert(w->wlp == w->wlb);
 		w->wrq = NULL;
 		Lck_Lock(&qp->mtx);
 	}