Skip to content

Commit 85df621

Browse files
namhyunggregkh
authored andcommitted
perf diff: Fix -o/--order option behavior (again)
commit a1c9f97 upstream. Commit 21e6d84 ("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: Namhyung Kim <namhyung@kernel.org> Acked-by: Jiri Olsa <jolsa@kernel.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Fixes: 21e6d84 ("perf diff: Use perf_hpp__register_sort_field interface") Link: http://lkml.kernel.org/r/20170118051457.30946-2-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 6b4af0d commit 85df621

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

tools/perf/builtin-diff.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1199,7 +1199,7 @@ static int ui_init(void)
11991199
BUG_ON(1);
12001200
}
12011201

1202-
perf_hpp__register_sort_field(fmt);
1202+
perf_hpp__prepend_sort_field(fmt);
12031203
return 0;
12041204
}
12051205

tools/perf/ui/hist.c

+6
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,12 @@ void perf_hpp_list__register_sort_field(struct perf_hpp_list *list,
521521
list_add_tail(&format->sort_list, &list->sorts);
522522
}
523523

524+
void perf_hpp_list__prepend_sort_field(struct perf_hpp_list *list,
525+
struct perf_hpp_fmt *format)
526+
{
527+
list_add(&format->sort_list, &list->sorts);
528+
}
529+
524530
void perf_hpp__column_unregister(struct perf_hpp_fmt *format)
525531
{
526532
list_del(&format->list);

tools/perf/util/hist.h

+7
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,8 @@ void perf_hpp_list__column_register(struct perf_hpp_list *list,
282282
struct perf_hpp_fmt *format);
283283
void perf_hpp_list__register_sort_field(struct perf_hpp_list *list,
284284
struct perf_hpp_fmt *format);
285+
void perf_hpp_list__prepend_sort_field(struct perf_hpp_list *list,
286+
struct perf_hpp_fmt *format);
285287

286288
static inline void perf_hpp__column_register(struct perf_hpp_fmt *format)
287289
{
@@ -293,6 +295,11 @@ static inline void perf_hpp__register_sort_field(struct perf_hpp_fmt *format)
293295
perf_hpp_list__register_sort_field(&perf_hpp_list, format);
294296
}
295297

298+
static inline void perf_hpp__prepend_sort_field(struct perf_hpp_fmt *format)
299+
{
300+
perf_hpp_list__prepend_sort_field(&perf_hpp_list, format);
301+
}
302+
296303
#define perf_hpp_list__for_each_format(_list, format) \
297304
list_for_each_entry(format, &(_list)->fields, list)
298305

0 commit comments

Comments
 (0)