diff options
| author | John Högberg <[email protected]> | 2018-03-27 06:58:10 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-03-27 06:58:10 +0200 |
| commit | e176b62e96e4452443b5be347fb7b97a561c5b3b (patch) | |
| tree | 38c923cf88cec72eb3e43e380bbaefde4160abdb /erts/emulator/beam/erl_message.c | |
| parent | bebf113ecd2d6a27808fc952e1f14db78515efb3 (diff) | |
| parent | 06ed628dfd013010dd6e182508c1137b9f4ba09b (diff) | |
| download | otp-e176b62e96e4452443b5be347fb7b97a561c5b3b.tar.gz otp-e176b62e96e4452443b5be347fb7b97a561c5b3b.tar.bz2 otp-e176b62e96e4452443b5be347fb7b97a561c5b3b.zip | |
Merge pull request #1760 from jhogberg/john/erts/any-term-as-seq_trace-label/OTP-14899
Lift the type restrictions on seq_trace token labels
Diffstat (limited to 'erts/emulator/beam/erl_message.c')
| -rw-r--r-- | erts/emulator/beam/erl_message.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_message.c b/erts/emulator/beam/erl_message.c index 98feb95d99..51b7865c0b 100644 --- a/erts/emulator/beam/erl_message.c +++ b/erts/emulator/beam/erl_message.c @@ -315,7 +315,7 @@ erts_queue_dist_message(Process *rcvr, dtrace_proc_str(rcvr, receiver_name); if (have_seqtrace(token)) { - tok_label = signed_val(SEQ_TRACE_T_LABEL(token)); + tok_label = SEQ_TRACE_T_DTRACE_LABEL(token); tok_lastcnt = signed_val(SEQ_TRACE_T_LASTCNT(token)); tok_serial = signed_val(SEQ_TRACE_T_SERIAL(token)); } @@ -640,7 +640,8 @@ erts_send_message(Process* sender, seq_trace_update_send(sender); seq_trace_output(stoken, message, SEQ_TRACE_SEND, receiver->common.id, sender); - seq_trace_size = 6; /* TUPLE5 */ + + seq_trace_size = size_object(stoken); } #ifdef USE_VM_PROBES if (DT_UTAG_FLAGS(sender) & DT_UTAG_SPREADING) { @@ -689,7 +690,7 @@ erts_send_message(Process* sender, } if (DTRACE_ENABLED(message_send)) { if (have_seqtrace(stoken)) { - tok_label = signed_val(SEQ_TRACE_T_LABEL(stoken)); + tok_label = SEQ_TRACE_T_DTRACE_LABEL(stoken); tok_lastcnt = signed_val(SEQ_TRACE_T_LASTCNT(stoken)); tok_serial = signed_val(SEQ_TRACE_T_SERIAL(stoken)); } |