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

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

perf ui/hists: Pass struct hpp to print functions 



Instead of the pointer to buffer and its size so that it can also get
private argument passed along with hpp.

This is a preparation of further change.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1393809254-4480-4-git-send-email-namhyung@kernel.org


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

tools/perf/ui/gtk/hists.c

+3 −1
Original line number Diff line number Diff line
@@ -8,12 +8,14 @@ 


#define MAX_COLUMNS			32



static int __percent_color_snprintf(char *buf, size_t size, const char *fmt, ...)

static int __percent_color_snprintf(struct perf_hpp *hpp, const char *fmt, ...)

{

	int ret = 0;

	va_list args;

	double percent;

	const char *markup;

	char *buf = hpp->buf;

	size_t size = hpp->size;



	va_start(args, fmt);

	percent = va_arg(args, double);

tools/perf/ui/hist.c

+66 −21
Original line number Diff line number Diff line
@@ -8,6 +8,13 @@ 


/* hist period print (hpp) functions */



#define hpp__call_print_fn(hpp, fn, fmt, ...)			\

({								\

	int __ret = fn(hpp, fmt, ##__VA_ARGS__);		\

	advance_hpp(hpp, __ret);				\

	__ret;							\

})



int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he,

	       u64 (*get_field)(struct hist_entry *),

	       const char *fmt, hpp_snprint_fn print_fn, bool fmt_percent)
@@ -15,6 +22,8 @@ int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he, 
	int ret;

	struct hists *hists = he->hists;

	struct perf_evsel *evsel = hists_to_evsel(hists);

	char *buf = hpp->buf;

	size_t size = hpp->size;



	if (fmt_percent) {

		double percent = 0.0;
@@ -23,9 +32,9 @@ int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he, 
			percent = 100.0 * get_field(he) /

				  hists->stats.total_period;



		ret = print_fn(hpp->buf, hpp->size, fmt, percent);

		ret = hpp__call_print_fn(hpp, print_fn, fmt, percent);

	} else

		ret = print_fn(hpp->buf, hpp->size, fmt, get_field(he));

		ret = hpp__call_print_fn(hpp, print_fn, fmt, get_field(he));



	if (perf_evsel__is_group_event(evsel)) {

		int prev_idx, idx_delta;
@@ -50,22 +59,21 @@ int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he, 
				 * have no sample

				 */

				if (fmt_percent) {

					ret += print_fn(hpp->buf + ret,

							hpp->size - ret,

					ret += hpp__call_print_fn(hpp, print_fn,

								  fmt, 0.0);

				} else {

					ret += print_fn(hpp->buf + ret,

							hpp->size - ret,

					ret += hpp__call_print_fn(hpp, print_fn,

								  fmt, 0ULL);

				}

			}



			if (fmt_percent)

				ret += print_fn(hpp->buf + ret, hpp->size - ret,

						fmt, 100.0 * period / total);

			else

				ret += print_fn(hpp->buf + ret, hpp->size - ret,

						fmt, period);

			if (fmt_percent) {

				ret += hpp__call_print_fn(hpp, print_fn, fmt,

							  100.0 * period / total);

			} else {

				ret += hpp__call_print_fn(hpp, print_fn, fmt,

							  period);

			}



			prev_idx = perf_evsel__group_idx(evsel);

		}
@@ -77,14 +85,22 @@ int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he, 
			 * zero-fill group members at last which have no sample

			 */

			if (fmt_percent) {

				ret += print_fn(hpp->buf + ret, hpp->size - ret,

				ret += hpp__call_print_fn(hpp, print_fn,

							  fmt, 0.0);

			} else {

				ret += print_fn(hpp->buf + ret, hpp->size - ret,

				ret += hpp__call_print_fn(hpp, print_fn,

							  fmt, 0ULL);

			}

		}

	}



	/*

	 * Restore original buf and size as it's where caller expects

	 * the result will be saved.

	 */

	hpp->buf = buf;

	hpp->size = size;



	return ret;

}
@@ -116,6 +132,34 @@ static int hpp__width_##_type(struct perf_hpp_fmt *fmt __maybe_unused, \ 
	return len;							\

}



static int hpp_color_scnprintf(struct perf_hpp *hpp, const char *fmt, ...)

{

	va_list args;

	ssize_t ssize = hpp->size;

	double percent;

	int ret;



	va_start(args, fmt);

	percent = va_arg(args, double);

	ret = value_color_snprintf(hpp->buf, hpp->size, fmt, percent);

	va_end(args);



	return (ret >= ssize) ? (ssize - 1) : ret;

}



static int hpp_entry_scnprintf(struct perf_hpp *hpp, const char *fmt, ...)

{

	va_list args;

	ssize_t ssize = hpp->size;

	int ret;



	va_start(args, fmt);

	ret = vsnprintf(hpp->buf, hpp->size, fmt, args);

	va_end(args);



	return (ret >= ssize) ? (ssize - 1) : ret;

}



#define __HPP_COLOR_PERCENT_FN(_type, _field)					\

static u64 he_get_##_field(struct hist_entry *he)				\

{										\
@@ -126,7 +170,7 @@ static int hpp__color_##_type(struct perf_hpp_fmt *fmt __maybe_unused, \ 
			      struct perf_hpp *hpp, struct hist_entry *he) 	\

{										\

	return __hpp__fmt(hpp, he, he_get_##_field, " %6.2f%%",			\

			  percent_color_snprintf, true);			\

			  hpp_color_scnprintf, true);				\

}



#define __HPP_ENTRY_PERCENT_FN(_type, _field)					\
@@ -135,7 +179,7 @@ static int hpp__entry_##_type(struct perf_hpp_fmt *_fmt __maybe_unused, \ 
{										\

	const char *fmt = symbol_conf.field_sep ? " %.2f" : " %6.2f%%";		\

	return __hpp__fmt(hpp, he, he_get_##_field, fmt,			\

			  scnprintf, true);					\

			  hpp_entry_scnprintf, true);				\

}



#define __HPP_ENTRY_RAW_FN(_type, _field)					\
@@ -148,7 +192,8 @@ static int hpp__entry_##_type(struct perf_hpp_fmt *_fmt __maybe_unused, \ 
			      struct perf_hpp *hpp, struct hist_entry *he) 	\

{										\

	const char *fmt = symbol_conf.field_sep ? " %"PRIu64 : " %11"PRIu64;	\

	return __hpp__fmt(hpp, he, he_get_raw_##_field, fmt, scnprintf, false);	\

	return __hpp__fmt(hpp, he, he_get_raw_##_field, fmt,			\

			  hpp_entry_scnprintf, false);				\

}



#define HPP_PERCENT_FNS(_type, _str, _field, _min_width, _unit_width)	\

tools/perf/ui/stdio/hist.c

+0 −6
Original line number Diff line number Diff line
@@ -306,12 +306,6 @@ 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)

{

tools/perf/util/hist.h

+7 −1
Original line number Diff line number Diff line
@@ -166,12 +166,18 @@ void perf_hpp__init(void); 
void perf_hpp__column_register(struct perf_hpp_fmt *format);

void perf_hpp__column_enable(unsigned col);



typedef int (*hpp_snprint_fn)(char *buf, size_t size, const char *fmt, ...);

typedef int (*hpp_snprint_fn)(struct perf_hpp *hpp, const char *fmt, ...);



int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he,

	       u64 (*get_field)(struct hist_entry *),

	       const char *fmt, hpp_snprint_fn print_fn, bool fmt_percent);



static inline void advance_hpp(struct perf_hpp *hpp, int inc)

{

	hpp->buf  += inc;

	hpp->size -= inc;

}



static inline size_t perf_hpp__use_color(void)

{

	return !symbol_conf.field_sep;