From 56090db3ea417157a749bdd810fc61d117493f1f Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Tue, 23 Feb 2016 19:45:01 +0100
Subject: erts: Change erl_exit into erts_exit

This is mostly a pure refactoring.

Except for the buggy cases when calling erlang:halt() with a positive
integer in the range -(INT_MIN+2) to -INT_MIN that got confused with
ERTS_ABORT_EXIT, ERTS_DUMP_EXIT and ERTS_INTR_EXIT.

Outcome             OLD erl_exit(n, )         NEW erts_exit(n, )
-------             -------------------       -------------------------------------------
exit(Status)        n = -Status <= 0          n = Status >= 0
crashdump+abort     n > 0, ignore n           n = ERTS_ERROR_EXIT < 0

The outcome of the old ERTS_ABORT_EXIT, ERTS_INTR_EXIT and
ERTS_DUMP_EXIT are the same as before (even though their values have
changed).
---
 erts/emulator/beam/erl_db.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'erts/emulator/beam/erl_db.c')

diff --git a/erts/emulator/beam/erl_db.c b/erts/emulator/beam/erl_db.c
index 878ee32b47..83c7ba7bbc 100644
--- a/erts/emulator/beam/erl_db.c
+++ b/erts/emulator/beam/erl_db.c
@@ -1295,7 +1295,7 @@ BIF_RETTYPE ets_rename_2(BIF_ALIST_2)
 	goto badarg;
 
     if (!remove_named_tab(tb, 1))
-	erl_exit(1,"Could not find named tab %s", tb->common.id);
+	erts_exit(ERTS_ERROR_EXIT,"Could not find named tab %s", tb->common.id);
 
     tb->common.id = tb->common.the_name = BIF_ARG_2;
 
@@ -1581,7 +1581,7 @@ BIF_RETTYPE ets_new_2(BIF_ALIST_2)
 			   BIF_P->common.id,
 			   make_small(slot)),
 		    0) != DB_ERROR_NONE) {
-	erl_exit(1,"Could not update ets metadata.");
+	erts_exit(ERTS_ERROR_EXIT,"Could not update ets metadata.");
     }
     db_meta_unlock(meta_pid_to_tab, LCK_WRITE_REC);
 
@@ -2940,7 +2940,7 @@ void init_db(ErtsDbSpinCount db_spin_count)
 
     bits = erts_fit_in_bits_int32(db_max_tabs-1);
     if (bits > SMALL_BITS) {
-	erl_exit(1,"Max limit for ets tabled too high %u (max %u).",
+	erts_exit(ERTS_ERROR_EXIT,"Max limit for ets tabled too high %u (max %u).",
 		 db_max_tabs, ((Uint)1)<<SMALL_BITS);
     }
     meta_main_tab_slot_mask = (((Uint)1)<<bits) - 1;
@@ -3001,7 +3001,7 @@ void init_db(ErtsDbSpinCount db_spin_count)
     db_init_lock(meta_pid_to_tab, "meta_pid_to_tab", "meta_pid_to_tab_FIX");*/
 
     if (db_create_hash(NULL, meta_pid_to_tab) != DB_ERROR_NONE) {
-	erl_exit(1,"Unable to create ets metadata tables.");
+	erts_exit(ERTS_ERROR_EXIT,"Unable to create ets metadata tables.");
     }
 
     erts_smp_atomic_set_nob(&init_tb.common.memory_size, 0);
@@ -3032,7 +3032,7 @@ void init_db(ErtsDbSpinCount db_spin_count)
     db_init_lock(meta_pid_to_fixed_tab, "meta_pid_to_fixed_tab", "meta_pid_to_fixed_tab_FIX");*/
 
     if (db_create_hash(NULL, meta_pid_to_fixed_tab) != DB_ERROR_NONE) {
-	erl_exit(1,"Unable to create ets metadata tables.");
+	erts_exit(ERTS_ERROR_EXIT,"Unable to create ets metadata tables.");
     }
 
     /* Non visual BIF to trap to. */
@@ -3229,7 +3229,7 @@ retry:
  * yielding.
  */
 #define ERTS_DB_INTERNAL_ERROR(LSTR) \
-  erl_exit(ERTS_ABORT_EXIT, "%s:%d:erts_db_process_exiting(): " LSTR "\n", \
+  erts_exit(ERTS_ABORT_EXIT, "%s:%d:erts_db_process_exiting(): " LSTR "\n", \
 	   __FILE__, __LINE__)
 
 int
@@ -3501,7 +3501,7 @@ static void fix_table_locked(Process* p, DbTable* tb)
 			   make_small(tb->common.slot)),
 		    0) != DB_ERROR_NONE) {
 	UnUseTmpHeap(3,p);
-	erl_exit(1,"Could not insert ets metadata in safe_fixtable.");
+	erts_exit(ERTS_ERROR_EXIT,"Could not insert ets metadata in safe_fixtable.");
     }	
     UnUseTmpHeap(3,p);
     db_meta_unlock(meta_pid_to_fixed_tab, LCK_WRITE_REC);
-- 
cgit v1.2.3