Skip to content

Commit

Permalink
perf hists: Rename and move some functions
Browse files Browse the repository at this point in the history 
Rename functions for consistency and move callchain print function
into hist_entry__fprintf().

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1345438331-20234-3-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Namhyung Kim authored and Arnaldo Carvalho de Melo committed Aug 20, 2012
1 parent 7ccf4f9 commit 000078b
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 27 deletions.
4 changes: 2 additions & 2 deletions tools/perf/ui/browsers/hists.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@ static int hist_browser__show_entry(struct hist_browser *browser,
}

if (row_offset == 0) {
hist_entry__snprintf(entry, s, sizeof(s), browser->hists);
hist_entry__sort_snprintf(entry, s, sizeof(s), browser->hists);
percent = (entry->period * 100.0) / browser->hists->stats.total_period;

ui_browser__set_percent_color(&browser->b, percent, current_entry);
Expand Down Expand Up @@ -931,7 +931,7 @@ static int hist_browser__fprintf_entry(struct hist_browser *browser,
if (symbol_conf.use_callchain)
folded_sign = hist_entry__folded(he);

hist_entry__snprintf(he, s, sizeof(s), browser->hists);
hist_entry__sort_snprintf(he, s, sizeof(s), browser->hists);
percent = (he->period * 100.0) / browser->hists->stats.total_period;

if (symbol_conf.use_callchain)
Expand Down
51 changes: 28 additions & 23 deletions tools/perf/ui/stdio/hist.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ static size_t hist_entry_callchain__fprintf(struct hist_entry *he,
return 0;
}

static int hist_entry__pcnt_snprintf(struct hist_entry *he, char *s,
static int hist_entry__period_snprintf(struct hist_entry *he, char *s,
size_t size, struct hists *pair_hists,
bool show_displacement, long displacement,
bool color, u64 total_period)
Expand Down Expand Up @@ -404,8 +404,8 @@ static int hist_entry__pcnt_snprintf(struct hist_entry *he, char *s,
return ret;
}

int hist_entry__snprintf(struct hist_entry *he, char *s, size_t size,
struct hists *hists)
int hist_entry__sort_snprintf(struct hist_entry *he, char *s, size_t size,
struct hists *hists)
{
const char *sep = symbol_conf.field_sep;
struct sort_entry *se;
Expand All @@ -423,6 +423,22 @@ int hist_entry__snprintf(struct hist_entry *he, char *s, size_t size,
return ret;
}

static size_t hist_entry__callchain_fprintf(struct hist_entry *he,
struct hists *hists,
u64 total_period, FILE *fp)
{
int left_margin = 0;

if (sort__first_dimension == SORT_COMM) {
struct sort_entry *se = list_first_entry(&hist_entry__sort_list,
typeof(*se), list);
left_margin = hists__col_len(hists, se->se_width_idx);
left_margin -= thread__comm_len(he->thread);
}

return hist_entry_callchain__fprintf(he, total_period, left_margin, fp);
}

static int hist_entry__fprintf(struct hist_entry *he, size_t size,
struct hists *hists, struct hists *pair_hists,
bool show_displacement, long displacement,
Expand All @@ -434,27 +450,18 @@ static int hist_entry__fprintf(struct hist_entry *he, size_t size,
if (size == 0 || size > sizeof(bf))
size = sizeof(bf);

ret = hist_entry__pcnt_snprintf(he, bf, size, pair_hists,
show_displacement, displacement,
true, total_period);
hist_entry__snprintf(he, bf + ret, size - ret, hists);
return fprintf(fp, "%s\n", bf);
}
ret = hist_entry__period_snprintf(he, bf, size, pair_hists,
show_displacement, displacement,
true, total_period);
hist_entry__sort_snprintf(he, bf + ret, size - ret, hists);

static size_t hist_entry__fprintf_callchain(struct hist_entry *he,
struct hists *hists,
u64 total_period, FILE *fp)
{
int left_margin = 0;
ret = fprintf(fp, "%s\n", bf);

if (sort__first_dimension == SORT_COMM) {
struct sort_entry *se = list_first_entry(&hist_entry__sort_list,
typeof(*se), list);
left_margin = hists__col_len(hists, se->se_width_idx);
left_margin -= thread__comm_len(he->thread);
}
if (symbol_conf.use_callchain)
ret += hist_entry__callchain_fprintf(he, hists,
total_period, fp);

return hist_entry_callchain__fprintf(he, total_period, left_margin, fp);
return ret;
}

size_t hists__fprintf(struct hists *hists, struct hists *pair,
Expand Down Expand Up @@ -608,8 +615,6 @@ size_t hists__fprintf(struct hists *hists, struct hists *pair,
ret += hist_entry__fprintf(h, max_cols, hists, pair, show_displacement,
displacement, total_period, fp);

if (symbol_conf.use_callchain)
ret += hist_entry__fprintf_callchain(h, hists, total_period, fp);
if (max_rows && ++nr_rows >= max_rows)
goto out;

Expand Down
4 changes: 2 additions & 2 deletions tools/perf/util/hist.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ struct hist_entry *__hists__add_entry(struct hists *self,
struct symbol *parent, u64 period);
int64_t hist_entry__cmp(struct hist_entry *left, struct hist_entry *right);
int64_t hist_entry__collapse(struct hist_entry *left, struct hist_entry *right);
int hist_entry__snprintf(struct hist_entry *self, char *bf, size_t size,
struct hists *hists);
int hist_entry__sort_snprintf(struct hist_entry *self, char *bf, size_t size,
struct hists *hists);
void hist_entry__free(struct hist_entry *);

struct hist_entry *__hists__add_branch_entry(struct hists *self,
Expand Down

0 comments on commit 000078b

Please sign in to comment.