diff options
| author | Lukas Larsson <[email protected]> | 2016-05-03 10:07:27 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-05-03 10:07:27 +0200 |
| commit | 8fcc73cd8d19fe362f929c9cb0d96579a2ed4ee5 (patch) | |
| tree | 32c3d1b27c5ee4801958f58b449e8fafae19153f /erts/doc/src | |
| parent | 94e70f82df417d9e673a13d101007d7ae8932df7 (diff) | |
| parent | 80512854940a6db33152717246a34bbe68aaa8ed (diff) | |
| download | otp-8fcc73cd8d19fe362f929c9cb0d96579a2ed4ee5.tar.gz otp-8fcc73cd8d19fe362f929c9cb0d96579a2ed4ee5.tar.bz2 otp-8fcc73cd8d19fe362f929c9cb0d96579a2ed4ee5.zip | |
Merge branch 'lukas/erts/tracing/misc_fixes/OTP-13503'
* lukas/erts/tracing/misc_fixes/OTP-13503:
erts: Add test for new procs trace with spawn_link
kernel: Remove seq_trace event order dep in tc
erts: Add tests for set on link tracing
erts: Expand trace tests for refc binaries
erts: Remove erl_tracer with invalid state
erts: Remove some dead code
erts: Fix broken doc link to erl_tracer
Conflicts:
erts/emulator/beam/erl_trace.c
Diffstat (limited to 'erts/doc/src')
| -rw-r--r-- | erts/doc/src/erlang.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml index 423ccdf98f..1daa582584 100644 --- a/erts/doc/src/erlang.xml +++ b/erts/doc/src/erlang.xml @@ -8637,8 +8637,8 @@ timestamp() -> <p>Specifies that a tracer module should be called instead of sending a trace message. The tracer module can then ignore or change the trace message. For more details - on how to write a tracer module see <seealso marker="erl_tracer"> - erl_tracer</seealso> + on how to write a tracer module see + <seealso marker="erts:erl_tracer"><c>erl_tracer</c></seealso> </p> </item> </taglist> @@ -8989,7 +8989,7 @@ timestamp() -> <c>erlang:trace_delivered(<anno>Tracee</anno>)</c> resides on. The special <c><anno>Tracee</anno></c> atom <c>all</c> denotes all processes that currently are traced in the node.</p> - <p>When used together with an <seealso marker="#erl_tracer"> + <p>When used together with an <seealso marker="erts:erl_tracer"> Tracer Module</seealso> any message sent in the trace callback is guaranteed to have reached it's recipient before the <c>trace_delivered</c> message is sent.</p> |