aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2017-01-25 11:33:31 +0100
committerBjörn-Egil Dahlberg <[email protected]>2017-01-25 11:33:31 +0100
commit1706f9302887cf238862fb7d92ca8d77fcef71d3 (patch)
tree5c505a15e04766824c29d80d7bc87d2ca4e6d74a /erts/emulator/beam
parentc2a833811c768fc38b51a5241f55eb25786ac13e (diff)
parent1623d7a85908221a118356bec64693901405659d (diff)
downloadotp-1706f9302887cf238862fb7d92ca8d77fcef71d3.tar.gz
otp-1706f9302887cf238862fb7d92ca8d77fcef71d3.tar.bz2
otp-1706f9302887cf238862fb7d92ca8d77fcef71d3.zip
Merge branch 'egil/erts/fix-crashdump-suspend/OTP-14164' into maint
* egil/erts/fix-crashdump-suspend/OTP-14164: erts: Fix thread suspend in crashdump
Diffstat (limited to 'erts/emulator/beam')
-rw-r--r--erts/emulator/beam/break.c2
-rw-r--r--erts/emulator/beam/erl_init.c1
-rw-r--r--erts/emulator/beam/sys.h3
3 files changed, 5 insertions, 1 deletions
diff --git a/erts/emulator/beam/break.c b/erts/emulator/beam/break.c
index dfbe1ced47..61907cc7ff 100644
--- a/erts/emulator/beam/break.c
+++ b/erts/emulator/beam/break.c
@@ -717,6 +717,8 @@ erl_crash_dump_v(char *file, int line, char* fmt, va_list args)
* We have to be very very careful when doing this as the schedulers
* could be anywhere.
*/
+ sys_init_suspend_handler();
+
for (i = 0; i < erts_no_schedulers; i++) {
erts_tid_t tid = ERTS_SCHEDULER_IX(i)->tid;
if (!erts_equal_tids(tid,erts_thr_self()))
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index 2fd97208cc..070cc3f2d0 100644
--- a/erts/emulator/beam/erl_init.c
+++ b/erts/emulator/beam/erl_init.c
@@ -2220,7 +2220,6 @@ 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 */
diff --git a/erts/emulator/beam/sys.h b/erts/emulator/beam/sys.h
index 7740dd4373..41a7ff4c16 100644
--- a/erts/emulator/beam/sys.h
+++ b/erts/emulator/beam/sys.h
@@ -859,9 +859,12 @@ int erts_sys_unsetenv(char *key);
char *erts_read_env(char *key);
void erts_free_read_env(void *value);
+#if defined(ERTS_SMP)
#if defined(ERTS_THR_HAVE_SIG_FUNCS) && !defined(ETHR_UNUSABLE_SIGUSRX)
extern void sys_thr_resume(erts_tid_t tid);
extern void sys_thr_suspend(erts_tid_t tid);
+#define ERTS_SYS_SUSPEND_SIGNAL SIGUSR2
+#endif
#endif
/* utils.c */