Ensure that {error, Reason} is returned even when server dies

5 files changed, 98 insertions, 97 deletions

diff --git a/lib/reltool/src/reltool.erl b/lib/reltool/src/reltool.erl
index 351a3d59cf..9dd0a24f46 100644
--- a/lib/reltool/src/reltool.erl
+++ b/lib/reltool/src/reltool.erl
@@ -99,16 +99,19 @@ stop(Pid) when is_pid(Pid) ->
 -spec eval_server(server(), boolean(), fun((server_pid()) -> term())) ->
  {ok, server_pid()} | {error, reason()}.
 eval_server(Pid, DisplayWarnings, Fun)
-  when is_pid(Pid), is_boolean(DisplayWarnings) ->
+  when is_pid(Pid) ->
     Fun(Pid);
 eval_server(Options, DisplayWarnings, Fun)
-  when is_list(Options), is_boolean(DisplayWarnings), is_function(Fun, 1) ->
-    case start_server(Options) of
-        {ok, Pid} ->
-	    apply_fun(Pid, DisplayWarnings, Fun);
-        {error, Reason} ->
-            {error, Reason}
-    end.
+  when is_list(Options) ->
+    TrapExit = process_flag(trap_exit, true),
+    Res = case start_server(Options) of
+	      {ok, Pid} ->
+		  apply_fun(Pid, DisplayWarnings, Fun);
+	      {error, Reason} ->
+		  {error, Reason}
+	  end,
+    process_flag(trap_exit, TrapExit),
+    Res.
 
 apply_fun(Pid, false, Fun) ->
     Res = Fun(Pid),
diff --git a/lib/reltool/src/reltool.hrl b/lib/reltool/src/reltool.hrl
index 7c9f519878..1a34ced89d 100644
--- a/lib/reltool/src/reltool.hrl
+++ b/lib/reltool/src/reltool.hrl
@@ -283,23 +283,23 @@
 -define(DEFAULT_EXCL_APP_FILTERS,    []).
 
 -define(EMBEDDED_INCL_SYS_FILTERS,   ["^bin",
-				    "^erts",
-				    "^lib",
-				    "^releases"]).
+				      "^erts",
+				      "^lib",
+				      "^releases"]).
 -define(EMBEDDED_EXCL_SYS_FILTERS,
 	["^bin/(erlc|dialyzer|typer)(|\\.exe)\$",
 	 "^erts.*/bin/(erlc|dialyzer|typer)(|\\.exe)\$",
 	 "^erts.*/bin/.*(debug|pdb)"]).
 -define(EMBEDDED_INCL_APP_FILTERS,    ["^ebin",
-				     "^priv",
-				     "^include"]).
+				       "^include",
+				       "^priv"]).
 -define(EMBEDDED_EXCL_APP_FILTERS,    []).
 -define(EMBEDDED_APP_TYPE,            load).
 
 -define(STANDALONE_INCL_SYS_FILTERS,  ["^bin/(erl|epmd)(|\\.exe|\\.ini)\$",
-				     "^bin/start(|_clean).boot\$",
-				     "^erts.*/bin",
-				     "^lib\$"]).
+				       "^bin/start(|_clean).boot\$",
+				       "^erts.*/bin",
+				       "^lib\$"]).
 -define(STANDALONE_EXCL_SYS_FILTERS,
 	["^erts.*/bin/(erlc|dialyzer|typer)(|\\.exe)\$",
 	 "^erts.*/bin/(start|escript|to_erl|run_erl)(|\\.exe)\$",
diff --git a/lib/reltool/src/reltool_server.erl b/lib/reltool/src/reltool_server.erl
index 01a7d93823..039ad56aa8 100644
--- a/lib/reltool/src/reltool_server.erl
+++ b/lib/reltool/src/reltool_server.erl
@@ -132,20 +132,20 @@ init(Options) ->
     end.
 
 do_init(Options) ->
-    case parse_options(Options) of
-        {#state{parent_pid = ParentPid, common = C, sys = Sys} = S, Status} ->
-            %% process_flag(trap_exit, (S#state.common)#common.trap_exit),
-            proc_lib:init_ack(ParentPid,
-			      {ok, self(), C, Sys#sys{apps = undefined}}),
-            {S2, Status2} = refresh(S, true, Status),
-	    {S3, Status3} =
-		    analyse(S2#state{old_sys = S2#state.sys}, Status2),
-	    case Status3 of
-		{ok, _Warnings} -> % BUGBUG: handle warnings
-		    loop(S3#state{status = Status3, old_status = {ok, []}});
-		{error, Reason} ->
-                    exit(Reason)
-            end
+    {S, Status} = parse_options(Options),
+    #state{parent_pid = ParentPid, common = C, sys = Sys} = S,
+
+    %% process_flag(trap_exit, (S#state.common)#common.trap_exit),
+    proc_lib:init_ack(ParentPid,
+		      {ok, self(), C, Sys#sys{apps = undefined}}),
+    {S2, Status2} = refresh(S, true, Status),
+    {S3, Status3} =
+	analyse(S2#state{old_sys = S2#state.sys}, Status2),
+    case Status3 of
+	{ok, _Warnings} -> % BUGBUG: handle warnings
+	    loop(S3#state{status = Status3, old_status = {ok, []}});
+	{error, Reason} ->
+	    exit(Reason)
     end.
 
 parse_options(Opts) ->
@@ -195,8 +195,8 @@ parse_options(Opts) ->
     S = #state{options = Opts},
     parse_options(Opts, S, C2, Sys, {ok, []}).
 
-dec_re(Key, Regexps, _Old) ->
-    reltool_utils:decode_regexps(Key, Regexps, _Old).
+dec_re(Key, Regexps, Old) ->
+    reltool_utils:decode_regexps(Key, Regexps, Old).
 
 parse_options([{Key, Val} | KeyVals], S, C, Sys, Status) ->
     case Key of
@@ -1250,64 +1250,28 @@ decode(#sys{} = Sys, [{Key, Val} | KeyVals], Status) ->
                 {Sys#sys{boot_rel = Val}, Status};
             emu_name when is_list(Val) ->
                 {Sys#sys{emu_name = Val}, Status};
-            profile when Val =:= development ->
-                Val = ?DEFAULT_PROFILE, % assert,
-                {Sys#sys{profile = Val,
-                         incl_sys_filters =
-			 dec_re(incl_sys_filters,
-				?DEFAULT_INCL_SYS_FILTERS,
-				Sys#sys.incl_sys_filters),
-                         excl_sys_filters =
-			 dec_re(excl_sys_filters,
-				?DEFAULT_EXCL_SYS_FILTERS,
-				Sys#sys.excl_sys_filters),
-                         incl_app_filters =
-			 dec_re(incl_app_filters,
-				?DEFAULT_INCL_APP_FILTERS,
-				Sys#sys.incl_app_filters),
-                         excl_app_filters =
-			 dec_re(excl_app_filters,
-				?DEFAULT_EXCL_APP_FILTERS,
-				Sys#sys.excl_app_filters)},
-                 Status};
-            profile when Val =:= embedded ->
-                {Sys#sys{profile = Val,
-                         incl_sys_filters =
-			 dec_re(incl_sys_filters,
-				?EMBEDDED_INCL_SYS_FILTERS,
-				Sys#sys.incl_sys_filters),
-                         excl_sys_filters =
-			 dec_re(excl_sys_filters,
-				?EMBEDDED_EXCL_SYS_FILTERS,
-				Sys#sys.excl_sys_filters),
-                         incl_app_filters =
-			 dec_re(incl_app_filters,
-				?EMBEDDED_INCL_APP_FILTERS,
-				Sys#sys.incl_app_filters),
-                         excl_app_filters =
-			 dec_re(excl_app_filters,
-				?EMBEDDED_EXCL_APP_FILTERS,
-				Sys#sys.excl_app_filters),
-			 embedded_app_type = ?EMBEDDED_APP_TYPE},
-                 Status};
-            profile when Val =:= standalone ->
-                {Sys#sys{profile = Val,
-                         incl_sys_filters =
-			 dec_re(incl_sys_filters,
-				?STANDALONE_INCL_SYS_FILTERS,
-				Sys#sys.incl_sys_filters),
-                         excl_sys_filters =
-			 dec_re(excl_sys_filters,
-				?STANDALONE_EXCL_SYS_FILTERS,
-				Sys#sys.excl_sys_filters),
-                         incl_app_filters =
-			 dec_re(incl_app_filters,
-				?STANDALONE_INCL_APP_FILTERS,
-				Sys#sys.incl_app_filters),
-                         excl_app_filters =
-			 dec_re(excl_app_filters,
-				?STANDALONE_EXCL_APP_FILTERS,
-				Sys#sys.excl_app_filters)},
+	    profile when Val =:= development;
+			 Val =:= embedded;
+			 Val =:= standalone ->
+		InclSys = reltool_utils:choose_default(incl_sys_filters, Val, false),
+		ExclSys = reltool_utils:choose_default(excl_sys_filters, Val, false),
+		InclApp = reltool_utils:choose_default(incl_app_filters, Val, false),
+		ExclApp = reltool_utils:choose_default(excl_app_filters, Val, false),
+		AppType = reltool_utils:choose_default(embedded_app_type, Val, false),
+		{Sys#sys{profile = Val,
+                         incl_sys_filters = dec_re(incl_sys_filters,
+						   InclSys,
+						   Sys#sys.incl_sys_filters),
+                         excl_sys_filters = dec_re(excl_sys_filters,
+						   ExclSys,
+						   Sys#sys.excl_sys_filters),
+                         incl_app_filters = dec_re(incl_app_filters,
+						   InclApp,
+						   Sys#sys.incl_app_filters),
+                         excl_app_filters = dec_re(excl_app_filters,
+						   ExclApp,
+						   Sys#sys.excl_app_filters),
+			 embedded_app_type = AppType},
                  Status};
             incl_sys_filters ->
                 {Sys#sys{incl_sys_filters =
diff --git a/lib/reltool/src/reltool_target.erl b/lib/reltool/src/reltool_target.erl
index bd06cda773..6149279112 100644
--- a/lib/reltool/src/reltool_target.erl
+++ b/lib/reltool/src/reltool_target.erl
@@ -132,15 +132,15 @@ do_gen_config(#sys{root_dir          	= RootDir,
      emit(emu_name, EmuName, ?DEFAULT_EMU_NAME, InclDefs) ++
      emit(relocatable, Relocatable, ?DEFAULT_RELOCATABLE, InclDefs) ++
      emit(profile, Profile, ?DEFAULT_PROFILE, InclDefs) ++
-     emit(incl_sys_filters, X(InclSysFiles), ?DEFAULT_INCL_SYS_FILTERS, InclDefs) ++
-     emit(excl_sys_filters, X(ExclSysFiles), ?DEFAULT_EXCL_SYS_FILTERS, InclDefs) ++
-     emit(incl_app_filters, X(InclAppFiles), ?DEFAULT_INCL_APP_FILTERS, InclDefs) ++
-     emit(excl_app_filters, X(ExclAppFiles), ?DEFAULT_EXCL_APP_FILTERS, InclDefs) ++
+     emit(incl_sys_filters, X(InclSysFiles), reltool_utils:choose_default(incl_sys_filters, Profile, InclDefs), InclDefs) ++
+     emit(excl_sys_filters, X(ExclSysFiles), reltool_utils:choose_default(excl_sys_filters, Profile, InclDefs), InclDefs) ++
+     emit(incl_app_filters, X(InclAppFiles), reltool_utils:choose_default(incl_app_filters, Profile, InclDefs), InclDefs) ++
+     emit(excl_app_filters, X(ExclAppFiles), reltool_utils:choose_default(excl_app_filters, Profile, InclDefs), InclDefs) ++
      emit(incl_archive_filters, X(InclArchiveDirs), ?DEFAULT_INCL_ARCHIVE_FILTERS, InclDefs) ++
      emit(excl_archive_filters, X(ExclArchiveDirs), ?DEFAULT_EXCL_ARCHIVE_FILTERS, InclDefs) ++
      emit(archive_opts, ArchiveOpts, ?DEFAULT_ARCHIVE_OPTS, InclDefs) ++
      emit(rel_app_type, RelAppType, ?DEFAULT_REL_APP_TYPE, InclDefs) ++
-     emit(embedded_app_type, InclAppType, ?DEFAULT_EMBEDDED_APP_TYPE, InclDefs) ++
+     emit(embedded_app_type, InclAppType, reltool_utils:choose_default(embedded_app_type, Profile, InclDefs), InclDefs) ++
      emit(app_file, AppFile, ?DEFAULT_APP_FILE, InclDefs) ++
      emit(debug_info, DebugInfo, ?DEFAULT_DEBUG_INFO, InclDefs)};
 do_gen_config(#app{name = Name,
@@ -221,6 +221,8 @@ do_gen_config([H | T], InclDefs) ->
     lists:flatten([do_gen_config(H, InclDefs), do_gen_config(T, InclDefs)]).
 
 emit(Tag, Val, Default, InclDefs) ->
+    %% io:format("~p(~p):\n\t~p\n\t~p\n",
+    %%           [Tag, Val =/= Default, Val, Default]),
     if
         Val == undefined -> [];
         InclDefs         -> [{Tag, Val}];
diff --git a/lib/reltool/src/reltool_utils.erl b/lib/reltool/src/reltool_utils.erl
index b33820c568..39d057d994 100644
--- a/lib/reltool/src/reltool_utils.erl
+++ b/lib/reltool/src/reltool_utils.erl
@@ -20,7 +20,8 @@
 
 %% Public
 -export([root_dir/0, erl_libs/0, lib_dirs/1,
-	 split_app_name/1, prim_consult/1, default_rels/0,
+	 split_app_name/1, prim_consult/1,
+	 default_rels/0, choose_default/3,
 
 	 assign_image_list/1, get_latest_resize/1,
 	 mod_conds/0, list_to_mod_cond/1, mod_cond_to_index/1,
@@ -139,6 +140,32 @@ default_rels() ->
 	  %%rel_apps = [Kernel, Sasl, Stdlib]}
     ].
 
+choose_default(Tag, Profile, InclDefs)
+  when Profile =:= ?DEFAULT_PROFILE; InclDefs ->
+    case Tag of
+	incl_sys_filters  -> ?DEFAULT_INCL_SYS_FILTERS;
+	excl_sys_filters  -> ?DEFAULT_EXCL_SYS_FILTERS;
+	incl_app_filters  -> ?DEFAULT_INCL_APP_FILTERS;
+	excl_app_filters  -> ?DEFAULT_EXCL_APP_FILTERS;
+	embedded_app_type -> ?DEFAULT_EMBEDDED_APP_TYPE
+    end;
+choose_default(Tag, standalone, _InclDefs) ->
+    case Tag of
+	incl_sys_filters  -> ?STANDALONE_INCL_SYS_FILTERS;
+	excl_sys_filters  -> ?STANDALONE_EXCL_SYS_FILTERS;
+	incl_app_filters  -> ?STANDALONE_INCL_APP_FILTERS;
+	excl_app_filters  -> ?STANDALONE_EXCL_APP_FILTERS;
+	embedded_app_type -> ?DEFAULT_EMBEDDED_APP_TYPE
+    end;
+choose_default(Tag, embedded, _InclDefs) ->
+    case Tag of
+	incl_sys_filters  -> ?EMBEDDED_INCL_SYS_FILTERS;
+	excl_sys_filters  -> ?EMBEDDED_EXCL_SYS_FILTERS;
+	incl_app_filters  -> ?EMBEDDED_INCL_APP_FILTERS;
+	excl_app_filters  -> ?EMBEDDED_EXCL_APP_FILTERS;
+	embedded_app_type -> ?EMBEDDED_APP_TYPE
+    end.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 assign_image_list(ListCtrl) ->
@@ -584,7 +611,12 @@ escript_foldl(Fun, Acc, File) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 call(Name, Msg) when is_atom(Name) ->
-    call(whereis(Name), Msg);
+    case whereis(Name) of
+	undefined ->
+	    {error, {noproc, Name}};
+	Pid ->
+	    call(Pid, Msg)
+    end;
 call(Pid, Msg) when is_pid(Pid) ->
     Ref = erlang:monitor(process, Pid),
     Pid ! {call, self(), Ref, Msg},