From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>, Thomas Gleixner <tglx@linutronix.de>
Cc: Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
Clark Williams <williams@redhat.com>,
linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
Ravi Bangoria <ravi.bangoria@linux.ibm.com>,
Arnaldo Carvalho de Melo <acme@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>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 2/6] perf report: Make -F more strict like -s
Date: Thu, 5 Dec 2019 16:32:20 -0300 [thread overview]
Message-ID: <20191205193224.24629-3-acme@kernel.org> (raw)
In-Reply-To: <20191205193224.24629-1-acme@kernel.org>
From: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
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 106d795574ba..9fcba2872130 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);
}
--
2.21.0
next prev parent reply other threads:[~2019-12-05 19:32 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-05 19:32 [GIT PULL 0/6] perf/urgent fixes Arnaldo Carvalho de Melo
2019-12-05 19:32 ` [PATCH 1/6] perf report/top TUI: Replace pr_err() with ui__error() Arnaldo Carvalho de Melo
2019-12-05 19:32 ` Arnaldo Carvalho de Melo [this message]
2019-12-05 19:32 ` [PATCH 3/6] perf report: Bail out --mem-mode if mem info is not available Arnaldo Carvalho de Melo
2019-12-05 19:32 ` [PATCH 4/6] perf inject: Fix processing of ID index for injected instruction tracing Arnaldo Carvalho de Melo
2019-12-05 19:32 ` [PATCH 5/6] tools headers UAPI: Sync drm/i915_drm.h with the kernel sources Arnaldo Carvalho de Melo
2019-12-05 19:32 ` [PATCH 6/6] tools headers UAPI: Update tools's copy of drm.h headers Arnaldo Carvalho de Melo
2019-12-06 7:57 ` [GIT PULL 0/6] perf/urgent fixes Ingo Molnar
2019-12-06 14:24 ` Arnaldo Carvalho de Melo
2019-12-06 14:25 ` Jiri Olsa
2019-12-06 14:43 ` Arnaldo Carvalho de Melo
2019-12-06 15:04 ` Jiri Olsa
2019-12-06 15:35 ` Arnaldo Carvalho de Melo
2020-01-12 19:22 ` [PATCH] perf tools: Use %define api.pure full instead of %pure-parser Jiri Olsa
2020-01-20 8:27 ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2020-01-13 8:28 ` [GIT PULL 0/6] perf/urgent fixes Ravi Bangoria
2020-01-13 9:25 ` Jiri Olsa
2020-01-13 9:44 ` Ravi Bangoria
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=20191205193224.24629-3-acme@kernel.org \
--to=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-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=ravi.bangoria@linux.ibm.com \
--cc=tglx@linutronix.de \
--cc=williams@redhat.com \
--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).