r2753 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2008-06-21 09:48:02 +0200 (Sat, 21 Jun 2008)
New Revision: 2753

Modified:
   trunk/varnish-cache/bin/varnishd/mgt_param.c
   trunk/varnish-cache/bin/varnishd/varnishd.c
Log:
Fix the default thread pool parameters to 2 pools, 500 threads and 300 seconds.

Add usage for -u while here.



Modified: trunk/varnish-cache/bin/varnishd/mgt_param.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_param.c	2008-06-21 06:42:34 UTC (rev 2752)
+++ trunk/varnish-cache/bin/varnishd/mgt_param.c	2008-06-21 07:48:02 UTC (rev 2753)
@@ -477,7 +477,7 @@
 		"Can be increased on the fly, but decreases require a "
 		"restart to take effect.",
 		EXPERIMENTAL | DELAYED_EFFECT,
-		"1", "pools" },
+		"2", "pools" },
 	{ "thread_pool_max", tweak_thread_pool_max, NULL, 1, 0,
 		"The maximum number of worker threads in all pools combined.\n"
 		"\n"
@@ -485,7 +485,7 @@
 		"worker threads soak up RAM and CPU and generally just get "
 		"in the way of getting work done.\n",
 		EXPERIMENTAL | DELAYED_EFFECT,
-		"100", "threads" },
+		"500", "threads" },
 	{ "thread_pool_min", tweak_thread_pool_min, NULL, 1, 0,
 		"The minimum number of threads in all worker pools combined.\n"
 		"\n"

Modified: trunk/varnish-cache/bin/varnishd/varnishd.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/varnishd.c	2008-06-21 06:42:34 UTC (rev 2752)
+++ trunk/varnish-cache/bin/varnishd/varnishd.c	2008-06-21 07:48:02 UTC (rev 2753)
@@ -157,14 +157,9 @@
 	fprintf(stderr, FMT, "-w int[,int[,int]]", "Number of worker threads");
 	fprintf(stderr, FMT, "", "  -w <fixed_count>");
 	fprintf(stderr, FMT, "", "  -w min,max");
-	fprintf(stderr, FMT, "", "  -w min,max,timeout [default: -w1,1000,120]");
+	fprintf(stderr, FMT, "", "  -w min,max,timeout [default: -w2,500,300]");
+	fprintf(stderr, FMT, "-u user", "Priviledge separation user id");
 #undef FMT
-#if 0
-	-c clusterid at cluster_controller
-	-m memory_limit
-	-u uid
-	-a CLI_port
-#endif
 	exit(1);
 }