diff options
| author | Erlang/OTP <[email protected]> | 2018-10-11 21:08:34 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2018-10-11 21:08:34 +0200 |
| commit | fd22146432316bc95a96dced298d7814b117e4de (patch) | |
| tree | 07159dba936db0695617ede8877c550ca6ddf3ac | |
| parent | 5a219d67e46b13139fecd3acd30701dac55225f1 (diff) | |
| parent | 2e4812fe7082364ff5bb423b3365b0e6564e5db8 (diff) | |
| download | otp-fd22146432316bc95a96dced298d7814b117e4de.tar.gz otp-fd22146432316bc95a96dced298d7814b117e4de.tar.bz2 otp-fd22146432316bc95a96dced298d7814b117e4de.zip | |
Merge branch 'rickard/thr-prgr-unmanaged-delay-bug/OTP-13869' into maint-17
* rickard/thr-prgr-unmanaged-delay-bug/OTP-13869:
Fix erts_thr_progress_unmanaged_delay()
| -rw-r--r-- | erts/emulator/beam/erl_thr_progress.c | 1 |
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 664c479eb6..83cdd56ead 100644 --- a/erts/emulator/beam/erl_thr_progress.c +++ b/erts/emulator/beam/erl_thr_progress.c @@ -699,6 +699,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); |