Skip to content

Refactor signal handling and replace signal handlers with thread-safe functions #1053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
pcanal wants to merge 14 commits into
base: master
Choose a base branch
from
Draft

Refactor signal handling and replace signal handlers with thread-safe functions #1053

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
fabd0dc
Created a new class TSigHandling out of TSystem and TSigHandling is d…
zzxuanyuan Jan 20, 2016
4607986
Change functions in signal handlers to be thread-safe
zzxuanyuan Jan 21, 2016
1ebb53f
Change auxiliary functions in TUnixSigHandling to gSystem functions
zzxuanyuan Mar 11, 2016
ea4472d
Changed Author and removed type cast and includes handling kSigFloati…
zzxuanyuan Mar 11, 2016
c637b65
Type casting gSystem to TUnixSystem and directly call DispatchTimers(…
zzxuanyuan Mar 11, 2016
c112524
Update signal handling setup calls for MacOSX
pcanal Sep 25, 2017
275d3db
Avoid code duplication.
pcanal Sep 25, 2017
4ae76d1
Use proper glob supporting setter
pcanal Jan 12, 2017
fa50533
Remove redundant code guard. Sort include.
pcanal Sep 25, 2017
93b4643
Remove #ifdef __CINT__
pcanal Sep 25, 2017
b6bbe3a
White space
pcanal Sep 25, 2017
81b94c9
TFdSet deduplication (now just in TUnixSystem.h)
pcanal Sep 25, 2017
6c238e3
Remove unnecessary include, forward decl
pcanal Sep 25, 2017
90767fe
Rename TSigHandling* to TSignalManager*
pcanal Sep 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Changed Author and removed type cast and includes handling kSigFloati… 
…ngException
  • Loading branch information
@zzxuanyuan @pcanal
zzxuanyuan authored and pcanal committed Sep 25, 2017
commit ea4472d94533a1aaee3eb84b7c46febe22f7953c
1 change: 1 addition & 0 deletions core/base/inc/TSigHandling.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ class TSigHandling : public TNamed {

//---- Handling of system signals
virtual Bool_t HaveTrappedSignal(Bool_t pendingOnly);
virtual void DispatchSignals(ESignals sig);
virtual void AddSignalHandler(TSignalHandler *sh);
virtual TSignalHandler *RemoveSignalHandler(TSignalHandler *sh);
virtual void ResetSignal(ESignals sig, Bool_t reset = kTRUE);
Expand Down
9 changes: 9 additions & 0 deletions core/base/src/TSigHandling.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,15 @@ Bool_t TSigHandling::HaveTrappedSignal(Bool_t)
return kFALSE;
}

////////////////////////////////////////////////////////////////////////////////
/// Dispatch signals.

void TSigHandling::DispatchSignals(ESignals /*sig*/)
{
AbstractMethod("DispatchSignals");
}


////////////////////////////////////////////////////////////////////////////////
/// Add a signal handler to list of system signal handlers. Only adds
/// the handler if it is not already in the list of signal handlers.
Expand Down
3 changes: 1 addition & 2 deletions core/base/src/TSystem.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ void TSystem::AddSignalHandler(TSignalHandler *h)

TSignalHandler *TSystem::RemoveSignalHandler(TSignalHandler *h)
{
return (TSignalHandler *)gSigHandling->RemoveSignalHandler(h);
return gSigHandling->RemoveSignalHandler(h);
}

////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -741,7 +741,6 @@ void TSystem::StackTrace()
AbstractMethod("StackTrace");
}


//---- Directories -------------------------------------------------------------

////////////////////////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion core/unix/inc/TUnixSigHandling.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// @(#)root/unix:$Id$
// Author: Fons Rademakers 15/09/95
// Author: Zhe Zhang 10/03/16

/*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
Expand Down
31 changes: 16 additions & 15 deletions core/unix/src/TUnixSigHandling.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// @(#)root/unix:$Id: 887c618d89c4ed436e4034fc133f468fecad651b $
// Author: Fons Rademakers 15/09/95
// Author: Zhe Zhang 10/03/16

/*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
Expand Down Expand Up @@ -133,7 +133,7 @@ static void SetRootSys()
static void SigHandler(ESignals sig)
{
if (gSigHandling)
((TUnixSigHandling*)gSigHandling)->DispatchSignals(sig);
gSigHandling->DispatchSignals(sig);
}

////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -515,10 +515,10 @@ void TUnixSigHandling::DispatchSignals(ESignals sig)
{
switch (sig) {
case kSigAlarm:
// DispatchTimers(kFALSE);
// gSystem->DispatchTimers(kFALSE);
break;
case kSigChild:
// CheckChilds();
// gSystem->CheckChilds();
break;
case kSigBus:
SignalSafeErrWrite("\n\nA fatal system signal has occurred: bus error");
Expand All @@ -530,19 +530,13 @@ void TUnixSigHandling::DispatchSignals(ESignals sig)
SignalSafeErrWrite("\n\nA fatal system signal has occurred: illegal instruction error");
break;
case kSigFloatingException:
Break("TUnixSigHandling::DispatchSignals", "%s", UnixSigname(sig));
StackTrace();
if (gApplication)
//sig is ESignal, should it be mapped to the correct signal number?
gApplication->HandleException(sig);
else
//map to the real signal code + set the
//high order bit to indicate a signal (?)
gSystem->Exit(gSignalMap[sig].fCode + 0x80);
SignalSafeErrWrite("\n\nA fatal system signal has occurred: floating exception error");
break;
case kSigSystem:
SignalSafeErrWrite("\n\nA fatal system signal has occurred: system error");
break;
case kSigPipe:
Break("TUnixSigHandling::DispatchSignals", "%s", UnixSigname(sig));
SignalSafeErrWrite("\n\nA fatal system signal has occurred: pipe error");
break;
case kSigWindowChanged:
Gl_windowchanged();
Expand All @@ -553,11 +547,18 @@ void TUnixSigHandling::DispatchSignals(ESignals sig)
break;
}

if ((sig == kSigIllegalInstruction) || (sig == kSigSegmentationViolation) || (sig == kSigBus))
if ((sig == kSigIllegalInstruction) || (sig == kSigSegmentationViolation) || (sig == kSigBus) || (sig == kSigFloatingException))
{
StackTraceTriggerThread();
signal(sig, SIG_DFL);
raise(sig);
if (gApplication)
//sig is ESignal, should it be mapped to the correct signal number?
gApplication->HandleException(sig);
else
//map to the real signal code + set the
//high order bit to indicate a signal (?)
gSystem->Exit(gSignalMap[sig].fCode + 0x80, 0);
}

// check a-synchronous signals
Expand Down