diff options
| author | Erlang/OTP <[email protected]> | 2019-07-02 13:44:47 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2019-07-02 13:44:47 +0200 |
| commit | f4437803fc6427d10369ea9d4eee61dc971b83d8 (patch) | |
| tree | dc3012179ff9d4fc27729a752d9b7ddae93fb94f | |
| parent | 1faf56243f13ad0284ea465132c060cfa42295fc (diff) | |
| parent | 6dd7f3010b360f655691b9f167963dd13ccca8d6 (diff) | |
| download | otp-f4437803fc6427d10369ea9d4eee61dc971b83d8.tar.gz otp-f4437803fc6427d10369ea9d4eee61dc971b83d8.tar.bz2 otp-f4437803fc6427d10369ea9d4eee61dc971b83d8.zip | |
Merge branch 'poroh/erts/sched-stuck-fix/OTP-15941' into maint-21
* 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 86798df64e..e1d899afd9 100644 --- a/erts/emulator/beam/erl_process.h +++ b/erts/emulator/beam/erl_process.h @@ -2347,6 +2347,8 @@ erts_try_change_runq_proc(Process *p, ErtsRunQueue *rq) old_rqint); if (act_rqint == old_rqint) return !0; + + old_rqint = act_rqint; } } |