aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/sys/win32
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2012-10-24 14:22:36 +0200
committerBjörn-Egil Dahlberg <[email protected]>2012-10-24 14:22:36 +0200
commitbb915519aa16f6410b19c6f868805b47717f11fa (patch)
tree02171f62ff06e14586a803b6a69c885978137cd8 /erts/emulator/sys/win32
parent49b7b5d5158f89fb4bee068719d000d6c753fdcd (diff)
parentd5733bc3e34449affde2594d85b905c8ab440d42 (diff)
downloadotp-bb915519aa16f6410b19c6f868805b47717f11fa.tar.gz
otp-bb915519aa16f6410b19c6f868805b47717f11fa.tar.bz2
otp-bb915519aa16f6410b19c6f868805b47717f11fa.zip
Merge branch 'maint'
Conflicts: erts/etc/common/heart.c
Diffstat (limited to 'erts/emulator/sys/win32')
-rwxr-xr-xerts/emulator/sys/win32/sys.c19
1 files changed, 17 insertions, 2 deletions
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