diff options
| author | Rickard Green <[email protected]> | 2016-08-12 14:04:29 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-08-12 14:04:29 +0200 |
| commit | 49722eb3e32b92563e576283d84531797c2a3627 (patch) | |
| tree | 878b6bacc39f80b5a3c72e7571558792ea20be9d /erts/emulator/beam/beam_emu.c | |
| parent | ce260c34b555e9e2d74fe9491e9e3a20cfcd6c82 (diff) | |
| parent | 19db7510939149206017c925032d390da9a83fe9 (diff) | |
| download | otp-49722eb3e32b92563e576283d84531797c2a3627.tar.gz otp-49722eb3e32b92563e576283d84531797c2a3627.tar.bz2 otp-49722eb3e32b92563e576283d84531797c2a3627.zip | |
Merge branch 'maint-19' into maint
* maint-19:
Updated OTP version
Prepare release
Avoid segfault when printing slogan after crashdumping
Fix race causing lost wakeup on receive-after timeout
Diffstat (limited to 'erts/emulator/beam/beam_emu.c')
| -rw-r--r-- | erts/emulator/beam/beam_emu.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c index b90c4dedea..8f90a999c4 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; |