Commit 00d8ddcf authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Add more asserts on worker->used



git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@3177 d4fa192b-c00b-0410-8231-f00ffab90ce4
parent 6af79c15
...@@ -219,6 +219,7 @@ cnt_done(struct sess *sp) ...@@ -219,6 +219,7 @@ cnt_done(struct sess *sp)
sp->t_end = TIM_real(); sp->t_end = TIM_real();
sp->wrk->used = sp->t_end; sp->wrk->used = sp->t_end;
assert(!isnan(sp->wrk->used));
if (sp->xid == 0) { if (sp->xid == 0) {
sp->t_req = sp->t_end; sp->t_req = sp->t_end;
sp->t_resp = sp->t_end; sp->t_resp = sp->t_end;
...@@ -235,8 +236,10 @@ cnt_done(struct sess *sp) ...@@ -235,8 +236,10 @@ cnt_done(struct sess *sp)
WSL_Flush(sp->wrk, 0); WSL_Flush(sp->wrk, 0);
/* If we did an ESI include, don't mess up our state */ /* 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); return (1);
}
sp->t_req = NAN; sp->t_req = NAN;
...@@ -431,6 +434,7 @@ cnt_fetch(struct sess *sp) ...@@ -431,6 +434,7 @@ cnt_fetch(struct sess *sp)
sp->obj->cacheable = 1; sp->obj->cacheable = 1;
if (sp->obj->objhead != NULL) { if (sp->obj->objhead != NULL) {
VRY_Create(sp); VRY_Create(sp);
assert(!isnan(sp->wrk->used));
EXP_Insert(sp->obj, sp->wrk->used); EXP_Insert(sp->obj, sp->wrk->used);
HSH_Unbusy(sp); HSH_Unbusy(sp);
} }
...@@ -463,6 +467,7 @@ cnt_first(struct sess *sp) ...@@ -463,6 +467,7 @@ cnt_first(struct sess *sp)
/* Receive a HTTP protocol request */ /* Receive a HTTP protocol request */
HTC_Init(sp->htc, sp->ws, sp->fd); HTC_Init(sp->htc, sp->ws, sp->fd);
sp->wrk->used = sp->t_open; sp->wrk->used = sp->t_open;
assert(!isnan(sp->wrk->used));
sp->wrk->acct.sess++; sp->wrk->acct.sess++;
SES_RefSrcAddr(sp); SES_RefSrcAddr(sp);
do do
...@@ -620,6 +625,7 @@ cnt_lookup(struct sess *sp) ...@@ -620,6 +625,7 @@ cnt_lookup(struct sess *sp)
*/ */
if (isnan(sp->wrk->used)) if (isnan(sp->wrk->used))
sp->wrk->used = TIM_real(); sp->wrk->used = TIM_real();
assert(!isnan(sp->wrk->used));
SES_Charge(sp); SES_Charge(sp);
return (1); return (1);
} }
...@@ -864,6 +870,7 @@ cnt_recv(struct sess *sp) ...@@ -864,6 +870,7 @@ cnt_recv(struct sess *sp)
/* XXX: VSL something */ /* XXX: VSL something */
INCOMPL(); INCOMPL();
sp->step = STP_DONE; sp->step = STP_DONE;
assert(!isnan(sp->wrk->used));
return (1); return (1);
} }
sp->step = STP_PIPE; sp->step = STP_PIPE;
...@@ -903,6 +910,7 @@ cnt_start(struct sess *sp) ...@@ -903,6 +910,7 @@ cnt_start(struct sess *sp)
VSL_stats->client_req++; /* XXX not locked */ VSL_stats->client_req++; /* XXX not locked */
sp->t_req = TIM_real(); sp->t_req = TIM_real();
sp->wrk->used = sp->t_req; sp->wrk->used = sp->t_req;
assert(!isnan(sp->wrk->used));
sp->wrk->acct.req++; sp->wrk->acct.req++;
/* Assign XID and log */ /* Assign XID and log */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment