Remove the undocumented function global:safe_whereis_name/1

2 files changed, 5 insertions, 25 deletions

diff --git a/lib/kernel/src/global.erl b/lib/kernel/src/global.erl
index 9e27f22a16..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};
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