Mailing List Archive

Author: phk
Date: 2008-09-10 15:25:37 +0200 (Wed, 10 Sep 2008)
New Revision: 3177

Modified:
trunk/varnish-cache/bin/varnishd/cache_center.c
Log:
Add more asserts on worker->used



Modified: trunk/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_center.c 2008-09-10 12:08:56 UTC (rev 3176)
+++ trunk/varnish-cache/bin/varnishd/cache_center.c 2008-09-10 13:25:37 UTC (rev 3177)
@@ -219,6 +219,7 @@

sp->t_end = TIM_real();
sp->wrk->used = sp->t_end;
+ assert(!isnan(sp->wrk->used));
if (sp->xid == 0) {
sp->t_req = sp->t_end;
sp->t_resp = sp->t_end;
@@ -235,8 +236,10 @@
WSL_Flush(sp->wrk, 0);

/* If we did an ESI include, don't mess up our state */
- if (sp->esis > 0)
+ if (sp->esis > 0) {
+ assert(!isnan(sp->wrk->used));
return (1);
+ }

sp->t_req = NAN;

@@ -431,6 +434,7 @@
sp->obj->cacheable = 1;
if (sp->obj->objhead != NULL) {
VRY_Create(sp);
+ assert(!isnan(sp->wrk->used));
EXP_Insert(sp->obj, sp->wrk->used);
HSH_Unbusy(sp);
}
@@ -463,6 +467,7 @@
/* Receive a HTTP protocol request */
HTC_Init(sp->htc, sp->ws, sp->fd);
sp->wrk->used = sp->t_open;
+ assert(!isnan(sp->wrk->used));
sp->wrk->acct.sess++;
SES_RefSrcAddr(sp);
do
@@ -620,6 +625,7 @@
*/
if (isnan(sp->wrk->used))
sp->wrk->used = TIM_real();
+ assert(!isnan(sp->wrk->used));
SES_Charge(sp);
return (1);
}
@@ -864,6 +870,7 @@
/* XXX: VSL something */
INCOMPL();
sp->step = STP_DONE;
+ assert(!isnan(sp->wrk->used));
return (1);
}
sp->step = STP_PIPE;
@@ -903,6 +910,7 @@
VSL_stats->client_req++; /* XXX not locked */
sp->t_req = TIM_real();
sp->wrk->used = sp->t_req;
+ assert(!isnan(sp->wrk->used));
sp->wrk->acct.req++;

/* Assign XID and log */