[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