Commit 1f7c2541 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf hists: Cleanup filtering functions 



The hists__filter_by_xxx functions share same logic with different
filters.  Factor out the common code into the hists__filter_by_type.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Acked-by: default avatarPekka Enberg <penberg@kernel.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1453252521-24398-2-git-send-email-namhyung@kernel.org


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

tools/perf/util/hist.c

+29 −60
Original line number Diff line number Diff line
@@ -1254,25 +1254,6 @@ static bool hists__filter_entry_by_dso(struct hists *hists, 
	return false;

}



void hists__filter_by_dso(struct hists *hists)

{

	struct rb_node *nd;



	hists->stats.nr_non_filtered_samples = 0;



	hists__reset_filter_stats(hists);

	hists__reset_col_len(hists);



	for (nd = rb_first(&hists->entries); nd; nd = rb_next(nd)) {

		struct hist_entry *h = rb_entry(nd, struct hist_entry, rb_node);



		if (hists__filter_entry_by_dso(hists, h))

			continue;



		hists__remove_entry_filter(hists, h, HIST_FILTER__DSO);

	}

}



static bool hists__filter_entry_by_thread(struct hists *hists,

					  struct hist_entry *he)

{
@@ -1285,25 +1266,6 @@ static bool hists__filter_entry_by_thread(struct hists *hists, 
	return false;

}



void hists__filter_by_thread(struct hists *hists)

{

	struct rb_node *nd;



	hists->stats.nr_non_filtered_samples = 0;



	hists__reset_filter_stats(hists);

	hists__reset_col_len(hists);



	for (nd = rb_first(&hists->entries); nd; nd = rb_next(nd)) {

		struct hist_entry *h = rb_entry(nd, struct hist_entry, rb_node);



		if (hists__filter_entry_by_thread(hists, h))

			continue;



		hists__remove_entry_filter(hists, h, HIST_FILTER__THREAD);

	}

}



static bool hists__filter_entry_by_symbol(struct hists *hists,

					  struct hist_entry *he)

{
@@ -1317,25 +1279,6 @@ static bool hists__filter_entry_by_symbol(struct hists *hists, 
	return false;

}



void hists__filter_by_symbol(struct hists *hists)

{

	struct rb_node *nd;



	hists->stats.nr_non_filtered_samples = 0;



	hists__reset_filter_stats(hists);

	hists__reset_col_len(hists);



	for (nd = rb_first(&hists->entries); nd; nd = rb_next(nd)) {

		struct hist_entry *h = rb_entry(nd, struct hist_entry, rb_node);



		if (hists__filter_entry_by_symbol(hists, h))

			continue;



		hists__remove_entry_filter(hists, h, HIST_FILTER__SYMBOL);

	}

}



static bool hists__filter_entry_by_socket(struct hists *hists,

					  struct hist_entry *he)

{
@@ -1348,7 +1291,9 @@ static bool hists__filter_entry_by_socket(struct hists *hists, 
	return false;

}



void hists__filter_by_socket(struct hists *hists)

typedef bool (*filter_fn_t)(struct hists *hists, struct hist_entry *he);



static void hists__filter_by_type(struct hists *hists, int type, filter_fn_t filter)

{

	struct rb_node *nd;
@@ -1360,11 +1305,35 @@ void hists__filter_by_socket(struct hists *hists) 
	for (nd = rb_first(&hists->entries); nd; nd = rb_next(nd)) {

		struct hist_entry *h = rb_entry(nd, struct hist_entry, rb_node);



		if (hists__filter_entry_by_socket(hists, h))

		if (filter(hists, h))

			continue;



		hists__remove_entry_filter(hists, h, HIST_FILTER__SOCKET);

		hists__remove_entry_filter(hists, h, type);

	}

}



void hists__filter_by_thread(struct hists *hists)

{

	hists__filter_by_type(hists, HIST_FILTER__THREAD,

			      hists__filter_entry_by_thread);

}



void hists__filter_by_dso(struct hists *hists)

{

	hists__filter_by_type(hists, HIST_FILTER__DSO,

			      hists__filter_entry_by_dso);

}



void hists__filter_by_symbol(struct hists *hists)

{

	hists__filter_by_type(hists, HIST_FILTER__SYMBOL,

			      hists__filter_entry_by_symbol);

}



void hists__filter_by_socket(struct hists *hists)

{

	hists__filter_by_type(hists, HIST_FILTER__SOCKET,

			      hists__filter_entry_by_socket);

}



void events_stats__inc(struct events_stats *stats, u32 type)

CRA Git | Maintained and supported by SUSTech CRA and CCSE