From 4422cb32637a341eac2dc03172e4aa859be67f34 Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Wed, 3 Feb 2016 12:10:06 +0100
Subject: Add supervisor:get_callback_module/1

This function is used by release_handler during upgrade. This was
earlier implemented in the release_handler, but it required a copy og
the definition of the supervisor's internal state, which caused
problems when this state was updated.
---
 lib/sasl/src/release_handler_1.erl | 33 ++-------------------------------
 lib/sasl/src/sasl.app.src          |  2 +-
 2 files changed, 3 insertions(+), 32 deletions(-)

(limited to 'lib/sasl')

diff --git a/lib/sasl/src/release_handler_1.erl b/lib/sasl/src/release_handler_1.erl
index 536ac924d4..86e3bddc1c 100644
--- a/lib/sasl/src/release_handler_1.erl
+++ b/lib/sasl/src/release_handler_1.erl
@@ -655,48 +655,19 @@ maybe_get_dynamic_mods(Name, Pid) ->
             error(get_modules_failed)
     end.
 
-%% XXXX
-%% Note: The following is a terrible hack done in order to resolve the
-%% problem stated in ticket OTP-3452.
-
-%% XXXX NOTE WELL: This record is from supervisor.erl. Also the record
-%% name is really `state'. 
--record(supervisor_state, {name,
-                strategy,
-                children = [],
-                dynamics = [],
-                intensity,
-                period,
-                restarts = [],
-                module,
-                args}).
-
 %% Return the name of the call-back module that implements the
 %% (top) supervisor SupPid.
 %% Returns: {ok, Module} | {error,undefined}
 %%
 get_supervisor_module(SupPid) ->
-    case catch get_supervisor_module1(SupPid) of
-	{ok, Module} when is_atom(Module) ->
+    case catch supervisor:get_callback_module(SupPid) of
+	Module when is_atom(Module) ->
 	    {ok, Module};
 	_Other ->
 	    io:format("~w: reason: ~w~n", [SupPid, _Other]),
 	    {error, undefined}
     end.
 
-get_supervisor_module1(SupPid) ->
-    {status, _Pid, {module, _Mod}, 
-     [_PDict, _SysState, _Parent, _Dbg, Misc]} = sys:get_status(SupPid),
-    %% supervisor Misc field changed at R13B04, handle old and new variants here
-    State = case Misc of
-                [_Name, State1, _Type, _Time] ->
-                    State1;
-                [_Header, _Data, {data, [{"State", State2}]}] ->
-                    State2
-            end,
-    %% Cannot use #supervisor_state{module = Module} = State.
-    {ok, element(#supervisor_state.module, State)}.
-
 %%-----------------------------------------------------------------
 %% Func: do_soft_purge/3
 %% Args: Mod = atom()
diff --git a/lib/sasl/src/sasl.app.src b/lib/sasl/src/sasl.app.src
index 705bb73fc5..507e2dc229 100644
--- a/lib/sasl/src/sasl.app.src
+++ b/lib/sasl/src/sasl.app.src
@@ -46,6 +46,6 @@
     {env, [{sasl_error_logger, tty},
            {errlog_type, all}]},
     {mod, {sasl, []}},
-    {runtime_dependencies, ["tools-2.6.14","stdlib-2.6","kernel-4.1",
+    {runtime_dependencies, ["tools-2.6.14","stdlib-2.8","kernel-4.1",
 			    "erts-6.0"]}]}.
 
-- 
cgit v1.2.3


From 264a5e804d6e23bf6c6916887669760cbf243caa Mon Sep 17 00:00:00 2001
From: Rory Byrne <rory@nybek.com>
Date: Thu, 28 May 2015 19:41:25 +0100
Subject: Speed up supervisor:count_children/1; simple_one_for_one

Speed up supervisor:count_children/1 for simple_one_for_one
supervisors. This is achieved by avoiding looping through all the
child process and verifying that each one is alive.

For a supervisor with 100,000 'temporary' children the count-time will
drop from approx 25ms to about 0.005ms.

For a supervisor with 100,000 'permanent' or 'transient' children the
count-time will drop from approx 30ms to about 0.005ms.

This avoids having the supervisor block for an extended period while
the count takes place. Under normal circumstances the accuracy of the
result should also improve since the duration is too short for many
processes to die during the count.
---
 lib/sasl/test/release_handler_SUITE.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/sasl')

diff --git a/lib/sasl/test/release_handler_SUITE.erl b/lib/sasl/test/release_handler_SUITE.erl
index d57de2593a..ee620dcdb4 100644
--- a/lib/sasl/test/release_handler_SUITE.erl
+++ b/lib/sasl/test/release_handler_SUITE.erl
@@ -1363,7 +1363,7 @@ upgrade_supervisor(Conf) when is_list(Conf) ->
     %% Check that the restart strategy and child spec is updated
     {status, _, {module, _}, [_, _, _, _, [_,_,{data,[{"State",State}]}]]} =
 	rpc:call(Node,sys,get_status,[a_sup]),
-    {state,_,RestartStrategy,[Child],_,_,_,_,_,_} = State,
+    {state,_,RestartStrategy,[Child],_,_,_,_,_,_,_} = State,
     one_for_all = RestartStrategy, % changed from one_for_one
     {child,_,_,_,_,brutal_kill,_,_} = Child, % changed from timeout 2000
 
-- 
cgit v1.2.3