diff options
| author | Erlang/OTP <[email protected]> | 2010-10-21 14:11:17 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-10-21 14:11:17 +0200 |
| commit | c97c93401f18021907a79719bf35c2f937f57fcf (patch) | |
| tree | a46e61db693e79b13633da1172987817882e7447 /lib/ssh/src/ssh_system_sup.erl | |
| parent | c219fb35d73ad393d983fd8b47a127d03cbc41c5 (diff) | |
| parent | fddc1ed0341d13df8373509fa063d889fab8d219 (diff) | |
| download | otp-c97c93401f18021907a79719bf35c2f937f57fcf.tar.gz otp-c97c93401f18021907a79719bf35c2f937f57fcf.tar.bz2 otp-c97c93401f18021907a79719bf35c2f937f57fcf.zip | |
Merge branch 'nick/ssh/fix-process-leak/OTP-8807' into maint-r13
* nick/ssh/fix-process-leak/OTP-8807:
Fix race condition when terminating a connection.
fix process leak in ssh_system_sup (dynamicaly created childs where not cleaned up)
Diffstat (limited to 'lib/ssh/src/ssh_system_sup.erl')
| -rw-r--r-- | lib/ssh/src/ssh_system_sup.erl | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh_system_sup.erl b/lib/ssh/src/ssh_system_sup.erl index 477f60f993..0ff73f1648 100644 --- a/lib/ssh/src/ssh_system_sup.erl +++ b/lib/ssh/src/ssh_system_sup.erl @@ -33,7 +33,8 @@ stop_system/2, system_supervisor/2, subsystem_supervisor/1, channel_supervisor/1, connection_supervisor/1, - acceptor_supervisor/1, start_subsystem/2, restart_subsystem/2, restart_acceptor/2]). + acceptor_supervisor/1, start_subsystem/2, restart_subsystem/2, + restart_acceptor/2, stop_subsystem/2]). %% Supervisor callback -export([init/1]). @@ -83,6 +84,23 @@ start_subsystem(SystemSup, Options) -> Spec = ssh_subsystem_child_spec(Options), supervisor:start_child(SystemSup, Spec). +stop_subsystem(SystemSup, SubSys) -> + case lists:keyfind(SubSys, 2, supervisor:which_children(SystemSup)) of + false -> + {error, not_found}; + {Id, _, _, _} -> + spawn(fun() -> supervisor:terminate_child(SystemSup, Id), + supervisor:delete_child(SystemSup, Id) end), + ok; + {'EXIT', {noproc, _}} -> + %% Already terminated; probably shutting down. + ok; + {'EXIT', {shutdown, _}} -> + %% Already shutting down. + ok + end. + + restart_subsystem(Address, Port) -> SysSupName = make_name(Address, Port), SubSysName = id(ssh_subsystem_sup, Address, Port), |