Move another bit from diag_bitmap to debug

XXX: doc-update needed

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);
 }
 

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"

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 

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

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"

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"

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"

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 {

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 {

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"

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 {

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")