From a8b8ec5e858da86531933b545f752f436e411b58 Mon Sep 17 00:00:00 2001
From: Paul Guyot <pguyot@kallisys.net>
Date: Sun, 11 Jul 2010 19:50:40 +0200
Subject: Load native code for modules loaded before the code server

When configuring erlang with --enable-native-libs, some core modules are
compiled with hipe, yet because they are loaded before the code server,
their native code is not loaded. The fix consists in quietly trying to
load the native code for all loaded modules just after the code server
is started.
---
 lib/kernel/src/code.erl        | 18 ++++++++++++++++++
 lib/kernel/test/code_SUITE.erl | 32 ++++++++++++++++++++++++++++++--
 2 files changed, 48 insertions(+), 2 deletions(-)

(limited to 'lib/kernel')

diff --git a/lib/kernel/src/code.erl b/lib/kernel/src/code.erl
index 42d4818f08..ec256d5806 100644
--- a/lib/kernel/src/code.erl
+++ b/lib/kernel/src/code.erl
@@ -304,6 +304,8 @@ do_start(Flags) ->
 			true ->
 			    ok
 		    end,
+		    % Quietly load the native code for all modules loaded so far.
+		    catch load_native_code_for_all_loaded(),
 		    Ok2;
 		Other ->
 		    Other
@@ -496,3 +498,19 @@ has_ext(Ext, Extlen,File) ->
 
 to_path(X) ->
     filename:join(packages:split(X)).
+
+-spec load_native_code_for_all_loaded() -> ok.
+load_native_code_for_all_loaded() ->
+    Architecture = erlang:system_info(hipe_architecture),
+    ChunkName = hipe_unified_loader:chunk_name(Architecture),
+    lists:foreach(fun({Module, BeamFilename}) ->
+        case code:is_module_native(Module) of
+            false ->
+                case beam_lib:chunks(BeamFilename, [ChunkName]) of
+                    {ok,{_,[{_,Bin}]}} when is_binary(Bin) ->
+                        load_native_partial(Module, Bin);
+                    {error, beam_lib, _} -> ok
+                end;
+            true -> ok
+        end
+    end, all_loaded()).
diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl
index 08b6477c9d..c9437df258 100644
--- a/lib/kernel/test/code_SUITE.erl
+++ b/lib/kernel/test/code_SUITE.erl
@@ -31,7 +31,7 @@
 	 where_is_file_cached/1, where_is_file_no_cache/1,
 	 purge_stacktrace/1, mult_lib_roots/1, bad_erl_libs/1,
 	 code_archive/1, code_archive2/1, on_load/1,
-	 on_load_embedded/1, on_load_errors/1]).
+	 on_load_embedded/1, on_load_errors/1, native_early_modules/1]).
 
 -export([init_per_testcase/2, fin_per_testcase/2, 
 	 init_per_suite/1, end_per_suite/1,
@@ -53,7 +53,7 @@ all(suite) ->
      where_is_file_no_cache, where_is_file_cached,
      purge_stacktrace, mult_lib_roots, bad_erl_libs,
      code_archive, code_archive2, on_load, on_load_embedded,
-     on_load_errors].
+     on_load_errors, native_early_modules].
 
 init_per_suite(Config) ->
     %% The compiler will no longer create a Beam file if
@@ -1333,6 +1333,34 @@ do_on_load_error(ReturnValue) ->
 	    ?line {undef,[{on_load_error,main,[]}|_]} = Exit
     end.
 
+native_early_modules(suite) -> [];
+native_early_modules(doc) -> ["Test that the native code of early loaded modules is loaded"];
+native_early_modules(Config) when is_list(Config) ->
+    case erlang:system_info(hipe_architecture) of
+	undefined ->
+	    {skip,"Native code support is not enabled"};
+	Architecture ->
+	    native_early_modules_1(Architecture)
+    end.
+
+native_early_modules_1(Architecture) ->
+    ?line {lists, ListsBinary, _ListsFilename} = code:get_object_code(lists),
+    ?line ChunkName = hipe_unified_loader:chunk_name(Architecture),
+    ?line NativeChunk = beam_lib:chunks(ListsBinary, [ChunkName]),
+    ?line IsHipeCompiled = case NativeChunk of
+        {ok,{_,[{_,Bin}]}} when is_binary(Bin) -> true;
+        {error, beam_lib, _} -> false
+    end,
+    case IsHipeCompiled of
+        false ->
+	    {skip,"OTP apparently not configured with --enable-native-libs"};
+        true ->
+            ?line true = lists:all(fun code:is_module_native/1,
+				   [ets,file,filename,gb_sets,gb_trees,
+				    hipe_unified_loader,lists,os,packages]),
+            ok
+    end.
+
 %%-----------------------------------------------------------------
 %% error_logger handler.
 %% (Copied from stdlib/test/proc_lib_SUITE.erl.)
-- 
cgit v1.2.3