ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implement error report stacking

This commit is contained in:
Nekotekina 2017-08-02 17:49:18 +03:00
parent f6c8f46462
commit c14eb4e54a
1 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
rpcs3/Emu/System.cpp
View File

@ -787,6 +787,29 @@ void Emulator::Stop()
s32 error_code::error_report(const fmt_type_info* sup, u64 arg)
{
static thread_local std::unordered_map<std::string, std::size_t>* g_tls_error_stats{};
static thread_local std::string* g_tls_error_str{};
if (!g_tls_error_stats)
{
g_tls_error_stats = new std::unordered_map<std::string, std::size_t>;
g_tls_error_str = new std::string;
thread_ctrl::atexit([]
{
for (auto&& pair : *g_tls_error_stats)
{
if (pair.second > 3)
{
LOG_ERROR(GENERAL, "Stat: %s [x%u]", pair.first, pair.second);
}
}
delete g_tls_error_stats;
delete g_tls_error_str;
});
}
logs::channel* channel = &logs::GENERAL;
logs::level level = logs::level::error;
const char* func = "Unknown function";
@ -797,29 +820,6 @@ s32 error_code::error_report(const fmt_type_info* sup, u64 arg)
{
auto& ppu = static_cast<ppu_thread&>(*thread);
// Filter some annoying reports
switch (arg)
{
case CELL_ESRCH:
case CELL_EDEADLK:
case CELL_EPERM:
{
if (ppu.m_name == "_cellsurMixerMain" || ppu.m_name == "_sys_MixerChStripMain")
{
if (std::memcmp(ppu.last_function, "sys_mutex_lock", 15) == 0 ||
std::memcmp(ppu.last_function, "sys_lwmutex_lock", 17) == 0 ||
std::memcmp(ppu.last_function, "_sys_mutex_lock", 16) == 0 ||
std::memcmp(ppu.last_function, "_sys_lwmutex_lock", 18) == 0 ||
std::memcmp(ppu.last_function, "sys_lwmutex_unlock", 19) == 0)
{
level = logs::level::trace;
}
}
break;
}
}
if (ppu.last_function)
{
func = ppu.last_function;
@ -835,7 +835,18 @@ s32 error_code::error_report(const fmt_type_info* sup, u64 arg)
}
}
channel->format(level, "'%s' failed with 0x%08x%s%s", func, arg, sup ? " : " : "", std::make_pair(sup, arg));
// Format log message (use preallocated buffer)
g_tls_error_str->clear();
fmt::append(*g_tls_error_str, "'%s' failed with 0x%08x%s%s", func, arg, sup ? " : " : "", std::make_pair(sup, arg));
// Update stats and check log threshold
const auto stat = ++(*g_tls_error_stats)[*g_tls_error_str];
if (stat <= 3)
{
channel->format(level, "%s [%u]", *g_tls_error_str, stat);
}
return static_cast<s32>(arg);
}