perf sort: Separate out memory-specific sort keys

[deliverable/linux.git] / tools / perf / util / sort.c

diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index a997955085eb813d933490b390722804d58e0b61..1dbf169492506be32ac4175c414d25891b90a0c1 100644 (file)
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -871,14 +871,6 @@ static struct sort_dimension common_sort_dimensions[] = {
        DIM(SORT_PARENT, "parent", sort_parent),
        DIM(SORT_CPU, "cpu", sort_cpu),
        DIM(SORT_SRCLINE, "srcline", sort_srcline),
-       DIM(SORT_LOCAL_WEIGHT, "local_weight", sort_local_weight),
-       DIM(SORT_GLOBAL_WEIGHT, "weight", sort_global_weight),
-       DIM(SORT_MEM_DADDR_SYMBOL, "symbol_daddr", sort_mem_daddr_sym),
-       DIM(SORT_MEM_DADDR_DSO, "dso_daddr", sort_mem_daddr_dso),
-       DIM(SORT_MEM_LOCKED, "locked", sort_mem_locked),
-       DIM(SORT_MEM_TLB, "tlb", sort_mem_tlb),
-       DIM(SORT_MEM_LVL, "mem", sort_mem_lvl),
-       DIM(SORT_MEM_SNOOP, "snoop", sort_mem_snoop),
 };
 
 #undef DIM
@@ -895,6 +887,21 @@ static struct sort_dimension bstack_sort_dimensions[] = {
 
 #undef DIM
 
+#define DIM(d, n, func) [d - __SORT_MEMORY_MODE] = { .name = n, .entry = &(func) }
+
+static struct sort_dimension memory_sort_dimensions[] = {
+       DIM(SORT_LOCAL_WEIGHT, "local_weight", sort_local_weight),
+       DIM(SORT_GLOBAL_WEIGHT, "weight", sort_global_weight),
+       DIM(SORT_MEM_DADDR_SYMBOL, "symbol_daddr", sort_mem_daddr_sym),
+       DIM(SORT_MEM_DADDR_DSO, "dso_daddr", sort_mem_daddr_dso),
+       DIM(SORT_MEM_LOCKED, "locked", sort_mem_locked),
+       DIM(SORT_MEM_TLB, "tlb", sort_mem_tlb),
+       DIM(SORT_MEM_LVL, "mem", sort_mem_lvl),
+       DIM(SORT_MEM_SNOOP, "snoop", sort_mem_snoop),
+};
+
+#undef DIM
+
 static void __sort_dimension__add(struct sort_dimension *sd, enum sort_type idx)
 {
        if (sd->taken)
@@ -957,6 +964,22 @@ int sort_dimension__add(const char *tok)
                return 0;
        }
 
+       for (i = 0; i < ARRAY_SIZE(memory_sort_dimensions); i++) {
+               struct sort_dimension *sd = &memory_sort_dimensions[i];
+
+               if (strncasecmp(tok, sd->name, strlen(tok)))
+                       continue;
+
+               if (sort__mode != SORT_MODE__MEMORY)
+                       return -EINVAL;
+
+               if (sd->entry == &sort_mem_daddr_sym)
+                       sort__has_sym = 1;
+
+               __sort_dimension__add(sd, i + __SORT_MEMORY_MODE);
+               return 0;
+       }
+
        return -ESRCH;
 }