diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2016-05-09 10:54:26 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2016-05-09 10:54:26 +0200 |
| commit | 7bc46f866e0e90fa6282a2893337be0c4d8d8989 (patch) | |
| tree | 6be1cd8e60f3a7c9f302ac14bc89ed61eb856bcf /lib/et/src/et_selector.erl | |
| parent | 36b79cc56bd681e324a24237a89d560bb7cb0f88 (diff) | |
| parent | 5449073a9a78b0b0a387852b6c596a9ab9dea1bd (diff) | |
| download | otp-7bc46f866e0e90fa6282a2893337be0c4d8d8989.tar.gz otp-7bc46f866e0e90fa6282a2893337be0c4d8d8989.tar.bz2 otp-7bc46f866e0e90fa6282a2893337be0c4d8d8989.zip | |
Merge branch 'egil/et/fix-trace-tags/OTP-13545'
* egil/et/fix-trace-tags/OTP-13545:
et: Update runtime dependencies
et: Update gc trace tags in selector
et: Remove unnecessary boilerplate in tests
Diffstat (limited to 'lib/et/src/et_selector.erl')
| -rw-r--r-- | lib/et/src/et_selector.erl | 46 |
1 files changed, 36 insertions, 10 deletions
diff --git a/lib/et/src/et_selector.erl b/lib/et/src/et_selector.erl index 0e2d7010cd..a0297c21d1 100644 --- a/lib/et/src/et_selector.erl +++ b/lib/et/src/et_selector.erl @@ -23,11 +23,9 @@ -module(et_selector). --export([ - make_pattern/1, +-export([make_pattern/1, change_pattern/1, - parse_event/2 - ]). + parse_event/2]). -compile([{nowarn_deprecated_function,[{erlang,now,0}]}]). @@ -535,7 +533,7 @@ parse_event(Mod, Trace, ParsedTS, ReportedTS, From, Label, Contents) -> {from, From}, {to, From}, {mfa, MFA}]}}; % MFA | 0 - gc_start -> + gc_minor_start -> DetailLevel = 80, [GcKeyValueList] = Contents, {true, #event{detail_level = DetailLevel, @@ -549,7 +547,7 @@ parse_event(Mod, Trace, ParsedTS, ReportedTS, From, Label, Contents) -> {from, From}, {to, From}, {gc_items, GcKeyValueList}]}}; - gc_end -> + gc_minor_end -> DetailLevel = 85, [GcKeyValueList] = Contents, {true, #event{detail_level = DetailLevel, @@ -559,10 +557,38 @@ parse_event(Mod, Trace, ParsedTS, ReportedTS, From, Label, Contents) -> to = From, label = Label, contents = [{label, Label}, - {detail_level, DetailLevel}, - {from, From}, - {to, From}, - {gc_items, GcKeyValueList}]}}; + {detail_level, DetailLevel}, + {from, From}, + {to, From}, + {gc_items, GcKeyValueList}]}}; + gc_major_start -> + DetailLevel = 80, + [GcKeyValueList] = Contents, + {true, #event{detail_level = DetailLevel, + trace_ts = ReportedTS, + event_ts = ParsedTS, + from = From, + to = From, + label = Label, + contents = [{label, Label}, + {detail_level, DetailLevel}, + {from, From}, + {to, From}, + {gc_items, GcKeyValueList}]}}; + gc_major_end -> + DetailLevel = 85, + [GcKeyValueList] = Contents, + {true, #event{detail_level = DetailLevel, + trace_ts = ReportedTS, + event_ts = ParsedTS, + from = From, + to = From, + label = Label, + contents = [{label, Label}, + {detail_level, DetailLevel}, + {from, From}, + {to, From}, + {gc_items, GcKeyValueList}]}}; _ -> error_logger:format("~p(~p): Ignoring unknown trace type -> ~p~n~n", [?MODULE, ?LINE, Trace]), |