diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-10-24 14:20:26 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-10-24 14:20:26 +0200 |
| commit | d5733bc3e34449affde2594d85b905c8ab440d42 (patch) | |
| tree | 4744a65c8d163ef261f56d70ff7b4bf975a2aa28 /erts/emulator/beam/erl_process_lock.c | |
| parent | e85c4dda93e416e8e97c0dcfadc5eeaf5bd8b4e1 (diff) | |
| parent | 6f0a76a0f78f3483b561b5e59260e8ca968b052c (diff) | |
| download | otp-d5733bc3e34449affde2594d85b905c8ab440d42.tar.gz otp-d5733bc3e34449affde2594d85b905c8ab440d42.tar.bz2 otp-d5733bc3e34449affde2594d85b905c8ab440d42.zip | |
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
Diffstat (limited to 'erts/emulator/beam/erl_process_lock.c')
| -rw-r--r-- | erts/emulator/beam/erl_process_lock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_process_lock.c b/erts/emulator/beam/erl_process_lock.c index f28ef6a6d7..f7900317cc 100644 --- a/erts/emulator/beam/erl_process_lock.c +++ b/erts/emulator/beam/erl_process_lock.c @@ -1349,7 +1349,7 @@ erts_proc_lc_chk_no_proc_locks(char *file, int line) lc_id.proc_lock_msgq, lc_id.proc_lock_status}; erts_lc_have_lock_ids(resv, ids, 4); - if (resv[0] || resv[1] || resv[2] || resv[3]) { + if (!ERTS_IS_CRASH_DUMPING && (resv[0] || resv[1] || resv[2] || resv[3])) { erts_lc_fail("%s:%d: Thread has process locks locked when expected " "not to have any process locks locked", file, line); |