Skip to content

L
linux
Commit 2c5d4b4a authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files
Options

perf tools: Add struct perf_hpp_fmt into hpp callbacks 

Adding 'struct perf_hpp_fmt' into hpp callbacks, so commands can access
their private data.

It'll be handy for diff command in future to be able to access file
related data for each column.
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-7vy2m18574b1bicoljn8e9lw@git.kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent b21484f1
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 41 deletions
tools/perf/ui/browsers/hists.c
View file @ 2c5d4b4a
...@@ -685,8 +685,10 @@ static u64 __hpp_get_##_field(struct hist_entry *he) \ ...@@ -685,8 +685,10 @@ static u64 __hpp_get_##_field(struct hist_entry *he) \
return he->stat._field; \ return he->stat._field; \
} \ } \
\ \
static int hist_browser__hpp_color_##_type(struct perf_hpp *hpp, \ static int \
struct hist_entry *he) \ hist_browser__hpp_color_##_type(struct perf_hpp_fmt *fmt __maybe_unused,\
struct perf_hpp *hpp, \
struct hist_entry *he) \
{ \ { \
return __hpp__color_fmt(hpp, he, __hpp_get_##_field, _cb); \ return __hpp__color_fmt(hpp, he, __hpp_get_##_field, _cb); \
} }
...@@ -762,9 +764,9 @@ static int hist_browser__show_entry(struct hist_browser *browser, ...@@ -762,9 +764,9 @@ static int hist_browser__show_entry(struct hist_browser *browser,
first = false; first = false;
if (fmt->color) { if (fmt->color) {
width -= fmt->color(&hpp, entry); width -= fmt->color(fmt, &hpp, entry);
} else { } else {
width -= fmt->entry(&hpp, entry); width -= fmt->entry(fmt, &hpp, entry);
slsmg_printf("%s", s); slsmg_printf("%s", s);
} }
} }
......
tools/perf/ui/gtk/hists.c
View file @ 2c5d4b4a
...@@ -91,7 +91,8 @@ static u64 he_get_##_field(struct hist_entry *he) \ ...@@ -91,7 +91,8 @@ static u64 he_get_##_field(struct hist_entry *he) \
return he->stat._field; \ return he->stat._field; \
} \ } \
\ \
static int perf_gtk__hpp_color_##_type(struct perf_hpp *hpp, \ static int perf_gtk__hpp_color_##_type(struct perf_hpp_fmt *fmt __maybe_unused, \
struct perf_hpp *hpp, \
struct hist_entry *he) \ struct hist_entry *he) \
{ \ { \
return __hpp__color_fmt(hpp, he, he_get_##_field); \ return __hpp__color_fmt(hpp, he, he_get_##_field); \
...@@ -244,7 +245,7 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists, ...@@ -244,7 +245,7 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists,
col_idx = 0; col_idx = 0;
perf_hpp__for_each_format(fmt) { perf_hpp__for_each_format(fmt) {
fmt->header(&hpp); fmt->header(fmt, &hpp);
gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(view), gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(view),
-1, ltrim(s), -1, ltrim(s),
...@@ -296,9 +297,9 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists, ...@@ -296,9 +297,9 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists,
perf_hpp__for_each_format(fmt) { perf_hpp__for_each_format(fmt) {
if (fmt->color) if (fmt->color)
fmt->color(&hpp, h); fmt->color(fmt, &hpp, h);
else else
fmt->entry(&hpp, h); fmt->entry(fmt, &hpp, h);
gtk_tree_store_set(store, &iter, col_idx++, s, -1); gtk_tree_store_set(store, &iter, col_idx++, s, -1);
} }
......
tools/perf/ui/hist.c
View file @ 2c5d4b4a
#include <math.h> #include <math.h>
#include <linux/compiler.h>
#include "../util/hist.h" #include "../util/hist.h"
#include "../util/util.h" #include "../util/util.h"
...@@ -79,7 +80,8 @@ static int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he, ...@@ -79,7 +80,8 @@ static int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he,
} }
#define __HPP_HEADER_FN(_type, _str, _min_width, _unit_width) \ #define __HPP_HEADER_FN(_type, _str, _min_width, _unit_width) \
static int hpp__header_##_type(struct perf_hpp *hpp) \ static int hpp__header_##_type(struct perf_hpp_fmt *fmt __maybe_unused, \
struct perf_hpp *hpp) \
{ \ { \
int len = _min_width; \ int len = _min_width; \
\ \
...@@ -92,7 +94,8 @@ static int hpp__header_##_type(struct perf_hpp *hpp) \ ...@@ -92,7 +94,8 @@ static int hpp__header_##_type(struct perf_hpp *hpp) \
} }
#define __HPP_WIDTH_FN(_type, _min_width, _unit_width) \ #define __HPP_WIDTH_FN(_type, _min_width, _unit_width) \
static int hpp__width_##_type(struct perf_hpp *hpp __maybe_unused) \ static int hpp__width_##_type(struct perf_hpp_fmt *fmt __maybe_unused, \
struct perf_hpp *hpp __maybe_unused) \
{ \ { \
int len = _min_width; \ int len = _min_width; \
\ \
...@@ -110,14 +113,16 @@ static u64 he_get_##_field(struct hist_entry *he) \ ...@@ -110,14 +113,16 @@ static u64 he_get_##_field(struct hist_entry *he) \
return he->stat._field; \ return he->stat._field; \
} \ } \
\ \
static int hpp__color_##_type(struct perf_hpp *hpp, struct hist_entry *he) \ 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%%", \ return __hpp__fmt(hpp, he, he_get_##_field, " %6.2f%%", \
(hpp_snprint_fn)percent_color_snprintf, true); \ (hpp_snprint_fn)percent_color_snprintf, true); \
} }
#define __HPP_ENTRY_PERCENT_FN(_type, _field) \ #define __HPP_ENTRY_PERCENT_FN(_type, _field) \
static int hpp__entry_##_type(struct perf_hpp *hpp, struct hist_entry *he) \ 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 ? " %.2f" : " %6.2f%%"; \ const char *fmt = symbol_conf.field_sep ? " %.2f" : " %6.2f%%"; \
return __hpp__fmt(hpp, he, he_get_##_field, fmt, \ return __hpp__fmt(hpp, he, he_get_##_field, fmt, \
...@@ -130,7 +135,8 @@ static u64 he_get_raw_##_field(struct hist_entry *he) \ ...@@ -130,7 +135,8 @@ static u64 he_get_raw_##_field(struct hist_entry *he) \
return he->stat._field; \ return he->stat._field; \
} \ } \
\ \
static int hpp__entry_##_type(struct perf_hpp *hpp, struct hist_entry *he) \ 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; \ 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, scnprintf, false); \
...@@ -158,12 +164,14 @@ HPP_RAW_FNS(samples, "Samples", nr_events, 12, 12) ...@@ -158,12 +164,14 @@ HPP_RAW_FNS(samples, "Samples", nr_events, 12, 12)
HPP_RAW_FNS(period, "Period", period, 12, 12) HPP_RAW_FNS(period, "Period", period, 12, 12)
static int hpp__header_baseline(struct perf_hpp *hpp) static int hpp__header_baseline(struct perf_hpp_fmt *fmt __maybe_unused,
struct perf_hpp *hpp)
{ {
return scnprintf(hpp->buf, hpp->size, "Baseline"); return scnprintf(hpp->buf, hpp->size, "Baseline");
} }
static int hpp__width_baseline(struct perf_hpp *hpp __maybe_unused) static int hpp__width_baseline(struct perf_hpp_fmt *fmt __maybe_unused,
struct perf_hpp *hpp __maybe_unused)
{ {
return 8; return 8;
} }
...@@ -184,7 +192,8 @@ static double baseline_percent(struct hist_entry *he) ...@@ -184,7 +192,8 @@ static double baseline_percent(struct hist_entry *he)
return percent; return percent;
} }
static int hpp__color_baseline(struct perf_hpp *hpp, struct hist_entry *he) static int hpp__color_baseline(struct perf_hpp_fmt *fmt __maybe_unused,
struct perf_hpp *hpp, struct hist_entry *he)
{ {
double percent = baseline_percent(he); double percent = baseline_percent(he);
...@@ -194,7 +203,8 @@ static int hpp__color_baseline(struct perf_hpp *hpp, struct hist_entry *he) ...@@ -194,7 +203,8 @@ static int hpp__color_baseline(struct perf_hpp *hpp, struct hist_entry *he)
return scnprintf(hpp->buf, hpp->size, " "); return scnprintf(hpp->buf, hpp->size, " ");
} }
static int hpp__entry_baseline(struct perf_hpp *hpp, struct hist_entry *he) static int hpp__entry_baseline(struct perf_hpp_fmt *_fmt __maybe_unused,
struct perf_hpp *hpp, struct hist_entry *he)
{ {
double percent = baseline_percent(he); double percent = baseline_percent(he);
const char *fmt = symbol_conf.field_sep ? "%.2f" : " %6.2f%%"; const char *fmt = symbol_conf.field_sep ? "%.2f" : " %6.2f%%";
...@@ -205,19 +215,22 @@ static int hpp__entry_baseline(struct perf_hpp *hpp, struct hist_entry *he) ...@@ -205,19 +215,22 @@ static int hpp__entry_baseline(struct perf_hpp *hpp, struct hist_entry *he)
return scnprintf(hpp->buf, hpp->size, " "); return scnprintf(hpp->buf, hpp->size, " ");
} }
static int hpp__header_period_baseline(struct perf_hpp *hpp) static int hpp__header_period_baseline(struct perf_hpp_fmt *_fmt __maybe_unused,
struct perf_hpp *hpp)
{ {
const char *fmt = symbol_conf.field_sep ? "%s" : "%12s"; const char *fmt = symbol_conf.field_sep ? "%s" : "%12s";
return scnprintf(hpp->buf, hpp->size, fmt, "Period Base"); return scnprintf(hpp->buf, hpp->size, fmt, "Period Base");
} }
static int hpp__width_period_baseline(struct perf_hpp *hpp __maybe_unused) static int hpp__width_period_baseline(struct perf_hpp_fmt *fmt __maybe_unused,
struct perf_hpp *hpp __maybe_unused)
{ {
return 12; return 12;
} }
static int hpp__entry_period_baseline(struct perf_hpp *hpp, struct hist_entry *he) static int hpp__entry_period_baseline(struct perf_hpp_fmt *_fmt __maybe_unused,
struct perf_hpp *hpp, struct hist_entry *he)
{ {
struct hist_entry *pair = hist_entry__next_pair(he); struct hist_entry *pair = hist_entry__next_pair(he);
u64 period = pair ? pair->stat.period : 0; u64 period = pair ? pair->stat.period : 0;
...@@ -226,19 +239,22 @@ static int hpp__entry_period_baseline(struct perf_hpp *hpp, struct hist_entry *h ...@@ -226,19 +239,22 @@ static int hpp__entry_period_baseline(struct perf_hpp *hpp, struct hist_entry *h
return scnprintf(hpp->buf, hpp->size, fmt, period); return scnprintf(hpp->buf, hpp->size, fmt, period);
} }
static int hpp__header_delta(struct perf_hpp *hpp) static int hpp__header_delta(struct perf_hpp_fmt *_fmt __maybe_unused,
struct perf_hpp *hpp)
{ {
const char *fmt = symbol_conf.field_sep ? "%s" : "%7s"; const char *fmt = symbol_conf.field_sep ? "%s" : "%7s";
return scnprintf(hpp->buf, hpp->size, fmt, "Delta"); return scnprintf(hpp->buf, hpp->size, fmt, "Delta");
} }
static int hpp__width_delta(struct perf_hpp *hpp __maybe_unused) static int hpp__width_delta(struct perf_hpp_fmt *fmt __maybe_unused,
struct perf_hpp *hpp __maybe_unused)
{ {
return 7; return 7;
} }
static int hpp__entry_delta(struct perf_hpp *hpp, struct hist_entry *he) static int hpp__entry_delta(struct perf_hpp_fmt *_fmt __maybe_unused,
struct perf_hpp *hpp, struct hist_entry *he)
{ {
struct hist_entry *pair = hist_entry__next_pair(he); struct hist_entry *pair = hist_entry__next_pair(he);
const char *fmt = symbol_conf.field_sep ? "%s" : "%7.7s"; const char *fmt = symbol_conf.field_sep ? "%s" : "%7.7s";
...@@ -259,19 +275,22 @@ static int hpp__entry_delta(struct perf_hpp *hpp, struct hist_entry *he) ...@@ -259,19 +275,22 @@ static int hpp__entry_delta(struct perf_hpp *hpp, struct hist_entry *he)
return scnprintf(hpp->buf, hpp->size, fmt, buf); return scnprintf(hpp->buf, hpp->size, fmt, buf);
} }
static int hpp__header_ratio(struct perf_hpp *hpp) static int hpp__header_ratio(struct perf_hpp_fmt *_fmt __maybe_unused,
struct perf_hpp *hpp)
{ {
const char *fmt = symbol_conf.field_sep ? "%s" : "%14s"; const char *fmt = symbol_conf.field_sep ? "%s" : "%14s";
return scnprintf(hpp->buf, hpp->size, fmt, "Ratio"); return scnprintf(hpp->buf, hpp->size, fmt, "Ratio");
} }
static int hpp__width_ratio(struct perf_hpp *hpp __maybe_unused) static int hpp__width_ratio(struct perf_hpp_fmt *fmt __maybe_unused,
struct perf_hpp *hpp __maybe_unused)
{ {
return 14; return 14;
} }
static int hpp__entry_ratio(struct perf_hpp *hpp, struct hist_entry *he) static int hpp__entry_ratio(struct perf_hpp_fmt *_fmt __maybe_unused,
struct perf_hpp *hpp, struct hist_entry *he)
{ {
struct hist_entry *pair = hist_entry__next_pair(he); struct hist_entry *pair = hist_entry__next_pair(he);
const char *fmt = symbol_conf.field_sep ? "%s" : "%14s"; const char *fmt = symbol_conf.field_sep ? "%s" : "%14s";
...@@ -291,19 +310,22 @@ static int hpp__entry_ratio(struct perf_hpp *hpp, struct hist_entry *he) ...@@ -291,19 +310,22 @@ static int hpp__entry_ratio(struct perf_hpp *hpp, struct hist_entry *he)
return scnprintf(hpp->buf, hpp->size, fmt, buf); return scnprintf(hpp->buf, hpp->size, fmt, buf);
} }
static int hpp__header_wdiff(struct perf_hpp *hpp) static int hpp__header_wdiff(struct perf_hpp_fmt *_fmt __maybe_unused,
struct perf_hpp *hpp)
{ {
const char *fmt = symbol_conf.field_sep ? "%s" : "%14s"; const char *fmt = symbol_conf.field_sep ? "%s" : "%14s";
return scnprintf(hpp->buf, hpp->size, fmt, "Weighted diff"); return scnprintf(hpp->buf, hpp->size, fmt, "Weighted diff");
} }
static int hpp__width_wdiff(struct perf_hpp *hpp __maybe_unused) static int hpp__width_wdiff(struct perf_hpp_fmt *fmt __maybe_unused,
struct perf_hpp *hpp __maybe_unused)
{ {
return 14; return 14;
} }
static int hpp__entry_wdiff(struct perf_hpp *hpp, struct hist_entry *he) static int hpp__entry_wdiff(struct perf_hpp_fmt *_fmt __maybe_unused,
struct perf_hpp *hpp, struct hist_entry *he)
{ {
struct hist_entry *pair = hist_entry__next_pair(he); struct hist_entry *pair = hist_entry__next_pair(he);
const char *fmt = symbol_conf.field_sep ? "%s" : "%14s"; const char *fmt = symbol_conf.field_sep ? "%s" : "%14s";
...@@ -323,19 +345,22 @@ static int hpp__entry_wdiff(struct perf_hpp *hpp, struct hist_entry *he) ...@@ -323,19 +345,22 @@ static int hpp__entry_wdiff(struct perf_hpp *hpp, struct hist_entry *he)
return scnprintf(hpp->buf, hpp->size, fmt, buf); return scnprintf(hpp->buf, hpp->size, fmt, buf);
} }
static int hpp__header_formula(struct perf_hpp *hpp) static int hpp__header_formula(struct perf_hpp_fmt *_fmt __maybe_unused,
struct perf_hpp *hpp)
{ {
const char *fmt = symbol_conf.field_sep ? "%s" : "%70s"; const char *fmt = symbol_conf.field_sep ? "%s" : "%70s";
return scnprintf(hpp->buf, hpp->size, fmt, "Formula"); return scnprintf(hpp->buf, hpp->size, fmt, "Formula");
} }
static int hpp__width_formula(struct perf_hpp *hpp __maybe_unused) static int hpp__width_formula(struct perf_hpp_fmt *fmt __maybe_unused,
struct perf_hpp *hpp __maybe_unused)
{ {
return 70; return 70;
} }
static int hpp__entry_formula(struct perf_hpp *hpp, struct hist_entry *he) static int hpp__entry_formula(struct perf_hpp_fmt *_fmt __maybe_unused,
struct perf_hpp *hpp, struct hist_entry *he)
{ {
struct hist_entry *pair = hist_entry__next_pair(he); struct hist_entry *pair = hist_entry__next_pair(he);
const char *fmt = symbol_conf.field_sep ? "%s" : "%-70s"; const char *fmt = symbol_conf.field_sep ? "%s" : "%-70s";
...@@ -454,9 +479,9 @@ int hist_entry__period_snprintf(struct perf_hpp *hpp, struct hist_entry *he, ...@@ -454,9 +479,9 @@ int hist_entry__period_snprintf(struct perf_hpp *hpp, struct hist_entry *he,
first = false; first = false;
if (color && fmt->color) if (color && fmt->color)
ret = fmt->color(hpp, he); ret = fmt->color(fmt, hpp, he);
else else
ret = fmt->entry(hpp, he); ret = fmt->entry(fmt, hpp, he);
advance_hpp(hpp, ret); advance_hpp(hpp, ret);
} }
...@@ -499,7 +524,7 @@ unsigned int hists__sort_list_width(struct hists *hists) ...@@ -499,7 +524,7 @@ unsigned int hists__sort_list_width(struct hists *hists)
if (i) if (i)
ret += 2; ret += 2;
ret += fmt->width(&dummy_hpp); ret += fmt->width(fmt, &dummy_hpp);
} }
list_for_each_entry(se, &hist_entry__sort_list, list) list_for_each_entry(se, &hist_entry__sort_list, list)
......
tools/perf/ui/stdio/hist.c
View file @ 2c5d4b4a
...@@ -365,7 +365,7 @@ size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows, ...@@ -365,7 +365,7 @@ size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows,
else else
first = false; first = false;
fmt->header(&dummy_hpp); fmt->header(fmt, &dummy_hpp);
fprintf(fp, "%s", bf); fprintf(fp, "%s", bf);
} }
...@@ -410,7 +410,7 @@ size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows, ...@@ -410,7 +410,7 @@ size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows,
else else
first = false; first = false;
width = fmt->width(&dummy_hpp); width = fmt->width(fmt, &dummy_hpp);
for (i = 0; i < width; i++) for (i = 0; i < width; i++)
fprintf(fp, "."); fprintf(fp, ".");
} }
......
tools/perf/util/hist.h
View file @ 2c5d4b4a
...@@ -141,10 +141,12 @@ struct perf_hpp { ...@@ -141,10 +141,12 @@ struct perf_hpp {
}; };
struct perf_hpp_fmt { struct perf_hpp_fmt {
int (*header)(struct perf_hpp *hpp); int (*header)(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp);
int (*width)(struct perf_hpp *hpp); int (*width)(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp);
int (*color)(struct perf_hpp *hpp, struct hist_entry *he); int (*color)(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,
int (*entry)(struct perf_hpp *hpp, struct hist_entry *he); struct hist_entry *he);
int (*entry)(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,
struct hist_entry *he);
struct list_head list; struct list_head list;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7