diff options
| author | Lukas Larsson <[email protected]> | 2019-06-17 08:33:01 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2019-06-17 08:33:01 +0200 |
| commit | c8d94a379105e859ba5fa8c40d5cd9814c506f6b (patch) | |
| tree | ca0a6e089512848145ff2550b43e2e52da7f8171 /erts | |
| parent | 7ef46ad0c2a333e052caef3845090808a4f9c6a7 (diff) | |
| parent | f77f8ba0509e5edd8ff89bd9313dfbb645f4140c (diff) | |
| download | otp-c8d94a379105e859ba5fa8c40d5cd9814c506f6b.tar.gz otp-c8d94a379105e859ba5fa8c40d5cd9814c506f6b.tar.bz2 otp-c8d94a379105e859ba5fa8c40d5cd9814c506f6b.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/doc/src/erlang.xml | 5 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_trace.c | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml index f41ed87048..0e82ceba7d 100644 --- a/erts/doc/src/erlang.xml +++ b/erts/doc/src/erlang.xml @@ -10129,6 +10129,11 @@ timestamp() -> time stamp flags are remembered, so if two are passed and the one with highest precedence later is disabled, the other one becomes active.</p> + <p>If a match specification (applicable only for <c>call</c>, <c>send</c> + and <c>'receive'</c> tracing) contains a <c>{message}</c> action + function with a non-boolean value, that value is added as an extra + element to the message tuple either in the last position or before + the timestamp (if it is present).</p> <p>Trace messages:</p> <marker id="trace_3_trace_messages"></marker> <taglist> diff --git a/erts/emulator/beam/erl_trace.c b/erts/emulator/beam/erl_trace.c index 6e462b64ef..ffe0752b46 100644 --- a/erts/emulator/beam/erl_trace.c +++ b/erts/emulator/beam/erl_trace.c @@ -713,7 +713,9 @@ trace_sched(Process *p, ErtsProcLocks locks, Eterm what) trace_sched_aux(p, locks, what); } -/* Send {trace_ts, Pid, Send, Msg, DestPid, Timestamp} +/* Send {trace_ts, Pid, Send, Msg, DestPid, PamResult, Timestamp} + * or {trace_ts, Pid, Send, Msg, DestPid, Timestamp} + * or {trace, Pid, Send, Msg, DestPid, PamResult} * or {trace, Pid, Send, Msg, DestPid} * * where 'Send' is 'send' or 'send_to_non_existing_process'. @@ -773,7 +775,9 @@ trace_send(Process *p, Eterm to, Eterm msg) erts_match_set_release_result_trace(p, pam_result); } -/* Send {trace_ts, Pid, receive, Msg, Timestamp} +/* Send {trace_ts, Pid, receive, Msg, PamResult, Timestamp} + * or {trace_ts, Pid, receive, Msg, Timestamp} + * or {trace, Pid, receive, Msg, PamResult} * or {trace, Pid, receive, Msg} */ void |