All of lore.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Namhyung Kim <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: namhyung@kernel.org, mingo@kernel.org, dsahern@gmail.com,
	hpa@zytor.com, jolsa@redhat.com, tglx@linutronix.de,
	acme@redhat.com, linux-kernel@vger.kernel.org,
	masami.hiramatsu.pt@hitachi.com
Subject: [tip:perf/core] perf symbols: Return the first entry with a given name in find_by_name method
Date: Wed, 28 Jan 2015 07:01:32 -0800	[thread overview]
Message-ID: <tip-de4809999dac44c51e1f9ad892deb0336296dc4e@git.kernel.org> (raw)
In-Reply-To: <1421234288-22758-2-git-send-email-namhyung@kernel.org>

Commit-ID:  de4809999dac44c51e1f9ad892deb0336296dc4e
Gitweb:     http://git.kernel.org/tip/de4809999dac44c51e1f9ad892deb0336296dc4e
Author:     Namhyung Kim <namhyung@kernel.org>
AuthorDate: Fri, 16 Jan 2015 15:31:28 -0300
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 21 Jan 2015 10:05:44 -0300

perf symbols: Return the first entry with a given name in find_by_name method

When a dso contains multiple symbols which have same name, current
dso__find_symbol_by_name() only finds an one of them and there's no way
to get the all symbols without going through the rbtree.

So make symbols__find_by_name() return the first entry with the given
name and the next patch in this series will provide a way to iterate
from there, by the name ordered rb_tree, till a suitable symbol is
found.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Link: http://lkml.kernel.org/r/1421234288-22758-2-git-send-email-namhyung@kernel.org
[ Yanked this independent hunk, without changes, from a larger patch  ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/symbol.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index c24c5b8..3cb928e 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -396,6 +396,7 @@ static struct symbol *symbols__find_by_name(struct rb_root *symbols,
 					    const char *name)
 {
 	struct rb_node *n;
+	struct symbol_name_rb_node *s;
 
 	if (symbols == NULL)
 		return NULL;
@@ -403,7 +404,6 @@ static struct symbol *symbols__find_by_name(struct rb_root *symbols,
 	n = symbols->rb_node;
 
 	while (n) {
-		struct symbol_name_rb_node *s;
 		int cmp;
 
 		s = rb_entry(n, struct symbol_name_rb_node, rb_node);
@@ -414,10 +414,24 @@ static struct symbol *symbols__find_by_name(struct rb_root *symbols,
 		else if (cmp > 0)
 			n = n->rb_right;
 		else
-			return &s->sym;
+			break;
 	}
 
-	return NULL;
+	if (n == NULL)
+		return NULL;
+
+	/* return first symbol that has same name (if any) */
+	for (n = rb_prev(n); n; n = rb_prev(n)) {
+		struct symbol_name_rb_node *tmp;
+
+		tmp = rb_entry(n, struct symbol_name_rb_node, rb_node);
+		if (strcmp(tmp->sym.name, s->sym.name))
+			break;
+
+		s = tmp;
+	}
+
+	return &s->sym;
 }
 
 struct symbol *dso__find_symbol(struct dso *dso,

  parent reply	other threads:[~2015-01-28 20:49 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-14 11:18 [PATCH v2 1/4] perf tools: Fix segfault for symbol annotation on TUI Namhyung Kim
2015-01-14 11:18 ` [PATCH v2 2/4] perf tools: Add link argument to dso__find_symbol_by_name() Namhyung Kim
2015-01-14 16:36   ` David Ahern
2015-01-15  0:23     ` Namhyung Kim
2015-01-15  0:42       ` David Ahern
2015-01-28 15:01   ` tip-bot for Namhyung Kim [this message]
2015-01-14 11:18 ` [PATCH v2 3/4] perf probe: Do not rely on map__load() filter to find symbols Namhyung Kim
2015-01-14 13:54   ` Arnaldo Carvalho de Melo
2015-01-15 12:09     ` Masami Hiramatsu
2015-01-28 15:02   ` [tip:perf/core] " tip-bot for Namhyung Kim
2015-01-14 11:18 ` [PATCH v2 4/4] perf probe: Fix probing kretprobes Namhyung Kim
2015-01-14 16:26   ` Jiri Olsa
2015-01-15 12:11   ` Masami Hiramatsu
2015-01-28 15:02   ` [tip:perf/core] " tip-bot for Namhyung Kim
2015-01-14 12:57 ` [PATCH v2 1/4] perf tools: Fix segfault for symbol annotation on TUI Arnaldo Carvalho de Melo
2015-01-14 14:57 ` David Ahern
2015-01-14 21:08   ` Arnaldo Carvalho de Melo
2015-01-15  0:20     ` Namhyung Kim
2015-01-17 12:38       ` Arnaldo Carvalho de Melo
2015-01-17 10:13 ` [tip:perf/urgent] " tip-bot for Namhyung Kim

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=tip-de4809999dac44c51e1f9ad892deb0336296dc4e@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=acme@redhat.com \
    --cc=dsahern@gmail.com \
    --cc=hpa@zytor.com \
    --cc=jolsa@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=masami.hiramatsu.pt@hitachi.com \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=tglx@linutronix.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.