Make sure the top command can be used more than once in tincctl's shell.

[tinc] / src / top.c

diff --git a/src/top.c b/src/top.c
index b71bcb8..5552895 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;
@@ -56,7 +59,6 @@ static bool cumulative = false;
 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;
@@ -140,7 +142,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);
@@ -154,6 +156,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)
@@ -179,36 +184,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;
                }
        }
 
@@ -241,6 +246,7 @@ static void redraw(void) {
 void top(int fd) {
        initscr();
        timeout(delay);
+       bool running = true;
 
        while(running) {
                update(fd);
@@ -299,7 +305,6 @@ void top(int fd) {
                                  scale = 1e-9;
                                  break;
                        case 'q':
-                       case 27:
                        case KEY_BREAK:
                                running = false;
                                break;
@@ -310,3 +315,5 @@ void top(int fd) {
 
        endwin();
 }
+
+#endif