Changeset c7c10de for tools/tracetop

Timestamp:

03/11/13 13:37:47 (9 years ago)

Author:

Shane Alcock <salcock@…>

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:

e99ba00

Parents:

9ca1fce

Message:

• Added a new option to tracetop: --wide, which will extend the display layout so that IPv6 addresses fit nicely. It's not on by default, because you will need a pretty wide terminal for it to work

Location:

tools/tracetop

Files:

• tracetop.1 (modified) (2 diffs)
• tracetop.cc (modified) (9 diffs)

tools/tracetop/tracetop.1

@@ -9 +9 @@
 [ \fB--bits-per-sec ]
 [ \fB--percent ]
+[ \fB--wide | -w ]
 [ \fB-i \fRinterval | \fB--interval=\fRinterval]
 [ \fB-h \fR| \fB--help\fR]
@@ -22 +23 @@
 \fB\-i\fR interval
 Wait interval seconds between updates.  (default 2).
+
+.TP
+\fB\-\-wide
+Expand the display to be able to fit IPv6 addresses. Use this to ensure the
+formatting lines up in the presence of IPv6 traffic.
 
 .TP

tools/tracetop/tracetop.cc

@@ -14 +14 @@
 #include <netdb.h>
 #include <string.h>
+#include <assert.h>
 #ifdef HAVE_NETPACKET_PACKET_H
 #include <netpacket/packet.h>
@@ -39 +40 @@
 bool quit = false;
 bool fullspeed = false;
+bool wide_display = false;
 
 uint64_t total_bytes=0;
@@ -303 +305 @@
         move(1,0);
         if (use_sip) {
-                printw("%20s", "source ip");
+                if (wide_display)
+                        printw("%46s", "source ip");
+                else
+                        printw("%20s", "source ip");
+                        
                 if (use_sport)
                         printw("/");
@@ -312 +318 @@
                 printw("%s\t", "sport");
         if (use_dip) {
-                printw("%20s", "dest ip");
+                if (wide_display)
+                        printw("%46s", "dest ip");
+                else
+                        printw("%20s", "dest ip");
                 if (use_dport)
                         printw("/");
@@ -341 +350 @@
                 move(i+1,0);
                 if (use_sip) {
-                        printw("%20s",
-                                trace_sockaddr2string((struct sockaddr*)&pq.top().sip,
-                                        sizeof(struct sockaddr_storage),
-                                        sipstr,sizeof(sipstr)));
+                        if (wide_display) {
+                                printw("%46s",
+                                        trace_sockaddr2string(
+                                                (struct sockaddr*)&pq.top().sip,
+                                                sizeof(struct sockaddr_storage),
+                                                sipstr,sizeof(sipstr)));
+                        } else {
+                                printw("%20s",
+                                        trace_sockaddr2string(
+                                                (struct sockaddr*)&pq.top().sip,
+                                                sizeof(struct sockaddr_storage),
+                                                sipstr,sizeof(sipstr)));
+                        }
                         if (use_sport)
                                 printw("/");
@@ -353 +371 @@
                         printw("%-5d\t", get_port_from_sockaddr((struct sockaddr*)&pq.top().sip));
                 if (use_dip) {
-                        printw("%20s",
-                                trace_sockaddr2string((struct sockaddr*)&pq.top().dip,
-                                        sizeof(struct sockaddr_storage),
-                                        dipstr,sizeof(dipstr)));
+                        if (wide_display) {
+                                printw("%46s",
+                                        trace_sockaddr2string(
+                                                (struct sockaddr*)&pq.top().dip,
+                                                sizeof(struct sockaddr_storage),
+                                                dipstr,sizeof(dipstr)));
+                        } else {
+                                printw("%20s",
+                                        trace_sockaddr2string(
+                                                (struct sockaddr*)&pq.top().dip,
+                                                sizeof(struct sockaddr_storage),
+                                                dipstr,sizeof(dipstr)));
+
+                        }
                         if (use_dport)
                                 printw("/");
@@ -500 +528 @@
         fprintf(stderr," -i int\n");
         fprintf(stderr,"\t\tUpdate the display every int seconds\n");
+        fprintf(stderr," --wide\n");
+        fprintf(stderr," -w\n");
+        fprintf(stderr,"\t\tExpand IP address fields to fit IPv6 addresses\n");
 }
 
@@ -523 +554 @@
                         { "interval",           1, 0, 'i' },
                         { "fast",               0, 0, 'F' },
+                        { "wide",               0, 0, 'w' },
                         { NULL,                 0, 0, 0 }
                 };
 
-                int c= getopt_long(argc, argv, "f:Fs:p:hHi:12345",
+                int c= getopt_long(argc, argv, "f:Fs:p:hHi:w12345",
                                 long_options, &option_index);
 
@@ -560 +592 @@
                                         return 1;
                                 }
+                                break;
+                        case 'w':
+                                wide_display = true;
                                 break;
                         case '1': use_sip       = !use_sip; break;