electron-rare/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Part: Fix signal handler compatibility with OCCT 8

Browse Source 
OCCT 8.0.0 removed the NewInstance/Jump API from signal exception
classes in favor of Standard_ErrorHandler::Abort.
This commit is contained in:
Benjamin Nauck
2026-02-28 21:56:44 +01:00
committed by Chris Hennes
parent 87651cdd4c
commit 17651fbfa4
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Mod/Part/App/SignalException.cpp
+17 -10
View File
@@ -43,6 +43,13 @@
# include <Standard_NumericError.hxx>
# include <Standard_ErrorHandler.hxx>
# include <Standard_Assert.hxx>
# include <Standard_Version.hxx>
// OCCT 8 removed NewInstance/Jump in favor of Standard_ErrorHandler::Abort
# if OCC_VERSION_HEX >= 0x080000
# define OSD_SIGNAL_THROW(Type, msg) Standard_ErrorHandler::Abort(Type(msg))
# else
# define OSD_SIGNAL_THROW(Type, msg) Type::NewInstance(msg)->Jump()
# endif
#endif
#include <Base/SystemHandler.h>
@@ -63,7 +70,7 @@ static void SegvHandler(const int theSignal, siginfo_t* theSigInfo, const Standa
sigemptyset(&set);
sigaddset(&set, SIGSEGV);
sigprocmask(SIG_UNBLOCK, &set, nullptr);
OSD_SIGSEGV::NewInstance("SIGSEGV 'segmentation violation' detected.")->Jump();
OSD_SIGNAL_THROW(OSD_SIGSEGV, "SIGSEGV 'segmentation violation' detected.");
}
exit(SIGSEGV);
}
@@ -86,40 +93,40 @@ static void throw_exc(const int theSignal, siginfo_t* /*theSigInfo*/, const Stan
sigemptyset(&set);
switch (theSignal) {
case SIGHUP:
OSD_SIGHUP::NewInstance("SIGHUP 'hangup' detected.")->Jump();
OSD_SIGNAL_THROW(OSD_SIGHUP, "SIGHUP 'hangup' detected.");
exit(SIGHUP);
break;
case SIGINT:
// For safe handling of Control-C as stop event, arm a variable but do not
// generate longjump (we are out of context anyway)
OSD_SIGINT::NewInstance("SIGINT 'interrupt' detected.")->Jump();
OSD_SIGNAL_THROW(OSD_SIGINT, "SIGINT 'interrupt' detected.");
exit(SIGINT);
break;
case SIGQUIT:
OSD_SIGQUIT::NewInstance("SIGQUIT 'quit' detected.")->Jump();
OSD_SIGNAL_THROW(OSD_SIGQUIT, "SIGQUIT 'quit' detected.");
exit(SIGQUIT);
break;
case SIGILL:
OSD_SIGILL::NewInstance("SIGILL 'illegal instruction' detected.")->Jump();
OSD_SIGNAL_THROW(OSD_SIGILL, "SIGILL 'illegal instruction' detected.");
exit(SIGILL);
break;
case SIGKILL:
OSD_SIGKILL::NewInstance("SIGKILL 'kill' detected.")->Jump();
OSD_SIGNAL_THROW(OSD_SIGKILL, "SIGKILL 'kill' detected.");
exit(SIGKILL);
break;
case SIGBUS:
sigaddset(&set, SIGBUS);
sigprocmask(SIG_UNBLOCK, &set, nullptr);
OSD_SIGBUS::NewInstance("SIGBUS 'bus error' detected.")->Jump();
OSD_SIGNAL_THROW(OSD_SIGBUS, "SIGBUS 'bus error' detected.");
exit(SIGBUS);
break;
case SIGSEGV:
OSD_SIGSEGV::NewInstance("SIGSEGV 'segmentation violation' detected.")->Jump();
OSD_SIGNAL_THROW(OSD_SIGSEGV, "SIGSEGV 'segmentation violation' detected.");
exit(SIGSEGV);
break;
# ifdef SIGSYS
case SIGSYS:
OSD_SIGSYS::NewInstance("SIGSYS 'bad argument to system call' detected.")->Jump();
OSD_SIGNAL_THROW(OSD_SIGSYS, "SIGSYS 'bad argument to system call' detected.");
exit(SIGSYS);
break;
# endif
@@ -127,7 +134,7 @@ static void throw_exc(const int theSignal, siginfo_t* /*theSigInfo*/, const Stan
sigaddset(&set, SIGFPE);
sigprocmask(SIG_UNBLOCK, &set, nullptr);
OSD::SetFloatingSignal(Standard_True);
Standard_NumericError::NewInstance("SIGFPE Arithmetic exception detected")->Jump();
OSD_SIGNAL_THROW(Standard_NumericError, "SIGFPE Arithmetic exception detected");
break;
default:
break;