aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2015-08-10 15:50:48 +0200
committerLukas Larsson <[email protected]>2015-08-10 15:50:48 +0200
commit77003a6daed96f0beb6de324666ad31530974dbb (patch)
tree23170344b944782c89652797230494e76163b074 /erts/emulator
parentde73ff17c737a24a322b260f75d69e61f3586328 (diff)
parented830e036f1bb5c2f1f67224897a31d2fa544c91 (diff)
downloadotp-77003a6daed96f0beb6de324666ad31530974dbb.tar.gz
otp-77003a6daed96f0beb6de324666ad31530974dbb.tar.bz2
otp-77003a6daed96f0beb6de324666ad31530974dbb.zip
Merge branch 'lukas/erts/system_process_core/OTP-12934' into maint
* lukas/erts/system_process_core/OTP-12934: erts: Don't abort when a system process is terminated
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/beam/erl_process.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index 9a2ec40a06..ceca5d4a82 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -12129,7 +12129,8 @@ erts_do_exit_process(Process* p, Eterm reason)
#endif
if (p->static_flags & ERTS_STC_FLG_SYSTEM_PROC)
- erl_exit(1, "System process %T terminated: %T\n", p->common.id, reason);
+ erl_exit(ERTS_DUMP_EXIT, "System process %T terminated: %T\n",
+ p->common.id, reason);
#ifdef ERTS_SMP
ERTS_SMP_CHK_HAVE_ONLY_MAIN_PROC_LOCK(p);