aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_thr_progress.c
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2012-08-02 17:42:25 +0200
committerRickard Green <[email protected]>2012-08-02 17:42:25 +0200
commitda6ea485c20727fe63bb365f34e40ccb8570d413 (patch)
tree4f63bc6a6cc31b9cb65613d5a770a8305605b9ce /erts/emulator/beam/erl_thr_progress.c
parentff1a1e3c6f9a233b880e9d359a1c50e55d7c812f (diff)
parent2e5c1dbb32cfe4be0a782216953b4630338edabc (diff)
downloadotp-da6ea485c20727fe63bb365f34e40ccb8570d413.tar.gz
otp-da6ea485c20727fe63bb365f34e40ccb8570d413.tar.bz2
otp-da6ea485c20727fe63bb365f34e40ccb8570d413.zip
Merge 'rickard/thr-prgr-use/OTP-10116' and 'rickard/proc-sched/OTP-9892'
Conflicts: erts/emulator/beam/erl_process.c
Diffstat (limited to 'erts/emulator/beam/erl_thr_progress.c')
-rw-r--r--erts/emulator/beam/erl_thr_progress.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/erts/emulator/beam/erl_thr_progress.c b/erts/emulator/beam/erl_thr_progress.c
index 9ef83746c5..88524bdd4c 100644
--- a/erts/emulator/beam/erl_thr_progress.c
+++ b/erts/emulator/beam/erl_thr_progress.c
@@ -891,16 +891,16 @@ has_reached_wakeup(ErtsThrPrgrVal wakeup)
ErtsThrPrgrVal limit;
/*
* erts_thr_progress_later() returns values which are
- * equal to 'current + 2'. That is, users should never
- * get a hold of values larger than that.
+ * equal to 'current + 2', or 'current + 3'. That is, users
+ * should never get a hold of values larger than that.
*
- * That is, valid values are values less than 'current + 3'.
+ * That is, valid values are values less than 'current + 4'.
*
* Values larger than this won't work with the wakeup
* algorithm.
*/
- limit = current + 3;
+ limit = current + 4;
if (limit == ERTS_THR_PRGR_VAL_WAITING)
limit = 0;
else if (limit < current) /* Wrapped */