Skip to contentSkip to conversation

perf top: Fix wrong hottest instruction highlighted

PATCH Applied He Kuang 4 participants 4 messages Jan 20, 2019 – Jan 22, 2019 perf events

lore
Share & tools
lore

He Kuang

author
#0 lore raw

PATCH 1/1 perf top: Fix wrong hottest instruction highlighted

Annotation line's percentage is compared and inserted into rbtree, but the percent field of 'struct annotation_data' is an array, the comparison result between them is the address difference.

This patch compares the right slot of percent array according to opts->percent_type and makes things right.

The problem can be reproduced by pressing 'H' in perf top annotation view. It should highlight the instruction line which has the highest sampling percentage.

---
 tools/perf/ui/browsers/annotate.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)
tools/perf/ui/browsers/annotate.c +10 -6
index 1d00e5ec7906..82e16bf84466 100644
@@ -224,20 +224,24 @@ static unsigned int annotate_browser__refresh(struct ui_browser *browser)
 	return ret;
 }
 
-static int disasm__cmp(struct annotation_line *a, struct annotation_line *b)
+static double disasm__cmp(struct annotation_line *a, struct annotation_line *b,
+						  int percent_type)
 {
 	int i;
 
 	for (i = 0; i < a->data_nr; i++) {
-		if (a->data[i].percent == b->data[i].percent)
+		if (a->data[i].percent[percent_type] == b->data[i].percent[percent_type])
 			continue;
-		return a->data[i].percent < b->data[i].percent;
+		return a->data[i].percent[percent_type] -
+			   b->data[i].percent[percent_type];
 	}
 	return 0;
 }
 
-static void disasm_rb_tree__insert(struct rb_root *root, struct annotation_line *al)
+static void disasm_rb_tree__insert(struct annotate_browser *browser,
+				struct annotation_line *al)
 {
+	struct rb_root *root = &browser->entries;
 	struct rb_node **p = &root->rb_node;
 	struct rb_node *parent = NULL;
 	struct annotation_line *l;
@@ -246,7 +250,7 @@ static void disasm_rb_tree__insert(struct rb_root *root, struct annotation_line
 		parent = *p;
 		l = rb_entry(parent, struct annotation_line, rb_node);
 
-		if (disasm__cmp(al, l))
+		if (disasm__cmp(al, l, browser->opts->percent_type) < 0)
 			p = &(*p)->rb_left;
 		else
 			p = &(*p)->rb_right;
@@ -329,7 +333,7 @@ static void annotate_browser__calc_percent(struct annotate_browser *browser,
 			RB_CLEAR_NODE(&pos->al.rb_node);
 			continue;
 		}
-		disasm_rb_tree__insert(&browser->entries, &pos->al);
+		disasm_rb_tree__insert(browser, &pos->al);
 	}
 	pthread_mutex_unlock(&notes->lock);
 
Signature · 1 line
2.20.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 4 lines · He Kuang

Annotation line's percentage is compared and inserted into rbtree, but the percent field of 'struct annotation_data' is an array, the comparison result between them is the address difference.

Quoted 8 lines

This patch compares the right slot of percent array according to opts->percent_type and makes things right.

The problem can be reproduced by pressing 'H' in perf top annotation view. It should highlight the instruction line which has the highest sampling percentage.

thanks,
jirka

maintainer Applied
#2 lore raw

Em Sun, Jan 20, 2019 at 07:40:43PM +0100, Jiri Olsa escreveu:

Quoted 8 lines · He Kuang
Quoted 7 lines

Annotation line's percentage is compared and inserted into rbtree, but the percent field of 'struct annotation_data' is an array, the comparison result between them is the address difference.

This patch compares the right slot of percent array according to opts->percent_type and makes things right.

Quoted 7 lines
Quoted 5 lines

The problem can be reproduced by pressing 'H' in perf top annotation view. It should highlight the instruction line which has the highest sampling percentage.

Thanks, applied.

- Arnaldo

#3 lore raw
In reply to He Kuang
perf top: Fix wrong hottest instruction highlighted
Commit-ID:  da06d568386877809532e8ec678f4a5e300f0951
Gitweb:     https://git.kernel.org/tip/da06d568386877809532e8ec678f4a5e300f0951
Author:     He Kuang <[email protected]>
AuthorDate: Mon, 21 Jan 2019 00:05:22 +0800
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Mon, 21 Jan 2019 11:29:07 -0300

perf top: Fix wrong hottest instruction highlighted

The annotation line percentage is compared and inserted into the rbtree, but the percent field of 'struct annotation_data' is an array, the comparison result between them is the address difference.

This patch compares the right slot of percent array according to opts->percent_type and makes things right.

The problem can be reproduced by pressing 'H' in perf top annotation view. It should highlight the instruction line which has the highest sampling percentage.

---
 tools/perf/ui/browsers/annotate.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)
tools/perf/ui/browsers/annotate.c +10 -6
index 1d00e5ec7906..82e16bf84466 100644
@@ -224,20 +224,24 @@ static unsigned int annotate_browser__refresh(struct ui_browser *browser)
 	return ret;
 }
 
-static int disasm__cmp(struct annotation_line *a, struct annotation_line *b)
+static double disasm__cmp(struct annotation_line *a, struct annotation_line *b,
+						  int percent_type)
 {
 	int i;
 
 	for (i = 0; i < a->data_nr; i++) {
-		if (a->data[i].percent == b->data[i].percent)
+		if (a->data[i].percent[percent_type] == b->data[i].percent[percent_type])
 			continue;
-		return a->data[i].percent < b->data[i].percent;
+		return a->data[i].percent[percent_type] -
+			   b->data[i].percent[percent_type];
 	}
 	return 0;
 }
 
-static void disasm_rb_tree__insert(struct rb_root *root, struct annotation_line *al)
+static void disasm_rb_tree__insert(struct annotate_browser *browser,
+				struct annotation_line *al)
 {
+	struct rb_root *root = &browser->entries;
 	struct rb_node **p = &root->rb_node;
 	struct rb_node *parent = NULL;
 	struct annotation_line *l;
@@ -246,7 +250,7 @@ static void disasm_rb_tree__insert(struct rb_root *root, struct annotation_line
 		parent = *p;
 		l = rb_entry(parent, struct annotation_line, rb_node);
 
-		if (disasm__cmp(al, l))
+		if (disasm__cmp(al, l, browser->opts->percent_type) < 0)
 			p = &(*p)->rb_left;
 		else
 			p = &(*p)->rb_right;
@@ -329,7 +333,7 @@ static void annotate_browser__calc_percent(struct annotate_browser *browser,
 			RB_CLEAR_NODE(&pos->al.rb_node);
 			continue;
 		}
-		disasm_rb_tree__insert(&browser->entries, &pos->al);
+		disasm_rb_tree__insert(browser, &pos->al);
 	}
 	pthread_mutex_unlock(&notes->lock);