From: phk Date: Sat, 21 Jun 2008 07:48:02 +0000 (+0000) Subject: Fix the default thread pool parameters to 2 pools, 500 threads and 300 seconds. X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c34d7ffe3e668e2423e3c72c0c22937bdc10c28;p=varnish Fix the default thread pool parameters to 2 pools, 500 threads and 300 seconds. Add usage for -u while here. git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2753 d4fa192b-c00b-0410-8231-f00ffab90ce4 --- diff --git a/varnish-cache/bin/varnishd/mgt_param.c b/varnish-cache/bin/varnishd/mgt_param.c index c3fde983..aee70ce5 100644 --- a/varnish-cache/bin/varnishd/mgt_param.c +++ b/varnish-cache/bin/varnishd/mgt_param.c @@ -477,7 +477,7 @@ static const struct parspec parspec[] = { "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 @@ static const struct parspec parspec[] = { "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" diff --git a/varnish-cache/bin/varnishd/varnishd.c b/varnish-cache/bin/varnishd/varnishd.c index 71cd40cb..e0d14ae0 100644 --- a/varnish-cache/bin/varnishd/varnishd.c +++ b/varnish-cache/bin/varnishd/varnishd.c @@ -157,14 +157,9 @@ usage(void) fprintf(stderr, FMT, "-w int[,int[,int]]", "Number of worker threads"); fprintf(stderr, FMT, "", " -w "); 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@cluster_controller - -m memory_limit - -u uid - -a CLI_port -#endif exit(1); }