From 941f9937e0744d18de4cc0afa71e0caa925d82ac Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 4 May 2024 03:25:11 +0200
Subject: Adding upstream version 3.5.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 libfreerdp/utils/stopwatch.c | 28 ++++------------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

(limited to 'libfreerdp/utils/stopwatch.c')

diff --git a/libfreerdp/utils/stopwatch.c b/libfreerdp/utils/stopwatch.c
index 3989638..70b60b3 100644
--- a/libfreerdp/utils/stopwatch.c
+++ b/libfreerdp/utils/stopwatch.c
@@ -22,38 +22,18 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <winpr/sysinfo.h>
 #include <freerdp/utils/stopwatch.h>
 
-#ifdef _WIN32
-LARGE_INTEGER stopwatch_freq = { 0 };
-#else
-#include <sys/time.h>
-#endif
-
 static void stopwatch_set_time(UINT64* usecs)
 {
-#ifdef _WIN32
-	LARGE_INTEGER perfcount;
-	QueryPerformanceCounter(&perfcount);
-	*usecs = (perfcount.QuadPart * 1000000) / stopwatch_freq.QuadPart;
-#else
-	struct timeval tv;
-	gettimeofday(&tv, NULL);
-	*usecs = tv.tv_sec * 1000000 + tv.tv_usec;
-#endif
+	const UINT64 ns = winpr_GetTickCount64NS();
+	*usecs = WINPR_TIME_NS_TO_US(ns);
 }
 
 STOPWATCH* stopwatch_create(void)
 {
-	STOPWATCH* sw = NULL;
-#ifdef _WIN32
-	if (stopwatch_freq.QuadPart == 0)
-	{
-		QueryPerformanceFrequency(&stopwatch_freq);
-	}
-#endif
-
-	sw = (STOPWATCH*)malloc(sizeof(STOPWATCH));
+	STOPWATCH* sw = (STOPWATCH*)calloc(1, sizeof(STOPWATCH));
 	if (!sw)
 		return NULL;
 	stopwatch_reset(sw);
-- 
cgit v1.2.3