aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/bif.c
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2018-06-20 10:42:20 +0200
committerLukas Larsson <[email protected]>2018-08-03 09:47:51 +0200
commitd383549b6e9d9b5e06f23226a61564264204db51 (patch)
tree938462b708ac6442bb0dda7b99815505503a4d2a /erts/emulator/beam/bif.c
parentc33d4c7539a1681cfbc024d8637e204c0a05fd1a (diff)
downloadotp-d383549b6e9d9b5e06f23226a61564264204db51.tar.gz
otp-d383549b6e9d9b5e06f23226a61564264204db51.tar.bz2
otp-d383549b6e9d9b5e06f23226a61564264204db51.zip
erts: Fix seq_trace to not clear token for system messages
A lot of erts internal messages used behind APIs to create non-blocking calls, e.g. port_command, would cause the seq_trace token to be cleared from the caller when it should not. This commit fixes that and adds asserts that makes sure that all messages sent have to correct token set. Fixes: ERL-602
Diffstat (limited to 'erts/emulator/beam/bif.c')
-rw-r--r--erts/emulator/beam/bif.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index 97e1ee1286..f18af8bcd7 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.c
@@ -2063,7 +2063,7 @@ do_send(Process *p, Eterm to, Eterm msg, Eterm *refp, ErtsSendContext *ctx)
if (p == rp)
rp_locks |= ERTS_PROC_LOCK_MAIN;
/* send to local process */
- erts_send_message(p, rp, &rp_locks, msg, 0);
+ erts_send_message(p, rp, &rp_locks, msg);
erts_proc_unlock(rp,
p == rp
? (rp_locks & ~ERTS_PROC_LOCK_MAIN)