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/emulator/nifs/common | |
| 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/emulator/nifs/common')
| -rw-r--r-- | erts/emulator/nifs/common/erl_tracer_nif.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/erts/emulator/nifs/common/erl_tracer_nif.c b/erts/emulator/nifs/common/erl_tracer_nif.c index 1bb6b940c4..b0c937592a 100644 --- a/erts/emulator/nifs/common/erl_tracer_nif.c +++ b/erts/emulator/nifs/common/erl_tracer_nif.c @@ -130,6 +130,9 @@ static ERL_NIF_TERM enabled(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) if (!enif_is_port_alive(env, &to_port)) /* tracer is dead so we should remove this trace point */ return atom_remove; + } else { + /* The state was not a pid or a port */ + return atom_remove; } /* Only generate trace for when tracer != tracee */ |