diff options
| author | Dan Gudmundsson <[email protected]> | 2012-10-30 16:15:14 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2012-10-30 16:15:14 +0100 |
| commit | 465be6cd854681093971c2bb0d678993168f4a3e (patch) | |
| tree | 2097d0d9bd67ac45f10f3008f7d6a83ba35ffd1b /lib/stdlib/test | |
| parent | f4003ae4ff6c53bdcffb4638eeb36ec737d8bdd2 (diff) | |
| parent | 6fba00f0e0e66311dd3a476aaa0c9d7f288a2a9b (diff) | |
| download | otp-465be6cd854681093971c2bb0d678993168f4a3e.tar.gz otp-465be6cd854681093971c2bb0d678993168f4a3e.tar.bz2 otp-465be6cd854681093971c2bb0d678993168f4a3e.zip | |
Merge branch 'dgud/stdlib/proc_lib_hangs/OTP-9803'
* dgud/stdlib/proc_lib_hangs/OTP-9803:
stdlib: Monitor proc_lib:start'ed processes to avoid waiting forever
Diffstat (limited to 'lib/stdlib/test')
| -rw-r--r-- | lib/stdlib/test/proc_lib_SUITE.erl | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/lib/stdlib/test/proc_lib_SUITE.erl b/lib/stdlib/test/proc_lib_SUITE.erl index c95089117c..8dca69bac4 100644 --- a/lib/stdlib/test/proc_lib_SUITE.erl +++ b/lib/stdlib/test/proc_lib_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2011. All Rights Reserved. +%% Copyright Ericsson AB 1996-2012. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -28,7 +28,7 @@ crash/1, sync_start_nolink/1, sync_start_link/1, spawn_opt/1, sp1/0, sp2/0, sp3/1, sp4/2, sp5/1, hibernate/1]). --export([ otp_6345/1]). +-export([ otp_6345/1, init_dont_hang/1]). -export([hib_loop/1, awaken/1]). @@ -36,7 +36,7 @@ handle_event/2, handle_call/2, handle_info/2, terminate/2]). --export([otp_6345_init/1]). +-export([otp_6345_init/1, init_dont_hang_init/1]). -ifdef(STANDALONE). @@ -52,7 +52,7 @@ all() -> {group, tickets}]. groups() -> - [{tickets, [], [otp_6345]}, + [{tickets, [], [otp_6345, init_dont_hang]}, {sync_start, [], [sync_start_nolink, sync_start_link]}]. init_per_suite(Config) -> @@ -343,6 +343,29 @@ otp_6345_loop() -> otp_6345_loop() end. +%% OTP-9803 +init_dont_hang(suite) -> + []; +init_dont_hang(doc) -> + ["Check that proc_lib:start don't hang if spawned process crashes before proc_lib:init_ack/2"]; +init_dont_hang(Config) when is_list(Config) -> + %% Start should behave as start_link + process_flag(trap_exit, true), + StartLinkRes = proc_lib:start_link(?MODULE, init_dont_hang_init, [self()]), + try + StartLinkRes = proc_lib:start(?MODULE, init_dont_hang_init, [self()], 1000), + StartLinkRes = proc_lib:start(?MODULE, init_dont_hang_init, [self()], 1000, []), + ok + catch _:Error -> + io:format("Error ~p /= ~p ~n",[erlang:get_stacktrace(), StartLinkRes]), + exit(Error) + end. + +init_dont_hang_init(Parent) -> + 1 = 2. + + + %%----------------------------------------------------------------- %% The error_logger handler used. %%----------------------------------------------------------------- |