aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2018-04-13 13:33:40 +0200
committerRickard Green <[email protected]>2018-04-13 13:33:40 +0200
commit30fd5b9e98268305762b9647d1bf40df665ae54d (patch)
tree4b3c46cd4a397abb7237000c69e0da3099b1b312 /erts/emulator
parentc171aa54085853afe4bf7097c9b47a0fa9a72378 (diff)
parent28e9c5673433054eee49b49ccdc919183326b686 (diff)
downloadotp-30fd5b9e98268305762b9647d1bf40df665ae54d.tar.gz
otp-30fd5b9e98268305762b9647d1bf40df665ae54d.tar.bz2
otp-30fd5b9e98268305762b9647d1bf40df665ae54d.zip
Merge branch 'rickard/signals/OTP-14589'
* rickard/signals/OTP-14589: Fix VM probes compilation Conflicts: erts/emulator/beam/erl_message.c
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/beam/erl_message.c24
1 files changed, 0 insertions, 24 deletions
diff --git a/erts/emulator/beam/erl_message.c b/erts/emulator/beam/erl_message.c
index 51b7865c0b..93fd9859a5 100644
--- a/erts/emulator/beam/erl_message.c
+++ b/erts/emulator/beam/erl_message.c
@@ -264,11 +264,6 @@ erts_queue_dist_message(Process *rcvr,
Eterm from)
{
ErtsMessage* mp;
-#ifdef USE_VM_PROBES
- Sint tok_label = 0;
- Sint tok_lastcnt = 0;
- Sint tok_serial = 0;
-#endif
erts_aint_t state;
ERTS_LC_ASSERT(rcvr_locks == erts_proc_lc_my_proc_locks(rcvr));
@@ -309,25 +304,6 @@ erts_queue_dist_message(Process *rcvr,
}
else {
-#ifdef USE_VM_PROBES
- if (DTRACE_ENABLED(message_queued)) {
- DTRACE_CHARBUF(receiver_name, DTRACE_TERM_BUF_SIZE);
-
- dtrace_proc_str(rcvr, receiver_name);
- if (have_seqtrace(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));
- }
- /*
- * TODO: We don't know the real size of the external message here.
- * -1 will appear to a D script as 4294967295.
- */
- DTRACE6(message_queued, receiver_name, -1, rcvr->sig_qs.len + 1,
- tok_label, tok_lastcnt, tok_serial);
- }
-#endif
-
LINK_MESSAGE(rcvr, mp, &mp->next, 1);
if (!(rcvr_locks & ERTS_PROC_LOCK_MSGQ))