Make traffic statistics more readable with configurable scaling.

[tinc] / src / top.c

diff --git a/src/top.c b/src/top.c
index f4e7303..62c46f5 100644 (file)
--- a/src/top.c
+++ b/src/top.c
@@ -57,6 +57,9 @@ static list_t node_list;
 static struct timeval now, prev, diff;
 static int delay = 1000;
 static bool running = true;
+static bool changed = true;
+static const char *unit = "bytes";
+static float scale = 1;
 
 static void update(int fd) {
        sendline(fd, "%d %d", CONTROL, REQ_DUMP_TRAFFIC);
@@ -133,13 +136,18 @@ static void redraw(void) {
 
        mvprintw(0, 0, "Tinc %-16s  Nodes: %4d  Sort: %-8s  %s", netname, node_list.count, sortname[sortmode], cumulative ? "Cumulative" : "Current");
        attrset(A_REVERSE);
-       mvprintw(2, 0, "Node                IN pkts   IN bytes   OUT pkts  OUT bytes");
+       mvprintw(2, 0, "Node                IN pkts   IN %s   OUT pkts  OUT %s", unit, unit);
        chgat(-1, A_REVERSE, 0, NULL);
 
-       nodestats_t *sorted[node_list.count];
-       int n = 0;
-       for(list_node_t *i = node_list.head; i; i = i->next)
-               sorted[n++] = i->data;
+       static nodestats_t **sorted = 0;
+       static int n = 0;
+       if(changed) {
+               n = 0;
+               sorted = xrealloc(sorted, node_list.count * sizeof *sorted);
+               for(list_node_t *i = node_list.head; i; i = i->next)
+                       sorted[n++] = i->data;
+               changed = false;
+       }
        
        int cmpfloat(float a, float b) {
                if(a < b)
@@ -200,8 +208,7 @@ static void redraw(void) {
 
        qsort(sorted, n, sizeof *sorted, sortfunc);
 
-       int row = 3;
-       for(int i = 0; i < n; i++, row++) {
+       for(int i = 0, row = 3; i < n; i++, row++) {
                nodestats_t *node = sorted[i];
                if(node->known)
                        if(node->in_packets_rate || node->out_packets_rate)
@@ -212,11 +219,11 @@ static void redraw(void) {
                        attrset(A_DIM);
 
                if(cumulative)
-                       mvprintw(row, 0, "%-16s %'10"PRIu64" %'10"PRIu64" %'10"PRIu64" %'10"PRIu64,
-                                       node->name, node->in_packets, node->in_bytes, node->out_packets, node->out_bytes);
+                       mvprintw(row, 0, "%-16s %'10"PRIu64" %'10.0f %'10"PRIu64" %'10.0f",
+                                       node->name, node->in_packets, node->in_bytes * scale, node->out_packets, node->out_bytes * scale);
                else
                        mvprintw(row, 0, "%-16s %'10.0f %'10.0f %'10.0f %'10.0f",
-                                       node->name, node->in_packets_rate, node->in_bytes_rate, node->out_packets_rate, node->out_bytes_rate);
+                                       node->name, node->in_packets_rate, node->in_bytes_rate * scale, node->out_packets_rate, node->out_bytes_rate * scale);
        }
 
        attrset(A_NORMAL);
@@ -269,6 +276,22 @@ void top(int fd) {
                        case 'T':
                                  sortmode = 5;
                                  break;
+                       case 'b':
+                                 unit = "bytes";
+                                 scale = 1;
+                                 break;
+                       case 'k':
+                                 unit = "kbyte";
+                                 scale = 1e-3;
+                                 break;
+                       case 'M':
+                                 unit = "Mbyte";
+                                 scale = 1e-6;
+                                 break;
+                       case 'G':
+                                 unit = "Gbyte";
+                                 scale = 1e-9;
+                                 break;
                        case 'q':
                        case 27:
                        case KEY_BREAK: