aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2016-08-01 11:25:31 +0200
committerBjörn-Egil Dahlberg <[email protected]>2016-08-01 11:25:31 +0200
commit6dcf9c56c648bb6fa2f0e27bdf6429eab23fdd8c (patch)
treed1906c1413fda0a853d5478a18d6b3e73d89fd45 /lib
parent38d70ada48adb51e8f092ca604d5347fea56339f (diff)
parentfdbf5631d9de0d1b7d763c25e634e768cae4bcc0 (diff)
downloadotp-6dcf9c56c648bb6fa2f0e27bdf6429eab23fdd8c.tar.gz
otp-6dcf9c56c648bb6fa2f0e27bdf6429eab23fdd8c.tar.bz2
otp-6dcf9c56c648bb6fa2f0e27bdf6429eab23fdd8c.zip
Merge branch 'comtihon/fprof/fix-gc-tags/PR-1136/OTP-13778' into maint
* comtihon/fprof/fix-gc-tags/PR-1136/OTP-13778: fix gc_start\end bug
Diffstat (limited to 'lib')
-rw-r--r--lib/tools/src/fprof.erl11
1 files changed, 11 insertions, 0 deletions
diff --git a/lib/tools/src/fprof.erl b/lib/tools/src/fprof.erl
index 8db23dd151..1291a3e5ec 100644
--- a/lib/tools/src/fprof.erl
+++ b/lib/tools/src/fprof.erl
@@ -1636,6 +1636,11 @@ trace_handler({trace_ts, Pid, gc_major_start, _Func, TS} = Trace, Table, _, Dump
dump_stack(Dump, get(Pid), Trace),
trace_gc_start(Table, Pid, TS),
TS;
+
+trace_handler({trace_ts, Pid, gc_start, _Func, TS} = Trace, Table, _, Dump) ->
+ dump_stack(Dump, get(Pid), Trace),
+ trace_gc_start(Table, Pid, TS),
+ TS;
%%
%% gc_end
@@ -1648,6 +1653,12 @@ trace_handler({trace_ts, Pid, gc_major_end, _Func, TS} = Trace, Table, _, Dump)
dump_stack(Dump, get(Pid), Trace),
trace_gc_end(Table, Pid, TS),
TS;
+
+trace_handler({trace_ts, Pid, gc_end, _Func, TS} = Trace, Table, _, Dump) ->
+ dump_stack(Dump, get(Pid), Trace),
+ trace_gc_end(Table, Pid, TS),
+ TS;
+
%%
%% link
trace_handler({trace_ts, Pid, link, _OtherPid, TS} = Trace,