Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1398147 > unrolled thread

[GIT PULL 0/1] perf/urgent fix

Started byArnaldo Carvalho de Melo <acme@kernel.org>
First post2016-05-10 16:30 +0200
Last post2016-05-10 22:30 +0200
Articles 5 — 3 participants

Back to article view | Back to linux.kernel

Contents

  [GIT PULL 0/1] perf/urgent fix Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 16:30 +0200
    [PATCH 1/1] perf diff: Fix duplicated output column Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 16:30 +0200
      [tip:perf/core] perf diff: Fix duplicated output column tip-bot for Namhyung Kim <tipbot@zytor.com> - 2016-05-11 14:30 +0200
      [tip:perf/core] perf diff: Fix duplicated output column tip-bot for Namhyung Kim <tipbot@zytor.com> - 2016-05-11 17:10 +0200
    Re: [GIT PULL 0/1] perf/urgent fix Ingo Molnar <mingo@kernel.org> - 2016-05-10 22:30 +0200

#1398147 — [GIT PULL 0/1] perf/urgent fix

FromArnaldo Carvalho de Melo <acme@kernel.org>
Date2016-05-10 16:30 +0200
Subject[GIT PULL 0/1] perf/urgent fix
Message-ID<rxgPD-3Xe-1@gated-at.bofh.it>
From: Arnaldo Carvalho de Melo <acme@redhat.com>

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 <acme@redhat.com>

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

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

[toc] | [next] | [standalone]

#1398148 — [PATCH 1/1] perf diff: Fix duplicated output column

FromArnaldo Carvalho de Melo <acme@kernel.org>
Date2016-05-10 16:30 +0200
Subject[PATCH 1/1] perf diff: Fix duplicated output column
Message-ID<rxgPD-3Xe-3@gated-at.bofh.it>
In reply to#1398147
From: Namhyung Kim <namhyung@kernel.org>

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 <namhyung@kernel.org>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: stable@vger.kernel.org  # 4.5+
Fixes: b97511c5bc94 ("perf tools: Add overhead/overhead_children keys defaults via string")
Link: http://lkml.kernel.org/r/1462884499-6612-1-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/sort.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 47966a1618c7..f5ba111cd9fb 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -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)
-- 
2.5.5

[toc] | [prev] | [next] | [standalone]

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

Fromtip-bot for Namhyung Kim <tipbot@zytor.com>
Date2016-05-11 14:30 +0200
Subject[tip:perf/core] perf diff: Fix duplicated output column
Message-ID<rxBr5-8cB-13@gated-at.bofh.it>
In reply to#1398148
Commit-ID:  4cdcac59960c5800cef91f904c9701bed03dc4dd
Gitweb:     http://git.kernel.org/tip/4cdcac59960c5800cef91f904c9701bed03dc4dd
Author:     Namhyung Kim <namhyung@kernel.org>
AuthorDate: Tue, 10 May 2016 11:26:24 -0300
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 11 May 2016 14:15:31 +0200

perf diff: Fix duplicated output column

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 <namhyung@kernel.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: #@infradead.org
Cc: 4.5+@infradead.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: stable@vger.kernel.org # 4.5+
Fixes: b97511c5bc94 ("perf tools: Add overhead/overhead_children keys defaults via string")
Link: http://lkml.kernel.org/r/1462890384-12486-2-git-send-email-acme@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 tools/perf/util/sort.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 47966a1..f5ba111 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -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)

[toc] | [prev] | [next] | [standalone]

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

Fromtip-bot for Namhyung Kim <tipbot@zytor.com>
Date2016-05-11 17:10 +0200
Subject[tip:perf/core] perf diff: Fix duplicated output column
Message-ID<rxDVU-2hX-33@gated-at.bofh.it>
In reply to#1398148
Commit-ID:  e9d848cb65d5f6f7731d12bd1b6d994bfdbcc94f
Gitweb:     http://git.kernel.org/tip/e9d848cb65d5f6f7731d12bd1b6d994bfdbcc94f
Author:     Namhyung Kim <namhyung@kernel.org>
AuthorDate: Tue, 10 May 2016 11:26:24 -0300
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 11 May 2016 16:55:32 +0200

perf diff: Fix duplicated output column

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 <namhyung@kernel.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: <stable@vger.kernel.org> # 4.5+
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Fixes: b97511c5bc94 ("perf tools: Add overhead/overhead_children keys defaults via string")
Link: http://lkml.kernel.org/r/1462890384-12486-2-git-send-email-acme@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 tools/perf/util/sort.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 47966a1..f5ba111 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -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)

[toc] | [prev] | [next] | [standalone]

#1398494

FromIngo Molnar <mingo@kernel.org>
Date2016-05-10 22:30 +0200
Message-ID<rxms2-1tG-21@gated-at.bofh.it>
In reply to#1398147
* Arnaldo Carvalho de Melo <acme@kernel.org> wrote:

> From: Arnaldo Carvalho de Melo <acme@redhat.com>
> 
> 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 <acme@redhat.com>
> 
> ----------------------------------------------------------------
> 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

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web