[PATCH 00/12] iptraf-ng: another cleanups

[Vitezslav Samel]

Vitezslav Samel (12):
  hostmon(): shuffle with init/destroy code
  hostmon(): call init/destroy functions in LIFO order
  hostmon(): optimize: move some checks away from the hot path
  hostmon(): refactor various time computing
  hostmon(): change do {} while() construct into while() {}
  timer.c: cleanup printelapsedtime()
  print_packet_drops(): use getmaxy() to get the last line
  packet_size_breakdown(): refactor initialization
  packet_size_breakdown(): optimize: move some checks away from the hot path
  packet_size_breakdown(): refactor various time computing
  packet_size_breakdown(): change do {} while() construct into while() {}
  refactor pktsize.c to print in and out counters

 src/deskman.c  |   4 +-
 src/deskman.h  |   2 +-
 src/detstats.c |   4 +-
 src/hostmon.c  | 168 +++++++++++++-------------
 src/ifstats.c  |   4 +-
 src/itrafmon.c |   5 +-
 src/pktsize.c  | 366 +++++++++++++++++++++++++++++++--------------------------
 src/serv.c     |   4 +-
 src/timer.c    |  12 +-
 src/timer.h    |   2 +-
 10 files changed, 299 insertions(+), 272 deletions(-)

-- 
1.9.1

[PATCH 01/12] hostmon(): shuffle with init/destroy code

[Vitezslav Samel]

Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz&gt;
---
 src/hostmon.c | 58 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/hostmon.c b/src/hostmon.c
index dc34a94..b217835 100644
--- a/src/hostmon.c
+++ b/src/hostmon.c
@@ -151,6 +151,14 @@ static void writeethlog(struct ethtabent *list, unsigned long nsecs,
FILE *fd)
 	fflush(fd);
 }
 
+static void hostmonhelp(void)
+{
+	move(LINES - 1, 1);
+	scrollkeyhelp();
+	sortkeyhelp();
+	stdexitkeyhelp();
+}
+
 static void initethtab(struct ethtab *table)
 {
 	table->head = table->tail = NULL;
@@ -179,9 +187,18 @@ static void initethtab(struct ethtab *table)
 	tx_colorwin(table->tabwin);
 	tx_stdwinset(table->tabwin);
 	wtimeout(table->tabwin, -1);
+	leaveok(table->tabwin, TRUE);
+
+	hostmonhelp();
 
 	update_panels();
 	doupdate();
+
+	/* Ethernet description list */
+	table->elist = load_eth_desc(ARPHRD_ETHER);
+
+	/* FDDI description list */
+	table->flist = load_eth_desc(ARPHRD_FDDI);
 }
 
 static struct ethtabent *addethnode(struct ethtab *table)
@@ -387,14 +404,18 @@ static void destroyethtab(struct ethtab *table)
 		if (cnext != NULL)
 			cnext = cnext->next_entry;
 	}
-}
 
-static void hostmonhelp(void)
-{
-	move(LINES - 1, 1);
-	scrollkeyhelp();
-	sortkeyhelp();
-	stdexitkeyhelp();
+	free_eth_desc(table->elist);
+	free_eth_desc(table->flist);
+
+	del_panel(table->tabpanel);
+	delwin(table->tabwin);
+
+	del_panel(table->borderpanel);
+	delwin(table->borderwin);
+
+	update_panels();
+	doupdate();
 }
 
 static void print_entry_rates(struct ethtab *table, struct ethtabent *entry)
@@ -913,16 +934,8 @@ void hostmon(time_t facilitytime, char *ifptr)
 		promisc_set_list(&promisc);
 	}
 
-	hostmonhelp();
-
 	initethtab(&table);
 
-	/* Ethernet description list */
-	table.elist = load_eth_desc(ARPHRD_ETHER);
-
-	/* FDDI description list */
-	table.flist = load_eth_desc(ARPHRD_FDDI);
-
 	if (logging) {
 		if (strcmp(current_logfile, "") == 0) {
 			strncpy(current_logfile,
@@ -947,8 +960,6 @@ void hostmon(time_t facilitytime, char *ifptr)
 			 "******** LAN traffic monitor started ********");
 	}
 
-	leaveok(table.tabwin, TRUE);
-
 	fd = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL));
 	if(fd == -1) {
 		write_error("Unable to obtain monitoring socket");
@@ -1030,20 +1041,9 @@ err:
 			 "******** LAN traffic monitor stopped ********");
 		fclose(logfile);
 	}
-
-
-	del_panel(table.tabpanel);
-	delwin(table.tabwin);
-	del_panel(table.borderpanel);
-	delwin(table.borderwin);
-	update_panels();
-	doupdate();
+	strcpy(current_logfile, "");
 
 	packet_destroy(&pkt);
 
-	free_eth_desc(table.elist);
-	free_eth_desc(table.flist);
 	destroyethtab(&table);
-
-	strcpy(current_logfile, "");
 }
-- 
1.9.1

[PATCH 02/12] hostmon(): call init/destroy functions in LIFO order

[Vitezslav Samel]

... to prevent use of uninitialized variables.

Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz&gt;
---
 src/hostmon.c | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/hostmon.c b/src/hostmon.c
index b217835..e55de19 100644
--- a/src/hostmon.c
+++ b/src/hostmon.c
@@ -928,13 +928,23 @@ void hostmon(time_t facilitytime, char *ifptr)
 		return;
 	}
 
+	initethtab(&table);
+
 	LIST_HEAD(promisc);
 	if (options.promisc) {
 		promisc_init(&promisc, ifptr);
 		promisc_set_list(&promisc);
 	}
 
-	initethtab(&table);
+	fd = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL));
+	if(fd == -1) {
+		write_error("Unable to obtain monitoring socket");
+		goto err;
+	}
+	if(ifptr && dev_bind_ifname(fd, ifptr) == -1) {
+		write_error("Unable to bind interface on the socket");
+		goto err_close;
+	}
 
 	if (logging) {
 		if (strcmp(current_logfile, "") == 0) {
@@ -960,15 +970,7 @@ void hostmon(time_t facilitytime, char *ifptr)
 			 "******** LAN traffic monitor started ********");
 	}
 
-	fd = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL));
-	if(fd == -1) {
-		write_error("Unable to obtain monitoring socket");
-		goto err;
-	}
-	if(ifptr && dev_bind_ifname(fd, ifptr) == -1) {
-		write_error("Unable to bind interface on the socket");
-		goto err_close;
-	}
+	packet_init(&pkt);
 
 	exitloop = 0;
 	gettimeofday(&tv, NULL);
@@ -976,8 +978,6 @@ void hostmon(time_t facilitytime, char *ifptr)
 	updtime = tv;
 	statbegin = startlog = tv.tv_sec;
 
-	packet_init(&pkt);
-
 	do {
 		gettimeofday(&tv, NULL);
 		now = tv.tv_sec;
@@ -1025,14 +1025,7 @@ void hostmon(time_t facilitytime, char *ifptr)
 
 	} while (!exitloop);
 
-err_close:
-	close(fd);
-
-err:
-	if (options.promisc) {
-		promisc_restore_list(&promisc);
-		promisc_destroy(&promisc);
-	}
+	packet_destroy(&pkt);
 
 	if (logging) {
 		signal(SIGUSR1, SIG_DFL);
@@ -1043,7 +1036,13 @@ err:
 	}
 	strcpy(current_logfile, "");
 
-	packet_destroy(&pkt);
+err_close:
+	close(fd);
+err:
+	if (options.promisc) {
+		promisc_restore_list(&promisc);
+		promisc_destroy(&promisc);
+	}
 
 	destroyethtab(&table);
 }
-- 
1.9.1

[PATCH 03/12] hostmon(): optimize: move some checks away from the hot path

[Vitezslav Samel]

Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz&gt;
---
 src/hostmon.c | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/hostmon.c b/src/hostmon.c
index e55de19..fadfc85 100644
--- a/src/hostmon.c
+++ b/src/hostmon.c
@@ -982,24 +982,33 @@ void hostmon(time_t facilitytime, char *ifptr)
 		gettimeofday(&tv, NULL);
 		now = tv.tv_sec;
 
-		unsigned long msecs = timeval_diff_msec(&tv, &tv_rate);
-		if (msecs >= 1000) {
-			printelapsedtime(statbegin, now, LINES - 3, 15,
-					 table.borderwin);
+		if (now > tv_rate.tv_sec) {
+			unsigned long msecs = timeval_diff_msec(&tv, &tv_rate);
 			updateethrates(&table, msecs);
 			print_visible_rates(&table);
+
+			printelapsedtime(statbegin, now, LINES - 3, 15,
+					 table.borderwin);
+
 			dropped += packet_get_dropped(fd);
 			print_packet_drops(dropped, table.borderwin, LINES - 3, 49);
-			tv_rate = tv;
-		}
-		if (logging) {
-			check_rotate_flag(&logfile);
-			if ((now - startlog) >= options.logspan) {
-				writeethlog(table.head, now - statbegin,
-					    logfile);
-				startlog = now;
+
+			if (logging) {
+				check_rotate_flag(&logfile);
+				if ((now - startlog) >= options.logspan) {
+					writeethlog(table.head, now - statbegin,
+						    logfile);
+					startlog = now;
+				}
 			}
+
+			if ((facilitytime != 0)
+			    && (((now - statbegin) / 60) >= facilitytime))
+				exitloop = 1;
+
+			tv_rate = tv;
 		}
+
 		if (screen_update_needed(&tv, &updtime)) {
 			update_panels();
 			doupdate();
@@ -1007,10 +1016,6 @@ void hostmon(time_t facilitytime, char *ifptr)
 			updtime = tv;
 		}
 
-		if ((facilitytime != 0)
-		    && (((now - statbegin) / 60) >= facilitytime))
-			exitloop = 1;
-
 		if (packet_get(fd, &pkt, &ch, table.tabwin) == -1) {
 			write_error("Packet receive failed");
 			exitloop = 1;
-- 
1.9.1

[PATCH 04/12] hostmon(): refactor various time computing

[Vitezslav Samel]

Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz&gt;
---
 src/hostmon.c | 55 +++++++++++++++++++++++++++----------------------------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/src/hostmon.c b/src/hostmon.c
index fadfc85..5856389 100644
--- a/src/hostmon.c
+++ b/src/hostmon.c
@@ -908,13 +908,6 @@ void hostmon(time_t facilitytime, char *ifptr)
 
 	int ch;
 
-	struct timeval tv;
-	struct timeval tv_rate;
-	time_t now = 0;
-	time_t statbegin = 0;
-	time_t startlog = 0;
-	struct timeval updtime;
-
 	FILE *logfile = NULL;
 
 	int fd;
@@ -973,47 +966,53 @@ void hostmon(time_t facilitytime, char *ifptr)
 	packet_init(&pkt);
 
 	exitloop = 0;
-	gettimeofday(&tv, NULL);
-	tv_rate = tv;
-	updtime = tv;
-	statbegin = startlog = tv.tv_sec;
+
+	struct timeval now;
+	gettimeofday(&now, NULL);
+	struct timeval last_time = now;
+	struct timeval last_update = now;
+
+	time_t starttime = now.tv_sec;
+	time_t endtime = INT_MAX;
+	if (facilitytime != 0)
+		endtime = now.tv_sec + facilitytime * 60;
+
+	time_t log_next = INT_MAX;
+	if (logging)
+		log_next = now.tv_sec + options.logspan;
 
 	do {
-		gettimeofday(&tv, NULL);
-		now = tv.tv_sec;
+		gettimeofday(&now, NULL);
 
-		if (now > tv_rate.tv_sec) {
-			unsigned long msecs = timeval_diff_msec(&tv, &tv_rate);
+		if (now.tv_sec > last_time.tv_sec) {
+			unsigned long msecs = timeval_diff_msec(&now, &last_time);
 			updateethrates(&table, msecs);
 			print_visible_rates(&table);
 
-			printelapsedtime(statbegin, now, LINES - 3, 15,
+			printelapsedtime(starttime, now.tv_sec, LINES - 3, 15,
 					 table.borderwin);
 
 			dropped += packet_get_dropped(fd);
 			print_packet_drops(dropped, table.borderwin, LINES - 3, 49);
 
-			if (logging) {
+			if (logging && (now.tv_sec > log_next)) {
 				check_rotate_flag(&logfile);
-				if ((now - startlog) >= options.logspan) {
-					writeethlog(table.head, now - statbegin,
-						    logfile);
-					startlog = now;
-				}
+				writeethlog(table.head, now.tv_sec - starttime,
+					    logfile);
+				log_next = now.tv_sec + options.logspan;
 			}
 
-			if ((facilitytime != 0)
-			    && (((now - statbegin) / 60) >= facilitytime))
+			if (now.tv_sec > endtime)
 				exitloop = 1;
 
-			tv_rate = tv;
+			last_time = now;
 		}
 
-		if (screen_update_needed(&tv, &updtime)) {
+		if (screen_update_needed(&now, &last_update)) {
 			update_panels();
 			doupdate();
 
-			updtime = tv;
+			last_update = now;
 		}
 
 		if (packet_get(fd, &pkt, &ch, table.tabwin) == -1) {
@@ -1034,7 +1033,7 @@ void hostmon(time_t facilitytime, char *ifptr)
 
 	if (logging) {
 		signal(SIGUSR1, SIG_DFL);
-		writeethlog(table.head, time(NULL) - statbegin, logfile);
+		writeethlog(table.head, time(NULL) - starttime, logfile);
 		writelog(logging, logfile,
 			 "******** LAN traffic monitor stopped ********");
 		fclose(logfile);
-- 
1.9.1

[PATCH 05/12] hostmon(): change do {} while() construct into while() {}

[Vitezslav Samel]

Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz&gt;
---
 src/hostmon.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hostmon.c b/src/hostmon.c
index 5856389..aa769ef 100644
--- a/src/hostmon.c
+++ b/src/hostmon.c
@@ -981,7 +981,7 @@ void hostmon(time_t facilitytime, char *ifptr)
 	if (logging)
 		log_next = now.tv_sec + options.logspan;
 
-	do {
+	while (!exitloop) {
 		gettimeofday(&now, NULL);
 
 		if (now.tv_sec > last_time.tv_sec) {
@@ -1027,7 +1027,7 @@ void hostmon(time_t facilitytime, char *ifptr)
 		if (pkt.pkt_len > 0)
 			hostmon_process_packet(&table, &pkt, ifptr);
 
-	} while (!exitloop);
+	}
 
 	packet_destroy(&pkt);
 
-- 
1.9.1

[PATCH 06/12] timer.c: cleanup printelapsedtime()

[Vitezslav Samel]

1) we are always printing to the last line of the given window, so get
   this value in here and don't pass it as arg to this function
2) compute elapsed time before calling printelapsedtime() and pass it as
   one arg only

Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz&gt;
---
 src/detstats.c |  2 +-
 src/hostmon.c  |  3 +--
 src/ifstats.c  |  2 +-
 src/itrafmon.c |  3 +--
 src/pktsize.c  |  3 +--
 src/serv.c     |  2 +-
 src/timer.c    | 12 ++++--------
 src/timer.h    |  2 +-
 8 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/src/detstats.c b/src/detstats.c
index f70dae4..7df10b6 100644
--- a/src/detstats.c
+++ b/src/detstats.c
@@ -621,7 +621,7 @@ void detstats(char *iface, time_t facilitytime)
 			ifrates_show(&ifrates, statwin);
 
 			wattrset(statwin, BOXATTR);
-			printelapsedtime(starttime, now.tv_sec, LINES - 3, 1, statwin);
+			printelapsedtime(now.tv_sec - starttime, 1, statwin);
 
 			dropped += packet_get_dropped(fd);
 			print_packet_drops(dropped, statwin, LINES - 3, 49);
diff --git a/src/hostmon.c b/src/hostmon.c
index aa769ef..5b6049d 100644
--- a/src/hostmon.c
+++ b/src/hostmon.c
@@ -989,8 +989,7 @@ void hostmon(time_t facilitytime, char *ifptr)
 			updateethrates(&table, msecs);
 			print_visible_rates(&table);
 
-			printelapsedtime(starttime, now.tv_sec, LINES - 3, 15,
-					 table.borderwin);
+			printelapsedtime(now.tv_sec - starttime, 15, table.borderwin);
 
 			dropped += packet_get_dropped(fd);
 			print_packet_drops(dropped, table.borderwin, LINES - 3, 49);
diff --git a/src/ifstats.c b/src/ifstats.c
index 4e8482f..7b1151b 100644
--- a/src/ifstats.c
+++ b/src/ifstats.c
@@ -582,7 +582,7 @@ void ifstats(time_t facilitytime)
 			updaterates(&table, msecs);
 			showrates(&table);
 
-			printelapsedtime(starttime, now.tv_sec, LINES - 3, 1, table.borderwin);
+			printelapsedtime(now.tv_sec - starttime, 1, table.borderwin);
 
 			dropped += packet_get_dropped(fd);
 			print_packet_drops(dropped, table.borderwin, LINES - 3, 49);
diff --git a/src/itrafmon.c b/src/itrafmon.c
index 393d07a..b40b77b 100644
--- a/src/itrafmon.c
+++ b/src/itrafmon.c
@@ -709,8 +709,7 @@ void ipmon(time_t facilitytime, char *ifptr)
 			print_flowrate(&table);
 
 			/* print timer at bottom of screen */
-			printelapsedtime(starttime, now.tv_sec, othptbl.obmaxy - 1, 15,
-					 othptbl.borderwin);
+			printelapsedtime(now.tv_sec - starttime, 15, othptbl.borderwin);
 
 			dropped += packet_get_dropped(fd);
 			print_packet_drops(dropped, othptbl.borderwin, othptbl.obmaxy - 1, 40);
diff --git a/src/pktsize.c b/src/pktsize.c
index 668b103..1ebd58d 100644
--- a/src/pktsize.c
+++ b/src/pktsize.c
@@ -268,8 +268,7 @@ void packet_size_breakdown(char *ifname, time_t facilitytime)
 			updtime = tv;
 		}
 		if (now - timeint >= 5) {
-			printelapsedtime(starttime, now, LINES - 3, 1,
-					 borderwin);
+			printelapsedtime(now - starttime, 1, borderwin);
 			dropped += packet_get_dropped(fd);
 			print_packet_drops(dropped, borderwin, LINES - 3, 49);
 			timeint = now;
diff --git a/src/serv.c b/src/serv.c
index f8ea1d5..69bdc65 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -985,7 +985,7 @@ void servmon(char *ifname, time_t facilitytime)
 			/* ... and print the current one */
 			print_serv_rates(&list);
 
-			printelapsedtime(starttime, now.tv_sec, LINES - 4, 20, list.borderwin);
+			printelapsedtime(now.tv_sec - starttime, 20, list.borderwin);
 
 			dropped += packet_get_dropped(fd);
 			print_packet_drops(dropped, list.borderwin, LINES - 4, 49);
diff --git a/src/timer.c b/src/timer.c
index 08fed75..557d50e 100644
--- a/src/timer.c
+++ b/src/timer.c
@@ -10,16 +10,12 @@ timer.c		- module to display the elapsed time since a facility
 
 #include "iptraf-ng-compat.h"
 
-void printelapsedtime(time_t start, time_t now, int y, int x, WINDOW * win)
+void printelapsedtime(time_t elapsed, int x, WINDOW *win)
 {
-	time_t elapsed;
-	unsigned int hours;
-	unsigned int mins;
+	unsigned int hours = elapsed / 3600;
+	unsigned int mins = (elapsed % 3600) / 60;
 
-	elapsed = now - start;
-
-	hours = elapsed / 3600;
-	mins = (elapsed % 3600) / 60;
+	int y = getmaxy(win) - 1;
 
 	mvwprintw(win, y, x, " Elapsed time: %3u:%02u ", hours, mins);
 }
diff --git a/src/timer.h b/src/timer.h
index 24bbf9d..965ef84 100644
--- a/src/timer.h
+++ b/src/timer.h
@@ -1,6 +1,6 @@
 #ifndef IPTRAF_NG_TIMER_H
 #define IPTRAF_NG_TIMER_H
 
-void printelapsedtime(time_t start, time_t now, int y, int x, WINDOW * win);
+void printelapsedtime(time_t elapsed, int x, WINDOW *win);
 
 #endif	/* IPTRAF_NG_TIMER_H */
-- 
1.9.1

[PATCH 07/12] print_packet_drops(): use getmaxy() to get the last line

[Vitezslav Samel]

We are always printing dropped packets count to the last line of the
given window, so compute the right line here (getmaxy(win) - 1).

Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz&gt;
---
 src/deskman.c  | 4 ++--
 src/deskman.h  | 2 +-
 src/detstats.c | 2 +-
 src/hostmon.c  | 2 +-
 src/ifstats.c  | 2 +-
 src/itrafmon.c | 2 +-
 src/pktsize.c  | 2 +-
 src/serv.c     | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/deskman.c b/src/deskman.c
index 58c3c8d..34d95e4 100644
--- a/src/deskman.c
+++ b/src/deskman.c
@@ -190,10 +190,10 @@ void printlargenum(unsigned long long i, WINDOW * win)
 		wprintw(win, "%8lluT", i / 1000000000000ULL);
 }
 
-void print_packet_drops(unsigned long count, WINDOW *win, int y, int x)
+void print_packet_drops(unsigned long count, WINDOW *win, int x)
 {
 	wattrset(win, BOXATTR);
-	mvwprintw(win, y, x, " Dropped packets:  %lu ", count);
+	mvwprintw(win, getmaxy(win) - 1, x, " Dropped packets:  %lu ", count);
 }
 
 int screen_update_needed(const struct timeval *now, const struct timeval *last)
diff --git a/src/deskman.h b/src/deskman.h
index 7f6a72f..6c818f8 100644
--- a/src/deskman.h
+++ b/src/deskman.h
@@ -17,7 +17,7 @@ void scrollkeyhelp(void);
 void stdexitkeyhelp(void);
 void indicate(char *message);
 void printlargenum(unsigned long long i, WINDOW * win);
-void print_packet_drops(unsigned long count, WINDOW *win, int y, int x);
+void print_packet_drops(unsigned long count, WINDOW *win, int x);
 int screen_update_needed(const struct timeval *now, const struct timeval *last);
 void infobox(char *text, char *prompt);
 void standardcolors(int color);
diff --git a/src/detstats.c b/src/detstats.c
index 7df10b6..fd1b99a 100644
--- a/src/detstats.c
+++ b/src/detstats.c
@@ -624,7 +624,7 @@ void detstats(char *iface, time_t facilitytime)
 			printelapsedtime(now.tv_sec - starttime, 1, statwin);
 
 			dropped += packet_get_dropped(fd);
-			print_packet_drops(dropped, statwin, LINES - 3, 49);
+			print_packet_drops(dropped, statwin, 49);
 
 			if (now.tv_sec > endtime)
 				exitloop = 1;
diff --git a/src/hostmon.c b/src/hostmon.c
index 5b6049d..6299fc6 100644
--- a/src/hostmon.c
+++ b/src/hostmon.c
@@ -992,7 +992,7 @@ void hostmon(time_t facilitytime, char *ifptr)
 			printelapsedtime(now.tv_sec - starttime, 15, table.borderwin);
 
 			dropped += packet_get_dropped(fd);
-			print_packet_drops(dropped, table.borderwin, LINES - 3, 49);
+			print_packet_drops(dropped, table.borderwin, 49);
 
 			if (logging && (now.tv_sec > log_next)) {
 				check_rotate_flag(&logfile);
diff --git a/src/ifstats.c b/src/ifstats.c
index 7b1151b..f095b08 100644
--- a/src/ifstats.c
+++ b/src/ifstats.c
@@ -585,7 +585,7 @@ void ifstats(time_t facilitytime)
 			printelapsedtime(now.tv_sec - starttime, 1, table.borderwin);
 
 			dropped += packet_get_dropped(fd);
-			print_packet_drops(dropped, table.borderwin, LINES - 3, 49);
+			print_packet_drops(dropped, table.borderwin, 49);
 
 			if (logging && (now.tv_sec > log_next)) {
 				check_rotate_flag(&logfile);
diff --git a/src/itrafmon.c b/src/itrafmon.c
index b40b77b..a2f3348 100644
--- a/src/itrafmon.c
+++ b/src/itrafmon.c
@@ -712,7 +712,7 @@ void ipmon(time_t facilitytime, char *ifptr)
 			printelapsedtime(now.tv_sec - starttime, 15, othptbl.borderwin);
 
 			dropped += packet_get_dropped(fd);
-			print_packet_drops(dropped, othptbl.borderwin, othptbl.obmaxy - 1, 40);
+			print_packet_drops(dropped, othptbl.borderwin, 40);
 
 			mark_timeouted_entries(&table, logging, logfile);
 
diff --git a/src/pktsize.c b/src/pktsize.c
index 1ebd58d..4127b14 100644
--- a/src/pktsize.c
+++ b/src/pktsize.c
@@ -270,7 +270,7 @@ void packet_size_breakdown(char *ifname, time_t facilitytime)
 		if (now - timeint >= 5) {
 			printelapsedtime(now - starttime, 1, borderwin);
 			dropped += packet_get_dropped(fd);
-			print_packet_drops(dropped, borderwin, LINES - 3, 49);
+			print_packet_drops(dropped, borderwin, 49);
 			timeint = now;
 		}
 		if (logging) {
diff --git a/src/serv.c b/src/serv.c
index 69bdc65..6bd89fa 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -988,7 +988,7 @@ void servmon(char *ifname, time_t facilitytime)
 			printelapsedtime(now.tv_sec - starttime, 20, list.borderwin);
 
 			dropped += packet_get_dropped(fd);
-			print_packet_drops(dropped, list.borderwin, LINES - 4, 49);
+			print_packet_drops(dropped, list.borderwin, 49);
 
 			if (now.tv_sec > endtime)
 				exitloop = 1;
-- 
1.9.1

[PATCH 08/12] packet_size_breakdown(): refactor initialization

[Vitezslav Samel]

... using newly introduced struct psizetab.

Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz&gt;
---
 src/pktsize.c | 253 +++++++++++++++++++++++++++++++---------------------------
 1 file changed, 134 insertions(+), 119 deletions(-)

diff --git a/src/pktsize.c b/src/pktsize.c
index 4127b14..3a16454 100644
--- a/src/pktsize.c
+++ b/src/pktsize.c
@@ -31,6 +31,18 @@ struct ifstat_brackets {
 	unsigned long count;
 };
 
+struct psizetab {
+	WINDOW *win;
+	PANEL *panel;
+	WINDOW *borderwin;
+	PANEL *borderpanel;
+
+	struct ifstat_brackets brackets[20];
+	unsigned int interval;
+
+	int mtu;
+};
+
 static void rotate_size_log(int s __unused)
 {
 	rotate_flag = 1;
@@ -38,9 +50,8 @@ static void rotate_size_log(int s __unused)
 	signal(SIGUSR1, rotate_size_log);
 }
 
-static void write_size_log(struct ifstat_brackets *brackets,
-			   unsigned long nsecs, char *ifname, unsigned int mtu,
-			   FILE *logfile)
+static void write_size_log(struct psizetab *table, unsigned long nsecs,
+			   char *ifname, FILE *logfile)
 {
 	char atime[TIME_TARGET_MAX];
 	int i;
@@ -48,110 +59,140 @@ static void write_size_log(struct ifstat_brackets *brackets,
 	genatime(time(NULL), atime);
 	fprintf(logfile, "*** Packet Size Distribution, generated %s\n\n",
 		atime);
-	fprintf(logfile, "Interface: %s   MTU: %u\n\n", ifname, mtu);
+	fprintf(logfile, "Interface: %s   MTU: %u\n\n", ifname, table->mtu);
 	fprintf(logfile, "Packet Size (bytes)\tCount\n");
 
 	for (i = 0; i <= 19; i++) {
-		fprintf(logfile, "%u to %u:\t\t%lu\n", brackets[i].floor,
-			brackets[i].ceil, brackets[i].count);
+		fprintf(logfile, "%u to %u:\t\t%lu\n", table->brackets[i].floor,
+			table->brackets[i].ceil, table->brackets[i].count);
 	}
 	fprintf(logfile, "\nRunning time: %lu seconds\n", nsecs);
 	fflush(logfile);
 }
 
-static int initialize_brackets(struct ifstat_brackets *brackets,
-			       unsigned int *interval, int mtu,
-			       WINDOW *win)
+static void psizetab_init(struct psizetab *table, char *ifname)
+{
+	table->borderwin = newwin(LINES - 2, COLS, 1, 0);
+	table->borderpanel = new_panel(table->borderwin);
+
+	wattrset(table->borderwin, BOXATTR);
+	tx_box(table->borderwin, ACS_VLINE, ACS_HLINE);
+	mvwprintw(table->borderwin, 0, 1, " Packet Distribution by Size ");
+
+	table->win = newwin(LINES - 4, COLS - 2, 2, 1);
+	table->panel = new_panel(table->win);
+
+	tx_stdwinset(table->win);
+	wtimeout(table->win, -1);
+	wattrset(table->win, STDATTR);
+	tx_colorwin(table->win);
+
+	mvwprintw(table->win, 1, 1, "Packet size brackets for interface %s",
ifname);
+	wattrset(table->win, BOXATTR);
+	mvwprintw(table->win, 4, 1, "Packet Size (bytes)");
+	mvwprintw(table->win, 4, 26, "Count");
+	mvwprintw(table->win, 4, 36, "Packet Size (bytes)");
+	mvwprintw(table->win, 4, 60, "Count");
+	wattrset(table->win, HIGHATTR);
+
+	move(LINES - 1, 1);
+	stdexitkeyhelp();
+
+	update_panels();
+	doupdate();
+}
+
+static void psizetab_destroy(struct psizetab *table)
+{
+	del_panel(table->panel);
+	delwin(table->win);
+
+	del_panel(table->borderpanel);
+	delwin(table->borderwin);
+
+	update_panels();
+	doupdate();
+}
+
+static int initialize_brackets(struct psizetab *table)
 {
 	int i;
 
-	*interval = mtu / 20;	/* There are 20 packet size brackets */
+	table->interval = table->mtu / 20;	/* There are 20 packet size brackets */
 
 	for (i = 0; i <= 19; i++) {
-		brackets[i].floor = *interval * i + 1;
-		brackets[i].ceil = *interval * (i + 1);
-		brackets[i].count = 0;
+		table->brackets[i].floor = table->interval * i + 1;
+		table->brackets[i].ceil = table->interval * (i + 1);
+		table->brackets[i].count = 0;
 	}
 
-	brackets[19].ceil = mtu;
+	table->brackets[19].ceil = table->mtu;
 
 	for (i = 0; i <= 9; i++) {
-		wattrset(win, STDATTR);
-		mvwprintw(win, i + 5, 2, "%4u to %4u:", brackets[i].floor,
-			brackets[i].ceil);
-		wattrset(win, HIGHATTR);
-		mvwprintw(win, i + 5, 23, "%8lu", 0);
+		wattrset(table->win, STDATTR);
+		mvwprintw(table->win, i + 5, 2, "%4u to %4u:",
table->brackets[i].floor,
+			table->brackets[i].ceil);
+		wattrset(table->win, HIGHATTR);
+		mvwprintw(table->win, i + 5, 23, "%8lu", 0);
 	}
 
 	for (i = 10; i <= 19; i++) {
-		wattrset(win, STDATTR);
-		wmove(win, (i - 10) + 5, 36);
+		wattrset(table->win, STDATTR);
+		wmove(table->win, (i - 10) + 5, 36);
 
 		if (i != 19)
-			wprintw(win, "%4u to %4u:", brackets[i].floor,
-				brackets[i].ceil);
+			wprintw(table->win, "%4u to %4u:", table->brackets[i].floor,
+				table->brackets[i].ceil);
 		else
-			wprintw(win, "%4u to %4u+:", brackets[i].floor,
-				brackets[i].ceil);
+			wprintw(table->win, "%4u to %4u+:", table->brackets[i].floor,
+				table->brackets[i].ceil);
 
-		wattrset(win, HIGHATTR);
-		mvwprintw(win, (i - 10) + 5, 57, "%8lu", 0);
+		wattrset(table->win, HIGHATTR);
+		mvwprintw(table->win, (i - 10) + 5, 57, "%8lu", 0);
 	}
 
-	wattrset(win, STDATTR);
-	mvwprintw(win, 17, 1,
+	wattrset(table->win, STDATTR);
+	mvwprintw(table->win, 17, 1,
 		  "Interface MTU is %d bytes, not counting the data-link header",
-		  mtu);
-	mvwprintw(win, 18, 1,
+		  table->mtu);
+	mvwprintw(table->win, 18, 1,
 		  "Maximum packet size is the MTU plus the data-link header length");
-	mvwprintw(win, 19, 1,
+	mvwprintw(table->win, 19, 1,
 		  "Packet size computations include data-link headers, if any");
 
 	return 0;
 }
 
-static void update_size_distrib(unsigned int length,
-				struct ifstat_brackets *brackets,
-				unsigned int interval)
+static void update_size_distrib(struct psizetab *table, unsigned int length)
 {
 	unsigned int i;
 
-	i = (length - 1) / interval;	/* minus 1 to keep interval
-					   boundary lengths within the
-					   proper brackets */
+	i = (length - 1) / table->interval;	/* minus 1 to keep interval
+						   boundary lengths within the
+						   proper brackets */
 
 	if (i > 19)		/* This is for extras for MTU's not */
 		i = 19;		/* divisible by 20 */
 
-	brackets[i].count++;
+	table->brackets[i].count++;
 }
 
-static void print_size_distrib(struct ifstat_brackets *brackets, WINDOW *win)
+static void print_size_distrib(struct psizetab *table)
 {
 	for (unsigned int i = 0; i <= 19; i++) {
 		if (i < 10)
-			wmove(win, i + 5, 23);
+			wmove(table->win, i + 5, 23);
 		else
-			wmove(win, (i - 10) + 5, 57);
+			wmove(table->win, (i - 10) + 5, 57);
 
-		wprintw(win, "%8lu", brackets[i].count);
+		wprintw(table->win, "%8lu", table->brackets[i].count);
 	}
 }
 
 void packet_size_breakdown(char *ifname, time_t facilitytime)
 {
-	WINDOW *win;
-	PANEL *panel;
-	WINDOW *borderwin;
-	PANEL *borderpanel;
-
-	struct ifstat_brackets brackets[20];
-	unsigned int interval;
-
 	int ch;
 
-	int mtu;
-
 	int pkt_result;
 
 	struct timeval tv;
@@ -162,6 +203,8 @@ void packet_size_breakdown(char *ifname, time_t facilitytime)
 	int logging = options.logging;
 	FILE *logfile = NULL;
 
+	struct psizetab table;
+
 	int fd;
 
 	struct pkt_hdr pkt;
@@ -170,43 +213,34 @@ void packet_size_breakdown(char *ifname, time_t facilitytime)
 
 	if (!dev_up(ifname)) {
 		err_iface_down();
-		goto err_unmark;
-	}
-
-	mtu = dev_get_mtu(ifname);
-	if (mtu < 0) {
-		write_error("Unable to obtain interface MTU");
-		goto err_unmark;
+		return;
 	}
 
-	borderwin = newwin(LINES - 2, COLS, 1, 0);
-	borderpanel = new_panel(borderwin);
+	psizetab_init(&table, ifname);
 
-	wattrset(borderwin, BOXATTR);
-	tx_box(borderwin, ACS_VLINE, ACS_HLINE);
-	mvwprintw(borderwin, 0, 1, " Packet Distribution by Size ");
-
-	win = newwin(LINES - 4, COLS - 2, 2, 1);
-	panel = new_panel(win);
-
-	tx_stdwinset(win);
-	wtimeout(win, -1);
-	wattrset(win, STDATTR);
-	tx_colorwin(win);
-
-	move(LINES - 1, 1);
-	stdexitkeyhelp();
+	LIST_HEAD(promisc);
+	if (options.promisc) {
+		promisc_init(&promisc, ifname);
+		promisc_set_list(&promisc);
+	}
 
-	initialize_brackets(brackets, &interval, mtu, win);
+	fd = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL));
+	if(fd == -1) {
+		write_error("Unable to obtain monitoring socket");
+		goto err;
+	}
+	if(dev_bind_ifname(fd, ifname) == -1) {
+		write_error("Unable to bind interface on the socket");
+		goto err_close;
+	}
 
-	mvwprintw(win, 1, 1, "Packet size brackets for interface %s", ifname);
-	wattrset(win, BOXATTR);
+	table.mtu = dev_get_mtu(ifname);
+	if (table.mtu < 0) {
+		write_error("Unable to obtain interface MTU");
+		goto err_close;
+	}
 
-	mvwprintw(win, 4, 1, "Packet Size (bytes)");
-	mvwprintw(win, 4, 26, "Count");
-	mvwprintw(win, 4, 36, "Packet Size (bytes)");
-	mvwprintw(win, 4, 60, "Count");
-	wattrset(win, HIGHATTR);
+	initialize_brackets(&table);
 
 	if (logging) {
 		if (strcmp(current_logfile, "") == 0) {
@@ -232,35 +266,20 @@ void packet_size_breakdown(char *ifname, time_t facilitytime)
 			 "******** Packet size distribution facility started ********");
 	}
 
+	packet_init(&pkt);
+
 	exitloop = 0;
+
 	gettimeofday(&tv, NULL);
 	updtime = tv;
 	now = starttime = startlog = timeint = tv.tv_sec;
 
-	LIST_HEAD(promisc);
-	if (options.promisc) {
-		promisc_init(&promisc, ifname);
-		promisc_set_list(&promisc);
-	}
-
-	fd = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL));
-	if(fd == -1) {
-		write_error("Unable to obtain monitoring socket");
-		goto err;
-	}
-	if(dev_bind_ifname(fd, ifname) == -1) {
-		write_error("Unable to bind interface on the socket");
-		goto err_close;
-	}
-
-	packet_init(&pkt);
-
 	do {
 		gettimeofday(&tv, NULL);
 		now = tv.tv_sec;
 
 		if (screen_update_needed(&tv, &updtime)) {
-			print_size_distrib(brackets, win);
+			print_size_distrib(&table);
 
 			update_panels();
 			doupdate();
@@ -268,16 +287,16 @@ void packet_size_breakdown(char *ifname, time_t facilitytime)
 			updtime = tv;
 		}
 		if (now - timeint >= 5) {
-			printelapsedtime(now - starttime, 1, borderwin);
+			printelapsedtime(now - starttime, 1, table.borderwin);
 			dropped += packet_get_dropped(fd);
-			print_packet_drops(dropped, borderwin, 49);
+			print_packet_drops(dropped, table.borderwin, 49);
 			timeint = now;
 		}
 		if (logging) {
 			check_rotate_flag(&logfile);
 			if ((now - startlog) >= options.logspan) {
-				write_size_log(brackets, now - starttime,
-					       ifname, mtu, logfile);
+				write_size_log(&table, now - starttime,
+					       ifname, logfile);
 				startlog = now;
 			}
 		}
@@ -286,7 +305,7 @@ void packet_size_breakdown(char *ifname, time_t facilitytime)
 		    && (((now - starttime) / 60) >= facilitytime))
 			exitloop = 1;
 
-		if (packet_get(fd, &pkt, &ch, win) == -1) {
+		if (packet_get(fd, &pkt, &ch, table.win) == -1) {
 			write_error("Packet receive failed");
 			exitloop = 1;
 			break;
@@ -318,31 +337,27 @@ void packet_size_breakdown(char *ifname, time_t facilitytime)
 		if (pkt_result != PACKET_OK)
 			continue;
 
-		update_size_distrib(pkt.pkt_len, brackets, interval);
+		update_size_distrib(&table, pkt.pkt_len);
 	} while (!exitloop);
 
 	packet_destroy(&pkt);
 
-err_close:
-	close(fd);
-err:
 	if (logging) {
 		signal(SIGUSR1, SIG_DFL);
-		write_size_log(brackets, now - starttime, ifname, mtu, logfile);
+		write_size_log(&table, now - starttime, ifname, logfile);
 		writelog(logging, logfile,
 			 "******** Packet size distribution facility stopped ********");
 		fclose(logfile);
 	}
+	strcpy(current_logfile, "");
 
+err_close:
+	close(fd);
+err:
 	if (options.promisc) {
 		promisc_restore_list(&promisc);
 		promisc_destroy(&promisc);
 	}
 
-	del_panel(panel);
-	delwin(win);
-	del_panel(borderpanel);
-	delwin(borderwin);
-err_unmark:
-	strcpy(current_logfile, "");
+	psizetab_destroy(&table);
 }
-- 
1.9.1

[PATCH 09/12] packet_size_breakdown(): optimize: move some checks away from the hot path

[Vitezslav Samel]

Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz&gt;
---
 src/pktsize.c | 64 ++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 33 insertions(+), 31 deletions(-)

diff --git a/src/pktsize.c b/src/pktsize.c
index 3a16454..0fc563c 100644
--- a/src/pktsize.c
+++ b/src/pktsize.c
@@ -195,11 +195,6 @@ void packet_size_breakdown(char *ifname, time_t facilitytime)
 
 	int pkt_result;
 
-	struct timeval tv;
-	time_t starttime, startlog, timeint;
-	time_t now;
-	struct timeval updtime;
-
 	int logging = options.logging;
 	FILE *logfile = NULL;
 
@@ -270,40 +265,47 @@ void packet_size_breakdown(char *ifname, time_t facilitytime)
 
 	exitloop = 0;
 
-	gettimeofday(&tv, NULL);
-	updtime = tv;
-	now = starttime = startlog = timeint = tv.tv_sec;
+	struct timeval now;
+	gettimeofday(&now, NULL);
+	struct timeval last_time = now;
+	struct timeval last_update = now;
 
-	do {
-		gettimeofday(&tv, NULL);
-		now = tv.tv_sec;
+	time_t starttime, startlog;
+	starttime = startlog = now.tv_sec;
 
-		if (screen_update_needed(&tv, &updtime)) {
-			print_size_distrib(&table);
+	do {
+		gettimeofday(&now, NULL);
 
-			update_panels();
-			doupdate();
+		if (now.tv_sec > last_time.tv_sec) {
+			printelapsedtime(now.tv_sec - starttime, 1, table.borderwin);
 
-			updtime = tv;
-		}
-		if (now - timeint >= 5) {
-			printelapsedtime(now - starttime, 1, table.borderwin);
 			dropped += packet_get_dropped(fd);
 			print_packet_drops(dropped, table.borderwin, 49);
-			timeint = now;
-		}
-		if (logging) {
-			check_rotate_flag(&logfile);
-			if ((now - startlog) >= options.logspan) {
-				write_size_log(&table, now - starttime,
-					       ifname, logfile);
-				startlog = now;
+
+			if (logging) {
+				check_rotate_flag(&logfile);
+				if ((now.tv_sec - startlog) >= options.logspan) {
+					write_size_log(&table, now.tv_sec - starttime,
+						       ifname, logfile);
+					startlog = now.tv_sec;
+				}
 			}
+
+			if ((facilitytime != 0)
+			    && (((now.tv_sec - starttime) / 60) >= facilitytime))
+				exitloop = 1;
+
+			last_time = now;
 		}
 
-		if ((facilitytime != 0)
-		    && (((now - starttime) / 60) >= facilitytime))
-			exitloop = 1;
+		if (screen_update_needed(&now, &last_update)) {
+			print_size_distrib(&table);
+
+			update_panels();
+			doupdate();
+
+			last_update = now;
+		}
 
 		if (packet_get(fd, &pkt, &ch, table.win) == -1) {
 			write_error("Packet receive failed");
@@ -344,7 +346,7 @@ void packet_size_breakdown(char *ifname, time_t facilitytime)
 
 	if (logging) {
 		signal(SIGUSR1, SIG_DFL);
-		write_size_log(&table, now - starttime, ifname, logfile);
+		write_size_log(&table, time(NULL) - starttime, ifname, logfile);
 		writelog(logging, logfile,
 			 "******** Packet size distribution facility stopped ********");
 		fclose(logfile);
-- 
1.9.1

[PATCH 10/12] packet_size_breakdown(): refactor various time computing

[Vitezslav Samel]

Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz&gt;
---
 src/pktsize.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/pktsize.c b/src/pktsize.c
index 0fc563c..9d699b9 100644
--- a/src/pktsize.c
+++ b/src/pktsize.c
@@ -270,8 +270,14 @@ void packet_size_breakdown(char *ifname, time_t facilitytime)
 	struct timeval last_time = now;
 	struct timeval last_update = now;
 
-	time_t starttime, startlog;
-	starttime = startlog = now.tv_sec;
+	time_t starttime = now.tv_sec;
+	time_t endtime = INT_MAX;
+	if (facilitytime != 0)
+		endtime = now.tv_sec + facilitytime * 60;
+
+	time_t log_next = INT_MAX;
+	if (logging)
+		log_next = now.tv_sec + options.logspan;
 
 	do {
 		gettimeofday(&now, NULL);
@@ -282,17 +288,14 @@ void packet_size_breakdown(char *ifname, time_t facilitytime)
 			dropped += packet_get_dropped(fd);
 			print_packet_drops(dropped, table.borderwin, 49);
 
-			if (logging) {
+			if (logging && (now.tv_sec > log_next)) {
 				check_rotate_flag(&logfile);
-				if ((now.tv_sec - startlog) >= options.logspan) {
-					write_size_log(&table, now.tv_sec - starttime,
-						       ifname, logfile);
-					startlog = now.tv_sec;
-				}
+				write_size_log(&table, now.tv_sec - starttime,
+					       ifname, logfile);
+				log_next = now.tv_sec + options.logspan;
 			}
 
-			if ((facilitytime != 0)
-			    && (((now.tv_sec - starttime) / 60) >= facilitytime))
+			if (now.tv_sec > endtime)
 				exitloop = 1;
 
 			last_time = now;
-- 
1.9.1

[PATCH 11/12] packet_size_breakdown(): change do {} while() construct into while() {}

[Vitezslav Samel]

Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz&gt;
---
 src/pktsize.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pktsize.c b/src/pktsize.c
index 9d699b9..2d053a2 100644
--- a/src/pktsize.c
+++ b/src/pktsize.c
@@ -279,7 +279,7 @@ void packet_size_breakdown(char *ifname, time_t facilitytime)
 	if (logging)
 		log_next = now.tv_sec + options.logspan;
 
-	do {
+	while (!exitloop) {
 		gettimeofday(&now, NULL);
 
 		if (now.tv_sec > last_time.tv_sec) {
@@ -343,7 +343,7 @@ void packet_size_breakdown(char *ifname, time_t facilitytime)
 			continue;
 
 		update_size_distrib(&table, pkt.pkt_len);
-	} while (!exitloop);
+	}
 
 	packet_destroy(&pkt);
 
-- 
1.9.1

[PATCH 12/12] refactor pktsize.c to print in and out counters

[Vitezslav Samel]

Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz&gt;
---
 src/pktsize.c | 155 +++++++++++++++++++++++++++++++---------------------------
 1 file changed, 83 insertions(+), 72 deletions(-)

diff --git a/src/pktsize.c b/src/pktsize.c
index 2d053a2..556151d 100644
--- a/src/pktsize.c
+++ b/src/pktsize.c
@@ -25,11 +25,7 @@ pktsize.c	- the packet size breakdown facility
 #include "logvars.h"
 #include "promisc.h"
 
-struct ifstat_brackets {
-	unsigned int floor;
-	unsigned int ceil;
-	unsigned long count;
-};
+#define SIZES 20
 
 struct psizetab {
 	WINDOW *win;
@@ -37,10 +33,13 @@ struct psizetab {
 	WINDOW *borderwin;
 	PANEL *borderpanel;
 
-	struct ifstat_brackets brackets[20];
+	unsigned long size_in[SIZES + 1];	/* +1 for oversized count */
+	unsigned long size_out[SIZES + 1];
+	unsigned int mtu;
 	unsigned int interval;
+	unsigned int maxsize_in;
+	unsigned int maxsize_out;
 
-	int mtu;
 };
 
 static void rotate_size_log(int s __unused)
@@ -60,11 +59,14 @@ static void write_size_log(struct psizetab *table, unsigned long
nsecs,
 	fprintf(logfile, "*** Packet Size Distribution, generated %s\n\n",
 		atime);
 	fprintf(logfile, "Interface: %s   MTU: %u\n\n", ifname, table->mtu);
-	fprintf(logfile, "Packet Size (bytes)\tCount\n");
-
-	for (i = 0; i <= 19; i++) {
-		fprintf(logfile, "%u to %u:\t\t%lu\n", table->brackets[i].floor,
-			table->brackets[i].ceil, table->brackets[i].count);
+	fprintf(logfile, "Packet Size (bytes)\tIn\t\tOut\n");
+
+	for (i = 0; i < SIZES; i++) {
+		fprintf(logfile, "%u to %u:\t\t%8lu\t%8lu\n",
+				table->interval * i + 1,
+				table->interval * (i + 1),
+				table->size_in[i],
+				table->size_out[i]);
 	}
 	fprintf(logfile, "\nRunning time: %lu seconds\n", nsecs);
 	fflush(logfile);
@@ -77,7 +79,7 @@ static void psizetab_init(struct psizetab *table, char *ifname)
 
 	wattrset(table->borderwin, BOXATTR);
 	tx_box(table->borderwin, ACS_VLINE, ACS_HLINE);
-	mvwprintw(table->borderwin, 0, 1, " Packet Distribution by Size ");
+	mvwprintw(table->borderwin, 0, 1, " Packet Distribution by Size for interface %s
", ifname);
 
 	table->win = newwin(LINES - 4, COLS - 2, 2, 1);
 	table->panel = new_panel(table->win);
@@ -87,12 +89,11 @@ static void psizetab_init(struct psizetab *table, char *ifname)
 	wattrset(table->win, STDATTR);
 	tx_colorwin(table->win);
 
-	mvwprintw(table->win, 1, 1, "Packet size brackets for interface %s",
ifname);
 	wattrset(table->win, BOXATTR);
-	mvwprintw(table->win, 4, 1, "Packet Size (bytes)");
-	mvwprintw(table->win, 4, 26, "Count");
-	mvwprintw(table->win, 4, 36, "Packet Size (bytes)");
-	mvwprintw(table->win, 4, 60, "Count");
+	mvwprintw(table->win, 1, 1, "Packet Size (bytes)");
+	mvwprintw(table->win, 1, 23, "In      Out");
+	mvwprintw(table->win, 1, 42, "Packet Size (bytes)");
+	mvwprintw(table->win, 1, 64, "In      Out");
 	wattrset(table->win, HIGHATTR);
 
 	move(LINES - 1, 1);
@@ -114,79 +115,85 @@ static void psizetab_destroy(struct psizetab *table)
 	doupdate();
 }
 
-static int initialize_brackets(struct psizetab *table)
+static void sizes_init(struct psizetab *table, unsigned int mtu)
 {
-	int i;
+	table->mtu = mtu;
 
-	table->interval = table->mtu / 20;	/* There are 20 packet size brackets */
-
-	for (i = 0; i <= 19; i++) {
-		table->brackets[i].floor = table->interval * i + 1;
-		table->brackets[i].ceil = table->interval * (i + 1);
-		table->brackets[i].count = 0;
-	}
+	unsigned int interval = mtu / SIZES;
 
-	table->brackets[19].ceil = table->mtu;
+	table->interval = interval;
 
-	for (i = 0; i <= 9; i++) {
-		wattrset(table->win, STDATTR);
-		mvwprintw(table->win, i + 5, 2, "%4u to %4u:",
table->brackets[i].floor,
-			table->brackets[i].ceil);
-		wattrset(table->win, HIGHATTR);
-		mvwprintw(table->win, i + 5, 23, "%8lu", 0);
+	wattrset(table->win, STDATTR);
+	for(unsigned int i = 0; i < SIZES; i++) {
+		int row, column;
+
+		table->size_in[i] = 0UL;	/* initialize counters */
+		table->size_out[i] = 0UL;
+
+		if (i < SIZES / 2) {
+			row = i + 2;
+			column = 1;
+		} else {
+			row = (i - 10) + 2;
+			column = 42;
+		}
+		mvwprintw(table->win, row, column, "%5u to %5u:",
+			  interval * i + 1, interval * (i + 1));
 	}
 
-	for (i = 10; i <= 19; i++) {
-		wattrset(table->win, STDATTR);
-		wmove(table->win, (i - 10) + 5, 36);
+	table->size_in[SIZES] = 0UL;	/* initialize oversized counters */
+	table->size_out[SIZES] = 0UL;
+	table->maxsize_in = 0UL;	/* initialize maxsize counters */
+	table->maxsize_out = 0UL;
 
-		if (i != 19)
-			wprintw(table->win, "%4u to %4u:", table->brackets[i].floor,
-				table->brackets[i].ceil);
-		else
-			wprintw(table->win, "%4u to %4u+:", table->brackets[i].floor,
-				table->brackets[i].ceil);
-
-		wattrset(table->win, HIGHATTR);
-		mvwprintw(table->win, (i - 10) + 5, 57, "%8lu", 0);
-	}
+	mvwprintw(table->win, 12, 47, "oversized:");
+	mvwprintw(table->win, 14, 1, "max packet size in (bytes):");
+	mvwprintw(table->win, 15, 1, "max packet size out (bytes):");
 
-	wattrset(table->win, STDATTR);
 	mvwprintw(table->win, 17, 1,
-		  "Interface MTU is %d bytes, not counting the data-link header",
+		  "Interface MTU is %u bytes, not counting the data-link header.",
 		  table->mtu);
 	mvwprintw(table->win, 18, 1,
-		  "Maximum packet size is the MTU plus the data-link header length");
+		  "Maximum packet size is the MTU plus the data-link header length, but can
be");
 	mvwprintw(table->win, 19, 1,
-		  "Packet size computations include data-link headers, if any");
-
-	return 0;
+		  "   bigger due to various offloading techniques of the interface.");
+	mvwprintw(table->win, 20, 1,
+		  "Packet size computations include data-link headers, if any.");
 }
 
-static void update_size_distrib(struct psizetab *table, unsigned int length)
+static void update_size_distrib(struct psizetab *table, struct pkt_hdr *pkt)
 {
-	unsigned int i;
-
-	i = (length - 1) / table->interval;	/* minus 1 to keep interval
-						   boundary lengths within the
-						   proper brackets */
-
-	if (i > 19)		/* This is for extras for MTU's not */
-		i = 19;		/* divisible by 20 */
-
-	table->brackets[i].count++;
+	/* -1 is to keep interval boundary lengths within the proper brackets */
+	unsigned int i = (pkt->pkt_len - 1) / table->interval;
+
+	if (i > SIZES)
+		i = SIZES;	/* last entry is for lengths > MTU */
+
+	if (pkt->from->sll_pkttype == PACKET_OUTGOING) {
+		table->size_out[i]++;
+		if (table->maxsize_out < pkt->pkt_len)
+			table->maxsize_out = pkt->pkt_len;
+	} else {
+		table->size_in[i]++;
+		if (table->maxsize_in < pkt->pkt_len)
+			table->maxsize_in = pkt->pkt_len;
+	}
 }
 
 static void print_size_distrib(struct psizetab *table)
 {
-	for (unsigned int i = 0; i <= 19; i++) {
+	wattrset(table->win, HIGHATTR);
+	for (unsigned int i = 0; i < SIZES + 1; i++) {	/* include oversized */
 		if (i < 10)
-			wmove(table->win, i + 5, 23);
+			wmove(table->win, i + 2, 17);
 		else
-			wmove(table->win, (i - 10) + 5, 57);
+			wmove(table->win, (i - 10) + 2, 58);
 
-		wprintw(table->win, "%8lu", table->brackets[i].count);
+		wprintw(table->win, "%8lu %8lu",
+			table->size_in[i], table->size_out[i]);
 	}
+	mvwprintw(table->win, 14, 33, "%5u", table->maxsize_in);
+	mvwprintw(table->win, 15, 33, "%5u", table->maxsize_out);
 }
 
 void packet_size_breakdown(char *ifname, time_t facilitytime)
@@ -229,13 +236,17 @@ void packet_size_breakdown(char *ifname, time_t facilitytime)
 		goto err_close;
 	}
 
-	table.mtu = dev_get_mtu(ifname);
-	if (table.mtu < 0) {
+	int mtu = dev_get_mtu(ifname);
+	if (mtu < 0) {
 		write_error("Unable to obtain interface MTU");
 		goto err_close;
 	}
 
-	initialize_brackets(&table);
+	sizes_init(&table, mtu);
+
+	print_size_distrib(&table);
+	update_panels();
+	doupdate();
 
 	if (logging) {
 		if (strcmp(current_logfile, "") == 0) {
@@ -342,7 +353,7 @@ void packet_size_breakdown(char *ifname, time_t facilitytime)
 		if (pkt_result != PACKET_OK)
 			continue;
 
-		update_size_distrib(&table, pkt.pkt_len);
+		update_size_distrib(&table, &pkt);
 	}
 
 	packet_destroy(&pkt);
-- 
1.9.1

[Nikola Pajkovsky]

Vitezslav Samel <vitezslav(a)samel.cz&gt; writes:

>  Vitezslav Samel (12):
>    hostmon(): shuffle with init/destroy code
>    hostmon(): call init/destroy functions in LIFO order
>    hostmon(): optimize: move some checks away from the hot path
>    hostmon(): refactor various time computing
>    hostmon(): change do {} while() construct into while() {}
>    timer.c: cleanup printelapsedtime()
>    print_packet_drops(): use getmaxy() to get the last line
>    packet_size_breakdown(): refactor initialization
>    packet_size_breakdown(): optimize: move some checks away from the hot path
>    packet_size_breakdown(): refactor various time computing
>    packet_size_breakdown(): change do {} while() construct into while() {}
>    refactor pktsize.c to print in and out counters
>
>   src/deskman.c  |   4 +-
>   src/deskman.h  |   2 +-
>   src/detstats.c |   4 +-
>   src/hostmon.c  | 168 +++++++++++++-------------
>   src/ifstats.c  |   4 +-
>   src/itrafmon.c |   5 +-
>   src/pktsize.c  | 366 +++++++++++++++++++++++++++++++--------------------------
>   src/serv.c     |   4 +-
>   src/timer.c    |  12 +-
>   src/timer.h    |   2 +-
>   10 files changed, 299 insertions(+), 272 deletions(-) 
Except one coding style for cycle, all seems to be good. Thanks. Pushed

+	for(unsigned int i = 0; i < SIZES; i++) {

-- 
Nikola