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
e9e8d428
Commit
e9e8d428
authored
Sep 15, 2014
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Eliminate bo->ws_o
parent
52a745bc
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
18 deletions
+14
-18
cache.h
bin/varnishd/cache/cache.h
+0
-3
cache_fetch.c
bin/varnishd/cache/cache_fetch.c
+0
-4
cache_obj.c
bin/varnishd/cache/cache_obj.c
+10
-4
cache_panic.c
bin/varnishd/cache/cache_panic.c
+0
-1
stevedore.c
bin/varnishd/storage/stevedore.c
+2
-5
storage_persistent.c
bin/varnishd/storage/storage_persistent.c
+2
-1
No files found.
bin/varnishd/cache/cache.h
View file @
e9e8d428
...
...
@@ -527,9 +527,6 @@ struct busyobj {
struct
vsl_log
vsl
[
1
];
struct
dstat
*
stats
;
/* Workspace for object only needed during fetch */
struct
ws
ws_o
[
1
];
struct
vsb
*
synth_body
;
};
...
...
bin/varnishd/cache/cache_fetch.c
View file @
e9e8d428
...
...
@@ -137,7 +137,6 @@ vbf_beresp2obj(struct busyobj *bo)
}
AZ
(
ObjSetU32
(
bo
->
vfc
,
OA_VXID
,
VXID
(
bo
->
vsl
->
wid
)));
WS_Assert
(
bo
->
ws_o
);
/* for HTTP_Encode() VSLH call */
bo
->
beresp
->
logtag
=
SLT_ObjMethod
;
...
...
@@ -607,8 +606,6 @@ vbf_stp_fetch(struct worker *wrk, struct busyobj *bo)
assert
(
bo
->
refcount
>=
1
);
AZ
(
WS_Overflowed
(
bo
->
ws_o
));
assert
(
bo
->
state
==
BOS_REQ_DONE
);
if
(
bo
->
do_stream
)
{
...
...
@@ -680,7 +677,6 @@ vbf_stp_condfetch(struct worker *wrk, struct busyobj *bo)
AZ
(
ObjCopyAttr
(
bo
->
vfc
,
bo
->
ims_oc
,
OA_FLAGS
));
AZ
(
ObjCopyAttr
(
bo
->
vfc
,
bo
->
ims_oc
,
OA_GZIPBITS
));
AZ
(
WS_Overflowed
(
bo
->
ws_o
));
if
(
bo
->
do_stream
)
{
HSH_Unbusy
(
&
wrk
->
stats
,
bo
->
fetch_objcore
);
VBO_setstate
(
bo
,
BOS_STREAM
);
...
...
bin/varnishd/cache/cache_obj.c
View file @
e9e8d428
...
...
@@ -407,12 +407,14 @@ ObjSetattr(const struct vfp_ctx *vc, enum obj_attr attr, ssize_t len,
{
struct
object
*
o
;
void
*
retval
=
NULL
;
struct
storage
*
st
;
CHECK_OBJ_NOTNULL
(
vc
,
VFP_CTX_MAGIC
);
CHECK_OBJ_NOTNULL
(
vc
->
bo
,
BUSYOBJ_MAGIC
);
CHECK_OBJ_NOTNULL
(
vc
->
oc
,
OBJCORE_MAGIC
);
o
=
obj_getobj
(
vc
->
oc
,
vc
->
stats
);
CHECK_OBJ_NOTNULL
(
o
,
OBJECT_MAGIC
);
st
=
o
->
objstore
;
switch
(
attr
)
{
case
OA_ESIDATA
:
o
->
esidata
=
objallocwithnuke
(
o
->
body
->
stevedore
,
vc
->
vsl
,
...
...
@@ -431,8 +433,10 @@ ObjSetattr(const struct vfp_ctx *vc, enum obj_attr attr, ssize_t len,
retval
=
o
->
oa_gzipbits
;
break
;
case
OA_HEADERS
:
o
->
oa_http
=
(
void
*
)
WS_Alloc
(
vc
->
bo
->
ws_o
,
len
);
AN
(
o
->
oa_http
);
len
=
PRNDUP
(
len
);
assert
(
st
->
len
+
len
<=
st
->
space
);
o
->
oa_http
=
(
void
*
)(
st
->
ptr
+
st
->
len
);
st
->
len
+=
len
;
retval
=
o
->
oa_http
;
break
;
case
OA_LASTMODIFIED
:
...
...
@@ -440,8 +444,10 @@ ObjSetattr(const struct vfp_ctx *vc, enum obj_attr attr, ssize_t len,
retval
=
o
->
oa_lastmodified
;
break
;
case
OA_VARY
:
o
->
oa_vary
=
(
void
*
)
WS_Alloc
(
vc
->
bo
->
ws_o
,
len
);
AN
(
o
->
oa_vary
);
len
=
PRNDUP
(
len
);
assert
(
st
->
len
+
len
<=
st
->
space
);
o
->
oa_vary
=
(
void
*
)(
st
->
ptr
+
st
->
len
);
st
->
len
+=
len
;
retval
=
o
->
oa_vary
;
break
;
case
OA_VXID
:
...
...
bin/varnishd/cache/cache_panic.c
View file @
e9e8d428
...
...
@@ -342,7 +342,6 @@ pan_busyobj(const struct busyobj *bo)
pan_http
(
"bereq"
,
bo
->
bereq
,
4
);
if
(
bo
->
beresp
->
ws
!=
NULL
)
pan_http
(
"beresp"
,
bo
->
beresp
,
4
);
pan_ws
(
bo
->
ws_o
,
4
);
if
(
bo
->
fetch_objcore
)
pan_objcore
(
"FETCH"
,
bo
->
fetch_objcore
);
if
(
bo
->
ims_oc
)
...
...
bin/varnishd/storage/stevedore.c
View file @
e9e8d428
...
...
@@ -223,10 +223,6 @@ STV_MkObject(struct stevedore *stv, struct busyobj *bo,
l
=
PRNDDN
(
ltot
-
sizeof
*
o
);
assert
(
l
>=
soc
->
wsl
);
WS_Init
(
bo
->
ws_o
,
"obj"
,
o
+
1
,
l
);
WS_Assert
(
bo
->
ws_o
);
assert
(
bo
->
ws_o
->
e
<=
(
char
*
)
ptr
+
ltot
);
VTAILQ_INIT
(
&
o
->
body
->
list
);
bo
->
fetch_objcore
->
stobj
->
magic
=
STOREOBJ_MAGIC
;
...
...
@@ -260,9 +256,10 @@ stv_default_allocobj(struct stevedore *stv, struct busyobj *bo,
stv
->
free
(
st
);
return
(
NULL
);
}
ltot
=
st
->
len
=
st
->
space
;
ltot
=
st
->
space
;
o
=
STV_MkObject
(
stv
,
bo
,
st
->
ptr
,
ltot
,
soc
);
CHECK_OBJ_NOTNULL
(
o
,
OBJECT_MAGIC
);
st
->
len
=
sizeof
(
*
o
);
o
->
objstore
=
st
;
bo
->
stats
->
n_object
++
;
return
(
o
);
...
...
bin/varnishd/storage/storage_persistent.c
View file @
e9e8d428
...
...
@@ -532,13 +532,14 @@ smp_allocobj(struct stevedore *stv, struct busyobj *bo,
return
(
NULL
);
assert
(
st
->
space
>=
ltot
);
ltot
=
st
->
len
=
st
->
space
;
ltot
=
st
->
space
;
o
=
STV_MkObject
(
stv
,
bo
,
st
->
ptr
,
ltot
,
soc
);
AN
(
bo
->
fetch_objcore
->
stobj
->
stevedore
);
assert
(
bo
->
fetch_objcore
->
stobj
->
stevedore
==
stv
);
CHECK_OBJ_NOTNULL
(
o
,
OBJECT_MAGIC
);
o
->
objstore
=
st
;
st
->
len
=
sizeof
(
*
o
);
bo
->
stats
->
n_object
++
;
oc
=
bo
->
fetch_objcore
;
...
...
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