diff options
| author | Rickard Green <[email protected]> | 2017-01-02 15:52:36 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-01-02 15:52:36 +0100 |
| commit | 9cb4770469218f65dbaec6c71d12b4aa722ac791 (patch) | |
| tree | ee41ff79891635ac2d9450853f9adc2487b0bb0e /erts/emulator/beam/erl_hl_timer.c | |
| parent | 560d3e6499de249b478f617a2fc547f67ab64172 (diff) | |
| parent | efc331a04191a124ee7428c25f2ec05ded748faf (diff) | |
| download | otp-9cb4770469218f65dbaec6c71d12b4aa722ac791.tar.gz otp-9cb4770469218f65dbaec6c71d12b4aa722ac791.tar.bz2 otp-9cb4770469218f65dbaec6c71d12b4aa722ac791.zip | |
Merge branch 'rickard/ds-fixes' into maint
OTP-14122
* rickard/ds-fixes:
Fix VM global GC info for dirty schedulers
Leave dirty work in dirty run-queues on multi scheduling block
Fix premature removal of process struct
Fix crash due to GC of node entry on dirty scheduler
Diffstat (limited to 'erts/emulator/beam/erl_hl_timer.c')
| -rw-r--r-- | erts/emulator/beam/erl_hl_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_hl_timer.c b/erts/emulator/beam/erl_hl_timer.c index d29d079fc5..38bebc7576 100644 --- a/erts/emulator/beam/erl_hl_timer.c +++ b/erts/emulator/beam/erl_hl_timer.c @@ -2666,7 +2666,7 @@ erts_start_timer_callback(ErtsMonotonicTime tmo, tmo); twt = tmo < ERTS_TIMER_WHEEL_MSEC; - if (esdp) + if (esdp && !ERTS_SCHEDULER_IS_DIRTY(esdp)) start_callback_timer(esdp, twt, timeout_pos, |