[master] 1226e77f9 increase default stack size on 64bit from 48k to 56k
Nils Goroll
nils.goroll at uplex.de
Thu Mar 7 10:04:07 UTC 2019
commit 1226e77f9501c56976635c714c99d84f417aa5d2
Author: Nils Goroll <nils.goroll at uplex.de>
Date: Thu Mar 7 11:00:23 2019 +0100
increase default stack size on 64bit from 48k to 56k
Ref #2932
Fixes #2817
diff --git a/bin/varnishd/mgt/mgt_param.c b/bin/varnishd/mgt/mgt_param.c
index fa2fa462f..8e1653f85 100644
--- a/bin/varnishd/mgt/mgt_param.c
+++ b/bin/varnishd/mgt/mgt_param.c
@@ -629,6 +629,8 @@ MCF_InitParams(struct cli *cli)
MCF_TcpParams();
+ def = 56 * 1024;
+
if (sizeof(void *) < 8) { /*lint !e506 !e774 */
/*
* Adjust default parameters for 32 bit systems to conserve
@@ -640,6 +642,7 @@ MCF_InitParams(struct cli *cli)
MCF_ParamConf(MCF_DEFAULT, "http_req_size", "12k");
MCF_ParamConf(MCF_DEFAULT, "gzip_buffer", "4k");
MCF_ParamConf(MCF_MAXIMUM, "vsl_space", "1G");
+ def = 48 * 1024;
}
low = sysconf(_SC_THREAD_STACK_MIN);
@@ -647,9 +650,8 @@ MCF_InitParams(struct cli *cli)
#if defined(__SANITIZER) || __has_feature(address_sanitizer)
def = 92 * 1024;
-#else
- def = 48 * 1024;
#endif
+
if (def < low)
def = low;
MCF_ParamConf(MCF_DEFAULT, "thread_pool_stack", "%jdb", (intmax_t)def);
diff --git a/bin/varnishtest/tests/r02817.vtc b/bin/varnishtest/tests/r02817.vtc
index 51b4c0b41..4e9b1189f 100644
--- a/bin/varnishtest/tests/r02817.vtc
+++ b/bin/varnishtest/tests/r02817.vtc
@@ -67,8 +67,7 @@ server s1 {
}
} -start
-# XXX THIS TEST SHOULD USE THE DEFAULT STACK SIZE - WIP
-varnish v1 -arg "-p thread_pool_stack=52k" -vcl+backend {
+varnish v1 -vcl+backend {
import std;
import debug;
More information about the varnish-commit
mailing list