aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2016-02-23 11:24:12 +0100
committerLukas Larsson <[email protected]>2016-02-23 11:26:18 +0100
commit6cec93eb4e697fc1451b0b4729fc3d4874581ebd (patch)
tree31417326e512f403dd1b46beaee501994e65f642 /erts/emulator/beam
parent72cc231e0186d98e52f7a1debdea624d4bbf1125 (diff)
downloadotp-6cec93eb4e697fc1451b0b4729fc3d4874581ebd.tar.gz
otp-6cec93eb4e697fc1451b0b4729fc3d4874581ebd.tar.bz2
otp-6cec93eb4e697fc1451b0b4729fc3d4874581ebd.zip
erts: Fix install of suspend handler
This commit makes sure to setup the suspend handler to matter what +B option is given at the command line.
Diffstat (limited to 'erts/emulator/beam')
-rw-r--r--erts/emulator/beam/break.c4
-rw-r--r--erts/emulator/beam/erl_init.c1
2 files changed, 3 insertions, 2 deletions
diff --git a/erts/emulator/beam/break.c b/erts/emulator/beam/break.c
index 4ce9d24479..8647b621d5 100644
--- a/erts/emulator/beam/break.c
+++ b/erts/emulator/beam/break.c
@@ -684,7 +684,7 @@ erl_crash_dump_v(char *file, int line, char* fmt, va_list args)
crash dump. */
erts_thr_progress_fatal_error_block(&tpd_buf);
-#ifdef ERTS_THR_HAVE_SIG_FUNCS
+#ifdef ERTS_SYS_SUSPEND_SIGNAL
/*
* We suspend all scheduler threads so that we can dump some
* data about the currently running processes and scheduler data.
@@ -818,7 +818,7 @@ erl_crash_dump_v(char *file, int line, char* fmt, va_list args)
#ifdef ERTS_SMP
-#if defined(ERTS_THR_HAVE_SIG_FUNCS)
+#ifdef ERTS_SYS_SUSPEND_SIGNAL
/* We resume all schedulers so that we are in a known safe state
when we write the rest of the crash dump */
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index d9c3b0dcf4..bcc54491bd 100644
--- a/erts/emulator/beam/erl_init.c
+++ b/erts/emulator/beam/erl_init.c
@@ -2134,6 +2134,7 @@ erl_start(int argc, char **argv)
init_break_handler();
if (replace_intr)
erts_replace_intr();
+ sys_init_suspend_handler();
#endif
boot_argc = argc - i; /* Number of arguments to init */