diff options
| author | Lukas Larsson <[email protected]> | 2018-08-03 09:49:24 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2018-08-03 09:49:24 +0200 |
| commit | 0ae934aa008f9ff2a929eafc52811fcde619631a (patch) | |
| tree | 938462b708ac6442bb0dda7b99815505503a4d2a /erts/emulator/beam/io.c | |
| parent | c33d4c7539a1681cfbc024d8637e204c0a05fd1a (diff) | |
| parent | d383549b6e9d9b5e06f23226a61564264204db51 (diff) | |
| download | otp-0ae934aa008f9ff2a929eafc52811fcde619631a.tar.gz otp-0ae934aa008f9ff2a929eafc52811fcde619631a.tar.bz2 otp-0ae934aa008f9ff2a929eafc52811fcde619631a.zip | |
Merge branch 'lukas/erts/seq_trace_fix_token_clear/ERL-602/OTP-15038' into maint
* lukas/erts/seq_trace_fix_token_clear/ERL-602/OTP-15038:
erts: Fix seq_trace to not clear token for system messages
Diffstat (limited to 'erts/emulator/beam/io.c')
| -rw-r--r-- | erts/emulator/beam/io.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/erts/emulator/beam/io.c b/erts/emulator/beam/io.c index 2446b3c074..133ab485d9 100644 --- a/erts/emulator/beam/io.c +++ b/erts/emulator/beam/io.c @@ -3287,7 +3287,6 @@ static void deliver_read_message(Port* prt, erts_aint32_t state, Eterm to, if (trace_send) trace_port_send(prt, to, tuple, 1); - ERL_MESSAGE_TOKEN(mp) = am_undefined; erts_queue_message(rp, rp_locks, mp, tuple, prt->common.id); if (rp_locks) erts_proc_unlock(rp, rp_locks); @@ -3459,7 +3458,6 @@ deliver_vec_message(Port* prt, /* Port */ if (IS_TRACED_FL(prt, F_TRACE_SEND)) trace_port_send(prt, to, tuple, 1); - ERL_MESSAGE_TOKEN(mp) = am_undefined; erts_queue_message(rp, rp_locks, mp, tuple, prt->common.id); erts_proc_unlock(rp, rp_locks); if (!scheduler) @@ -5382,7 +5380,6 @@ void driver_report_exit(ErlDrvPort ix, int status) if (IS_TRACED_FL(prt, F_TRACE_SEND)) trace_port_send(prt, pid, tuple, 1); - ERL_MESSAGE_TOKEN(mp) = am_undefined; erts_queue_message(rp, rp_locks, mp, tuple, prt->common.id); erts_proc_unlock(rp, rp_locks); @@ -5988,8 +5985,6 @@ driver_deliver_term(Port *prt, Eterm to, ErlDrvTermData* data, int len) from = prt->common.id; } - /* send message */ - ERL_MESSAGE_TOKEN(factory.message) = am_undefined; erts_queue_message(rp, rp_locks, factory.message, mess, from); } else if (res == -2) { |