[master] a48962f Remove diagnostic check on active VCL, rather than increase cost by correctly holding the mtx while examining it.

Poul-Henning Kamp phk at FreeBSD.org
Sat Sep 10 15:15:10 CEST 2016


commit a48962fcf521d9e7587aaa6bc507f0d233512a07
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sat Sep 10 13:14:15 2016 +0000

    Remove diagnostic check on active VCL, rather than increase
    cost by correctly holding the mtx while examining it.

diff --git a/bin/varnishd/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index 461931f..3cb2b69 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -282,9 +282,6 @@ void
 VCL_Refresh(struct vcl **vcc)
 {
 	CHECK_OBJ_NOTNULL(vcl_active, VCL_MAGIC);
-	AZ(pthread_rwlock_rdlock(&vcl_active->temp_rwl));
-	assert(VCL_WARM(vcl_active));
-	AZ(pthread_rwlock_unlock(&vcl_active->temp_rwl));
 	if (*vcc == vcl_active)
 		return;
 	if (*vcc != NULL)



More information about the varnish-commit mailing list