| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20120809191827.GE4084@infradead.org>
Date: Thu, 9 Aug 2012 16:18:27 -0300
From: Arnaldo Carvalho de Melo <acme@...stprotocols.net>
To: Namhyung Kim <namhyung@...nel.org>
Cc: Peter Zijlstra <a.p.zijlstra@...llo.nl>,
Paul Mackerras <paulus@...ba.org>,
Ingo Molnar <mingo@...nel.org>,
LKML <linux-kernel@...r.kernel.org>,
Stephane Eranian <eranian@...gle.com>,
Pekka Enberg <penberg@...nel.org>,
Namhyung Kim <namhyung.kim@....com>
Subject: Re: [PATCH 1/7] perf hists: Separate out hist print functions
Em Mon, Aug 06, 2012 at 05:57:36PM +0900, Namhyung Kim escreveu:
> From: Namhyung Kim <namhyung.kim@....com>
>
> Separate out those functions into ui/hist.c. This is required for
> upcoming changes.
Isn't it better to further separate it by introducing the ui/stdio/
directory since these functions use fprintf?
- Arnaldo
> Signed-off-by: Namhyung Kim <namhyung@...nel.org>
> ---
> tools/perf/Makefile | 4 +-
> tools/perf/ui/hist.c | 648 ++++++++++++++++++++++++++++++++++++++++++++++
> tools/perf/util/hist.c | 677 ++-----------------------------------------------
> tools/perf/util/hist.h | 2 +
> 4 files changed, 670 insertions(+), 661 deletions(-)
> create mode 100644 tools/perf/ui/hist.c
>
> diff --git a/tools/perf/Makefile b/tools/perf/Makefile
> index 35655c3a7b7a..49cff288ac24 100644
> --- a/tools/perf/Makefile
> +++ b/tools/perf/Makefile
> @@ -388,10 +388,10 @@ LIB_OBJS += $(OUTPUT)util/target.o
> LIB_OBJS += $(OUTPUT)util/rblist.o
> LIB_OBJS += $(OUTPUT)util/intlist.o
>
> -BUILTIN_OBJS += $(OUTPUT)builtin-annotate.o
> +LIB_OBJS += $(OUTPUT)ui/hist.o
>
> +BUILTIN_OBJS += $(OUTPUT)builtin-annotate.o
> BUILTIN_OBJS += $(OUTPUT)builtin-bench.o
> -
> # Benchmark modules
> BUILTIN_OBJS += $(OUTPUT)bench/sched-messaging.o
> BUILTIN_OBJS += $(OUTPUT)bench/sched-pipe.o
> diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
> new file mode 100644
> index 000000000000..b7936dc6271f
> --- /dev/null
> +++ b/tools/perf/ui/hist.c
> @@ -0,0 +1,648 @@
> +#include <stdio.h>
> +#include <math.h>
> +
> +#include "../util/util.h"
> +#include "../util/hist.h"
> +#include "../util/sort.h"
> +
> +
> +static size_t callchain__fprintf_left_margin(FILE *fp, int left_margin)
> +{
> + int i;
> + int ret = fprintf(fp, " ");
> +
> + for (i = 0; i < left_margin; i++)
> + ret += fprintf(fp, " ");
> +
> + return ret;
> +}
> +
> +static size_t ipchain__fprintf_graph_line(FILE *fp, int depth, int depth_mask,
> + int left_margin)
> +{
> + int i;
> + size_t ret = callchain__fprintf_left_margin(fp, left_margin);
> +
> + for (i = 0; i < depth; i++)
> + if (depth_mask & (1 << i))
> + ret += fprintf(fp, "| ");
> + else
> + ret += fprintf(fp, " ");
> +
> + ret += fprintf(fp, "\n");
> +
> + return ret;
> +}
> +
> +static size_t ipchain__fprintf_graph(FILE *fp, struct callchain_list *chain,
> + int depth, int depth_mask, int period,
> + u64 total_samples, u64 hits,
> + int left_margin)
> +{
> + int i;
> + size_t ret = 0;
> +
> + ret += callchain__fprintf_left_margin(fp, left_margin);
> + for (i = 0; i < depth; i++) {
> + if (depth_mask & (1 << i))
> + ret += fprintf(fp, "|");
> + else
> + ret += fprintf(fp, " ");
> + if (!period && i == depth - 1) {
> + double percent;
> +
> + percent = hits * 100.0 / total_samples;
> + ret += percent_color_fprintf(fp, "--%2.2f%%-- ", percent);
> + } else
> + ret += fprintf(fp, "%s", " ");
> + }
> + if (chain->ms.sym)
> + ret += fprintf(fp, "%s\n", chain->ms.sym->name);
> + else
> + ret += fprintf(fp, "0x%0" PRIx64 "\n", chain->ip);
> +
> + return ret;
> +}
> +
> +static struct symbol *rem_sq_bracket;
> +static struct callchain_list rem_hits;
> +
> +static void init_rem_hits(void)
> +{
> + rem_sq_bracket = malloc(sizeof(*rem_sq_bracket) + 6);
> + if (!rem_sq_bracket) {
> + fprintf(stderr, "Not enough memory to display remaining hits\n");
> + return;
> + }
> +
> + strcpy(rem_sq_bracket->name, "[...]");
> + rem_hits.ms.sym = rem_sq_bracket;
> +}
> +
> +static size_t __callchain__fprintf_graph(FILE *fp, struct rb_root *root,
> + u64 total_samples, int depth,
> + int depth_mask, int left_margin)
> +{
> + struct rb_node *node, *next;
> + struct callchain_node *child;
> + struct callchain_list *chain;
> + int new_depth_mask = depth_mask;
> + u64 remaining;
> + size_t ret = 0;
> + int i;
> + uint entries_printed = 0;
> +
> + remaining = total_samples;
> +
> + node = rb_first(root);
> + while (node) {
> + u64 new_total;
> + u64 cumul;
> +
> + child = rb_entry(node, struct callchain_node, rb_node);
> + cumul = callchain_cumul_hits(child);
> + remaining -= cumul;
> +
> + /*
> + * The depth mask manages the output of pipes that show
> + * the depth. We don't want to keep the pipes of the current
> + * level for the last child of this depth.
> + * Except if we have remaining filtered hits. They will
> + * supersede the last child
> + */
> + next = rb_next(node);
> + if (!next && (callchain_param.mode != CHAIN_GRAPH_REL || !remaining))
> + new_depth_mask &= ~(1 << (depth - 1));
> +
> + /*
> + * But we keep the older depth mask for the line separator
> + * to keep the level link until we reach the last child
> + */
> + ret += ipchain__fprintf_graph_line(fp, depth, depth_mask,
> + left_margin);
> + i = 0;
> + list_for_each_entry(chain, &child->val, list) {
> + ret += ipchain__fprintf_graph(fp, chain, depth,
> + new_depth_mask, i++,
> + total_samples,
> + cumul,
> + left_margin);
> + }
> +
> + if (callchain_param.mode == CHAIN_GRAPH_REL)
> + new_total = child->children_hit;
> + else
> + new_total = total_samples;
> +
> + ret += __callchain__fprintf_graph(fp, &child->rb_root, new_total,
> + depth + 1,
> + new_depth_mask | (1 << depth),
> + left_margin);
> + node = next;
> + if (++entries_printed == callchain_param.print_limit)
> + break;
> + }
> +
> + if (callchain_param.mode == CHAIN_GRAPH_REL &&
> + remaining && remaining != total_samples) {
> +
> + if (!rem_sq_bracket)
> + return ret;
> +
> + new_depth_mask &= ~(1 << (depth - 1));
> + ret += ipchain__fprintf_graph(fp, &rem_hits, depth,
> + new_depth_mask, 0, total_samples,
> + remaining, left_margin);
> + }
> +
> + return ret;
> +}
> +
> +static size_t callchain__fprintf_graph(FILE *fp, struct rb_root *root,
> + u64 total_samples, int left_margin)
> +{
> + struct callchain_node *cnode;
> + struct callchain_list *chain;
> + u32 entries_printed = 0;
> + bool printed = false;
> + struct rb_node *node;
> + int i = 0;
> + int ret = 0;
> +
> + /*
> + * If have one single callchain root, don't bother printing
> + * its percentage (100 % in fractal mode and the same percentage
> + * than the hist in graph mode). This also avoid one level of column.
> + */
> + node = rb_first(root);
> + if (node && !rb_next(node)) {
> + cnode = rb_entry(node, struct callchain_node, rb_node);
> + list_for_each_entry(chain, &cnode->val, list) {
> + /*
> + * If we sort by symbol, the first entry is the same than
> + * the symbol. No need to print it otherwise it appears as
> + * displayed twice.
> + */
> + if (!i++ && sort__first_dimension == SORT_SYM)
> + continue;
> + if (!printed) {
> + ret += callchain__fprintf_left_margin(fp, left_margin);
> + ret += fprintf(fp, "|\n");
> + ret += callchain__fprintf_left_margin(fp, left_margin);
> + ret += fprintf(fp, "---");
> + left_margin += 3;
> + printed = true;
> + } else
> + ret += callchain__fprintf_left_margin(fp, left_margin);
> +
> + if (chain->ms.sym)
> + ret += fprintf(fp, " %s\n", chain->ms.sym->name);
> + else
> + ret += fprintf(fp, " %p\n", (void *)(long)chain->ip);
> +
> + if (++entries_printed == callchain_param.print_limit)
> + break;
> + }
> + root = &cnode->rb_root;
> + }
> +
> + ret += __callchain__fprintf_graph(fp, root, total_samples,
> + 1, 1, left_margin);
> + ret += fprintf(fp, "\n");
> +
> + return ret;
> +}
> +
> +static size_t __callchain__fprintf_flat(FILE *fp,
> + struct callchain_node *self,
> + u64 total_samples)
> +{
> + struct callchain_list *chain;
> + size_t ret = 0;
> +
> + if (!self)
> + return 0;
> +
> + ret += __callchain__fprintf_flat(fp, self->parent, total_samples);
> +
> +
> + list_for_each_entry(chain, &self->val, list) {
> + if (chain->ip >= PERF_CONTEXT_MAX)
> + continue;
> + if (chain->ms.sym)
> + ret += fprintf(fp, " %s\n", chain->ms.sym->name);
> + else
> + ret += fprintf(fp, " %p\n",
> + (void *)(long)chain->ip);
> + }
> +
> + return ret;
> +}
> +
> +static size_t callchain__fprintf_flat(FILE *fp, struct rb_root *self,
> + u64 total_samples)
> +{
> + size_t ret = 0;
> + u32 entries_printed = 0;
> + struct rb_node *rb_node;
> + struct callchain_node *chain;
> +
> + rb_node = rb_first(self);
> + while (rb_node) {
> + double percent;
> +
> + chain = rb_entry(rb_node, struct callchain_node, rb_node);
> + percent = chain->hit * 100.0 / total_samples;
> +
> + ret = percent_color_fprintf(fp, " %6.2f%%\n", percent);
> + ret += __callchain__fprintf_flat(fp, chain, total_samples);
> + ret += fprintf(fp, "\n");
> + if (++entries_printed == callchain_param.print_limit)
> + break;
> +
> + rb_node = rb_next(rb_node);
> + }
> +
> + return ret;
> +}
> +
> +static size_t hist_entry_callchain__fprintf(struct hist_entry *he,
> + u64 total_samples, int left_margin,
> + FILE *fp)
> +{
> + switch (callchain_param.mode) {
> + case CHAIN_GRAPH_REL:
> + return callchain__fprintf_graph(fp, &he->sorted_chain, he->period,
> + left_margin);
> + break;
> + case CHAIN_GRAPH_ABS:
> + return callchain__fprintf_graph(fp, &he->sorted_chain, total_samples,
> + left_margin);
> + break;
> + case CHAIN_FLAT:
> + return callchain__fprintf_flat(fp, &he->sorted_chain, total_samples);
> + break;
> + case CHAIN_NONE:
> + break;
> + default:
> + pr_err("Bad callchain mode\n");
> + }
> +
> + return 0;
> +}
> +
> +static int hist_entry__pcnt_snprintf(struct hist_entry *he, char *s,
> + size_t size, struct hists *pair_hists,
> + bool show_displacement, long displacement,
> + bool color, u64 total_period)
> +{
> + u64 period, total, period_sys, period_us, period_guest_sys, period_guest_us;
> + u64 nr_events;
> + const char *sep = symbol_conf.field_sep;
> + int ret;
> +
> + if (symbol_conf.exclude_other && !he->parent)
> + return 0;
> +
> + if (pair_hists) {
> + period = he->pair ? he->pair->period : 0;
> + nr_events = he->pair ? he->pair->nr_events : 0;
> + total = pair_hists->stats.total_period;
> + period_sys = he->pair ? he->pair->period_sys : 0;
> + period_us = he->pair ? he->pair->period_us : 0;
> + period_guest_sys = he->pair ? he->pair->period_guest_sys : 0;
> + period_guest_us = he->pair ? he->pair->period_guest_us : 0;
> + } else {
> + period = he->period;
> + nr_events = he->nr_events;
> + total = total_period;
> + period_sys = he->period_sys;
> + period_us = he->period_us;
> + period_guest_sys = he->period_guest_sys;
> + period_guest_us = he->period_guest_us;
> + }
> +
> + if (total) {
> + if (color)
> + ret = percent_color_snprintf(s, size,
> + sep ? "%.2f" : " %6.2f%%",
> + (period * 100.0) / total);
> + else
> + ret = scnprintf(s, size, sep ? "%.2f" : " %6.2f%%",
> + (period * 100.0) / total);
> + if (symbol_conf.show_cpu_utilization) {
> + ret += percent_color_snprintf(s + ret, size - ret,
> + sep ? "%.2f" : " %6.2f%%",
> + (period_sys * 100.0) / total);
> + ret += percent_color_snprintf(s + ret, size - ret,
> + sep ? "%.2f" : " %6.2f%%",
> + (period_us * 100.0) / total);
> + if (perf_guest) {
> + ret += percent_color_snprintf(s + ret,
> + size - ret,
> + sep ? "%.2f" : " %6.2f%%",
> + (period_guest_sys * 100.0) /
> + total);
> + ret += percent_color_snprintf(s + ret,
> + size - ret,
> + sep ? "%.2f" : " %6.2f%%",
> + (period_guest_us * 100.0) /
> + total);
> + }
> + }
> + } else
> + ret = scnprintf(s, size, sep ? "%" PRIu64 : "%12" PRIu64 " ", period);
> +
> + if (symbol_conf.show_nr_samples) {
> + if (sep)
> + ret += scnprintf(s + ret, size - ret, "%c%" PRIu64, *sep, nr_events);
> + else
> + ret += scnprintf(s + ret, size - ret, "%11" PRIu64, nr_events);
> + }
> +
> + if (symbol_conf.show_total_period) {
> + if (sep)
> + ret += scnprintf(s + ret, size - ret, "%c%" PRIu64, *sep, period);
> + else
> + ret += scnprintf(s + ret, size - ret, " %12" PRIu64, period);
> + }
> +
> + if (pair_hists) {
> + char bf[32];
> + double old_percent = 0, new_percent = 0, diff;
> +
> + if (total > 0)
> + old_percent = (period * 100.0) / total;
> + if (total_period > 0)
> + new_percent = (he->period * 100.0) / total_period;
> +
> + diff = new_percent - old_percent;
> +
> + if (fabs(diff) >= 0.01)
> + scnprintf(bf, sizeof(bf), "%+4.2F%%", diff);
> + else
> + scnprintf(bf, sizeof(bf), " ");
> +
> + if (sep)
> + ret += scnprintf(s + ret, size - ret, "%c%s", *sep, bf);
> + else
> + ret += scnprintf(s + ret, size - ret, "%11.11s", bf);
> +
> + if (show_displacement) {
> + if (displacement)
> + scnprintf(bf, sizeof(bf), "%+4ld", displacement);
> + else
> + scnprintf(bf, sizeof(bf), " ");
> +
> + if (sep)
> + ret += scnprintf(s + ret, size - ret, "%c%s", *sep, bf);
> + else
> + ret += scnprintf(s + ret, size - ret, "%6.6s", bf);
> + }
> + }
> +
> + return ret;
> +}
> +
> +int hist_entry__snprintf(struct hist_entry *he, char *s, size_t size,
> + struct hists *hists)
> +{
> + const char *sep = symbol_conf.field_sep;
> + struct sort_entry *se;
> + int ret = 0;
> +
> + list_for_each_entry(se, &hist_entry__sort_list, list) {
> + if (se->elide)
> + continue;
> +
> + ret += scnprintf(s + ret, size - ret, "%s", sep ?: " ");
> + ret += se->se_snprintf(he, s + ret, size - ret,
> + hists__col_len(hists, se->se_width_idx));
> + }
> +
> + return ret;
> +}
> +
> +static int hist_entry__fprintf(struct hist_entry *he, size_t size,
> + struct hists *hists, struct hists *pair_hists,
> + bool show_displacement, long displacement,
> + u64 total_period, FILE *fp)
> +{
> + char bf[512];
> + int ret;
> +
> + 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);
> +}
> +
> +static size_t hist_entry__fprintf_callchain(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);
> +}
> +
> +size_t hists__fprintf(struct hists *hists, struct hists *pair,
> + bool show_displacement, bool show_header, int max_rows,
> + int max_cols, FILE *fp)
> +{
> + struct sort_entry *se;
> + struct rb_node *nd;
> + size_t ret = 0;
> + u64 total_period;
> + unsigned long position = 1;
> + long displacement = 0;
> + unsigned int width;
> + const char *sep = symbol_conf.field_sep;
> + const char *col_width = symbol_conf.col_width_list_str;
> + int nr_rows = 0;
> +
> + init_rem_hits();
> +
> + if (!show_header)
> + goto print_entries;
> +
> + fprintf(fp, "# %s", pair ? "Baseline" : "Overhead");
> +
> + if (symbol_conf.show_cpu_utilization) {
> + if (sep) {
> + ret += fprintf(fp, "%csys", *sep);
> + ret += fprintf(fp, "%cus", *sep);
> + if (perf_guest) {
> + ret += fprintf(fp, "%cguest sys", *sep);
> + ret += fprintf(fp, "%cguest us", *sep);
> + }
> + } else {
> + ret += fprintf(fp, " sys ");
> + ret += fprintf(fp, " us ");
> + if (perf_guest) {
> + ret += fprintf(fp, " guest sys ");
> + ret += fprintf(fp, " guest us ");
> + }
> + }
> + }
> +
> + if (symbol_conf.show_nr_samples) {
> + if (sep)
> + fprintf(fp, "%cSamples", *sep);
> + else
> + fputs(" Samples ", fp);
> + }
> +
> + if (symbol_conf.show_total_period) {
> + if (sep)
> + ret += fprintf(fp, "%cPeriod", *sep);
> + else
> + ret += fprintf(fp, " Period ");
> + }
> +
> + if (pair) {
> + if (sep)
> + ret += fprintf(fp, "%cDelta", *sep);
> + else
> + ret += fprintf(fp, " Delta ");
> +
> + if (show_displacement) {
> + if (sep)
> + ret += fprintf(fp, "%cDisplacement", *sep);
> + else
> + ret += fprintf(fp, " Displ");
> + }
> + }
> +
> + list_for_each_entry(se, &hist_entry__sort_list, list) {
> + if (se->elide)
> + continue;
> + if (sep) {
> + fprintf(fp, "%c%s", *sep, se->se_header);
> + continue;
> + }
> + width = strlen(se->se_header);
> + if (symbol_conf.col_width_list_str) {
> + if (col_width) {
> + hists__set_col_len(hists, se->se_width_idx,
> + atoi(col_width));
> + col_width = strchr(col_width, ',');
> + if (col_width)
> + ++col_width;
> + }
> + }
> + if (!hists__new_col_len(hists, se->se_width_idx, width))
> + width = hists__col_len(hists, se->se_width_idx);
> + fprintf(fp, " %*s", width, se->se_header);
> + }
> +
> + fprintf(fp, "\n");
> + if (max_rows && ++nr_rows >= max_rows)
> + goto out;
> +
> + if (sep)
> + goto print_entries;
> +
> + fprintf(fp, "# ........");
> + if (symbol_conf.show_cpu_utilization)
> + fprintf(fp, " ....... .......");
> + if (symbol_conf.show_nr_samples)
> + fprintf(fp, " ..........");
> + if (symbol_conf.show_total_period)
> + fprintf(fp, " ............");
> + if (pair) {
> + fprintf(fp, " ..........");
> + if (show_displacement)
> + fprintf(fp, " .....");
> + }
> + list_for_each_entry(se, &hist_entry__sort_list, list) {
> + unsigned int i;
> +
> + if (se->elide)
> + continue;
> +
> + fprintf(fp, " ");
> + width = hists__col_len(hists, se->se_width_idx);
> + if (width == 0)
> + width = strlen(se->se_header);
> + for (i = 0; i < width; i++)
> + fprintf(fp, ".");
> + }
> +
> + fprintf(fp, "\n");
> + if (max_rows && ++nr_rows >= max_rows)
> + goto out;
> +
> + fprintf(fp, "#\n");
> + if (max_rows && ++nr_rows >= max_rows)
> + goto out;
> +
> +print_entries:
> + total_period = hists->stats.total_period;
> +
> + for (nd = rb_first(&hists->entries); nd; nd = rb_next(nd)) {
> + struct hist_entry *h = rb_entry(nd, struct hist_entry, rb_node);
> +
> + if (h->filtered)
> + continue;
> +
> + if (show_displacement) {
> + if (h->pair != NULL)
> + displacement = ((long)h->pair->position -
> + (long)position);
> + else
> + displacement = 0;
> + ++position;
> + }
> + 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;
> +
> + if (h->ms.map == NULL && verbose > 1) {
> + __map_groups__fprintf_maps(&h->thread->mg,
> + MAP__FUNCTION, verbose, fp);
> + fprintf(fp, "%.10s end\n", graph_dotted_line);
> + }
> + }
> +out:
> + free(rem_sq_bracket);
> +
> + return ret;
> +}
> +
> +size_t hists__fprintf_nr_events(struct hists *hists, FILE *fp)
> +{
> + int i;
> + size_t ret = 0;
> +
> + for (i = 0; i < PERF_RECORD_HEADER_MAX; ++i) {
> + const char *name;
> +
> + if (hists->stats.nr_events[i] == 0)
> + continue;
> +
> + name = perf_event__name(i);
> + if (!strcmp(name, "UNKNOWN"))
> + continue;
> +
> + ret += fprintf(fp, "%16s events: %10d\n", name,
> + hists->stats.nr_events[i]);
> + }
> +
> + return ret;
> +}
> diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
> index f247ef2789a4..b1817f15bb87 100644
> --- a/tools/perf/util/hist.c
> +++ b/tools/perf/util/hist.c
> @@ -45,7 +45,7 @@ bool hists__new_col_len(struct hists *hists, enum hist_column col, u16 len)
> return false;
> }
>
> -static void hists__reset_col_len(struct hists *hists)
> +void hists__reset_col_len(struct hists *hists)
> {
> enum hist_column col;
>
> @@ -63,7 +63,7 @@ static void hists__set_unres_dso_col_len(struct hists *hists, int dso)
> hists__set_col_len(hists, dso, unresolved_col_width);
> }
>
> -static void hists__calc_col_len(struct hists *hists, struct hist_entry *h)
> +void hists__calc_col_len(struct hists *hists, struct hist_entry *h)
> {
> const unsigned int unresolved_col_width = BITS_PER_LONG / 4;
> u16 len;
> @@ -114,6 +114,22 @@ static void hists__calc_col_len(struct hists *hists, struct hist_entry *h)
> }
> }
>
> +void hists__output_recalc_col_len(struct hists *hists, int max_rows)
> +{
> + struct rb_node *next = rb_first(&hists->entries);
> + struct hist_entry *n;
> + int row = 0;
> +
> + hists__reset_col_len(hists);
> +
> + while (next && row++ < max_rows) {
> + n = rb_entry(next, struct hist_entry, rb_node);
> + if (!n->filtered)
> + hists__calc_col_len(hists, n);
> + next = rb_next(&n->rb_node);
> + }
> +}
> +
> static void hist_entry__add_cpumode_period(struct hist_entry *he,
> unsigned int cpumode, u64 period)
> {
> @@ -547,641 +563,6 @@ void hists__output_resort_threaded(struct hists *hists)
> return __hists__output_resort(hists, true);
> }
>
> -static size_t callchain__fprintf_left_margin(FILE *fp, int left_margin)
> -{
> - int i;
> - int ret = fprintf(fp, " ");
> -
> - for (i = 0; i < left_margin; i++)
> - ret += fprintf(fp, " ");
> -
> - return ret;
> -}
> -
> -static size_t ipchain__fprintf_graph_line(FILE *fp, int depth, int depth_mask,
> - int left_margin)
> -{
> - int i;
> - size_t ret = callchain__fprintf_left_margin(fp, left_margin);
> -
> - for (i = 0; i < depth; i++)
> - if (depth_mask & (1 << i))
> - ret += fprintf(fp, "| ");
> - else
> - ret += fprintf(fp, " ");
> -
> - ret += fprintf(fp, "\n");
> -
> - return ret;
> -}
> -
> -static size_t ipchain__fprintf_graph(FILE *fp, struct callchain_list *chain,
> - int depth, int depth_mask, int period,
> - u64 total_samples, u64 hits,
> - int left_margin)
> -{
> - int i;
> - size_t ret = 0;
> -
> - ret += callchain__fprintf_left_margin(fp, left_margin);
> - for (i = 0; i < depth; i++) {
> - if (depth_mask & (1 << i))
> - ret += fprintf(fp, "|");
> - else
> - ret += fprintf(fp, " ");
> - if (!period && i == depth - 1) {
> - double percent;
> -
> - percent = hits * 100.0 / total_samples;
> - ret += percent_color_fprintf(fp, "--%2.2f%%-- ", percent);
> - } else
> - ret += fprintf(fp, "%s", " ");
> - }
> - if (chain->ms.sym)
> - ret += fprintf(fp, "%s\n", chain->ms.sym->name);
> - else
> - ret += fprintf(fp, "0x%0" PRIx64 "\n", chain->ip);
> -
> - return ret;
> -}
> -
> -static struct symbol *rem_sq_bracket;
> -static struct callchain_list rem_hits;
> -
> -static void init_rem_hits(void)
> -{
> - rem_sq_bracket = malloc(sizeof(*rem_sq_bracket) + 6);
> - if (!rem_sq_bracket) {
> - fprintf(stderr, "Not enough memory to display remaining hits\n");
> - return;
> - }
> -
> - strcpy(rem_sq_bracket->name, "[...]");
> - rem_hits.ms.sym = rem_sq_bracket;
> -}
> -
> -static size_t __callchain__fprintf_graph(FILE *fp, struct rb_root *root,
> - u64 total_samples, int depth,
> - int depth_mask, int left_margin)
> -{
> - struct rb_node *node, *next;
> - struct callchain_node *child;
> - struct callchain_list *chain;
> - int new_depth_mask = depth_mask;
> - u64 remaining;
> - size_t ret = 0;
> - int i;
> - uint entries_printed = 0;
> -
> - remaining = total_samples;
> -
> - node = rb_first(root);
> - while (node) {
> - u64 new_total;
> - u64 cumul;
> -
> - child = rb_entry(node, struct callchain_node, rb_node);
> - cumul = callchain_cumul_hits(child);
> - remaining -= cumul;
> -
> - /*
> - * The depth mask manages the output of pipes that show
> - * the depth. We don't want to keep the pipes of the current
> - * level for the last child of this depth.
> - * Except if we have remaining filtered hits. They will
> - * supersede the last child
> - */
> - next = rb_next(node);
> - if (!next && (callchain_param.mode != CHAIN_GRAPH_REL || !remaining))
> - new_depth_mask &= ~(1 << (depth - 1));
> -
> - /*
> - * But we keep the older depth mask for the line separator
> - * to keep the level link until we reach the last child
> - */
> - ret += ipchain__fprintf_graph_line(fp, depth, depth_mask,
> - left_margin);
> - i = 0;
> - list_for_each_entry(chain, &child->val, list) {
> - ret += ipchain__fprintf_graph(fp, chain, depth,
> - new_depth_mask, i++,
> - total_samples,
> - cumul,
> - left_margin);
> - }
> -
> - if (callchain_param.mode == CHAIN_GRAPH_REL)
> - new_total = child->children_hit;
> - else
> - new_total = total_samples;
> -
> - ret += __callchain__fprintf_graph(fp, &child->rb_root, new_total,
> - depth + 1,
> - new_depth_mask | (1 << depth),
> - left_margin);
> - node = next;
> - if (++entries_printed == callchain_param.print_limit)
> - break;
> - }
> -
> - if (callchain_param.mode == CHAIN_GRAPH_REL &&
> - remaining && remaining != total_samples) {
> -
> - if (!rem_sq_bracket)
> - return ret;
> -
> - new_depth_mask &= ~(1 << (depth - 1));
> - ret += ipchain__fprintf_graph(fp, &rem_hits, depth,
> - new_depth_mask, 0, total_samples,
> - remaining, left_margin);
> - }
> -
> - return ret;
> -}
> -
> -static size_t callchain__fprintf_graph(FILE *fp, struct rb_root *root,
> - u64 total_samples, int left_margin)
> -{
> - struct callchain_node *cnode;
> - struct callchain_list *chain;
> - u32 entries_printed = 0;
> - bool printed = false;
> - struct rb_node *node;
> - int i = 0;
> - int ret = 0;
> -
> - /*
> - * If have one single callchain root, don't bother printing
> - * its percentage (100 % in fractal mode and the same percentage
> - * than the hist in graph mode). This also avoid one level of column.
> - */
> - node = rb_first(root);
> - if (node && !rb_next(node)) {
> - cnode = rb_entry(node, struct callchain_node, rb_node);
> - list_for_each_entry(chain, &cnode->val, list) {
> - /*
> - * If we sort by symbol, the first entry is the same than
> - * the symbol. No need to print it otherwise it appears as
> - * displayed twice.
> - */
> - if (!i++ && sort__first_dimension == SORT_SYM)
> - continue;
> - if (!printed) {
> - ret += callchain__fprintf_left_margin(fp, left_margin);
> - ret += fprintf(fp, "|\n");
> - ret += callchain__fprintf_left_margin(fp, left_margin);
> - ret += fprintf(fp, "---");
> - left_margin += 3;
> - printed = true;
> - } else
> - ret += callchain__fprintf_left_margin(fp, left_margin);
> -
> - if (chain->ms.sym)
> - ret += fprintf(fp, " %s\n", chain->ms.sym->name);
> - else
> - ret += fprintf(fp, " %p\n", (void *)(long)chain->ip);
> -
> - if (++entries_printed == callchain_param.print_limit)
> - break;
> - }
> - root = &cnode->rb_root;
> - }
> -
> - ret += __callchain__fprintf_graph(fp, root, total_samples,
> - 1, 1, left_margin);
> - ret += fprintf(fp, "\n");
> -
> - return ret;
> -}
> -
> -static size_t __callchain__fprintf_flat(FILE *fp,
> - struct callchain_node *self,
> - u64 total_samples)
> -{
> - struct callchain_list *chain;
> - size_t ret = 0;
> -
> - if (!self)
> - return 0;
> -
> - ret += __callchain__fprintf_flat(fp, self->parent, total_samples);
> -
> -
> - list_for_each_entry(chain, &self->val, list) {
> - if (chain->ip >= PERF_CONTEXT_MAX)
> - continue;
> - if (chain->ms.sym)
> - ret += fprintf(fp, " %s\n", chain->ms.sym->name);
> - else
> - ret += fprintf(fp, " %p\n",
> - (void *)(long)chain->ip);
> - }
> -
> - return ret;
> -}
> -
> -static size_t callchain__fprintf_flat(FILE *fp, struct rb_root *self,
> - u64 total_samples)
> -{
> - size_t ret = 0;
> - u32 entries_printed = 0;
> - struct rb_node *rb_node;
> - struct callchain_node *chain;
> -
> - rb_node = rb_first(self);
> - while (rb_node) {
> - double percent;
> -
> - chain = rb_entry(rb_node, struct callchain_node, rb_node);
> - percent = chain->hit * 100.0 / total_samples;
> -
> - ret = percent_color_fprintf(fp, " %6.2f%%\n", percent);
> - ret += __callchain__fprintf_flat(fp, chain, total_samples);
> - ret += fprintf(fp, "\n");
> - if (++entries_printed == callchain_param.print_limit)
> - break;
> -
> - rb_node = rb_next(rb_node);
> - }
> -
> - return ret;
> -}
> -
> -static size_t hist_entry_callchain__fprintf(struct hist_entry *he,
> - u64 total_samples, int left_margin,
> - FILE *fp)
> -{
> - switch (callchain_param.mode) {
> - case CHAIN_GRAPH_REL:
> - return callchain__fprintf_graph(fp, &he->sorted_chain, he->period,
> - left_margin);
> - break;
> - case CHAIN_GRAPH_ABS:
> - return callchain__fprintf_graph(fp, &he->sorted_chain, total_samples,
> - left_margin);
> - break;
> - case CHAIN_FLAT:
> - return callchain__fprintf_flat(fp, &he->sorted_chain, total_samples);
> - break;
> - case CHAIN_NONE:
> - break;
> - default:
> - pr_err("Bad callchain mode\n");
> - }
> -
> - return 0;
> -}
> -
> -void hists__output_recalc_col_len(struct hists *hists, int max_rows)
> -{
> - struct rb_node *next = rb_first(&hists->entries);
> - struct hist_entry *n;
> - int row = 0;
> -
> - hists__reset_col_len(hists);
> -
> - while (next && row++ < max_rows) {
> - n = rb_entry(next, struct hist_entry, rb_node);
> - if (!n->filtered)
> - hists__calc_col_len(hists, n);
> - next = rb_next(&n->rb_node);
> - }
> -}
> -
> -static int hist_entry__pcnt_snprintf(struct hist_entry *he, char *s,
> - size_t size, struct hists *pair_hists,
> - bool show_displacement, long displacement,
> - bool color, u64 total_period)
> -{
> - u64 period, total, period_sys, period_us, period_guest_sys, period_guest_us;
> - u64 nr_events;
> - const char *sep = symbol_conf.field_sep;
> - int ret;
> -
> - if (symbol_conf.exclude_other && !he->parent)
> - return 0;
> -
> - if (pair_hists) {
> - period = he->pair ? he->pair->period : 0;
> - nr_events = he->pair ? he->pair->nr_events : 0;
> - total = pair_hists->stats.total_period;
> - period_sys = he->pair ? he->pair->period_sys : 0;
> - period_us = he->pair ? he->pair->period_us : 0;
> - period_guest_sys = he->pair ? he->pair->period_guest_sys : 0;
> - period_guest_us = he->pair ? he->pair->period_guest_us : 0;
> - } else {
> - period = he->period;
> - nr_events = he->nr_events;
> - total = total_period;
> - period_sys = he->period_sys;
> - period_us = he->period_us;
> - period_guest_sys = he->period_guest_sys;
> - period_guest_us = he->period_guest_us;
> - }
> -
> - if (total) {
> - if (color)
> - ret = percent_color_snprintf(s, size,
> - sep ? "%.2f" : " %6.2f%%",
> - (period * 100.0) / total);
> - else
> - ret = scnprintf(s, size, sep ? "%.2f" : " %6.2f%%",
> - (period * 100.0) / total);
> - if (symbol_conf.show_cpu_utilization) {
> - ret += percent_color_snprintf(s + ret, size - ret,
> - sep ? "%.2f" : " %6.2f%%",
> - (period_sys * 100.0) / total);
> - ret += percent_color_snprintf(s + ret, size - ret,
> - sep ? "%.2f" : " %6.2f%%",
> - (period_us * 100.0) / total);
> - if (perf_guest) {
> - ret += percent_color_snprintf(s + ret,
> - size - ret,
> - sep ? "%.2f" : " %6.2f%%",
> - (period_guest_sys * 100.0) /
> - total);
> - ret += percent_color_snprintf(s + ret,
> - size - ret,
> - sep ? "%.2f" : " %6.2f%%",
> - (period_guest_us * 100.0) /
> - total);
> - }
> - }
> - } else
> - ret = scnprintf(s, size, sep ? "%" PRIu64 : "%12" PRIu64 " ", period);
> -
> - if (symbol_conf.show_nr_samples) {
> - if (sep)
> - ret += scnprintf(s + ret, size - ret, "%c%" PRIu64, *sep, nr_events);
> - else
> - ret += scnprintf(s + ret, size - ret, "%11" PRIu64, nr_events);
> - }
> -
> - if (symbol_conf.show_total_period) {
> - if (sep)
> - ret += scnprintf(s + ret, size - ret, "%c%" PRIu64, *sep, period);
> - else
> - ret += scnprintf(s + ret, size - ret, " %12" PRIu64, period);
> - }
> -
> - if (pair_hists) {
> - char bf[32];
> - double old_percent = 0, new_percent = 0, diff;
> -
> - if (total > 0)
> - old_percent = (period * 100.0) / total;
> - if (total_period > 0)
> - new_percent = (he->period * 100.0) / total_period;
> -
> - diff = new_percent - old_percent;
> -
> - if (fabs(diff) >= 0.01)
> - scnprintf(bf, sizeof(bf), "%+4.2F%%", diff);
> - else
> - scnprintf(bf, sizeof(bf), " ");
> -
> - if (sep)
> - ret += scnprintf(s + ret, size - ret, "%c%s", *sep, bf);
> - else
> - ret += scnprintf(s + ret, size - ret, "%11.11s", bf);
> -
> - if (show_displacement) {
> - if (displacement)
> - scnprintf(bf, sizeof(bf), "%+4ld", displacement);
> - else
> - scnprintf(bf, sizeof(bf), " ");
> -
> - if (sep)
> - ret += scnprintf(s + ret, size - ret, "%c%s", *sep, bf);
> - else
> - ret += scnprintf(s + ret, size - ret, "%6.6s", bf);
> - }
> - }
> -
> - return ret;
> -}
> -
> -int hist_entry__snprintf(struct hist_entry *he, char *s, size_t size,
> - struct hists *hists)
> -{
> - const char *sep = symbol_conf.field_sep;
> - struct sort_entry *se;
> - int ret = 0;
> -
> - list_for_each_entry(se, &hist_entry__sort_list, list) {
> - if (se->elide)
> - continue;
> -
> - ret += scnprintf(s + ret, size - ret, "%s", sep ?: " ");
> - ret += se->se_snprintf(he, s + ret, size - ret,
> - hists__col_len(hists, se->se_width_idx));
> - }
> -
> - return ret;
> -}
> -
> -static int hist_entry__fprintf(struct hist_entry *he, size_t size,
> - struct hists *hists, struct hists *pair_hists,
> - bool show_displacement, long displacement,
> - u64 total_period, FILE *fp)
> -{
> - char bf[512];
> - int ret;
> -
> - 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);
> -}
> -
> -static size_t hist_entry__fprintf_callchain(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);
> -}
> -
> -size_t hists__fprintf(struct hists *hists, struct hists *pair,
> - bool show_displacement, bool show_header, int max_rows,
> - int max_cols, FILE *fp)
> -{
> - struct sort_entry *se;
> - struct rb_node *nd;
> - size_t ret = 0;
> - u64 total_period;
> - unsigned long position = 1;
> - long displacement = 0;
> - unsigned int width;
> - const char *sep = symbol_conf.field_sep;
> - const char *col_width = symbol_conf.col_width_list_str;
> - int nr_rows = 0;
> -
> - init_rem_hits();
> -
> - if (!show_header)
> - goto print_entries;
> -
> - fprintf(fp, "# %s", pair ? "Baseline" : "Overhead");
> -
> - if (symbol_conf.show_cpu_utilization) {
> - if (sep) {
> - ret += fprintf(fp, "%csys", *sep);
> - ret += fprintf(fp, "%cus", *sep);
> - if (perf_guest) {
> - ret += fprintf(fp, "%cguest sys", *sep);
> - ret += fprintf(fp, "%cguest us", *sep);
> - }
> - } else {
> - ret += fprintf(fp, " sys ");
> - ret += fprintf(fp, " us ");
> - if (perf_guest) {
> - ret += fprintf(fp, " guest sys ");
> - ret += fprintf(fp, " guest us ");
> - }
> - }
> - }
> -
> - if (symbol_conf.show_nr_samples) {
> - if (sep)
> - fprintf(fp, "%cSamples", *sep);
> - else
> - fputs(" Samples ", fp);
> - }
> -
> - if (symbol_conf.show_total_period) {
> - if (sep)
> - ret += fprintf(fp, "%cPeriod", *sep);
> - else
> - ret += fprintf(fp, " Period ");
> - }
> -
> - if (pair) {
> - if (sep)
> - ret += fprintf(fp, "%cDelta", *sep);
> - else
> - ret += fprintf(fp, " Delta ");
> -
> - if (show_displacement) {
> - if (sep)
> - ret += fprintf(fp, "%cDisplacement", *sep);
> - else
> - ret += fprintf(fp, " Displ");
> - }
> - }
> -
> - list_for_each_entry(se, &hist_entry__sort_list, list) {
> - if (se->elide)
> - continue;
> - if (sep) {
> - fprintf(fp, "%c%s", *sep, se->se_header);
> - continue;
> - }
> - width = strlen(se->se_header);
> - if (symbol_conf.col_width_list_str) {
> - if (col_width) {
> - hists__set_col_len(hists, se->se_width_idx,
> - atoi(col_width));
> - col_width = strchr(col_width, ',');
> - if (col_width)
> - ++col_width;
> - }
> - }
> - if (!hists__new_col_len(hists, se->se_width_idx, width))
> - width = hists__col_len(hists, se->se_width_idx);
> - fprintf(fp, " %*s", width, se->se_header);
> - }
> -
> - fprintf(fp, "\n");
> - if (max_rows && ++nr_rows >= max_rows)
> - goto out;
> -
> - if (sep)
> - goto print_entries;
> -
> - fprintf(fp, "# ........");
> - if (symbol_conf.show_cpu_utilization)
> - fprintf(fp, " ....... .......");
> - if (symbol_conf.show_nr_samples)
> - fprintf(fp, " ..........");
> - if (symbol_conf.show_total_period)
> - fprintf(fp, " ............");
> - if (pair) {
> - fprintf(fp, " ..........");
> - if (show_displacement)
> - fprintf(fp, " .....");
> - }
> - list_for_each_entry(se, &hist_entry__sort_list, list) {
> - unsigned int i;
> -
> - if (se->elide)
> - continue;
> -
> - fprintf(fp, " ");
> - width = hists__col_len(hists, se->se_width_idx);
> - if (width == 0)
> - width = strlen(se->se_header);
> - for (i = 0; i < width; i++)
> - fprintf(fp, ".");
> - }
> -
> - fprintf(fp, "\n");
> - if (max_rows && ++nr_rows >= max_rows)
> - goto out;
> -
> - fprintf(fp, "#\n");
> - if (max_rows && ++nr_rows >= max_rows)
> - goto out;
> -
> -print_entries:
> - total_period = hists->stats.total_period;
> -
> - for (nd = rb_first(&hists->entries); nd; nd = rb_next(nd)) {
> - struct hist_entry *h = rb_entry(nd, struct hist_entry, rb_node);
> -
> - if (h->filtered)
> - continue;
> -
> - if (show_displacement) {
> - if (h->pair != NULL)
> - displacement = ((long)h->pair->position -
> - (long)position);
> - else
> - displacement = 0;
> - ++position;
> - }
> - 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;
> -
> - if (h->ms.map == NULL && verbose > 1) {
> - __map_groups__fprintf_maps(&h->thread->mg,
> - MAP__FUNCTION, verbose, fp);
> - fprintf(fp, "%.10s end\n", graph_dotted_line);
> - }
> - }
> -out:
> - free(rem_sq_bracket);
> -
> - return ret;
> -}
> -
> /*
> * See hists__fprintf to match the column widths
> */
> @@ -1342,25 +723,3 @@ void hists__inc_nr_events(struct hists *hists, u32 type)
> ++hists->stats.nr_events[0];
> ++hists->stats.nr_events[type];
> }
> -
> -size_t hists__fprintf_nr_events(struct hists *hists, FILE *fp)
> -{
> - int i;
> - size_t ret = 0;
> -
> - for (i = 0; i < PERF_RECORD_HEADER_MAX; ++i) {
> - const char *name;
> -
> - if (hists->stats.nr_events[i] == 0)
> - continue;
> -
> - name = perf_event__name(i);
> - if (!strcmp(name, "UNKNOWN"))
> - continue;
> -
> - ret += fprintf(fp, "%16s events: %10d\n", name,
> - hists->stats.nr_events[i]);
> - }
> -
> - return ret;
> -}
> diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
> index 0b096c27a419..69fab7d9abcd 100644
> --- a/tools/perf/util/hist.h
> +++ b/tools/perf/util/hist.h
> @@ -112,6 +112,8 @@ void hists__filter_by_symbol(struct hists *hists);
> u16 hists__col_len(struct hists *self, enum hist_column col);
> void hists__set_col_len(struct hists *self, enum hist_column col, u16 len);
> bool hists__new_col_len(struct hists *self, enum hist_column col, u16 len);
> +void hists__reset_col_len(struct hists *hists);
> +void hists__calc_col_len(struct hists *hists, struct hist_entry *he);
>
> struct perf_evlist;
>
> --
> 1.7.11.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists