Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1292282
| From | Namhyung Kim <namhyung@kernel.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 09/10] perf tools: Make 'trace' sort key default for tracepoint events |
| Date | 2015-12-15 16:40 +0100 |
| Message-ID | <qFZRN-64B-55@gated-at.bofh.it> (permalink) |
| References | <qFZRL-64B-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
When an evlist contains tracepoint events only, use 'trace' sort key as
default. This will make users more convenient to see trace result.
Suggested-by: Jiri Olsa <jolsa@redhat.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/util/sort.c | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index da65b07258bb..e661d3dd3ef3 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -2049,7 +2049,7 @@ static int sort_dimension__add(const char *tok,
return -ESRCH;
}
-static const char *get_default_sort_order(void)
+static const char *get_default_sort_order(struct perf_evlist *evlist)
{
const char *default_sort_orders[] = {
default_sort_order,
@@ -2058,13 +2058,25 @@ static const char *get_default_sort_order(void)
default_top_sort_order,
default_diff_sort_order,
};
+ bool use_trace = true;
+ struct perf_evsel *evsel;
BUG_ON(sort__mode >= ARRAY_SIZE(default_sort_orders));
+ evlist__for_each(evlist, evsel) {
+ if (evsel->attr.type != PERF_TYPE_TRACEPOINT) {
+ use_trace = false;
+ break;
+ }
+ }
+
+ if (use_trace)
+ return "trace";
+
return default_sort_orders[sort__mode];
}
-static int setup_sort_order(void)
+static int setup_sort_order(struct perf_evlist *evlist)
{
char *new_sort_order;
@@ -2085,7 +2097,7 @@ static int setup_sort_order(void)
* because it's checked over the rest of the code.
*/
if (asprintf(&new_sort_order, "%s,%s",
- get_default_sort_order(), sort_order + 1) < 0) {
+ get_default_sort_order(evlist), sort_order + 1) < 0) {
error("Not enough memory to set up --sort");
return -ENOMEM;
}
@@ -2100,7 +2112,7 @@ static int __setup_sorting(struct perf_evlist *evlist)
const char *sort_keys;
int ret = 0;
- ret = setup_sort_order();
+ ret = setup_sort_order(evlist);
if (ret)
return ret;
@@ -2114,7 +2126,7 @@ static int __setup_sorting(struct perf_evlist *evlist)
return 0;
}
- sort_keys = get_default_sort_order();
+ sort_keys = get_default_sort_order(evlist);
}
str = strdup(sort_keys);
--
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