r1245 - in branches/1.0: . bin/varnishd

des at projects.linpro.no des at projects.linpro.no
Tue Feb 20 09:46:42 CET 2007


Author: des
Date: 2007-02-20 09:46:42 +0100 (Tue, 20 Feb 2007)
New Revision: 1245

Modified:
   branches/1.0/
   branches/1.0/bin/varnishd/varnishd.c
Log:
 r33742 at cat (orig r1221):  des | 2006-11-08 09:59:20 +0100
 Rewrite tackle_warg(): don't override the default max or timeout unless
 the user asks; bail if max < min; fix usage string.



Property changes on: branches/1.0
___________________________________________________________________
Name: svk:merge
   - d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1220
   + d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1221

Modified: branches/1.0/bin/varnishd/varnishd.c
===================================================================
--- branches/1.0/bin/varnishd/varnishd.c	2007-02-20 08:46:41 UTC (rev 1244)
+++ branches/1.0/bin/varnishd/varnishd.c	2007-02-20 08:46:42 UTC (rev 1245)
@@ -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;
+	}
 }
 
 /*--------------------------------------------------------------------




More information about the varnish-commit mailing list