* [GIT PULL 0/1] perf/urgent fix
@ 2016-05-10 14:26 Arnaldo Carvalho de Melo
2016-05-10 14:26 ` [PATCH 1/1] perf diff: Fix duplicated output column Arnaldo Carvalho de Melo
2016-05-10 20:23 ` [GIT PULL 0/1] perf/urgent fix Ingo Molnar
0 siblings, 2 replies; 5+ messages in thread
From: Arnaldo Carvalho de Melo @ 2016-05-10 14:26 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Arnaldo Carvalho de Melo, Jiri Olsa, Namhyung Kim,
Peter Zijlstra
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(+)
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 1/1] perf diff: Fix duplicated output column
2016-05-10 14:26 [GIT PULL 0/1] perf/urgent fix Arnaldo Carvalho de Melo
@ 2016-05-10 14:26 ` Arnaldo Carvalho de Melo
2016-05-11 12:21 ` [tip:perf/core] " tip-bot for Namhyung Kim
2016-05-11 15:00 ` tip-bot for Namhyung Kim
2016-05-10 20:23 ` [GIT PULL 0/1] perf/urgent fix Ingo Molnar
1 sibling, 2 replies; 5+ messages in thread
From: Arnaldo Carvalho de Melo @ 2016-05-10 14:26 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Namhyung Kim, Peter Zijlstra, stable, #, 4.5+,
Arnaldo Carvalho de Melo
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
^ permalink raw reply related [flat|nested] 5+ messages in thread* [tip:perf/core] perf diff: Fix duplicated output column
2016-05-10 14:26 ` [PATCH 1/1] perf diff: Fix duplicated output column Arnaldo Carvalho de Melo
@ 2016-05-11 12:21 ` tip-bot for Namhyung Kim
2016-05-11 15:00 ` tip-bot for Namhyung Kim
1 sibling, 0 replies; 5+ messages in thread
From: tip-bot for Namhyung Kim @ 2016-05-11 12:21 UTC (permalink / raw)
To: linux-tip-commits
Cc: acme, namhyung, tglx, linux-kernel, mingo, torvalds, peterz,
jolsa, hpa
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)
^ permalink raw reply related [flat|nested] 5+ messages in thread* [tip:perf/core] perf diff: Fix duplicated output column
2016-05-10 14:26 ` [PATCH 1/1] perf diff: Fix duplicated output column Arnaldo Carvalho de Melo
2016-05-11 12:21 ` [tip:perf/core] " tip-bot for Namhyung Kim
@ 2016-05-11 15:00 ` tip-bot for Namhyung Kim
1 sibling, 0 replies; 5+ messages in thread
From: tip-bot for Namhyung Kim @ 2016-05-11 15:00 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, hpa, mingo, namhyung, peterz, jolsa, tglx, acme,
torvalds
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)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [GIT PULL 0/1] perf/urgent fix
2016-05-10 14:26 [GIT PULL 0/1] perf/urgent fix Arnaldo Carvalho de Melo
2016-05-10 14:26 ` [PATCH 1/1] perf diff: Fix duplicated output column Arnaldo Carvalho de Melo
@ 2016-05-10 20:23 ` Ingo Molnar
1 sibling, 0 replies; 5+ messages in thread
From: Ingo Molnar @ 2016-05-10 20:23 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: linux-kernel, Arnaldo Carvalho de Melo, Jiri Olsa, Namhyung Kim,
Peter Zijlstra
* 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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-05-11 15:01 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-10 14:26 [GIT PULL 0/1] perf/urgent fix Arnaldo Carvalho de Melo
2016-05-10 14:26 ` [PATCH 1/1] perf diff: Fix duplicated output column Arnaldo Carvalho de Melo
2016-05-11 12:21 ` [tip:perf/core] " tip-bot for Namhyung Kim
2016-05-11 15:00 ` tip-bot for Namhyung Kim
2016-05-10 20:23 ` [GIT PULL 0/1] perf/urgent fix Ingo Molnar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox