Merge branch 'raimo/close-ports-on-halt/OTP-9985' into maint

* raimo/close-ports-on-halt/OTP-9985:
  erts: Basic test of erlang:halt/0..2
  erts: Document erlang:halt/2 and update erlang:halt/0,1
  erts: Implement erlang:halt/2
  stdlib: Stop working around erlang:halt not flushing
  erts: Make erlang:halt/0,1 close ports and flush async threads
  erts: Remove forgotten and unused function erl_exit0
  erts: Implement erl_halt
  erts: Remove unused ntbuild.erl

1 files changed, 29 insertions, 62 deletions

diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index 717315d8bd..ca4385dd3a 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
@@ -1510,7 +1510,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.
@@ -1542,7 +1542,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())
@@ -1585,21 +1585,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();
 
@@ -1609,66 +1600,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);
+}