diff options
| author | Rickard Green <[email protected]> | 2017-01-02 15:53:01 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-01-02 15:53:01 +0100 |
| commit | ae1c4b4dd1a4333727adb6875340e556a403a7fc (patch) | |
| tree | ac5e193c7e12e5e0d0c190775029b6c2d3dbfad6 /erts/emulator/beam/erl_hl_timer.c | |
| parent | e6f982d7374e148be51865a781af1f1982667af9 (diff) | |
| parent | 9cb4770469218f65dbaec6c71d12b4aa722ac791 (diff) | |
| download | otp-ae1c4b4dd1a4333727adb6875340e556a403a7fc.tar.gz otp-ae1c4b4dd1a4333727adb6875340e556a403a7fc.tar.bz2 otp-ae1c4b4dd1a4333727adb6875340e556a403a7fc.zip | |
Merge branch 'maint'
* maint:
Multi scheduling block bug-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, |