diff options
| author | Rickard Green <[email protected]> | 2014-08-29 16:42:31 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-08-29 16:42:31 +0200 |
| commit | a8e12f7168c14cc765a63a51c838d065412795d7 (patch) | |
| tree | eef42d97fc8cb4d63d939cccc7f3dc9b0cca7511 /erts/emulator/beam/erl_process.h | |
| parent | 25f37cf6c5739126c72bdab3e9ec4f95e87d7a8b (diff) | |
| parent | 14e7c8f79847668d815a55f4328f3a86bd527451 (diff) | |
| download | otp-a8e12f7168c14cc765a63a51c838d065412795d7.tar.gz otp-a8e12f7168c14cc765a63a51c838d065412795d7.tar.bz2 otp-a8e12f7168c14cc765a63a51c838d065412795d7.zip | |
Merge branch 'rickard/runnable-trace-ooo-bug/OTP-12105' into maint
* rickard/runnable-trace-ooo-bug/OTP-12105:
Fix busy_port_SUITE:io_to_busy test-case
Ensure "runnable port" trace messages are not sent out of order
Ensure "runnable proc" trace messages are not sent out of order
Diffstat (limited to 'erts/emulator/beam/erl_process.h')
| -rw-r--r-- | erts/emulator/beam/erl_process.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/erts/emulator/beam/erl_process.h b/erts/emulator/beam/erl_process.h index 31f4a09c94..9b740f049e 100644 --- a/erts/emulator/beam/erl_process.h +++ b/erts/emulator/beam/erl_process.h @@ -1700,17 +1700,17 @@ ErtsSchedulerData *erts_get_scheduler_data(void) #endif #endif -void erts_schedule_process(Process *, erts_aint32_t); +void erts_schedule_process(Process *, erts_aint32_t, ErtsProcLocks); -ERTS_GLB_INLINE void erts_proc_notify_new_message(Process *p); +ERTS_GLB_INLINE void erts_proc_notify_new_message(Process *p, ErtsProcLocks locks); #if ERTS_GLB_INLINE_INCL_FUNC_DEF ERTS_GLB_INLINE void -erts_proc_notify_new_message(Process *p) +erts_proc_notify_new_message(Process *p, ErtsProcLocks locks) { /* No barrier needed, due to msg lock */ erts_aint32_t state = erts_smp_atomic32_read_nob(&p->state); if (!(state & ERTS_PSFLG_ACTIVE)) - erts_schedule_process(p, state); + erts_schedule_process(p, state, locks); } #endif |