perf tools: Move hist_entry__period_snprintf into stdio code

Moving hist_entry__period_snprintf function into stdio code and making
it static, as it's no longer used anywhere else.

Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Reviewed-by: Namhyung Kim <namhyung@kernel.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/n/tip-ah8ms343h8xygt20iqz91kz4@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
index dc900d7a190e374ca751e4a20354eac36c62eb14..0a193281eba85ec12bbed36d85803b51d7d24464 100644 (file)
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -236,46 +236,6 @@ void perf_hpp__column_enable(unsigned col)
        perf_hpp__column_register(&perf_hpp__format[col]);
 }
 
-static inline void advance_hpp(struct perf_hpp *hpp, int inc)
-{
-       hpp->buf  += inc;
-       hpp->size -= inc;
-}
-
-int hist_entry__period_snprintf(struct perf_hpp *hpp, struct hist_entry *he,
-                               bool color)
-{
-       const char *sep = symbol_conf.field_sep;
-       struct perf_hpp_fmt *fmt;
-       char *start = hpp->buf;
-       int ret;
-       bool first = true;
-
-       if (symbol_conf.exclude_other && !he->parent)
-               return 0;
-
-       perf_hpp__for_each_format(fmt) {
-               /*
-                * If there's no field_sep, we still need
-                * to display initial '  '.
-                */
-               if (!sep || !first) {
-                       ret = scnprintf(hpp->buf, hpp->size, "%s", sep ?: "  ");
-                       advance_hpp(hpp, ret);
-               } else
-                       first = false;
-
-               if (color && fmt->color)
-                       ret = fmt->color(fmt, hpp, he);
-               else
-                       ret = fmt->entry(fmt, hpp, he);
-
-               advance_hpp(hpp, ret);
-       }
-
-       return hpp->buf - start;
-}
-
 int hist_entry__sort_snprintf(struct hist_entry *he, char *s, size_t size,
                              struct hists *hists)
 {

diff --git a/tools/perf/ui/stdio/hist.c b/tools/perf/ui/stdio/hist.c
index ee703720649d155593f50dc20fae7a60c066c206..5b4fb330f656d71f929f197c06387389dbc2dfed 100644 (file)
--- a/tools/perf/ui/stdio/hist.c
+++ b/tools/perf/ui/stdio/hist.c
@@ -308,6 +308,47 @@ static size_t hist_entry__callchain_fprintf(struct hist_entry *he,
        return hist_entry_callchain__fprintf(he, total_period, left_margin, fp);
 }
 
+static inline void advance_hpp(struct perf_hpp *hpp, int inc)
+{
+       hpp->buf  += inc;
+       hpp->size -= inc;
+}
+
+static int hist_entry__period_snprintf(struct perf_hpp *hpp,
+                                      struct hist_entry *he,
+                                      bool color)
+{
+       const char *sep = symbol_conf.field_sep;
+       struct perf_hpp_fmt *fmt;
+       char *start = hpp->buf;
+       int ret;
+       bool first = true;
+
+       if (symbol_conf.exclude_other && !he->parent)
+               return 0;
+
+       perf_hpp__for_each_format(fmt) {
+               /*
+                * If there's no field_sep, we still need
+                * to display initial '  '.
+                */
+               if (!sep || !first) {
+                       ret = scnprintf(hpp->buf, hpp->size, "%s", sep ?: "  ");
+                       advance_hpp(hpp, ret);
+               } else
+                       first = false;
+
+               if (color && fmt->color)
+                       ret = fmt->color(fmt, hpp, he);
+               else
+                       ret = fmt->entry(fmt, hpp, he);
+
+               advance_hpp(hpp, ret);
+       }
+
+       return hpp->buf - start;
+}
+
 static int hist_entry__fprintf(struct hist_entry *he, size_t size,
                               struct hists *hists, FILE *fp)
 {

diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
index bfcbb11c26487aa07db4839c8e4e67cbc1b639a8..1329b6b6ffe61b0f5fb97d8582a837f554b3c752 100644 (file)
--- a/tools/perf/util/hist.h
+++ b/tools/perf/util/hist.h
@@ -174,8 +174,6 @@ enum {
 void perf_hpp__init(void);
 void perf_hpp__column_register(struct perf_hpp_fmt *format);
 void perf_hpp__column_enable(unsigned col);
-int hist_entry__period_snprintf(struct perf_hpp *hpp, struct hist_entry *he,
-                               bool color);
 
 struct perf_evlist;