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
90862a70
Commit
90862a70
authored
Feb 24, 2016
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add a BOS_PREP_STREAM state to notify stevedores before streaming
starts.
parent
cbe3974f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
1 deletion
+4
-1
cache.h
bin/varnishd/cache/cache.h
+1
-0
cache_fetch.c
bin/varnishd/cache/cache_fetch.c
+2
-0
cache_obj.c
bin/varnishd/cache/cache_obj.c
+1
-1
No files found.
bin/varnishd/cache/cache.h
View file @
90862a70
...
...
@@ -365,6 +365,7 @@ struct storeobj {
enum
boc_state_e
{
BOS_INVALID
=
0
,
/* don't touch (yet) */
BOS_REQ_DONE
,
/* beresp.* can be examined */
BOS_PREP_STREAM
,
/* Prepare for streaming */
BOS_STREAM
,
/* beresp.* can be examined */
BOS_FINISHED
,
/* object is complete */
BOS_FAILED
,
/* something went wrong */
...
...
bin/varnishd/cache/cache_fetch.c
View file @
90862a70
...
...
@@ -672,6 +672,7 @@ vbf_stp_fetch(struct worker *wrk, struct busyobj *bo)
assert
(
bo
->
fetch_objcore
->
boc
->
state
==
BOS_REQ_DONE
);
if
(
bo
->
do_stream
)
{
ObjSetState
(
wrk
,
bo
->
fetch_objcore
,
BOS_PREP_STREAM
);
HSH_Unbusy
(
wrk
,
bo
->
fetch_objcore
);
ObjSetState
(
wrk
,
bo
->
fetch_objcore
,
BOS_STREAM
);
}
...
...
@@ -762,6 +763,7 @@ vbf_stp_condfetch(struct worker *wrk, struct busyobj *bo)
AZ
(
ObjCopyAttr
(
bo
->
wrk
,
bo
->
fetch_objcore
,
bo
->
stale_oc
,
OA_GZIPBITS
));
if
(
bo
->
do_stream
)
{
ObjSetState
(
wrk
,
bo
->
fetch_objcore
,
BOS_PREP_STREAM
);
HSH_Unbusy
(
wrk
,
bo
->
fetch_objcore
);
ObjSetState
(
wrk
,
bo
->
fetch_objcore
,
BOS_STREAM
);
}
...
...
bin/varnishd/cache/cache_obj.c
View file @
90862a70
...
...
@@ -54,7 +54,7 @@
* 2 ObjSetU32()
* 2 ObjSetU64()
*
* 2->3 ObjStable() Will no longer be modified
* 2->3 ObjStable() Will no longer be modified
(clean up boc)
*
* 23 ObjHasAttr()
* 23 ObjGetAttr()
...
...
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