Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
U
unique-xids
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
uplex-varnish
unique-xids
Commits
495b9f51
Commit
495b9f51
authored
Aug 27, 2012
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move 3 more debug bits from diag_bitmaps to debug
XXX: doc-update needed
parent
609c67d1
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
20 additions
and
20 deletions
+20
-20
cache_ban.c
bin/varnishd/cache/cache_ban.c
+8
-8
cache_hash.c
bin/varnishd/cache/cache_hash.c
+1
-1
cache_session.c
bin/varnishd/cache/cache_session.c
+2
-4
mgt_param.c
bin/varnishd/mgt/mgt_param.c
+0
-3
c00023.vtc
bin/varnishtest/tests/c00023.vtc
+1
-1
c00049.vtc
bin/varnishtest/tests/c00049.vtc
+1
-1
m00001.vtc
bin/varnishtest/tests/m00001.vtc
+1
-1
p00005.vtc
bin/varnishtest/tests/p00005.vtc
+3
-1
debug_bits.h
include/tbl/debug_bits.h
+3
-0
No files found.
bin/varnishd/cache/cache_ban.c
View file @
495b9f51
...
...
@@ -836,13 +836,13 @@ ban_lurker_work(struct worker *wrk, struct vsl_log *vsl, unsigned pass)
b
->
flags
&=
~
BAN_F_LURK
;
b
->
flags
|=
pass
;
}
if
(
cache_param
->
diag_bitmap
&
0x80000
)
if
(
DO_DEBUG
(
DBG_LURKER
)
)
VSLb
(
vsl
,
SLT_Debug
,
"lurker: %d actionable bans"
,
i
);
if
(
i
==
0
)
return
(
0
);
VTAILQ_FOREACH_REVERSE
(
b
,
&
ban_head
,
banhead_s
,
list
)
{
if
(
cache_param
->
diag_bitmap
&
0x80000
)
if
(
DO_DEBUG
(
DBG_LURKER
)
)
VSLb
(
vsl
,
SLT_Debug
,
"lurker doing %f %d"
,
ban_time
(
b
->
spec
),
b
->
refcount
);
while
(
1
)
{
...
...
@@ -851,7 +851,7 @@ ban_lurker_work(struct worker *wrk, struct vsl_log *vsl, unsigned pass)
if
(
oc
==
NULL
)
break
;
CHECK_OBJ_NOTNULL
(
oc
,
OBJCORE_MAGIC
);
if
(
cache_param
->
diag_bitmap
&
0x80000
)
if
(
DO_DEBUG
(
DBG_LURKER
)
)
VSLb
(
vsl
,
SLT_Debug
,
"test: %p %u %u"
,
oc
,
oc
->
flags
&
OC_F_LURK
,
pass
);
if
((
oc
->
flags
&
OC_F_LURK
)
==
pass
)
...
...
@@ -903,7 +903,7 @@ ban_lurker_work(struct worker *wrk, struct vsl_log *vsl, unsigned pass)
*/
o
=
oc_getobj
(
&
wrk
->
stats
,
oc
);
i
=
ban_check_object
(
o
,
vsl
,
NULL
);
if
(
cache_param
->
diag_bitmap
&
0x80000
)
if
(
DO_DEBUG
(
DBG_LURKER
)
)
VSLb
(
vsl
,
SLT_Debug
,
"lurker got: %p %d"
,
oc
,
i
);
if
(
i
==
-
1
)
{
...
...
@@ -915,7 +915,7 @@ ban_lurker_work(struct worker *wrk, struct vsl_log *vsl, unsigned pass)
Lck_Unlock
(
&
ban_mtx
);
}
Lck_Unlock
(
&
oh
->
mtx
);
if
(
cache_param
->
diag_bitmap
&
0x80000
)
if
(
DO_DEBUG
(
DBG_LURKER
)
)
VSLb
(
vsl
,
SLT_Debug
,
"lurker done: %p %u %u"
,
oc
,
oc
->
flags
&
OC_F_LURK
,
pass
);
(
void
)
HSH_Deref
(
&
wrk
->
stats
,
NULL
,
&
o
);
...
...
@@ -927,7 +927,7 @@ ban_lurker_work(struct worker *wrk, struct vsl_log *vsl, unsigned pass)
b
->
flags
|=
BAN_F_GONE
;
VSC_C_main
->
bans_gone
++
;
}
if
(
cache_param
->
diag_bitmap
&
0x80000
)
if
(
DO_DEBUG
(
DBG_LURKER
)
)
VSLb
(
vsl
,
SLT_Debug
,
"lurker BAN %f now gone"
,
ban_time
(
b
->
spec
));
}
...
...
@@ -1091,7 +1091,7 @@ ccf_ban_list(struct cli *cli, const char * const *av, void *priv)
VCLI_Out
(
cli
,
"Present bans:
\n
"
);
VTAILQ_FOREACH
(
b
,
&
ban_head
,
list
)
{
if
(
b
==
bl
&&
!
(
cache_param
->
diag_bitmap
&
0x80000
))
if
(
b
==
bl
&&
!
DO_DEBUG
(
DBG_LURKER
))
break
;
VCLI_Out
(
cli
,
"%10.6f %5u%s
\t
"
,
ban_time
(
b
->
spec
),
bl
==
b
?
b
->
refcount
-
1
:
b
->
refcount
,
...
...
@@ -1100,7 +1100,7 @@ ccf_ban_list(struct cli *cli, const char * const *av, void *priv)
VCLI_Out
(
cli
,
"
\n
"
);
if
(
VCLI_Overflow
(
cli
))
break
;
if
(
cache_param
->
diag_bitmap
&
0x80000
)
{
if
(
DO_DEBUG
(
DBG_LURKER
)
)
{
Lck_Lock
(
&
ban_mtx
);
struct
objcore
*
oc
;
VTAILQ_FOREACH
(
oc
,
&
b
->
objcore
,
ban_list
)
...
...
bin/varnishd/cache/cache_hash.c
View file @
495b9f51
...
...
@@ -305,7 +305,7 @@ HSH_Lookup(struct req *req)
AN
(
hash
);
hsh_prealloc
(
wrk
);
if
(
cache_param
->
diag_bitmap
&
0x80000000
)
if
(
DO_DEBUG
(
DBG_HASHEDGE
)
)
hsh_testmagic
(
req
->
digest
);
if
(
req
->
hash_objhead
!=
NULL
)
{
...
...
bin/varnishd/cache/cache_session.c
View file @
495b9f51
...
...
@@ -140,10 +140,8 @@ ses_req_pool_task(struct worker *wrk, void *arg)
HTTP1_Session
(
wrk
,
req
);
WS_Assert
(
wrk
->
aws
);
AZ
(
wrk
->
wrw
);
if
(
cache_param
->
diag_bitmap
&
0x00040000
)
{
if
(
wrk
->
vcl
!=
NULL
)
VCL_Rel
(
&
wrk
->
vcl
);
}
if
(
DO_DEBUG
(
DBG_VCLREL
)
&&
wrk
->
vcl
!=
NULL
)
VCL_Rel
(
&
wrk
->
vcl
);
THR_SetRequest
(
NULL
);
}
...
...
bin/varnishd/mgt/mgt_param.c
View file @
495b9f51
...
...
@@ -1054,9 +1054,6 @@ static const struct parspec input_parspec[] = {
" 0x00002000 - only short panic message.
\n
"
" 0x00004000 - panic to stderr.
\n
"
" 0x00020000 - synchronous start of persistence.
\n
"
" 0x00040000 - release VCL early.
\n
"
" 0x00080000 - ban-lurker debugging.
\n
"
" 0x80000000 - do edge-detection on digest.
\n
"
"
\n
"
"Use 0x notation and do the bitor in your head :-)
\n
"
"
\n
"
...
...
bin/varnishtest/tests/c00023.vtc
View file @
495b9f51
...
...
@@ -31,7 +31,7 @@ server s1 {
} -start
varnish v1 -arg "-hcritbit" -vcl+backend { } -start
varnish v1 -cliok "param.set d
iag_bitmap 0x80000000
"
varnish v1 -cliok "param.set d
ebug +hashedge
"
client c1 {
txreq -url "/1"
...
...
bin/varnishtest/tests/c00049.vtc
View file @
495b9f51
...
...
@@ -36,7 +36,7 @@ varnish v1 -vcl+backend {
} -start
varnish v1 -cliok "param.set ban_lurker_sleep 0"
varnish v1 -cliok "param.set d
iag_bitmap 0x80000
"
varnish v1 -cliok "param.set d
ebug +lurker
"
varnish v1 -cliok "ban.list"
...
...
bin/varnishtest/tests/m00001.vtc
View file @
495b9f51
...
...
@@ -15,7 +15,7 @@ varnish v1 -arg "-pthread_pools=1" -vcl+backend {
}
} -start
varnish v1 -cliok "param.set d
iag_bitmap 0x40000
"
varnish v1 -cliok "param.set d
ebug +vclrel
"
client c1 {
txreq -url "/bar"
...
...
bin/varnishtest/tests/p00005.vtc
View file @
495b9f51
...
...
@@ -8,7 +8,6 @@ server s1 {
} -start
varnish v1 \
-arg "-pdiag_bitmap=0x30000" \
-storage "-spersistent,${tmpdir}/_.per,10m" \
-arg "-pban_lurker_sleep=0" \
-vcl+backend {
...
...
@@ -17,6 +16,9 @@ varnish v1 \
}
} -start
varnish v1 -cliok "param.set debug +syncvsl"
varnish v1 -cliok "param.set diag_bitmap 0x20000"
client c1 {
txreq -url "/foo"
rxresp
...
...
include/tbl/debug_bits.h
View file @
495b9f51
...
...
@@ -34,3 +34,6 @@ DEBUG_BIT(WORKSPACE, workspace, "", "VSL Workspace operations")
DEBUG_BIT
(
WAITER
,
waiter
,
"
\t
"
,
"VSL Waiter internals"
)
DEBUG_BIT
(
WAITINGLIST
,
waitinglist
,
""
,
"VSL Waitinglist events"
)
DEBUG_BIT
(
SYNCVSL
,
syncvsl
,
"
\t
"
,
"Make VSL synchronous"
)
DEBUG_BIT
(
HASHEDGE
,
hashedge
,
""
,
"Edge cases in Hash"
)
DEBUG_BIT
(
VCLREL
,
vclrel
,
"
\t
"
,
"Rapid VCL release"
)
DEBUG_BIT
(
LURKER
,
lurker
,
"
\t
"
,
"VSL Ban lurker"
)
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