commit 226ead097b77aeeaaf6df57a89786ca47fa6ebef parent d3bae6a03e0c624d0809539896a1ab5cb694685e Author: Brendan Gregg <brendan.d.gregg@gmail.com> Date: Thu, 7 Jul 2016 16:58:11 -0700 Merge pull request #96 from skarcha/fix-issue-26 Fix issue #95 Diffstat:
12 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/stackcollapse-perf.pl b/stackcollapse-perf.pl @@ -174,7 +174,7 @@ while (defined($_ = <>)) { } # event record start - if (/^(.*?)\s+(\d+)\/*(\d+)*(\s+\[\d+])*\s+\d/) { + if (/^(\S.+?)\s+(\d+)\/*(\d+)*\s+/) { # default "perf script" output has TID but not PID # eg, "java 25607 4794564.109216: cycles:" # eg, "java 12688 [002] 6544038.708352: cpu-clock:" diff --git a/test/results/perf-dd-stacks-01.txt-collapsed-inline.txt b/test/results/perf-dd-stacks-01.txt-collapsed-inline.txt @@ -1,5 +1,6 @@ -dd;??;;;;; 2 -dd;[unknown];?? 2 -dd;[unknown];??;; 2 -dd;[unknown];??;;;; 2 -dd;[unknown];??;;;;; 2 +dd;;;;;; 2 +dd;[unknown]; 1 +dd;[unknown];;; 2 +dd;[unknown];;;;; 2 +dd;[unknown];;;;;; 2 +dd;[unknown];?? 1 diff --git a/test/results/perf-funcab-cmd-01.txt-collapsed-context.txt b/test/results/perf-funcab-cmd-01.txt-collapsed-context.txt @@ -0,0 +1,2 @@ +func_ab;__libc_start_main;main;func_a 81 +func_ab;__libc_start_main;main;func_b 88 diff --git a/test/results/perf-funcab-cmd-01.txt-collapsed-inline.txt b/test/results/perf-funcab-cmd-01.txt-collapsed-inline.txt @@ -0,0 +1 @@ +func_ab;;; 169 diff --git a/test/results/perf-funcab-cmd-01.txt-collapsed-kernel.txt b/test/results/perf-funcab-cmd-01.txt-collapsed-kernel.txt @@ -0,0 +1,2 @@ +func_ab;__libc_start_main;main;func_a 81 +func_ab;__libc_start_main;main;func_b 88 diff --git a/test/results/perf-funcab-cmd-01.txt-collapsed-pid.txt b/test/results/perf-funcab-cmd-01.txt-collapsed-pid.txt @@ -0,0 +1,2 @@ +func_ab-?;__libc_start_main;main;func_a 81 +func_ab-?;__libc_start_main;main;func_b 88 diff --git a/test/results/perf-funcab-cmd-01.txt-collapsed-tid.txt b/test/results/perf-funcab-cmd-01.txt-collapsed-tid.txt @@ -0,0 +1,2 @@ +func_ab-?/15285;__libc_start_main;main;func_a 81 +func_ab-?/15285;__libc_start_main;main;func_b 88 diff --git a/test/results/perf-funcab-pid-01.txt-collapsed-context.txt b/test/results/perf-funcab-pid-01.txt-collapsed-context.txt @@ -0,0 +1,2 @@ +func_ab;__libc_start_main;main;func_a 112 +func_ab;__libc_start_main;main;func_b 116 diff --git a/test/results/perf-funcab-pid-01.txt-collapsed-inline.txt b/test/results/perf-funcab-pid-01.txt-collapsed-inline.txt @@ -0,0 +1 @@ +func_ab;;; 228 diff --git a/test/results/perf-funcab-pid-01.txt-collapsed-kernel.txt b/test/results/perf-funcab-pid-01.txt-collapsed-kernel.txt @@ -0,0 +1,2 @@ +func_ab;__libc_start_main;main;func_a 112 +func_ab;__libc_start_main;main;func_b 116 diff --git a/test/results/perf-funcab-pid-01.txt-collapsed-pid.txt b/test/results/perf-funcab-pid-01.txt-collapsed-pid.txt @@ -0,0 +1,2 @@ +func_ab-?;__libc_start_main;main;func_a 112 +func_ab-?;__libc_start_main;main;func_b 116 diff --git a/test/results/perf-funcab-pid-01.txt-collapsed-tid.txt b/test/results/perf-funcab-pid-01.txt-collapsed-tid.txt @@ -0,0 +1,2 @@ +func_ab-?/15294;__libc_start_main;main;func_a 112 +func_ab-?/15294;__libc_start_main;main;func_b 116