Changeset 752353b

Timestamp:

03/23/09 17:12:37 (13 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:

35c5a72

Parents:

2528816

Message:

Allow for bits per second measurements

File:

• tools/tracetop/tracetop.cc (modified) (7 diffs)

tools/tracetop/tracetop.cc

@@ -22 +22 @@
 typedef enum { BITS_PER_SEC, BYTES } display_t;
 display_t display_as = BYTES;
+int interval=1;
 
 int cmp_sockaddr_in6(const struct sockaddr_in6 *a, const struct sockaddr_in6 *b)
@@ -181 +182 @@
         getmaxyx(stdscr,row,col);
         attrset(A_REVERSE);
-        mvprintw(0,0,"%20s/%s\t%20s/%s\tproto\tbytes\tpackets\n",
+        mvprintw(0,0,"%20s/%s\t%20s/%s\tproto\t%s\tpackets\n",
                 "source ip","sport",
-                "dest ip","dport"
+                "dest ip","dport",
+                (display_as == BYTES ? "bytes" : "bits/sec")
                 );
         attrset(A_NORMAL);
@@ -189 +191 @@
         char dipstr[1024];
         for(int i=0; i<row-2 && !pq.empty(); ++i) {
-                mvprintw(i+1,0,"%20s/%-5d\t%20s/%-5d\t%d\t%"PRIu64"\t%"PRIu64"\n",
+                mvprintw(i+1,0,"%20s/%-5d\t%20s/%-5d\t%d\t",
                                 trace_sockaddr2string((struct sockaddr*)&pq.top().sip,
                                         sizeof(struct sockaddr_storage),
@@ -198 +200 @@
                                         dipstr,sizeof(dipstr)), 
                                 pq.top().dport,
-                                pq.top().protocol,
-                                pq.top().bytes,
-                                pq.top().packets);
+                                pq.top().protocol);
+                switch (display_as) {
+                        case BYTES:
+                                printw("%"PRIu64"\t%"PRIu64"\n",
+                                                pq.top().bytes,
+                                                pq.top().packets);
+                                break;
+                        case BITS_PER_SEC:
+                                printw("%8.03f\t%"PRIu64"\n",
+                                                8.0*pq.top().bytes/interval,
+                                                pq.top().packets);
+                }
                 pq.pop();
         }
@@ -231 +242 @@
                         { "help",               0, 0, 'h' },
                         { "libtrace-help",      0, 0, 'H' },
+                        { "bits-per-sec",       0, 0, 'b' },
                         { NULL,                 0, 0, 0 }
                 };
@@ -253 +265 @@
                                 trace_help();
                                 return 1;
+                        case 'b':
+                                display_as = BITS_PER_SEC;
+                                break;
                         default:
                                 fprintf(stderr,"Unknown option: %c\n",c);
@@ -304 +319 @@
 
                 while (trace_read_packet(trace,packet)>0) {
-                        if (trace_get_seconds(packet) - last_report > 1) {
+                        if (trace_get_seconds(packet) - last_report >= interval) {
                                 do_report();