diff options
author | Rickard Green <[email protected]> | 2018-08-15 18:04:15 +0200 |
---|---|---|
committer | Rickard Green <[email protected]> | 2018-08-20 13:26:09 +0200 |
commit | 1d1a604d66806fb622d03a7c82f0316a5b15ba4b (patch) | |
tree | e34882a0a9085704513acde9c5af948fc6a1bbce /erts/emulator/test | |
parent | e37eec271ad08a6689e358071eeb800674cde938 (diff) | |
download | otp-1d1a604d66806fb622d03a7c82f0316a5b15ba4b.tar.gz otp-1d1a604d66806fb622d03a7c82f0316a5b15ba4b.tar.bz2 otp-1d1a604d66806fb622d03a7c82f0316a5b15ba4b.zip |
Fix incoming suspend monitor down
An incoming suspend monitor down wasn't handled correct when the
local monitor half had been removed with an emulator crash as result.
Diffstat (limited to 'erts/emulator/test')
-rw-r--r-- | erts/emulator/test/trace_SUITE.erl | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/erts/emulator/test/trace_SUITE.erl b/erts/emulator/test/trace_SUITE.erl index 979b3185a5..c2d5cd7023 100644 --- a/erts/emulator/test/trace_SUITE.erl +++ b/erts/emulator/test/trace_SUITE.erl @@ -39,7 +39,7 @@ system_monitor_large_heap_1/1, system_monitor_large_heap_2/1, system_monitor_long_schedule/1, bad_flag/1, trace_delivered/1, trap_exit_self_receive/1, - trace_info_badarg/1]). + trace_info_badarg/1, erl_704/1]). -include_lib("common_test/include/ct.hrl"). @@ -63,7 +63,7 @@ all() -> system_monitor_long_gc_2, system_monitor_large_heap_1, system_monitor_long_schedule, system_monitor_large_heap_2, bad_flag, trace_delivered, - trap_exit_self_receive, trace_info_badarg]. + trap_exit_self_receive, trace_info_badarg, erl_704]. init_per_testcase(_Case, Config) -> [{receiver,spawn(fun receiver/0)}|Config]. @@ -1739,6 +1739,21 @@ trace_info_badarg(Config) when is_list(Config) -> catch erlang:trace_info({a,b,c},d), ok. +%% An incoming suspend monitor down wasn't handled +%% correct when the local monitor half had been +%% removed with an emulator crash as result. +erl_704(Config) -> + erl_704_test(100). + +erl_704_test(0) -> + ok; +erl_704_test(N) -> + P = spawn(fun () -> receive infinity -> ok end end), + erlang:suspend_process(P), + exit(P, kill), + (catch erlang:resume_process(P)), + erl_704_test(N-1). + drop_trace_until_down(Proc, Mon) -> drop_trace_until_down(Proc, Mon, false, 0, 0). |