diff options
| author | Henrik Nord <[email protected]> | 2011-10-07 17:17:27 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-10-07 17:17:32 +0200 |
| commit | a5abe96590ec22779f796fc67e5afbbf99a3a922 (patch) | |
| tree | b22eb07f52606bc7ab5c7339026d007784aef0a4 /lib/kernel/src/application.erl | |
| parent | 00202339445daae6ed931f28f932089d5c3dd455 (diff) | |
| parent | ed72d05e27fcf1d4f649014ffd7a1c2878b5b010 (diff) | |
| download | otp-a5abe96590ec22779f796fc67e5afbbf99a3a922.tar.gz otp-a5abe96590ec22779f796fc67e5afbbf99a3a922.tar.bz2 otp-a5abe96590ec22779f796fc67e5afbbf99a3a922.zip | |
Merge branch 'sa/callback-attr'
* sa/callback-attr:
Add callback specs into 'application' module in kernel
Add callback specs to tftp module following internet documentation
Add callback specs to inets_service module following possibly deprecated comments
Add '-callback' attributes in stdlib's behaviours
Update primary bootstrap
Update the documentation with information on the callback attribute
Automatically generate 'behaviour_info' function from '-callback' attributes
Add '-callback' attribute to language syntax
OTP-9621
Diffstat (limited to 'lib/kernel/src/application.erl')
| -rw-r--r-- | lib/kernel/src/application.erl | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/kernel/src/application.erl b/lib/kernel/src/application.erl index fa3a4c3d36..caac4d926c 100644 --- a/lib/kernel/src/application.erl +++ b/lib/kernel/src/application.erl @@ -28,8 +28,6 @@ -export([get_application/0, get_application/1, info/0]). -export([start_type/0]). --export([behaviour_info/1]). - %%%----------------------------------------------------------------- -type start_type() :: 'normal' @@ -59,12 +57,12 @@ %%------------------------------------------------------------------ --spec behaviour_info(atom()) -> 'undefined' | [{atom(), byte()}]. +-callback start(StartType :: normal | {takeover, node()} | {failover, node()}, + StartArgs :: term()) -> + {ok, pid()} | {ok, pid(), State :: term()} | {error, Reason :: term}. -behaviour_info(callbacks) -> - [{start,2},{stop,1}]; -behaviour_info(_Other) -> - undefined. +-callback stop(State :: term()) -> + term(). %%%----------------------------------------------------------------- %%% This module is API towards application_controller and |