From 6bb1e114ef5dc0df8acb05a50fe3f7a1c5529a2c Mon Sep 17 00:00:00 2001
From: Rickard Green
Date: Tue, 29 Jan 2013 01:37:16 +0100
Subject: Fix unmanaged thread progress delay
---
erts/emulator/beam/erl_thr_progress.c | 2 ++
1 file changed, 2 insertions(+)
(limited to 'erts')
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;
--
cgit v1.2.3
From cc469188a28ecbbef8e32415ffaa2c9e16bada5a Mon Sep 17 00:00:00 2001
From: Rickard Green
Date: Tue, 29 Jan 2013 01:59:53 +0100
Subject: Fix spelling in communication.xml
Thanks to Richard O'Keefe
---
erts/doc/src/communication.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'erts')
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.
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 A send
+ the order will be preserved. That is, if A sends
a signal S1 to B, and later sends
the signal S2 to B, S1 is guaranteed not to
arrive after S2.
@@ -69,7 +69,7 @@
Implementation
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.
By inspecting the implementation you might notice that some
--
cgit v1.2.3