aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2017-02-01 18:32:23 +0100
committerErlang/OTP <[email protected]>2017-02-01 18:32:23 +0100
commit8816cb5bc1befbe41f4cef5441d0ac39e49c19fd (patch)
treedb54022d6be35bfcf614d94383ece656eb9fbb4e
parent4925c1a6df409ea9a964cd4c319af3b1c2cf62dd (diff)
parent2e4812fe7082364ff5bb423b3365b0e6564e5db8 (diff)
downloadotp-8816cb5bc1befbe41f4cef5441d0ac39e49c19fd.tar.gz
otp-8816cb5bc1befbe41f4cef5441d0ac39e49c19fd.tar.bz2
otp-8816cb5bc1befbe41f4cef5441d0ac39e49c19fd.zip
Merge branch 'rickard/thr-prgr-unmanaged-delay-bug/OTP-13869' into maint-18
* rickard/thr-prgr-unmanaged-delay-bug/OTP-13869: Fix erts_thr_progress_unmanaged_delay()
-rw-r--r--erts/emulator/beam/erl_thr_progress.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_thr_progress.c b/erts/emulator/beam/erl_thr_progress.c
index 7b06fd840f..232a2d0fdc 100644
--- a/erts/emulator/beam/erl_thr_progress.c
+++ b/erts/emulator/beam/erl_thr_progress.c
@@ -700,6 +700,7 @@ leader_update(ErtsThrPrgrData *tpd)
tpd->leader_state.chk_next_ix = no_managed;
erts_atomic32_set_nob(&intrnl->misc.data.umrefc_ix.current,
(erts_aint32_t) new_umrefc_ix);
+ tpd->leader_state.umrefc_ix.current = new_umrefc_ix;
ETHR_MEMBAR(ETHR_StoreLoad);
refc = erts_atomic_read_nob(&intrnl->umrefc[umrefc_ix].refc);
ASSERT(refc >= 0);