diff options
| author | Rickard Green <[email protected]> | 2011-09-24 13:14:54 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2011-09-24 13:14:54 +0200 |
| commit | 5606322f1d7e2be43cd9a6f438d8d7f75df0b933 (patch) | |
| tree | f7258ce01d6f62c02de1f67a6c981b3a82ee14af | |
| parent | 0738421651e4997c1cfc29f2f90b2792bb3a42d6 (diff) | |
| parent | 4a68d3ebd54342ed72300a957883ed73957054af (diff) | |
| download | otp-5606322f1d7e2be43cd9a6f438d8d7f75df0b933.tar.gz otp-5606322f1d7e2be43cd9a6f438d8d7f75df0b933.tar.bz2 otp-5606322f1d7e2be43cd9a6f438d8d7f75df0b933.zip | |
Merge branch 'rickard/aux-work-bug/OTP-9567' into dev
* rickard/aux-work-bug/OTP-9567:
Fix lost wakeup of scheduler when enqueuing auxiliary work
| -rw-r--r-- | erts/emulator/beam/erl_process.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c index d8aed63544..ba3b32dd97 100644 --- a/erts/emulator/beam/erl_process.c +++ b/erts/emulator/beam/erl_process.c @@ -1151,13 +1151,6 @@ scheduler_wait(int *fcalls, ErtsSchedulerData *esdp, ErtsRunQueue *rq) ASSERT(!(flgs & ERTS_SSI_FLG_SLEEPING)); goto sys_woken; } - if (!(flgs & ERTS_SSI_FLG_SLEEPING)) { - flgs = sched_prep_cont_spin_wait(ssi); - if (!(flgs & ERTS_SSI_FLG_WAITING)) { - ASSERT(!(flgs & ERTS_SSI_FLG_SLEEPING)); - goto sys_woken; - } - } /* * If we got new I/O tasks we aren't allowed to |