[master] 8f35a32d6 Also give the per-pool lock its own class

Nils Goroll nils.goroll at uplex.de
Tue Mar 10 09:33:06 UTC 2020


commit 8f35a32d6b4e4d90135708fdfba214e484126ed3
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Tue Mar 10 10:31:39 2020 +0100

    Also give the per-pool lock its own class
    
    (see previous)

diff --git a/bin/varnishd/cache/cache_pool.c b/bin/varnishd/cache/cache_pool.c
index c5991c634..bfdddccb0 100644
--- a/bin/varnishd/cache/cache_pool.c
+++ b/bin/varnishd/cache/cache_pool.c
@@ -146,7 +146,7 @@ pool_mkpool(unsigned pool_no)
 	AN(pp->a_stat);
 	pp->b_stat = calloc(1, sizeof *pp->b_stat);
 	AN(pp->b_stat);
-	Lck_New(&pp->mtx, lck_wq);
+	Lck_New(&pp->mtx, lck_perpool);
 
 	VTAILQ_INIT(&pp->idle_queue);
 	VTAILQ_INIT(&pp->poolsocks);
diff --git a/include/tbl/locks.h b/include/tbl/locks.h
index 026c24253..ca0ed0427 100644
--- a/include/tbl/locks.h
+++ b/include/tbl/locks.h
@@ -40,6 +40,7 @@ LOCK(hcb)
 LOCK(lru)
 LOCK(mempool)
 LOCK(objhdr)
+LOCK(perpool)
 LOCK(pipestat)
 LOCK(probe)
 LOCK(sess)


More information about the varnish-commit mailing list