From c412d8d8148d4d0797888e01b4d00c8c94ea91f8 Mon Sep 17 00:00:00 2001
From: Daniel Borkmann <borkmann@iogearbox.net>
Date: Wed, 9 May 2012 11:34:07 +0200
Subject: [PATCH] trafgen: be non-verbose on default

Signed-off-by: Daniel Borkmann <borkmann@iogearbox.net>
---
 src/trafgen.c        |  9 +++++++--
 src/trafgen_parser.y | 10 ++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/trafgen.c b/src/trafgen.c
index 193cefe..ed378e2 100644
--- a/src/trafgen.c
+++ b/src/trafgen.c
@@ -194,6 +194,7 @@ struct mode {
 	/* 0 for automatic, > 0 for manual */
 	unsigned int reserve_size;
 	int jumbo_support;
+	int verbose;
 };
 
 #define CPU_UNKNOWN  -1
@@ -204,7 +205,7 @@ extern int compile_packets(char *file, struct pktconf *cfg, int verbose);
 
 sig_atomic_t sigint = 0;
 
-static const char *short_options = "d:c:n:t:vJhS:HQb:B:rk:xi:o:";
+static const char *short_options = "d:c:n:t:vJhS:HQb:B:rk:xi:o:V";
 
 static struct option long_options[] = {
 	{"dev", required_argument, 0, 'd'},
@@ -222,6 +223,7 @@ static struct option long_options[] = {
 	{"rand", no_argument, 0, 'r'},
 	{"prio-high", no_argument, 0, 'H'},
 	{"notouch-irq", no_argument, 0, 'Q'},
+	{"verbose", no_argument, 0, 'V'},
 	{"version", no_argument, 0, 'v'},
 	{"help", no_argument, 0, 'h'},
 	{0, 0, 0, 0}
@@ -594,7 +596,7 @@ static int main_loop(struct mode *mode, char *confname, unsigned long pkts,
 	cfg.gap = gap,
 	cfg.len = 0,
 
-	compile_packets(confname, &cfg, 1);
+	compile_packets(confname, &cfg, mode->verbose);
 	if (gap > 0)
 		tx_tgap_or_die(mode, &cfg);
 	else
@@ -627,6 +629,9 @@ int main(int argc, char **argv)
 		case 'v':
 			version();
 			break;
+		case 'V':
+			mode.verbose = 1;
+			break;
 		case 'd':
 		case 'o':
 			mode.device = xstrndup(optarg, IFNAMSIZ);
diff --git a/src/trafgen_parser.y b/src/trafgen_parser.y
index f169b5c..bcc7518 100644
--- a/src/trafgen_parser.y
+++ b/src/trafgen_parser.y
@@ -340,6 +340,16 @@ int compile_packets(char *file, struct pktconf *cfg, int verbose)
 
 	if (verbose)
 		dump_conf(cfg);
+	else {
+		int i;
+		size_t total_len = 0;
+
+		printf("%zu packets to schedule\n", conf->len);
+
+		for (i = 0; i < conf->len; ++i)
+			total_len += conf->pkts[i].plen;
+		printf("%zu bytes in total\n", total_len);
+	}
 
 	fclose(yyin);
 	return 0;
-- 
2.11.4.GIT