Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
libvdp-pesi
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Jobs
Commits
Open sidebar
uplex-varnish
libvdp-pesi
Commits
328f71c1
Commit
328f71c1
authored
Jul 30, 2019
by
Nils Goroll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use the transport_priv only for esi_level > 0
parent
3e2f9c5b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
7 deletions
+10
-7
vdp_pesi.c
src/vdp_pesi.c
+10
-7
No files found.
src/vdp_pesi.c
View file @
328f71c1
...
@@ -1732,7 +1732,10 @@ pesi_buf_bytes(struct req *req, enum vdp_action act, void **priv,
...
@@ -1732,7 +1732,10 @@ pesi_buf_bytes(struct req *req, enum vdp_action act, void **priv,
struct
pesi
*
pesi
;
struct
pesi
*
pesi
;
unsigned
refok
;
unsigned
refok
;
CAST_OBJ_NOTNULL
(
tree
,
*
priv
,
BYTES_TREE_MAGIC
);
CAST_OBJ_NOTNULL
(
pesi
,
*
priv
,
PESI_MAGIC
);
CHECK_OBJ_NOTNULL
(
pesi
->
pesi_tree
,
PESI_TREE_MAGIC
);
tree
=
pesi
->
pesi_tree
->
tree
;
CHECK_OBJ_NOTNULL
(
tree
,
BYTES_TREE_MAGIC
);
// magic pointers in use, so no check for len == 0
// magic pointers in use, so no check for len == 0
if
(
tree
->
retval
||
ptr
==
NULL
)
if
(
tree
->
retval
||
ptr
==
NULL
)
...
@@ -1740,7 +1743,6 @@ pesi_buf_bytes(struct req *req, enum vdp_action act, void **priv,
...
@@ -1740,7 +1743,6 @@ pesi_buf_bytes(struct req *req, enum vdp_action act, void **priv,
CHECK_OBJ_NOTNULL
(
req
,
REQ_MAGIC
);
CHECK_OBJ_NOTNULL
(
req
,
REQ_MAGIC
);
CAST_OBJ_NOTNULL
(
pesi
,
req
->
transport_priv
,
PESI_MAGIC
);
if
(
pesi
->
bypass
)
{
if
(
pesi
->
bypass
)
{
AZ
(
req
->
esi_level
);
AZ
(
req
->
esi_level
);
return
(
VDP_bytes
(
req
,
act
,
ptr
,
len
));
return
(
VDP_bytes
(
req
,
act
,
ptr
,
len
));
...
@@ -2016,9 +2018,8 @@ vdp_pesi_init(struct req *req, void **priv)
...
@@ -2016,9 +2018,8 @@ vdp_pesi_init(struct req *req, void **priv)
pecx
->
node
=
pesi_tree
->
tree
->
root
;
pecx
->
node
=
pesi_tree
->
tree
->
root
;
AZ
(
pecx
->
state
);
AZ
(
pecx
->
state
);
AZ
(
pecx
->
woken
);
AZ
(
pecx
->
woken
);
req
->
transport_priv
=
pesi
;
VDP_Push
(
req
,
&
VDP_pesi_buf
,
pesi
_tree
->
tree
);
VDP_Push
(
req
,
&
VDP_pesi_buf
,
pesi
);
return
(
0
);
return
(
0
);
}
}
...
@@ -2049,9 +2050,8 @@ vdp_pesi_fini(struct req *req, void **priv)
...
@@ -2049,9 +2050,8 @@ vdp_pesi_fini(struct req *req, void **priv)
node
=
pecx
->
node
;
node
=
pecx
->
node
;
CHECK_OBJ_NOTNULL
(
node
,
NODE_MAGIC
);
CHECK_OBJ_NOTNULL
(
node
,
NODE_MAGIC
);
assert
(
pesi
==
req
->
transport_priv
);
if
(
req
->
esi_level
>
0
)
{
if
(
req
->
esi_level
>
0
)
{
assert
(
req
->
transport_priv
==
pesi
);
*
priv
=
NULL
;
*
priv
=
NULL
;
req
->
transport_priv
=
NULL
;
req
->
transport_priv
=
NULL
;
...
@@ -2060,6 +2060,9 @@ vdp_pesi_fini(struct req *req, void **priv)
...
@@ -2060,6 +2060,9 @@ vdp_pesi_fini(struct req *req, void **priv)
return
(
0
);
return
(
0
);
}
}
assert
(
req
->
transport_priv
==
NULL
||
*
(
unsigned
*
)
req
->
transport_priv
!=
PESI_MAGIC
);
/*
/*
* at this point, the tree must be delivered completely, but
* at this point, the tree must be delivered completely, but
* tasks our shared data structures could still be running
* tasks our shared data structures could still be running
...
@@ -2576,7 +2579,7 @@ vped_deliver(struct req *req, struct boc *boc, int wantbody)
...
@@ -2576,7 +2579,7 @@ vped_deliver(struct req *req, struct boc *boc, int wantbody)
VSLdbg
(
req
,
"vped_deliver: ESI"
);
VSLdbg
(
req
,
"vped_deliver: ESI"
);
VDP_Push
(
req
,
&
VDP_pesi_buf
,
tree
);
VDP_Push
(
req
,
&
VDP_pesi_buf
,
pesi
);
XXXAZ
(
push_vdps
(
req
,
&
parent
->
nexus
.
gzip
));
XXXAZ
(
push_vdps
(
req
,
&
parent
->
nexus
.
gzip
));
AN
(
parent
);
AN
(
parent
);
AZ
(
VDP_Push
(
req
,
&
vped_to_parent
,
parent
->
req
));
AZ
(
VDP_Push
(
req
,
&
vped_to_parent
,
parent
->
req
));
...
...
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