Add real time and use for display and file

br101 · Jul 12, 2017 · a674e84 · a674e84
1 parent 874929e
commit a674e84
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/display.c b/display.c
@@ -238,7 +238,7 @@ static void update_menu(void)
 	wattroff(stdscr, BLACKONWHITE);
 
 	update_mini_status();
-	update_clock(&time_mono.tv_sec);
+	update_clock(&time_real.tv_sec);
 }
 
 /******************* WINDOW MANAGEMENT / UPDATE *******************/
@@ -306,7 +306,7 @@ void update_display_clock(void)
 {
 	/* helper to update just the clock every second */
 	if (time_mono.tv_sec > time_mono.tv_sec) {
-		update_clock(&time_mono.tv_sec);
+		update_clock(&time_real.tv_sec);
 		doupdate();
 	}
 }
@@ -339,7 +339,7 @@ void update_display(struct packet_info* pkt)
 
 	/* update clock every second */
 	if (time_mono.tv_sec > time_mono.tv_sec)
-		update_clock(&time_mono.tv_sec);
+		update_clock(&time_real.tv_sec);
 
 	last_time = time_mono;
 

diff --git a/main.c b/main.c
@@ -58,6 +58,7 @@ struct node_names_info node_names;
 struct config conf;
 
 struct timespec time_mono;
+struct timespec time_real;
 
 int mon; /* monitoring socket */
 
@@ -214,7 +215,7 @@ static void write_to_file(struct packet_info* p)
 {
 	char buf[40];
 	int i;
-	struct tm* ltm = localtime(&time_mono.tv_sec);
+	struct tm* ltm = localtime(&time_real.tv_sec);
 
 	//timestamp, e.g. 2015-05-16 15:05:44.338806 +0300
 	i = strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", ltm);
@@ -725,6 +726,8 @@ int main(int argc, char** argv)
 			exit(1);
 
 		clock_gettime(CLOCK_MONOTONIC, &time_mono);
+		clock_gettime(CLOCK_REALTIME, &time_real);
+
 		node_timeout();
 
 		if (conf.serveraddr[0] == '\0') { /* server */

diff --git a/main.h b/main.h
@@ -345,6 +345,7 @@ struct config {
 extern struct config conf;
 
 extern struct timespec time_mono;
+extern struct timespec time_real;
 
 void free_lists(void);
 void init_spectrum(void);