Change get_windows_timestamp to a multiplatform get_timestamp_ns

Change the code that sets the event timestamp for plugin events to use a single function get_timestamp_ns and make it multiplatform for windows and other. Avoids sprinkling the code with ifdef _WIN32s. Signed-off-by: Mark Stemm <[email protected]>
falcosecurity · Oct 11, 2021 · aeea91d · aeea91d
1 parent 06012ea
commit aeea91d
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/userspace/libscap/scap.c b/userspace/libscap/scap.c
@@ -1682,9 +1682,11 @@ static int32_t scap_next_nodriver(scap_t* handle, OUT scap_evt** pevent, OUT uin
 }
 #endif // _WIN32
 
-#ifdef _WIN32
-inline uint64_t get_windows_timestamp()
+inline uint64_t get_timestamp_ns()
 {
+	uint64_t ts;
+
+#ifdef _WIN32
 	FILETIME ft;
 	static const uint64_t EPOCH = ((uint64_t) 116444736000000000ULL);
 
@@ -1693,9 +1695,15 @@ inline uint64_t get_windows_timestamp()
 	uint64_t ftl = (((uint64_t)ft.dwHighDateTime) << 32) + ft.dwLowDateTime;
 	ftl -= EPOCH;
 
-	return ftl * 100;
+	ts = ftl * 100;
+#else
+	struct timeval tv;
+	gettimeofday(&tv, NULL);
+	ts = tv.tv_sec * (uint64_t) 1000000000 + tv.tv_usec * 1000;
+#endif
+
+	return ts;
 }
-#endif // _WIN32
 
 static int32_t scap_next_plugin(scap_t* handle, OUT scap_evt** pevent, OUT uint16_t* pcpuid)
 {
@@ -1811,14 +1819,7 @@ static int32_t scap_next_plugin(scap_t* handle, OUT scap_evt** pevent, OUT uint1
 	}
 	else
 	{
-#ifdef _WIN32
-		struct timespec ts;
-		evt->ts = get_windows_timestamp();
-#else
-		struct timeval tv;
-		gettimeofday(&tv, NULL);
-		evt->ts = tv.tv_sec * (uint64_t) 1000000000 + tv.tv_usec * 1000;
-#endif
+		evt->ts = get_timestamp_ns();
 	}
 
 	*pevent = evt;