Merge branch 'maint'

Conflicts:
	erts/doc/src/erlang.xml
	erts/emulator/beam/erl_process.c
	erts/emulator/beam/erl_process.h
	erts/emulator/test/bif_SUITE.erl
	erts/preloaded/ebin/erlang.beam
	erts/preloaded/src/erlang.erl
	lib/hipe/cerl/erl_bif_types.erl

8 files changed, 258 insertions, 97 deletions

diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index 9b2394d92f..d39beea1f3 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.c
@@ -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
@@ -3665,43 +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"));
-    erts_smp_proc_unlock(BIF_P, ERTS_PROC_LOCK_MAIN);
-    erl_exit(0, "");
-    return NIL;  /* Pedantic (lint does not know about erl_exit) */
+    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(-code, "");
-    } else if (is_string(BIF_ARG_1) || BIF_ARG_1 == NIL) {
-	if ((i = intlist_to_buf(BIF_ARG_1, msg, MSG_SIZE-1)) < 0) {
+	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;
 	}
-	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 7f874a2d9c..1338b90374 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/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index 4db23a0a18..f56ccac33d 100644
--- a/erts/emulator/beam/erl_init.c
+++ b/erts/emulator/beam/erl_init.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1997-2011. 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
@@ -1514,7 +1514,7 @@ __decl_noreturn void erts_thr_fatal_error(int err, char *what)
 #endif
 
 static void
-system_cleanup(int exit_code)
+system_cleanup(int flush_async)
 {
     /*
      * Make sure only one thread exits the runtime system.
@@ -1546,7 +1546,7 @@ system_cleanup(int exit_code)
      *    (in threaded non smp case).
      */
 
-    if (exit_code != 0
+    if (!flush_async
 	|| !erts_initialized
 #if defined(USE_THREADS) && !defined(ERTS_SMP)
 	|| !erts_equal_tids(main_thread, erts_thr_self())
@@ -1589,21 +1589,12 @@ system_cleanup(int exit_code)
     erts_exit_flush_async();
 }
 
-/*
- * Common exit function, all exits from the system go through here.
- * n <= 0 -> normal exit with status n;
- * n = 127 -> Erlang crash dump produced, exit with status 1;
- * other positive n -> Erlang crash dump and core dump produced.
- */
-
-__decl_noreturn void erl_exit0(char *file, int line, int n, char *fmt,...)
+static __decl_noreturn void __noreturn
+erl_exit_vv(int n, int flush_async, char *fmt, va_list args1, va_list args2)
 {
     unsigned int an;
-    va_list args;
 
-    va_start(args, fmt);
-
-    system_cleanup(n);
+    system_cleanup(flush_async);
 
     save_statistics();
 
@@ -1613,66 +1604,42 @@ __decl_noreturn void erl_exit0(char *file, int line, int n, char *fmt,...)
 	erts_mtrace_exit((Uint32) an);
 
     /* Produce an Erlang core dump if error */
-    if (n > 0 && erts_initialized &&
-	(erts_no_crash_dump == 0 || n == ERTS_DUMP_EXIT)) {
-	erl_crash_dump_v(file, line, fmt, args); 
+    if (((n > 0 && erts_no_crash_dump == 0) || n == ERTS_DUMP_EXIT)
+	&& erts_initialized) {
+	erl_crash_dump_v((char*) NULL, 0, fmt, args1);
     }
 
-    /* need to reinitialize va_args thing */
-    va_end(args);
-    va_start(args, fmt);
-
     if (fmt != NULL && *fmt != '\0')
-	  erl_error(fmt, args);	/* Print error message. */
-    va_end(args);
+	  erl_error(fmt, args2);	/* Print error message. */
     sys_tty_reset(n);
 
     if (n == ERTS_INTR_EXIT)
 	exit(0);
-    else if (n == 127)
+    else if (n == ERTS_DUMP_EXIT)
 	ERTS_EXIT_AFTER_DUMP(1);
     else if (n > 0 || n == ERTS_ABORT_EXIT)
         abort();
     exit(an);
 }
 
-__decl_noreturn void erl_exit(int n, char *fmt,...)
+/* Exit without flushing async threads */
+__decl_noreturn void __noreturn erl_exit(int n, char *fmt, ...)
 {
-    unsigned int an;
-    va_list args;
-
-    va_start(args, fmt);
-
-    system_cleanup(n);
-
-    save_statistics();
-
-    an = abs(n);
-
-    if (erts_mtrace_enabled)
-	erts_mtrace_exit((Uint32) an);
-
-    /* Produce an Erlang core dump if error */
-    if (n > 0 && erts_initialized &&
-	(erts_no_crash_dump == 0 || n == ERTS_DUMP_EXIT)) {
-	erl_crash_dump_v((char*) NULL, 0, fmt, args);
-    }
-
-    /* need to reinitialize va_args thing */
-    va_end(args);
-    va_start(args, fmt);
-
-    if (fmt != NULL && *fmt != '\0')
-	  erl_error(fmt, args);	/* Print error message. */
-    va_end(args);
-    sys_tty_reset(n);
-
-    if (n == ERTS_INTR_EXIT)
-	exit(0);
-    else if (n == ERTS_DUMP_EXIT)
-	ERTS_EXIT_AFTER_DUMP(1);
-    else if (n > 0 || n == ERTS_ABORT_EXIT)
-        abort();
-    exit(an);
+    va_list args1, args2;
+    va_start(args1, fmt);
+    va_start(args2, fmt);
+    erl_exit_vv(n, 0, fmt, args1, args2);
+    va_end(args2);
+    va_end(args1);
 }
 
+/* Exit after flushing async threads */
+__decl_noreturn void __noreturn erl_exit_flush_async(int n, char *fmt, ...)
+{
+    va_list args1, args2;
+    va_start(args1, fmt);
+    va_start(args2, fmt);
+    erl_exit_vv(n, 1, fmt, args1, args2);
+    va_end(args2);
+    va_end(args1);
+}
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index 6c136571d5..ec85dd487a 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -104,6 +104,9 @@ do {								\
 #define ERTS_EMPTY_RUNQ(RQ) \
   ((RQ)->len == 0 && (RQ)->misc.start == NULL)
 
+#define ERTS_EMPTY_RUNQ_PORTS(RQ) \
+  ((RQ)->ports.info.len == 0 && (RQ)->misc.start == NULL)
+
 extern BeamInstr beam_apply[];
 extern BeamInstr beam_exit[];
 extern BeamInstr beam_continue_exit[];
@@ -369,6 +372,9 @@ dbg_chk_aux_work_val(erts_aint32_t value)
 #ifdef ERTS_SMP
     valid |= ERTS_SSI_AUX_WORK_CODE_IX_ACTIVATION;
 #endif
+#ifdef ERTS_SSI_AUX_WORK_REAP_PORTS
+    valid |= ERTS_SSI_AUX_WORK_REAP_PORTS;
+#endif
 
     if (~valid & value)
 	erl_exit(ERTS_ABORT_EXIT,
@@ -864,8 +870,6 @@ set_aux_work_flags_wakeup_nob(ErtsSchedulerSleepInfo *ssi,
     }
 }
 
-#ifdef ERTS_SMP
-
 static ERTS_INLINE void
 set_aux_work_flags_wakeup_relb(ErtsSchedulerSleepInfo *ssi,
 			       erts_aint32_t flgs)
@@ -885,8 +889,6 @@ set_aux_work_flags_wakeup_relb(ErtsSchedulerSleepInfo *ssi,
     }
 }
 
-#endif /* ERTS_SMP */
-
 static ERTS_INLINE erts_aint32_t
 set_aux_work_flags(ErtsSchedulerSleepInfo *ssi, erts_aint32_t flgs)
 {
@@ -1392,6 +1394,65 @@ handle_check_children(ErtsAuxWorkData *awdp, erts_aint32_t aux_work)
 
 #endif
 
+static void
+notify_reap_ports_relb(void)
+{
+    int i;
+    for (i = 0; i < erts_no_schedulers; i++) {
+	set_aux_work_flags_wakeup_relb(ERTS_SCHED_SLEEP_INFO_IX(i),
+				       ERTS_SSI_AUX_WORK_REAP_PORTS);
+    }
+}
+
+erts_smp_atomic32_t erts_halt_progress;
+int erts_halt_code;
+
+static ERTS_INLINE erts_aint32_t
+handle_reap_ports(ErtsAuxWorkData *awdp, erts_aint32_t aux_work)
+{
+    unset_aux_work_flags(awdp->ssi, ERTS_SSI_AUX_WORK_REAP_PORTS);
+    awdp->esdp->run_queue->halt_in_progress = 1;
+    if (erts_smp_atomic32_dec_read_acqb(&erts_halt_progress) == 0) {
+	int i;
+	erts_smp_atomic32_set_nob(&erts_halt_progress, 1);
+	for (i = 0; i < erts_max_ports; i++) {
+	    Port *prt = &erts_port[i];
+	    erts_smp_port_state_lock(prt);
+	    if ((prt->status & (ERTS_PORT_SFLGS_INVALID_DRIVER_LOOKUP
+				| ERTS_PORT_SFLG_HALT))) {
+		erts_smp_port_state_unlock(prt);
+		continue;
+	    }
+	    /* We need to set the halt flag - get the port lock */
+#ifdef ERTS_SMP
+	    erts_smp_atomic_inc_nob(&prt->refc);
+#endif
+	    erts_smp_port_state_unlock(prt);
+#ifdef ERTS_SMP
+	    erts_smp_mtx_lock(prt->lock);
+#endif
+	    if ((prt->status & (ERTS_PORT_SFLGS_INVALID_DRIVER_LOOKUP
+				| ERTS_PORT_SFLG_HALT))) {
+		erts_port_release(prt);
+		continue;
+	    }
+	    erts_port_status_bor_set(prt, ERTS_PORT_SFLG_HALT);
+	    erts_smp_atomic32_inc_nob(&erts_halt_progress);
+	    if (prt->status & (ERTS_PORT_SFLG_EXITING
+			       | ERTS_PORT_SFLG_CLOSING)) {
+		erts_port_release(prt);
+		continue;
+	    }
+	    erts_do_exit_port(prt, prt->id, am_killed);
+	    erts_port_release(prt);
+	}
+	if (erts_smp_atomic32_dec_read_nob(&erts_halt_progress) == 0) {
+	    erl_exit_flush_async(erts_halt_code, "");
+	}
+    }
+    return aux_work & ~ERTS_SSI_AUX_WORK_REAP_PORTS;
+}
+
 #if HAVE_ERTS_MSEG
 
 static ERTS_INLINE erts_aint32_t
@@ -1496,6 +1557,10 @@ handle_aux_work(ErtsAuxWorkData *awdp, erts_aint32_t orig_aux_work)
     HANDLE_AUX_WORK(ERTS_SSI_AUX_WORK_CODE_IX_ACTIVATION,
 		    handle_code_ix_activation);
 #endif
+
+    HANDLE_AUX_WORK(ERTS_SSI_AUX_WORK_REAP_PORTS,
+		    handle_reap_ports);
+
     ERTS_DBG_CHK_AUX_WORK_VAL(aux_work);
 
     return aux_work;
@@ -2761,6 +2826,9 @@ try_steal_task_from_victim(ErtsRunQueue *rq, int *rq_lockedp, ErtsRunQueue *vrq)
     ERTS_SMP_LC_CHK_RUNQ_LOCK(rq, *rq_lockedp);
     ERTS_SMP_LC_CHK_RUNQ_LOCK(vrq, vrq_locked);
 
+    if (rq->halt_in_progress)
+	goto try_steal_port;
+
     /*
      * Check for a runnable process to steal...
      */
@@ -2847,6 +2915,8 @@ try_steal_task_from_victim(ErtsRunQueue *rq, int *rq_lockedp, ErtsRunQueue *vrq)
 	vrq_locked = 1;
     }
 
+ try_steal_port:
+
     ERTS_SMP_LC_CHK_RUNQ_LOCK(rq, *rq_lockedp);
     ERTS_SMP_LC_CHK_RUNQ_LOCK(vrq, vrq_locked);
 
@@ -2962,7 +3032,8 @@ try_steal_task(ErtsRunQueue *rq)
 	erts_smp_runq_lock(rq);
 
     if (!res)
-	res = !ERTS_EMPTY_RUNQ(rq);
+	res = rq->halt_in_progress ?
+	    !ERTS_EMPTY_RUNQ_PORTS(rq) : !ERTS_EMPTY_RUNQ(rq);
 
     return res;
 }
@@ -3628,6 +3699,7 @@ erts_init_scheduling(int no_schedulers, int no_schedulers_online)
 	rq->len = 0;
 	rq->wakeup_other = 0;
 	rq->wakeup_other_reds = 0;
+	rq->halt_in_progress = 0;
 
 	rq->procs.len = 0;
 	rq->procs.pending_exiters = NULL;
@@ -3822,6 +3894,9 @@ erts_init_scheduling(int no_schedulers, int no_schedulers_online)
     ERTS_VERIFY_UNUSED_TEMP_ALLOC(NULL);
 #endif
 #endif
+
+    erts_smp_atomic32_init_relb(&erts_halt_progress, -1);
+    erts_halt_code = 0;
 }
 
 ErtsRunQueue *
@@ -6388,7 +6463,9 @@ Process *schedule(Process *p, int calls)
 
 	ASSERT(rq->len == rq->procs.len + rq->ports.info.len);
 
-	if (rq->len == 0 && !rq->misc.start) {
+	if ((rq->len == 0 && !rq->misc.start)
+	    || (rq->halt_in_progress
+		&& rq->ports.info.len == 0 && !rq->misc.start)) {
 
 #ifdef ERTS_SMP
 
@@ -6486,7 +6563,8 @@ Process *schedule(Process *p, int calls)
 	if (rq->ports.info.len) {
 	    int have_outstanding_io;
 	    have_outstanding_io = erts_port_task_execute(rq, &esdp->current_port);
-	    if (have_outstanding_io && fcalls > 2*input_reductions) {
+	    if ((have_outstanding_io && fcalls > 2*input_reductions)
+		|| rq->halt_in_progress) {
 		/*
 		 * If we have performed more than 2*INPUT_REDUCTIONS since
 		 * last call to erl_sys_schedule() and we still haven't
@@ -9907,3 +9985,30 @@ debug_processes_assert_error(char* expr, char* file, int line)
 /*                                                                           *\
  * End of the processes/0 BIF implementation.                                *
 \* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/*
+ * A nice system halt closing all open port goes as follows:
+ * 1) This function schedules the aux work ERTS_SSI_AUX_WORK_REAP_PORTS
+ *    on all schedulers, then schedules itself out.
+ * 2) All shedulers detect this and set the flag halt_in_progress
+ *    on their run queue. The last scheduler sets all non-closed ports
+ *    ERTS_PORT_SFLG_HALT. Global atomic erts_halt_progress is used
+ *    as refcount to determine which is last.
+ * 3) While the run ques has flag halt_in_progress no processes
+ *    will be scheduled, only ports.
+ * 4) When the last port closes that scheduler calls erlang:halt/1.
+ *    The same global atomic is used as refcount.
+ *
+ * A BIF that calls this should make sure to schedule out to never come back:
+ *    erl_halt((int)(- code));
+ *    ERTS_BIF_YIELD1(bif_export[BIF_erlang_halt_1], BIF_P, NIL);
+ */
+void erl_halt(int code)
+{
+    if (-1 == erts_smp_atomic32_cmpxchg_acqb(&erts_halt_progress,
+					     erts_no_schedulers,
+					     -1)) {
+	erts_halt_code = code;
+	notify_reap_ports_relb();
+    }
+}
diff --git a/erts/emulator/beam/erl_process.h b/erts/emulator/beam/erl_process.h
index 3f19d92fcd..e20cb493f0 100644
--- a/erts/emulator/beam/erl_process.h
+++ b/erts/emulator/beam/erl_process.h
@@ -265,6 +265,7 @@ typedef enum {
 #define ERTS_SSI_AUX_WORK_SET_TMO		(((erts_aint32_t) 1) << 9)
 #define ERTS_SSI_AUX_WORK_MSEG_CACHE_CHECK	(((erts_aint32_t) 1) << 10)
 #define ERTS_SSI_AUX_WORK_CODE_IX_ACTIVATION	(((erts_aint32_t) 1) << 11)
+#define ERTS_SSI_AUX_WORK_REAP_PORTS		(((erts_aint32_t) 1) << 12)
 
 typedef struct ErtsSchedulerSleepInfo_ ErtsSchedulerSleepInfo;
 
@@ -342,6 +343,7 @@ struct ErtsRunQueue_ {
     int len;
     int wakeup_other;
     int wakeup_other_reds;
+    int halt_in_progress;
 
     struct {
 	int len;
@@ -1669,4 +1671,6 @@ erts_sched_poke(ErtsSchedulerSleepInfo *ssi)
 #endif
 
 
-
+void erl_halt(int code);
+extern erts_smp_atomic32_t erts_halt_progress;
+extern int erts_halt_code;
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h
index 1431e08610..b259ef3694 100644
--- a/erts/emulator/beam/global.h
+++ b/erts/emulator/beam/global.h
@@ -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
@@ -808,6 +808,8 @@ do {									\
 /* Port uses port specific locking (opposed to driver specific locking) */
 #define ERTS_PORT_SFLG_PORT_SPECIFIC_LOCK ((Uint32) (1 << 13))
 #define ERTS_PORT_SFLG_INVALID		((Uint32) (1 << 14))
+/* Last port to terminate halts the emulator */
+#define ERTS_PORT_SFLG_HALT		((Uint32) (1 << 15))
 #ifdef DEBUG
 /* Only debug: make sure all flags aren't cleared unintentionally */
 #define ERTS_PORT_SFLG_PORT_DEBUG	((Uint32) (1 << 31))
@@ -912,14 +914,9 @@ void loaded(int, void *);
 /* config.c */
 
 __decl_noreturn void __noreturn erl_exit(int n, char*, ...);
-__decl_noreturn void __noreturn erl_exit0(char *, int, int n, char*, ...);
+__decl_noreturn void __noreturn erl_exit_flush_async(int n, char*, ...);
 void erl_error(char*, va_list);
 
-#define ERL_EXIT0(n,f)		erl_exit0(__FILE__, __LINE__, n, f)
-#define ERL_EXIT1(n,f,a)	erl_exit0(__FILE__, __LINE__, n, f, a)
-#define ERL_EXIT2(n,f,a,b)	erl_exit0(__FILE__, __LINE__, n, f, a, b)
-#define ERL_EXIT3(n,f,a,b,c)	erl_exit0(__FILE__, __LINE__, n, f, a, b, c)
-
 /* copy.c */
 void init_copy(void);
 Eterm copy_object(Eterm, Process*);
diff --git a/erts/emulator/beam/io.c b/erts/emulator/beam/io.c
index 603a6c47aa..7604365ab6 100644
--- a/erts/emulator/beam/io.c
+++ b/erts/emulator/beam/io.c
@@ -1838,6 +1838,7 @@ terminate_port(Port *prt)
     Eterm send_closed_port_id;
     Eterm connected_id = NIL /* Initialize to silence compiler */;
     erts_driver_t *drv;
+    int halt;
 
     ERTS_SMP_CHK_NO_PROC_LOCKS;
     ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(prt));
@@ -1845,6 +1846,8 @@ terminate_port(Port *prt)
     ASSERT(!prt->nlinks);
     ASSERT(!prt->monitors);
 
+    /* prt->status may be altered by kill_port()below */
+    halt = (prt->status & ERTS_PORT_SFLG_HALT) != 0;
     if (prt->status & ERTS_PORT_SFLG_SEND_CLOSED) {
 	erts_port_status_band_set(prt, ~ERTS_PORT_SFLG_SEND_CLOSED);
 	send_closed_port_id = prt->id;
@@ -1896,6 +1899,10 @@ terminate_port(Port *prt)
      * We don't want to send the closed message until after the
      * port has been removed from the port table (in kill_port()).
      */
+    if (halt && (erts_smp_atomic32_dec_read_nob(&erts_halt_progress) == 0)) {
+	erts_smp_port_unlock(prt); /* We will exit and never return */
+	erl_exit_flush_async(erts_halt_code, "");
+    }
     if (is_internal_port(send_closed_port_id))
 	deliver_result(send_closed_port_id, connected_id, am_closed);
 
diff --git a/erts/emulator/beam/sys.h b/erts/emulator/beam/sys.h
index eb6f2f8516..7b2bb81f62 100644
--- a/erts/emulator/beam/sys.h
+++ b/erts/emulator/beam/sys.h
@@ -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
@@ -511,7 +511,7 @@ __decl_noreturn void __noreturn erl_exit(int n, char*, ...);
 /* Some special erl_exit() codes: */
 #define ERTS_INTR_EXIT	INT_MIN		/* called from signal handler */
 #define ERTS_ABORT_EXIT	(INT_MIN + 1)	/* no crash dump; only abort() */
-#define ERTS_DUMP_EXIT	(127)		/* crash dump; then exit() */
+#define ERTS_DUMP_EXIT	(INT_MIN + 2)	/* crash dump; then exit() */
 
 Eterm erts_check_io_info(void *p);