Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make application:stop/1 callback optional #7990

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make application:stop/1 callback optional #7990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6627b36
Make application:stop/1 callback optional
josevalim Jan 1, 2024
b1e516b
Update primary bootstrap
garazdawi Jan 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified bootstrap/lib/kernel/ebin/application.beam
View file
Open in desktop
Binary file not shown.
Binary file modified bootstrap/lib/kernel/ebin/group.beam
View file
Open in desktop
Binary file not shown.
Binary file modified bootstrap/lib/stdlib/ebin/c.beam
View file
Open in desktop
Binary file not shown.
Binary file modified bootstrap/lib/stdlib/ebin/erl_stdlib_errors.beam
View file
Open in desktop
Binary file not shown.
Binary file modified bootstrap/lib/stdlib/ebin/ets.beam
View file
Open in desktop
Binary file not shown.
9 changes: 1 addition & 8 deletions lib/asn1/src/asn1_app.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,10 @@

-behaviour(application).

-export([start/2, stop/1]).
-export([start/2]).

%% start/2(Type, StartArgs) -> {ok, Pid} | {ok, Pid, State} |
%% {error, Reason}
%%
start(_Type, _StartArgs) ->
{ok, self()}.

%% stop(State)
%%
stop(_State) ->
ok.


5 changes: 1 addition & 4 deletions lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_sup.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
-behaviour(application).
-behaviour(supervisor).

-export([start/0, start/2, init/1, stop/1, start_event/0, kill/0]).
-export([start/0, start/2, init/1, start_event/0, kill/0]).

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% application and suprvisor callback functions
Expand All @@ -43,9 +43,6 @@ start() ->
SupName = {local,?MODULE},
supervisor:start_link(SupName, ?MODULE, []).

stop(_StartArgs) ->
ok.

init([]) -> % Supervisor
init();
init([[]]) -> % Application
Expand Down
7 changes: 1 addition & 6 deletions lib/diameter/src/base/diameter_app.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
-behaviour(application).

%% application callbacks
-export([start/2, stop/1]).
-export([start/2]).

-include_lib("diameter/include/diameter.hrl").

Expand Down Expand Up @@ -109,8 +109,3 @@

start(_Type, _Args) ->
diameter_sup:start_link().

%% stop/1

stop(_) ->
ok.
6 changes: 1 addition & 5 deletions lib/ftp/src/ftp_app.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
-behaviour(application).

%% Application callbacks
-export([start/2, stop/1]).
-export([start/2]).

%%====================================================================
%% API
Expand All @@ -38,10 +38,6 @@
start(_StartType, _StartArgs) ->
ftp_sup:start_link().

%%--------------------------------------------------------------------
stop(_State) ->
ok.

%%====================================================================
%% Internal functions
%%====================================================================
5 changes: 1 addition & 4 deletions lib/inets/src/inets_app/inets_app.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@

-behaviour(application).

-export([start/2, stop/1]).
-export([start/2]).

start(_Type, _State) ->
inets_sup:start_link().

stop(_State) ->
ok.
5 changes: 4 additions & 1 deletion lib/kernel/doc/src/application.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,6 +610,7 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
included applications, for which the start phase is defined.</p>
<p>For a description of <c>StartType</c>, see
<seemfa marker="#Module:start/2"><c>Module:start/2</c></seemfa>.</p>
<p>This callback is optional.</p>
</desc>
</func>
<func>
Expand All @@ -626,7 +627,7 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
<c>Module:start/2</c>, or <c>[]</c> if no state was returned.
<c>NewState</c> is any term and is passed to
<c>Module:stop/1</c>.</p>
<p>The function is optional. If it is not defined, the processes
<p>This callback is optional. If it is not defined, the processes
are terminated and then <c>Module:stop(State)</c> is called.</p>
</desc>
</func>
Expand All @@ -644,6 +645,7 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
<p><c>State</c> is the return value of <c>Module:prep_stop/1</c>,
if such a function exists. Otherwise <c>State</c> is taken from
the return value of <c>Module:start/2</c>.</p>
<p>This callback is optional.</p>
</desc>
</func>
<func>
Expand All @@ -664,6 +666,7 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
<p><c>New</c> is a list of parameter-value tuples including all
added configuration parameters.</p>
<p><c>Removed</c> is a list of all removed parameters.</p>
<p>This callback is optional.</p>
</desc>
</func>
</funcs>
Expand Down
2 changes: 1 addition & 1 deletion lib/kernel/src/application.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
PhaseArgs :: term(),
Reason :: term().

-optional_callbacks([config_change/3, prep_stop/1, start_phase/3]).
-optional_callbacks([config_change/3, prep_stop/1, start_phase/3, stop/1]).

%%%-----------------------------------------------------------------
%%% This module is API towards application_controller and
Expand Down
4 changes: 0 additions & 4 deletions lib/kernel/test/application_SUITE_data/deadlock/deadlock.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
start(_StartType, _StartArgs) ->
supervisor:start_link({local, ?SUP}, ?MODULE, [sup]).

stop(_State) ->
ok.



%%%-----------------------------------------------------------------
%%% supervisor callbacks
Expand Down
5 changes: 1 addition & 4 deletions lib/megaco/src/engine/megaco_sup.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
-behaviour(supervisor).

%% public
-export([start/0, start/2, stop/1]).
-export([start/0, start/2]).
-export([start_sup_child/1, stop_sup_child/1]).

%% internal
Expand Down Expand Up @@ -64,9 +64,6 @@ start() ->
SupName = {local,?MODULE},
supervisor:start_link(SupName, ?MODULE, []).

stop(_StartArgs) ->
ok.

init([]) -> % Supervisor
init();
init([[]]) -> % Application
Expand Down
5 changes: 1 addition & 4 deletions lib/mnesia/src/mnesia_app.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

-behaviour(application).

-export([start/2, stop/1]).
-export([start/2]).

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% application callback functions
Expand All @@ -36,6 +36,3 @@ start(normal, Args) ->
end;
start(_, _) ->
{error, badarg}.

stop(_StartArgs) ->
ok.
4 changes: 1 addition & 3 deletions lib/runtime_tools/src/runtime_tools.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
-module(runtime_tools).
-behaviour(application).

-export([start/2,stop/1]).
-export([start/2]).


%% -----------------------------------------------------------------------------
Expand All @@ -39,8 +39,6 @@ start(_,AutoModArgs) ->
Error
end.

stop(_) ->
ok.
%% -----------------------------------------------------------------------------


Expand Down
5 changes: 1 addition & 4 deletions lib/ssh/src/ssh_app.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
-behaviour(supervisor).

%% 'application' export:
-export([start/2, stop/1]).
-export([start/2]).

%% 'supervisor' export:
-export([init/1]).
Expand All @@ -53,9 +53,6 @@
start(_Type, _State) ->
supervisor:start_link({local,ssh_sup}, ?MODULE, [ssh_sup]).

stop(_State) ->
ok.

%%%=========================================================================
%%% Supervisor callback
%%%=========================================================================
Expand Down
17 changes: 6 additions & 11 deletions lib/stdlib/test/erl_lint_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3334,8 +3334,7 @@ behaviour_basic(Config) when is_list(Config) ->
<<"-behaviour(application).
">>,
[],
{warnings,[{{1,22},erl_lint,{undefined_behaviour_func,{start,2},application}},
{{1,22},erl_lint,{undefined_behaviour_func,{stop,1},application}}]}},
{warnings,[{{1,22},erl_lint,{undefined_behaviour_func,{start,2},application}}]}},

{behaviour2,
<<"-behaviour(application).
Expand All @@ -3347,20 +3346,19 @@ behaviour_basic(Config) when is_list(Config) ->

{behaviour3,
<<"-behavior(application). %% Test American spelling.
-export([start/2,stop/1]).
-export([start/2]).
start(_, _) -> ok.
stop(_) -> ok.
">>,
[],
[]},

{behaviour4,
<<"-behavior(application). %% Test callbacks with export_all
-compile([export_all, nowarn_export_all]).
stop(_) -> ok.
start(_, _) -> ok.
">>,
[],
{warnings,[{{1,22},erl_lint,{undefined_behaviour_func,{start,2},application}}]}}
[]}
],
[] = run(Config, Ts),
ok.
Expand All @@ -3373,15 +3371,13 @@ behaviour_multiple(Config) when is_list(Config) ->
">>,
[],
{warnings,[{{1,22},erl_lint,{undefined_behaviour_func,{start,2},application}},
{{1,22},erl_lint,{undefined_behaviour_func,{stop,1},application}},
{{2,16},erl_lint,{undefined_behaviour_func,{init,1},supervisor}}]}},

{behaviour2,
<<"-behaviour(application).
-behaviour(supervisor).
-export([start/2,stop/1,init/1]).
-export([start/2,init/1]).
start(_, _) -> ok.
stop(_) -> ok.
init(_) -> ok.
">>,
[],
Expand All @@ -3390,9 +3386,8 @@ behaviour_multiple(Config) when is_list(Config) ->
{american_behavior2,
<<"-behavior(application).
-behavior(supervisor).
-export([start/2,stop/1,init/1]).
-export([start/2,init/1]).
start(_, _) -> ok.
stop(_) -> ok.
init(_) -> ok.
">>,
[],
Expand Down
6 changes: 1 addition & 5 deletions lib/tftp/src/tftp_app.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
-behaviour(application).

%% Application callbacks
-export([start/2, stop/1]).
-export([start/2]).

%%====================================================================
%% API
Expand All @@ -39,10 +39,6 @@ start(_StartType, _StartArgs) ->
Config = get_configuration(),
tftp_sup:start_link(Config).

%%--------------------------------------------------------------------
stop(_State) ->
ok.

%%====================================================================
%% Internal functions
%%====================================================================
Expand Down