diff options
| author | Rickard Green <[email protected]> | 2014-08-29 16:43:31 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-08-29 16:43:31 +0200 |
| commit | aa48f2055c6d4002d631664b3a1ebdfe3415680e (patch) | |
| tree | 06f4362bad16a1308ffb540173aadc47811cf73e /erts/emulator/beam/erl_message.c | |
| parent | d0bc17831c47144eccf94c4ffa09359ba7e0e3d2 (diff) | |
| parent | a8e12f7168c14cc765a63a51c838d065412795d7 (diff) | |
| download | otp-aa48f2055c6d4002d631664b3a1ebdfe3415680e.tar.gz otp-aa48f2055c6d4002d631664b3a1ebdfe3415680e.tar.bz2 otp-aa48f2055c6d4002d631664b3a1ebdfe3415680e.zip | |
Merge branch 'maint'
* maint:
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_message.c')
| -rw-r--r-- | erts/emulator/beam/erl_message.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_message.c b/erts/emulator/beam/erl_message.c index 59a677a12c..8870fac7d9 100644 --- a/erts/emulator/beam/erl_message.c +++ b/erts/emulator/beam/erl_message.c @@ -415,7 +415,13 @@ erts_queue_dist_message(Process *rcvr, if (!(*rcvr_locks & ERTS_PROC_LOCK_MSGQ)) erts_smp_proc_unlock(rcvr, ERTS_PROC_LOCK_MSGQ); - erts_proc_notify_new_message(rcvr); + erts_proc_notify_new_message(rcvr, +#ifdef ERTS_SMP + *rcvr_locks +#else + 0 +#endif + ); } } @@ -542,7 +548,13 @@ queue_message(Process *c_p, if (locked_msgq) erts_smp_proc_unlock(receiver, ERTS_PROC_LOCK_MSGQ); - erts_proc_notify_new_message(receiver); + erts_proc_notify_new_message(receiver, +#ifdef ERTS_SMP + *receiver_locks +#else + 0 +#endif + ); #ifndef ERTS_SMP ERTS_HOLE_CHECK(receiver); |