[master] cbab1e1 Remove unused lock-families.

Poul-Henning Kamp phk at FreeBSD.org
Wed Jun 3 17:22:00 CEST 2015


commit cbab1e16bb0093ecb76c35e09c9207e2fe3b29af
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Jun 3 15:02:42 2015 +0000

    Remove unused lock-families.

diff --git a/bin/varnishtest/tests/r01746.vtc b/bin/varnishtest/tests/r01746.vtc
index 0cc92f6..30c6137 100644
--- a/bin/varnishtest/tests/r01746.vtc
+++ b/bin/varnishtest/tests/r01746.vtc
@@ -21,3 +21,5 @@ client c1 {
 	rxresp
 	expect resp.body == "<A></A>"
 } -run
+
+varnish v1 -expect esi_errors == 0
diff --git a/include/tbl/locks.h b/include/tbl/locks.h
index 010de43..7331493 100644
--- a/include/tbl/locks.h
+++ b/include/tbl/locks.h
@@ -28,32 +28,27 @@
  */
 
 /*lint -save -e525 -e539 */
-LOCK(sms)
-LOCK(smp)
-LOCK(sma)
-LOCK(smf)
-LOCK(hsl)
+LOCK(backend)
+LOCK(ban)
+LOCK(busyobj)
+LOCK(cli)
+LOCK(exp)
 LOCK(hcb)
 LOCK(hcl)
-LOCK(vcl)
-LOCK(sessmem)
-LOCK(sess)
-LOCK(wstat)
-LOCK(herder)
-LOCK(wq)
-LOCK(objhdr)
-LOCK(exp)
+LOCK(hsl)
 LOCK(lru)
-LOCK(cli)
-LOCK(ban)
+LOCK(mempool)
+LOCK(misc)
+LOCK(objhdr)
+LOCK(pipestat)
+LOCK(sess)
+LOCK(sma)
+LOCK(smf)
+LOCK(smp)
 LOCK(vbe)
-LOCK(vbp)
-LOCK(backend)
 LOCK(vcapace)
-LOCK(nbusyobj)
-LOCK(busyobj)
-LOCK(mempool)
+LOCK(vcl)
 LOCK(vxid)
-LOCK(pipestat)
-LOCK(misc)
+LOCK(wq)
+LOCK(wstat)
 /*lint -restore */



More information about the varnish-commit mailing list