diff options
| author | Lukas Larsson <[email protected]> | 2016-02-23 11:24:12 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2016-08-31 14:36:58 +0200 |
| commit | c46ba734b6787e254b45b35ea135fc2da23190bb (patch) | |
| tree | c4effd213b8e5f7b42741f6c26b4dd17f080d2ee /erts/emulator/beam | |
| parent | 5cf780148575f1ea4c460d7c9783831e6fbce9ff (diff) | |
| download | otp-c46ba734b6787e254b45b35ea135fc2da23190bb.tar.gz otp-c46ba734b6787e254b45b35ea135fc2da23190bb.tar.bz2 otp-c46ba734b6787e254b45b35ea135fc2da23190bb.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.c | 4 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_init.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/erts/emulator/beam/break.c b/erts/emulator/beam/break.c index 0ddf7f4e6d..298b30fff3 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 e729574ec7..1718b23688 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 */ |