We need to update traffic rates of all interfaces, because rates
of not visible interfaces would not be updated and therefore bad rates
would be shown after scrolling the screen and making them visible.
Split updaterates() function: the new updaterates() updates rates only
(but for all interfaces), the new showrates() prints the visible rates
on the display. In the main loop call both functions now.
This new updaterates() function must be called every 1s to have accurate
bps units. The showrates() function can called any time and will show
the correct running average.
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/ifstats.c | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/ifstats.c b/src/ifstats.c
index c7088f7..f2ff72e 100644
--- a/src/ifstats.c
+++ b/src/ifstats.c
@@ -255,6 +255,23 @@ static void no_ifaces_error(void)
static void updaterates(struct iftab *table, unsigned long msecs)
{
+ struct iflist *ptmp = table->head;
+ unsigned long rate;
+
+ while (ptmp != NULL) {
+ rate_add_rate(&ptmp->rate, ptmp->spanbr, msecs);
+ rate = rate_get_average(&ptmp->rate);
+
+ if (rate > ptmp->peakrate)
+ ptmp->peakrate = rate;
+
+ ptmp->spanbr = 0;
+ ptmp = ptmp->next_entry;
+ }
+}
+
+static void showrates(struct iftab *table)
+{
struct iflist *ptmp = table->firstvisible;
unsigned int idx = table->firstvisible->index;
unsigned long rate;
@@ -262,16 +279,11 @@ static void updaterates(struct iftab *table, unsigned long msecs)
wattrset(table->statwin, HIGHATTR);
do {
- rate_add_rate(&ptmp->rate, ptmp->spanbr, msecs);
rate = rate_get_average(&ptmp->rate);
rate_print(rate, buf, sizeof(buf));
wmove(table->statwin, ptmp->index - idx, 63 * COLS / 80);
wprintw(table->statwin, "%s", buf);
- if (rate > ptmp->peakrate)
- ptmp->peakrate = rate;
-
- ptmp->spanbr = 0;
ptmp = ptmp->next_entry;
} while (ptmp != table->lastvisible->next_entry);
}
@@ -511,6 +523,7 @@ void ifstats(time_t facilitytime)
msecs = timeval_diff_msec(&tv, &start_tv);
updaterates(&table, msecs);
+ showrates(&table);
printelapsedtime(statbegin, now, LINES - 3, 1,
table.borderwin);
starttime = now;
--
1.7.8.4
