diff options
| author | Sverker Eriksson <[email protected]> | 2016-05-09 15:30:04 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-05-09 15:30:04 +0200 |
| commit | 72854151006ca4bba903f99fb598fbe244827d5c (patch) | |
| tree | 4700fd2fa91ad01ae41ab62b191c5f9ed44944c2 /erts/preloaded | |
| parent | 387e94f0a7796869486cf3160f2d124b1e216a21 (diff) | |
| parent | d38d8a4cafe04d7ad63a4d0b168a25eb5e887440 (diff) | |
| download | otp-72854151006ca4bba903f99fb598fbe244827d5c.tar.gz otp-72854151006ca4bba903f99fb598fbe244827d5c.tar.bz2 otp-72854151006ca4bba903f99fb598fbe244827d5c.zip | |
Merge branch 'sverker/trace-send-receive-matchspec/OTP-13507'
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index 20a64e81b4..90fd536b15 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -1749,16 +1749,16 @@ trace_delivered(_Tracee) -> erlang:nif_error(undefined). %% trace_info/2 --spec erlang:trace_info(PidPortOrFunc, Item) -> Res when - PidPortOrFunc :: pid() | port() | new | new_processes | new_ports - | {Module, Function, Arity} | on_load, +-spec erlang:trace_info(PidPortFuncEvent, Item) -> Res when + PidPortFuncEvent :: pid() | port() | new | new_processes | new_ports + | {Module, Function, Arity} | on_load | send | 'receive', Module :: module(), Function :: atom(), Arity :: arity(), Item :: flags | tracer | traced | match_spec | meta | meta_match_spec | call_count | call_time | all, Res :: trace_info_return(). -trace_info(_PidPortOrFunc, _Item) -> +trace_info(_PidPortFuncEvent, _Item) -> erlang:nif_error(undefined). %% trunc/1 @@ -2381,7 +2381,7 @@ tl(_List) -> [{[term()] | '_' ,[term()],[term()]}]. -spec erlang:trace_pattern(MFA, MatchSpec) -> non_neg_integer() when - MFA :: trace_pattern_mfa(), + MFA :: trace_pattern_mfa() | send | 'receive', MatchSpec :: (MatchSpecList :: trace_match_spec()) | boolean() | restart @@ -2403,7 +2403,13 @@ trace_pattern(MFA, MatchSpec) -> call_count | call_time. --spec erlang:trace_pattern(MFA, MatchSpec, FlagList) -> non_neg_integer() when +-spec erlang:trace_pattern(send, MatchSpec, []) -> non_neg_integer() when + MatchSpec :: (MatchSpecList :: trace_match_spec()) + | boolean(); + ('receive', MatchSpec, []) -> non_neg_integer() when + MatchSpec :: (MatchSpecList :: trace_match_spec()) + | boolean(); + (MFA, MatchSpec, FlagList) -> non_neg_integer() when MFA :: trace_pattern_mfa(), MatchSpec :: (MatchSpecList :: trace_match_spec()) | boolean() |