From 3384b1385edba826f56dec3c92c01426e1fcd48d Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sun, 17 Jul 2022 20:59:31 -0700 Subject: move "double time" code into State from Timer Ideally the statesave format could be changed to just store a u64 in the future --- Source/Core/Common/Timer.cpp | 43 ++----------------------------------------- 1 file changed, 2 insertions(+), 41 deletions(-) (limited to 'Source/Core/Common/Timer.cpp') diff --git a/Source/Core/Common/Timer.cpp b/Source/Core/Common/Timer.cpp index 9ac3645841..ef910f6c27 100644 --- a/Source/Core/Common/Timer.cpp +++ b/Source/Core/Common/Timer.cpp @@ -4,23 +4,16 @@ #include "Common/Timer.h" #include -#include #ifdef _WIN32 -#include - #include -#include -#include +#include +#include #else #include #endif -#include -#include - #include "Common/CommonTypes.h" -#include "Common/StringUtil.h" namespace Common { @@ -106,38 +99,6 @@ u64 Timer::GetLocalTimeSinceJan1970() return static_cast(sysTime + tzDiff + tzDST); } -double Timer::GetSystemTimeAsDouble() -{ - // FYI: std::chrono::system_clock epoch is not required to be 1970 until c++20. - // We will however assume time_t IS unix time. - using Clock = std::chrono::system_clock; - - // TODO: Use this on switch to c++20: - // const auto since_epoch = Clock::now().time_since_epoch(); - const auto unix_epoch = Clock::from_time_t({}); - const auto since_epoch = Clock::now() - unix_epoch; - - const auto since_double_time_epoch = since_epoch - std::chrono::seconds(DOUBLE_TIME_OFFSET); - return std::chrono::duration_cast>(since_double_time_epoch).count(); -} - -std::string Timer::SystemTimeAsDoubleToString(double time) -{ - // revert adjustments from GetSystemTimeAsDouble() to get a normal Unix timestamp again - time_t seconds = (time_t)time + DOUBLE_TIME_OFFSET; - tm* localTime = localtime(&seconds); - -#ifdef _WIN32 - wchar_t tmp[32] = {}; - wcsftime(tmp, std::size(tmp), L"%x %X", localTime); - return WStringToUTF8(tmp); -#else - char tmp[32] = {}; - strftime(tmp, sizeof(tmp), "%x %X", localTime); - return tmp; -#endif -} - void Timer::IncreaseResolution() { #ifdef _WIN32 -- cgit v1.2.3