diff options
| author | Erlang/OTP <[email protected]> | 2016-08-11 16:23:44 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2016-08-11 16:23:44 +0200 |
| commit | 4e9c137e708178319d63a143e802fdbd2e628651 (patch) | |
| tree | 53161c8b94e11868f1ecd4095ed479bdea35aeb2 /erts/emulator/beam | |
| parent | 020d38d4c9062f255b52eeb35542152c7cff1598 (diff) | |
| parent | 17c838402c6d71aef041548ad36ee66db6f24a56 (diff) | |
| download | otp-4e9c137e708178319d63a143e802fdbd2e628651.tar.gz otp-4e9c137e708178319d63a143e802fdbd2e628651.tar.bz2 otp-4e9c137e708178319d63a143e802fdbd2e628651.zip | |
Merge branch 'rickard/proc-tmo-bug/OTP-13798' into maint-19
* rickard/proc-tmo-bug/OTP-13798:
Fix race causing lost wakeup on receive-after timeout
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/beam_emu.c | 5 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_hl_timer.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c index c6258287c4..03aec2c987 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -2161,7 +2161,10 @@ void process_main(void) c_p->i = (BeamInstr *) Arg(0); /* L1 */ SWAPOUT; c_p->arity = 0; - erts_smp_atomic32_read_band_relb(&c_p->state, ~ERTS_PSFLG_ACTIVE); + + if (!ERTS_PTMR_IS_TIMED_OUT(c_p)) + erts_smp_atomic32_read_band_relb(&c_p->state, + ~ERTS_PSFLG_ACTIVE); ASSERT(!ERTS_PROC_IS_EXITING(c_p)); erts_smp_proc_unlock(c_p, ERTS_PROC_LOCKS_MSG_RECEIVE); c_p->current = NULL; diff --git a/erts/emulator/beam/erl_hl_timer.c b/erts/emulator/beam/erl_hl_timer.c index ebeff51aac..f1bef28186 100644 --- a/erts/emulator/beam/erl_hl_timer.c +++ b/erts/emulator/beam/erl_hl_timer.c @@ -735,7 +735,10 @@ proc_timeout_common(Process *proc, void *tmr) if (tmr == (void *) erts_smp_atomic_cmpxchg_mb(&proc->common.timer, ERTS_PTMR_TIMEDOUT, (erts_aint_t) tmr)) { - erts_aint32_t state = erts_smp_atomic32_read_acqb(&proc->state); + erts_aint32_t state; + erts_smp_proc_lock(proc, ERTS_PROC_LOCKS_MSG_RECEIVE); + state = erts_smp_atomic32_read_acqb(&proc->state); + erts_smp_proc_unlock(proc, ERTS_PROC_LOCKS_MSG_RECEIVE); if (!(state & (ERTS_PSFLG_ACTIVE|ERTS_PSFLG_EXITING))) erts_schedule_process(proc, state, 0); return 1; |