aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2016-01-21 10:33:40 +0100
committerBjörn-Egil Dahlberg <[email protected]>2016-04-06 17:23:56 +0200
commit977d50fcbc119a2d6d3bf2512605e62a3f22741b (patch)
tree73940240479f5a8bf707c7eb5c924d3681ecf307
parent8735e04e031284bd73d0cf5b9fddebf624623c02 (diff)
downloadotp-977d50fcbc119a2d6d3bf2512605e62a3f22741b.tar.gz
otp-977d50fcbc119a2d6d3bf2512605e62a3f22741b.tar.bz2
otp-977d50fcbc119a2d6d3bf2512605e62a3f22741b.zip
Refactor and fix dtrace define in erl_message
-rw-r--r--erts/emulator/beam/erl_message.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/erts/emulator/beam/erl_message.c b/erts/emulator/beam/erl_message.c
index 88efb2c59f..bc0a55068b 100644
--- a/erts/emulator/beam/erl_message.c
+++ b/erts/emulator/beam/erl_message.c
@@ -766,17 +766,7 @@ erts_send_message(Process* sender,
utag = DT_UTAG(sender);
else
utag = copy_struct(DT_UTAG(sender), dt_utag_size, &hp, ohp);
-#ifdef DTRACE_TAG_HARDDEBUG
- erts_fprintf(stderr,
- "Dtrace -> (%T) Spreading tag (%T) with "
- "message %T!\r\n",sender->common.id, utag, message);
-#endif
}
-#endif
- BM_MESSAGE_COPIED(msize);
- BM_SWAP_TIMER(copy,send);
-
-#ifdef USE_VM_PROBES
if (DTRACE_ENABLED(message_send)) {
if (have_seqtrace(stoken)) {
tok_label = signed_val(SEQ_TRACE_T_LABEL(stoken));
@@ -787,6 +777,9 @@ erts_send_message(Process* sender,
msize, tok_label, tok_lastcnt, tok_serial);
}
#endif
+ BM_MESSAGE_COPIED(msize);
+ BM_SWAP_TIMER(copy,send);
+
} else {
Eterm *hp;
@@ -822,8 +815,10 @@ erts_send_message(Process* sender,
BM_MESSAGE_COPIED(msz);
BM_SWAP_TIMER(copy,send);
}
+#ifdef USE_VM_PROBES
DTRACE6(message_send, sender_name, receiver_name,
msize, tok_label, tok_lastcnt, tok_serial);
+#endif
}
res = queue_message(sender,