From 489bea0c23c87ed20718c0fa54192a1fd01a244f Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Wed, 12 Feb 2025 05:40:29 -0700 Subject: [PATCH] LibTest: Remove uses of gettimeofday in favor of AK::Time gettimeofday is not a thing on Windows or esoteric Unixen. --- Libraries/LibTest/TestRunnerUtil.h | 7 +++---- Libraries/LibTest/TestSuite.cpp | 13 ++++--------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/Libraries/LibTest/TestRunnerUtil.h b/Libraries/LibTest/TestRunnerUtil.h index 119b4add775..e3832148171 100644 --- a/Libraries/LibTest/TestRunnerUtil.h +++ b/Libraries/LibTest/TestRunnerUtil.h @@ -6,6 +6,7 @@ #pragma once +#include #include #include #include @@ -15,10 +16,8 @@ namespace Test { inline double get_time_in_ms() { - struct timeval tv1; - auto return_code = gettimeofday(&tv1, nullptr); - VERIFY(return_code >= 0); - return static_cast(tv1.tv_sec) * 1000.0 + static_cast(tv1.tv_usec) / 1000.0; + auto now = UnixDateTime::now(); + return static_cast(now.milliseconds_since_epoch()); } template diff --git a/Libraries/LibTest/TestSuite.cpp b/Libraries/LibTest/TestSuite.cpp index 7d7af043eee..4b8e0977059 100644 --- a/Libraries/LibTest/TestSuite.cpp +++ b/Libraries/LibTest/TestSuite.cpp @@ -6,6 +6,7 @@ */ #include +#include #include #include #include @@ -22,21 +23,15 @@ class TestElapsedTimer { public: TestElapsedTimer() { restart(); } - void restart() { gettimeofday(&m_started, nullptr); } + void restart() { m_started = UnixDateTime::now(); } u64 elapsed_milliseconds() { - struct timeval now = {}; - gettimeofday(&now, nullptr); - - struct timeval delta = {}; - timersub(&now, &m_started, &delta); - - return delta.tv_sec * 1000 + delta.tv_usec / 1000; + return (UnixDateTime::now() - m_started).to_milliseconds(); } private: - struct timeval m_started = {}; + UnixDateTime m_started; }; // Declared in Macros.h