admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf c2c annotate: Start from the contention line

Browse Source 
Add support to highlight the contention line in the annotate browser,
use 'TAB'/'UNTAB' to refocus to the contention line.

Signed-off-by: Tianyou Li <tianyou.li@intel.com>
Reviewed-by: Dapeng Mi <dapeng1.mi@linux.intel.com>
Reviewed-by: Thomas Falcon <thomas.falcon@intel.com>
Reviewed-by: Jiebin Sun <jiebin.sun@intel.com>
Reviewed-by: Pan Deng <pan.deng@intel.com>
Reviewed-by: Zhiguo Zhou <zhiguo.zhou@intel.com>
Reviewed-by: Wangyang Guo <wangyang.guo@intel.com>
Tested-by: Ravi Bangoria <ravi.bangoria@amd.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
This commit is contained in:
Tianyou Li
2025-10-13 22:48:11 +08:00
committed by Namhyung Kim
parent cd3466cd26
commit ad83f3b715
5 changed files with 55 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/builtin-annotate.c
View File

@@ -519,7 +519,7 @@ find_next:
/* skip missing symbols */
nd = rb_next(nd);
} else if (use_browser == 1) {
key = hist_entry__tui_annotate(he, evsel, NULL);
key = hist_entry__tui_annotate(he, evsel, NULL, NO_ADDR);
switch (key) {
case -1:

6
tools/perf/builtin-c2c.c
View File

@@ -2604,6 +2604,7 @@ static int perf_c2c__toggle_annotation(struct hist_browser *browser)
struct symbol *sym = NULL;
struct annotated_source *src = NULL;
struct c2c_hist_entry *c2c_he = NULL;
u64 al_addr = NO_ADDR;
if (!perf_c2c__has_annotation(he->hists->hpp_list)) {
ui_browser__help_window(&browser->b, "No annotation support");
@@ -2627,8 +2628,11 @@ static int perf_c2c__toggle_annotation(struct hist_browser *browser)
return 0;
}
if (he->mem_info)
al_addr = mem_info__iaddr(he->mem_info)->al_addr;
c2c_he = container_of(he, struct c2c_hist_entry, he);
return hist_entry__tui_annotate(he, c2c_he->evsel, NULL);
return hist_entry__tui_annotate(he, c2c_he->evsel, NULL, al_addr);
}
static void c2c_browser__update_nr_entries(struct hist_browser *hb)

48
tools/perf/ui/browsers/annotate.c
View File

@@ -605,7 +605,7 @@ static bool annotate_browser__callq(struct annotate_browser *browser,
target_ms.map = ms->map;
target_ms.sym = dl->ops.target.sym;
annotation__unlock(notes);
__hist_entry__tui_annotate(browser->he, &target_ms, evsel, hbt);
__hist_entry__tui_annotate(browser->he, &target_ms, evsel, hbt, NO_ADDR);
/*
* The annotate_browser above changed the title with the target function
@@ -852,6 +852,16 @@ static void annotate_browser__debuginfo_warning(struct annotate_browser *browser
}
}
static s64 annotate_browser__curr_hot_offset(struct annotate_browser *browser)
{
struct annotation_line *al = NULL;
if (browser->curr_hot)
al = rb_entry(browser->curr_hot, struct annotation_line, rb_node);
return al ? al->offset : 0;
}
static int annotate_browser__run(struct annotate_browser *browser,
struct evsel *evsel,
struct hist_browser_timer *hbt)
@@ -873,6 +883,11 @@ static int annotate_browser__run(struct annotate_browser *browser,
annotate_browser__calc_percent(browser, evsel);
if (browser->selection != NULL) {
browser->curr_hot = &browser->selection->rb_node;
browser->b.use_navkeypressed = false;
}
if (browser->curr_hot) {
annotate_browser__set_rb_top(browser, browser->curr_hot);
browser->b.navkeypressed = false;
@@ -969,8 +984,19 @@ static int annotate_browser__run(struct annotate_browser *browser,
nd = browser->curr_hot;
break;
case 's':
struct annotation_line *al = NULL;
s64 offset = annotate_browser__curr_hot_offset(browser);
if (annotate_browser__toggle_source(browser, evsel))
ui_helpline__puts(help);
/* Update the annotation browser's rb_tree, and reset the nd */
annotate_browser__calc_percent(browser, evsel);
/* Try to find the same asm line as before */
al = annotated_source__get_line(notes->src, offset);
browser->curr_hot = al ? &al->rb_node : NULL;
nd = browser->curr_hot;
annotate__scnprintf_title(hists, title, sizeof(title));
annotate_browser__show(browser, title, help);
continue;
@@ -1106,19 +1132,19 @@ out:
}
int hist_entry__tui_annotate(struct hist_entry *he, struct evsel *evsel,
struct hist_browser_timer *hbt)
struct hist_browser_timer *hbt, u64 al_addr)
{
/* reset abort key so that it can get Ctrl-C as a key */
SLang_reset_tty();
SLang_init_tty(0, 0, 0);
SLtty_set_suspend_state(true);
return __hist_entry__tui_annotate(he, &he->ms, evsel, hbt);
return __hist_entry__tui_annotate(he, &he->ms, evsel, hbt, al_addr);
}
int __hist_entry__tui_annotate(struct hist_entry *he, struct map_symbol *ms,
struct evsel *evsel,
struct hist_browser_timer *hbt)
struct hist_browser_timer *hbt, u64 al_addr)
{
struct symbol *sym = ms->sym;
struct annotation *notes = symbol__annotation(sym);
@@ -1188,6 +1214,20 @@ int __hist_entry__tui_annotate(struct hist_entry *he, struct map_symbol *ms,
if (annotate_opts.hide_src_code)
ui_browser__init_asm_mode(&browser.b);
/*
* If al_addr is set, it means that there should be a line
* intentionally selected, not based on the percentages
* which caculated by the event sampling. In this case, we
* convey this information into the browser selection, where
* the selection in other cases should be empty.
*/
if (al_addr != NO_ADDR) {
struct annotation_line *al = annotated_source__get_line(notes->src,
al_addr - sym->start);
browser.selection = al;
}
ret = annotate_browser__run(&browser, evsel, hbt);
debuginfo__delete(browser.dbg);

2
tools/perf/ui/browsers/hists.c
View File

@@ -2485,7 +2485,7 @@ do_annotate(struct hist_browser *browser, struct popup_action *act)
evsel = hists_to_evsel(browser->hists);
he = hist_browser__selected_entry(browser);
err = __hist_entry__tui_annotate(he, &act->ms, evsel, browser->hbt);
err = __hist_entry__tui_annotate(he, &act->ms, evsel, browser->hbt, NO_ADDR);
/*
* offer option to annotate the other branch source or target
* (if they exists) when returning from annotate

6
tools/perf/util/hist.h
View File

@@ -713,12 +713,14 @@ struct block_hist {
#include "../ui/keysyms.h"
void attr_to_script(char *buf, struct perf_event_attr *attr);
#define NO_ADDR 0
int __hist_entry__tui_annotate(struct hist_entry *he, struct map_symbol *ms,
struct evsel *evsel,
struct hist_browser_timer *hbt);
struct hist_browser_timer *hbt, u64 al_addr);
int hist_entry__tui_annotate(struct hist_entry *he, struct evsel *evsel,
struct hist_browser_timer *hbt);
struct hist_browser_timer *hbt, u64 al_addr);
int evlist__tui_browse_hists(struct evlist *evlist, const char *help, struct hist_browser_timer *hbt,
float min_pcnt, struct perf_env *env, bool warn_lost_event);