Skip to contentSkip to conversation

perf tools: Compare dso's also when comparing symbols

PATCH In review Namhyung Kim 3 participants 5 messages Oct 15, 2013 – Oct 23, 2013 perf events

lore
Share & tools
lore

Namhyung Kim

author maintainer
#0 lore raw

PATCH 1/2 perf tools: Compare dso's also when comparing symbols

From: Namhyung Kim <[email protected]>

Linus reported that sometimes 'perf report -s symbol' exits without any message on TUI. David and Jiri found that it's because it failed to add a hist entry due to an invalid symbol length.

It turns out that sorting by symbol (address) was broken since it only compares symbol addresses. The symbol address is a relative address within a dso thus just checking its address can result in merging unrelated symbols together. Fix it by checking dso before comparing symbol address.

---
 tools/perf/util/sort.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
tools/perf/util/sort.c +10 -0
index 32c56377e008..1f9821db9e77 100644
@@ -182,9 +182,19 @@ static int64_t _sort__sym_cmp(struct symbol *sym_l, struct symbol *sym_r)
 static int64_t
 sort__sym_cmp(struct hist_entry *left, struct hist_entry *right)
 {
+	int64_t ret;
+
 	if (!left->ms.sym && !right->ms.sym)
 		return right->level - left->level;
 
+	/*
+	 * comparing symbol address alone is not enough since it's a
+	 * relative address within a dso.
+	 */
+	ret = sort__dso_cmp(left, right);
+	if (ret != 0)
+		return ret;
+
 	return _sort__sym_cmp(left->ms.sym, right->ms.sym);
 }
 
Signature · 1 line
1.7.11.7
author maintainer
#1 lore raw

PATCH 2/2 perf tools: Sort dso using pointers

From: Namhyung Kim <[email protected]>

The dso's in a perf session are maintained machine-wide so same dso is shared by hist entries. Thus just checking pointer should be enough to comparing dso's.

It may change behavior of 'perf report -s dso' when there're two or more dso's that have same basename - the dso's which have same name used to merged to one unless -v option was given. But I don't think it's a big problem. ;)

---
 tools/perf/util/sort.c | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)
tools/perf/util/sort.c +1 -13
index 1f9821db9e77..70658a0834e3 100644
@@ -114,20 +114,8 @@ static int64_t _sort__dso_cmp(struct map *map_l, struct map *map_r)
 {
 	struct dso *dso_l = map_l ? map_l->dso : NULL;
 	struct dso *dso_r = map_r ? map_r->dso : NULL;
-	const char *dso_name_l, *dso_name_r;
 
-	if (!dso_l || !dso_r)
-		return cmp_null(dso_l, dso_r);
-
-	if (verbose) {
-		dso_name_l = dso_l->long_name;
-		dso_name_r = dso_r->long_name;
-	} else {
-		dso_name_l = dso_l->short_name;
-		dso_name_r = dso_r->short_name;
-	}
-
-	return strcmp(dso_name_l, dso_name_r);
+	return (int64_t)(dso_l - dso_r);
 }
 
 static int64_t
Signature · 1 line
1.7.11.7
#2 lore raw
In reply to Namhyung Kim
Quoted 5 lines · Namhyung Kim

From: Namhyung Kim <[email protected]>

Linus reported that sometimes 'perf report -s symbol' exits without any message on TUI. David and Jiri found that it's because it failed to add a hist entry due to an invalid symbol length.

Btw., 'exit without any messages' is something that should be fixed separately as well I suspect.

Review

Quoted 5 lines

static int64_t
sort__sym_cmp(struct hist_entry *left, struct hist_entry *right) {

(quoted diff) +2 -0
+	int64_t ret;
+

Btw., this file should go back to u64/s64 like the kernel and most of perf does. (A few int64_t uses slipped into other places as well, I suspect they should be fixed.)

Thanks,

Ingo

author maintainer
#3 lore raw
Quoted 10 lines · Ingo Molnar
Quoted 5 lines · Namhyung Kim

From: Namhyung Kim <[email protected]>

Linus reported that sometimes 'perf report -s symbol' exits without any message on TUI. David and Jiri found that it's because it failed to add a hist entry due to an invalid symbol length.

Btw., 'exit without any messages' is something that should be fixed separately as well I suspect.

Sure. I believe acme is gonna work on it. :)

Quoted 10 lines

Review

Quoted 6 lines

static int64_t
sort__sym_cmp(struct hist_entry *left, struct hist_entry *right) {

(quoted diff) +2 -0
+	int64_t ret;
+

Btw., this file should go back to u64/s64 like the kernel and most of perf does. (A few int64_t uses slipped into other places as well, I suspect they should be fixed.)

Okay, will send a separate patch for the fix.

Thanks,
Namhyung

#4 lore raw

[tip:perf/core] perf tools: Compare dso' s also when comparing symbols

In reply to Namhyung Kim
perf tools: Compare dso's also when comparing symbols
Commit-ID:  09600e0f9ebb06235b852a646a3644b7d4a71aca
Gitweb:     http://git.kernel.org/tip/09600e0f9ebb06235b852a646a3644b7d4a71aca
Author:     Namhyung Kim <[email protected]>
AuthorDate: Tue, 15 Oct 2013 11:01:56 +0900
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Mon, 21 Oct 2013 17:33:23 -0300

perf tools: Compare dso's also when comparing symbols

Linus reported that sometimes 'perf report -s symbol' exits without any message on TUI. David and Jiri found that it's because it failed to add a hist entry due to an invalid symbol length.

It turns out that sorting by symbol (address) was broken since it only compares symbol addresses. The symbol address is a relative address within a dso thus just checking its address can result in merging unrelated symbols together. Fix it by checking dso before comparing symbol address.

---
 tools/perf/util/sort.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
tools/perf/util/sort.c +10 -0
index 32c5637..1f9821d 100644
@@ -182,9 +182,19 @@ static int64_t _sort__sym_cmp(struct symbol *sym_l, struct symbol *sym_r)
 static int64_t
 sort__sym_cmp(struct hist_entry *left, struct hist_entry *right)
 {
+	int64_t ret;
+
 	if (!left->ms.sym && !right->ms.sym)
 		return right->level - left->level;
 
+	/*
+	 * comparing symbol address alone is not enough since it's a
+	 * relative address within a dso.
+	 */
+	ret = sort__dso_cmp(left, right);
+	if (ret != 0)
+		return ret;
+
 	return _sort__sym_cmp(left->ms.sym, right->ms.sym);
 }