The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-26 07:45:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

State: Make use of re-entrant variant of localtime

Browse Source 
Makes this member function thread-safe. We can also unify the string
handling to make it easier to maintain.
This commit is contained in:
Lioncash 2024-01-23 15:22:37 -05:00
parent 1b3f61041a
commit 6a86b35e88
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Core/Core/State.cpp
View File

@ -7,6 +7,7 @@
#include <atomic> #include <atomic>
#include <condition_variable> #include <condition_variable>
#include <filesystem> #include <filesystem>
#include <locale>
#include <map> #include <map>
#include <memory> #include <memory>
#include <mutex> #include <mutex>
@ -15,6 +16,7 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#include <fmt/chrono.h>
#include <fmt/format.h> #include <fmt/format.h>
#include <lz4.h> #include <lz4.h>
@ -278,21 +280,11 @@ static double GetSystemTimeAsDouble()
static std::string SystemTimeAsDoubleToString(double time) static std::string SystemTimeAsDoubleToString(double time)
{ {
// revert adjustments from GetSystemTimeAsDouble() to get a normal Unix timestamp again // revert adjustments from GetSystemTimeAsDouble() to get a normal Unix timestamp again
time_t seconds = static_cast<time_t>(time) + DOUBLE_TIME_OFFSET; const time_t seconds = static_cast<time_t>(time) + DOUBLE_TIME_OFFSET;
errno = 0; const tm local_time = fmt::localtime(seconds);
tm* local_time = localtime(&seconds);
if (errno != 0 || !local_time)
return "";
#ifdef _WIN32 // fmt is locale agnostic by default, so explicitly use current locale.
wchar_t tmp[32] = {}; return fmt::format(std::locale{""}, "{:%x %X}", local_time);
wcsftime(tmp, std::size(tmp), L"%x %X", local_time);
return WStringToUTF8(tmp);
#else
char tmp[32] = {};
strftime(tmp, sizeof(tmp), "%x %X", local_time);
return tmp;
#endif
} }
static std::string MakeStateFilename(int number); static std::string MakeStateFilename(int number);