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
White space
  • Loading branch information
@pcanal
pcanal committed Sep 25, 2017
commit b6bbe3aa656f23b4918881ac2d7b9ef9709e6c42
2 changes: 1 addition & 1 deletion core/base/inc/TSigHandling.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class TSigHandling : public TNamed {

//---- Handling of system signals
virtual Bool_t HaveTrappedSignal(Bool_t pendingOnly);
virtual void DispatchSignals(ESignals sig);
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
2 changes: 1 addition & 1 deletion core/base/src/TSigHandling.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ Bool_t TSigHandling::HaveTrappedSignal(Bool_t)

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

void TSigHandling::DispatchSignals(ESignals /*sig*/)
{
AbstractMethod("DispatchSignals");
Expand Down
4 changes: 2 additions & 2 deletions core/unix/inc/TUnixSigHandling.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ class TUnixSigHandling : public TSigHandling {
static void StackTraceTriggerThread();
static void StackTraceForkThread();
static int StackTraceExecScript(void *);

public:
TUnixSigHandling();
virtual ~TUnixSigHandling();

//---- Misc -------------------------------------------------
void Init();

//---- Handling of system events ----------------------------
Bool_t CheckSignals(Bool_t sync);
Bool_t HaveTrappedSignal(Bool_t pendingOnly);
Expand Down
8 changes: 4 additions & 4 deletions core/unix/src/TUnixSigHandling.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
#endif

class TFdSet;

#if defined(HAVE_DLADDR) && !defined(R__MACOSX)
////////////////////////////////////////////////////////////////////////////////

Expand Down Expand Up @@ -298,7 +298,7 @@ void TUnixSigHandling::Init()
if(snprintf(gStackTraceHelper.fPidString, kStringLength-1, "%s/etc/gdb-backtrace.sh", gSystem->Getenv("ROOTSYS")) >= kStringLength) {
SignalSafeErrWrite("Unable to pre-allocate executable information");
return;
}
}
#endif
Copy link
Member

@amadio amadio Jan 28, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove this #ifdef and use TROOT::GetEtcDir() or equivalent.


gStackTraceHelper.fParentToChild[0] = -1;
Expand Down Expand Up @@ -793,7 +793,7 @@ void TUnixSigHandling::StackTraceMonitorThread()

void TUnixSigHandling::StackTraceTriggerThread()
{
int result = SignalSafeWrite(gStackTraceHelper.fParentToChild[1], "1");
int result = SignalSafeWrite(gStackTraceHelper.fParentToChild[1], "1");
if (result < 0) {
SignalSafeErrWrite("\n\nAttempt to request stacktrace failed: ");
SignalSafeErrWrite(strerror(-result));
Expand Down Expand Up @@ -839,7 +839,7 @@ void TUnixSigHandling::StackTraceForkThread()
}

//////////////////////////////////////////////////////////////////////////////
/// The new thread in StackTraceForkThread() is forked to run this function
/// The new thread in StackTraceForkThread() is forked to run this function
/// to print out stack trace.

int TUnixSigHandling::StackTraceExecScript(void * /*arg*/)
Expand Down
2 changes: 1 addition & 1 deletion core/unix/src/TUnixSystem.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ TFdSet::TFdSet() { memset(fds_bits, 0, sizeof(fds_bits)); }
TFdSet::TFdSet(const TFdSet &org) { memcpy(fds_bits, org.fds_bits, sizeof(org.fds_bits)); }

void TFdSet::Zero() { memset(fds_bits, 0, sizeof(fds_bits)); }

void TFdSet::Set(Int_t n)
{
if (n >= 0 && n < kFDSETSIZE) {
Expand Down