Merge branch 'egil/ensure-erl_crash.dump/OTP-10422' into maint

* egil/ensure-erl_crash.dump/OTP-10422:
  test: Relax timeouts for heart_SUITE
  erts: Fix crash dump write to port hack
  erts: Fix lock check assertion
  doc: Document ERL_CRASH_DUMP_SECONDS behaviour
  test: Add test for heart restart on crash
  test: Add test for heart restart on crash
  erts: Change ERL_CRASH_DUMP_SECONDS behaviour
  test: Refactor away ?line macros in heart_SUITE
  erts: Search for heart in ports that are alive
  heart: Refactor heart debugging
  erts, heart: Ensure erl_crash.dump is written

1 files changed, 17 insertions, 2 deletions

diff --git a/erts/emulator/sys/win32/sys.c b/erts/emulator/sys/win32/sys.c
index c4e748ed3c..50f6219374 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