diff options
| author | Lukas Larsson <[email protected]> | 2016-05-27 09:34:25 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-05-27 09:34:25 +0200 |
| commit | 3f2eea83dd133c597580d7c2b5056bc90219d025 (patch) | |
| tree | f46ad339fc2b21f3bd0c1260b06e218ebd4550fb /erts/preloaded | |
| parent | ea8064b1bbda0ef59420ec8a805f3ee52630d704 (diff) | |
| parent | d9e0f376b36baa5453717606f373daa5b7a1b0aa (diff) | |
| download | otp-3f2eea83dd133c597580d7c2b5056bc90219d025.tar.gz otp-3f2eea83dd133c597580d7c2b5056bc90219d025.tar.bz2 otp-3f2eea83dd133c597580d7c2b5056bc90219d025.zip | |
Merge branch 'lukas/erts/tracing/tracer-move-extra-to-map/OTP-10267'
* lukas/erts/tracing/tracer-move-extra-to-map/OTP-10267:
runtime_tools: Fix erl_tracer testcases
runtime_tools: Fix documentation for dbg:p
erts: Move tracer SecondTraceTerm to Opts map
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/ebin/erl_tracer.beam | bin | 2112 -> 2200 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erl_tracer.erl | 14 |
2 files changed, 8 insertions, 6 deletions
diff --git a/erts/preloaded/ebin/erl_tracer.beam b/erts/preloaded/ebin/erl_tracer.beam Binary files differindex 69804540c9..22286ed221 100644 --- a/erts/preloaded/ebin/erl_tracer.beam +++ b/erts/preloaded/ebin/erl_tracer.beam diff --git a/erts/preloaded/src/erl_tracer.erl b/erts/preloaded/src/erl_tracer.erl index fe15812535..c810069d17 100644 --- a/erts/preloaded/src/erl_tracer.erl +++ b/erts/preloaded/src/erl_tracer.erl @@ -1,6 +1,6 @@ -module(erl_tracer). --export([enabled/3, trace/6, on_load/0]). +-export([enabled/3, trace/5, on_load/0]). -type tracee() :: port() | pid() | undefined. @@ -26,9 +26,9 @@ | trace_tag_running_ports() | trace_tag_gc(). --type trace_opts() :: #{ match_spec_result => true | term(), - scheduler_id => undefined | non_neg_integer(), - timestamp => undefined | timestamp | cpu_timestamp | +-type trace_opts() :: #{ extra => term(), match_spec_result => term(), + scheduler_id => non_neg_integer(), + timestamp => timestamp | cpu_timestamp | monotonic | strict_monotonic }. -type tracer_state() :: term(). @@ -41,6 +41,9 @@ on_load() -> %%% NIF placeholders %%% +%% This suppression is needed as trace_tag gets collapsed to atom() +-dialyzer({no_contracts, enabled/3}). + -spec enabled(Tag :: trace_status, TracerState :: tracer_state(), Tracee :: tracee()) -> @@ -56,8 +59,7 @@ enabled(_, _, _) -> TracerState :: tracer_state(), Tracee :: tracee(), Msg :: term(), - Extra :: term(), Opts :: trace_opts()) -> any(). -trace(_, _, _, _, _, _) -> +trace(_, _, _, _, _) -> erlang:nif_error(nif_not_loaded). |