Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnishevent3
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
uplex-varnish
varnishevent3
Commits
e3deca91
Commit
e3deca91
authored
Jun 27, 2011
by
Poul-Henning Kamp
Committed by
Tollef Fog Heen
Aug 16, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enforce that oc_getobj() does not work on BUSY objcores.
parent
03fe1a49
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
cache.h
bin/varnishd/cache.h
+1
-0
cache_hash.c
bin/varnishd/cache_hash.c
+1
-1
No files found.
bin/varnishd/cache.h
View file @
e3deca91
...
@@ -434,6 +434,7 @@ oc_getobj(struct worker *wrk, struct objcore *oc)
...
@@ -434,6 +434,7 @@ oc_getobj(struct worker *wrk, struct objcore *oc)
{
{
CHECK_OBJ_NOTNULL
(
oc
,
OBJCORE_MAGIC
);
CHECK_OBJ_NOTNULL
(
oc
,
OBJCORE_MAGIC
);
AZ
(
oc
->
flags
&
OC_F_BUSY
);
AN
(
oc
->
methods
);
AN
(
oc
->
methods
);
AN
(
oc
->
methods
->
getobj
);
AN
(
oc
->
methods
->
getobj
);
return
(
oc
->
methods
->
getobj
(
wrk
,
oc
));
return
(
oc
->
methods
->
getobj
(
wrk
,
oc
));
...
...
bin/varnishd/cache_hash.c
View file @
e3deca91
...
@@ -594,7 +594,6 @@ HSH_Unbusy(const struct sess *sp)
...
@@ -594,7 +594,6 @@ HSH_Unbusy(const struct sess *sp)
AssertObjBusy
(
o
);
AssertObjBusy
(
o
);
AN
(
oc
->
ban
);
AN
(
oc
->
ban
);
assert
(
oc_getobj
(
sp
->
wrk
,
oc
)
==
o
);
assert
(
oc
->
refcnt
>
0
);
assert
(
oc
->
refcnt
>
0
);
assert
(
oh
->
refcnt
>
0
);
assert
(
oh
->
refcnt
>
0
);
if
(
o
->
ws_o
->
overflow
)
if
(
o
->
ws_o
->
overflow
)
...
@@ -613,6 +612,7 @@ HSH_Unbusy(const struct sess *sp)
...
@@ -613,6 +612,7 @@ HSH_Unbusy(const struct sess *sp)
hsh_rush
(
oh
);
hsh_rush
(
oh
);
AN
(
oc
->
ban
);
AN
(
oc
->
ban
);
Lck_Unlock
(
&
oh
->
mtx
);
Lck_Unlock
(
&
oh
->
mtx
);
assert
(
oc_getobj
(
sp
->
wrk
,
oc
)
==
o
);
}
}
void
void
...
...
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