[master] 4300c74 Strip the tag bits when setting obj->vxid rather than everytime we put it into a http-header.
Poul-Henning Kamp
phk at FreeBSD.org
Wed Aug 6 11:19:22 CEST 2014
commit 4300c741125d9b45ba1660179a79907be3943d98
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Wed Aug 6 09:18:42 2014 +0000
Strip the tag bits when setting obj->vxid rather than everytime we
put it into a http-header.
diff --git a/bin/varnishd/cache/cache_ban.c b/bin/varnishd/cache/cache_ban.c
index 552b67a..fdd0443 100644
--- a/bin/varnishd/cache/cache_ban.c
+++ b/bin/varnishd/cache/cache_ban.c
@@ -968,7 +968,7 @@ BAN_CheckObject(struct worker *wrk, struct objcore *oc, struct req *req)
} else {
oc->ban = NULL;
VSLb(vsl, SLT_ExpBan, "%u banned lookup",
- VXID(ObjGetXID(oc, &wrk->stats)));
+ ObjGetXID(oc, &wrk->stats));
VSC_C_main->bans_obj_killed++;
EXP_Rearm(oc, oc->exp.t_origin, 0, 0, 0); // XXX fake now
return (1);
@@ -1104,7 +1104,7 @@ ban_lurker_test_ban(struct worker *wrk, struct vsl_log *vsl, struct ban *bt,
}
if (i) {
VSLb(vsl, SLT_ExpBan, "%u banned by lurker",
- VXID(ObjGetXID(oc, &wrk->stats)));
+ ObjGetXID(oc, &wrk->stats));
EXP_Rearm(oc, oc->exp.t_origin, 0, 0, 0); // XXX fake now
VSC_C_main->bans_lurker_obj_killed++;
}
diff --git a/bin/varnishd/cache/cache_expire.c b/bin/varnishd/cache/cache_expire.c
index 6cea948..2afb254 100644
--- a/bin/varnishd/cache/cache_expire.c
+++ b/bin/varnishd/cache/cache_expire.c
@@ -340,7 +340,7 @@ EXP_NukeOne(struct busyobj *bo, struct lru *lru)
exp_mail_it(oc);
- VSLb(bo->vsl, SLT_ExpKill, "LRU x=%u", VXID(ObjGetXID(oc, bo->stats)));
+ VSLb(bo->vsl, SLT_ExpKill, "LRU x=%u", ObjGetXID(oc, bo->stats));
AN(bo->stats);
AN(oc);
(void)HSH_DerefObjCore(bo->stats, &oc);
@@ -472,7 +472,7 @@ exp_expire(struct exp_priv *ep, double now)
o = ObjGetObj(oc, &ep->wrk->stats);
CHECK_OBJ_NOTNULL(o, OBJECT_MAGIC);
VSLb(&ep->vsl, SLT_ExpKill, "EXP_Expired x=%u t=%.0f",
- VXID(ObjGetXID(oc, &ep->wrk->stats)),
+ ObjGetXID(oc, &ep->wrk->stats),
EXP_Ttl(NULL, &oc->exp) - now);
(void)HSH_DerefObjCore(&ep->wrk->stats, &oc);
return (0);
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 5b66145..4fab36b 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -151,7 +151,8 @@ vbf_beresp2obj(struct busyobj *bo)
VSB_delete(vary);
}
- AZ(ObjSetU32(bo->fetch_objcore, bo->stats, OA_VXID, bo->vsl->wid));
+ AZ(ObjSetU32(bo->fetch_objcore, bo->stats, OA_VXID,
+ VXID(bo->vsl->wid)));
WS_Assert(bo->ws_o);
/* Filter into object */
diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index 596a68d..a07f12f 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -111,7 +111,7 @@ cnt_deliver(struct worker *wrk, struct req *req)
if (req->wrk->stats.cache_hit)
http_PrintfHeader(req->resp,
"X-Varnish: %u %u", VXID(req->vsl->wid),
- VXID(ObjGetXID(req->objcore, &wrk->stats)));
+ ObjGetXID(req->objcore, &wrk->stats));
else
http_PrintfHeader(req->resp,
"X-Varnish: %u", VXID(req->vsl->wid));
@@ -402,7 +402,7 @@ cnt_lookup(struct worker *wrk, struct req *req)
/* Found a hit-for-pass */
VSLb(req->vsl, SLT_Debug, "XXXX HIT-FOR-PASS");
VSLb(req->vsl, SLT_HitPass, "%u",
- VXID(ObjGetXID(req->objcore, &wrk->stats)));
+ ObjGetXID(req->objcore, &wrk->stats));
AZ(boc);
AZ(req->obj);
(void)HSH_DerefObjCore(&wrk->stats, &req->objcore);
@@ -412,7 +412,7 @@ cnt_lookup(struct worker *wrk, struct req *req)
}
VSLb(req->vsl, SLT_Hit, "%u",
- VXID(ObjGetXID(req->objcore, &wrk->stats)));
+ ObjGetXID(req->objcore, &wrk->stats));
VCL_hit_method(req->vcl, wrk, req, NULL, req->http->ws);
More information about the varnish-commit
mailing list