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
725c8c2b
Commit
725c8c2b
authored
Nov 20, 2012
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add forward SLT_Link records from req->esireq and req->bereq
Prodded by: Martin
parent
8ae7647d
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
2 deletions
+6
-2
cache.h
bin/varnishd/cache/cache.h
+1
-1
cache_busyobj.c
bin/varnishd/cache/cache_busyobj.c
+2
-1
cache_esi_deliver.c
bin/varnishd/cache/cache_esi_deliver.c
+1
-0
vsl_tags.h
include/tbl/vsl_tags.h
+2
-0
No files found.
bin/varnishd/cache/cache.h
View file @
725c8c2b
...
@@ -760,7 +760,7 @@ double BAN_Time(const struct ban *ban);
...
@@ -760,7 +760,7 @@ double BAN_Time(const struct ban *ban);
/* cache_busyobj.c */
/* cache_busyobj.c */
void
VBO_Init
(
void
);
void
VBO_Init
(
void
);
struct
busyobj
*
VBO_GetBusyObj
(
struct
worker
*
,
const
struct
req
*
);
struct
busyobj
*
VBO_GetBusyObj
(
struct
worker
*
,
struct
req
*
);
void
VBO_DerefBusyObj
(
struct
worker
*
wrk
,
struct
busyobj
**
busyobj
);
void
VBO_DerefBusyObj
(
struct
worker
*
wrk
,
struct
busyobj
**
busyobj
);
void
VBO_Free
(
struct
busyobj
**
vbo
);
void
VBO_Free
(
struct
busyobj
**
vbo
);
...
...
bin/varnishd/cache/cache_busyobj.c
View file @
725c8c2b
...
@@ -87,7 +87,7 @@ VBO_Free(struct busyobj **bop)
...
@@ -87,7 +87,7 @@ VBO_Free(struct busyobj **bop)
}
}
struct
busyobj
*
struct
busyobj
*
VBO_GetBusyObj
(
struct
worker
*
wrk
,
const
struct
req
*
req
)
VBO_GetBusyObj
(
struct
worker
*
wrk
,
struct
req
*
req
)
{
{
struct
busyobj
*
bo
=
NULL
;
struct
busyobj
*
bo
=
NULL
;
uint16_t
nhttp
;
uint16_t
nhttp
;
...
@@ -130,6 +130,7 @@ VBO_GetBusyObj(struct worker *wrk, const struct req *req)
...
@@ -130,6 +130,7 @@ VBO_GetBusyObj(struct worker *wrk, const struct req *req)
VSL_Setup
(
bo
->
vsl
,
p
,
sz
);
VSL_Setup
(
bo
->
vsl
,
p
,
sz
);
bo
->
vsl
->
wid
=
VXID_Get
(
&
wrk
->
vxid_pool
)
|
VSL_BACKENDMARKER
;
bo
->
vsl
->
wid
=
VXID_Get
(
&
wrk
->
vxid_pool
)
|
VSL_BACKENDMARKER
;
VSLb
(
bo
->
vsl
,
SLT_Link
,
"req %u"
,
req
->
vsl
->
wid
&
VSL_IDENTMASK
);
VSLb
(
bo
->
vsl
,
SLT_Link
,
"req %u"
,
req
->
vsl
->
wid
&
VSL_IDENTMASK
);
VSLb
(
req
->
vsl
,
SLT_Link
,
"bereq %u"
,
bo
->
vsl
->
wid
&
VSL_IDENTMASK
);
p
+=
sz
;
p
+=
sz
;
p
=
(
void
*
)
PRNDUP
(
p
);
p
=
(
void
*
)
PRNDUP
(
p
);
assert
(
p
<
bo
->
end
);
assert
(
p
<
bo
->
end
);
...
...
bin/varnishd/cache/cache_esi_deliver.c
View file @
725c8c2b
...
@@ -61,6 +61,7 @@ ved_include(struct req *preq, const char *src, const char *host)
...
@@ -61,6 +61,7 @@ ved_include(struct req *preq, const char *src, const char *host)
req
=
SES_GetReq
(
wrk
,
preq
->
sp
);
req
=
SES_GetReq
(
wrk
,
preq
->
sp
);
VSLb
(
req
->
vsl
,
SLT_Link
,
"req %u"
,
preq
->
vsl
->
wid
&
VSL_IDENTMASK
);
VSLb
(
req
->
vsl
,
SLT_Link
,
"req %u"
,
preq
->
vsl
->
wid
&
VSL_IDENTMASK
);
VSLb
(
preq
->
vsl
,
SLT_Link
,
"esireq %u"
,
req
->
vsl
->
wid
&
VSL_IDENTMASK
);
req
->
esi_level
=
preq
->
esi_level
+
1
;
req
->
esi_level
=
preq
->
esi_level
+
1
;
HTTP_Copy
(
req
->
http0
,
preq
->
http0
);
HTTP_Copy
(
req
->
http0
,
preq
->
http0
);
...
...
include/tbl/vsl_tags.h
View file @
725c8c2b
...
@@ -162,5 +162,7 @@ SLTM(Link, "Linkage between different VXIDs",
...
@@ -162,5 +162,7 @@ SLTM(Link, "Linkage between different VXIDs",
"The first field gives the type of the parent:
\n
"
"The first field gives the type of the parent:
\n
"
" req Request
\n
"
" req Request
\n
"
" sess Session
\n
"
" sess Session
\n
"
" bereq Backend request
\n
"
" esireq ESI subrequest
\n
"
"The second field gives the VXID if the parent.
\n
"
"The second field gives the VXID if the parent.
\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