diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-03-15 17:54:36 -0300 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-03-20 13:19:30 -0300 |
commit | 2ba5eca10486eeb37030f8bce27cecda3763502f (patch) | |
tree | 9716939204c684cbf04f53d6984b6cd691cb4a84 /tools/perf/util | |
parent | c52202434de2bd3e0c447c6dce992266fd7fc589 (diff) | |
download | linux-2ba5eca10486eeb37030f8bce27cecda3763502f.tar.bz2 |
perf annotate: Introduce annotation_line__print_start() out of TUI code
For the --tui and --stdio2 cases using callbacks for print() and
set_percent_color() end up being the easiest path, real GUI remains as
an exercise.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-1o7az1ng55g2g6ppr2jpeuct@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util')
-rw-r--r-- | tools/perf/util/annotate.c | 75 | ||||
-rw-r--r-- | tools/perf/util/annotate.h | 5 |
2 files changed, 80 insertions, 0 deletions
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 3bd6f9b0147f..046feda11052 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -2198,6 +2198,81 @@ double annotation_line__max_percent(struct annotation_line *al, struct annotatio return percent_max; } +static void set_percent_color_stub(void *obj __maybe_unused, + double percent __maybe_unused, + bool current __maybe_unused) +{ +} + +void annotation_line__print_start(struct annotation_line *al, struct annotation *notes, + bool first_line, bool current_entry, + void *obj, + void (*obj__set_percent_color)(void *obj, double percent, bool current), + void (*obj__printf)(void *obj, const char *fmt, ...)) +{ + double percent_max = annotation_line__max_percent(al, notes); + bool show_title = false; + + if (first_line && (al->offset == -1 || percent_max == 0.0)) { + if (notes->have_cycles) { + if (al->ipc == 0.0 && al->cycles == 0) + show_title = true; + } else + show_title = true; + } + + if (!obj__set_percent_color) + obj__set_percent_color = set_percent_color_stub; + + if (al->offset != -1 && percent_max != 0.0) { + int i; + + for (i = 0; i < notes->nr_events; i++) { + obj__set_percent_color(obj, al->samples[i].percent, current_entry); + if (notes->options->show_total_period) { + obj__printf(obj, "%11" PRIu64 " ", al->samples[i].he.period); + } else if (notes->options->show_nr_samples) { + obj__printf(obj, "%6" PRIu64 " ", + al->samples[i].he.nr_samples); + } else { + obj__printf(obj, "%6.2f ", + al->samples[i].percent); + } + } + } else { + int pcnt_width = annotation__pcnt_width(notes); + + obj__set_percent_color(obj, 0, current_entry); + + if (!show_title) + obj__printf(obj, "%*s", pcnt_width, " "); + else { + obj__printf(obj, "%*s", pcnt_width, + notes->options->show_total_period ? "Period" : + notes->options->show_nr_samples ? "Samples" : "Percent"); + } + } + + if (notes->have_cycles) { + if (al->ipc) + obj__printf(obj, "%*.2f ", ANNOTATION__IPC_WIDTH - 1, al->ipc); + else if (!show_title) + obj__printf(obj, "%*s", ANNOTATION__IPC_WIDTH, " "); + else + obj__printf(obj, "%*s ", ANNOTATION__IPC_WIDTH - 1, "IPC"); + + if (al->cycles) + obj__printf(obj, "%*" PRIu64 " ", + ANNOTATION__CYCLES_WIDTH - 1, al->cycles); + else if (!show_title) + obj__printf(obj, "%*s", ANNOTATION__CYCLES_WIDTH, " "); + else + obj__printf(obj, "%*s ", ANNOTATION__CYCLES_WIDTH - 1, "Cycle"); + } + + obj__printf(obj, " "); +} + int symbol__annotate2(struct symbol *sym, struct map *map, struct perf_evsel *evsel, struct annotation_options *options, struct arch **parch) { diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h index 83484e236f33..84c99774bfed 100644 --- a/tools/perf/util/annotate.h +++ b/tools/perf/util/annotate.h @@ -126,6 +126,11 @@ struct annotation_line * annotation_line__next(struct annotation_line *pos, struct list_head *head); double annotation_line__max_percent(struct annotation_line *al, struct annotation *notes); +void annotation_line__print_start(struct annotation_line *al, struct annotation *notes, + bool first_line, bool current_entry, + void *obj, + void (*obj__set_percent_color)(void *obj, double percent, bool current), + void (*obj__printf)(void *obj, const char *fmt, ...)); int disasm_line__scnprintf(struct disasm_line *dl, char *bf, size_t size, bool raw); size_t disasm__fprintf(struct list_head *head, FILE *fp); |