erts: Implement erlang:halt/2

4 files changed, 102 insertions, 15 deletions

diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index 148817bc7c..ebdca87f4a 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.c
@@ -3665,42 +3665,122 @@ BIF_RETTYPE display_nl_0(BIF_ALIST_0)
 /* ARGSUSED */
 BIF_RETTYPE halt_0(BIF_ALIST_0)
 {
-    VERBOSE(DEBUG_SYSTEM,("System halted by BIF halt/0\n"));
+    VERBOSE(DEBUG_SYSTEM,("System halted by BIF halt()\n"));
     erl_halt(0);
     ERTS_BIF_YIELD1(bif_export[BIF_halt_1], BIF_P, am_undefined);
 }
 
 /**********************************************************************/
 
-#define MSG_SIZE	200
+#define HALT_MSG_SIZE	200
+static char halt_msg[HALT_MSG_SIZE];
 
 /* stop the system with exit code */
 /* ARGSUSED */
 BIF_RETTYPE halt_1(BIF_ALIST_1)
 {
     Sint code;
-    static char msg[MSG_SIZE];
-    int i;
     
     if (is_small(BIF_ARG_1) && (code = signed_val(BIF_ARG_1)) >= 0) {
-	VERBOSE(DEBUG_SYSTEM,("System halted by BIF halt(%d)\n", code));
+	VERBOSE(DEBUG_SYSTEM,("System halted by BIF halt(%T)\n", BIF_ARG_1));
 	erl_halt((int)(- code));
 	ERTS_BIF_YIELD1(bif_export[BIF_halt_1], BIF_P, am_undefined);
     }
+    else if (ERTS_IS_ATOM_STR("abort", BIF_ARG_1)) {
+	VERBOSE(DEBUG_SYSTEM,("System halted by BIF halt(%T)\n", BIF_ARG_1));
+	erts_smp_proc_unlock(BIF_P, ERTS_PROC_LOCK_MAIN);
+	erl_exit(ERTS_ABORT_EXIT, "");
+    }
     else if (is_string(BIF_ARG_1) || BIF_ARG_1 == NIL) {
-	if ((i = intlist_to_buf(BIF_ARG_1, halt_msg, HALT_MSG_SIZE-1)) < 0)
+	int i;
+
+	if ((i = intlist_to_buf(BIF_ARG_1, halt_msg, HALT_MSG_SIZE-1)) < 0) {
 	    goto error;
-	msg[i] = '\0';
-	VERBOSE(DEBUG_SYSTEM,("System halted by BIF halt(%s)\n", msg));
+	}
+	halt_msg[i] = '\0';
+	VERBOSE(DEBUG_SYSTEM,("System halted by BIF halt(%T)\n", BIF_ARG_1));
 	erts_smp_proc_unlock(BIF_P, ERTS_PROC_LOCK_MAIN);
-	erl_exit(ERTS_DUMP_EXIT, "%s\n", msg);
-    } else {
-    error:
+	erl_exit(ERTS_DUMP_EXIT, "%s\n", halt_msg);
+    }
+    else
+	goto error;
+    return NIL;  /* Pedantic (lint does not know about erl_exit) */
+ error:
 	BIF_ERROR(BIF_P, BADARG);
+}
+
+/**********************************************************************/
+
+/* stop the system with exit code and flags */
+/* ARGSUSED */
+BIF_RETTYPE halt_2(BIF_ALIST_2)
+{
+    Sint code;
+    Eterm optlist = BIF_ARG_2;
+    int flush = 0;
+
+    for (optlist = BIF_ARG_2;
+	 is_list(optlist);
+	 optlist = CDR(list_val(optlist))) {
+	Eterm *tp, opt = CAR(list_val(optlist));
+	if (is_not_tuple(opt))
+	    goto error;
+	tp = tuple_val(opt);
+	if (tp[0] != make_arityval(2))
+	    goto error;
+	if (tp[1] == am_flush) {
+	    if (tp[2] == am_true)
+		flush = 1;
+	    else if (tp[2] == am_false)
+		flush = 0;
+	    else
+		goto error;
+	}
+	else
+	    goto error;
     }
+    if (is_not_nil(optlist))
+	goto error;
+
+    if (is_small(BIF_ARG_1) && (code = signed_val(BIF_ARG_1)) >= 0) {
+	VERBOSE(DEBUG_SYSTEM,
+		("System halted by BIF halt(%T, %T)\n", BIF_ARG_1, BIF_ARG_2));
+	if (flush) {
+	    erl_halt((int)(- code));
+	    ERTS_BIF_YIELD1(bif_export[BIF_halt_1], BIF_P, am_undefined);
+	}
+	else {
+	    erts_smp_proc_unlock(BIF_P, ERTS_PROC_LOCK_MAIN);
+	    erl_exit((int)(- code), "");
+	}
+    }
+    else if (ERTS_IS_ATOM_STR("abort", BIF_ARG_1)) {
+	VERBOSE(DEBUG_SYSTEM,
+		("System halted by BIF halt(%T, %T)\n", BIF_ARG_1, BIF_ARG_2));
+	erts_smp_proc_unlock(BIF_P, ERTS_PROC_LOCK_MAIN);
+	erl_exit(ERTS_ABORT_EXIT, "");
+    }
+    else if (is_string(BIF_ARG_1) || BIF_ARG_1 == NIL) {
+	int i;
+
+	if ((i = intlist_to_buf(BIF_ARG_1, halt_msg, HALT_MSG_SIZE-1)) < 0) {
+	    goto error;
+	}
+	halt_msg[i] = '\0';
+	VERBOSE(DEBUG_SYSTEM,
+		("System halted by BIF halt(%T, %T)\n", BIF_ARG_1, BIF_ARG_2));
+	erts_smp_proc_unlock(BIF_P, ERTS_PROC_LOCK_MAIN);
+	erl_exit(ERTS_DUMP_EXIT, "%s\n", halt_msg);
+    }
+    else
+	goto error;
     return NIL;  /* Pedantic (lint does not know about erl_exit) */
+ error:
+    BIF_ERROR(BIF_P, BADARG);
 }
 
+/**********************************************************************/
+
 BIF_RETTYPE function_exported_3(BIF_ALIST_3)
 {
     if (is_not_atom(BIF_ARG_1) ||
diff --git a/erts/emulator/beam/bif.tab b/erts/emulator/beam/bif.tab
index 8cc568b16c..007c884a6a 100644
--- a/erts/emulator/beam/bif.tab
+++ b/erts/emulator/beam/bif.tab
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1996-2011. 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
@@ -115,6 +115,8 @@ bif erlang:halt/0
 bif 'erl.lang.system':halt/0		ebif_halt_0
 bif erlang:halt/1
 bif 'erl.lang.system':halt/1		ebif_halt_1
+bif erlang:halt/2
+bif 'erl.lang.system':halt/2		ebif_halt_2
 bif erlang:phash/2
 bif erlang:phash2/1
 bif erlang:phash2/2
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl
index 845df0ca61..a7ce17eb53 100644
--- a/lib/hipe/cerl/erl_bif_types.erl
+++ b/lib/hipe/cerl/erl_bif_types.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2003-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
@@ -241,6 +241,7 @@ type(erl_ddll, try_unload, 2, Xs) ->
 %%-- erlang -------------------------------------------------------------------
 type(erlang, halt, 0, _) -> t_none();
 type(erlang, halt, 1, _) -> t_none();
+type(erlang, halt, 2, _) -> t_none();
 type(erlang, exit, 1, _) -> t_none();
 %% Note that exit/2 sends an exit signal to another process.
 type(erlang, exit, 2, _) -> t_atom('true');
@@ -3553,7 +3554,10 @@ arg_types(erlang, group_leader, 2) ->
 arg_types(erlang, halt, 0) ->
   [];
 arg_types(erlang, halt, 1) ->
-  [t_sup(t_non_neg_fixnum(), t_string())];
+  [t_sup([t_non_neg_fixnum(), t_atom('abort'), t_string()])];
+arg_types(erlang, halt, 2) ->
+  [t_sup([t_non_neg_fixnum(), t_atom('abort'), t_string()]),
+   t_list(t_tuple([t_atom('flush'), t_boolean()]))];
 arg_types(erlang, hash, 2) ->
   [t_any(), t_integer()];
 arg_types(erlang, hd, 1) ->
diff --git a/lib/stdlib/src/erl_internal.erl b/lib/stdlib/src/erl_internal.erl
index cd3b531d10..3063881890 100644
--- a/lib/stdlib/src/erl_internal.erl
+++ b/lib/stdlib/src/erl_internal.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1998-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
@@ -287,6 +287,7 @@ bif(group_leader, 0) -> true;
 bif(group_leader, 2) -> true;
 bif(halt, 0) -> true;
 bif(halt, 1) -> true;
+bif(halt, 2) -> true;
 bif(hd, 1) -> true;
 bif(integer_to_list, 1) -> true;
 bif(integer_to_list, 2) -> true;