diff options
| author | Erlang/OTP <[email protected]> | 2019-06-03 11:34:53 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2019-06-03 11:34:53 +0200 |
| commit | 69e8891b678d843aaedf14212d40cc7cb9d2807b (patch) | |
| tree | 5cdb7a780da33f57d60b395e7ba8d138259873c4 /erts/emulator/beam/erl_process.h | |
| parent | d53b5fe6fec0e01f5c807256680710c45159e2d2 (diff) | |
| parent | 17cf40f734346f67b4d0b708974768f81bc83d2b (diff) | |
| download | otp-69e8891b678d843aaedf14212d40cc7cb9d2807b.tar.gz otp-69e8891b678d843aaedf14212d40cc7cb9d2807b.tar.bz2 otp-69e8891b678d843aaedf14212d40cc7cb9d2807b.zip | |
Merge branch 'sverker/seq-trace-label-old-heap-bug/ERL-700/OTP-15849/OTP-15858/OTP-15859' into maint-21
* sverker/seq-trace-label-old-heap-bug/ERL-700/OTP-15849/OTP-15858/OTP-15859:
erts: Fix faulty spec for seq_trace:set_token/2
erts: Fix seq_trace:print/2 for arbitrary labels
erts: Fix bug in seq_trace:set_token(label,_)
Diffstat (limited to 'erts/emulator/beam/erl_process.h')
| -rw-r--r-- | erts/emulator/beam/erl_process.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_process.h b/erts/emulator/beam/erl_process.h index 43937f216c..86798df64e 100644 --- a/erts/emulator/beam/erl_process.h +++ b/erts/emulator/beam/erl_process.h @@ -1226,9 +1226,10 @@ void erts_check_for_holes(Process* p); /* The sequential tracing token is a tuple of size 5: * - * {Flags, Label, Serial, Sender} + * {Flags, Label, Serial, Sender, LastCnt} + * + * WARNING: The top 5-tuple is *MUTABLE* and thus INTERNAL ONLY. */ - #define SEQ_TRACE_TOKEN_ARITY(p) (arityval(*(tuple_val(SEQ_TRACE_TOKEN(p))))) #define SEQ_TRACE_TOKEN_FLAGS(p) (*(tuple_val(SEQ_TRACE_TOKEN(p)) + 1)) #define SEQ_TRACE_TOKEN_LABEL(p) (*(tuple_val(SEQ_TRACE_TOKEN(p)) + 2)) |