diff options
| author | Lukas Larsson <[email protected]> | 2018-12-20 10:10:51 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2018-12-20 10:10:51 +0100 |
| commit | 58d4bef716136bb1681fcdd0c8502d681ccd9cd3 (patch) | |
| tree | fc64c1725937b7967bd1163e9e51cb8b0ea41a1a /erts/emulator/beam/erl_proc_sig_queue.h | |
| parent | 9aac178d30c5bad940e68a7eb8a36596df5ed903 (diff) | |
| parent | 27ff974bfa155ad31dcdc338d7fecf36b08a0516 (diff) | |
| download | otp-58d4bef716136bb1681fcdd0c8502d681ccd9cd3.tar.gz otp-58d4bef716136bb1681fcdd0c8502d681ccd9cd3.tar.bz2 otp-58d4bef716136bb1681fcdd0c8502d681ccd9cd3.zip | |
Merge branch 'lukas/erts/fix-seq_trace-reset_trace/OTP-15490' into maint
* lukas/erts/fix-seq_trace-reset_trace/OTP-15490:
erts: Fix seq_trace:reset_trace dirty gc bug
erts: Use sys_memcpy in copy_one_frag
Diffstat (limited to 'erts/emulator/beam/erl_proc_sig_queue.h')
| -rw-r--r-- | erts/emulator/beam/erl_proc_sig_queue.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_proc_sig_queue.h b/erts/emulator/beam/erl_proc_sig_queue.h index 3fc2d06b2d..6b065a7add 100644 --- a/erts/emulator/beam/erl_proc_sig_queue.h +++ b/erts/emulator/beam/erl_proc_sig_queue.h @@ -989,8 +989,7 @@ erts_proc_sig_fetch(Process *proc) Sint res = 0; ErtsSignal *sig; - ERTS_LC_ASSERT(erts_thr_progress_is_blocking() - || ERTS_PROC_IS_EXITING(proc) + ERTS_LC_ASSERT(ERTS_PROC_IS_EXITING(proc) || ((erts_proc_lc_my_proc_locks(proc) & (ERTS_PROC_LOCK_MAIN | ERTS_PROC_LOCK_MSGQ)) |