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

Commit 4e754e1c authored by Namhyung Kim's avatar Namhyung Kim Committed by Jiri Olsa
Browse files

perf tests: Factor out print_hists_*() 



Those print helper functions can be reused by later hist test cases so
factor them out to a common location.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1400480762-22852-20-git-send-email-namhyung@kernel.org


Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
parent 1c89fe9b

tools/perf/tests/hists_common.c

+57 −0
Original line number Diff line number Diff line
@@ -146,3 +146,60 @@ struct machine *setup_fake_machine(struct machines *machines) 
	machine__delete(machine);

	return NULL;

}



void print_hists_in(struct hists *hists)

{

	int i = 0;

	struct rb_root *root;

	struct rb_node *node;



	if (sort__need_collapse)

		root = &hists->entries_collapsed;

	else

		root = hists->entries_in;



	pr_info("----- %s --------\n", __func__);

	node = rb_first(root);

	while (node) {

		struct hist_entry *he;



		he = rb_entry(node, struct hist_entry, rb_node_in);



		if (!he->filtered) {

			pr_info("%2d: entry: %-8s [%-8s] %20s: period = %"PRIu64"\n",

				i, thread__comm_str(he->thread),

				he->ms.map->dso->short_name,

				he->ms.sym->name, he->stat.period);

		}



		i++;

		node = rb_next(node);

	}

}



void print_hists_out(struct hists *hists)

{

	int i = 0;

	struct rb_root *root;

	struct rb_node *node;



	root = &hists->entries;



	pr_info("----- %s --------\n", __func__);

	node = rb_first(root);

	while (node) {

		struct hist_entry *he;



		he = rb_entry(node, struct hist_entry, rb_node);



		if (!he->filtered) {

			pr_info("%2d: entry: %-8s [%-8s] %20s: period = %"PRIu64"\n",

				i, thread__comm_str(he->thread),

				he->ms.map->dso->short_name,

				he->ms.sym->name, he->stat.period);

		}



		i++;

		node = rb_next(node);

	}

}

tools/perf/tests/hists_common.h

+3 −0
Original line number Diff line number Diff line
@@ -41,4 +41,7 @@ struct machines; 
 */

struct machine *setup_fake_machine(struct machines *machines);



void print_hists_in(struct hists *hists);

void print_hists_out(struct hists *hists);



#endif /* __PERF_TESTS__HISTS_COMMON_H__ */

tools/perf/tests/hists_filter.c

+5 −32
Original line number Diff line number Diff line
@@ -98,33 +98,6 @@ static int add_hist_entries(struct perf_evlist *evlist, struct machine *machine) 
	return TEST_FAIL;

}



static void print_hists(struct hists *hists)

{

	int i = 0;

	struct rb_root *root;

	struct rb_node *node;



	root = &hists->entries;



	pr_info("----- %s --------\n", __func__);

	node = rb_first(root);

	while (node) {

		struct hist_entry *he;



		he = rb_entry(node, struct hist_entry, rb_node);



		if (!he->filtered) {

			pr_info("%2d: entry: %-8s [%-8s] %20s: period = %"PRIu64"\n",

				i, thread__comm_str(he->thread),

				he->ms.map->dso->short_name,

				he->ms.sym->name, he->stat.period);

		}



		i++;

		node = rb_next(node);

	}

}



int test__hists_filter(void)

{

	int err = TEST_FAIL;
@@ -169,7 +142,7 @@ int test__hists_filter(void) 


		if (verbose > 2) {

			pr_info("Normal histogram\n");

			print_hists(hists);

			print_hists_out(hists);

		}



		TEST_ASSERT_VAL("Invalid nr samples",
@@ -193,7 +166,7 @@ int test__hists_filter(void) 


		if (verbose > 2) {

			pr_info("Histogram for thread filter\n");

			print_hists(hists);

			print_hists_out(hists);

		}



		/* normal stats should be invariant */
@@ -222,7 +195,7 @@ int test__hists_filter(void) 


		if (verbose > 2) {

			pr_info("Histogram for dso filter\n");

			print_hists(hists);

			print_hists_out(hists);

		}



		/* normal stats should be invariant */
@@ -257,7 +230,7 @@ int test__hists_filter(void) 


		if (verbose > 2) {

			pr_info("Histogram for symbol filter\n");

			print_hists(hists);

			print_hists_out(hists);

		}



		/* normal stats should be invariant */
@@ -284,7 +257,7 @@ int test__hists_filter(void) 


		if (verbose > 2) {

			pr_info("Histogram for all filters\n");

			print_hists(hists);

			print_hists_out(hists);

		}



		/* normal stats should be invariant */

tools/perf/tests/hists_link.c

+1 −28
Original line number Diff line number Diff line
@@ -268,33 +268,6 @@ static int validate_link(struct hists *leader, struct hists *other) 
	return __validate_link(leader, 0) || __validate_link(other, 1);

}



static void print_hists(struct hists *hists)

{

	int i = 0;

	struct rb_root *root;

	struct rb_node *node;



	if (sort__need_collapse)

		root = &hists->entries_collapsed;

	else

		root = hists->entries_in;



	pr_info("----- %s --------\n", __func__);

	node = rb_first(root);

	while (node) {

		struct hist_entry *he;



		he = rb_entry(node, struct hist_entry, rb_node_in);



		pr_info("%2d: entry: %-8s [%-8s] %20s: period = %"PRIu64"\n",

			i, thread__comm_str(he->thread), he->ms.map->dso->short_name,

			he->ms.sym->name, he->stat.period);



		i++;

		node = rb_next(node);

	}

}



int test__hists_link(void)

{

	int err = -1;
@@ -336,7 +309,7 @@ int test__hists_link(void) 
		hists__collapse_resort(&evsel->hists, NULL);



		if (verbose > 2)

			print_hists(&evsel->hists);

			print_hists_in(&evsel->hists);

	}



	first = perf_evlist__first(evlist);