Really stable sorting of tincctl top output.

[tinc] / src / top.c

diff --git a/src/top.c b/src/top.c
index 62c46f5..5a9edb0 100644 (file)
--- a/src/top.c
+++ b/src/top.c
@@ -19,6 +19,8 @@
 
 #include "system.h"
 
+#ifdef HAVE_CURSES
+
 #include <curses.h>
 
 #include "control_common.h"
@@ -29,6 +31,7 @@
 
 typedef struct nodestats_t {
        char *name;
+       int i;
        uint64_t in_packets;
        uint64_t in_bytes;
        uint64_t out_packets;
@@ -61,6 +64,10 @@ static bool changed = true;
 static const char *unit = "bytes";
 static float scale = 1;
 
+#ifndef timersub
+#define timersub(a, b, c) do {(c)->tv_sec = (a)->tv_sec - (b)->tv_sec; (c)->tv_usec = (a)->tv_usec = (b)->tv_usec;} while(0)
+#endif
+
 static void update(int fd) {
        sendline(fd, "%d %d", CONTROL, REQ_DUMP_TRAFFIC);
        gettimeofday(&now, NULL);
@@ -108,7 +115,8 @@ static void update(int fd) {
                        } else {
                                found = xmalloc_and_zero(sizeof *found);
                                found->name = xstrdup(name);
-                               list_insert_after(&node_list, i, found);
+                               list_insert_before(&node_list, i, found);
+                               changed = true;
                                break;
                        }
                }
@@ -117,6 +125,7 @@ static void update(int fd) {
                        found = xmalloc_and_zero(sizeof *found);
                        found->name = xstrdup(name);
                        list_insert_tail(&node_list, found);
+                       changed = true;
                }
 
                found->known = true;
@@ -134,7 +143,7 @@ static void update(int fd) {
 static void redraw(void) {
        erase();
 
-       mvprintw(0, 0, "Tinc %-16s  Nodes: %4d  Sort: %-8s  %s", netname, node_list.count, sortname[sortmode], cumulative ? "Cumulative" : "Current");
+       mvprintw(0, 0, "Tinc %-16s  Nodes: %4d  Sort: %-10s  %s", netname ?: "", node_list.count, sortname[sortmode], cumulative ? "Cumulative" : "Current");
        attrset(A_REVERSE);
        mvprintw(2, 0, "Node                IN pkts   IN %s   OUT pkts  OUT %s", unit, unit);
        chgat(-1, A_REVERSE, 0, NULL);
@@ -148,6 +157,9 @@ static void redraw(void) {
                        sorted[n++] = i->data;
                changed = false;
        }
+
+       for(int i = 0; i < n; i++)
+               sorted[i]->i = i;
        
        int cmpfloat(float a, float b) {
                if(a < b)
@@ -173,36 +185,36 @@ static void redraw(void) {
                switch(sortmode) {
                        case 1:
                                if(cumulative)
-                                       return -cmpu64(na->in_packets, nb->in_packets);
+                                       return -cmpu64(na->in_packets, nb->in_packets) ?: na->i - nb->i;
                                else
-                                       return -cmpfloat(na->in_packets_rate, nb->in_packets_rate);
+                                       return -cmpfloat(na->in_packets_rate, nb->in_packets_rate) ?: na->i - nb->i;
                        case 2:
                                if(cumulative)
-                                       return -cmpu64(na->in_bytes, nb->in_bytes);
+                                       return -cmpu64(na->in_bytes, nb->in_bytes) ?: na->i - nb->i;
                                else
-                                       return -cmpfloat(na->in_bytes_rate, nb->in_bytes_rate);
+                                       return -cmpfloat(na->in_bytes_rate, nb->in_bytes_rate) ?: na->i - nb->i;
                        case 3:
                                if(cumulative)
-                                       return -cmpu64(na->out_packets, nb->out_packets);
+                                       return -cmpu64(na->out_packets, nb->out_packets) ?: na->i - nb->i;
                                else
-                                       return -cmpfloat(na->out_packets_rate, nb->out_packets_rate);
+                                       return -cmpfloat(na->out_packets_rate, nb->out_packets_rate) ?: na->i - nb->i;
                        case 4:
                                if(cumulative)
-                                       return -cmpu64(na->out_bytes, nb->out_bytes);
+                                       return -cmpu64(na->out_bytes, nb->out_bytes) ?: na->i - nb->i;
                                else
-                                       return -cmpfloat(na->out_bytes_rate, nb->out_bytes_rate);
+                                       return -cmpfloat(na->out_bytes_rate, nb->out_bytes_rate) ?: na->i - nb->i;
                        case 5:
                                if(cumulative)
-                                       return -cmpu64(na->in_packets + na->out_packets, nb->in_packets + nb->out_packets);
+                                       return -cmpu64(na->in_packets + na->out_packets, nb->in_packets + nb->out_packets) ?: na->i - nb->i;
                                else
-                                       return -cmpfloat(na->in_packets_rate + na->out_packets_rate, nb->in_packets_rate + nb->out_packets_rate);
+                                       return -cmpfloat(na->in_packets_rate + na->out_packets_rate, nb->in_packets_rate + nb->out_packets_rate) ?: na->i - nb->i;
                        case 6:
                                if(cumulative)
-                                       return -cmpu64(na->in_bytes + na->out_bytes, nb->in_bytes + nb->out_bytes);
+                                       return -cmpu64(na->in_bytes + na->out_bytes, nb->in_bytes + nb->out_bytes) ?: na->i - nb->i;
                                else
-                                       return -cmpfloat(na->in_bytes_rate + na->out_bytes_rate, nb->in_bytes_rate + nb->out_bytes_rate);
+                                       return -cmpfloat(na->in_bytes_rate + na->out_bytes_rate, nb->in_bytes_rate + nb->out_bytes_rate) ?: na->i - nb->i;
                        default:
-                               return strcmp(na->name, nb->name);
+                               return strcmp(na->name, nb->name) ?: na->i - nb->i;
                }
        }
 
@@ -219,10 +231,10 @@ static void redraw(void) {
                        attrset(A_DIM);
 
                if(cumulative)
-                       mvprintw(row, 0, "%-16s %'10"PRIu64" %'10.0f %'10"PRIu64" %'10.0f",
+                       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",
+                       mvprintw(row, 0, "%-16s %10.0f %10.0f %10.0f %10.0f",
                                        node->name, node->in_packets_rate, node->in_bytes_rate * scale, node->out_packets_rate, node->out_bytes_rate * scale);
        }
 
@@ -304,3 +316,5 @@ void top(int fd) {
 
        endwin();
 }
+
+#endif