mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-21 19:33:22 +02:00
Merge pull request #6929 from yuzu-emu/revert-6870-trace-back-stack-back-stack-back
Revert "logging: Display backtrace on crash"
This commit is contained in:
commit
c20ea89390
@ -176,6 +176,3 @@ if (MSVC)
|
|||||||
else()
|
else()
|
||||||
target_link_libraries(common PRIVATE zstd)
|
target_link_libraries(common PRIVATE zstd)
|
||||||
endif()
|
endif()
|
||||||
if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND CMAKE_CXX_COMPILER_ID STREQUAL GNU)
|
|
||||||
target_link_libraries(common PRIVATE backtrace)
|
|
||||||
endif()
|
|
||||||
|
@ -13,14 +13,6 @@
|
|||||||
#include <windows.h> // For OutputDebugStringW
|
#include <windows.h> // For OutputDebugStringW
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(__linux__) && defined(__GNUG__) && !defined(__clang__)
|
|
||||||
#define BOOST_STACKTRACE_USE_BACKTRACE
|
|
||||||
#include <boost/stacktrace.hpp>
|
|
||||||
#undef BOOST_STACKTRACE_USE_BACKTRACE
|
|
||||||
#include <signal.h>
|
|
||||||
#define YUZU_LINUX_GCC_BACKTRACE
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "common/fs/file.h"
|
#include "common/fs/file.h"
|
||||||
#include "common/fs/fs.h"
|
#include "common/fs/fs.h"
|
||||||
#include "common/fs/fs_paths.h"
|
#include "common/fs/fs_paths.h"
|
||||||
@ -163,14 +155,6 @@ public:
|
|||||||
|
|
||||||
bool initialization_in_progress_suppress_logging = true;
|
bool initialization_in_progress_suppress_logging = true;
|
||||||
|
|
||||||
#ifdef YUZU_LINUX_GCC_BACKTRACE
|
|
||||||
[[noreturn]] void SleepForever() {
|
|
||||||
while (true) {
|
|
||||||
pause();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Static state as a singleton.
|
* Static state as a singleton.
|
||||||
*/
|
*/
|
||||||
@ -242,66 +226,9 @@ private:
|
|||||||
while (max_logs_to_write-- && message_queue.Pop(entry)) {
|
while (max_logs_to_write-- && message_queue.Pop(entry)) {
|
||||||
write_logs();
|
write_logs();
|
||||||
}
|
}
|
||||||
})} {
|
})} {}
|
||||||
#ifdef YUZU_LINUX_GCC_BACKTRACE
|
|
||||||
int waker_pipefd[2];
|
|
||||||
int done_printing_pipefd[2];
|
|
||||||
if (pipe2(waker_pipefd, O_CLOEXEC) || pipe2(done_printing_pipefd, O_CLOEXEC)) {
|
|
||||||
abort();
|
|
||||||
}
|
|
||||||
backtrace_thread_waker_fd = waker_pipefd[1];
|
|
||||||
backtrace_done_printing_fd = done_printing_pipefd[0];
|
|
||||||
std::thread([this, wait_fd = waker_pipefd[0], done_fd = done_printing_pipefd[1]] {
|
|
||||||
Common::SetCurrentThreadName("yuzu:Crash");
|
|
||||||
for (u8 ignore = 0; read(wait_fd, &ignore, 1) != 1;)
|
|
||||||
;
|
|
||||||
const int sig = received_signal;
|
|
||||||
if (sig <= 0) {
|
|
||||||
abort();
|
|
||||||
}
|
|
||||||
StopBackendThread();
|
|
||||||
const auto signal_entry =
|
|
||||||
CreateEntry(Class::Log, Level::Critical, "?", 0, "?",
|
|
||||||
fmt::vformat("Received signal {}", fmt::make_format_args(sig)));
|
|
||||||
ForEachBackend([&signal_entry](Backend& backend) {
|
|
||||||
backend.EnableForStacktrace();
|
|
||||||
backend.Write(signal_entry);
|
|
||||||
});
|
|
||||||
const auto backtrace =
|
|
||||||
boost::stacktrace::stacktrace::from_dump(backtrace_storage.data(), 4096);
|
|
||||||
for (const auto& frame : backtrace.as_vector()) {
|
|
||||||
auto line = boost::stacktrace::detail::to_string(&frame, 1);
|
|
||||||
if (line.empty()) {
|
|
||||||
abort();
|
|
||||||
}
|
|
||||||
line.pop_back(); // Remove newline
|
|
||||||
const auto frame_entry =
|
|
||||||
CreateEntry(Class::Log, Level::Critical, "?", 0, "?", line);
|
|
||||||
ForEachBackend([&frame_entry](Backend& backend) { backend.Write(frame_entry); });
|
|
||||||
}
|
|
||||||
using namespace std::literals;
|
|
||||||
const auto rip_entry = CreateEntry(Class::Log, Level::Critical, "?", 0, "?", "RIP"s);
|
|
||||||
ForEachBackend([&rip_entry](Backend& backend) {
|
|
||||||
backend.Write(rip_entry);
|
|
||||||
backend.Flush();
|
|
||||||
});
|
|
||||||
for (const u8 anything = 0; write(done_fd, &anything, 1) != 1;)
|
|
||||||
;
|
|
||||||
// Abort on original thread to help debugging
|
|
||||||
SleepForever();
|
|
||||||
}).detach();
|
|
||||||
signal(SIGSEGV, &HandleSignal);
|
|
||||||
signal(SIGABRT, &HandleSignal);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
~Impl() {
|
~Impl() {
|
||||||
#ifdef YUZU_LINUX_GCC_BACKTRACE
|
|
||||||
if (int zero_or_ignore = 0;
|
|
||||||
!received_signal.compare_exchange_strong(zero_or_ignore, SIGKILL)) {
|
|
||||||
SleepForever();
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
StopBackendThread();
|
StopBackendThread();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -340,36 +267,6 @@ private:
|
|||||||
delete ptr;
|
delete ptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef YUZU_LINUX_GCC_BACKTRACE
|
|
||||||
[[noreturn]] static void HandleSignal(int sig) {
|
|
||||||
signal(SIGABRT, SIG_DFL);
|
|
||||||
signal(SIGSEGV, SIG_DFL);
|
|
||||||
if (sig <= 0) {
|
|
||||||
abort();
|
|
||||||
}
|
|
||||||
instance->InstanceHandleSignal(sig);
|
|
||||||
}
|
|
||||||
|
|
||||||
[[noreturn]] void InstanceHandleSignal(int sig) {
|
|
||||||
if (int zero_or_ignore = 0; !received_signal.compare_exchange_strong(zero_or_ignore, sig)) {
|
|
||||||
if (received_signal == SIGKILL) {
|
|
||||||
abort();
|
|
||||||
}
|
|
||||||
SleepForever();
|
|
||||||
}
|
|
||||||
// Don't restart like boost suggests. We want to append to the log file and not lose dynamic
|
|
||||||
// symbols. This may segfault if it unwinds outside C/C++ code but we'll just have to fall
|
|
||||||
// back to core dumps.
|
|
||||||
boost::stacktrace::safe_dump_to(backtrace_storage.data(), 4096);
|
|
||||||
std::atomic_thread_fence(std::memory_order_seq_cst);
|
|
||||||
for (const int anything = 0; write(backtrace_thread_waker_fd, &anything, 1) != 1;)
|
|
||||||
;
|
|
||||||
for (u8 ignore = 0; read(backtrace_done_printing_fd, &ignore, 1) != 1;)
|
|
||||||
;
|
|
||||||
abort();
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static inline std::unique_ptr<Impl, decltype(&Deleter)> instance{nullptr, Deleter};
|
static inline std::unique_ptr<Impl, decltype(&Deleter)> instance{nullptr, Deleter};
|
||||||
|
|
||||||
Filter filter;
|
Filter filter;
|
||||||
@ -380,13 +277,6 @@ private:
|
|||||||
std::thread backend_thread;
|
std::thread backend_thread;
|
||||||
MPSCQueue<Entry> message_queue{};
|
MPSCQueue<Entry> message_queue{};
|
||||||
std::chrono::steady_clock::time_point time_origin{std::chrono::steady_clock::now()};
|
std::chrono::steady_clock::time_point time_origin{std::chrono::steady_clock::now()};
|
||||||
|
|
||||||
#ifdef YUZU_LINUX_GCC_BACKTRACE
|
|
||||||
std::atomic_int received_signal{0};
|
|
||||||
std::array<u8, 4096> backtrace_storage{};
|
|
||||||
int backtrace_thread_waker_fd;
|
|
||||||
int backtrace_done_printing_fd;
|
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user