aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2016-09-06 12:19:44 +0200
committerRickard Green <[email protected]>2016-09-06 12:19:44 +0200
commit54aeaff05a88e83c2ee174b53da2b00ac101c6db (patch)
treeccd2cdfe6e731ad25f3d4627893f7a0a38526ada
parent02c9a648db3753008e67f22140a2bf8dd8912ccd (diff)
parent2e4812fe7082364ff5bb423b3365b0e6564e5db8 (diff)
downloadotp-54aeaff05a88e83c2ee174b53da2b00ac101c6db.tar.gz
otp-54aeaff05a88e83c2ee174b53da2b00ac101c6db.tar.bz2
otp-54aeaff05a88e83c2ee174b53da2b00ac101c6db.zip
Merge branch 'rickard/thr-prgr-unmanaged-delay-bug/OTP-13869' into maint
* 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 26d71f573f..700ed90def 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);