linux-kernel - [tip:perf/core] perf tools: Do not auto-remove Children column if --fields given

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <tip-2bf1a12340bda1bf621f27b9892094a51b1297fd@git.kernel.org>
Date:	Tue, 3 Jun 2014 11:34:42 -0700
From:	tip-bot for Namhyung Kim <tipbot@...or.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
	jolsa@...nel.org, rodrigo@...g.com.ar, namhyung@...nel.org,
	fweisbec@...il.com, tglx@...utronix.de, asharma@...com
Subject: [tip:perf/core] perf tools:
  Do not auto-remove Children column if --fields given

Commit-ID:  2bf1a12340bda1bf621f27b9892094a51b1297fd
Gitweb:     http://git.kernel.org/tip/2bf1a12340bda1bf621f27b9892094a51b1297fd
Author:     Namhyung Kim <namhyung@...nel.org>
AuthorDate: Thu, 20 Mar 2014 09:10:29 +0900
Committer:  Jiri Olsa <jolsa@...nel.org>
CommitDate: Sun, 1 Jun 2014 14:35:05 +0200

perf tools: Do not auto-remove Children column if --fields given

Depending on the configuration perf inserts/removes the Children
column in the output automatically.  But it might not be what user
wants if [s]he give --fields option explicitly.

Signed-off-by: Namhyung Kim <namhyung@...nel.org>
Tested-by: Rodrigo Campos <rodrigo@...g.com.ar>
Cc: Arun Sharma <asharma@...com>
Cc: Frederic Weisbecker <fweisbec@...il.com>
Link: http://lkml.kernel.org/r/1401335910-16832-18-git-send-email-namhyung@kernel.org
Signed-off-by: Jiri Olsa <jolsa@...nel.org>
---
 tools/perf/ui/hist.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
index 8ca6387..498adb2 100644
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -513,6 +513,9 @@ void perf_hpp__column_disable(unsigned col)
 
 void perf_hpp__cancel_cumulate(void)
 {
+	if (field_order)
+		return;
+
 	perf_hpp__column_disable(PERF_HPP__OVERHEAD_ACC);
 	perf_hpp__format[PERF_HPP__OVERHEAD].header = hpp__header_overhead;
 }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/