From dde6691b25c7b9ec5bb37b6292032c90b5e979ab Mon Sep 17 00:00:00 2001 From: Alfred Klomp Date: Tue, 9 Jan 2024 00:32:56 +0100 Subject: [PATCH] fixup! wip simplify gettime --- test/benchmark.c | 21 +++++++++++++++------ test/gettime_win.c | 9 --------- 2 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 test/gettime_win.c diff --git a/test/benchmark.c b/test/benchmark.c index 4fc8257..f050834 100644 --- a/test/benchmark.c +++ b/test/benchmark.c @@ -27,10 +27,6 @@ # include #endif -#if defined(_WIN32) -# include "gettime_win.c" -#endif - #include "../include/libbase64.h" #include "codec_supported.h" @@ -120,7 +116,7 @@ get_random_data (struct buffers *b, char **errmsg) #ifdef __MACH__ typedef uint64_t base64_timespec; static void -base64_gettime (base64_timespec * o_time) +base64_gettime (base64_timespec *o_time) { *o_time = mach_absolute_time(); } @@ -134,10 +130,23 @@ timediff_sec (base64_timespec *start, base64_timespec *end) return (float)((diff * tb.numer) / tb.denom) / 1e9f; } +#elif defined(_WIN32) && !(defined(__MINGW32__) || defined(__MINGW64)) +typedef struct timespec base64_timespec; +static void +base64_gettime (base64_timespec *o_time) +{ + timespec_get(o_time, TIME_UTC); +} + +static float +timediff_sec (base64_timespec *start, base64_timespec *end) +{ + return (end->tv_sec - start->tv_sec) + ((float)(end->tv_nsec - start->tv_nsec)) / 1e9f; +} #else typedef struct timespec base64_timespec; static void -base64_gettime (base64_timespec * o_time) +base64_gettime (base64_timespec *o_time) { clock_gettime(CLOCK_REALTIME, o_time); } diff --git a/test/gettime_win.c b/test/gettime_win.c deleted file mode 100644 index f375c75..0000000 --- a/test/gettime_win.c +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef CLOCK_REALTIME -#define CLOCK_REALTIME 2 -#endif - -static int -clock_gettime (const int id, struct timespec* ts) -{ - return timespec_get(ts, TIME_UTC) ? 0 : -1; -}