aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2016-08-01 11:25:41 +0200
committerBjörn-Egil Dahlberg <[email protected]>2016-08-01 11:25:41 +0200
commit2f654b18a0aaa221b1a60aa17f13b460b1a4df4a (patch)
tree07fb392af4d5f7fbc8e03cabddd2b4cf67b016d0
parent74efa6d47652b77b03f56326130252ee4138be10 (diff)
parent6dcf9c56c648bb6fa2f0e27bdf6429eab23fdd8c (diff)
downloadotp-2f654b18a0aaa221b1a60aa17f13b460b1a4df4a.tar.gz
otp-2f654b18a0aaa221b1a60aa17f13b460b1a4df4a.tar.bz2
otp-2f654b18a0aaa221b1a60aa17f13b460b1a4df4a.zip
Merge branch 'maint'
-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,