Merge branch 'siri/remove-overload/OTP-13184'

* siri/remove-overload/OTP-13184:
  Remove module 'overload' from SASL

13 files changed, 5 insertions, 583 deletions

diff --git a/lib/sasl/doc/src/Makefile b/lib/sasl/doc/src/Makefile
index 1ee48af338..a66b1f8bcb 100644
--- a/lib/sasl/doc/src/Makefile
+++ b/lib/sasl/doc/src/Makefile
@@ -36,7 +36,6 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
 # ----------------------------------------------------
 XML_APPLICATION_FILES = ref_man.xml
 XML_REF3_FILES = alarm_handler.xml \
-	overload.xml \
 	rb.xml \
 	release_handler.xml \
 	systools.xml
diff --git a/lib/sasl/doc/src/overload.xml b/lib/sasl/doc/src/overload.xml
deleted file mode 100644
index 2f19cd9088..0000000000
--- a/lib/sasl/doc/src/overload.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1996</year><year>2013</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>overload</title>
-    <prepared>Peter H&ouml;gfeldt</prepared>
-    <responsible>Peter H&ouml;gfeldt</responsible>
-    <docno></docno>
-    <approved>(Joe Armstrong)</approved>
-    <checked></checked>
-    <date>1996-10-29</date>
-    <rev>A</rev>
-    <file>overload.sgml</file>
-  </header>
-  <module>overload</module>
-  <modulesummary>An Overload Regulation Process</modulesummary>
-  <description>
-    <warning>
-      <p>
-	All functions in this module are deprecated and will be
-	removed in a future release.
-      </p>
-    </warning>
-    <p><c>overload</c> is a process that indirectly regulates the CPU
-      usage in the system. The idea is that a main application calls
-      function 
-      <seealso marker="#request/0"><c>request/0</c></seealso> 
-      before starting a major job and
-      proceeds with the job if the return value is positive; otherwise
-      the job must not be started.</p>
-    <p><c>overload</c> is part of the <c>SASL</c> application and all
-      configuration parameters are defined there.</p>
-    <p>A set of two intensities are maintained, the <c>total intensity</c>
-      and the <c>accept intensity</c>. For that purpose,
-      there are two configuration parameters, <c>MaxIntensity</c>
-      and <c>Weight</c>; both are measured in 1/second.</p>
-    <p>Then total and accept intensities are calculated as
-      follows. Assume that the time of the current call to
-      <c>request/0</c> is <c>T(n)</c> and that the time of the
-      previous call was <c>T(n-1)</c>.</p>
-    <list type="bulleted">
-      <item>
-        <p>The current <c>total intensity</c>, denoted
-          <c>TI(n)</c>, is calculated according to the formula</p>
-        <p><c>TI(n) = exp(-Weight*(T(n) - T(n-1)) * TI(n-1) +  Weight</c>,</p>
-        <p>where <c>TI(n-1)</c> is the previous <c>total intensity</c>.</p>
-      </item>
-      <item>
-        <p>The current <c>accept intensity</c>, denoted
-          <c>AI(n)</c>, is determined by the formula</p>
-        <p><c>AI(n) = exp(-Weight*(T(n) - T(n-1)) * AI(n-1) + Weight</c>,</p>
-        <p>where <c>AI(n-1)</c> is the previous <c>accept intensity</c>,
-          if the value of <c>exp(-Weight*(T(n) - T(n-1)) * AI(n-1)</c>
-          is less than <c>MaxIntensity</c>. Otherwise the value is</p>
-        <p><c>AI(n) = exp(-Weight*(T(n) - T(n-1)) * AI(n-1)</c></p>
-      </item>
-    </list>
-    <p>The value of configuration parameter <c>Weight</c> controls the
-      speed with which the calculations of intensities react to
-      changes in the underlying input intensity. The inverted value of
-      <c>Weight</c>, <c>T = 1/Weight</c>, can be thought of as the
-      "time constant" of the intensity calculation formulas. For example,
-      if <c>Weight = 0.1</c>, a change in the underlying input intensity is
-      reflected in <c>total intensity</c> and <c>accept intensity</c> within
-      about 10 seconds.</p>
-    <p>The overload process defines one alarm, which it sets using
-      <c>alarm_handler:set_alarm(Alarm)</c>. <c>Alarm</c> is defined
-      as follows:</p>
-    <taglist>
-      <tag><c>{overload, []}</c></tag>
-      <item>
-        <p>This alarm is set when the current <c>accept intensity</c> exceeds
-          <c>MaxIntensity</c>.</p>
-      </item>
-    </taglist>
-    <p>A new request is not accepted until the current <c>accept
-      intensity</c> has fallen below <c>MaxIntensity</c>. To prevent the
-      overload process from generating many set/reset alarms, the
-      alarm is not reset until the current <c>accept intensity</c> has fallen
-      below 75% of <c>MaxIntensity</c>; it is not until then that
-      the alarm can be set again.</p>
-  </description>
-
-  <funcs>
-    <func>
-      <name>request() -> accept | reject</name>
-      <fsummary>Requests to proceed with current job.</fsummary>
-      <desc>
-        <p>Returns <c>accept</c> or <c>reject</c> depending on the
-          current value of the <c>accept intensity</c>.</p>
-        <p>The application
-          calling this function is to proceed with the job in
-          question if the return value is <c>accept</c>; otherwise it
-          is not to continue with that job.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name>get_overload_info() -> OverloadInfo</name>
-      <fsummary>Returns current overload information data.</fsummary>
-      <type>
-        <v>OverloadInfo = [{total_intensity, TotalIntensity},
-          {accept_intensity, AcceptIntensity}, {max_intensity,
-          MaxIntensity}, {weight, Weight}, {total_requests,
-          TotalRequests}, {accepted_requests, AcceptedRequests}].</v>
-        <v>TotalIntensity = float() > 0</v>
-        <v>AcceptIntensity = float() > 0</v>
-        <v>MaxIntensity = float() > 0</v>
-        <v>Weight = float() > 0</v>
-        <v>TotalRequests = integer()</v>
-        <v>AcceptedRequests = integer()</v>
-      </type>
-      <desc>
-        <p>Returns:</p>
-        <list type="bulleted">
-          <item>Current total and accept intensities</item>
-          <item>Configuration parameters</item>
-          <item>Absolute counts of the total number of requests</item>
-          <item>Accepted number of requests (since the overload
-            process was started)</item>
-        </list>
-      </desc>
-    </func>
-  </funcs>
-
-  <section>
-    <title>See Also</title>
-    <p><seealso marker="alarm_handler"><c>alarm_handler(3)</c></seealso>,
-      <seealso marker="sasl_app"><c>sasl(6)</c></seealso></p>
-  </section>
-</erlref>
-
diff --git a/lib/sasl/doc/src/ref_man.xml b/lib/sasl/doc/src/ref_man.xml
index a80e5a2a00..74cd92a9b0 100644
--- a/lib/sasl/doc/src/ref_man.xml
+++ b/lib/sasl/doc/src/ref_man.xml
@@ -35,7 +35,6 @@
   </description>
   <xi:include href="sasl_app.xml"/>
   <xi:include href="alarm_handler.xml"/>
-  <xi:include href="overload.xml"/>
   <xi:include href="rb.xml"/>
   <xi:include href="release_handler.xml"/>
   <xi:include href="systools.xml"/>
diff --git a/lib/sasl/doc/src/sasl_app.xml b/lib/sasl/doc/src/sasl_app.xml
index bcd446a868..044c016302 100644
--- a/lib/sasl/doc/src/sasl_app.xml
+++ b/lib/sasl/doc/src/sasl_app.xml
@@ -34,7 +34,6 @@
     <p>The <c>SASL</c> application provides the following services:</p>
     <list type="bulleted">
       <item><c>alarm_handler</c></item>
-      <item><c>overload</c> (deprecated)</item>
       <item><c>rb</c></item>
       <item><c>release_handler</c></item>
       <item><c>systools</c></item>
@@ -140,21 +139,6 @@
           this parameter is undefined, the <c>log_mf_h</c> handler is
           not installed.</p>
       </item>
-      <tag><c><![CDATA[overload_max_intensity = float() > 0 ]]></c></tag>
-      <item>
-        <p>Specifies the maximum intensity
-          for <seealso marker="overload"><c>overload</c></seealso>. Default
-          is <c>0.8</c>.</p>
-	<p>Note that the <c>overload</c> module is deprected and
-	  will be removed in a future release.</p>
-      </item>
-      <tag><c><![CDATA[overload_weight = float() > 0 ]]></c></tag>
-      <item>
-        <p>Specifies the <seealso marker="overload"><c>overload</c></seealso>
-        weight. Default is <c>0.1</c>.</p>
-	<p>Note that the <c>overload</c> module is deprected and
-	  will be removed in a future release.</p>
-      </item>
       <tag><c><![CDATA[start_prg = string() ]]></c></tag>
       <item>
         <p>Specifies the program to be used when restarting the system
@@ -205,7 +189,6 @@
     <p><seealso marker="alarm_handler"><c>alarm_handler(3)</c></seealso>,
       <seealso marker="kernel:error_logger"><c>error_logger(3)</c></seealso>,
       <seealso marker="stdlib:log_mf_h"><c>log_mf_h(3)</c></seealso>,
-      <seealso marker="overload"><c>overload(3)</c></seealso>,
       <seealso marker="rb"><c>rb(3)</c></seealso>,
       <seealso marker="release_handler"><c>release_handler(3)</c></seealso>,
       <seealso marker="systools"><c>systools(3)</c></seealso></p>
diff --git a/lib/sasl/doc/src/sasl_intro.xml b/lib/sasl/doc/src/sasl_intro.xml
index bbc9457103..237580977c 100644
--- a/lib/sasl/doc/src/sasl_intro.xml
+++ b/lib/sasl/doc/src/sasl_intro.xml
@@ -36,7 +36,6 @@
     <list type="bulleted">
       <item>Error logging</item>
       <item>Alarm handling</item>
-      <item>Overload regulation</item>
       <item>Release handling</item>
       <item>Report browsing</item>
     </list>
diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile
index 7ff6a03a50..92d4818f2e 100644
--- a/lib/sasl/src/Makefile
+++ b/lib/sasl/src/Makefile
@@ -36,7 +36,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/sasl-$(VSN)
 # ----------------------------------------------------
 MODULES= alarm_handler sasl sasl_report \
 	sasl_report_file_h sasl_report_tty_h format_lib_supp \
-	misc_supp overload rb rb_format_supp release_handler \
+	misc_supp rb rb_format_supp release_handler \
 	release_handler_1 si si_sasl_supp systools \
 	systools_make systools_rc systools_relup systools_lib \
 	erlsrv
diff --git a/lib/sasl/src/misc_supp.erl b/lib/sasl/src/misc_supp.erl
index 42de7eedec..39656f6e65 100644
--- a/lib/sasl/src/misc_supp.erl
+++ b/lib/sasl/src/misc_supp.erl
@@ -27,7 +27,7 @@
 %%% 2) Very generic functions such as, multi_map, is_string...
 %%%
 %%% This module is a part of the BOS.  (format_pdict is called from
-%%% init, memsup, disksup, overload (but not the fileserver since it
+%%% init, memsup, disksup (but not the fileserver since it
 %%% formats its pdict its own way).)
 %%%---------------------------------------------------------------------
 
diff --git a/lib/sasl/src/overload.erl b/lib/sasl/src/overload.erl
deleted file mode 100644
index bc8ab7d5e4..0000000000
--- a/lib/sasl/src/overload.erl
+++ /dev/null
@@ -1,233 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1996-2013. 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.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
--module(overload). 
-
--deprecated(module).
-
--export([start_link/0, request/0, set_config_data/2,
-	 get_overload_info/0]).
-
--export([init/1, handle_call/3, handle_info/2, terminate/2,
-	 format_status/2]).
-
-%%%-----------------------------------------------------------------
-%%% This is a rewrite of overload from BS.3, by Peter Högfeldt.
-%%%
-%%% DESCRIPTION
-%%%
-%%% This module implements a server process that keeps record of the
-%%% intensity of calls of the request/0 function, and answers accept or
-%%% reject depending on if the current average intensity is not greater 
-%%% than a specified maximum intensity.
-%%%
-%%% The intensity i is calculated according to the formula:
-%%%    i(n) = exp(-K*(T(n) - T(n-1)))*i(n-1) + Kappa
-%%% where i(n) is the intensity at event n, Kappa is a constant, and
-%%% T(n) is the time at event n.
-%%%
-%%% The constant Kappa can be thought of as 1 / T, where T is the time 
-%%% constant. Kappa is externally referred to as Weight.
-%%%  
-%%% We keep track of two intensities: the total call intensity and the 
-%%% intensity of accepted calls.
-%%%-----------------------------------------------------------------
-%%% TODO
-%%%
-%%% 3. Hysteresis.
-%%%
-%%%-----------------------------------------------------------------
-
--record(state, {total = 0, accept = 0, max, prev_t = get_now(),
-		kappa, call_counts = {0, 0}, alarm = clear}).
-
--define(clear_timeout, 30000).
-  
-start_link() ->
-    gen_server:start_link({local, overload}, overload, [], []).
-
-init([]) ->
-    process_flag(priority, high),
-    MaxIntensity = fetch_config_data(overload_max_intensity),
-    Kappa = fetch_config_data(overload_weight),
-    {ok, #state{max = MaxIntensity, kappa = Kappa}}.
-  
-%%-----------------------------------------------------------------
-%% Func: request/0
-%% Purpose: This is a request to proceed, e.g. a request to
-%%          establish a call.
-%% Returns: accept | reject
-%%-----------------------------------------------------------------
-request() -> call(request).
-  
-%%-----------------------------------------------------------------
-%% Func: set_config_data/2
-%% Purpose: Set configuration data, and reset intensities.
-%% Arguments: MaxIntensity (real > 0), Weight (real > 0).
-%% Returns: ok | {error, What}
-%% This function is for debugging purposes and is therefore not
-%% documented at all.
-%%-----------------------------------------------------------------
-set_config_data(MaxIntensity, Weight) ->
-    call({set_config_data, MaxIntensity, Weight}).
-%%-----------------------------------------------------------------
-%% Func: get_overload_info/0
-%% Returns: A list of tagged items: TotalIntensity, AcceptIntensity,
-%%          MaxIntensity, Weight, TotalRequests, AcceptedRequests.
-%%-----------------------------------------------------------------
-get_overload_info() -> call(get_overload_info).
-
-%%-----------------------------------------------------------------
-%% call(Request) -> Term
-%%-----------------------------------------------------------------
-call(Req) ->
-    gen_server:call(overload, Req, infinity).
-
-%%%-----------------------------------------------------------------
-%%% Callback functions from gen_server
-%%%-----------------------------------------------------------------
-handle_call(request, _From, State) ->
-    #state{total = TI, accept = AI, kappa = Kappa, prev_t = PrevT,
-	  alarm = Alarm} = State,
-    {TR, AR} = State#state.call_counts,
-    T = get_now(),
-    CurI = new_intensity(AI, T, PrevT, Kappa),
-    NewTI  = new_intensity(TI, T, PrevT, Kappa) + Kappa,
-    if 
-	CurI =< State#state.max ->
-	    %% Hysteresis: If alarm is set, and current intensity has
-	    %% fallen below 75% of max intensity, clear alarm.
-	    NewAlarm = if
-			   CurI =< 0.75*State#state.max ->
-			       clear_alarm(Alarm);
-			   true ->
-			       Alarm
-		       end,
-	    {reply, accept, State#state{call_counts = {TR+1, AR+1}, 
-					prev_t = T, total = NewTI, 
-					accept = CurI + Kappa, 
-				        alarm = NewAlarm},
-	     ?clear_timeout};
-        true ->
-	    %% Set alarm if not already set.
-	    NewAlarm = set_alarm(Alarm),
-	    {reply, reject,
-	     State#state{call_counts = {TR+1, AR}, prev_t = T,
-			 total = NewTI, accept = CurI,
-				       alarm = NewAlarm},
-	    ?clear_timeout}
-    end;
-handle_call({set_config_data, MaxIntensity, Weight}, _From, _State) ->
-    {reply, ok, #state{max = MaxIntensity, kappa = Weight},
-     ?clear_timeout};
-handle_call(get_overload_info, _From, State) ->
-    #state{max = MI, total = TI, accept = AI, kappa = Kappa,
-	   prev_t = PrevT, call_counts = {TR, AR}} = State,
-    T = get_now(),
-    CurI = new_intensity(AI, T, PrevT, Kappa),
-    NewTI  = new_intensity(TI, T, PrevT, Kappa),
-    Reply = [{total_intensity, NewTI}, {accept_intensity, CurI}, 
-	     {max_intensity, MI}, {weight, Kappa},
-	     {total_requests, TR}, {accepted_requests, AR}],
-    {reply, Reply, State#state{total = NewTI, accept = CurI},
-     ?clear_timeout}.
-
-handle_info(timeout, State) ->
-    #state{total = TI, accept = AI, kappa = Kappa, prev_t = PrevT,
-	  alarm = Alarm} = State,
-    T = get_now(),
-    CurI = new_intensity(AI, T, PrevT, Kappa),
-    NewTI  = new_intensity(TI, T, PrevT, Kappa),
-    if 
-	CurI < 0.75* State#state.max ->
-	    NewAlarm = clear_alarm(Alarm),
-	    {noreply, State#state{total = NewTI, accept = CurI, 
-				  alarm = NewAlarm}};
-	    
-	true ->
-	    {noreply, State#state{total = NewTI, accept = CurI},
-	     ?clear_timeout}
-    end;
-
-handle_info(_, State) ->
-    {noreply, State, ?clear_timeout}.
-
-terminate(_Reason, _State) ->
-    ok.
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
-fetch_config_data(Tag) ->
-    case application:get_env(sasl, Tag) of
-	{ok, Value} -> Value;
-	_ -> fetch_default_data(Tag)
-    end.
-  
-fetch_default_data(overload_max_intensity) -> 0.8;
-fetch_default_data(overload_weight) -> 0.1.
-
-set_alarm(clear) ->
-    alarm_handler:set_alarm({overload, []}),
-    set;
-set_alarm(Alarm) ->
-    Alarm.
-
-clear_alarm(set) ->
-    alarm_handler:clear_alarm(overload),
-    clear;
-clear_alarm(Alarm) ->
-    Alarm.
-
-%%-----------------------------------------------------------------
-%% The catch protects against floating-point exception.
-%%
-new_intensity(I, T, PrevT, K) ->
-    Diff = sub(T, PrevT)/1000,
-    case catch (I*math:exp(-K*Diff)) of
-	{'EXIT', _} ->				% Assume zero.
-	    0.0;
-	Res ->
-	    Res
-    end.
-
-%% Mask equal to 2^27 - 1, used below.
--define(mask27, 16#7ffffff).
-
-%% Returns number of milliseconds in the range [0, 2^27 - 1]. Must have
-%% this since statistics(wall_clock) wraps. Having 2^27 -1 as the max
-%% assures that we always get non-negative integers. 2^27 milliseconds 
-%% are approx. 37.28 hours.
-get_now() -> 
-    element(1, statistics(wall_clock)) band ?mask27.
-
-%% Returns (X - Y) mod 2^27 (which is in the range [0, 2^27 - 1]).
-sub(X, Y) ->
-    (X + (bnot Y) + 1) band ?mask27.
-
-format_status(Opt, [PDict, #state{max = MI, total = TI, accept = AI,
-				  kappa = K,
-				  call_counts = {TR, AR}}]) ->
-    [{data, [{"Total Intensity", TI},
-	     {"Accept Intensity", AI}, 
-	     {"Max Intensity", MI},
-	     {"Weight", K},
-	     {"Total requests", TR},
-	     {"Accepted requests", AR}]} |
-     misc_supp:format_pdict(Opt, PDict, [])].     
diff --git a/lib/sasl/src/sasl.app.src b/lib/sasl/src/sasl.app.src
index 507e2dc229..16e8e44ba2 100644
--- a/lib/sasl/src/sasl.app.src
+++ b/lib/sasl/src/sasl.app.src
@@ -24,7 +24,6 @@
 	       alarm_handler, 
                format_lib_supp, 
                misc_supp, 
-               overload, 
                rb, 
                rb_format_supp, 
 	       release_handler, 
@@ -41,7 +40,7 @@
 	       systools_relup, 
 	       systools_lib
 	      ]},
-    {registered, [sasl_sup, alarm_handler, overload, release_handler]},
+    {registered, [sasl_sup, alarm_handler, release_handler]},
     {applications, [kernel, stdlib]},
     {env, [{sasl_error_logger, tty},
            {errlog_type, all}]},
diff --git a/lib/sasl/src/sasl.erl b/lib/sasl/src/sasl.erl
index fc49fc2465..0fb85682c6 100644
--- a/lib/sasl/src/sasl.erl
+++ b/lib/sasl/src/sasl.erl
@@ -170,7 +170,4 @@ init(safe) ->
     AlarmH = {alarm_handler,
 	      {alarm_handler, start_link, []},
 	      permanent, 2000, worker, dynamic},	      
-    Overload = {overload,
-		{overload, start_link, []},
-		permanent, 2000, worker, [overload]},	      
-    {ok, {SupFlags, [AlarmH, Overload]}}.
+    {ok, {SupFlags, [AlarmH]}}.
diff --git a/lib/sasl/test/Makefile b/lib/sasl/test/Makefile
index 6f67498714..2e9e107efd 100644
--- a/lib/sasl/test/Makefile
+++ b/lib/sasl/test/Makefile
@@ -33,7 +33,6 @@ MODULES= \
 	sasl_report_suite_supervisor \
 	systools_SUITE \
 	systools_rc_SUITE \
-	overload_SUITE \
 	rb_SUITE \
 	rh_test_lib \
 
diff --git a/lib/sasl/test/overload_SUITE.erl b/lib/sasl/test/overload_SUITE.erl
deleted file mode 100644
index 02d1056698..0000000000
--- a/lib/sasl/test/overload_SUITE.erl
+++ /dev/null
@@ -1,168 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2011. 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.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-
--module(overload_SUITE).
--include_lib("common_test/include/ct.hrl").
-
--compile(export_all).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-all() -> [info, set_config_data, set_env_vars, request, timeout].
-
-init_per_testcase(_Case,Config) ->
-    restart_sasl(),
-    Config.
-
-end_per_testcase(Case,Config) ->
-    try apply(?MODULE,Case,[cleanup,Config])
-    catch error:undef -> ok
-    end,
-    ok.
-
-%%%-----------------------------------------------------------------
-info(_Config) ->
-    Info = overload:get_overload_info(),
-    [{total_intensity,0.0},
-     {accept_intensity,0.0},
-     {max_intensity,0.8},
-     {weight,0.1},
-     {total_requests,0},
-     {accepted_requests,0}] = Info.
-
-%%%-----------------------------------------------------------------
-set_config_data(_Config) ->
-    InfoDefault = overload:get_overload_info(),
-    ok = check_info(0.8,0.1,InfoDefault),
-    ok = overload:set_config_data(0.5,0.4),
-    Info1 = overload:get_overload_info(),
-    ok = check_info(0.5,0.4,Info1),
-    ok.
-
-%%%-----------------------------------------------------------------
-set_env_vars(_Config) ->
-    InfoDefault = overload:get_overload_info(),
-    ok = check_info(0.8,0.1,InfoDefault),
-    ok = application:set_env(sasl,overload_max_intensity,0.5),
-    ok = application:set_env(sasl,overload_weight,0.4),
-    ok = application:stop(sasl),
-    ok = application:start(sasl),
-    Info1 = overload:get_overload_info(),
-    ok = check_info(0.5,0.4,Info1),
-    ok.
-set_env_vars(cleanup,_Config) ->
-    application:unset_env(sasl,overload_max_intensity),
-    application:unset_env(sasl,overload_weight),
-    ok.
-
-%%%-----------------------------------------------------------------
-request(_Config) ->
-    %% Find number of request that can be done with default settings
-    %% and no delay
-    overload:set_config_data(0.8, 0.1),
-    NDefault = do_many_requests(0),
-    restart_sasl(),
-    ?t:format("NDefault: ~p",[NDefault]),
-
-    %% Check that the number of requests increases when max_intensity
-    %% increases
-    overload:set_config_data(2, 0.1),
-    NLargeMI = do_many_requests(0),
-    restart_sasl(),
-    ?t:format("NLargeMI: ~p",[NLargeMI]),
-    true = NLargeMI > NDefault,
-
-    %% Check that the number of requests decreases when weight
-    %% increases
-    overload:set_config_data(0.8, 1),
-    NLargeWeight = do_many_requests(0),
-    restart_sasl(),
-    ?t:format("NLargeWeight: ~p",[NLargeWeight]),
-    true = NLargeWeight < NDefault,
-
-    %% Check that number of requests increases when delay between
-    %% requests increases.
-    %% (Keeping same config and comparing to large weight in order to
-    %% minimize the time needed for this case.)
-    overload:set_config_data(0.8, 1),
-    NLargeTime = do_many_requests(500),
-    restart_sasl(),
-    ?t:format("NLargeTime: ~p",[NLargeTime]),
-    true = NLargeTime > NLargeWeight,
-    ok.
-
-%%%-----------------------------------------------------------------
-timeout(_Config) ->
-    overload:set_config_data(0.8, 1),
-    _N = do_many_requests(0),
-
-    %% Check that the overload alarm is raised
-    [{overload,_}] = alarm_handler:get_alarms(),
-
-    %% Fake a clear timeout in overload.erl and check that, since it
-    %% came very soon after the overload situation, the alarm is not
-    %% cleared
-    overload ! timeout,
-    timer:sleep(1000),
-    [{overload,_}] = alarm_handler:get_alarms(),
-
-    %% A bit later, try again and check that this time the alarm is
-    %% cleared
-    overload ! timeout,
-    timer:sleep(1000),
-    [] = alarm_handler:get_alarms(),
-
-    ok.
-
-
-%%%-----------------------------------------------------------------
-%%% INTERNAL FUNCTIONS
-
-%%%-----------------------------------------------------------------
-%%% Call overload:request/0 up to 30 times with the given time delay
-%%% between. Stop when 'reject' is returned.
-do_many_requests(T) ->
-    30 - do_requests(30,T).
-
-do_requests(0,_) ->
-    ?t:fail(never_rejected);
-do_requests(N,T) ->
-    case overload:request() of
-	accept ->
-	    timer:sleep(T),
-	    do_requests(N-1,T);
-	reject ->
-	    N
-    end.
-
-%%%-----------------------------------------------------------------
-%%% Restart the sasl application
-restart_sasl() ->
-    application:stop(sasl),
-    application:start(sasl),
-    ok.
-
-%%%-----------------------------------------------------------------
-%%% Check that max_intensity and weight is set as expected
-check_info(MI,W,Info) -> 
-    case {lists:keyfind(max_intensity,1,Info), lists:keyfind(weight,1,Info)} of
-	{{_,MI},{_,W}} -> ok;
-	_ -> ?t:fail({unexpected_info,MI,W,Info})
-    end.
diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl
index 0dc2626ae8..6f546da7b8 100644
--- a/lib/stdlib/src/otp_internal.erl
+++ b/lib/stdlib/src/otp_internal.erl
@@ -650,7 +650,7 @@ obsolete_1(code, rehash, 0) ->
     {deprecated, "deprecated because the code path cache feature has been removed"};
 
 obsolete_1(overload, _, _) ->
-    {deprecated, "deprecated; will be removed in OTP 19"};
+    {removed, "removed in OTP 19"};
 
 obsolete_1(_, _, _) ->
     no.