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
649d9f4a
Commit
649d9f4a
authored
Apr 18, 2016
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add some oc->refcnt paranoid asserts.
parent
5f0dc307
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
8 deletions
+15
-8
cache_ban.c
bin/varnishd/cache/cache_ban.c
+1
-2
cache_expire.c
bin/varnishd/cache/cache_expire.c
+9
-5
cache_hash.c
bin/varnishd/cache/cache_hash.c
+5
-1
No files found.
bin/varnishd/cache/cache_ban.c
View file @
649d9f4a
...
...
@@ -530,6 +530,7 @@ BAN_CheckObject(struct worker *wrk, struct objcore *oc, struct req *req)
CHECK_OBJ_NOTNULL
(
oc
,
OBJCORE_MAGIC
);
CHECK_OBJ_NOTNULL
(
req
,
REQ_MAGIC
);
Lck_AssertHeld
(
&
oc
->
objhead
->
mtx
);
assert
(
oc
->
refcnt
>
0
);
vsl
=
req
->
vsl
;
...
...
@@ -597,8 +598,6 @@ BAN_CheckObject(struct worker *wrk, struct objcore *oc, struct req *req)
}
else
{
VSLb
(
vsl
,
SLT_ExpBan
,
"%u banned lookup"
,
ObjGetXID
(
wrk
,
oc
));
VSC_C_main
->
bans_obj_killed
++
;
oc
->
flags
|=
OC_F_DYING
;
EXP_Poke
(
oc
);
return
(
1
);
}
}
...
...
bin/varnishd/cache/cache_expire.c
View file @
649d9f4a
...
...
@@ -83,6 +83,7 @@ static void
exp_mail_it
(
struct
objcore
*
oc
,
uint8_t
cmds
)
{
CHECK_OBJ_NOTNULL
(
oc
,
OBJCORE_MAGIC
);
assert
(
oc
->
refcnt
>
0
);
Lck_Lock
(
&
exphdl
->
mtx
);
if
(
!
(
oc
->
exp_flags
&
OC_EF_POSTED
))
{
...
...
@@ -174,20 +175,21 @@ exp_inbox(struct exp_priv *ep, struct objcore *oc, unsigned flags)
CHECK_OBJ_NOTNULL
(
ep
,
EXP_PRIV_MAGIC
);
CHECK_OBJ_NOTNULL
(
oc
,
OBJCORE_MAGIC
);
assert
(
oc
->
refcnt
>
0
);
VSLb
(
&
ep
->
vsl
,
SLT_ExpKill
,
"EXP_Inbox
p=%p e=%.9f f=0x%x"
,
oc
,
oc
->
timer_when
,
oc
->
flags
);
VSLb
(
&
ep
->
vsl
,
SLT_ExpKill
,
"EXP_Inbox
flg=%x p=%p e=%.9f f=0x%x"
,
flags
,
oc
,
oc
->
timer_when
,
oc
->
flags
);
if
(
oc
->
flags
&
OC_F_DYING
)
{
oc
->
exp_flags
&=
~
OC_EF_EXP
;
VSLb
(
&
ep
->
vsl
,
SLT_ExpKill
,
"EXP_Kill p=%p e=%.9f f=0x%x"
,
oc
,
oc
->
timer_when
,
oc
->
flags
);
if
(
!
(
flags
&
OC_EF_INSERT
))
{
assert
(
oc
->
timer_idx
!=
BINHEAP_NOIDX
);
binheap_delete
(
ep
->
heap
,
oc
->
timer_idx
);
}
assert
(
oc
->
timer_idx
==
BINHEAP_NOIDX
);
ObjSendEvent
(
ep
->
wrk
,
oc
,
OEV_REMOVE
);
oc
->
exp_flags
&=
~
OC_EF_EXP
;
assert
(
oc
->
refcnt
>
0
);
AZ
(
oc
->
exp_flags
);
(
void
)
HSH_DerefObjCore
(
ep
->
wrk
,
&
oc
);
return
;
}
...
...
@@ -304,7 +306,9 @@ exp_thread(struct worker *wrk, void *priv)
Lck_Lock
(
&
ep
->
mtx
);
oc
=
VSTAILQ_FIRST
(
&
ep
->
inbox
);
CHECK_OBJ_ORNULL
(
oc
,
OBJCORE_MAGIC
);
if
(
oc
!=
NULL
)
{
assert
(
oc
->
refcnt
>=
1
);
VSTAILQ_REMOVE
(
&
ep
->
inbox
,
oc
,
objcore
,
exp_list
);
VSC_C_main
->
exp_received
++
;
tnext
=
0
;
...
...
bin/varnishd/cache/cache_hash.c
View file @
649d9f4a
...
...
@@ -385,6 +385,7 @@ HSH_Lookup(struct req *req, struct objcore **ocp, struct objcore **bocp,
assert
(
oh
->
refcnt
>
1
);
CHECK_OBJ_NOTNULL
(
oc
,
OBJCORE_MAGIC
);
assert
(
oc
->
objhead
==
oh
);
assert
(
oc
->
refcnt
>
0
);
if
(
oc
->
flags
&
OC_F_DYING
)
continue
;
...
...
@@ -408,8 +409,11 @@ HSH_Lookup(struct req *req, struct objcore **ocp, struct objcore **bocp,
if
(
oc
->
ttl
<=
0
.)
continue
;
if
(
BAN_CheckObject
(
wrk
,
oc
,
req
))
if
(
BAN_CheckObject
(
wrk
,
oc
,
req
))
{
oc
->
flags
|=
OC_F_DYING
;
EXP_Poke
(
oc
);
continue
;
}
if
(
ObjHasAttr
(
wrk
,
oc
,
OA_VARY
))
{
vary
=
ObjGetAttr
(
wrk
,
oc
,
OA_VARY
,
NULL
);
...
...
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