aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2016-05-11 17:16:27 +0200
committerRickard Green <[email protected]>2016-05-11 17:16:27 +0200
commit18fbb49321d716d4590d24512696b665e857d623 (patch)
tree24d0c78cec3abc0c7466ecbba5385d19ee750b53 /erts/preloaded
parent8b544b523d915d1a54d505ec34182676f183a5e0 (diff)
parent3471d44a6a5ed5ab038c4cdc76b350119fe745e2 (diff)
downloadotp-18fbb49321d716d4590d24512696b665e857d623.tar.gz
otp-18fbb49321d716d4590d24512696b665e857d623.tar.bz2
otp-18fbb49321d716d4590d24512696b665e857d623.zip
Merge branch 'lukas/trace-fix'
* lukas/trace-fix: erts: Only allow remove from trace_status callback
Diffstat (limited to 'erts/preloaded')
-rw-r--r--erts/preloaded/src/erl_tracer.erl8
1 files changed, 6 insertions, 2 deletions
diff --git a/erts/preloaded/src/erl_tracer.erl b/erts/preloaded/src/erl_tracer.erl
index de1e9ca01e..fe15812535 100644
--- a/erts/preloaded/src/erl_tracer.erl
+++ b/erts/preloaded/src/erl_tracer.erl
@@ -41,10 +41,14 @@ on_load() ->
%%% NIF placeholders
%%%
--spec enabled(Tag :: trace_tag() | seq_trace | trace_status,
+-spec enabled(Tag :: trace_status,
TracerState :: tracer_state(),
Tracee :: tracee()) ->
- trace | discard | remove.
+ trace | remove;
+ (Tag :: trace_tag() | seq_trace,
+ TracerState :: tracer_state(),
+ Tracee :: tracee()) ->
+ trace | discard.
enabled(_, _, _) ->
erlang:nif_error(nif_not_loaded).