diff options
| author | vaxerski <vaxry@vaxry.net> | 2023-03-01 15:08:44 +0000 |
|---|---|---|
| committer | vaxerski <vaxry@vaxry.net> | 2023-03-01 15:08:44 +0000 |
| commit | 6c250df77e2af7c56b1f424ea44430746160f797 (patch) | |
| tree | 8d1a1baf08033f871d121283eef0c44733534d27 /src | |
| parent | 7c5c7ced9170b5c1e34825735a720372a6c0c110 (diff) | |
generate coredumps on sigabrt too
Diffstat (limited to 'src')
| -rw-r--r-- | src/Compositor.cpp | 7 | ||||
| -rw-r--r-- | src/debug/CrashReporter.cpp | 5 | ||||
| -rw-r--r-- | src/debug/CrashReporter.hpp | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/Compositor.cpp b/src/Compositor.cpp index 4e3596a7..ca47e80a 100644 --- a/src/Compositor.cpp +++ b/src/Compositor.cpp @@ -18,14 +18,14 @@ int handleCritSignal(int signo, void* data) { return 0; // everything went fine } -void handleSegv(int sig) { +void handleUnrecoverableSignal(int sig) { if (g_pHookSystem->m_bCurrentEventPlugin) { longjmp(g_pHookSystem->m_jbHookFaultJumpBuf, 1); return; } - CrashReporter::createAndSaveCrash(); + CrashReporter::createAndSaveCrash(sig); abort(); } @@ -74,7 +74,8 @@ CCompositor::CCompositor() { // register crit signal handler wl_event_loop_add_signal(m_sWLEventLoop, SIGTERM, handleCritSignal, nullptr); - signal(SIGSEGV, handleSegv); + signal(SIGSEGV, handleUnrecoverableSignal); + signal(SIGABRT, handleUnrecoverableSignal); //wl_event_loop_add_signal(m_sWLEventLoop, SIGINT, handleCritSignal, nullptr); m_sWLRBackend = wlr_backend_autocreate(m_sWLDisplay, &m_sWLRSession); diff --git a/src/debug/CrashReporter.cpp b/src/debug/CrashReporter.cpp index 5b8c8a40..683bd951 100644 --- a/src/debug/CrashReporter.cpp +++ b/src/debug/CrashReporter.cpp @@ -3,6 +3,7 @@ #include <sys/utsname.h> #include <execinfo.h> #include <fstream> +#include <signal.h> #include "../plugins/PluginSystem.hpp" @@ -33,7 +34,7 @@ std::string getRandomMessage() { return MESSAGES[distribution(engine)]; } -void CrashReporter::createAndSaveCrash() { +void CrashReporter::createAndSaveCrash(int sig) { // get the backtrace const int PID = getpid(); @@ -43,7 +44,7 @@ void CrashReporter::createAndSaveCrash() { finalCrashReport += "--------------------------------------------\n Hyprland Crash Report\n--------------------------------------------\n"; finalCrashReport += getRandomMessage() + "\n\n"; - finalCrashReport += "Hyprland received signal 11 (SIGSEGV): Segmentation Fault\n\n"; + finalCrashReport += getFormat("Hyprland received signal %d (%s): Segmentation Fault\n\n", sig, strsignal(sig)); if (!g_pPluginSystem->getAllPlugins().empty()) { finalCrashReport += "Hyprland seems to be running with plugins. This crash might not be Hyprland's fault.\nPlugins:\n"; diff --git a/src/debug/CrashReporter.hpp b/src/debug/CrashReporter.hpp index b607a82f..b6750f10 100644 --- a/src/debug/CrashReporter.hpp +++ b/src/debug/CrashReporter.hpp @@ -3,5 +3,5 @@ #include "../defines.hpp" namespace CrashReporter { - void createAndSaveCrash(); + void createAndSaveCrash(int sig); };
\ No newline at end of file |