r3445 - trunk/varnish-cache/bin/varnishd
phk at projects.linpro.no
phk at projects.linpro.no
Wed Nov 26 13:05:44 CET 2008
Author: phk
Date: 2008-11-26 13:05:44 +0100 (Wed, 26 Nov 2008)
New Revision: 3445
Modified:
trunk/varnish-cache/bin/varnishd/cache_center.c
trunk/varnish-cache/bin/varnishd/cache_pool.c
Log:
Add asserts to find where WRW is leaking in ticket 390
Modified: trunk/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_center.c 2008-11-25 16:04:47 UTC (rev 3444)
+++ trunk/varnish-cache/bin/varnishd/cache_center.c 2008-11-26 12:05:44 UTC (rev 3445)
@@ -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: trunk/varnish-cache/bin/varnishd/cache_pool.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_pool.c 2008-11-25 16:04:47 UTC (rev 3444)
+++ trunk/varnish-cache/bin/varnishd/cache_pool.c 2008-11-26 12:05:44 UTC (rev 3445)
@@ -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);
}
More information about the varnish-commit
mailing list