diff options
| author | Gustav Simonsson <[email protected]> | 2012-03-16 10:32:00 +0100 |
|---|---|---|
| committer | Gustav Simonsson <[email protected]> | 2012-03-16 10:32:00 +0100 |
| commit | e5cc75f496d41589003548c16d199f0b37a919dc (patch) | |
| tree | 789d803954f2dc10105c3a9f8680801b4eb46ce3 /lib | |
| parent | 37827c8f57036cec67c4d9460c02c468aa615155 (diff) | |
| parent | 7ab34f2413c1a969f07e9eb1455d34fc1834f597 (diff) | |
| download | otp-e5cc75f496d41589003548c16d199f0b37a919dc.tar.gz otp-e5cc75f496d41589003548c16d199f0b37a919dc.tar.bz2 otp-e5cc75f496d41589003548c16d199f0b37a919dc.zip | |
Merge branch 'rj/fix-global-spec' into maint
* rj/fix-global-spec:
Improve global:re_register_name/2,3 spec
Fix global:{random_exit_name,random_notify_name}/3 spec
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/kernel/src/global.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/kernel/src/global.erl b/lib/kernel/src/global.erl index fa97614eca..7da33859bf 100644 --- a/lib/kernel/src/global.erl +++ b/lib/kernel/src/global.erl @@ -280,13 +280,13 @@ unregister_name(Name) -> gen_server:call(global_name_server, {registrar, Fun}, infinity) end. --spec re_register_name(Name, Pid) -> _ when +-spec re_register_name(Name, Pid) -> 'yes' when Name :: term(), Pid :: pid(). re_register_name(Name, Pid) when is_pid(Pid) -> re_register_name(Name, Pid, fun random_exit_name/3). --spec re_register_name(Name, Pid, Resolve) -> _ when +-spec re_register_name(Name, Pid, Resolve) -> 'yes' when Name :: term(), Pid :: pid(), Resolve :: method(). @@ -1965,7 +1965,7 @@ resolve_it(Method, Name, Pid1, Pid2) -> minmax(P1,P2) -> if node(P1) < node(P2) -> {P1, P2}; true -> {P2, P1} end. --spec random_exit_name(Name, Pid1, Pid2) -> 'none' when +-spec random_exit_name(Name, Pid1, Pid2) -> pid() when Name :: term(), Pid1 :: pid(), Pid2 :: pid(). @@ -1976,7 +1976,7 @@ random_exit_name(Name, Pid, Pid2) -> exit(Max, kill), Min. --spec random_notify_name(Name, Pid1, Pid2) -> 'none' when +-spec random_notify_name(Name, Pid1, Pid2) -> pid() when Name :: term(), Pid1 :: pid(), Pid2 :: pid(). @@ -2175,7 +2175,7 @@ get_own_nodes() -> start_the_registrar() -> spawn_link(fun() -> loop_the_registrar() end). - + loop_the_registrar() -> receive {trans_all_known, Fun, From} -> |