Use monotonic clock for time keeping

blairsteven · carlatat · commit 45abaed70cc5 · 2020-05-25T07:50:09.000+12:00
diff --git a/ginetflow.c b/ginetflow.c
@@ -223,9 +223,12 @@ static gboolean flow_parse_ipv6(GInetTuple * f, const guint8 * data, guint32 len
 
 static inline guint64 get_time_us(void)
 {
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
-    return (tv.tv_sec * (guint64) TIMESTAMP_RESOLUTION_US + tv.tv_usec);
+    struct timespec now;
+
+    if (clock_gettime(CLOCK_MONOTONIC, &now) == 0)
+        return (now.tv_sec * (guint64)TIMESTAMP_RESOLUTION_US + (now.tv_nsec / 1000));
+    else
+        return 0;
 }
 
 static guint32 get_hdr_len(guint8 hdr_ext_len)

Original file line number	Diff line number	Diff line change
`@@ -223,9 +223,12 @@ static gboolean flow_parse_ipv6(GInetTuple * f, const guint8 * data, guint32 len`
`223`	`223`
`224`	`224`	`static inline guint64 get_time_us(void)`
`225`	`225`	`{`
`226`		`- struct timeval tv;`
`227`		`- gettimeofday(&tv, NULL);`
`228`		`- return (tv.tv_sec * (guint64) TIMESTAMP_RESOLUTION_US + tv.tv_usec);`
	`226`	`+ struct timespec now;`
	`227`	`+`
	`228`	`+ if (clock_gettime(CLOCK_MONOTONIC, &now) == 0)`
	`229`	`+ return (now.tv_sec * (guint64)TIMESTAMP_RESOLUTION_US + (now.tv_nsec / 1000));`
	`230`	`+ else`
	`231`	`+ return 0;`
`229`	`232`	`}`
`230`	`233`
`231`	`234`	`static guint32 get_hdr_len(guint8 hdr_ext_len)`