Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
4300c741
Commit
4300c741
authored
Aug 06, 2014
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Strip the tag bits when setting obj->vxid rather than everytime we
put it into a http-header.
parent
6ce5b1ef
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
8 deletions
+9
-8
cache_ban.c
bin/varnishd/cache/cache_ban.c
+2
-2
cache_expire.c
bin/varnishd/cache/cache_expire.c
+2
-2
cache_fetch.c
bin/varnishd/cache/cache_fetch.c
+2
-1
cache_req_fsm.c
bin/varnishd/cache/cache_req_fsm.c
+3
-3
No files found.
bin/varnishd/cache/cache_ban.c
View file @
4300c741
...
...
@@ -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
++
;
}
...
...
bin/varnishd/cache/cache_expire.c
View file @
4300c741
...
...
@@ -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
);
...
...
bin/varnishd/cache/cache_fetch.c
View file @
4300c741
...
...
@@ -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 */
...
...
bin/varnishd/cache/cache_req_fsm.c
View file @
4300c741
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment