Merge branch 'hb/stdlib/gen_call_improvement/OTP-9212'

* hb/stdlib/gen_call_improvement/OTP-9212:
  Remove the undocumented function global:safe_whereis_name/1
  Remove all use of global:safe_whereis_name/1
  Fix a minor race in gen_fsm

8 files changed, 162 insertions, 43 deletions

diff --git a/lib/kernel/src/global.erl b/lib/kernel/src/global.erl
index 7d15f8bf83..fa97614eca 100644
--- a/lib/kernel/src/global.erl
+++ b/lib/kernel/src/global.erl
@@ -28,7 +28,7 @@
 
 %% External exports
 -export([start/0, start_link/0, stop/0, sync/0, sync/1,
-	 safe_whereis_name/1, whereis_name/1,  register_name/2, 
+	 whereis_name/1,  register_name/2,
          register_name/3, register_name_external/2, register_name_external/3,
          unregister_name_external/1,re_register_name/2, re_register_name/3,
 	 unregister_name/1, registered_names/0, send/2, node_disconnected/1,
@@ -203,10 +203,6 @@ send(Name, Msg) ->
 whereis_name(Name) ->
     where(Name).
 
--spec safe_whereis_name(term()) -> pid() | 'undefined'.
-safe_whereis_name(Name) ->
-    gen_server:call(global_name_server, {whereis, Name}, infinity).
-
 node_disconnected(Node) ->
     global_name_server ! {nodedown, Node}.
 
@@ -510,8 +506,7 @@ init([]) ->
 %%   delay can sometimes be quite substantial. Global guarantees that
 %%   the name will eventually be removed, but there is no
 %%   synchronization between nodes; the name can be removed from some
-%%   node(s) long before it is removed from other nodes. Using
-%%   safe_whereis_name is no cure.
+%%   node(s) long before it is removed from other nodes.
 %%
 %% - Global cannot handle problems with the distribution very well.
 %%   Depending on the value of the kernel variable 'net_ticktime' long
@@ -589,10 +584,6 @@ init([]) ->
 	{'reply', term(), state()} |
 	{'stop', 'normal', 'stopped', state()}.
 
-handle_call({whereis, Name}, From, S) ->
-    do_whereis(Name, From),
-    {noreply, S};
-
 handle_call({registrar, Fun}, From, S) ->
     S#state.the_registrar ! {trans_all_known, Fun, From},
     {noreply, S};
@@ -1235,7 +1226,15 @@ ins_name_ext(Name, Pid, Method, RegNode, FromPidOrNode, ExtraInfo, S0) ->
 
 where(Name) ->
     case ets:lookup(global_names, Name) of
-	[{_Name, Pid, _Method, _RPid, _Ref}] -> Pid;
+	[{_Name, Pid, _Method, _RPid, _Ref}] ->
+	    if node(Pid) == node() ->
+		    case is_process_alive(Pid) of
+			true  -> Pid;
+			false -> undefined
+		    end;
+	       true ->
+		    Pid
+	    end;
 	[] -> undefined
     end.
 
diff --git a/lib/kernel/test/global_SUITE.erl b/lib/kernel/test/global_SUITE.erl
index 1e7bcf1766..60035b50a0 100644
--- a/lib/kernel/test/global_SUITE.erl
+++ b/lib/kernel/test/global_SUITE.erl
@@ -436,7 +436,7 @@ lock_global2(Id, Parent) ->
 
 %cp1 - cp3 are started, and the name 'test' registered for a process on
 %test_server. Then it is checked that the name is registered on all
-%nodes, using whereis_name and safe_whereis_name. Check that the same
+%nodes, using whereis_name. Check that the same
 %name can't be registered with another value. Exit the registered
 %process and check that the name disappears. Register a new process
 %(Pid2) under the name 'test'. Let another new process (Pid3)
@@ -465,10 +465,6 @@ names(Config) when is_list(Config) ->
     % test that it is registered at all nodes
     ?line 
     ?UNTIL(begin 
-            (Pid =:= global:safe_whereis_name(test)) and
-            (Pid =:= rpc:call(Cp1, global, safe_whereis_name, [test])) and
-            (Pid =:= rpc:call(Cp2, global, safe_whereis_name, [test])) and
-            (Pid =:= rpc:call(Cp3, global, safe_whereis_name, [test])) and
             (Pid =:= global:whereis_name(test)) and
             (Pid =:= rpc:call(Cp1, global, whereis_name, [test])) and
             (Pid =:= rpc:call(Cp2, global, whereis_name, [test])) and
@@ -566,10 +562,7 @@ names_hidden(Config) when is_list(Config) ->
 
     % Check that it didn't get registered on visible nodes
     ?line
-    ?UNTIL((undefined =:= global:safe_whereis_name(test)) and
-           (undefined =:= rpc:call(Cp1, global, safe_whereis_name, [test])) and
-           (undefined =:= rpc:call(Cp2, global, safe_whereis_name, [test])) and
-           (undefined =:= global:whereis_name(test)) and
+    ?UNTIL((undefined =:= global:whereis_name(test)) and
            (undefined =:= rpc:call(Cp1, global, whereis_name, [test])) and
            (undefined =:= rpc:call(Cp2, global, whereis_name, [test]))),
 
@@ -579,11 +572,7 @@ names_hidden(Config) when is_list(Config) ->
 
     % test that it is registered at all nodes
     ?line
-    ?UNTIL((Pid =:= global:safe_whereis_name(test)) and
-           (Pid =:= rpc:call(Cp1, global, safe_whereis_name, [test])) and
-           (Pid =:= rpc:call(Cp2, global, safe_whereis_name, [test])) and
-           (HPid =:= rpc:call(Cp3, global, safe_whereis_name, [test])) and
-           (Pid =:= global:whereis_name(test)) and
+    ?UNTIL((Pid =:= global:whereis_name(test)) and
            (Pid =:= rpc:call(Cp1, global, whereis_name, [test])) and
            (Pid =:= rpc:call(Cp2, global, whereis_name, [test])) and
            (HPid =:= rpc:call(Cp3, global, whereis_name, [test])) and
diff --git a/lib/stdlib/src/gen.erl b/lib/stdlib/src/gen.erl
index 574146b1cd..5d803091b6 100644
--- a/lib/stdlib/src/gen.erl
+++ b/lib/stdlib/src/gen.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -273,7 +273,7 @@ reply({To, Tag}, Reply) ->
 %%%-----------------------------------------------------------------
 %%%  Misc. functions.
 %%%-----------------------------------------------------------------
-where({global, Name}) -> global:safe_whereis_name(Name);
+where({global, Name}) -> global:whereis_name(Name);
 where({local, Name})  -> whereis(Name).
 
 name_register({local, Name} = LN) ->
diff --git a/lib/stdlib/src/gen_fsm.erl b/lib/stdlib/src/gen_fsm.erl
index 3db8c9f4f2..57734a075c 100644
--- a/lib/stdlib/src/gen_fsm.erl
+++ b/lib/stdlib/src/gen_fsm.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -296,7 +296,7 @@ get_proc_name({local, Name}) ->
 	    exit(process_not_registered)
     end;
 get_proc_name({global, Name}) ->
-    case global:safe_whereis_name(Name) of
+    case global:whereis_name(Name) of
 	undefined ->
 	    exit(process_not_registered_globally);
 	Pid when Pid =:= self() ->
@@ -318,7 +318,7 @@ get_parent() ->
 name_to_pid(Name) ->
     case whereis(Name) of
 	undefined ->
-	    case global:safe_whereis_name(Name) of
+	    case global:whereis_name(Name) of
 		undefined ->
 		    exit(could_not_find_registerd_name);
 		Pid ->
@@ -348,12 +348,15 @@ init_it(Starter, Parent, Name0, Mod, Args, Options) ->
 	    proc_lib:init_ack(Starter, {ok, self()}), 	    
 	    loop(Parent, Name, StateName, StateData, Mod, Timeout, Debug);
 	{stop, Reason} ->
+	    unregister_name(Name0),
 	    proc_lib:init_ack(Starter, {error, Reason}),
 	    exit(Reason);
 	ignore ->
+	    unregister_name(Name0),
 	    proc_lib:init_ack(Starter, ignore),
 	    exit(normal);
 	{'EXIT', Reason} ->
+	    unregister_name(Name0),
 	    proc_lib:init_ack(Starter, {error, Reason}),
 	    exit(Reason);
 	Else ->
@@ -366,6 +369,13 @@ name({local,Name}) -> Name;
 name({global,Name}) -> Name;
 name(Pid) when is_pid(Pid) -> Pid.
 
+unregister_name({local,Name}) ->
+    _ = (catch unregister(Name));
+unregister_name({global,Name}) ->
+    _ = global:unregister_name(Name);
+unregister_name(Pid) when is_pid(Pid) ->
+    Pid.
+
 %%-----------------------------------------------------------------
 %% The MAIN loop
 %%-----------------------------------------------------------------
diff --git a/lib/stdlib/src/gen_server.erl b/lib/stdlib/src/gen_server.erl
index dd0ef74f30..6f075bbe5a 100644
--- a/lib/stdlib/src/gen_server.erl
+++ b/lib/stdlib/src/gen_server.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -820,7 +820,7 @@ get_proc_name({local, Name}) ->
 	    exit(process_not_registered)
     end;    
 get_proc_name({global, Name}) ->
-    case global:safe_whereis_name(Name) of
+    case global:whereis_name(Name) of
 	undefined ->
 	    exit(process_not_registered_globally);
 	Pid when Pid =:= self() ->
@@ -842,7 +842,7 @@ get_parent() ->
 name_to_pid(Name) ->
     case whereis(Name) of
 	undefined ->
-	    case global:safe_whereis_name(Name) of
+	    case global:whereis_name(Name) of
 		undefined ->
 		    exit(could_not_find_registerd_name);
 		Pid ->
diff --git a/lib/stdlib/test/gen_server_SUITE.erl b/lib/stdlib/test/gen_server_SUITE.erl
index a614d6595d..7fb8d54f2d 100644
--- a/lib/stdlib/test/gen_server_SUITE.erl
+++ b/lib/stdlib/test/gen_server_SUITE.erl
@@ -694,7 +694,7 @@ multicall_down(Config) when is_list(Config) ->
     %% We use 'global' as a gen_server to call.
     ?line {Good, Bad} = gen_server:multi_call([Name, node()],
 					      global_name_server,
-					      {whereis, gurkburk},
+					      info,
 					      3000),
     io:format("good = ~p, bad = ~p~n", [Good, Bad]),
     ?line [Name] = Bad,
diff --git a/lib/stdlib/test/supervisor_SUITE.erl b/lib/stdlib/test/supervisor_SUITE.erl
index da6996cc9f..d3d140abbc 100644
--- a/lib/stdlib/test/supervisor_SUITE.erl
+++ b/lib/stdlib/test/supervisor_SUITE.erl
@@ -29,7 +29,8 @@
 	 end_per_testcase/2]).
 
 %% Internal export
--export([init/1, terminate_all_children/1]).
+-export([init/1, terminate_all_children/1,
+         middle9212/0, gen_server9212/0, handle_info/2]).
 
 %% API tests
 -export([ sup_start_normal/1, sup_start_ignore_init/1, 
@@ -58,7 +59,8 @@
 -export([child_unlink/1, tree/1, count_children_memory/1,
 	 do_not_save_start_parameters_for_temporary_children/1,
 	 do_not_save_child_specs_for_temporary_children/1,
-	 simple_one_for_one_scale_many_temporary_children/1]).
+	 simple_one_for_one_scale_many_temporary_children/1,
+         simple_global_supervisor/1]).
 
 %%-------------------------------------------------------------------------
 
@@ -77,7 +79,8 @@ all() ->
      {group, abnormal_termination}, child_unlink, tree,
      count_children_memory, do_not_save_start_parameters_for_temporary_children,
      do_not_save_child_specs_for_temporary_children,
-     simple_one_for_one_scale_many_temporary_children, temporary_bystander].
+     simple_one_for_one_scale_many_temporary_children, temporary_bystander,
+     simple_global_supervisor].
 
 groups() -> 
     [{sup_start, [],
@@ -1388,6 +1391,92 @@ terminate_all_children([]) ->
     done.
 
 
+%%-------------------------------------------------------------------------
+%% OTP-9212. Restart of global supervisor.
+simple_global_supervisor(_Config) ->
+    kill_supervisor(),
+    kill_worker(),
+    exit_worker(),
+    restart_worker(),
+    ok.
+
+kill_supervisor() ->
+    {Top, Sup2_1, Server_1} = start9212(),
+
+    %% Killing a supervisor isn't really supported, but try it anyway...
+    exit(Sup2_1, kill),
+    timer:sleep(200),
+    Sup2_2 = global:whereis_name(sup2),
+    Server_2 = global:whereis_name(server),
+    true = is_pid(Sup2_2),
+    true = is_pid(Server_2),
+    true = Sup2_1 =/= Sup2_2,
+    true = Server_1 =/= Server_2,
+
+    stop9212(Top).
+
+handle_info({fail, With, After}, _State) ->
+    timer:sleep(After),
+    erlang:error(With).
+
+kill_worker() ->
+    {Top, _Sup2, Server_1} = start9212(),
+    exit(Server_1, kill),
+    timer:sleep(200),
+    Server_2 = global:whereis_name(server),
+    true = is_pid(Server_2),
+    true = Server_1 =/= Server_2,
+    stop9212(Top).
+
+exit_worker() ->
+    %% Very much the same as kill_worker().
+    {Top, _Sup2, Server_1} = start9212(),
+    Server_1 ! {fail, normal, 0},
+    timer:sleep(200),
+    Server_2 = global:whereis_name(server),
+    true = is_pid(Server_2),
+    true = Server_1 =/= Server_2,
+    stop9212(Top).
+
+restart_worker() ->
+    {Top, _Sup2, Server_1} = start9212(),
+    ok = supervisor:terminate_child({global, sup2}, child),
+    {ok, _Child} = supervisor:restart_child({global, sup2}, child),
+    Server_2 = global:whereis_name(server),
+    true = is_pid(Server_2),
+    true = Server_1 =/= Server_2,
+    stop9212(Top).
+
+start9212() ->
+    Middle = {middle,{?MODULE,middle9212,[]}, permanent,2000,supervisor,[]},
+    InitResult = {ok, {{one_for_all,3,60}, [Middle]}},
+    {ok, TopPid} = start_link(InitResult),
+
+    Sup2 = global:whereis_name(sup2),
+    Server = global:whereis_name(server),
+    true = is_pid(Sup2),
+    true = is_pid(Server),
+    {TopPid, Sup2, Server}.
+
+stop9212(Top) ->
+    Old = process_flag(trap_exit, true),
+    exit(Top, kill),
+    timer:sleep(200),
+    undefined = global:whereis_name(sup2),
+    undefined = global:whereis_name(server),
+    check_exit([Top]),
+    _ = process_flag(trap_exit, Old),
+    ok.
+
+middle9212() ->
+    Child = {child, {?MODULE,gen_server9212,[]},permanent, 2000, worker, []},
+    InitResult = {ok, {{one_for_all,3,60}, [Child]}},
+    supervisor:start_link({global,sup2}, ?MODULE, InitResult).
+
+gen_server9212() ->
+    InitResult = {ok, []},
+    gen_server:start_link({global,server}, ?MODULE, InitResult, []).
+
 
 %%-------------------------------------------------------------------------
 terminate(Pid, Reason) when Reason =/= supervisor ->
diff --git a/lib/stdlib/test/supervisor_bridge_SUITE.erl b/lib/stdlib/test/supervisor_bridge_SUITE.erl
index c4d696564d..b3056ff41a 100644
--- a/lib/stdlib/test/supervisor_bridge_SUITE.erl
+++ b/lib/stdlib/test/supervisor_bridge_SUITE.erl
@@ -19,8 +19,9 @@
 -module(supervisor_bridge_SUITE).
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2,starting/1,
-	 mini_terminate/1,mini_die/1,badstart/1]).
--export([client/1,init/1,internal_loop_init/1,terminate/2]).
+	 mini_terminate/1,mini_die/1,badstart/1,
+         simple_global_supervisor/1]).
+-export([client/1,init/1,internal_loop_init/1,terminate/2,server9212/0]).
 
 -include_lib("test_server/include/test_server.hrl").
 -define(bridge_name,supervisor_bridge_SUITE_server).
@@ -31,7 +32,7 @@
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [starting, mini_terminate, mini_die, badstart].
+    [starting, mini_terminate, mini_die, badstart, simple_global_supervisor].
 
 groups() -> 
     [].
@@ -138,7 +139,9 @@ init(3) ->
     receive
 	{InternalPid,init_done} ->
 	    {ok,InternalPid,self()}
-    end.
+    end;
+init({4,Result}) ->
+    Result.
 
 internal_loop_init(Parent) ->
     register(?work_bridge_name, self()),
@@ -160,7 +163,9 @@ terminate(Reason,{Parent,Worker}) ->
     io:format("Terminating bridge...\n"),
     exit(Worker,kill),
     Parent ! {dying,Reason},
-    anything.
+    anything;
+terminate(_Reason, _State) ->
+    any.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -197,3 +202,30 @@ badstart(Config) when is_list(Config) ->
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% OTP-9212. Restart of global supervisor.
+
+simple_global_supervisor(suite) -> [];
+simple_global_supervisor(doc) -> "Globally registered supervisor.";
+simple_global_supervisor(Config) when is_list(Config) ->
+    ?line Dog = test_server:timetrap({seconds,10}),
+
+    Child = {child, {?MODULE,server9212,[]}, permanent, 2000, worker, []},
+    InitResult = {ok, {{one_for_all,3,60}, [Child]}},
+    {ok, Sup} =
+        supervisor:start_link({local,bridge9212}, ?MODULE, {4,InitResult}),
+
+    BN_1 = global:whereis_name(?bridge_name),
+    ?line exit(BN_1, kill),
+    timer:sleep(200),
+    BN_2 = global:whereis_name(?bridge_name),
+    ?line true = is_pid(BN_2),
+    ?line true = BN_1 =/= BN_2,
+
+    ?line process_flag(trap_exit, true),
+    exit(Sup, kill),
+    ?line receive {'EXIT', Sup, killed} -> ok end,
+    ?line test_server:timetrap_cancel(Dog),
+    ok.
+
+server9212() ->
+    supervisor_bridge:start_link({global,?bridge_name}, ?MODULE, 3).