aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2015-08-18 18:12:51 +0200
committerLukas Larsson <[email protected]>2015-08-18 18:12:51 +0200
commit0b29b85757d186a5cc94aaa1761e812c95fec2d0 (patch)
treef294035eae48b6f120be2c9760e13597f9266883
parent132b23a4511dd6f76366bd61eb52d1d11ef5ef35 (diff)
parent02380778fd2a9d6af85865a89ef0747351cc0f88 (diff)
downloadotp-0b29b85757d186a5cc94aaa1761e812c95fec2d0.tar.gz
otp-0b29b85757d186a5cc94aaa1761e812c95fec2d0.tar.bz2
otp-0b29b85757d186a5cc94aaa1761e812c95fec2d0.zip
Merge branch 'lukas/erts/process_priority_unlock/OTP-12943' into maint
* lukas/erts/process_priority_unlock/OTP-12943: erts: Make sure to unlock status lock when setting process prio
-rw-r--r--erts/emulator/beam/erl_process.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index ceca5d4a82..7135c0475e 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -9177,6 +9177,10 @@ erts_set_process_priority(Process *p, Eterm value)
a = erts_smp_atomic32_cmpxchg_mb(&p->state, n, e);
} while (a != e);
+
+ if (slocked)
+ erts_smp_proc_unlock(p, ERTS_PROC_LOCK_STATUS);
+
}
switch (oprio) {