[4.1] 33c2ac2 Also make this debugging hash class' locks dynamic

Lasse Karstensen lkarsten at varnish-software.com
Thu Jan 14 15:15:09 CET 2016


commit 33c2ac251e4446e8699556c9f0aa73fade318652
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Dec 16 23:26:32 2015 +0000

    Also make this debugging hash class' locks dynamic

diff --git a/bin/varnishd/hash/hash_simple_list.c b/bin/varnishd/hash/hash_simple_list.c
index d99bb89..a946d16 100644
--- a/bin/varnishd/hash/hash_simple_list.c
+++ b/bin/varnishd/hash/hash_simple_list.c
@@ -35,6 +35,8 @@
 
 #include "hash/hash_slinger.h"
 
+static struct VSC_C_lck *lck_hsl;
+
 /*--------------------------------------------------------------------*/
 
 static VTAILQ_HEAD(, objhead)	hsl_head = VTAILQ_HEAD_INITIALIZER(hsl_head);
@@ -49,6 +51,7 @@ static void __match_proto__(hash_start_f)
 hsl_start(void)
 {
 
+	lck_hsl = Lck_CreateClass("hsl");
 	Lck_New(&hsl_mtx, lck_hsl);
 }
 
diff --git a/include/tbl/locks.h b/include/tbl/locks.h
index 16af3ac..4a1539e 100644
--- a/include/tbl/locks.h
+++ b/include/tbl/locks.h
@@ -35,7 +35,6 @@ LOCK(busyobj)
 LOCK(cli)
 LOCK(exp)
 LOCK(hcb)
-LOCK(hsl)
 LOCK(lru)
 LOCK(mempool)
 LOCK(objhdr)



More information about the varnish-commit mailing list