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
98272265
Commit
98272265
authored
Aug 05, 2014
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More req->obj low hanging fruit
parent
d717b1bc
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
10 deletions
+18
-10
cache_esi_deliver.c
bin/varnishd/cache/cache_esi_deliver.c
+18
-10
No files found.
bin/varnishd/cache/cache_esi_deliver.c
View file @
98272265
...
...
@@ -262,9 +262,13 @@ ESI_Deliver(struct req *req)
size_t
dl
;
const
void
*
dp
;
int
i
;
struct
object
*
obj
;
CHECK_OBJ_NOTNULL
(
req
,
REQ_MAGIC
);
CHECK_OBJ_NOTNULL
(
req
->
objcore
,
OBJCORE_MAGIC
);
p
=
ObjGetattr
(
req
->
objcore
,
&
req
->
wrk
->
stats
,
OA_ESIDATA
,
&
l
);
obj
=
ObjGetObj
(
req
->
objcore
,
&
req
->
wrk
->
stats
);
CHECK_OBJ_NOTNULL
(
obj
,
OBJECT_MAGIC
);
AN
(
p
);
assert
(
l
>
0
);
e
=
p
+
l
;
...
...
@@ -304,7 +308,7 @@ ESI_Deliver(struct req *req)
AZ
(
dl
);
}
st
=
VTAILQ_FIRST
(
&
req
->
obj
->
body
->
list
);
st
=
VTAILQ_FIRST
(
&
obj
->
body
->
list
);
off
=
0
;
while
(
p
<
e
)
{
...
...
@@ -455,14 +459,15 @@ ESI_Deliver(struct req *req)
*/
static
uint8_t
ved_deliver_byterange
(
struct
req
*
req
,
ssize_t
low
,
ssize_t
high
)
ved_deliver_byterange
(
struct
req
*
req
,
const
struct
object
*
obj
,
ssize_t
low
,
ssize_t
high
)
{
struct
storage
*
st
;
ssize_t
l
,
lx
;
u_char
*
p
;
lx
=
0
;
VTAILQ_FOREACH
(
st
,
&
req
->
obj
->
body
->
list
,
list
)
{
VTAILQ_FOREACH
(
st
,
&
obj
->
body
->
list
,
list
)
{
p
=
st
->
ptr
;
l
=
st
->
len
;
if
(
lx
+
l
<
low
)
{
...
...
@@ -505,8 +510,13 @@ ESI_DeliverChild(struct req *req)
uint8_t
tailbuf
[
8
];
CHECK_OBJ_NOTNULL
(
req
,
REQ_MAGIC
);
if
(
!
req
->
obj
->
gziped
)
{
VTAILQ_FOREACH
(
st
,
&
req
->
obj
->
body
->
list
,
list
)
CHECK_OBJ_NOTNULL
(
req
->
objcore
,
OBJCORE_MAGIC
);
obj
=
ObjGetObj
(
req
->
objcore
,
&
req
->
wrk
->
stats
);
CHECK_OBJ_NOTNULL
(
obj
,
OBJECT_MAGIC
);
if
(
!
obj
->
gziped
)
{
VTAILQ_FOREACH
(
st
,
&
obj
->
body
->
list
,
list
)
ved_pretend_gzip
(
req
,
st
->
ptr
,
st
->
len
);
return
;
}
...
...
@@ -518,8 +528,6 @@ ESI_DeliverChild(struct req *req)
dbits
=
(
void
*
)
WS_Alloc
(
req
->
ws
,
8
);
AN
(
dbits
);
obj
=
req
->
obj
;
CHECK_OBJ_NOTNULL
(
obj
,
OBJECT_MAGIC
);
p
=
ObjGetattr
(
obj
->
objcore
,
&
req
->
wrk
->
stats
,
OA_GZIPBITS
,
&
l
);
AN
(
p
);
assert
(
l
==
24
);
...
...
@@ -539,10 +547,10 @@ ESI_DeliverChild(struct req *req)
* XXX: optimize for the case where the 'last'
* XXX: bit is in a empty copy block
*/
*
dbits
=
ved_deliver_byterange
(
req
,
start
/
8
,
last
/
8
);
*
dbits
=
ved_deliver_byterange
(
req
,
obj
,
start
/
8
,
last
/
8
);
*
dbits
&=
~
(
1U
<<
(
last
&
7
));
req
->
resp_bodybytes
+=
WRW_Write
(
req
->
wrk
,
dbits
,
1
);
cc
=
ved_deliver_byterange
(
req
,
1
+
last
/
8
,
stop
/
8
);
cc
=
ved_deliver_byterange
(
req
,
obj
,
1
+
last
/
8
,
stop
/
8
);
switch
((
int
)(
stop
&
7
))
{
case
0
:
/* xxxxxxxx */
/* I think we have an off by one here, but that's OK */
...
...
@@ -588,7 +596,7 @@ ESI_DeliverChild(struct req *req)
req
->
resp_bodybytes
+=
WRW_Write
(
req
->
wrk
,
dbits
+
1
,
lpad
);
/* We need the entire tail, but it may not be in one storage segment */
st
=
VTAILQ_LAST
(
&
req
->
obj
->
body
->
list
,
storagehead
);
st
=
VTAILQ_LAST
(
&
obj
->
body
->
list
,
storagehead
);
for
(
i
=
sizeof
tailbuf
;
i
>
0
;
i
-=
j
)
{
j
=
st
->
len
;
if
(
j
>
i
)
...
...
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