jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

system/excpt: let the OS handle termination on signal (#16712)

Browse source
This commit is contained in:
alaviss 2021-02-19 08:29:21 +00:00 • committed by GitHub
commit ccc0667c29
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 46 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/system/ansi_c.nim
View file

@ -40,6 +40,7 @@ else:
C_JmpBuf* {.importc: "jmp_buf", header: "<setjmp.h>".} = object
type CSighandlerT = proc (a: cint) {.noconv.}
when defined(windows):
const
SIGABRT* = cint(22)
@ -48,6 +49,7 @@ when defined(windows):
SIGINT* = cint(2)
SIGSEGV* = cint(11)
SIGTERM = cint(15)
SIG_DFL* = cast[CSighandlerT](0)
elif defined(macosx) or defined(linux) or defined(freebsd) or
defined(openbsd) or defined(netbsd) or defined(solaris) or
defined(dragonfly) or defined(nintendoswitch) or defined(genode) or
@ -60,6 +62,7 @@ elif defined(macosx) or defined(linux) or defined(freebsd) or
SIGSEGV* = cint(11)
SIGTERM* = cint(15)
SIGPIPE* = cint(13)
SIG_DFL* = cast[CSighandlerT](0)
elif defined(haiku):
const
SIGABRT* = cint(6)
@ -69,6 +72,7 @@ elif defined(haiku):
SIGSEGV* = cint(11)
SIGTERM* = cint(15)
SIGPIPE* = cint(7)
SIG_DFL* = cast[CSighandlerT](0)
else:
when NoFakeVars:
{.error: "SIGABRT not ported to your platform".}
@ -79,6 +83,7 @@ else:
SIGABRT* {.importc: "SIGABRT", nodecl.}: cint
SIGFPE* {.importc: "SIGFPE", nodecl.}: cint
SIGILL* {.importc: "SIGILL", nodecl.}: cint
SIG_DFL* {.importc: "SIG_DFL", nodecl.}: CSighandlerT
when defined(macosx) or defined(linux):
var SIGPIPE* {.importc: "SIGPIPE", nodecl.}: cint
@ -105,9 +110,9 @@ else:
proc c_setjmp*(jmpb: C_JmpBuf): cint {.
header: "<setjmp.h>", importc: "setjmp".}
type CSighandlerT = proc (a: cint) {.noconv.}
proc c_signal*(sign: cint, handler: proc (a: cint) {.noconv.}): CSighandlerT {.
proc c_signal*(sign: cint, handler: CSighandlerT): CSighandlerT {.
importc: "signal", header: "<signal.h>", discardable.}
proc c_raise*(sign: cint): cint {.importc: "raise", header: "<signal.h>".}
type
CFile {.importc: "FILE", header: "<stdio.h>",

12
lib/system/excpt.nim
View file

@ -643,7 +643,17 @@ when not defined(noSignalHandler) and not defined(useNimRtl):
# unless there's a good reason to use cstring in signal handler to avoid
# using gc?
showErrorMessage(msg, msg.len)
quit(1) # always quit when SIGABRT
when defined(posix):
# reset the signal handler to OS default
c_signal(sign, SIG_DFL)
# re-raise the signal, which will arrive once this handler exit.
# this lets the OS perform actions like core dumping and will
# also return the correct exit code to the shell.
discard c_raise(sign)
else:
quit(1)
proc registerSignalHandler() =
c_signal(SIGINT, signalHandler)