[master] aa8875a add a temporary bandaid for vmod_re

Nils Goroll nils.goroll at uplex.de
Thu Nov 9 13:15:10 UTC 2017


commit aa8875a44d587bc5530554963f93fffba99efadd
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Thu Nov 9 14:11:05 2017 +0100

    add a temporary bandaid for vmod_re
    
    @bsdphk to be discussed / replaced

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 250b0e5..e920268 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -731,6 +731,7 @@ extern const char H__Reason[];
 #define VXID(u) ((u) & VSL_IDENTMASK)
 uint32_t VXID_Get(struct worker *, uint32_t marker);
 extern volatile struct params * cache_param;
+extern volatile struct vre_limits *vparam_vre_limits;
 extern pthread_key_t witness_key;
 
 /* cache_lck.c */
diff --git a/bin/varnishd/cache/cache_main.c b/bin/varnishd/cache/cache_main.c
index cfaec23..239c095 100644
--- a/bin/varnishd/cache/cache_main.c
+++ b/bin/varnishd/cache/cache_main.c
@@ -49,7 +49,9 @@
 #include "hash/hash_slinger.h"
 
 
-volatile struct params	*cache_param;
+volatile struct params		*cache_param;
+// XXX generic solution?
+volatile struct vre_limits	*vparam_vre_limits;
 
 /*--------------------------------------------------------------------
  * Per thread storage for the session currently being processed by
@@ -308,6 +310,8 @@ child_main(int sigmagic, size_t altstksz)
 #endif
 
 	cache_param = heritage.param;
+	// XXX TODO - generic solution?
+	vparam_vre_limits = &cache_param->vre_limits;
 
 	AZ(pthread_key_create(&req_key, NULL));
 	AZ(pthread_key_create(&bo_key, NULL));


More information about the varnish-commit mailing list