diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-10-19 17:22:25 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-10-23 14:30:30 +0200 |
| commit | 014c784a73e56769c7045d8f7515d57d9d8a2caf (patch) | |
| tree | d23207bcc6d53e0393eb97352b235ce14a86914f | |
| parent | e6ea3b07e25b09481b010558f8bfdfb57dcbb85e (diff) | |
| download | otp-014c784a73e56769c7045d8f7515d57d9d8a2caf.tar.gz otp-014c784a73e56769c7045d8f7515d57d9d8a2caf.tar.bz2 otp-014c784a73e56769c7045d8f7515d57d9d8a2caf.zip | |
erts: Fix lock check assertion
| -rw-r--r-- | erts/emulator/beam/erl_lock_check.c | 2 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_process_lock.c | 2 | ||||
| -rw-r--r-- | erts/emulator/beam/io.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_lock_check.c b/erts/emulator/beam/erl_lock_check.c index b545ec07c0..1f388c1796 100644 --- a/erts/emulator/beam/erl_lock_check.c +++ b/erts/emulator/beam/erl_lock_check.c @@ -443,7 +443,7 @@ print_lock2(char *prefix, Sint16 id, Wterm extra, Uint16 flags, char *suffix) "%s'%s:%p%s'%s%s", prefix, lname, - boxed_val(extra), + _unchecked_boxed_val(extra), lock_type(flags), rw_op_str(flags), suffix); 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); diff --git a/erts/emulator/beam/io.c b/erts/emulator/beam/io.c index 88e9215a9c..609fe9f5fb 100644 --- a/erts/emulator/beam/io.c +++ b/erts/emulator/beam/io.c @@ -1132,7 +1132,7 @@ int erts_write_to_port(Eterm caller_id, Port *p, Eterm list) Uint size; int fpe_was_unmasked; - ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(p)); + ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(p) || ERTS_IS_CRASH_DUMPING); ERTS_SMP_CHK_NO_PROC_LOCKS; p->caller = caller_id; |