r310 - trunk/varnish-tools/fetcher

[des at projects.linpro.no]

Author: des
Date: 2006-07-05 10:13:01 +0200 (Wed, 05 Jul 2006)
New Revision: 310

Modified:
   trunk/varnish-tools/fetcher/fetcher.c
Log:
Add signal handling and statistics.

Modified: trunk/varnish-tools/fetcher/fetcher.c
===================================================================
--- trunk/varnish-tools/fetcher/fetcher.c	2006-07-05 08:08:46 UTC (rev 309)
+++ trunk/varnish-tools/fetcher/fetcher.c	2006-07-05 08:13:01 UTC (rev 310)
@@ -4,6 +4,7 @@
 
 #include <sys/param.h>
 #include <sys/socket.h>
+#include <sys/time.h>
 
 #include <err.h>
 #include <netdb.h>
@@ -113,7 +114,15 @@
 	}
 }
 
+static volatile sig_atomic_t got_sig;
+
 static void
+handler(int sig)
+{
+	got_sig = sig;
+}
+
+static void
 usage(void)
 {
 	fprintf(stderr, "usage: fetcher [-h]\n");
@@ -125,6 +134,8 @@
 int
 main(int argc, char *argv[])
 {
+	struct timeval start, stop;
+	double elapsed;
 	char url[PATH_MAX];
 	int i, opt, sd;
 	FILE *f;
@@ -159,14 +170,22 @@
 	if ((f = fdopen(sd, "w+")) == NULL)
 		err(1, "fdopen()");
 
-	for (i = 0; i < ctr; ++i) {
-		if (i % 163 == 0)
-			fprintf(stderr, "\r%d ", i);
+	got_sig = 0;
+	signal(SIGINT, handler);
+	signal(SIGTERM, handler);
+	gettimeofday(&start, NULL);
+	for (i = 0; i < ctr && !got_sig; ++i) {
 		snprintf(url, sizeof url, url_pattern, i % MAX_CTR);
 		send_request(f, method, host, url);
 		receive_response(f, method);
 	}
+	gettimeofday(&stop, NULL);
 	fclose(f);
 
+	elapsed = (stop.tv_sec * 1000000.0 + stop.tv_usec) -
+	    (start.tv_sec * 1000000.0 + start.tv_usec);
+	fprintf(stderr, "%d requests in %.3f seconds (%d rps)\n",
+	    i, elapsed / 1000000, (int)(i / (elapsed / 1000000)));
+
 	exit(0);
 }