Commit f75c69cc authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Add more paranoia


git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@2190 d4fa192b-c00b-0410-8231-f00ffab90ce4
parent 7ecee2f9
......@@ -87,6 +87,9 @@ cnt_again(struct sess *sp)
{
int i;
CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC);
AZ(sp->obj);
assert(sp->xid == 0);
i = HTC_Complete(sp->htc);
......@@ -142,6 +145,10 @@ static int
cnt_deliver(struct sess *sp)
{
CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
CHECK_OBJ_NOTNULL(sp->obj, OBJECT_MAGIC);
CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC);
sp->t_resp = TIM_real();
if (sp->obj->objhead != NULL)
EXP_Touch(sp->obj, sp->t_resp);
......@@ -183,6 +190,9 @@ cnt_done(struct sess *sp)
double dh, dp, da;
int i;
CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC);
AZ(sp->obj);
AZ(sp->bereq);
sp->backend = NULL;
......@@ -305,6 +315,9 @@ cnt_fetch(struct sess *sp)
{
int i;
CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC);
AN(sp->bereq);
CHECK_OBJ_NOTNULL(sp->backend, BACKEND_MAGIC);
i = Fetch(sp);
......@@ -428,6 +441,10 @@ static int
cnt_hit(struct sess *sp)
{
CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
CHECK_OBJ_NOTNULL(sp->obj, OBJECT_MAGIC);
CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC);
assert(!sp->obj->pass);
VCL_hit_method(sp);
......@@ -492,6 +509,7 @@ cnt_lookup(struct sess *sp)
uintptr_t u;
CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC);
if (sp->obj == NULL) {
......@@ -585,6 +603,10 @@ static int
cnt_miss(struct sess *sp)
{
CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
CHECK_OBJ_NOTNULL(sp->obj, OBJECT_MAGIC);
CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC);
http_FilterHeader(sp, HTTPH_R_FETCH);
VCL_miss_method(sp);
if (sp->handling == VCL_RET_ERROR) {
......@@ -644,6 +666,8 @@ static int
cnt_pass(struct sess *sp)
{
CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC);
AZ(sp->obj);
http_FilterHeader(sp, HTTPH_R_PASS);
......@@ -690,6 +714,9 @@ static int
cnt_pipe(struct sess *sp)
{
CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC);
sp->wrk->acct.pipe++;
http_FilterHeader(sp, HTTPH_R_PIPE);
......@@ -725,8 +752,9 @@ static int
cnt_recv(struct sess *sp)
{
CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC);
AZ(sp->obj);
AN(sp->vcl);
VCL_recv_method(sp);
......@@ -770,6 +798,7 @@ cnt_start(struct sess *sp)
{
int done;
CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
AZ(sp->restarts);
AZ(sp->obj);
AZ(sp->vcl);
......
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