diff options
| author | Raimo Niskanen <raimo@erlang.org> | 2019-02-11 14:49:04 +0100 |
|---|---|---|
| committer | Raimo Niskanen <raimo@erlang.org> | 2019-02-11 14:57:45 +0100 |
| commit | e23b1ad7f296ae18cae143cdafcdaff044cee9f3 (patch) | |
| tree | 1fca741e6304b4c4f1d3596880daf0ea9da0c76b /erts/preloaded | |
| parent | 934f9974eb6bec43cd9445ec0f5019a4d1389428 (diff) | |
| download | erlang-e23b1ad7f296ae18cae143cdafcdaff044cee9f3.tar.gz | |
Check empty_out_q at close also for linger
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/ebin/prim_inet.beam | bin | 82228 -> 82572 bytes | |||
| -rw-r--r-- | erts/preloaded/src/prim_inet.erl | 16 |
2 files changed, 13 insertions, 3 deletions
diff --git a/erts/preloaded/ebin/prim_inet.beam b/erts/preloaded/ebin/prim_inet.beam Binary files differindex 558968b58a..d39c988442 100644 --- a/erts/preloaded/ebin/prim_inet.beam +++ b/erts/preloaded/ebin/prim_inet.beam diff --git a/erts/preloaded/src/prim_inet.erl b/erts/preloaded/src/prim_inet.erl index f1d938c9a4..e964f0b174 100644 --- a/erts/preloaded/src/prim_inet.erl +++ b/erts/preloaded/src/prim_inet.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2000-2018. All Rights Reserved. +%% Copyright Ericsson AB 2000-2019. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -172,8 +172,18 @@ close(S) when is_port(S) -> %% and is a contradiction in itself. %% We have hereby done our best... %% - Tref = erlang:start_timer(T * 1000, self(), close_port), - close_pend_loop(S, Tref, undefined); + case subscribe(S, [subs_empty_out_q]) of + {ok, [{subs_empty_out_q,0}]} -> + close_port(S); + {ok, [{subs_empty_out_q,N}]} when N > 0 -> + %% Wait for pending output to be sent + Tref = erlang:start_timer(T * 1000, self(), close_port), + close_pend_loop(S, Tref, N); + _ -> + %% Subscribe failed - wait full time + Tref = erlang:start_timer(T * 1000, self(), close_port), + close_pend_loop(S, Tref, undefined) + end; _ -> % Regard this as {ok,{false,_}} case subscribe(S, [subs_empty_out_q]) of {ok, [{subs_empty_out_q,N}]} when N > 0 -> |