aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2016-02-22 18:23:26 +0100
committerSverker Eriksson <[email protected]>2016-02-22 18:23:26 +0100
commit5c1d88266274d40a8702a8f66c8cbd4e0f0c15f3 (patch)
treeb43a46d303a2457a598d263b828b7b9b9f302c3c
parent8c5f8128fc167d67fbd5d63205f35eade4cc741f (diff)
parent184a4d38db21cdc3011a5c906f38c880c1ffdc58 (diff)
downloadotp-5c1d88266274d40a8702a8f66c8cbd4e0f0c15f3.tar.gz
otp-5c1d88266274d40a8702a8f66c8cbd4e0f0c15f3.tar.bz2
otp-5c1d88266274d40a8702a8f66c8cbd4e0f0c15f3.zip
Merge branch 'sverk/proc-lock-check-fix' into maint
* sverk/proc-lock-check-fix: erts: Fix lock checker for process locks
-rw-r--r--erts/emulator/beam/erl_process_lock.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_process_lock.h b/erts/emulator/beam/erl_process_lock.h
index a64c993e8f..9c59301086 100644
--- a/erts/emulator/beam/erl_process_lock.h
+++ b/erts/emulator/beam/erl_process_lock.h
@@ -523,6 +523,10 @@ erts_smp_proc_lock__(Process *p,
ERTS_LC_ASSERT((locks & ~ERTS_PROC_LOCKS_ALL) == 0);
+#ifdef ERTS_ENABLE_LOCK_CHECK
+ erts_proc_lc_lock(p, locks, file, line);
+#endif
+
old_lflgs = erts_smp_proc_raw_trylock__(p, locks);
if (old_lflgs != 0) {
@@ -544,9 +548,6 @@ erts_smp_proc_lock__(Process *p,
#ifdef ERTS_ENABLE_LOCK_COUNT
erts_lcnt_proc_lock_post_x(&(p->lock), locks, file, line);
#endif
-#ifdef ERTS_ENABLE_LOCK_CHECK
- erts_proc_lc_lock(p, locks, file, line);
-#endif
#ifdef ERTS_PROC_LOCK_DEBUG
erts_proc_lock_op_debug(p, locks, 1);