[PATCH 09/10] perf tools: Make 'trace' sort key default for tracepoint events

[Namhyung Kim]

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 <jo...@redhat.com>
Cc: Steven Rostedt <rost...@goodmis.org>
Signed-off-by: Namhyung Kim <namhy...@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 f38a0577967a..43cb9b638718 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -2067,7 +2067,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,
@@ -2076,13 +2076,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;
 
@@ -2103,7 +2115,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;
        }
@@ -2118,7 +2130,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;
 
@@ -2132,7 +2144,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 majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/