r4550 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2010-02-10 14:46:44 +0100 (Wed, 10 Feb 2010)
New Revision: 4550

Modified:
   trunk/varnish-cache/bin/varnishd/mgt_param.c
   trunk/varnish-cache/bin/varnishd/varnishd.1
   trunk/varnish-cache/bin/varnishd/varnishd.c
Log:
Centralize default param changes for VM conservation on 32 bit systems.

Mention this in man page.

Update param list in man page.



Modified: trunk/varnish-cache/bin/varnishd/mgt_param.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_param.c	2010-02-10 12:48:17 UTC (rev 4549)
+++ trunk/varnish-cache/bin/varnishd/mgt_param.c	2010-02-10 13:46:44 UTC (rev 4550)
@@ -523,11 +523,7 @@
 		"header and any edits done to it in the VCL code.\n"
 		"Minimum is 1024 bytes.",
 		DELAYED_EFFECT,
-#if SIZE_MAX <= UINT32_MAX
-		"16384",
-#else
 		"65536",
-#endif
 		"bytes" },
 	{ "http_headers", tweak_uint, &master.http_headers, 32, UINT_MAX,
 		"Maximum number of HTTP headers we will deal with.\n"

Modified: trunk/varnish-cache/bin/varnishd/varnishd.1
===================================================================
--- trunk/varnish-cache/bin/varnishd/varnishd.1	2010-02-10 12:48:17 UTC (rev 4549)
+++ trunk/varnish-cache/bin/varnishd/varnishd.1	2010-02-10 13:46:44 UTC (rev 4550)
@@ -512,6 +512,12 @@
 command, so should there be a new parameter which is not listed here,
 you can find the description using the CLI commands.
 .Pp
+Be aware that on 32 bit systems, certain default values, such as
+.Va sess_workspace
+(=16k) and
+.Va thread_pool_stack
+(=64k) are reduced relative to the values listed here, in order to conserve VM space.
+.Pp
 .\" ----------------------------------------------------------------
 .\" This table is generated by running a -DDIAGNOSTIC version of
 .\" varnishd with the secret "-x dumpmdoc" argument
@@ -639,21 +645,6 @@
 .Pp
 Timeout for the childs replies to CLI requests from the master.
 .Pp
-.It Va client_http11
-Units:
-.Dv bool
-.br
-Default:
-.Dv off
-.br
-Flags:
-.Dv "experimental"
-.br
-.Pp
-Force all client responses to be HTTP/1.1.
-.br
-By default we copy the protocol version from the backend response.
-.Pp
 .It Va clock_skew
 Units:
 .Dv s
@@ -1026,7 +1017,7 @@
 .Dv bytes
 .br
 Default:
-.Dv 16384
+.Dv 65536
 .br
 Flags:
 .Dv "delayed"

Modified: trunk/varnish-cache/bin/varnishd/varnishd.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/varnishd.c	2010-02-10 12:48:17 UTC (rev 4549)
+++ trunk/varnish-cache/bin/varnishd/varnishd.c	2010-02-10 13:46:44 UTC (rev 4550)
@@ -579,6 +579,18 @@
 	mgt_vcc_init();
 
 	MCF_ParamInit(cli);
+
+	if (sizeof(void *) < 8) {
+		/*
+		 * Adjust default parameters for 32 bit systems to conserve
+		 * VM space.
+		 */
+		MCF_ParamSet(cli, "sess_workspace", "16384");
+		cli_check(cli);
+		MCF_ParamSet(cli, "thread_pool_stack", "65536");
+		cli_check(cli);
+	}
+
 	cli_check(cli);
 
 	while ((o = getopt(argc, argv,