replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

When we restore signal handlers, restore them back to what they 

were when we came around, not to their default handler.  This 
should fix PR3848

llvm-svn: 67509
This commit is contained in:
Chris Lattner 2009-03-23 05:55:36 +00:00
parent f299a68ee0
commit fb95472123
1 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
llvm/lib/System/Unix/Signals.inc
View File

@ -57,23 +57,45 @@ static const int KillSigs[] = {
static const int *const KillSigsEnd =
KillSigs + sizeof(KillSigs) / sizeof(KillSigs[0]);
// Just call signal
static unsigned NumRegisteredSignals = 0;
static struct {
struct sigaction SA;
int SigNo;
} RegisteredSignalInfo[(sizeof(IntSigs)+sizeof(KillSigs))/sizeof(KillSigs[0])];
static void RegisterHandler(int Signal) {
signal(Signal, SignalHandler);
assert(NumRegisteredSignals <
sizeof(RegisteredSignalInfo)/sizeof(RegisteredSignalInfo[0]) &&
"Out of space for signal handlers!");
struct sigaction NewHandler;
NewHandler.sa_handler = SignalHandler;
NewHandler.sa_flags = SA_NODEFER|SA_RESETHAND;
sigemptyset(&NewHandler.sa_mask);
// Install the new handler, save the old one in RegisteredSignalInfo.
sigaction(Signal, &NewHandler,
&RegisteredSignalInfo[NumRegisteredSignals].SA);
RegisteredSignalInfo[NumRegisteredSignals].SigNo = Signal;
++NumRegisteredSignals;
}
static void RegisterHandlers() {
// If the handlers are already registered, we're done.
if (NumRegisteredSignals != 0) return;
std::for_each(IntSigs, IntSigsEnd, RegisterHandler);
std::for_each(KillSigs, KillSigsEnd, RegisterHandler);
}
static void UnregisterHandler(int Signal) {
signal(Signal, SIG_DFL);
}
static void UnregisterHandlers() {
std::for_each(KillSigs, KillSigsEnd, UnregisterHandler);
std::for_each(IntSigs, IntSigsEnd, UnregisterHandler);
// Restore all of the signal handlers to how they were before we showed up.
for (unsigned i = 0, e = NumRegisteredSignals; i != e; ++i)
sigaction(RegisteredSignalInfo[NumRegisteredSignals].SigNo,
&RegisteredSignalInfo[NumRegisteredSignals].SA, 0);
NumRegisteredSignals = 0;
}