aiden
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Host: Pack locals in struct

Browse Source
pull/3568/head
Stenzek 1 month ago
parent 640769c2b2
commit aa929370ba
No known key found for this signature in database
1 changed files with 41 additions and 33 deletions
Show Stats Download Patch File Download Diff File

74
src/util/host.cpp
Unescape Escape View File

@ -14,16 +14,24 @@
LOG_CHANNEL(Host);
namespace Host {
static std::pair<const char*, u32> LookupTranslationString(std::string_view context, std::string_view msg,
std::string_view disambiguation);
static constexpr u32 TRANSLATION_STRING_CACHE_SIZE = 4 * 1024 * 1024;
using TranslationStringMap = PreferUnorderedStringMap<std::pair<u32, u32>>;
using TranslationStringContextMap = PreferUnorderedStringMap<TranslationStringMap>;
static std::shared_mutex s_translation_string_mutex;
static TranslationStringContextMap s_translation_string_map;
static std::vector<char> s_translation_string_cache;
static u32 s_translation_string_cache_pos;
struct Locals
{
std::shared_mutex translation_string_mutex;
TranslationStringContextMap translation_string_map;
std::vector<char> translation_string_cache;
u32 translation_string_cache_pos;
};
static Locals s_locals;
} // namespace Host
std::pair<const char*, u32> Host::LookupTranslationString(std::string_view context, std::string_view msg,
@ -40,7 +48,7 @@ std::pair<const char*, u32> Host::LookupTranslationString(std::string_view conte
// Shouldn't happen, but just in case someone tries to translate an empty string.
if (msg.empty()) [[unlikely]]
{
ret.first = &s_translation_string_cache[0];
ret.first = &s_locals.translation_string_cache[0];
ret.second = 0;
return ret;
}
@ -51,42 +59,42 @@ std::pair<const char*, u32> Host::LookupTranslationString(std::string_view conte
disambiguation_key.append(msg);
}
s_translation_string_mutex.lock_shared();
ctx_it = s_translation_string_map.find(context);
s_locals.translation_string_mutex.lock_shared();
ctx_it = s_locals.translation_string_map.find(context);
if (ctx_it == s_translation_string_map.end()) [[unlikely]]
if (ctx_it == s_locals.translation_string_map.end()) [[unlikely]]
goto add_string;
msg_it = ctx_it->second.find(disambiguation.empty() ? msg : disambiguation_key.view());
if (msg_it == ctx_it->second.end()) [[unlikely]]
goto add_string;
ret.first = &s_translation_string_cache[msg_it->second.first];
ret.first = &s_locals.translation_string_cache[msg_it->second.first];
ret.second = msg_it->second.second;
s_translation_string_mutex.unlock_shared();
s_locals.translation_string_mutex.unlock_shared();
return ret;
add_string:
s_translation_string_mutex.unlock_shared();
s_translation_string_mutex.lock();
s_locals.translation_string_mutex.unlock_shared();
s_locals.translation_string_mutex.lock();
if (s_translation_string_cache.empty()) [[unlikely]]
if (s_locals.translation_string_cache.empty()) [[unlikely]]
{
// First element is always an empty string.
s_translation_string_cache.resize(TRANSLATION_STRING_CACHE_SIZE);
s_translation_string_cache[0] = '\0';
s_translation_string_cache_pos = 0;
s_locals.translation_string_cache.resize(TRANSLATION_STRING_CACHE_SIZE);
s_locals.translation_string_cache[0] = '\0';
s_locals.translation_string_cache_pos = 0;
}
if ((len = Internal::GetTranslatedStringImpl(context, msg, disambiguation,
&s_translation_string_cache[s_translation_string_cache_pos],
TRANSLATION_STRING_CACHE_SIZE - 1 - s_translation_string_cache_pos)) < 0)
if ((len = Internal::GetTranslatedStringImpl(
context, msg, disambiguation, &s_locals.translation_string_cache[s_locals.translation_string_cache_pos],
TRANSLATION_STRING_CACHE_SIZE - 1 - s_locals.translation_string_cache_pos)) < 0)
{
ERROR_LOG("WARNING: Clearing translation string cache, it might need to be larger.");
s_translation_string_cache_pos = 0;
s_locals.translation_string_cache_pos = 0;
if ((len = Internal::GetTranslatedStringImpl(
context, msg, disambiguation, &s_translation_string_cache[s_translation_string_cache_pos],
TRANSLATION_STRING_CACHE_SIZE - 1 - s_translation_string_cache_pos)) < 0)
context, msg, disambiguation, &s_locals.translation_string_cache[s_locals.translation_string_cache_pos],
TRANSLATION_STRING_CACHE_SIZE - 1 - s_locals.translation_string_cache_pos)) < 0)
{
Panic("Failed to get translated string after clearing cache.");
len = 0;
@ -94,21 +102,21 @@ add_string:
}
// New context?
if (ctx_it == s_translation_string_map.end())
ctx_it = s_translation_string_map.emplace(context, TranslationStringMap()).first;
if (ctx_it == s_locals.translation_string_map.end())
ctx_it = s_locals.translation_string_map.emplace(context, TranslationStringMap()).first;
// Impl doesn't null terminate, we need that for C strings.
// TODO: do we want to consider aligning the buffer?
const u32 insert_pos = s_translation_string_cache_pos;
s_translation_string_cache[insert_pos + static_cast<u32>(len)] = 0;
const u32 insert_pos = s_locals.translation_string_cache_pos;
s_locals.translation_string_cache[insert_pos + static_cast<u32>(len)] = 0;
ctx_it->second.emplace(disambiguation.empty() ? msg : disambiguation_key.view(),
std::pair<u32, u32>(insert_pos, static_cast<u32>(len)));
s_translation_string_cache_pos = insert_pos + static_cast<u32>(len) + 1;
s_locals.translation_string_cache_pos = insert_pos + static_cast<u32>(len) + 1;
ret.first = &s_translation_string_cache[insert_pos];
ret.first = &s_locals.translation_string_cache[insert_pos];
ret.second = static_cast<u32>(len);
s_translation_string_mutex.unlock();
s_locals.translation_string_mutex.unlock();
return ret;
}
@ -131,8 +139,8 @@ std::string Host::TranslateToString(std::string_view context, std::string_view m
void Host::ClearTranslationCache()
{
s_translation_string_mutex.lock();
s_translation_string_map.clear();
s_translation_string_cache_pos = 0;
s_translation_string_mutex.unlock();
s_locals.translation_string_mutex.lock();
s_locals.translation_string_map.clear();
s_locals.translation_string_cache_pos = 0;
s_locals.translation_string_mutex.unlock();
}

Write Preview
Loading…
Cancel
Save