perf sort: Separate out memory-specific sort keys
Since they're used only for perf mem, separate out them to a different dimension so that normal user cannot access them by any chance. For global/local weights, I'm not entirely sure to place them into the memory dimension. But it's the only user at this time. Signed-off-by: Namhyung Kim <namhyung@kernel.org> Cc: Andi Kleen <andi@firstfloor.org> Cc: David Ahern <dsahern@gmail.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/r/1364991979-3008-3-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
2f532d09fa
commit
afab87b91f
|
@ -871,6 +871,8 @@ repeat:
|
||||||
fprintf(stderr, "branch and mem mode incompatible\n");
|
fprintf(stderr, "branch and mem mode incompatible\n");
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
sort__mode = SORT_MODE__MEMORY;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* if no sort_order is provided, then specify
|
* if no sort_order is provided, then specify
|
||||||
* branch-mode specific order
|
* branch-mode specific order
|
||||||
|
|
|
@ -871,14 +871,6 @@ static struct sort_dimension common_sort_dimensions[] = {
|
||||||
DIM(SORT_PARENT, "parent", sort_parent),
|
DIM(SORT_PARENT, "parent", sort_parent),
|
||||||
DIM(SORT_CPU, "cpu", sort_cpu),
|
DIM(SORT_CPU, "cpu", sort_cpu),
|
||||||
DIM(SORT_SRCLINE, "srcline", sort_srcline),
|
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
|
#undef DIM
|
||||||
|
@ -895,6 +887,21 @@ static struct sort_dimension bstack_sort_dimensions[] = {
|
||||||
|
|
||||||
#undef DIM
|
#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)
|
static void __sort_dimension__add(struct sort_dimension *sd, enum sort_type idx)
|
||||||
{
|
{
|
||||||
if (sd->taken)
|
if (sd->taken)
|
||||||
|
@ -957,6 +964,22 @@ int sort_dimension__add(const char *tok)
|
||||||
return 0;
|
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;
|
return -ESRCH;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -138,14 +138,6 @@ enum sort_type {
|
||||||
SORT_PARENT,
|
SORT_PARENT,
|
||||||
SORT_CPU,
|
SORT_CPU,
|
||||||
SORT_SRCLINE,
|
SORT_SRCLINE,
|
||||||
SORT_LOCAL_WEIGHT,
|
|
||||||
SORT_GLOBAL_WEIGHT,
|
|
||||||
SORT_MEM_DADDR_SYMBOL,
|
|
||||||
SORT_MEM_DADDR_DSO,
|
|
||||||
SORT_MEM_LOCKED,
|
|
||||||
SORT_MEM_TLB,
|
|
||||||
SORT_MEM_LVL,
|
|
||||||
SORT_MEM_SNOOP,
|
|
||||||
|
|
||||||
/* branch stack specific sort keys */
|
/* branch stack specific sort keys */
|
||||||
__SORT_BRANCH_STACK,
|
__SORT_BRANCH_STACK,
|
||||||
|
@ -154,6 +146,17 @@ enum sort_type {
|
||||||
SORT_SYM_FROM,
|
SORT_SYM_FROM,
|
||||||
SORT_SYM_TO,
|
SORT_SYM_TO,
|
||||||
SORT_MISPREDICT,
|
SORT_MISPREDICT,
|
||||||
|
|
||||||
|
/* memory mode specific sort keys */
|
||||||
|
__SORT_MEMORY_MODE,
|
||||||
|
SORT_LOCAL_WEIGHT = __SORT_MEMORY_MODE,
|
||||||
|
SORT_GLOBAL_WEIGHT,
|
||||||
|
SORT_MEM_DADDR_SYMBOL,
|
||||||
|
SORT_MEM_DADDR_DSO,
|
||||||
|
SORT_MEM_LOCKED,
|
||||||
|
SORT_MEM_TLB,
|
||||||
|
SORT_MEM_LVL,
|
||||||
|
SORT_MEM_SNOOP,
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in a new issue