diff options
| author | Lukas Larsson <[email protected]> | 2014-03-25 11:47:11 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2014-03-25 11:47:11 +0100 |
| commit | 62430f5399c31b1be0a4737cff680b8d4122f41e (patch) | |
| tree | 2a185b79f8ae1880f778bc6832b624f3c2a61ea1 | |
| parent | c5dc6babf962b22aaffd04bd8c1fff761973f0c0 (diff) | |
| parent | c8b55a755da15e766a745a948f3d8020f581fd37 (diff) | |
| download | otp-62430f5399c31b1be0a4737cff680b8d4122f41e.tar.gz otp-62430f5399c31b1be0a4737cff680b8d4122f41e.tar.bz2 otp-62430f5399c31b1be0a4737cff680b8d4122f41e.zip | |
Merge branch 'paulgray/dtrace_snprintf_fix/OTP-11816'
* paulgray/dtrace_snprintf_fix/OTP-11816:
Fix DTrace/SystemTap-related formatting
| -rw-r--r-- | erts/emulator/beam/erl_message.c | 6 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_port_task.c | 2 | ||||
| -rw-r--r-- | erts/emulator/beam/io.c | 2 | ||||
| -rw-r--r-- | erts/emulator/sys/common/erl_check_io.c | 3 |
4 files changed, 8 insertions, 5 deletions
diff --git a/erts/emulator/beam/erl_message.c b/erts/emulator/beam/erl_message.c index 6a9030fd99..0eb8117980 100644 --- a/erts/emulator/beam/erl_message.c +++ b/erts/emulator/beam/erl_message.c @@ -896,8 +896,10 @@ erts_send_message(Process* sender, #ifdef USE_VM_PROBES *sender_name = *receiver_name = '\0'; if (DTRACE_ENABLED(message_send)) { - erts_snprintf(sender_name, sizeof(DTRACE_CHARBUF_NAME(sender_name)), "%T", sender->common.id); - erts_snprintf(receiver_name, sizeof(DTRACE_CHARBUF_NAME(receiver_name)), "%T", receiver->common.id); + erts_snprintf(sender_name, sizeof(DTRACE_CHARBUF_NAME(sender_name)), + "%T", sender->common.id); + erts_snprintf(receiver_name, sizeof(DTRACE_CHARBUF_NAME(receiver_name)), + "%T", receiver->common.id); } #endif if (SEQ_TRACE_TOKEN(sender) != NIL && !(flags & ERTS_SND_FLG_NO_SEQ_TRACE)) { diff --git a/erts/emulator/beam/erl_port_task.c b/erts/emulator/beam/erl_port_task.c index 4e107b722d..31d9a1e26e 100644 --- a/erts/emulator/beam/erl_port_task.c +++ b/erts/emulator/beam/erl_port_task.c @@ -2037,7 +2037,7 @@ begin_port_cleanup(Port *pp, ErtsPortTask **execqp, int *processing_busy_q_p) erts_snprintf(port_str, sizeof(DTRACE_CHARBUF_NAME(port_str)), "%T", pp->common.id); while (plp2 != NULL) { - erts_snprintf(pid_str, sizeof(DTRACE_CHARBUF_NAME(pid_str)), "%T", plp2->pid); + erts_snprintf(pid_str, sizeof(DTRACE_CHARBUF_NAME(pid_str)), "%T", plp2->pid); DTRACE2(process_port_unblocked, pid_str, port_str); } } diff --git a/erts/emulator/beam/io.c b/erts/emulator/beam/io.c index 999d2fb2f7..a25716b9b4 100644 --- a/erts/emulator/beam/io.c +++ b/erts/emulator/beam/io.c @@ -4727,7 +4727,7 @@ erts_port_resume_procs(Port *prt) erts_snprintf(port_str, sizeof(DTRACE_CHARBUF_NAME(port_str)), "%T", prt->common.id); while (plp2 != NULL) { - erts_snprintf(pid_str, sizeof(DTRACE_CHARBUF_NAME(pid_str)), "%T", plp2->pid); + erts_snprintf(pid_str, sizeof(DTRACE_CHARBUF_NAME(pid_str)), "%T", plp2->pid); DTRACE2(process_port_unblocked, pid_str, port_str); } } diff --git a/erts/emulator/sys/common/erl_check_io.c b/erts/emulator/sys/common/erl_check_io.c index 245841a768..1db673e7f3 100644 --- a/erts/emulator/sys/common/erl_check_io.c +++ b/erts/emulator/sys/common/erl_check_io.c @@ -527,7 +527,8 @@ ERTS_CIO_EXPORT(driver_select)(ErlDrvPort ix, /* fast track to stop_select callback */ stop_select_fn = prt->drv_ptr->stop_select; #ifdef USE_VM_PROBES - strncpy(name, prt->drv_ptr->name, sizeof(name)-1); + strncpy(name, prt->drv_ptr->name, + sizeof(DTRACE_CHARBUF_NAME(name))-1); name[sizeof(name)-1] = '\0'; #endif ret = 0; |