perf gtk/browser: Convert hpp helpers to a function

The hpp helpers do same job for each field so it was implemented as
macro in order to access those fields easily.  But it gets cumbersome to
maintain a large function in a macro as the function grows. Factor it
out to a function with a little helper macro to access field.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1358845787-1350-9-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Namhyung Kim 2013-01-22 18:09:36 +09:00 committed by Arnaldo Carvalho de Melo
parent 5aed9d2493
commit 843985e953

View File

@ -8,32 +8,58 @@
#define MAX_COLUMNS 32 #define MAX_COLUMNS 32
#define HPP__COLOR_FN(_name, _field) \ static int perf_gtk__percent_color_snprintf(char *buf, size_t size,
static int perf_gtk__hpp_color_ ## _name(struct perf_hpp *hpp, \ double percent)
struct hist_entry *he) \ {
{ \ int ret = 0;
struct hists *hists = he->hists; \ const char *markup;
double percent = 100.0 * he->stat._field / hists->stats.total_period; \
const char *markup; \ markup = perf_gtk__get_percent_color(percent);
int ret = 0; \ if (markup)
\ ret += scnprintf(buf, size, markup);
markup = perf_gtk__get_percent_color(percent); \
if (markup) \ ret += scnprintf(buf + ret, size - ret, "%6.2f%%", percent);
ret += scnprintf(hpp->buf, hpp->size, "%s", markup); \
ret += scnprintf(hpp->buf + ret, hpp->size - ret, "%6.2f%%", percent); \ if (markup)
if (markup) \ ret += scnprintf(buf + ret, size - ret, "</span>");
ret += scnprintf(hpp->buf + ret, hpp->size - ret, "</span>"); \
\ return ret;
return ret; \
} }
HPP__COLOR_FN(overhead, period)
HPP__COLOR_FN(overhead_sys, period_sys)
HPP__COLOR_FN(overhead_us, period_us)
HPP__COLOR_FN(overhead_guest_sys, period_guest_sys)
HPP__COLOR_FN(overhead_guest_us, period_guest_us)
#undef HPP__COLOR_FN static int __hpp__color_fmt(struct perf_hpp *hpp, struct hist_entry *he,
u64 (*get_field)(struct hist_entry *))
{
int ret;
double percent = 0.0;
struct hists *hists = he->hists;
if (hists->stats.total_period)
percent = 100.0 * get_field(he) / hists->stats.total_period;
ret = perf_gtk__percent_color_snprintf(hpp->buf, hpp->size, percent);
return ret;
}
#define __HPP_COLOR_PERCENT_FN(_type, _field) \
static u64 he_get_##_field(struct hist_entry *he) \
{ \
return he->stat._field; \
} \
\
static int perf_gtk__hpp_color_##_type(struct perf_hpp *hpp, \
struct hist_entry *he) \
{ \
return __hpp__color_fmt(hpp, he, he_get_##_field); \
}
__HPP_COLOR_PERCENT_FN(overhead, period)
__HPP_COLOR_PERCENT_FN(overhead_sys, period_sys)
__HPP_COLOR_PERCENT_FN(overhead_us, period_us)
__HPP_COLOR_PERCENT_FN(overhead_guest_sys, period_guest_sys)
__HPP_COLOR_PERCENT_FN(overhead_guest_us, period_guest_us)
#undef __HPP_COLOR_PERCENT_FN
void perf_gtk__init_hpp(void) void perf_gtk__init_hpp(void)