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

More stable sorting in tincctl top.

Browse source 
Although we use qsort(), which is not guaranteed to be stable, resorting the
previously sorted array is more stable than recreating and resorting the array
each time.
This commit is contained in:
Guus Sliepen 2011-06-02 20:27:16 +02:00
parent 2bda2aa885
commit a8f0d21330
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/top.c
View file

@ -57,6 +57,7 @@ static list_t node_list;
static struct timeval now, prev, diff; 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 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);
@ -136,10 +137,15 @@ static void redraw(void) {
mvprintw(2, 0, "Node IN pkts IN bytes OUT pkts OUT bytes"); mvprintw(2, 0, "Node IN pkts IN bytes OUT pkts OUT bytes");
chgat(-1, A_REVERSE, 0, NULL); chgat(-1, A_REVERSE, 0, NULL);
nodestats_t *sorted[node_list.count]; static nodestats_t **sorted = 0;
int n = 0; static int n = 0;
if(changed) {
n = 0;
sorted = xrealloc(sorted, node_list.count * sizeof *sorted);
for(list_node_t *i = node_list.head; i; i = i->next) for(list_node_t *i = node_list.head; i; i = i->next)
sorted[n++] = i->data; sorted[n++] = i->data;
changed = false;
}
int cmpfloat(float a, float b) { int cmpfloat(float a, float b) {
if(a < b) if(a < b)
@ -200,8 +206,7 @@ static void redraw(void) {
qsort(sorted, n, sizeof *sorted, sortfunc); qsort(sorted, n, sizeof *sorted, sortfunc);
int row = 3; for(int i = 0, row = 3; i < n; i++, row++) {
for(int i = 0; i < n; i++, row++) {
nodestats_t *node = sorted[i]; nodestats_t *node = sorted[i];
if(node->known) if(node->known)
if(node->in_packets_rate || node->out_packets_rate) if(node->in_packets_rate || node->out_packets_rate)