RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-21 18:22:33 +01:00
Code Issues Releases Wiki Activity

Add information about unnamed/main threads in logs and fatal dialog

Browse Source 
* If thread is unnamed, keep log name empty for main thread, otherwise print thread id. In fatal dialog, main thread can be handled differently (with special remark that it's main thread).
* Always print thread id in fatal dialog, regardless of thread type.

Co-authored-by: Nekotekina <nekotekina@gmail.com>
This commit is contained in:
Eladash 2021-03-01 13:58:13 +02:00 committed by Ivan
parent 40f3adc45f
commit cd6ef2958b
6 changed files with 55 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Utilities/Thread.cpp
View File

@ -94,7 +94,7 @@ thread_local bool g_tls_access_violation_recovered = false;
extern thread_local std::string(*g_tls_log_prefix)();
// Report error and call std::abort(), defined in main.cpp
[[noreturn]] void report_fatal_error(const std::string&);
[[noreturn]] void report_fatal_error(std::string_view);
template <>
void fmt_class_string<std::thread::id>::format(std::string& out, u64 arg)
@ -1609,6 +1609,22 @@ bool handle_access_violation(u32 addr, bool is_writing, x64_context* context) no
return true;
}
static void append_thread_name(std::string& msg)
{
if (thread_ctrl::get_current())
{
fmt::append(msg, "Emu Thread Name: '%s'.\n", thread_ctrl::get_name());
}
else if (thread_ctrl::is_main())
{
fmt::append(msg, "Thread: Main Thread");
}
else
{
fmt::append(msg, "Thread id = %s.\n", std::this_thread::get_id());
}
}
#ifdef _WIN32
static LONG exception_handler(PEXCEPTION_POINTERS pExp) noexcept
@ -1670,14 +1686,7 @@ static LONG exception_filter(PEXCEPTION_POINTERS pExp) noexcept
}
}
if (thread_ctrl::get_current())
{
fmt::append(msg, "Emu Thread Name: '%s'.\n", thread_ctrl::get_name());
}
// TODO: Report full thread name if not an emu thread
fmt::append(msg, "Thread id = %s.\n", std::this_thread::get_id());
append_thread_name(msg);
std::vector<HMODULE> modules;
for (DWORD size = 256; modules.size() != size; size /= sizeof(HMODULE))
@ -1795,14 +1804,7 @@ static void signal_handler(int /*sig*/, siginfo_t* info, void* uct) noexcept
std::string msg = fmt::format("Segfault %s location %p at %p.\n", cause, info->si_addr, RIP(context));
if (thread_ctrl::get_current())
{
fmt::append(msg, "Emu Thread Name: '%s'.\n", thread_ctrl::get_name());
}
// TODO: Report full thread name if not an emu thread
fmt::append(msg, "Thread id = %s.\n", std::this_thread::get_id());
append_thread_name(msg);
if (IsDebuggerPresent())
{
@ -2542,8 +2544,7 @@ void thread_base::exec()
#endif
}
// Assume main thread
report_fatal_error(std::string(reason));
report_fatal_error(reason);
}
void thread_ctrl::detect_cpu_layout()

2
rpcs3/Emu/System.cpp
View File

@ -88,7 +88,7 @@ atomic_t<u32> g_progr_ptotal{0};
atomic_t<u32> g_progr_pdone{0};
// Report error and call std::abort(), defined in main.cpp
[[noreturn]] void report_fatal_error(const std::string&);
[[noreturn]] void report_fatal_error(std::string_view);
namespace
{

26
rpcs3/main.cpp
View File

@ -61,6 +61,8 @@ static atomic_t<bool> s_headless = false;
static atomic_t<bool> s_no_gui = false;
static atomic_t<char*> s_argv0;
extern thread_local std::string(*g_tls_log_prefix)();
#ifndef _WIN32
extern char **environ;
#endif
@ -68,15 +70,29 @@ extern char **environ;
LOG_CHANNEL(sys_log, "SYS");
LOG_CHANNEL(q_debug, "QDEBUG");
[[noreturn]] extern void report_fatal_error(const std::string& text)
[[noreturn]] extern void report_fatal_error(std::string_view _text)
{
std::string buf;
// Check if thread id is in string
if (_text.find("\nThread id = "sv) == umax)
{
// Copy only when needed
buf = std::string(_text);
// Always print thread id
fmt::append(buf, "\nThread id = %s.", std::this_thread::get_id());
}
const std::string_view text = buf.empty() ? _text : buf;
if (s_headless)
{
#ifdef _WIN32
if (AttachConsole(ATTACH_PARENT_PROCESS) || AllocConsole())
[[maybe_unused]] const auto con_out = freopen("conout$", "w", stderr);
#endif
fprintf(stderr, "RPCS3: %s\n", text.c_str());
std::fprintf(stderr, "RPCS3: %.*s\n", static_cast<int>(text.size()), text.data());
std::abort();
}
@ -93,10 +109,10 @@ LOG_CHANNEL(q_debug, "QDEBUG");
}
else
{
fprintf(stderr, "RPCS3: %s\n", text.c_str());
std::fprintf(stderr, "RPCS3: %.*s\n", static_cast<int>(text.size()), text.data());
}
auto show_report = [](const std::string& text)
auto show_report = [](std::string_view text)
{
fatal_error_dialog dlg(text);
dlg.exec();
@ -154,7 +170,7 @@ LOG_CHANNEL(q_debug, "QDEBUG");
}
else
{
fprintf(stderr, "posix_spawn() failed: %d\n", ret);
std::fprintf(stderr, "posix_spawn() failed: %d\n", ret);
}
#endif
std::abort();

6
rpcs3/rpcs3qt/fatal_error_dialog.cpp
View File

@ -3,9 +3,7 @@
#include <QLayout>
#include <QTextDocument>
#include <string>
fatal_error_dialog::fatal_error_dialog(const std::string& text) : QMessageBox()
fatal_error_dialog::fatal_error_dialog(std::string_view text) : QMessageBox()
{
setWindowTitle(tr("RPCS3: Fatal Error"));
setIcon(QMessageBox::Icon::Critical);
@ -18,7 +16,7 @@ fatal_error_dialog::fatal_error_dialog(const std::string& text) : QMessageBox()
%3<br>
</p>
)")
.arg(Qt::convertFromPlainText(QString::fromStdString(text)))
.arg(Qt::convertFromPlainText(QString::fromUtf8(text.data(), text.size())))
.arg(tr("HOW TO REPORT ERRORS:"))
.arg(tr("Please, don't send incorrect reports. Thanks for understanding.")));
layout()->setSizeConstraint(QLayout::SetFixedSize);

4
rpcs3/rpcs3qt/fatal_error_dialog.h
View File

@ -2,12 +2,12 @@
#include <QMessageBox>
#include <string>
#include <string_view>
class fatal_error_dialog : public QMessageBox
{
Q_OBJECT
public:
fatal_error_dialog(const std::string& text);
fatal_error_dialog(std::string_view text);
};

12
rpcs3/util/logs.cpp
View File

@ -2,6 +2,7 @@
#include "Utilities/File.h"
#include "Utilities/mutex.h"
#include "Utilities/Thread.h"
#include "Utilities/StrFmt.h"
#include <cstring>
#include <cstdarg>
#include <string>
@ -25,13 +26,18 @@ using namespace std::literals::chrono_literals;
#include <zlib.h>
static std::string empty_string()
static std::string default_string()
{
return {};
if (thread_ctrl::is_main())
{
return {};
}
return fmt::format("TID: %s", std::this_thread::get_id());
}
// Thread-specific log prefix provider
thread_local std::string(*g_tls_log_prefix)() = &empty_string;
thread_local std::string(*g_tls_log_prefix)() = &default_string;
// Another thread-specific callback
thread_local void(*g_tls_log_control)(const char* fmt, u64 progress) = [](const char*, u64){};