1 files changed, 34 insertions, 9 deletions

diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl
index e3d22e7999..5d4f2eb70c 100644
--- a/lib/kernel/src/code_server.erl
+++ b/lib/kernel/src/code_server.erl
@@ -32,6 +32,8 @@
 
 -import(lists, [foreach/2]).
 
+-define(ANY_NATIVE_CODE_LOADED, any_native_code_loaded).
+
 -record(state, {supervisor,
 		root,
 		path,
@@ -97,6 +99,8 @@ init(Ref, Parent, [Root,Mode0]) ->
 		State0
 	end,
 
+    put(?ANY_NATIVE_CODE_LOADED, false),
+
     Parent ! {Ref,{ok,self()}},
     loop(State#state{supervisor = Parent}).
 
@@ -1278,35 +1282,56 @@ load_native_code(Mod, Bin) ->
     %% Therefore we must test for that the loader modules are available
     %% before trying to to load native code.
     case erlang:module_loaded(hipe_unified_loader) of
-	false -> no_native;
-	true -> hipe_unified_loader:load_native_code(Mod, Bin)
+	false ->
+	    no_native;
+	true ->
+	    Result = hipe_unified_loader:load_native_code(Mod, Bin),
+	    case Result of
+		{module,_} ->
+		    put(?ANY_NATIVE_CODE_LOADED, true);
+		_ ->
+		    ok
+	    end,
+	    Result
     end.
 
 hipe_result_to_status(Result) ->
     case Result of
-	{module,_} -> Result;
-	_ -> {error,Result}
+	{module,_} ->
+	    put(?ANY_NATIVE_CODE_LOADED, true),
+	    Result;
+	_ ->
+	    {error,Result}
     end.
 
 post_beam_load(Mod) ->
-    case erlang:module_loaded(hipe_unified_loader) of
-	false -> ok;
-	true -> hipe_unified_loader:post_beam_load(Mod)
+    %% post_beam_load/1 can potentially be very expensive because it
+    %% blocks multi-scheduling; thus we want to avoid the call if we
+    %% know that it is not needed.
+    case get(?ANY_NATIVE_CODE_LOADED) of
+	true -> hipe_unified_loader:post_beam_load(Mod);
+	false -> ok
     end.
 
 int_list([H|T]) when is_integer(H) -> int_list(T);
 int_list([_|_])                    -> false;
 int_list([])                       -> true.
 
+load_file(Mod0, {From,_}=Caller, St0) ->
+    Mod = to_atom(Mod0),
+    case pending_on_load(Mod, From, St0) of
+	no -> load_file_1(Mod, Caller, St0);
+	{yes,St} -> {noreply,St}
+    end.
 
-load_file(Mod, Caller, #state{path=Path,cache=no_cache}=St) ->
+load_file_1(Mod, Caller, #state{path=Path,cache=no_cache}=St) ->
     case mod_to_bin(Path, Mod) of
 	error ->
 	    {reply,{error,nofile},St};
 	{Mod,Binary,File} ->
 	    try_load_module(File, Mod, Binary, Caller, St)
     end;
-load_file(Mod, Caller, #state{cache=Cache}=St0) ->
+load_file_1(Mod, Caller, #state{cache=Cache}=St0) ->
     Key = {obj,Mod},
     case ets:lookup(Cache, Key) of
 	[] ->