cpmadevs
/
cnq3
mirror of https://bitbucket.org/CPMADevs/cnq3
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

try to restore settings once only to make sure we always attempt writing 

the backtrace(s)
This commit is contained in:
myt 2017-03-08 02:10:11 +01:00
parent 7ccf48f10d
commit 635e71d024
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
code/unix/linux_signals.cpp
View File

@ -155,7 +155,9 @@ static int sig_signal = 0;
// Every call in there needs to be safe when called more than once.
static void SIG_HandleCrash()
static void SIG_HandleCrash(qbool restoreSettings)
{
if (restoreSettings)
{
// We crashed and only care about restoring system settings
// that the process clean-up won't handle for us.
@ -163,14 +165,21 @@ static void SIG_HandleCrash()
LIN_RestoreGamma();
#endif
Sys_ConsoleInputShutdown();
}
if (!sig_crashed)
return;
if (sig_crashed)
{
Sig_WriteJSON(sig_signal);
Sig_WriteBacktraceSafe();
Sig_WriteBacktraceUnsafe();
}
}
static void SIG_HandleExit()
{
SIG_HandleCrash(qtrue);
}
static void Sig_HandleSignal(int sig)
@ -197,7 +206,7 @@ static void Sig_HandleSignal(int sig)
printf("DOUBLE SIGNAL FAULT: Received signal %d (%s), exiting...\n", sig, Sig_GetName(sig));
if (sig_crashed && !crashHandled)
{
SIG_HandleCrash();
SIG_HandleCrash(qfalse);
}
exit(2);
}
@ -207,7 +216,7 @@ static void Sig_HandleSignal(int sig)
if (sig_crashed)
{
SIG_HandleCrash();
SIG_HandleCrash(qtrue);
crashHandled = qtrue;
exit(1);
}
@ -231,7 +240,7 @@ void SIG_Init()
// there ever being a real crash.
// This happens for instance with the "fatal IO error"
// of the X server.
atexit(SIG_HandleCrash);
atexit(SIG_HandleExit);
signal(SIGILL, Sig_HandleSignal);
signal(SIGIOT, Sig_HandleSignal);