j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Make traffic statistics more readable with configurable scaling.

Browse source
This commit is contained in:
Guus Sliepen 2011-06-02 20:48:18 +02:00
parent a8f0d21330
commit 311f60f4f0
1 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/top.c
View file

@ -58,6 +58,8 @@ static struct timeval now, prev, diff;
static int delay = 1000; static int delay = 1000;
static bool running = true; static bool running = true;
static bool changed = true; static bool changed = true;
static const char *unit = "bytes";
static float scale = 1;
static void update(int fd) { static void update(int fd) {
sendline(fd, "%d %d", CONTROL, REQ_DUMP_TRAFFIC); sendline(fd, "%d %d", CONTROL, REQ_DUMP_TRAFFIC);
@ -134,7 +136,7 @@ static void redraw(void) {
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: %-8s %s", netname, node_list.count, sortname[sortmode], cumulative ? "Cumulative" : "Current");
attrset(A_REVERSE); 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); chgat(-1, A_REVERSE, 0, NULL);
static nodestats_t **sorted = 0; static nodestats_t **sorted = 0;
@ -217,11 +219,11 @@ static void redraw(void) {
attrset(A_DIM); attrset(A_DIM);
if(cumulative) if(cumulative)
mvprintw(row, 0, "%-16s %'10"PRIu64" %'10"PRIu64" %'10"PRIu64" %'10"PRIu64, mvprintw(row, 0, "%-16s %'10"PRIu64" %'10.0f %'10"PRIu64" %'10.0f",
node->name, node->in_packets, node->in_bytes, node->out_packets, node->out_bytes); node->name, node->in_packets, node->in_bytes * scale, node->out_packets, node->out_bytes * scale);
else 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, 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); attrset(A_NORMAL);
@ -274,6 +276,22 @@ void top(int fd) {
case 'T': case 'T':
sortmode = 5; sortmode = 5;
break; 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 'q':
case 27: case 27:
case KEY_BREAK: case KEY_BREAK: