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: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1400480762-22852-20-git-send-email-namhyung@kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>

diff --git a/tools/perf/tests/hists_common.c b/tools/perf/tests/hists_common.c
index 44655b395bb9e67a631e4599f29f71a1ddc8e0b0..040a85b17aee2836046827666059b045e2ebeccc 100644 (file)
--- a/tools/perf/tests/hists_common.c
+++ b/tools/perf/tests/hists_common.c
@@ -146,3 +146,60 @@ out:
        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);
+       }
+}

diff --git a/tools/perf/tests/hists_common.h b/tools/perf/tests/hists_common.h
index 2528b8fc105a27d645ab5f7539239e8ac6e67700..1415ae69d7b6fa40235cce03a8e02874da39aa10 100644 (file)
--- a/tools/perf/tests/hists_common.h
+++ b/tools/perf/tests/hists_common.h
@@ -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__ */

diff --git a/tools/perf/tests/hists_filter.c b/tools/perf/tests/hists_filter.c
index 4617a8bee29b431a494e1d5950b51765cca5ab19..13c8cf49225ecc1d982af4827b0dc16efaaf9233 100644 (file)
--- a/tools/perf/tests/hists_filter.c
+++ b/tools/perf/tests/hists_filter.c
@@ -98,33 +98,6 @@ out:
        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 */

diff --git a/tools/perf/tests/hists_link.c b/tools/perf/tests/hists_link.c
index b009bbf440d968ffea5eef026e6ce2645a628b20..4e783db60bba91b1f91c459034a821239b3b3a53 100644 (file)
--- a/tools/perf/tests/hists_link.c
+++ b/tools/perf/tests/hists_link.c
@@ -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);