Merge pull request fpco#11 from flip111/patch-1

Update stack & flamegraph with minor fixes
platonic-io · Jun 7, 2018 · e60d6dc · e60d6dc
2 parents 2dd2263 + a5d8eb2
commit e60d6dc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.stack-work
diff --git a/FlameGraph b/FlameGraph
diff --git a/ghc-prof-flamegraph.cabal b/ghc-prof-flamegraph.cabal
@@ -43,5 +43,6 @@ executable ghc-prof-flamegraph
                      , optparse-applicative
                      , process
   other-modules:       ProfFile
+                     , Paths_ghc_prof_flamegraph
   default-language:    Haskell2010
   ghc-options:         -Wall
diff --git a/stack.yaml b/stack.yaml
@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: lts-7.15
+resolver: lts-10.4
+1 −0		README.md
+38 −24		flamegraph.pl
+1 −1		jmaps
+3 −0		pkgsplit-perf.pl
+16 −4		record-test.sh
+62 −14		stackcollapse-perf.pl
+98 −0		stackcollapse-vsprof.pl
+14 −1		stackcollapse.pl
+18 −10		test.sh
+1,614 −0		test/perf-cycles-instructions-01.txt
+9,985 −0		test/perf-vertx-stacks-01.txt
+7 −0		test/results/perf-cycles-instructions-01-collapsed-addrs.txt
+6 −0		test/results/perf-cycles-instructions-01-collapsed-all.txt
+6 −0		test/results/perf-cycles-instructions-01-collapsed-jit.txt
+6 −0		test/results/perf-cycles-instructions-01-collapsed-kernel.txt
+6 −0		test/results/perf-cycles-instructions-01-collapsed-pid.txt
+9 −0		test/results/perf-cycles-instructions-01-collapsed-tid.txt
+9 −0		test/results/perf-dd-stacks-01-collapsed-addrs.txt
+0 −0		test/results/perf-dd-stacks-01-collapsed-all.txt
+9 −0		test/results/perf-dd-stacks-01-collapsed-jit.txt
+9 −0		test/results/perf-dd-stacks-01-collapsed-kernel.txt
+0 −0		test/results/perf-dd-stacks-01-collapsed-pid.txt
+0 −0		test/results/perf-dd-stacks-01-collapsed-tid.txt
+0 −0		test/results/perf-funcab-cmd-01-collapsed-addrs.txt
+2 −0		test/results/perf-funcab-cmd-01-collapsed-all.txt
+2 −0		test/results/perf-funcab-cmd-01-collapsed-jit.txt
+2 −0		test/results/perf-funcab-cmd-01-collapsed-kernel.txt
+0 −0		test/results/perf-funcab-cmd-01-collapsed-pid.txt
+0 −0		test/results/perf-funcab-cmd-01-collapsed-tid.txt
+0 −0		test/results/perf-funcab-pid-01-collapsed-addrs.txt
+2 −0		test/results/perf-funcab-pid-01-collapsed-all.txt
+2 −0		test/results/perf-funcab-pid-01-collapsed-jit.txt
+2 −0		test/results/perf-funcab-pid-01-collapsed-kernel.txt
+0 −0		test/results/perf-funcab-pid-01-collapsed-pid.txt
+0 −0		test/results/perf-funcab-pid-01-collapsed-tid.txt
+114 −0		test/results/perf-iperf-stacks-pidtid-01-collapsed-addrs.txt
+1 −1		test/results/perf-iperf-stacks-pidtid-01-collapsed-all.txt
+106 −0		test/results/perf-iperf-stacks-pidtid-01-collapsed-jit.txt
+106 −0		test/results/perf-iperf-stacks-pidtid-01-collapsed-kernel.txt
+0 −0		test/results/perf-iperf-stacks-pidtid-01-collapsed-pid.txt
+0 −0		test/results/perf-iperf-stacks-pidtid-01-collapsed-tid.txt
+12 −0		test/results/perf-java-faults-01-collapsed-addrs.txt
+12 −0		test/results/perf-java-faults-01-collapsed-all.txt
+12 −0		test/results/perf-java-faults-01-collapsed-jit.txt
+0 −0		test/results/perf-java-faults-01-collapsed-kernel.txt
+0 −0		test/results/perf-java-faults-01-collapsed-pid.txt
+0 −0		test/results/perf-java-faults-01-collapsed-tid.txt
+33 −0		test/results/perf-java-stacks-01-collapsed-addrs.txt
+33 −0		test/results/perf-java-stacks-01-collapsed-all.txt
+33 −0		test/results/perf-java-stacks-01-collapsed-jit.txt
+0 −0		test/results/perf-java-stacks-01-collapsed-kernel.txt
+0 −0		test/results/perf-java-stacks-01-collapsed-pid.txt
+0 −0		test/results/perf-java-stacks-01-collapsed-tid.txt
+1 −0		test/results/perf-java-stacks-02-collapsed-addrs.txt
+1 −0		test/results/perf-java-stacks-02-collapsed-all.txt
+1 −0		test/results/perf-java-stacks-02-collapsed-jit.txt
+0 −0		test/results/perf-java-stacks-02-collapsed-kernel.txt
+0 −0		test/results/perf-java-stacks-02-collapsed-pid.txt
+0 −0		test/results/perf-java-stacks-02-collapsed-tid.txt
+0 −0		test/results/perf-js-stacks-01-collapsed-addrs.txt
+2 −0		test/results/perf-js-stacks-01-collapsed-all.txt
+2 −0		test/results/perf-js-stacks-01-collapsed-jit.txt
+2 −0		test/results/perf-js-stacks-01-collapsed-kernel.txt
+0 −0		test/results/perf-js-stacks-01-collapsed-pid.txt
+0 −0		test/results/perf-js-stacks-01-collapsed-tid.txt
+10 −0		test/results/perf-mirageos-stacks-01-collapsed-addrs.txt
+0 −0		test/results/perf-mirageos-stacks-01-collapsed-all.txt
+9 −0		test/results/perf-mirageos-stacks-01-collapsed-jit.txt
+9 −0		test/results/perf-mirageos-stacks-01-collapsed-kernel.txt
+0 −0		test/results/perf-mirageos-stacks-01-collapsed-pid.txt
+0 −0		test/results/perf-mirageos-stacks-01-collapsed-tid.txt
+46 −0		test/results/perf-numa-stacks-01-collapsed-addrs.txt
+17 −0		test/results/perf-numa-stacks-01-collapsed-all.txt
+17 −0		test/results/perf-numa-stacks-01-collapsed-jit.txt
+0 −0		test/results/perf-numa-stacks-01-collapsed-kernel.txt
+0 −0		test/results/perf-numa-stacks-01-collapsed-pid.txt
+0 −0		test/results/perf-numa-stacks-01-collapsed-tid.txt
+45 −0		test/results/perf-rust-Yamakaky-dcpu-collapsed-addrs.txt
+0 −0		test/results/perf-rust-Yamakaky-dcpu-collapsed-all.txt
+45 −0		test/results/perf-rust-Yamakaky-dcpu-collapsed-jit.txt
+45 −0		test/results/perf-rust-Yamakaky-dcpu-collapsed-kernel.txt
+0 −0		test/results/perf-rust-Yamakaky-dcpu-collapsed-pid.txt
+0 −0		test/results/perf-rust-Yamakaky-dcpu-collapsed-tid.txt
+199 −0		test/results/perf-vertx-stacks-01-collapsed-addrs.txt
+199 −0		test/results/perf-vertx-stacks-01-collapsed-all.txt
+199 −0		test/results/perf-vertx-stacks-01-collapsed-jit.txt
+199 −0		test/results/perf-vertx-stacks-01-collapsed-kernel.txt
+199 −0		test/results/perf-vertx-stacks-01-collapsed-pid.txt
+209 −0		test/results/perf-vertx-stacks-01-collapsed-tid.txt