diff options
| author | Rickard Green <[email protected]> | 2013-01-29 02:01:19 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-01-29 02:01:19 +0100 |
| commit | 2bde557b4817c09cc376e344335d53cfd1aa3f26 (patch) | |
| tree | ffe681befeae9131851708faff715882631c3073 | |
| parent | 88c2cc5c8ec4105559ab93cb9ab952333e848478 (diff) | |
| parent | cc469188a28ecbbef8e32415ffaa2c9e16bada5a (diff) | |
| download | otp-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
| -rw-r--r-- | erts/doc/src/communication.xml | 4 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_thr_progress.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/erts/doc/src/communication.xml b/erts/doc/src/communication.xml index 6049123f6a..4025e41ef3 100644 --- a/erts/doc/src/communication.xml +++ b/erts/doc/src/communication.xml @@ -49,7 +49,7 @@ signals may be lost if the distribution channel goes down.</p> <p>The only signal ordering guarantee given is the following. If an entity sends multiple signals to the same destination entity, - the order will be preserved. That is, if <c>A</c> send + the order will be preserved. That is, if <c>A</c> sends a signal <c>S1</c> to <c>B</c>, and later sends the signal <c>S2</c> to <c>B</c>, <c>S1</c> is guaranteed not to arrive after <c>S2</c>.</p> @@ -69,7 +69,7 @@ <section> <title>Implementation</title> <p>The implementation of different asynchronous signals in the - VM may vary over time, but the behavior will always respect this + VM may vary over time, but the behaviour will always respect this concept of asynchronous signals being passed between entities as described above.</p> <p>By inspecting the implementation you might notice that some 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; |