diff options
| author | Raimo Niskanen <[email protected]> | 2012-03-15 11:22:59 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2012-03-21 10:23:09 +0100 |
| commit | 83d38d0dda488ecb7090f3070a5b2569be5a555e (patch) | |
| tree | e75e4e0bc082a9e0694422a9b6947fcb3fe899dd | |
| parent | 3a10d2e251e5490c05b32ca9c18165e9d1a055d9 (diff) | |
| download | otp-83d38d0dda488ecb7090f3070a5b2569be5a555e.tar.gz otp-83d38d0dda488ecb7090f3070a5b2569be5a555e.tar.bz2 otp-83d38d0dda488ecb7090f3070a5b2569be5a555e.zip | |
stdlib: Stop working around erlang:halt not flushing
| -rw-r--r-- | lib/stdlib/src/erl_compile.erl | 14 | ||||
| -rw-r--r-- | lib/stdlib/src/escript.erl | 14 |
2 files changed, 4 insertions, 24 deletions
diff --git a/lib/stdlib/src/erl_compile.erl b/lib/stdlib/src/erl_compile.erl index ff032b129c..81bec21a3f 100644 --- a/lib/stdlib/src/erl_compile.erl +++ b/lib/stdlib/src/erl_compile.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2011. All Rights Reserved. +%% Copyright Ericsson AB 1997-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 @@ -57,17 +57,7 @@ compile_cmdline(List) -> end. my_halt(Reason) -> - case process_info(group_leader(), status) of - {_,waiting} -> - %% Now all output data is down in the driver. - %% Give the driver some extra time before halting. - receive after 1 -> ok end, - halt(Reason); - _ -> - %% Probably still processing I/O requests. - erlang:yield(), - my_halt(Reason) - end. + erlang:halt(Reason). %% Run the the compiler in a separate process, trapping EXITs. diff --git a/lib/stdlib/src/escript.erl b/lib/stdlib/src/escript.erl index ad49d89908..27e70ac4d4 100644 --- a/lib/stdlib/src/escript.erl +++ b/lib/stdlib/src/escript.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2011. All Rights Reserved. +%% Copyright Ericsson AB 2007-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 @@ -848,17 +848,7 @@ fatal(Str) -> throw(Str). my_halt(Reason) -> - case process_info(group_leader(), status) of - {_,waiting} -> - %% Now all output data is down in the driver. - %% Give the driver some extra time before halting. - receive after 1 -> ok end, - halt(Reason); - _ -> - %% Probably still processing I/O requests. - erlang:yield(), - my_halt(Reason) - end. + erlang:halt(Reason). hidden_apply(App, M, F, Args) -> try |