projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove newlines at end of log messages.
[tinc]
/
src
/
top.c
diff --git
a/src/top.c
b/src/top.c
index
373b180
..
5552895
100644
(file)
--- a/
src/top.c
+++ b/
src/top.c
@@
-19,6
+19,8
@@
#include "system.h"
#include "system.h"
+#ifdef HAVE_CURSES
+
#include <curses.h>
#include "control_common.h"
#include <curses.h>
#include "control_common.h"
@@
-29,6
+31,7
@@
typedef struct nodestats_t {
char *name;
typedef struct nodestats_t {
char *name;
+ int i;
uint64_t in_packets;
uint64_t in_bytes;
uint64_t out_packets;
uint64_t in_packets;
uint64_t in_bytes;
uint64_t out_packets;
@@
-56,11
+59,14
@@
static bool cumulative = false;
static list_t node_list;
static struct timeval now, prev, diff;
static int delay = 1000;
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 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);
static void update(int fd) {
sendline(fd, "%d %d", CONTROL, REQ_DUMP_TRAFFIC);
gettimeofday(&now, NULL);
@@
-136,7
+142,7
@@
static void update(int fd) {
static void redraw(void) {
erase();
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);
attrset(A_REVERSE);
mvprintw(2, 0, "Node IN pkts IN %s OUT pkts OUT %s", unit, unit);
chgat(-1, A_REVERSE, 0, NULL);
@@
-150,6
+156,9
@@
static void redraw(void) {
sorted[n++] = i->data;
changed = false;
}
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)
int cmpfloat(float a, float b) {
if(a < b)
@@
-175,36
+184,36
@@
static void redraw(void) {
switch(sortmode) {
case 1:
if(cumulative)
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
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)
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
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)
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
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)
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
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)
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
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)
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
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:
default:
- return strcmp(na->name, nb->name);
+ return strcmp(na->name, nb->name)
?: na->i - nb->i
;
}
}
}
}
@@
-221,10
+230,10
@@
static void redraw(void) {
attrset(A_DIM);
if(cumulative)
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
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);
}
node->name, node->in_packets_rate, node->in_bytes_rate * scale, node->out_packets_rate, node->out_bytes_rate * scale);
}
@@
-237,6
+246,7
@@
static void redraw(void) {
void top(int fd) {
initscr();
timeout(delay);
void top(int fd) {
initscr();
timeout(delay);
+ bool running = true;
while(running) {
update(fd);
while(running) {
update(fd);
@@
-295,7
+305,6
@@
void top(int fd) {
scale = 1e-9;
break;
case 'q':
scale = 1e-9;
break;
case 'q':
- case 27:
case KEY_BREAK:
running = false;
break;
case KEY_BREAK:
running = false;
break;
@@
-306,3
+315,5
@@
void top(int fd) {
endwin();
}
endwin();
}
+
+#endif