diff options
| author | Rickard Green <[email protected]> | 2018-04-12 16:55:58 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2018-05-16 13:28:38 +0200 |
| commit | 08873ec673ef223a4e0c9826b0370d80bb6aad24 (patch) | |
| tree | 3282e1d43d2695c353c93eb4db08373e5d06fc9f /erts/emulator/hipe/hipe_mode_switch.c | |
| parent | 9be1ed4b7847044698563392b3d7b53565ea0873 (diff) | |
| download | otp-08873ec673ef223a4e0c9826b0370d80bb6aad24.tar.gz otp-08873ec673ef223a4e0c9826b0370d80bb6aad24.tar.bz2 otp-08873ec673ef223a4e0c9826b0370d80bb6aad24.zip | |
Teach HiPE to yield from receive
Diffstat (limited to 'erts/emulator/hipe/hipe_mode_switch.c')
| -rw-r--r-- | erts/emulator/hipe/hipe_mode_switch.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/erts/emulator/hipe/hipe_mode_switch.c b/erts/emulator/hipe/hipe_mode_switch.c index bc9a700204..0a65e317ed 100644 --- a/erts/emulator/hipe/hipe_mode_switch.c +++ b/erts/emulator/hipe/hipe_mode_switch.c @@ -490,16 +490,21 @@ Process *hipe_mode_switch(Process *p, unsigned cmd, Eterm reg[]) /* same semantics, different debug trace messages */ /* XXX: BEAM has different entries for the locked and unlocked cases. HiPE doesn't, so we must check dynamically. */ - if (p->hipe_smp.have_receive_locks) - p->hipe_smp.have_receive_locks = 0; + if (p->flags & F_HIPE_RECV_LOCKED) + p->flags &= ~F_HIPE_RECV_LOCKED; else erts_proc_lock(p, ERTS_PROC_LOCKS_MSG_RECEIVE); p->i = hipe_beam_pc_resume; p->arity = 0; if (erts_atomic32_read_nob(&p->state) & ERTS_PSFLG_EXITING) ASSERT(erts_atomic32_read_nob(&p->state) & ERTS_PSFLG_ACTIVE); - else + else if (!(p->flags & F_HIPE_RECV_YIELD)) erts_atomic32_read_band_relb(&p->state, ~ERTS_PSFLG_ACTIVE); + else { + /* Yielded from receive */ + ERTS_VBUMP_ALL_REDS(p); + p->flags &= ~F_HIPE_RECV_YIELD; + } erts_proc_unlock(p, ERTS_PROC_LOCKS_MSG_RECEIVE); do_schedule: { @@ -522,7 +527,7 @@ Process *hipe_mode_switch(Process *p, unsigned cmd, Eterm reg[]) p = erts_schedule(NULL, p, reds_in - p->fcalls); ERTS_REQ_PROC_MAIN_LOCK(p); ASSERT(!(p->flags & F_HIPE_MODE)); - p->hipe_smp.have_receive_locks = 0; + p->flags &= ~F_HIPE_RECV_LOCKED; reg = p->scheduler_data->x_reg_array; } { |