Changeset 3d4fb8f for tools/tracertstats

Timestamp:

03/13/06 11:01:18 (16 years ago)

Author:

Perry Lorier <perry@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

32f365f

Parents:

8f80e87

Message:

Cleanup the tools

Location:

tools/tracertstats

Files:

• output_csv.c (modified) (1 diff)
• output_html.c (modified) (1 diff)
• output_png.c (modified) (1 diff)
• output_txt.c (modified) (2 diffs)
• tracertstats.c (modified) (4 diffs)

tools/tracertstats/output_csv.c

@@ -46 +46 @@
 
 struct output_type_t output_csv = {
-name: "csv",
-init: output_csv_init,
-flush: output_csv_flush,
-destroy: output_csv_destroy,
+.name= "csv",
+.init= output_csv_init,
+.flush= output_csv_flush,
+.destroy= output_csv_destroy,
 };

tools/tracertstats/output_html.c

@@ -65 +65 @@
 
 struct output_type_t output_html = {
-name: "html",
-init: output_html_init,
-flush: output_html_flush,
-destroy: output_html_destroy,
+.name= "html",
+.init= output_html_init,
+.flush= output_html_flush,
+.destroy= output_html_destroy,
 };

tools/tracertstats/output_png.c

@@ -76 +76 @@
 
 struct output_type_t output_png = {
-        name: "png",
-        init: output_png_init,
-        flush: output_png_flush,
-        destroy: output_png_destroy,
+        .name= "png",
+        .init= output_png_init,
+        .flush= output_png_flush,
+        .destroy= output_png_destroy,
 };

tools/tracertstats/output_txt.c

@@ -4 +4 @@
 #include <inttypes.h>
 #include <lt_inttypes.h>
+#include <string.h>
 
 #define COLWIDTH 11
@@ -53 +54 @@
 
 struct output_type_t output_txt = {
-name: "txt",
-init: output_txt_init,
-flush: output_txt_flush,
-destroy: output_txt_destroy,
+.name= "txt",
+.init= output_txt_init,
+.flush= output_txt_flush,
+.destroy= output_txt_destroy,
 };

tools/tracertstats/tracertstats.c

@@ -29 +29 @@
  */
 
-// 
-// This program takes a series of traces and bpf filters and outputs how many
-// bytes/packets every time interval
+/* This program takes a series of traces and bpf filters and outputs how many
+ * bytes/packets every time interval
+ */
 
 #include <stdio.h>
@@ -98 +98 @@
         double ts = 0;
 
-        output=output_init(uri,output_format?:"txt");
-        output_add_column(output,"unix_time");
+        output=output_init(uri,output_format?output_format:"txt");
+        output_add_column(output,"ts");
         output_add_column(output,"packets");
         output_add_column(output,"bytes");
@@ -113 +113 @@
 
         trace = trace_create(uri);
+        if (trace_is_err(trace)) {
+                trace_perror(trace,"trace_create");
+                trace_destroy(trace);
+                output_destroy(output);
+                return; 
+        }
+        if (trace_start(trace)==-1) {
+                trace_perror(trace,"trace_start");
+                trace_destroy(trace);
+                output_destroy(output);
+                return;
+        }
 
         for (;;) {
@@ -141 +153 @@
                 }
 
-                if (count > packet_count) {
+                if (count >= packet_count) {
                         report_results(ts,count,bytes);
                         count=0;