Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9ea55d0 authored by Andi Kleen's avatar Andi Kleen Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Move weight back to common sort keys 



This is a partial revert of Namhyung's patch

 afab87b9
 perf sort: Separate out memory-specific sort keys

He wrote

 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.

Well TSX is another (in fact the original) user of the flags, and it
needs them to be common. So move local/global weight back to the common
sort keys.

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Link: http://lkml.kernel.org/r/1374188333-17899-1-git-send-email-andi@firstfloor.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent dbad4189

tools/perf/util/sort.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -874,6 +874,8 @@ 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),

};

};





#undef DIM

#undef DIM
@@ -893,8 +895,6 @@ static struct sort_dimension bstack_sort_dimensions[] = { 
#define DIM(d, n, func) [d - __SORT_MEMORY_MODE] = { .name = n, .entry = &(func) }

#define DIM(d, n, func) [d - __SORT_MEMORY_MODE] = { .name = n, .entry = &(func) }





static struct sort_dimension memory_sort_dimensions[] = {

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_SYMBOL, "symbol_daddr", sort_mem_daddr_sym),

	DIM(SORT_MEM_DADDR_DSO, "dso_daddr", sort_mem_daddr_dso),

	DIM(SORT_MEM_DADDR_DSO, "dso_daddr", sort_mem_daddr_dso),

	DIM(SORT_MEM_LOCKED, "locked", sort_mem_locked),

	DIM(SORT_MEM_LOCKED, "locked", sort_mem_locked),

tools/perf/util/sort.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -143,6 +143,8 @@ enum sort_type { 
	SORT_PARENT,

	SORT_PARENT,

	SORT_CPU,

	SORT_CPU,

	SORT_SRCLINE,

	SORT_SRCLINE,

	SORT_LOCAL_WEIGHT,

	SORT_GLOBAL_WEIGHT,





	/* branch stack specific sort keys */

	/* branch stack specific sort keys */

	__SORT_BRANCH_STACK,

	__SORT_BRANCH_STACK,
@@ -154,9 +156,7 @@ enum sort_type { 




	/* memory mode specific sort keys */

	/* memory mode specific sort keys */

	__SORT_MEMORY_MODE,

	__SORT_MEMORY_MODE,

	SORT_LOCAL_WEIGHT = __SORT_MEMORY_MODE,

	SORT_MEM_DADDR_SYMBOL = __SORT_MEMORY_MODE,

	SORT_GLOBAL_WEIGHT,

	SORT_MEM_DADDR_SYMBOL,

	SORT_MEM_DADDR_DSO,

	SORT_MEM_DADDR_DSO,

	SORT_MEM_LOCKED,

	SORT_MEM_LOCKED,

	SORT_MEM_TLB,

	SORT_MEM_TLB,