aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2013-01-29 02:01:19 +0100
committerRickard Green <[email protected]>2013-01-29 02:01:19 +0100
commit2bde557b4817c09cc376e344335d53cfd1aa3f26 (patch)
treeffe681befeae9131851708faff715882631c3073 /erts/emulator/beam
parent88c2cc5c8ec4105559ab93cb9ab952333e848478 (diff)
parentcc469188a28ecbbef8e32415ffaa2c9e16bada5a (diff)
downloadotp-2bde557b4817c09cc376e344335d53cfd1aa3f26.tar.gz
otp-2bde557b4817c09cc376e344335d53cfd1aa3f26.tar.bz2
otp-2bde557b4817c09cc376e344335d53cfd1aa3f26.zip
Merge branch 'rickard/r16/port-optimizations/OTP-10336'
* rickard/r16/port-optimizations/OTP-10336: Fix spelling in communication.xml Fix unmanaged thread progress delay
Diffstat (limited to 'erts/emulator/beam')
-rw-r--r--erts/emulator/beam/erl_thr_progress.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_thr_progress.c b/erts/emulator/beam/erl_thr_progress.c
index 9678d7e08b..9effdae98e 100644
--- a/erts/emulator/beam/erl_thr_progress.c
+++ b/erts/emulator/beam/erl_thr_progress.c
@@ -797,6 +797,8 @@ leader_update(ErtsThrPrgrData *tpd)
ERTS_THR_PROGRESS_STATE_DEBUG_SET_LEADER(tpd->id, 0);
+ intrnl->misc.data.umrefc_ix.waiting
+ = tpd->leader_state.umrefc_ix.waiting;
if (waiting_unmanaged)
set_flags |= ERTS_THR_PRGR_LFLG_WAITING_UM;