[master] 609c67d Move another bit from diag_bitmap to debug
Poul-Henning Kamp
phk at varnish-cache.org
Mon Aug 27 22:20:49 CEST 2012
commit 609c67d18aa90cebb8301cbafec592c66e110a38
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Mon Aug 27 19:21:23 2012 +0000
Move another bit from diag_bitmap to debug
XXX: doc-update needed
diff --git a/bin/varnishd/cache/cache_shmlog.c b/bin/varnishd/cache/cache_shmlog.c
index 167c25e..228dde8 100644
--- a/bin/varnishd/cache/cache_shmlog.c
+++ b/bin/varnishd/cache/cache_shmlog.c
@@ -240,7 +240,7 @@ wslr(struct vsl_log *vsl, enum VSL_tag_e tag, int id, txt t)
vsl->wlp = VSL_END(vsl->wlp, l);
assert(vsl->wlp < vsl->wle);
vsl->wlr++;
- if (cache_param->diag_bitmap & 0x10000)
+ if (DO_DEBUG(DBG_SYNCVSL))
VSL_Flush(vsl, 0);
}
@@ -281,7 +281,7 @@ wsl(struct vsl_log *vsl, enum VSL_tag_e tag, int id, const char *fmt,
assert(vsl->wlp < vsl->wle);
vsl->wlr++;
}
- if (cache_param->diag_bitmap & 0x10000)
+ if (DO_DEBUG(DBG_SYNCVSL))
VSL_Flush(vsl, 0);
}
diff --git a/bin/varnishd/mgt/mgt_param.c b/bin/varnishd/mgt/mgt_param.c
index dd084ed..2c8ad86 100644
--- a/bin/varnishd/mgt/mgt_param.c
+++ b/bin/varnishd/mgt/mgt_param.c
@@ -1053,7 +1053,6 @@ static const struct parspec input_parspec[] = {
" 0x00001000 - do not core-dump child process.\n"
" 0x00002000 - only short panic message.\n"
" 0x00004000 - panic to stderr.\n"
- " 0x00010000 - synchronize shmlog.\n"
" 0x00020000 - synchronous start of persistence.\n"
" 0x00040000 - release VCL early.\n"
" 0x00080000 - ban-lurker debugging.\n"
diff --git a/bin/varnishtest/tests/e00008.vtc b/bin/varnishtest/tests/e00008.vtc
index 9c8770f..15b915a 100644
--- a/bin/varnishtest/tests/e00008.vtc
+++ b/bin/varnishtest/tests/e00008.vtc
@@ -63,7 +63,7 @@ varnish v1 -vcl+backend {
varnish v1 -cliok "param.set esi_syntax 0x3e"
-varnish v1 -cliok "param.set diag_bitmap 0x10000"
+varnish v1 -cliok "param.set debug +syncvsl"
client c1 {
txreq
diff --git a/bin/varnishtest/tests/e00019.vtc b/bin/varnishtest/tests/e00019.vtc
index 2c1e82b..54c756f 100644
--- a/bin/varnishtest/tests/e00019.vtc
+++ b/bin/varnishtest/tests/e00019.vtc
@@ -38,7 +38,7 @@ varnish v1 -vcl+backend {
varnish v1 -cliok "param.set esi_syntax 8"
-varnish v1 -cliok "param.set diag_bitmap 0x10000"
+varnish v1 -cliok "param.set debug +syncvsl"
client c1 {
txreq -url bar
diff --git a/bin/varnishtest/tests/e00023.vtc b/bin/varnishtest/tests/e00023.vtc
index 1373fc8..03d185b 100644
--- a/bin/varnishtest/tests/e00023.vtc
+++ b/bin/varnishtest/tests/e00023.vtc
@@ -44,7 +44,7 @@ varnish v1 -vcl+backend {
varnish v1 -cliok "param.set http_gzip_support true"
varnish v1 -cliok "param.set esi_syntax 0x3e"
-varnish v1 -cliok "param.set diag_bitmap 0x10000"
+varnish v1 -cliok "param.set debug +syncvsl"
client c1 {
txreq -hdr "Accept-Encoding: gzip"
diff --git a/bin/varnishtest/tests/e00024.vtc b/bin/varnishtest/tests/e00024.vtc
index f728b3c..87235c5 100644
--- a/bin/varnishtest/tests/e00024.vtc
+++ b/bin/varnishtest/tests/e00024.vtc
@@ -69,7 +69,7 @@ varnish v1 -vcl+backend {
varnish v1 -cliok "param.set http_gzip_support true"
varnish v1 -cliok "param.set esi_syntax 0x3e"
-varnish v1 -cliok "param.set diag_bitmap 0x10000"
+varnish v1 -cliok "param.set debug +syncvsl"
client c1 {
txreq -hdr "Accept-Encoding: gzip"
diff --git a/bin/varnishtest/tests/e00026.vtc b/bin/varnishtest/tests/e00026.vtc
index bcb05b0..fa6cf9a 100644
--- a/bin/varnishtest/tests/e00026.vtc
+++ b/bin/varnishtest/tests/e00026.vtc
@@ -37,7 +37,7 @@ varnish v1 -vcl+backend {
varnish v1 -cliok "param.set esi_syntax 0x21"
-varnish v1 -cliok "param.set diag_bitmap 0x10000"
+varnish v1 -cliok "param.set debug +syncvsl"
client c1 {
txreq -url /foo -hdr "Accept-Encoding: gzip"
diff --git a/bin/varnishtest/tests/g00004.vtc b/bin/varnishtest/tests/g00004.vtc
index 0ab74ad..0a23c01 100644
--- a/bin/varnishtest/tests/g00004.vtc
+++ b/bin/varnishtest/tests/g00004.vtc
@@ -18,7 +18,6 @@ server s1 -repeat 2 {
} -start
varnish v1 \
- -arg {-p diag_bitmap=0x00010000} \
-vcl+backend {
sub vcl_fetch {
set beresp.do_stream = false;
@@ -29,6 +28,8 @@ varnish v1 \
}
}
+varnish v1 -cliok "param.set debug +syncvsl"
+
varnish v1 -start
client c1 {
diff --git a/bin/varnishtest/tests/r00433.vtc b/bin/varnishtest/tests/r00433.vtc
index f782f14..1bcefa8 100644
--- a/bin/varnishtest/tests/r00433.vtc
+++ b/bin/varnishtest/tests/r00433.vtc
@@ -37,7 +37,7 @@ varnish v1 -vcl+backend {
} -start
varnish v1 -cliok "param.set esi_syntax 4"
-varnish v1 -cliok "param.set diag_bitmap 0x10000"
+varnish v1 -cliok "param.set debug +syncvsl"
varnish v1 -cliok "debug.fragfetch 32"
client c1 {
diff --git a/bin/varnishtest/tests/r00466.vtc b/bin/varnishtest/tests/r00466.vtc
index 3d64b22..e509de8 100644
--- a/bin/varnishtest/tests/r00466.vtc
+++ b/bin/varnishtest/tests/r00466.vtc
@@ -23,7 +23,9 @@ varnish v1 -vcl+backend {
return(pass);
}
}
-} -start -cliok "param.set diag_bitmap 0x10000"
+} -start
+
+varnish v1 -cliok "param.set debug +syncvsl"
client c1 {
txreq -url "/foo" -hdr "Range: 100-200"
diff --git a/bin/varnishtest/tests/r00942.vtc b/bin/varnishtest/tests/r00942.vtc
index 6bb31e1..1506709 100644
--- a/bin/varnishtest/tests/r00942.vtc
+++ b/bin/varnishtest/tests/r00942.vtc
@@ -25,13 +25,13 @@ server s1 {
} -start
varnish v1 \
- -arg {-p diag_bitmap=0x00010000} \
-vcl+backend {
sub vcl_fetch {
set beresp.do_stream = false;
}
}
+varnish v1 -cliok "param.set debug +syncvsl"
varnish v1 -start
client c1 {
diff --git a/include/tbl/debug_bits.h b/include/tbl/debug_bits.h
index 3300547..ece0fc4 100644
--- a/include/tbl/debug_bits.h
+++ b/include/tbl/debug_bits.h
@@ -31,5 +31,6 @@
DEBUG_BIT(REQ_STATE, req_state, "", "VSL Request state engine")
DEBUG_BIT(WORKSPACE, workspace, "", "VSL Workspace operations")
-DEBUG_BIT(WAITER, waiter, "", "VSL Waiter internals")
+DEBUG_BIT(WAITER, waiter, "\t","VSL Waiter internals")
DEBUG_BIT(WAITINGLIST, waitinglist, "", "VSL Waitinglist events")
+DEBUG_BIT(SYNCVSL, syncvsl, "\t","Make VSL synchronous")
More information about the varnish-commit
mailing list