X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftop.c;h=750488948b1961ccba38cd0e8e047a4371c23c57;hb=6bc5d626a8726fc23365ee705761a3c666a08ad4;hp=5ca97495ff0c5eef4587eee04d669e68af980810;hpb=d772289f6d6adfb8932658b533349d43f08ec326;p=tinc diff --git a/src/top.c b/src/top.c index 5ca97495..75048894 100644 --- a/src/top.c +++ b/src/top.c @@ -1,6 +1,6 @@ /* top.c -- Show real-time statistics from a running tincd - Copyright (C) 2011 Guus Sliepen + Copyright (C) 2011-2012 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,6 +19,8 @@ #include "system.h" +#ifdef HAVE_CURSES + #include #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; @@ -54,16 +57,22 @@ static int sortmode = 0; static bool cumulative = false; static list_t node_list; -static struct timeval now, prev, diff; +static struct timeval cur, prev, diff; static int delay = 1000; -static bool running = true; +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); + gettimeofday(&cur, NULL); - timersub(&now, &prev, &diff); - prev = now; + timersub(&cur, &prev, &diff); + prev = cur; float interval = diff.tv_sec + diff.tv_usec * 1e-6; char line[4096]; @@ -75,10 +84,8 @@ static void update(int fd) { uint64_t out_packets; uint64_t out_bytes; - for(list_node_t *i = node_list.head; i; i = i->next) { - nodestats_t *node = i->data; - node->known = false; - } + for list_each(nodestats_t, ns, &node_list) + ns->known = false; while(recvline(fd, line, sizeof line)) { int n = sscanf(line, "%d %d %s %"PRIu64" %"PRIu64" %"PRIu64" %"PRIu64, &code, &req, name, &in_packets, &in_bytes, &out_packets, &out_bytes); @@ -94,18 +101,18 @@ static void update(int fd) { nodestats_t *found = NULL; - for(list_node_t *i = node_list.head; i; i = i->next) { - nodestats_t *node = i->data; - int result = strcmp(name, node->name); + for list_each(nodestats_t, ns, &node_list) { + int result = strcmp(name, ns->name); if(result > 0) { continue; } if(result == 0) { - found = node; + found = ns; break; } else { found = xmalloc_and_zero(sizeof *found); found->name = xstrdup(name); - list_insert_after(&node_list, i, found); + list_insert_before(&node_list, node, found); + changed = true; break; } } @@ -114,6 +121,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; @@ -128,19 +136,27 @@ static void update(int fd) { } } -static void redraw() { +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 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_each(nodestats_t, ns, &node_list) + sorted[n++] = ns; + changed = false; + } + + for(int i = 0; i < n; i++) + sorted[i]->i = i; + int cmpfloat(float a, float b) { if(a < b) return -1; @@ -165,43 +181,42 @@ static void redraw() { 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; } } 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 +227,11 @@ static void redraw() { 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); + 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); } attrset(A_NORMAL); @@ -228,6 +243,7 @@ static void redraw() { void top(int fd) { initscr(); timeout(delay); + bool running = true; while(running) { update(fd); @@ -237,7 +253,7 @@ void top(int fd) { case 's': { timeout(-1); float input = delay * 1e-3; - printw("Change delay from %.1fs to: ", input); + mvprintw(1, 0, "Change delay from %.1fs to: ", input); scanw("%f", &input); if(input < 0.1) input = 0.1; @@ -269,8 +285,23 @@ 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: running = false; break; @@ -281,3 +312,5 @@ void top(int fd) { endwin(); } + +#endif