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

Commit be0e6d10 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

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: default avatarJiri Olsa <jolsa@redhat.com>
Reviewed-by: default avatarNamhyung 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 5f3f8d3b

tools/perf/ui/hist.c

+0 −40
Original line number Diff line number Diff line
@@ -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)

{

tools/perf/ui/stdio/hist.c

+41 −0
Original line number Diff line number Diff line
@@ -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)

{

tools/perf/util/hist.h

+0 −2
Original line number Diff line number Diff line
@@ -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;