diff options
| author | Erlang/OTP <[email protected]> | 2019-07-02 13:44:05 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2019-07-02 13:44:05 +0200 |
| commit | ffdcbfd46d03fcf31cead86407bc27d91c54a8f8 (patch) | |
| tree | 80d943575fe63137ed752d601b502fb49851042c | |
| parent | 2ffffd7832ba64d9bb4a0cea9cee8c88befb64a1 (diff) | |
| parent | 6dd7f3010b360f655691b9f167963dd13ccca8d6 (diff) | |
| download | otp-ffdcbfd46d03fcf31cead86407bc27d91c54a8f8.tar.gz otp-ffdcbfd46d03fcf31cead86407bc27d91c54a8f8.tar.bz2 otp-ffdcbfd46d03fcf31cead86407bc27d91c54a8f8.zip | |
Merge branch 'poroh/erts/sched-stuck-fix/OTP-15941' into maint-22
* poroh/erts/sched-stuck-fix/OTP-15941:
Infinite cycle fixed on try to change run queue (if it has already changed concurrently)
| -rw-r--r-- | erts/emulator/beam/erl_process.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_process.h b/erts/emulator/beam/erl_process.h index 6118c671ee..cdad72443f 100644 --- a/erts/emulator/beam/erl_process.h +++ b/erts/emulator/beam/erl_process.h @@ -2352,6 +2352,8 @@ erts_try_change_runq_proc(Process *p, ErtsRunQueue *rq) old_rqint); if (act_rqint == old_rqint) return !0; + + old_rqint = act_rqint; } } |