diff options
| author | Rickard Green <[email protected]> | 2012-06-20 14:12:10 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2012-06-20 14:12:10 +0200 |
| commit | ba8fb1d9939d070fc67f959a2041d965929fed35 (patch) | |
| tree | 012e27bf414fb05c90be19b8215d1906bcbc277f /erts/emulator/beam/erl_thr_progress.c | |
| parent | c6b0348bb4ab8e3603b06b9e58dcbca2641bd35a (diff) | |
| parent | 2e5c1dbb32cfe4be0a782216953b4630338edabc (diff) | |
| download | otp-ba8fb1d9939d070fc67f959a2041d965929fed35.tar.gz otp-ba8fb1d9939d070fc67f959a2041d965929fed35.tar.bz2 otp-ba8fb1d9939d070fc67f959a2041d965929fed35.zip | |
Merge branch 'rickard/thr-prgr-use/OTP-10116' into maint
* rickard/thr-prgr-use/OTP-10116:
Fix faulty use of thread progress in handle_aux_work()
Diffstat (limited to 'erts/emulator/beam/erl_thr_progress.c')
| -rw-r--r-- | erts/emulator/beam/erl_thr_progress.c | 8 |
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 */ |