aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/sys/win32
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2012-12-06 15:02:45 +0100
committerBjörn-Egil Dahlberg <[email protected]>2012-12-06 15:02:45 +0100
commit1cbd897c43f0dab1275392a3736e4629c1f80243 (patch)
tree523c09bf004e1028c6a4f0baa19f24f973b1b7bf /erts/emulator/sys/win32
parent214d1aaf4749ae6a7bb0506cf448551a312a9a58 (diff)
parent05f8e1029d5bfc102558c68264ee91757788885e (diff)
downloadotp-1cbd897c43f0dab1275392a3736e4629c1f80243.tar.gz
otp-1cbd897c43f0dab1275392a3736e4629c1f80243.tar.bz2
otp-1cbd897c43f0dab1275392a3736e4629c1f80243.zip
Merge tag 'erl_1219' into maintOTP_R15B03-1
erts: Patch 1219 OTP-10602 Create an erl_crash.dump if no heart exists and no ERL_CRASH_DUMP_SECONDS is set (behaviour changed). Don't create an erl_crash.dump if heart do exists and no ERL_CRASH_DUMP_SECONDS is set (behaviour not changed). This changes the behaviour back to the R15B02 default considering if a beam was running with no heart.
Diffstat (limited to 'erts/emulator/sys/win32')
-rwxr-xr-xerts/emulator/sys/win32/sys.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/erts/emulator/sys/win32/sys.c b/erts/emulator/sys/win32/sys.c
index 50f6219374..578536ed08 100755
--- a/erts/emulator/sys/win32/sys.c
+++ b/erts/emulator/sys/win32/sys.c
@@ -255,8 +255,7 @@ void erl_sys_args(int* argc, char** argv)
#endif
}
-void
-erts_sys_prepare_crash_dump(int secs)
+int erts_sys_prepare_crash_dump(int secs)
{
Port *heart_port;
Eterm heap[3];
@@ -271,10 +270,14 @@ erts_sys_prepare_crash_dump(int secs)
/* send to heart port, CMD = 8, i.e. prepare crash dump =o */
erts_write_to_port(NIL, heart_port, list);
+
+ return 1;
}
/* Windows - free file descriptors are hopefully available */
/* Alarm not used on windows */
+
+ return 0;
}
static void