From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
Arnaldo Carvalho de Melo <acme@redhat.com>,
Adrian Hunter <adrian.hunter@intel.com>,
Andi Kleen <ak@linux.intel.com>, David Ahern <dsahern@gmail.com>,
Jin Yao <yao.jin@linux.intel.com>, Jiri Olsa <jolsa@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Wang Nan <wangnan0@huawei.com>
Subject: [PATCH 17/44] perf annotate: Move 'start' to struct annotation
Date: Sat, 24 Mar 2018 17:01:44 -0300 [thread overview]
Message-ID: <20180324200211.21326-18-acme@kernel.org> (raw)
In-Reply-To: <20180324200211.21326-1-acme@kernel.org>
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Another field that is not TUI specific.
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-jj3dwswndft5mln8hu9k0idv@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/ui/browsers/annotate.c | 5 ++---
tools/perf/util/annotate.h | 1 +
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index 50f8e671644f..7ec441f93f7e 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -35,7 +35,6 @@ struct annotate_browser {
struct rb_node *curr_hot;
struct annotation_line *selection;
struct arch *arch;
- u64 start;
int nr_asm_entries;
int nr_entries;
bool searching_backwards;
@@ -208,7 +207,7 @@ static void annotate_browser__write(struct ui_browser *browser, void *entry, int
int color = -1;
if (!notes->options->use_offset)
- addr += ab->start;
+ addr += notes->start;
if (!notes->options->use_offset) {
printed = scnprintf(bf, sizeof(bf), "%" PRIx64 ": ", addr);
@@ -991,7 +990,7 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map,
ui_helpline__push("Press ESC to exit");
- browser.start = map__rip_2objdump(map, sym->start);
+ notes->start = map__rip_2objdump(map, sym->start);
list_for_each_entry(al, ¬es->src->source, node) {
size_t line_len = strlen(al->line);
diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
index 2018a47790c7..0424c127b004 100644
--- a/tools/perf/util/annotate.h
+++ b/tools/perf/util/annotate.h
@@ -169,6 +169,7 @@ struct annotated_source {
struct annotation {
pthread_mutex_t lock;
u64 max_coverage;
+ u64 start;
struct annotation_options *options;
struct annotation_line **offsets;
int nr_events;
--
2.14.3
next prev parent reply other threads:[~2018-03-24 20:01 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-24 20:01 [GIT PULL 00/44] perf/core improvements and fixes Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 01/44] perf unwind: Report error from dwfl_attach_state Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 02/44] perf annotate: Move annotation_options out of the TUI browser Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 03/44] perf annotate: Move cycles/IPC formatting width constants outside TUI Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 04/44] perf annotate tui: Use annotate_browser__cycles_width() mroe Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 05/44] perf annotate tui: Move have_cycles to struct annotation Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 06/44] perf annotate: Move annotation_line array from TUI to generic code Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 07/44] perf annotate: Move compute_ipc() to annotation library Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 08/44] perf annotate: Move nr_events from annotate_browser to annotation struct Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 09/44] perf annotate: Stop using a global config struct Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 10/44] perf annotate: Move pcnt_with() to the annotation library Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 11/44] perf annotate tui: Add browser__annotation() helper Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 12/44] perf annotate: Move max_jump_sources to struct annotation Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 13/44] perf annotate: Move jumps_percent_color to ui_browser Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 14/44] perf annotate: Move nr_jumps to struct annotation Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 15/44] perf annotate: Move mark_jump_targets from the TUI to the annotation library Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 16/44] perf annotate: Nuke struct browser_line Arnaldo Carvalho de Melo
2018-03-24 20:01 ` Arnaldo Carvalho de Melo [this message]
2018-03-24 20:01 ` [PATCH 18/44] perf annotate: Move nr_{asm_}entries to struct annotation Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 19/44] perf annotate: Introduce set_offsets() method out of TUI code Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 20/44] perf annotate: Move the column widths from the TUI to generic lib Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 21/44] perf annotate: Move update_column_widths() to the " Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 22/44] perf annotate: Introduce init_column_widths() method out of TUI code Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 23/44] perf annotate: Introduce symbol__annotate2 method Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 24/44] perf annotate: Introduce annotation_line__max_percent() Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 25/44] perf ui browser: Add vprintf() method Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 26/44] perf annotate: Introduce annotation_line__print_start() out of TUI code Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 27/44] perf annotate: Finish the generalization of annotate_browser__write() Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 28/44] perf annotate: Use a ops table for annotation_line__write() Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 29/44] perf annotate: Introduce annotation_line__filter() Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 30/44] perf annotate: Introduce the --stdio2 output mode Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 31/44] perf annotate: Move the default annotate options to the library Arnaldo Carvalho de Melo
2018-03-24 20:01 ` [PATCH 32/44] perf annotate: Use the default annotation options for --stdio2 Arnaldo Carvalho de Melo
2018-03-24 20:02 ` [PATCH 33/44] perf annotate: Add function header to --stdio2 Arnaldo Carvalho de Melo
2018-03-24 20:02 ` [PATCH 34/44] perf annotate: Introduce --ignore-vmlinux command line option Arnaldo Carvalho de Melo
2018-03-24 20:02 ` [PATCH 35/44] perf report: " Arnaldo Carvalho de Melo
2018-03-24 20:02 ` [PATCH 36/44] perf annotate browser: Add 'P' hotkey to dump annotation to file Arnaldo Carvalho de Melo
2018-03-24 20:02 ` [PATCH 37/44] perf annotate: No need to calculate notes->start twice Arnaldo Carvalho de Melo
2018-03-24 20:02 ` [PATCH 38/44] perf annotate: Pass function descriptor to its instruction parsing routines Arnaldo Carvalho de Melo
2018-03-24 20:02 ` [PATCH 39/44] perf annotate: Mark jumps to outher functions with the call arrow Arnaldo Carvalho de Melo
2018-03-24 20:02 ` [PATCH 40/44] perf python: Reference Py_None before returning it Arnaldo Carvalho de Melo
2018-03-24 20:02 ` [PATCH 41/44] perf annotate: Add "_local" to jump/offset validation routines Arnaldo Carvalho de Melo
2018-03-24 20:02 ` [PATCH 42/44] perf annotate: Support jumping from one function to another Arnaldo Carvalho de Melo
2018-03-24 20:02 ` [PATCH 43/44] perf annotate: Defer searching for comma in raw line till it is needed Arnaldo Carvalho de Melo
2018-03-24 20:02 ` [PATCH 44/44] perf annotate: Use absolute addresses to calculate jump target offsets Arnaldo Carvalho de Melo
2018-03-25 8:40 ` [GIT PULL 00/44] perf/core improvements and fixes Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180324200211.21326-18-acme@kernel.org \
--to=acme@kernel.org \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=ak@linux.intel.com \
--cc=dsahern@gmail.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=wangnan0@huawei.com \
--cc=yao.jin@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).