diff options
| author | Henrik Nord <[email protected]> | 2012-07-06 12:27:01 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2012-07-06 12:27:01 +0200 |
| commit | 3c972cc1a1686f85464b8da3702718c6a52093ea (patch) | |
| tree | b57e8b76d158cd882b5ff0721505015ba1a683ec /erts | |
| parent | 866cf9343b289d94c144600af1765e6754cfb593 (diff) | |
| parent | c075ac6484e3d5a93a0d870ab4483d39ae26eaec (diff) | |
| download | otp-3c972cc1a1686f85464b8da3702718c6a52093ea.tar.gz otp-3c972cc1a1686f85464b8da3702718c6a52093ea.tar.bz2 otp-3c972cc1a1686f85464b8da3702718c6a52093ea.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/dtrace-wrapper.h | 2 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_message.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/erts/emulator/beam/dtrace-wrapper.h b/erts/emulator/beam/dtrace-wrapper.h index 1aeb7f9221..6ec0c91e21 100644 --- a/erts/emulator/beam/dtrace-wrapper.h +++ b/erts/emulator/beam/dtrace-wrapper.h @@ -42,6 +42,8 @@ #define DTRACE_CHARBUF(name, size) \ char name##_BUFFER[size], *name = name##_BUFFER +#define DTRACE_CHARBUF_NAME(name) name##_BUFFER + #if defined(USE_DYNAMIC_TRACE) && defined(USE_VM_PROBES) #include "erlang_dtrace.h" diff --git a/erts/emulator/beam/erl_message.c b/erts/emulator/beam/erl_message.c index 26bb015070..c98ca09f3f 100644 --- a/erts/emulator/beam/erl_message.c +++ b/erts/emulator/beam/erl_message.c @@ -888,8 +888,8 @@ erts_send_message(Process* sender, #ifdef USE_VM_PROBES *sender_name = *receiver_name = '\0'; if (DTRACE_ENABLED(message_send)) { - erts_snprintf(sender_name, sizeof(sender_name), "%T", sender->id); - erts_snprintf(receiver_name, sizeof(receiver_name), "%T", receiver->id); + erts_snprintf(sender_name, sizeof(DTRACE_CHARBUF_NAME(sender_name)), "%T", sender->id); + erts_snprintf(receiver_name, sizeof(DTRACE_CHARBUF_NAME(receiver_name)), "%T", receiver->id); } #endif if (SEQ_TRACE_TOKEN(sender) != NIL && !(flags & ERTS_SND_FLG_NO_SEQ_TRACE)) { |