2 files changed, 75 insertions, 26 deletions

diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c
index 97756e8434..b485dbf784 100644
--- a/erts/emulator/sys/unix/sys.c
+++ b/erts/emulator/sys/unix/sys.c
@@ -58,7 +58,6 @@
 #define __DARWIN__ 1
 #endif
 
-
 #ifdef USE_THREADS
 #include "erl_threads.h"
 #endif
@@ -71,7 +70,6 @@ static erts_smp_rwmtx_t environ_rwmtx;
 #define MAX_VSIZE 16		/* Max number of entries allowed in an I/O
 				 * vector sock_sendv().
 				 */
-
 /*
  * Don't need global.h, but bif_table.h (included by bif.h),
  * won't compile otherwise
@@ -123,6 +121,15 @@ struct ErtsSysReportExit_ {
 #endif
 };
 
+/* This data is shared by these drivers - initialized by spawn_init() */
+static struct driver_data {
+    int port_num, ofd, packet_bytes;
+    ErtsSysReportExit *report_exit;
+    int pid;
+    int alive;
+    int status;
+} *driver_data;			/* indexed by fd */
+
 static ErtsSysReportExit *report_exit_list;
 #if CHLDWTHR && !defined(ERTS_SMP)
 static ErtsSysReportExit *report_exit_transit_list;
@@ -680,17 +687,40 @@ static RETSIGTYPE break_handler(int sig)
 #endif /* 0 */
 
 static ERTS_INLINE void
-prepare_crash_dump(void)
+prepare_crash_dump(int secs)
 {
+#define NUFBUF (3)
     int i, max;
     char env[21]; /* enough to hold any 64-bit integer */
     size_t envsz;
+    DeclareTmpHeapNoproc(heap,NUFBUF);
+    Port *heart_port;
+    Eterm *hp = heap;
+    Eterm list = NIL;
+    int heart_fd[2] = {-1,-1};
+
+    UseTmpHeapNoproc(NUFBUF);
 
     if (ERTS_PREPARED_CRASH_DUMP)
 	return; /* We have already been called */
 
+    heart_port = erts_get_heart_port();
+    if (heart_port) {
+	/* hearts input fd
+	 * We "know" drv_data is the in_fd since the port is started with read|write
+	 */
+	heart_fd[0] = (int)heart_port->drv_data;
+	heart_fd[1] = (int)driver_data[heart_fd[0]].ofd;
+
+	list = CONS(hp, make_small(8), list); hp += 2;
+
+	/* send to heart port, CMD = 8, i.e. prepare crash dump =o */
+	erts_write_to_port(ERTS_INVALID_PID, heart_port, list);
+    }
+
     /* Make sure we unregister at epmd (unknown fd) and get at least
        one free filedescriptor (for erl_crash.dump) */
+
     max = max_files;
     if (max < 1024)
 	max = 1024;
@@ -704,11 +734,15 @@ prepare_crash_dump(void)
 	if (i == async_fd[0] || i == async_fd[1])
 	    continue;
 #endif
+	/* We don't want to close our heart yet ... */
+	if (i == heart_fd[0] || i == heart_fd[1])
+	    continue;
+
 	close(i);
     }
 
     envsz = sizeof(env);
-    i = erts_sys_getenv_raw("ERL_CRASH_DUMP_NICE", env, &envsz);
+    i = erts_sys_getenv__("ERL_CRASH_DUMP_NICE", env, &envsz);
     if (i >= 0) {
 	int nice_val;
 	nice_val = i != 0 ? 0 : atoi(env);
@@ -717,21 +751,21 @@ prepare_crash_dump(void)
 	}
 	erts_silence_warn_unused_result(nice(nice_val));
     }
-    
-    envsz = sizeof(env);
-    i = erts_sys_getenv_raw("ERL_CRASH_DUMP_SECONDS", env, &envsz);
-    if (i >= 0) {
-	unsigned sec;
-	sec = (unsigned) i != 0 ? 0 : atoi(env);
-	alarm(sec);
-    }
 
+    /* Positive secs means an alarm must be set
+     * 0 or negative means no alarm
+     */
+    if (secs > 0) {
+	alarm((unsigned int)secs);
+    }
+    UnUseTmpHeapNoproc(NUFBUF);
+#undef NUFBUF
 }
 
 void
-erts_sys_prepare_crash_dump(void)
+erts_sys_prepare_crash_dump(int secs)
 {
-    prepare_crash_dump();
+    prepare_crash_dump(secs);
 }
 
 static ERTS_INLINE void
@@ -773,7 +807,7 @@ sigusr1_exit(void)
       is hung somewhere, so it won't be able to poll any flag we set here.
       */
     ERTS_SET_GOT_SIGUSR1;
-    prepare_crash_dump();
+    prepare_crash_dump((int)0);
     erl_exit(1, "Received SIGUSR1\n");
 }
 
@@ -1021,15 +1055,6 @@ void fini_getenv_state(GETENV_STATE *state)
 
 #define ERTS_SYS_READ_BUF_SZ (64*1024)
 
-/* This data is shared by these drivers - initialized by spawn_init() */
-static struct driver_data {
-    int port_num, ofd, packet_bytes;
-    ErtsSysReportExit *report_exit;
-    int pid;
-    int alive;
-    int status;
-} *driver_data;			/* indexed by fd */
-
 /* Driver interfaces */
 static ErlDrvData spawn_start(ErlDrvPort, char*, SysDriverOpts*);
 static ErlDrvData fd_start(ErlDrvPort, char*, SysDriverOpts*);
@@ -2419,6 +2444,15 @@ erts_sys_getenv_raw(char *key, char *value, size_t *size) {
     return erts_sys_getenv(key, value, size);
 }
 
+/*
+ * erts_sys_getenv
+ * returns:
+ *  -1, if environment key is not set with a value
+ *   0, if environment key is set and value fits into buffer size
+ *   1, if environment key is set but does not fit into buffer size
+ *      size is set with the needed buffer size value
+ */
+
 int
 erts_sys_getenv(char *key, char *value, size_t *size)
 {
diff --git a/erts/emulator/sys/win32/sys.c b/erts/emulator/sys/win32/sys.c
index 6c69fecbf3..47d12ed5fe 100755
--- a/erts/emulator/sys/win32/sys.c
+++ b/erts/emulator/sys/win32/sys.c
@@ -256,10 +256,25 @@ void erl_sys_args(int* argc, char** argv)
 }
 
 void
-erts_sys_prepare_crash_dump(void)
+erts_sys_prepare_crash_dump(int secs)
 {
+    Port *heart_port;
+    Eterm heap[3];
+    Eterm *hp = heap;
+    Eterm list = NIL;
+
+    heart_port = erts_get_heart_port();
+
+    if (heart_port) {
+
+	list = CONS(hp, make_small(8), list); hp += 2;
+
+	/* send to heart port, CMD = 8, i.e. prepare crash dump =o */
+	erts_write_to_port(NIL, heart_port, list);
+    }
+
     /* Windows - free file descriptors are hopefully available */
-    return;
+    /* Alarm not used on windows */
 }
 
 static void