From: "tip-bot2 for Ravi Bangoria" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>,
Ravi Bangoria <ravi.bangoria@linux.ibm.com>,
Jiri Olsa <jolsa@kernel.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Andi Kleen <ak@linux.intel.com>,
Jin Yao <yao.jin@linux.intel.com>,
Kan Liang <kan.liang@linux.intel.com>,
Mark Rutland <mark.rutland@arm.com>,
Namhyung Kim <namhyung@kernel.org>,
Arnaldo Carvalho de Melo <acme@redhat.com>, x86 <x86@kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [tip: perf/urgent] perf report: Make -F more strict like -s
Date: Fri, 06 Dec 2019 08:03:35 -0000 [thread overview]
Message-ID: <157561941516.21853.8956813920047526893.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20191114132213.5419-3-ravi.bangoria@linux.ibm.com>
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: aa6b3c99236b49a3e842d7272efa2529f15f7d8a
Gitweb: https://git.kernel.org/tip/aa6b3c99236b49a3e842d7272efa2529f15f7d8a
Author: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
AuthorDate: Thu, 14 Nov 2019 18:52:12 +05:30
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitterDate: Wed, 04 Dec 2019 12:32:40 -03:00
perf report: Make -F more strict like -s
Currently -F allows branch-mode / mem-mode fields with -F even
when perf report is not running in that mode. Don't allow that.
Suggested-by: Arnaldo Carvalho de Melo <acme@kernel.org>
Signed-off-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lore.kernel.org/lkml/20191114132213.5419-3-ravi.bangoria@linux.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/sort.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 106d795..9fcba28 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -2959,6 +2959,9 @@ int output_field_add(struct perf_hpp_list *list, char *tok)
if (strncasecmp(tok, sd->name, strlen(tok)))
continue;
+ if (sort__mode != SORT_MODE__MEMORY)
+ return -EINVAL;
+
return __sort_dimension__add_output(list, sd);
}
@@ -2968,6 +2971,9 @@ int output_field_add(struct perf_hpp_list *list, char *tok)
if (strncasecmp(tok, sd->name, strlen(tok)))
continue;
+ if (sort__mode != SORT_MODE__BRANCH)
+ return -EINVAL;
+
return __sort_dimension__add_output(list, sd);
}
next prev parent reply other threads:[~2019-12-06 8:03 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-14 13:22 [PATCH v2 0/3] perf report: Few fixes Ravi Bangoria
2019-11-14 13:22 ` [PATCH v2 1/3] perf hists: Replace pr_err with ui__error Ravi Bangoria
2019-12-04 15:26 ` Arnaldo Carvalho de Melo
2019-12-06 8:03 ` [tip: perf/urgent] perf report/top TUI: Replace pr_err() with ui__error() tip-bot2 for Ravi Bangoria
2019-11-14 13:22 ` [PATCH v2 2/3] perf report: Make -F more strict like -s Ravi Bangoria
2019-12-06 8:03 ` tip-bot2 for Ravi Bangoria [this message]
2019-11-14 13:22 ` [PATCH v2 3/3] perf report: Bail out --mem-mode if mem info is not available Ravi Bangoria
2019-12-06 8:03 ` [tip: perf/urgent] " tip-bot2 for Ravi Bangoria
2019-12-04 10:36 ` [PATCH v2 0/3] perf report: Few fixes Ravi Bangoria
2019-12-04 12:07 ` Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=157561941516.21853.8956813920047526893.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=acme@kernel.org \
--cc=acme@redhat.com \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=jolsa@kernel.org \
--cc=kan.liang@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=namhyung@kernel.org \
--cc=ravi.bangoria@linux.ibm.com \
--cc=x86@kernel.org \
--cc=yao.jin@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).