ssh: Mappify supervisors

1 files changed, 67 insertions, 92 deletions

diff --git a/lib/ssh/src/ssh_system_sup.erl b/lib/ssh/src/ssh_system_sup.erl
index a923b5ef71..84b4cd3241 100644
--- a/lib/ssh/src/ssh_system_sup.erl
+++ b/lib/ssh/src/ssh_system_sup.erl
@@ -21,7 +21,7 @@
 %%
 %%----------------------------------------------------------------------
 %% Purpose: The ssh server instance supervisor, an instans of this supervisor
-%%          exists for every ip-address and port combination, hangs under  
+%%          exists for every ip-address and port combination, hangs under
 %%          sshd_sup.
 %%----------------------------------------------------------------------
 
@@ -34,58 +34,100 @@
 -export([start_link/4, stop_listener/1,
 	 stop_listener/3, stop_system/1,
 	 stop_system/3, system_supervisor/3,
-	 subsystem_supervisor/1, channel_supervisor/1, 
-	 connection_supervisor/1, 
-	 acceptor_supervisor/1, start_subsystem/6, restart_subsystem/3,
-	 restart_acceptor/3, stop_subsystem/2]).
+	 subsystem_supervisor/1, channel_supervisor/1,
+	 connection_supervisor/1,
+	 acceptor_supervisor/1, start_subsystem/6,
+	 stop_subsystem/2]).
 
 %% Supervisor callback
 -export([init/1]).
 
 %%%=========================================================================
-%%% Internal  API
+%%% API
 %%%=========================================================================
 start_link(Address, Port, Profile, Options) ->
     Name = make_name(Address, Port, Profile),
     supervisor:start_link({local, Name}, ?MODULE, [Address, Port, Profile, Options]).
 
-stop_listener(SysSup) ->
-    stop_acceptor(SysSup). 
+%%%=========================================================================
+%%%  Supervisor callback
+%%%=========================================================================
+init([Address, Port, Profile, Options]) ->
+    SupFlags = #{strategy  => one_for_one,
+                 intensity =>    0,
+                 period    => 3600
+                },
+    ChildSpecs =
+        case ?GET_INTERNAL_OPT(connected_socket,Options,undefined) of
+            undefined ->
+                [#{id       => id(ssh_acceptor_sup, Address, Port, Profile),
+                   start    => {ssh_acceptor_sup, start_link, [Address, Port, Profile, Options]},
+                   restart  => transient,
+                   shutdown => infinity,
+                   type     => supervisor,
+                   modules  => [ssh_acceptor_sup]
+                  }];
+            _ ->
+                []
+        end,
+    {ok, {SupFlags,ChildSpecs}}.
+
+%%%=========================================================================
+%%% Service API
+%%%=========================================================================
+stop_listener(SystemSup) ->
+    {Name, AcceptorSup, _, _} = lookup(ssh_acceptor_sup, SystemSup),
+    case supervisor:terminate_child(AcceptorSup, Name) of
+        ok ->
+            supervisor:delete_child(AcceptorSup, Name);
+        Error ->
+            Error
+    end.
 
 stop_listener(Address, Port, Profile) ->
-    Name = make_name(Address, Port, Profile),
-    stop_acceptor(whereis(Name)). 
- 
+    stop_listener(
+      system_supervisor(Address, Port, Profile)).
+
+
 stop_system(SysSup) ->
-    Name = sshd_sup:system_name(SysSup),
-    spawn(fun() -> sshd_sup:stop_child(Name) end),
+    spawn(fun() -> sshd_sup:stop_child(SysSup) end),
     ok.
 
-stop_system(Address, Port, Profile) -> 
+stop_system(Address, Port, Profile) ->
     spawn(fun() -> sshd_sup:stop_child(Address, Port, Profile) end),
     ok.
 
+
 system_supervisor(Address, Port, Profile) ->
     Name = make_name(Address, Port, Profile),
     whereis(Name).
 
 subsystem_supervisor(SystemSup) ->
-    ssh_subsystem_sup(supervisor:which_children(SystemSup)).
+    {_, Child, _, _} = lookup(ssh_subsystem_sup, SystemSup),
+    Child.
 
 channel_supervisor(SystemSup) ->
-    SubSysSup = ssh_subsystem_sup(supervisor:which_children(SystemSup)),
-    ssh_subsystem_sup:channel_supervisor(SubSysSup).
+    ssh_subsystem_sup:channel_supervisor(
+      subsystem_supervisor(SystemSup)).
 
 connection_supervisor(SystemSup) ->
-    SubSysSup = ssh_subsystem_sup(supervisor:which_children(SystemSup)),
-    ssh_subsystem_sup:connection_supervisor(SubSysSup).
+    ssh_subsystem_sup:connection_supervisor(
+      subsystem_supervisor(SystemSup)).
 
 acceptor_supervisor(SystemSup) ->
-    ssh_acceptor_sup(supervisor:which_children(SystemSup)).
+    {_, Child, _, _} = lookup(ssh_acceptor_sup, SystemSup),
+    Child.
+
 
 start_subsystem(SystemSup, Role, Address, Port, Profile, Options) ->
-    Spec = ssh_subsystem_child_spec(Role, Address, Port, Profile, Options),
-    supervisor:start_child(SystemSup, Spec).
+    SubsystemSpec =
+        #{id       => make_ref(),
+          start    => {ssh_subsystem_sup, start_link, [Role, Address, Port, Profile, Options]},
+          restart  => temporary,
+          shutdown => infinity,
+          type     => supervisor,
+          modules  => [ssh_subsystem_sup]},
+    supervisor:start_child(SystemSup, SubsystemSpec).
 
 stop_subsystem(SystemSup, SubSys) ->
     case catch lists:keyfind(SubSys, 2, supervisor:which_children(SystemSup)) of
@@ -103,60 +145,9 @@ stop_subsystem(SystemSup, SubSys) ->
 	    ok
     end.
 
-
-restart_subsystem(Address, Port, Profile) ->
-    SysSupName = make_name(Address, Port, Profile),
-    SubSysName = id(ssh_subsystem_sup, Address, Port, Profile),
-    case supervisor:terminate_child(SysSupName, SubSysName) of
-	ok ->
-	    supervisor:restart_child(SysSupName, SubSysName);
-	Error  ->
-	    Error
-    end.
-
-restart_acceptor(Address, Port, Profile) ->
-    SysSupName = make_name(Address, Port, Profile),
-    AcceptorName = id(ssh_acceptor_sup, Address, Port, Profile),
-    supervisor:restart_child(SysSupName, AcceptorName).
-
-%%%=========================================================================
-%%%  Supervisor callback
-%%%=========================================================================
-init([Address, Port, Profile, Options]) ->
-    RestartStrategy = one_for_one,
-    MaxR = 0,
-    MaxT = 3600,
-    Children = case ?GET_INTERNAL_OPT(connected_socket,Options,undefined) of
-		   undefined -> child_specs(Address, Port, Profile, Options);
-		   _ -> []
-	       end,
-    {ok, {{RestartStrategy, MaxR, MaxT}, Children}}.
-
 %%%=========================================================================
 %%%  Internal functions
 %%%=========================================================================
-child_specs(Address, Port, Profile, Options) ->
-    [ssh_acceptor_child_spec(Address, Port, Profile, Options)]. 
-  
-ssh_acceptor_child_spec(Address, Port, Profile, Options) ->
-    Name = id(ssh_acceptor_sup, Address, Port, Profile),
-    StartFunc = {ssh_acceptor_sup, start_link, [Address, Port, Profile, Options]},
-    Restart = transient, 
-    Shutdown = infinity,
-    Modules = [ssh_acceptor_sup],
-    Type = supervisor,
-    {Name, StartFunc, Restart, Shutdown, Type, Modules}.
-
-ssh_subsystem_child_spec(Role, Address, Port, Profile, Options) ->
-    Name = make_ref(),
-    StartFunc = {ssh_subsystem_sup, start_link, [Role, Address, Port, Profile, Options]},
-    Restart = temporary,
-    Shutdown = infinity,
-    Modules = [ssh_subsystem_sup],
-    Type = supervisor,
-    {Name, StartFunc, Restart, Shutdown, Type, Modules}.
-
-
 id(Sup, Address, Port, Profile) ->
     {Sup, Address, Port, Profile}.
 
@@ -168,23 +159,7 @@ fmt_host(A)  when is_atom(A)   -> A;
 fmt_host(S)  when is_list(S)   -> S.
 
 
-ssh_subsystem_sup([{_, Child, _, [ssh_subsystem_sup]} | _]) ->
-    Child;
-ssh_subsystem_sup([_ | Rest]) ->
-    ssh_subsystem_sup(Rest).
-
-ssh_acceptor_sup([{_, Child, _, [ssh_acceptor_sup]} | _]) ->
-    Child;
-ssh_acceptor_sup([_ | Rest]) ->
-    ssh_acceptor_sup(Rest).
+lookup(SupModule, SystemSup) ->
+    lists:keyfind([SupModule], 4,
+                  supervisor:which_children(SystemSup)).
 
-stop_acceptor(Sup) ->
-    [{Name, AcceptorSup}] =
-	[{SupName, ASup} || {SupName, ASup, _, [ssh_acceptor_sup]} <- 
-			  supervisor:which_children(Sup)],
-    case supervisor:terminate_child(AcceptorSup, Name) of
-        ok ->
-            supervisor:delete_child(AcceptorSup, Name);
-        Error ->
-            Error
-    end.