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
78045920
Commit
78045920
authored
Aug 18, 2014
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make the object iterator work on objcore and get rid of ims_obj.
parent
43b39e5f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
16 deletions
+10
-16
cache.h
bin/varnishd/cache/cache.h
+1
-2
cache_fetch.c
bin/varnishd/cache/cache_fetch.c
+2
-10
cache_http1_deliver.c
bin/varnishd/cache/cache_http1_deliver.c
+1
-1
cache_obj.c
bin/varnishd/cache/cache_obj.c
+4
-1
cache_panic.c
bin/varnishd/cache/cache_panic.c
+2
-2
No files found.
bin/varnishd/cache/cache.h
View file @
78045920
...
...
@@ -494,7 +494,6 @@ struct busyobj {
struct
http
*
bereq0
;
struct
http
*
bereq
;
struct
http
*
beresp
;
struct
object
*
ims_obj
;
struct
objcore
*
ims_oc
;
struct
objcore
*
fetch_objcore
;
...
...
@@ -1058,7 +1057,7 @@ enum objiter_status {
OIS_STREAM
,
OIS_ERROR
,
};
struct
objiter
*
ObjIterBegin
(
struct
worker
*
,
struct
obj
ect
*
);
struct
objiter
*
ObjIterBegin
(
struct
worker
*
,
struct
obj
core
*
);
enum
objiter_status
ObjIter
(
struct
objiter
*
,
void
**
,
ssize_t
*
);
void
ObjIterEnd
(
struct
objiter
**
);
void
ObjTrimStore
(
struct
objcore
*
,
struct
dstat
*
);
...
...
bin/varnishd/cache/cache_fetch.c
View file @
78045920
...
...
@@ -590,7 +590,7 @@ vbf_stp_condfetch(struct worker *wrk, struct busyobj *bo)
al
=
0
;
ol
=
ObjGetLen
(
bo
->
ims_oc
,
bo
->
stats
);
oi
=
ObjIterBegin
(
wrk
,
bo
->
ims_o
bj
);
oi
=
ObjIterBegin
(
wrk
,
bo
->
ims_o
c
);
do
{
ois
=
ObjIter
(
oi
,
&
sp
,
&
sl
);
while
(
sl
>
0
)
{
...
...
@@ -803,10 +803,8 @@ vbf_fetch_thread(struct worker *wrk, void *priv)
}
AZ
(
bo
->
fetch_objcore
->
busyobj
);
if
(
bo
->
ims_oc
!=
NULL
)
{
if
(
bo
->
ims_oc
!=
NULL
)
(
void
)
HSH_DerefObjCore
(
&
wrk
->
stats
,
&
bo
->
ims_oc
);
bo
->
ims_obj
=
NULL
;
}
bo
->
stats
=
NULL
;
...
...
@@ -823,7 +821,6 @@ VBF_Fetch(struct worker *wrk, struct req *req, struct objcore *oc,
{
struct
busyobj
*
bo
;
const
char
*
how
;
struct
object
*
oldobj
=
NULL
;
CHECK_OBJ_NOTNULL
(
wrk
,
WORKER_MAGIC
);
CHECK_OBJ_NOTNULL
(
req
,
REQ_MAGIC
);
...
...
@@ -861,17 +858,12 @@ VBF_Fetch(struct worker *wrk, struct req *req, struct objcore *oc,
HSH_Ref
(
oc
);
bo
->
fetch_objcore
=
oc
;
AZ
(
bo
->
ims_obj
);
AZ
(
bo
->
ims_oc
);
if
(
oldoc
!=
NULL
&&
ObjCheckFlag
(
oldoc
,
&
req
->
wrk
->
stats
,
OF_IMSCAND
))
{
assert
(
oldoc
->
refcnt
>
0
);
HSH_Ref
(
oldoc
);
bo
->
ims_oc
=
oldoc
;
oldobj
=
ObjGetObj
(
oldoc
,
&
wrk
->
stats
);
CHECK_OBJ_NOTNULL
(
oldobj
,
OBJECT_MAGIC
);
bo
->
ims_obj
=
oldobj
;
}
AZ
(
bo
->
req
);
...
...
bin/varnishd/cache/cache_http1_deliver.c
View file @
78045920
...
...
@@ -174,7 +174,7 @@ v1d_WriteDirObj(struct req *req)
CHECK_OBJ_NOTNULL
(
req
,
REQ_MAGIC
);
oi
=
ObjIterBegin
(
req
->
wrk
,
req
->
obj
);
oi
=
ObjIterBegin
(
req
->
wrk
,
req
->
obj
core
);
XXXAN
(
oi
);
do
{
...
...
bin/varnishd/cache/cache_obj.c
View file @
78045920
...
...
@@ -46,10 +46,13 @@ struct objiter {
};
struct
objiter
*
ObjIterBegin
(
struct
worker
*
wrk
,
struct
obj
ect
*
obj
)
ObjIterBegin
(
struct
worker
*
wrk
,
struct
obj
core
*
oc
)
{
struct
objiter
*
oi
;
struct
object
*
obj
;
CHECK_OBJ_NOTNULL
(
oc
,
OBJCORE_MAGIC
);
obj
=
ObjGetObj
(
oc
,
&
wrk
->
stats
);
CHECK_OBJ_NOTNULL
(
obj
,
OBJECT_MAGIC
);
ALLOC_OBJ
(
oi
,
OBJITER_MAGIC
);
if
(
oi
==
NULL
)
...
...
bin/varnishd/cache/cache_panic.c
View file @
78045920
...
...
@@ -341,8 +341,8 @@ pan_busyobj(const struct busyobj *bo)
pan_ws
(
bo
->
ws_o
,
4
);
if
(
bo
->
fetch_objcore
)
pan_objcore
(
"FETCH"
,
bo
->
fetch_objcore
);
if
(
bo
->
ims_o
bj
)
pan_obj
ect
(
"IMS"
,
bo
->
ims_obj
);
if
(
bo
->
ims_o
c
)
pan_obj
core
(
"IMS"
,
bo
->
ims_oc
);
VSB_printf
(
pan_vsp
,
" }
\n
"
);
}
...
...
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