perf/urgent fix

GIT PULL New Arnaldo Carvalho de Melo 3 participants 5 messages May 10, 2016 – May 11, 2016

Subsystems (2)

Stable branch perf events

lore

Share & tools

lore

Arnaldo Carvalho de Melo

author maintainer

2016-05-10 14:26 UTC #0 lore raw

From: Arnaldo Carvalho de Melo <[email protected]>

Hi Ingo,

Please consider pulling,

- Arnaldo

The following changes since commit 93193230f7b8bd484d1749f4044d1214d521c804:

perf/core: Change the default paranoia level to 2 (2016-05-10 09:58:51 +0200)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git tags/perf-urgent-for-mingo-20160510

for you to fetch changes up to ba07ebe02077751db101ed202bb690f504248575:

perf diff: Fix duplicated output column (2016-05-10 10:37:05 -0300)

----------------------------------------------------------------
perf/urgent fix:

- Fix duplicated output column in 'perf diff' (Namhyung Kim)

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

----------------------------------------------------------------
Namhyung Kim (1):
perf diff: Fix duplicated output column

 tools/perf/util/sort.c | 3 +++
 1 file changed, 3 insertions(+)

Arnaldo Carvalho de Melo

author maintainer

2016-05-10 14:26 UTC #1 lore raw

PATCH 1/1 perf diff: Fix duplicated output column

From: Namhyung Kim <[email protected]>

The commit b97511c5bc94 ("perf tools: Add overhead/overhead_children keys defaults via string") moved initialization of column headers but it missed to check the sort__mode. As 'perf diff' doesn't call perf_hpp__init(), the setup_overhead() also should not be called.

Before:

  # Baseline    Delta  Children  Overhead  Shared Object        Symbol
  # ........  .......  ........  ........  ...................  .......................
  #
      28.48%  -28.47%    28.48%    28.48%  [kernel.vmlinux ]    [k] intel_idle
      11.51%  -11.47%    11.51%    11.51%  libxul.so            [.] 0x0000000001a360f7
       3.49%   -3.49%     3.49%     3.49%  [kernel.vmlinux]     [k] generic_exec_single
       2.91%   -2.89%     2.91%     2.91%  libdbus-1.so.3.8.11  [.] 0x000000000000cdc2
       2.86%   -2.85%     2.86%     2.86%  libxcb.so.1.1.0      [.] 0x000000000000c890
       2.44%   -2.39%     2.44%     2.44%  [kernel.vmlinux]     [k] perf_event_aux_ctx

After:

  # Baseline    Delta  Shared Object        Symbol
  # ........  .......  ...................  .......................
  #
      28.48%  -28.47%  [kernel.vmlinux]     [k] intel_idle
      11.51%  -11.47%  libxul.so            [.] 0x0000000001a360f7
       3.49%   -3.49%  [kernel.vmlinux]     [k] generic_exec_single
       2.91%   -2.89%  libdbus-1.so.3.8.11  [.] 0x000000000000cdc2
       2.86%   -2.85%  libxcb.so.1.1.0      [.] 0x000000000000c890
       2.44%   -2.39%  [kernel.vmlinux]     [k] perf_event_aux_ctx

Signed-off-by Namhyung Kim <[email protected]>

Acked-by Jiri Olsa <[email protected]>

Cc Peter Zijlstra <[email protected]>

Cc [email protected] # 4.5+

Fixes b97511c5bc94 ("perf tools: Add overhead/overhead_children keys defaults via string")

Link http://lkml.kernel.org/r/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/perf/util/sort.c | 3 +++
 1 file changed, 3 insertions(+)

tools/perf/util/sort.c +3 -0

index 47966a1618c7..f5ba111cd9fb 100644
@@ -2445,6 +2445,9 @@ static char *prefix_if_not_in(const char *pre, char *str)
 
 static char *setup_overhead(char *keys)
 {
+	if (sort__mode == SORT_MODE__DIFF)
+		return keys;
+
 	keys = prefix_if_not_in("overhead", keys);
 
 	if (symbol_conf.cumulate_callchain)

Signature · 1 line

2.5.5

tip-bot for Namhyung Kim

merge bot

2016-05-11 12:22 UTC #2 lore raw

[tip:perf/core] perf diff: Fix duplicated output column

perf diff: Fix duplicated output column

Commit-ID:  4cdcac59960c5800cef91f904c9701bed03dc4dd
Gitweb:     http://git.kernel.org/tip/4cdcac59960c5800cef91f904c9701bed03dc4dd
Author:     Namhyung Kim <[email protected]>
AuthorDate: Tue, 10 May 2016 11:26:24 -0300
Committer:  Ingo Molnar <[email protected]>
CommitDate: Wed, 11 May 2016 14:15:31 +0200

perf diff: Fix duplicated output column

Before:

  # Baseline    Delta  Children  Overhead  Shared Object        Symbol
  # ........  .......  ........  ........  ...................  .......................
  #
      28.48%  -28.47%    28.48%    28.48%  [kernel.vmlinux ]    [k] intel_idle
      11.51%  -11.47%    11.51%    11.51%  libxul.so            [.] 0x0000000001a360f7
       3.49%   -3.49%     3.49%     3.49%  [kernel.vmlinux]     [k] generic_exec_single
       2.91%   -2.89%     2.91%     2.91%  libdbus-1.so.3.8.11  [.] 0x000000000000cdc2
       2.86%   -2.85%     2.86%     2.86%  libxcb.so.1.1.0      [.] 0x000000000000c890
       2.44%   -2.39%     2.44%     2.44%  [kernel.vmlinux]     [k] perf_event_aux_ctx

After:

  # Baseline    Delta  Shared Object        Symbol
  # ........  .......  ...................  .......................
  #
      28.48%  -28.47%  [kernel.vmlinux]     [k] intel_idle
      11.51%  -11.47%  libxul.so            [.] 0x0000000001a360f7
       3.49%   -3.49%  [kernel.vmlinux]     [k] generic_exec_single
       2.91%   -2.89%  libdbus-1.so.3.8.11  [.] 0x000000000000cdc2
       2.86%   -2.85%  libxcb.so.1.1.0      [.] 0x000000000000c890
       2.44%   -2.39%  [kernel.vmlinux]     [k] perf_event_aux_ctx

Signed-off-by Namhyung Kim <[email protected]>

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

Acked-by Jiri Olsa <[email protected]>

Cc #@infradead.org

Cc [email protected]

Cc Linus Torvalds <[email protected]>

Cc Peter Zijlstra <[email protected]>

Cc Thomas Gleixner <[email protected]>

Cc [email protected] # 4.5+

Fixes b97511c5bc94 ("perf tools: Add overhead/overhead_children keys defaults via string")

Link http://lkml.kernel.org/r/[email protected] open here

Signed-off-by Ingo Molnar <[email protected]>

---
 tools/perf/util/sort.c | 3 +++
 1 file changed, 3 insertions(+)

tools/perf/util/sort.c +3 -0

index 47966a1..f5ba111 100644
@@ -2445,6 +2445,9 @@ static char *prefix_if_not_in(const char *pre, char *str)
 
 static char *setup_overhead(char *keys)
 {
+	if (sort__mode == SORT_MODE__DIFF)
+		return keys;
+
 	keys = prefix_if_not_in("overhead", keys);
 
 	if (symbol_conf.cumulate_callchain)

tip-bot for Namhyung Kim

merge bot

2016-05-11 15:01 UTC #3 lore raw

[tip:perf/core] perf diff: Fix duplicated output column

In reply to Arnaldo Carvalho de Melo

perf diff: Fix duplicated output column

Commit-ID:  e9d848cb65d5f6f7731d12bd1b6d994bfdbcc94f
Gitweb:     http://git.kernel.org/tip/e9d848cb65d5f6f7731d12bd1b6d994bfdbcc94f
Author:     Namhyung Kim <[email protected]>
AuthorDate: Tue, 10 May 2016 11:26:24 -0300
Committer:  Ingo Molnar <[email protected]>
CommitDate: Wed, 11 May 2016 16:55:32 +0200

perf diff: Fix duplicated output column

Before:

  # Baseline    Delta  Children  Overhead  Shared Object        Symbol
  # ........  .......  ........  ........  ...................  .......................
  #
      28.48%  -28.47%    28.48%    28.48%  [kernel.vmlinux ]    [k] intel_idle
      11.51%  -11.47%    11.51%    11.51%  libxul.so            [.] 0x0000000001a360f7
       3.49%   -3.49%     3.49%     3.49%  [kernel.vmlinux]     [k] generic_exec_single
       2.91%   -2.89%     2.91%     2.91%  libdbus-1.so.3.8.11  [.] 0x000000000000cdc2
       2.86%   -2.85%     2.86%     2.86%  libxcb.so.1.1.0      [.] 0x000000000000c890
       2.44%   -2.39%     2.44%     2.44%  [kernel.vmlinux]     [k] perf_event_aux_ctx

After:

  # Baseline    Delta  Shared Object        Symbol
  # ........  .......  ...................  .......................
  #
      28.48%  -28.47%  [kernel.vmlinux]     [k] intel_idle
      11.51%  -11.47%  libxul.so            [.] 0x0000000001a360f7
       3.49%   -3.49%  [kernel.vmlinux]     [k] generic_exec_single
       2.91%   -2.89%  libdbus-1.so.3.8.11  [.] 0x000000000000cdc2
       2.86%   -2.85%  libxcb.so.1.1.0      [.] 0x000000000000c890
       2.44%   -2.39%  [kernel.vmlinux]     [k] perf_event_aux_ctx

Signed-off-by Namhyung Kim <[email protected]>

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

Acked-by Jiri Olsa <[email protected]>

Cc <[email protected]> # 4.5+

Cc Linus Torvalds <[email protected]>

Cc Peter Zijlstra <[email protected]>

Cc Thomas Gleixner <[email protected]>

Fixes b97511c5bc94 ("perf tools: Add overhead/overhead_children keys defaults via string")

Link http://lkml.kernel.org/r/[email protected] open here

Signed-off-by Ingo Molnar <[email protected]>

---
 tools/perf/util/sort.c | 3 +++
 1 file changed, 3 insertions(+)

tools/perf/util/sort.c +3 -0

index 47966a1..f5ba111 100644
@@ -2445,6 +2445,9 @@ static char *prefix_if_not_in(const char *pre, char *str)
 
 static char *setup_overhead(char *keys)
 {
+	if (sort__mode == SORT_MODE__DIFF)
+		return keys;
+
 	keys = prefix_if_not_in("overhead", keys);
 
 	if (symbol_conf.cumulate_callchain)

Ingo Molnar

2016-05-10 20:23 UTC #4 lore raw

In reply to Arnaldo Carvalho de Melo

Quoted 25 lines · Arnaldo Carvalho de Melo

From: Arnaldo Carvalho de Melo <[email protected]>
Hi Ingo,
Please consider pulling,
- Arnaldo
The following changes since commit 93193230f7b8bd484d1749f4044d1214d521c804:
perf/core: Change the default paranoia level to 2 (2016-05-10 09:58:51 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git tags/perf-urgent-for-mingo-20160510
for you to fetch changes up to ba07ebe02077751db101ed202bb690f504248575:
perf diff: Fix duplicated output column (2016-05-10 10:37:05 -0300)
----------------------------------------------------------------
perf/urgent fix:
- Fix duplicated output column in 'perf diff' (Namhyung Kim)

Quoted 8 lines

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
----------------------------------------------------------------
Namhyung Kim (1):
perf diff: Fix duplicated output column
 tools/perf/util/sort.c | 3 +++
 1 file changed, 3 insertions(+)

Pulled, thanks a lot Arnaldo!

Ingo