#269 print per-loop stats with --stats=0 (#288)

fklassen · web-flow · commit b6196bcdb045 · 2017-02-27T11:05:07.000-08:00
diff --git a/src/common/flows.c b/src/common/flows.c
@@ -147,7 +147,7 @@ static inline flow_entry_type_t hash_put_data(flow_hash_table_t *fht, const uint
             res = FLOW_ENTRY_INVALID;
     }
 
-    dbgx(2, "flow type=%d\n", (int)res);
+    dbgx(2, "flow type=%d", (int)res);
     return res;
 }
 
@@ -321,7 +321,7 @@ flow_hash_table_t *flow_hash_table_init(size_t n)
 {
     flow_hash_table_t *fht;
     if (!is_power_of_2(n))
-        errx(-1, "invalid table size: %zu\n", n);
+        errx(-1, "invalid table size: %zu", n);
 
     fht = safe_malloc(sizeof(*fht));
     fht->num_buckets = n;
diff --git a/src/common/utils.c b/src/common/utils.c
@@ -157,10 +157,10 @@ packet_stats(const tcpreplay_stats_t *stats)
     }
 
     if (diff_us >= 1000000)
-        printf("Actual: " COUNTER_SPEC " packets (" COUNTER_SPEC " bytes) sent in %zd.%02zd seconds.\n",
-                stats->pkts_sent, stats->bytes_sent, (ssize_t)diff.tv_sec, (ssize_t)(diff.tv_usec / (100 * 1000)));
+        printf("Actual: " COUNTER_SPEC " packets (" COUNTER_SPEC " bytes) sent in %zd.%02zd seconds\n",
+                stats->pkts_sent, stats->bytes_sent, (ssize_t)diff.tv_sec, (ssize_t)(diff.tv_usec / (10 * 1000)));
     else
-        printf("Actual: " COUNTER_SPEC " packets (" COUNTER_SPEC " bytes) sent in %zd.%06zd seconds.\n",
+        printf("Actual: " COUNTER_SPEC " packets (" COUNTER_SPEC " bytes) sent in %zd.%06zd seconds\n",
                 stats->pkts_sent, stats->bytes_sent, (ssize_t)diff.tv_sec, (ssize_t)diff.tv_usec);
 
 
diff --git a/src/tcpedit/tcpedit.c b/src/tcpedit/tcpedit.c
@@ -330,7 +330,7 @@ tcpedit_init(tcpedit_t **tcpedit_ex, int dlt)
     tcpedit->runtime.dlt1 = dlt;
     tcpedit->runtime.dlt2 = dlt;
     
-    dbgx(1, "Input file (1) datalink type is %s\n",
+    dbgx(1, "Input file (1) datalink type is %s",
             pcap_datalink_val_to_name(dlt));
 
 #ifdef FORCE_ALIGN
@@ -494,7 +494,7 @@ tcpedit_close(tcpedit_t *tcpedit)
 
     assert(tcpedit);
     dbgx(1, "tcpedit processed " COUNTER_SPEC " bytes in " COUNTER_SPEC
-            " packets.\n", tcpedit->runtime.total_bytes, 
+            " packets.", tcpedit->runtime.total_bytes,
             tcpedit->runtime.pkts_edited);
 
     /* free buffer if required */
diff --git a/src/tcpreplay_api.c b/src/tcpreplay_api.c
@@ -98,6 +98,9 @@ tcpreplay_init()
     /* set the default MTU size */
     ctx->options->mtu = DEFAULT_MTU;
 
+    /* disable periodic statistics */
+    ctx->options->stats = -1;
+
     /* disable limit send */
     ctx->options->limit_send = -1;
 
@@ -1149,7 +1152,7 @@ tcpreplay_prepare(tcpreplay_t *ctx)
 int
 tcpreplay_replay(tcpreplay_t *ctx)
 {
-    int rcode;
+    int rcode, loop, total_loops;
 
     assert(ctx);
 
@@ -1172,21 +1175,36 @@ tcpreplay_replay(tcpreplay_t *ctx)
         return -1;
     }
 
-
     ctx->running = true;
+    total_loops = ctx->options->loop;
+    loop = 0;
 
     /* main loop, when not looping forever (or until abort) */
     if (ctx->options->loop > 0) {
         while (ctx->options->loop-- && !ctx->abort) {  /* limited loop */
+            if (ctx->options->stats == 0)
+                printf("Loop %d of %d...\n", ++loop, total_loops);
             if ((rcode = tcpr_replay_index(ctx)) < 0)
                 return rcode;
-            if (ctx->options->loop > 0 && !ctx->abort && ctx->options->loopdelay_ms > 0)
-            	usleep(ctx->options->loopdelay_ms * 1000);
+            if (ctx->options->loop > 0) {
+                if (!ctx->abort && ctx->options->loopdelay_ms > 0) {
+                    usleep(ctx->options->loopdelay_ms * 1000);
+                    gettimeofday(&ctx->stats.end_time, NULL);
+                }
+
+                if (ctx->options->stats == 0)
+                    packet_stats(&ctx->stats);
+            }
         }
     } else {
         while (!ctx->abort) { /* loop forever unless user aborts */
+            if (ctx->options->stats == 0)
+                printf("Loop %d...\n", ++loop);
             if ((rcode = tcpr_replay_index(ctx)) < 0)
                 return rcode;
+
+            if (ctx->options->stats == 0 && !ctx->abort)
+                packet_stats(&ctx->stats);
         }
     }
 
diff --git a/src/tcpreplay_opts.def b/src/tcpreplay_opts.def
@@ -596,10 +596,10 @@ EOText;
 flag = {
     name        = stats;
     arg-type    = number;
-    arg-range   = "1->";
-    descrip     = "Print statistics every X seconds";
+    arg-range   = "0->";
+    descrip     = "Print statistics every X seconds, or every loop if '0'";
     doc         = <<- EOText
-Note that this is very much a "best effort" and long delays between
+Note that timed delays are a "best effort" and long delays between
 sending packets may cause equally long delays between printing statistics.
 EOText;
 };

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ static inline flow_entry_type_t hash_put_data(flow_hash_table_t *fht, const uint`
`147`	`147`	`res = FLOW_ENTRY_INVALID;`
`148`	`148`	`}`
`149`	`149`
`150`		`- dbgx(2, "flow type=%d\n", (int)res);`
	`150`	`+ dbgx(2, "flow type=%d", (int)res);`
`151`	`151`	`return res;`
`152`	`152`	`}`
`153`	`153`
`@@ -321,7 +321,7 @@ flow_hash_table_t *flow_hash_table_init(size_t n)`
`321`	`321`	`{`
`322`	`322`	`flow_hash_table_t *fht;`
`323`	`323`	`if (!is_power_of_2(n))`
`324`		`- errx(-1, "invalid table size: %zu\n", n);`
	`324`	`+ errx(-1, "invalid table size: %zu", n);`
`325`	`325`
`326`	`326`	`fht = safe_malloc(sizeof(*fht));`
`327`	`327`	`fht->num_buckets = n;`