Mailing List Archive

Author: des
Date: 2006-11-08 09:59:20 +0100 (Wed, 08 Nov 2006)
New Revision: 1221

Modified:
trunk/varnish-cache/bin/varnishd/varnishd.c
Log:
Rewrite tackle_warg(): don't override the default max or timeout unless
the user asks; bail if max < min; fix usage string.

Modified: trunk/varnish-cache/bin/varnishd/varnishd.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/varnishd.c 2006-11-08 08:49:57 UTC (rev 1220)
+++ trunk/varnish-cache/bin/varnishd/varnishd.c 2006-11-08 08:59:20 UTC (rev 1221)
@@ -194,7 +194,7 @@
fprintf(stderr, " %-28s # %s\n", "",
" -w min,max");
fprintf(stderr, " %-28s # %s\n", "",
- " -w min,max,timeout [default: -w1,INF,10]");
+ " -w min,max,timeout [default: -w1,1000,120]");
#if 0
-c clusterid at cluster_controller
-m memory_limit
@@ -211,21 +211,23 @@
static void
tackle_warg(const char *argv)
{
- int i;
- unsigned ua, ub, uc;
+ unsigned int ua, ub, uc;

- i = sscanf(argv, "%u,%u,%u", &ua, &ub, &uc);
- if (i == 0)
+ switch (sscanf(argv, "%u,%u,%u", &ua, &ub, &uc)) {
+ case 3:
+ params->wthread_timeout = uc;
+ case 2:
+ if (ub < ua)
+ usage();
+ params->wthread_max = ub;
+ case 1:
+ if (ua < 1)
+ usage();
+ params->wthread_min = ua;
+ break;
+ default:
usage();
- if (ua < 1)
- usage();
- params->wthread_min = ua;
- params->wthread_max = ua;
- params->wthread_timeout = 10;
- if (i >= 2)
- params->wthread_max = ub;
- if (i >= 3)
- params->wthread_timeout = uc;
+ }
}

/*--------------------------------------------------------------------