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
e3303ad3
Commit
e3303ad3
authored
Jan 10, 2024
by
Dridi Boukelmoune
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
expire: Rename ExpKill's EXP_expire to EXP_Inspect
And while at it document it.
parent
5963b6dc
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
4 deletions
+8
-4
cache_expire.c
bin/varnishd/cache/cache_expire.c
+1
-1
b00063.vtc
bin/varnishtest/tests/b00063.vtc
+2
-2
c00105.vtc
bin/varnishtest/tests/c00105.vtc
+1
-1
vsl_tags.h
include/tbl/vsl_tags.h
+4
-0
No files found.
bin/varnishd/cache/cache_expire.c
View file @
e3303ad3
...
@@ -328,7 +328,7 @@ exp_expire(struct exp_priv *ep, vtim_real now)
...
@@ -328,7 +328,7 @@ exp_expire(struct exp_priv *ep, vtim_real now)
oc
=
VBH_root
(
ep
->
heap
);
oc
=
VBH_root
(
ep
->
heap
);
if
(
oc
==
NULL
)
if
(
oc
==
NULL
)
return
(
now
+
355
.
/
113
.);
return
(
now
+
355
.
/
113
.);
VSLb
(
&
ep
->
vsl
,
SLT_ExpKill
,
"EXP_
expire
p=%p e=%.6f f=0x%x"
,
oc
,
VSLb
(
&
ep
->
vsl
,
SLT_ExpKill
,
"EXP_
Inspect
p=%p e=%.6f f=0x%x"
,
oc
,
oc
->
timer_when
-
now
,
oc
->
flags
);
oc
->
timer_when
-
now
,
oc
->
flags
);
CHECK_OBJ_NOTNULL
(
oc
,
OBJCORE_MAGIC
);
CHECK_OBJ_NOTNULL
(
oc
,
OBJCORE_MAGIC
);
...
...
bin/varnishtest/tests/b00063.vtc
View file @
e3303ad3
...
@@ -47,9 +47,9 @@ varnish v1 -vcl+backend {
...
@@ -47,9 +47,9 @@ varnish v1 -vcl+backend {
} -start
} -start
logexpect l1 -v v1 -g raw {
logexpect l1 -v v1 -g raw {
expect * * ExpKill EXP_
expire
expect * * ExpKill EXP_
Inspect
expect * * ExpKill EXP_When
expect * * ExpKill EXP_When
expect * * ExpKill EXP_
expire
expect * * ExpKill EXP_
Inspect
} -start
} -start
client c1 {
client c1 {
...
...
bin/varnishtest/tests/c00105.vtc
View file @
e3303ad3
...
@@ -35,7 +35,7 @@ varnish v1 -vcl+backend {
...
@@ -35,7 +35,7 @@ varnish v1 -vcl+backend {
}
}
} -start
} -start
logexpect l1 -v v1 -g raw -q "ExpKill ~ EXP_
expire
" {
logexpect l1 -v v1 -g raw -q "ExpKill ~ EXP_
Inspect
" {
expect 0 0 ExpKill
expect 0 0 ExpKill
} -start
} -start
...
...
include/tbl/vsl_tags.h
View file @
e3303ad3
...
@@ -353,6 +353,9 @@ SLTM(ExpKill, 0, "Object expiry event",
...
@@ -353,6 +353,9 @@ SLTM(ExpKill, 0, "Object expiry event",
"
\t
Logged when the expiry thread kills an object from the inbox.
\n\n
"
"
\t
Logged when the expiry thread kills an object from the inbox.
\n\n
"
"EXP_When
\n
"
"EXP_When
\n
"
"
\t
Logged when the expiry thread moves an object on the binheap.
\n\n
"
"
\t
Logged when the expiry thread moves an object on the binheap.
\n\n
"
"EXP_Inspect
\n
"
"
\t
Logged when the expiry thread inspects the next object scheduled"
" to expire.
\n\n
"
"EXP_Expired
\n
"
"EXP_Expired
\n
"
"
\t
Logged when the expiry thread expires an object.
\n\n
"
"
\t
Logged when the expiry thread expires an object.
\n\n
"
"EXP_Removed
\n
"
"EXP_Removed
\n
"
...
@@ -369,6 +372,7 @@ SLTM(ExpKill, 0, "Object expiry event",
...
@@ -369,6 +372,7 @@ SLTM(ExpKill, 0, "Object expiry event",
"
\t
EXP_Inbox p=%p e=%f f=0x%x
\n
"
"
\t
EXP_Inbox p=%p e=%f f=0x%x
\n
"
"
\t
EXP_Kill p=%p e=%f f=0x%x
\n
"
"
\t
EXP_Kill p=%p e=%f f=0x%x
\n
"
"
\t
EXP_When p=%p e=%f f=0x%x
\n
"
"
\t
EXP_When p=%p e=%f f=0x%x
\n
"
"
\t
EXP_Inspect p=%p e=%f f=0x%x
\n
"
"
\t
EXP_Expired x=%u t=%f h=%u
\n
"
"
\t
EXP_Expired x=%u t=%f h=%u
\n
"
"
\t
EXP_Removed x=%u t=%f h=%u
\n
"
"
\t
EXP_Removed x=%u t=%f h=%u
\n
"
"
\t
LRU_Cand p=%p f=0x%x r=%d
\n
"
"
\t
LRU_Cand p=%p f=0x%x r=%d
\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