Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1292272
| From | Namhyung Kim <namhyung@kernel.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 10/10] perf tools: Support shortcuts for events in dynamic sort keys |
| Date | 2015-12-15 16:40 +0100 |
| Message-ID | <qFZRM-64B-29@gated-at.bofh.it> (permalink) |
| References | <qFZRL-64B-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
The dynamic sort key requires event name but specifying full event name
is rather inconvenient. This patch adds more ways to identify the event
in a more compact way.
1. If session has just one event, event name can be omitted.
2. Events can be accessed by index preceded by a percent sign.
3. A part of the name can be used, if it's not ambiguous. The partial
name should not contain ':' in it.
4. Full system + event name is still used, it should contain ':'.
So in the below example all does same thing:
$ perf record -e sched:sched_switch -a sleep 1
$ perf report -s next_pid,next_comm
$ perf report -s %1.next_pid,%1.next_comm
$ perf report -s switch.next_pid,switch.next_comm
$ perf report -s sched:sched_switch.next_pid,sched:sched_switch_.next_comm
Cc: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/util/sort.c | 107 ++++++++++++++++++++++++++++++++++++++++---------
1 file changed, 87 insertions(+), 20 deletions(-)
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index e661d3dd3ef3..0725bf0eb3b6 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -1819,10 +1819,90 @@ __alloc_dynamic_entry(struct perf_evsel *evsel, struct format_field *field)
return hde;
}
+static int parse_field_name(char *str, char **event, char **field, char **opt)
+{
+ char *event_name, *field_name, *opt_name;
+
+ event_name = str;
+ field_name = strchr(str, '.');
+
+ if (field_name) {
+ *field_name++ = '\0';
+ } else {
+ event_name = NULL;
+ field_name = str;
+ }
+
+ opt_name = strchr(field_name, '/');
+ if (opt_name)
+ *opt_name++ = '\0';
+
+ *event = event_name;
+ *field = field_name;
+ *opt = opt_name;
+
+ return 0;
+}
+
+/* find match evsel using a given event name. The event name can be:
+ * 1. NULL - only valid for single event session
+ * 2. '%' + event index (e.g. '%1' for first event)
+ * 3. full event name (e.g. sched:sched_switch)
+ * 4. partial event name (should not contain ':')
+ */
+static struct perf_evsel *find_evsel(struct perf_evlist *evlist, char *event_name)
+{
+ struct perf_evsel *evsel = NULL;
+ struct perf_evsel *pos;
+ bool full_name;
+
+ /* case 1 */
+ if (event_name == NULL) {
+ if (evlist->nr_entries != 1) {
+ pr_debug("event name should be given\n");
+ return NULL;
+ }
+
+ return perf_evlist__first(evlist);
+ }
+
+ /* case 2 */
+ if (event_name[0] == '%') {
+ int nr = strtol(event_name+1, NULL, 0);
+
+ if (nr > evlist->nr_entries)
+ return NULL;
+
+ evsel = perf_evlist__first(evlist);
+ while (--nr > 0)
+ evsel = perf_evsel__next(evsel);
+
+ return evsel;
+ }
+
+ full_name = !!strchr(event_name, ':');
+ evlist__for_each(evlist, pos) {
+ /* case 3 */
+ if (full_name && !strcmp(pos->name, event_name))
+ return pos;
+ /* case 4 */
+ if (!full_name && strstr(pos->name, event_name)) {
+ if (evsel) {
+ pr_debug("'%s' event is ambiguous: it can be %s or %s\n",
+ event_name, evsel->name, pos->name);
+ return NULL;
+ }
+ evsel = pos;
+ }
+ }
+
+ return evsel;
+}
+
static int add_dynamic_entry(struct perf_evlist *evlist, const char *tok)
{
- char *str, *event_name, *field_name, *raw_opt;
- struct perf_evsel *evsel, *pos;
+ char *str, *event_name, *field_name, *opt_name;
+ struct perf_evsel *evsel;
struct event_format *format;
struct format_field *field;
struct hpp_dynamic_entry *hde;
@@ -1836,34 +1916,21 @@ static int add_dynamic_entry(struct perf_evlist *evlist, const char *tok)
if (str == NULL)
return -ENOMEM;
- event_name = str;
- field_name = strchr(str, '.');
- if (field_name == NULL) {
+ if (parse_field_name(str, &event_name, &field_name, &opt_name) < 0) {
ret = -EINVAL;
goto out;
}
- *field_name++ = '\0';
- raw_opt = strchr(field_name, '/');
- if (raw_opt) {
- *raw_opt++ = '\0';
-
- if (strcmp(raw_opt, "raw")) {
- pr_err("Unsupported field option %s\n", raw_opt);
+ if (opt_name) {
+ if (strcmp(opt_name, "raw")) {
+ pr_debug("unsupported field option %s\n", opt_name);
ret = -EINVAL;
goto out;
}
raw_trace = true;
}
- evsel = NULL;
- evlist__for_each(evlist, pos) {
- if (!strcmp(pos->name, event_name)) {
- evsel = pos;
- break;
- }
- }
-
+ evsel = find_evsel(evlist, event_name);
if (evsel == NULL) {
pr_debug("Cannot find event: %s\n", event_name);
ret = -ENOENT;
--
2.6.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCHSET 00/10] perf tools: Support dynamic sort keys for tracepoints (v2) Namhyung Kim <namhyung@kernel.org> - 2015-12-15 16:40 +0100
[PATCH 02/10] perf hist: Save raw_data/size for tracepoint events Namhyung Kim <namhyung@kernel.org> - 2015-12-15 16:40 +0100
[PATCH v2.1] perf hist: Save raw_data/size for tracepoint events Namhyung Kim <namhyung@kernel.org> - 2015-12-17 09:20 +0100
Re: [PATCH v2.1] perf hist: Save raw_data/size for tracepoint events Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-12-17 13:30 +0100
[PATCH 01/10] perf hist: Pass struct sample to __hists__add_entry() Namhyung Kim <namhyung@kernel.org> - 2015-12-15 16:40 +0100
[PATCH 03/10] tools lib traceevent: Factor out and export print_event_field[s] Namhyung Kim <namhyung@kernel.org> - 2015-12-15 16:40 +0100
[PATCH 06/10] perf tools: Try to show pretty printed output for dynamic sort keys Namhyung Kim <namhyung@kernel.org> - 2015-12-15 16:40 +0100
Re: [PATCH 06/10] perf tools: Try to show pretty printed output for dynamic sort keys Jiri Olsa <jolsa@redhat.com> - 2015-12-20 15:20 +0100
Re: [PATCH 06/10] perf tools: Try to show pretty printed output for dynamic sort keys Namhyung Kim <namhyung@kernel.org> - 2015-12-21 09:40 +0100
[PATCH 10/10] perf tools: Support shortcuts for events in dynamic sort keys Namhyung Kim <namhyung@kernel.org> - 2015-12-15 16:40 +0100
[PATCH 07/10] perf tools: Add 'trace' sort key Namhyung Kim <namhyung@kernel.org> - 2015-12-15 16:40 +0100
[PATCH 08/10] perf tools: Add --raw-trace option Namhyung Kim <namhyung@kernel.org> - 2015-12-15 16:40 +0100
Re: [PATCH 08/10] perf tools: Add --raw-trace option Jiri Olsa <jolsa@redhat.com> - 2015-12-20 16:00 +0100
Re: [PATCH 08/10] perf tools: Add --raw-trace option Namhyung Kim <namhyung@kernel.org> - 2015-12-21 09:50 +0100
Re: [PATCH 08/10] perf tools: Add --raw-trace option Jiri Olsa <jolsa@redhat.com> - 2015-12-22 08:00 +0100
Re: [PATCH 08/10] perf tools: Add --raw-trace option Namhyung Kim <namhyung@kernel.org> - 2015-12-22 17:30 +0100
[PATCH 04/10] perf tools: Pass evlist to setup_sorting() Namhyung Kim <namhyung@kernel.org> - 2015-12-15 16:40 +0100
[PATCH 05/10] perf tools: Add dynamic sort key for tracepoint events Namhyung Kim <namhyung@kernel.org> - 2015-12-15 16:40 +0100
Re: [PATCH 05/10] perf tools: Add dynamic sort key for tracepoint events Jiri Olsa <jolsa@redhat.com> - 2015-12-20 15:00 +0100
Re: [PATCH 05/10] perf tools: Add dynamic sort key for tracepoint events Namhyung Kim <namhyung@kernel.org> - 2015-12-20 15:10 +0100
[PATCH 09/10] perf tools: Make 'trace' sort key default for tracepoint events Namhyung Kim <namhyung@kernel.org> - 2015-12-15 16:40 +0100
Re: [PATCHSET 00/10] perf tools: Support dynamic sort keys for tracepoints (v2) Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-12-17 01:20 +0100
Re: [PATCHSET 00/10] perf tools: Support dynamic sort keys for tracepoints (v2) Namhyung Kim <namhyung@kernel.org> - 2015-12-17 09:00 +0100
Re: [PATCHSET 00/10] perf tools: Support dynamic sort keys for tracepoints (v2) Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-12-17 13:30 +0100
csiph-web