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

Commit 85df621b authored by Namhyung Kim's avatar Namhyung Kim Committed by Greg Kroah-Hartman
Browse files

perf diff: Fix -o/--order option behavior (again) 



commit a1c9f97f0b64e6337d9cfcc08c134450934fdd90 upstream.

Commit 21e6d842 ("perf diff: Use perf_hpp__register_sort_field
interface") changed list_add() to perf_hpp__register_sort_field().

This resulted in a behavior change since the field was added to the tail
instead of the head.  So the -o option is mostly ignored due to its
order in the list.

This patch fixes it by adding perf_hpp__prepend_sort_field().

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Fixes: 21e6d842 ("perf diff: Use perf_hpp__register_sort_field interface")
Link: http://lkml.kernel.org/r/20170118051457.30946-2-namhyung@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6b4af0da

tools/perf/builtin-diff.c

+1 −1
Original line number Diff line number Diff line
@@ -1199,7 +1199,7 @@ static int ui_init(void) 
		BUG_ON(1);

	}



	perf_hpp__register_sort_field(fmt);

	perf_hpp__prepend_sort_field(fmt);

	return 0;

}

tools/perf/ui/hist.c

+6 −0
Original line number Diff line number Diff line
@@ -521,6 +521,12 @@ void perf_hpp_list__register_sort_field(struct perf_hpp_list *list, 
	list_add_tail(&format->sort_list, &list->sorts);

}



void perf_hpp_list__prepend_sort_field(struct perf_hpp_list *list,

				       struct perf_hpp_fmt *format)

{

	list_add(&format->sort_list, &list->sorts);

}



void perf_hpp__column_unregister(struct perf_hpp_fmt *format)

{

	list_del(&format->list);

tools/perf/util/hist.h

+7 −0
Original line number Diff line number Diff line
@@ -282,6 +282,8 @@ void perf_hpp_list__column_register(struct perf_hpp_list *list, 
				    struct perf_hpp_fmt *format);

void perf_hpp_list__register_sort_field(struct perf_hpp_list *list,

					struct perf_hpp_fmt *format);

void perf_hpp_list__prepend_sort_field(struct perf_hpp_list *list,

				       struct perf_hpp_fmt *format);



static inline void perf_hpp__column_register(struct perf_hpp_fmt *format)

{
@@ -293,6 +295,11 @@ static inline void perf_hpp__register_sort_field(struct perf_hpp_fmt *format) 
	perf_hpp_list__register_sort_field(&perf_hpp_list, format);

}



static inline void perf_hpp__prepend_sort_field(struct perf_hpp_fmt *format)

{

	perf_hpp_list__prepend_sort_field(&perf_hpp_list, format);

}



#define perf_hpp_list__for_each_format(_list, format) \

	list_for_each_entry(format, &(_list)->fields, list)