mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 08:26:59 +00:00
perf ui/gtk: Reuse generic __hpp__fmt() code
The __hpp__color_fmt used in the gtk code can be replace by the generic code with small change in print_fn callback. This is a preparation to upcoming changes and no functional changes intended. Signed-off-by: Namhyung Kim <namhyung@kernel.org> Acked-by: Pekka Enberg <penberg@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: Pekka Enberg <penberg@kernel.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1393809254-4480-3-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
9b0d2fb86d
commit
4a62109fe9
3 changed files with 19 additions and 69 deletions
|
@ -8,16 +8,22 @@
|
||||||
|
|
||||||
#define MAX_COLUMNS 32
|
#define MAX_COLUMNS 32
|
||||||
|
|
||||||
static int __percent_color_snprintf(char *buf, size_t size, double percent)
|
static int __percent_color_snprintf(char *buf, size_t size, const char *fmt, ...)
|
||||||
{
|
{
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
va_list args;
|
||||||
|
double percent;
|
||||||
const char *markup;
|
const char *markup;
|
||||||
|
|
||||||
|
va_start(args, fmt);
|
||||||
|
percent = va_arg(args, double);
|
||||||
|
va_end(args);
|
||||||
|
|
||||||
markup = perf_gtk__get_percent_color(percent);
|
markup = perf_gtk__get_percent_color(percent);
|
||||||
if (markup)
|
if (markup)
|
||||||
ret += scnprintf(buf, size, markup);
|
ret += scnprintf(buf, size, markup);
|
||||||
|
|
||||||
ret += scnprintf(buf + ret, size - ret, " %6.2f%%", percent);
|
ret += scnprintf(buf + ret, size - ret, fmt, percent);
|
||||||
|
|
||||||
if (markup)
|
if (markup)
|
||||||
ret += scnprintf(buf + ret, size - ret, "</span>");
|
ret += scnprintf(buf + ret, size - ret, "</span>");
|
||||||
|
@ -25,66 +31,6 @@ static int __percent_color_snprintf(char *buf, size_t size, double percent)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
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;
|
|
||||||
struct perf_evsel *evsel = hists_to_evsel(hists);
|
|
||||||
|
|
||||||
if (hists->stats.total_period)
|
|
||||||
percent = 100.0 * get_field(he) / hists->stats.total_period;
|
|
||||||
|
|
||||||
ret = __percent_color_snprintf(hpp->buf, hpp->size, percent);
|
|
||||||
|
|
||||||
if (perf_evsel__is_group_event(evsel)) {
|
|
||||||
int prev_idx, idx_delta;
|
|
||||||
struct hist_entry *pair;
|
|
||||||
int nr_members = evsel->nr_members;
|
|
||||||
|
|
||||||
prev_idx = perf_evsel__group_idx(evsel);
|
|
||||||
|
|
||||||
list_for_each_entry(pair, &he->pairs.head, pairs.node) {
|
|
||||||
u64 period = get_field(pair);
|
|
||||||
u64 total = pair->hists->stats.total_period;
|
|
||||||
|
|
||||||
evsel = hists_to_evsel(pair->hists);
|
|
||||||
idx_delta = perf_evsel__group_idx(evsel) - prev_idx - 1;
|
|
||||||
|
|
||||||
while (idx_delta--) {
|
|
||||||
/*
|
|
||||||
* zero-fill group members in the middle which
|
|
||||||
* have no sample
|
|
||||||
*/
|
|
||||||
ret += __percent_color_snprintf(hpp->buf + ret,
|
|
||||||
hpp->size - ret,
|
|
||||||
0.0);
|
|
||||||
}
|
|
||||||
|
|
||||||
percent = 100.0 * period / total;
|
|
||||||
ret += __percent_color_snprintf(hpp->buf + ret,
|
|
||||||
hpp->size - ret,
|
|
||||||
percent);
|
|
||||||
|
|
||||||
prev_idx = perf_evsel__group_idx(evsel);
|
|
||||||
}
|
|
||||||
|
|
||||||
idx_delta = nr_members - prev_idx - 1;
|
|
||||||
|
|
||||||
while (idx_delta--) {
|
|
||||||
/*
|
|
||||||
* zero-fill group members at last which have no sample
|
|
||||||
*/
|
|
||||||
ret += __percent_color_snprintf(hpp->buf + ret,
|
|
||||||
hpp->size - ret,
|
|
||||||
0.0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
#define __HPP_COLOR_PERCENT_FN(_type, _field) \
|
#define __HPP_COLOR_PERCENT_FN(_type, _field) \
|
||||||
static u64 he_get_##_field(struct hist_entry *he) \
|
static u64 he_get_##_field(struct hist_entry *he) \
|
||||||
{ \
|
{ \
|
||||||
|
@ -95,7 +41,8 @@ static int perf_gtk__hpp_color_##_type(struct perf_hpp_fmt *fmt __maybe_unused,
|
||||||
struct perf_hpp *hpp, \
|
struct perf_hpp *hpp, \
|
||||||
struct hist_entry *he) \
|
struct hist_entry *he) \
|
||||||
{ \
|
{ \
|
||||||
return __hpp__color_fmt(hpp, he, he_get_##_field); \
|
return __hpp__fmt(hpp, he, he_get_##_field, " %6.2f%%", \
|
||||||
|
__percent_color_snprintf, true); \
|
||||||
}
|
}
|
||||||
|
|
||||||
__HPP_COLOR_PERCENT_FN(overhead, period)
|
__HPP_COLOR_PERCENT_FN(overhead, period)
|
||||||
|
|
|
@ -8,12 +8,9 @@
|
||||||
|
|
||||||
/* hist period print (hpp) functions */
|
/* hist period print (hpp) functions */
|
||||||
|
|
||||||
typedef int (*hpp_snprint_fn)(char *buf, size_t size, const char *fmt, ...);
|
int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he,
|
||||||
|
u64 (*get_field)(struct hist_entry *),
|
||||||
static int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he,
|
const char *fmt, hpp_snprint_fn print_fn, bool fmt_percent)
|
||||||
u64 (*get_field)(struct hist_entry *),
|
|
||||||
const char *fmt, hpp_snprint_fn print_fn,
|
|
||||||
bool fmt_percent)
|
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
struct hists *hists = he->hists;
|
struct hists *hists = he->hists;
|
||||||
|
|
|
@ -166,6 +166,12 @@ void perf_hpp__init(void);
|
||||||
void perf_hpp__column_register(struct perf_hpp_fmt *format);
|
void perf_hpp__column_register(struct perf_hpp_fmt *format);
|
||||||
void perf_hpp__column_enable(unsigned col);
|
void perf_hpp__column_enable(unsigned col);
|
||||||
|
|
||||||
|
typedef int (*hpp_snprint_fn)(char *buf, size_t size, 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 size_t perf_hpp__use_color(void)
|
static inline size_t perf_hpp__use_color(void)
|
||||||
{
|
{
|
||||||
return !symbol_conf.field_sep;
|
return !symbol_conf.field_sep;
|
||||||
|
|
Loading…
Reference in a new issue