Merge branch 'maint'

* maint:
  Look for port in priv/bin/arch/ as well as priv/bin/
  Fix on_load handling in modules loaded by code:load_binary/3

6 files changed, 75 insertions, 18 deletions

diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl
index 32a12e2b52..5d4f2eb70c 100644
--- a/lib/kernel/src/code_server.erl
+++ b/lib/kernel/src/code_server.erl
@@ -1317,15 +1317,21 @@ 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
 	[] -> 
diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl
index 10ab3e4370..99b0cd2ffb 100644
--- a/lib/kernel/test/code_SUITE.erl
+++ b/lib/kernel/test/code_SUITE.erl
@@ -30,9 +30,9 @@
 	 load_cached/1, start_node_with_cache/1, add_and_rehash/1,
 	 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,
-	 big_boot_embedded/1,
-	 on_load_embedded/1, on_load_errors/1, native_early_modules/1]).
+	 code_archive/1, code_archive2/1, on_load/1, on_load_binary/1,
+	 on_load_embedded/1, on_load_errors/1, big_boot_embedded/1,
+	 native_early_modules/1]).
 
 -export([init_per_testcase/2, end_per_testcase/2, 
 	 init_per_suite/1, end_per_suite/1,
@@ -55,8 +55,8 @@ all() ->
      add_and_rehash, 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, big_boot_embedded, on_load_errors, 
-     native_early_modules].
+     on_load_binary, on_load_embedded, on_load_errors,
+     big_boot_embedded, native_early_modules].
 
 groups() -> 
     [].
@@ -1286,6 +1286,45 @@ on_load_wait_for_all([Ref|T]) ->
     end;
 on_load_wait_for_all([]) -> ok.
 
+on_load_binary(_) ->
+    Master = on_load_binary_test_case_process,
+    register(Master, self()),
+
+    %% Construct, compile and pretty-print.
+    Mod = on_load_binary,
+    File = atom_to_list(Mod) ++ ".erl",
+    Forms = [{attribute,1,file,{File,1}},
+	     {attribute,1,module,Mod},
+	     {attribute,2,export,[{ok,0}]},
+	     {attribute,3,on_load,{init,0}},
+	     {function,5,init,0,
+	      [{clause,5,[],[],
+		[{op,6,'!',
+		  {atom,6,Master},
+		  {tuple,6,[{atom,6,Mod},{call,6,{atom,6,self},[]}]}},
+		 {'receive',7,[{clause,8,[{atom,8,go}],[],[{atom,8,ok}]}]}]}]},
+	     {function,11,ok,0,[{clause,11,[],[],[{atom,11,true}]}]}],
+    {ok,Mod,Bin} = compile:forms(Forms, [report]),
+    [io:put_chars(erl_pp:form(F)) || F <- Forms],
+
+    {Pid1,Ref1} = spawn_monitor(fun() ->
+					code:load_binary(Mod, File, Bin),
+					true = on_load_binary:ok()
+				end),
+    receive {Mod,OnLoadPid} -> ok end,
+    {Pid2,Ref2} = spawn_monitor(fun() ->
+					true = on_load_binary:ok()
+				end),
+    erlang:yield(),
+    OnLoadPid ! go,
+    receive {'DOWN',Ref1,process,Pid1,Exit1} -> ok end,
+    receive {'DOWN',Ref2,process,Pid2,Exit2} -> ok end,
+    normal = Exit1,
+    normal = Exit2,
+    true = code:delete(on_load_binary),
+    false = code:purge(on_load_binary),
+    ok.
+
 on_load_embedded(Config) when is_list(Config) ->
     try
 	on_load_embedded_1(Config)
diff --git a/lib/os_mon/src/cpu_sup.erl b/lib/os_mon/src/cpu_sup.erl
index e414e2c10b..34251178ee 100644
--- a/lib/os_mon/src/cpu_sup.erl
+++ b/lib/os_mon/src/cpu_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. 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
@@ -764,8 +764,7 @@ port_receive_cpu_util_entries(_, _, Data) ->
      exit({data_mismatch, Data}).
 
 start_portprogram() ->
-    Command = filename:join([code:priv_dir(os_mon), "bin", "cpu_sup"]),
-    Port = open_port({spawn, Command}, [stream]),
+    Port = os_mon:open_port("cpu_sup", [stream]),
     port_command(Port, ?ping),
     4711 = port_receive_uint32(Port, 5000),
     Port.
diff --git a/lib/os_mon/src/memsup.erl b/lib/os_mon/src/memsup.erl
index ba07a529bc..49533da1f7 100644
--- a/lib/os_mon/src/memsup.erl
+++ b/lib/os_mon/src/memsup.erl
@@ -802,8 +802,7 @@ port_init() ->
     port_idle(Port).
 
 start_portprogram() ->
-    Command = filename:join([code:priv_dir(os_mon), "bin", "memsup"]),
-    open_port({spawn, Command}, [{packet, 1}]).
+    os_mon:open_port("memsup",[{packet,1}]).
 
 %% The connected process loops are a bit awkward (several different
 %% functions doing almost the same thing) as
diff --git a/lib/os_mon/src/os_mon.erl b/lib/os_mon/src/os_mon.erl
index ef368571db..3098c38808 100644
--- a/lib/os_mon/src/os_mon.erl
+++ b/lib/os_mon/src/os_mon.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. 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
@@ -22,7 +22,7 @@
 -behaviour(supervisor).
 
 %% API
--export([call/2, call/3, get_env/2]).
+-export([call/2, call/3, get_env/2, open_port/2]).
 
 %% Application callbacks
 -export([start/2, stop/1]).
@@ -79,6 +79,22 @@ get_env(Service, Param) ->
 	    Service:param_default(Param)
     end.
 
+open_port(Name, Opts) ->
+    PrivDir = code:priv_dir(os_mon),
+    ReleasedPath = filename:join([PrivDir,"bin",Name]),
+    %% Check os_mon*/priv/bin/Name
+    case filelib:is_regular(ReleasedPath) of
+	true ->
+	    erlang:open_port({spawn, ReleasedPath}, Opts);
+	false ->
+	    %% Use os_mon*/priv/bin/Arch/Name
+	    ArchPath =
+		filename:join(
+		  [PrivDir,"bin",erlang:system_info(system_architecture),Name]),
+	    erlang:open_port({spawn, ArchPath}, Opts)
+    end.
+
+
 %%%-----------------------------------------------------------------
 %%% Application callbacks
 %%%-----------------------------------------------------------------
diff --git a/lib/os_mon/src/os_mon_sysinfo.erl b/lib/os_mon/src/os_mon_sysinfo.erl
index 5d12bd95d1..080885d5d6 100644
--- a/lib/os_mon/src/os_mon_sysinfo.erl
+++ b/lib/os_mon/src/os_mon_sysinfo.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-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
@@ -108,9 +108,7 @@ code_change(_OldVsn, State, _Extra) ->
 %%----------------------------------------------------------------------
 
 start_portprogram() ->
-    Command =
-	filename:join([code:priv_dir(os_mon),"bin","win32sysinfo.exe"]),
-    Port = open_port({spawn,Command}, [{packet,1}]),
+    Port = os_mon:open_port("win32sysinfo.exe", [{packet,1}]),
     receive
 	{Port, {data, [?OK]}} ->
 	    Port;