Merge branch 'dgud/mnesia/try-catch'

* dgud/mnesia/try-catch:
  mnesia: Replace catch with try-catch

1 files changed, 60 insertions, 71 deletions

diff --git a/lib/mnesia/src/mnesia_lib.erl b/lib/mnesia/src/mnesia_lib.erl
index fc41cbedcb..7bd207f816 100644
--- a/lib/mnesia/src/mnesia_lib.erl
+++ b/lib/mnesia/src/mnesia_lib.erl
@@ -114,9 +114,7 @@
 	 lock_table/1,
 	 mkcore/1,
 	 not_active_here/1,
-	 other_val/2,
          other_val/1,
-         pr_other/2,
          overload_read/0,
          overload_read/1,
          overload_set/2,
@@ -380,8 +378,8 @@ search_key(_Key, []) ->
 
 val(Var) ->
     case ?catch_val(Var) of
-	{'EXIT', _ReASoN_} -> mnesia_lib:other_val(Var, _ReASoN_); 
-	_VaLuE_ -> _VaLuE_ 
+	{'EXIT', _} -> other_val(Var);
+	_VaLuE_ -> _VaLuE_
     end.
 
 set(Var, Val) ->
@@ -390,13 +388,13 @@ set(Var, Val) ->
 unset(Var) ->
     ?ets_delete(mnesia_gvar, Var).
 
-other_val(Var, Other) ->
-    case other_val(Var) of
-        error -> pr_other(Var, Other);
+other_val(Var) ->
+    case other_val_1(Var) of
+        error -> pr_other(Var);
         Val -> Val
     end.
 
-other_val(Var) ->
+other_val_1(Var) ->
     case Var of
 	{_, where_to_read} -> nowhere;
 	{_, where_to_write} -> [];
@@ -404,21 +402,16 @@ other_val(Var) ->
 	_ -> error
     end.
 
-pr_other(Var, Other) ->
-    Why = 
+pr_other(Var) ->
+    Why =
 	case is_running() of
 	    no -> {node_not_running, node()};
 	    _ -> {no_exists, Var}
 	end,
-    verbose("~p (~p) val(mnesia_gvar, ~w) -> ~p ~p ~n",
+    verbose("~p (~p) val(mnesia_gvar, ~w) -> ~p ~n",
 	    [self(), process_info(self(), registered_name),
-	     Var, Other, Why]),
-    case Other of
-	{badarg, [{ets, lookup_element, _, _}|_]} ->
-	    exit(Why);
-	_ ->
-	    erlang:error(Why)
-    end.
+	     Var, Why]),
+    exit(Why).
 
 %% Some functions for list valued variables
 add(Var, Val) ->
@@ -905,7 +898,7 @@ dirty_rpc_error_tag(Reason) ->
     end.
 
 fatal(Format, Args) ->
-    catch set(mnesia_status, stopping),
+    ?SAFE(catch set(mnesia_status, stopping)),
     Core = mkcore({crashinfo, {Format, Args}}),
     report_fatal(Format, Args, Core),
     timer:sleep(10000), % Enough to write the core dump to disc?
@@ -917,7 +910,7 @@ report_fatal(Format, Args) ->
 
 report_fatal(Format, Args, Core) ->
     report_system_event({mnesia_fatal, Format, Args, Core}),
-    catch exit(whereis(mnesia_monitor), fatal).
+    ?SAFE(exit(whereis(mnesia_monitor), fatal)).
 
 %% We sleep longer and longer the more we try
 %% Made some testing and came up with the following constants
@@ -1014,7 +1007,7 @@ dbg_out(Format, Args) ->
 
 %% Keep the last 10 debug print outs
 save(DbgInfo) ->
-    catch save2(DbgInfo).
+    ?SAFE(save2(DbgInfo)).
 
 save2(DbgInfo) ->
     Key = {'$$$_report', current_pos},
@@ -1090,35 +1083,29 @@ db_match_object(Tab, Pat) ->
     db_match_object(val({Tab, storage_type}), Tab, Pat).
 db_match_object(Storage, Tab, Pat) ->
     db_fixtable(Storage, Tab, true),
-    Res = catch_match_object(Storage, Tab, Pat),
-    db_fixtable(Storage, Tab, false),
-    case Res of
-	{'EXIT', Reason} -> exit(Reason);
-	_ -> Res
+    try
+	case Storage of
+	    disc_only_copies -> dets:match_object(Tab, Pat);
+	    _ -> ets:match_object(Tab, Pat)
+	end
+    after
+	db_fixtable(Storage, Tab, false)
     end.
 
-catch_match_object(disc_only_copies, Tab, Pat) ->
-    catch dets:match_object(Tab, Pat);
-catch_match_object(_, Tab, Pat) ->
-    catch ets:match_object(Tab, Pat).
-
 db_select(Tab, Pat) ->
     db_select(val({Tab, storage_type}), Tab, Pat).
 
 db_select(Storage, Tab, Pat) ->
     db_fixtable(Storage, Tab, true),
-    Res = catch_select(Storage, Tab, Pat),
-    db_fixtable(Storage, Tab, false),
-    case Res of
-	{'EXIT', Reason} -> exit(Reason);
-	_ -> Res
+    try
+	case Storage of
+	    disc_only_copies -> dets:select(Tab, Pat);
+	    _ -> ets:select(Tab, Pat)
+	end
+    after
+	db_fixtable(Storage, Tab, false)
     end.
 
-catch_select(disc_only_copies, Tab, Pat) ->
-    catch dets:select(Tab, Pat);
-catch_select(_, Tab, Pat) ->
-    catch ets:select(Tab, Pat).
-
 db_select_init(disc_only_copies, Tab, Pat, Limit) ->
     dets:select(Tab, Pat, Limit);
 db_select_init(_, Tab, Pat, Limit) ->
@@ -1262,7 +1249,7 @@ dets_sync_open(Tab, Args) ->
     end.
 
 dets_sync_close(Tab) ->
-    catch dets:close(Tab),
+    ?SAFE(dets:close(Tab)),
     unlock_table(Tab),
     ok.
 
@@ -1298,7 +1285,7 @@ readable_indecies(Tab) ->
 
 scratch_debug_fun() ->
     dbg_out("scratch_debug_fun(): ~p~n", [?DEBUG_TAB]),
-    (catch ?ets_delete_table(?DEBUG_TAB)),
+    ?SAFE(?ets_delete_table(?DEBUG_TAB)),
     ?ets_new_table(?DEBUG_TAB, [set, public, named_table, {keypos, 2}]).
 
 activate_debug_fun(FunId, Fun, InitialContext, File, Line) ->
@@ -1311,43 +1298,45 @@ activate_debug_fun(FunId, Fun, InitialContext, File, Line) ->
     update_debug_info(Info).
 
 update_debug_info(Info) ->
-    case catch ?ets_insert(?DEBUG_TAB, Info) of
-	{'EXIT', _} ->
+    try ?ets_insert(?DEBUG_TAB, Info),
+	 ok
+    catch error:_ ->
 	    scratch_debug_fun(),
-	    ?ets_insert(?DEBUG_TAB, Info);
-	_ ->
-	    ok
+	    ?ets_insert(?DEBUG_TAB, Info)
     end,
     dbg_out("update_debug_info(~p)~n", [Info]),
     ok.
 
 deactivate_debug_fun(FunId, _File, _Line) ->
-    catch ?ets_delete(?DEBUG_TAB, FunId),
+    ?SAFE(?ets_delete(?DEBUG_TAB, FunId)),
     ok.
 
 eval_debug_fun(FunId, EvalContext, EvalFile, EvalLine) ->
-    case catch ?ets_lookup(?DEBUG_TAB, FunId) of
-	[] ->
-	    ok;
-	[Info] ->
-	    OldContext = Info#debug_info.context,
-	    dbg_out("~s(~p): ~w "
-		    "activated in ~s(~p)~n  "
-		    "eval_debug_fun(~w, ~w)~n",
-		    [filename:basename(EvalFile), EvalLine, Info#debug_info.id,
-		     filename:basename(Info#debug_info.file), Info#debug_info.line,
-		     OldContext, EvalContext]),
-	    Fun = Info#debug_info.function,
-	    NewContext = Fun(OldContext, EvalContext),
-	    
-	    case catch ?ets_lookup(?DEBUG_TAB, FunId) of
-		[Info] when NewContext /= OldContext ->
-		    NewInfo = Info#debug_info{context = NewContext},
-		    update_debug_info(NewInfo);
-		_ ->
-		    ok
-	    end;
-	{'EXIT', _} -> ok    
+    try 
+	case ?ets_lookup(?DEBUG_TAB, FunId) of
+	    [] ->
+		ok;
+	    [Info] ->
+		OldContext = Info#debug_info.context,
+		dbg_out("~s(~p): ~w "
+			"activated in ~s(~p)~n  "
+			"eval_debug_fun(~w, ~w)~n",
+			[filename:basename(EvalFile), EvalLine, Info#debug_info.id,
+			 filename:basename(Info#debug_info.file), Info#debug_info.line,
+			 OldContext, EvalContext]),
+		Fun = Info#debug_info.function,
+		NewContext = Fun(OldContext, EvalContext),
+
+		case ?ets_lookup(?DEBUG_TAB, FunId) of
+		    [Info] when NewContext /= OldContext ->
+			NewInfo = Info#debug_info{context = NewContext},
+			update_debug_info(NewInfo);
+		    _ ->
+			ok
+		end
+	end
+    catch error ->
+	    ok
     end.
 	
 -ifdef(debug).