Commit 4945cf2a authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Add more sort entry check functions 



Those functions are for checkinf if a given perf_hpp_fmt is a
filter-related sort entry.  With hierarchy mode, it needs to check
filters on the hist entries with its own hpp format list.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Tested-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1457531222-18130-3-git-send-email-namhyung@kernel.org


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

tools/perf/util/hist.h

+4 −0
Original line number Diff line number Diff line
@@ -318,6 +318,10 @@ bool perf_hpp__defined_dynamic_entry(struct perf_hpp_fmt *fmt, struct hists *his 
bool perf_hpp__is_trace_entry(struct perf_hpp_fmt *fmt);

bool perf_hpp__is_srcline_entry(struct perf_hpp_fmt *fmt);

bool perf_hpp__is_srcfile_entry(struct perf_hpp_fmt *fmt);

bool perf_hpp__is_thread_entry(struct perf_hpp_fmt *fmt);

bool perf_hpp__is_comm_entry(struct perf_hpp_fmt *fmt);

bool perf_hpp__is_dso_entry(struct perf_hpp_fmt *fmt);

bool perf_hpp__is_sym_entry(struct perf_hpp_fmt *fmt);



struct perf_hpp_fmt *perf_hpp_fmt__dup(struct perf_hpp_fmt *fmt);

tools/perf/util/sort.c

+19 −31
Original line number Diff line number Diff line
@@ -1488,38 +1488,26 @@ bool perf_hpp__is_sort_entry(struct perf_hpp_fmt *format) 
	return format->header == __sort__hpp_header;

}



bool perf_hpp__is_trace_entry(struct perf_hpp_fmt *fmt)

{

	struct hpp_sort_entry *hse;

#define MK_SORT_ENTRY_CHK(key)					\

bool perf_hpp__is_ ## key ## _entry(struct perf_hpp_fmt *fmt)	\

{								\

	struct hpp_sort_entry *hse;				\

								\

	if (!perf_hpp__is_sort_entry(fmt))			\

		return false;					\

								\

	hse = container_of(fmt, struct hpp_sort_entry, hpp);	\

	return hse->se == &sort_ ## key ;			\

}



MK_SORT_ENTRY_CHK(trace)

MK_SORT_ENTRY_CHK(srcline)

MK_SORT_ENTRY_CHK(srcfile)

MK_SORT_ENTRY_CHK(thread)

MK_SORT_ENTRY_CHK(comm)

MK_SORT_ENTRY_CHK(dso)

MK_SORT_ENTRY_CHK(sym)



	if (!perf_hpp__is_sort_entry(fmt))

		return false;



	hse = container_of(fmt, struct hpp_sort_entry, hpp);

	return hse->se == &sort_trace;

}



bool perf_hpp__is_srcline_entry(struct perf_hpp_fmt *fmt)

{

	struct hpp_sort_entry *hse;



	if (!perf_hpp__is_sort_entry(fmt))

		return false;



	hse = container_of(fmt, struct hpp_sort_entry, hpp);

	return hse->se == &sort_srcline;

}



bool perf_hpp__is_srcfile_entry(struct perf_hpp_fmt *fmt)

{

	struct hpp_sort_entry *hse;



	if (!perf_hpp__is_sort_entry(fmt))

		return false;



	hse = container_of(fmt, struct hpp_sort_entry, hpp);

	return hse->se == &sort_srcfile;

}



static bool __sort__hpp_equal(struct perf_hpp_fmt *a, struct perf_hpp_fmt *b)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE