[master] 14a0992 Make thread_pool_max and thread_pool_min consistent so they both apply to individual pools.

[Poul-Henning Kamp]

commit 14a09925afd07d27528996ff133a14cd425a8f14
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Fri May 13 07:50:11 2011 +0000

    Make thread_pool_max and thread_pool_min consistent so they both
    apply to individual pools.

diff --git a/bin/varnishd/cache_pool.c b/bin/varnishd/cache_pool.c
index f701442..2b82455 100644
--- a/bin/varnishd/cache_pool.c
+++ b/bin/varnishd/cache_pool.c
@@ -436,7 +436,7 @@ wrk_herdtimer_thread(void *priv)
 
 		/* Scale parameters */
 
-		u = params->wthread_max / nwq;
+		u = params->wthread_max;
 		if (u < params->wthread_min)
 			u = params->wthread_min;
 		nthr_max = u;
diff --git a/bin/varnishd/mgt_pool.c b/bin/varnishd/mgt_pool.c
index afa8435..fce1a8f 100644
--- a/bin/varnishd/mgt_pool.c
+++ b/bin/varnishd/mgt_pool.c
@@ -121,7 +121,7 @@ const struct parspec WRK_parspec[] = {
 		EXPERIMENTAL | DELAYED_EFFECT,
 		"2", "pools" },
 	{ "thread_pool_max", tweak_thread_pool_max, NULL, 1, 0,
-		"The maximum number of worker threads in all pools combined.\n"
+		"The maximum number of worker threads in each pool.\n"
 		"\n"
 		"Do not set this higher than you have to, since excess "
 		"worker threads soak up RAM and CPU and generally just get "
@@ -129,7 +129,7 @@ const struct parspec WRK_parspec[] = {
 		EXPERIMENTAL | DELAYED_EFFECT,
 		"500", "threads" },
 	{ "thread_pool_min", tweak_thread_pool_min, NULL, 2, 0,
-		"The minimum number of threads in each worker pool.\n"
+		"The minimum number of threads in each pool.\n"
 		"\n"
 		"Increasing this may help ramp up faster from low load "
 		"situations where threads have expired.\n"