From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Namhyung Kim <namhyung@kernel.org>,
David Ahern <dsahern@gmail.com>, Jiri Olsa <jolsa@redhat.com>,
Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 5/9] perf symbols: Return the first entry with a given name in find_by_name method
Date: Wed, 21 Jan 2015 12:01:06 -0300 [thread overview]
Message-ID: <1421852470-20153-6-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1421852470-20153-1-git-send-email-acme@kernel.org>
From: Namhyung Kim <namhyung@kernel.org>
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 c24c5b83156c..3cb928e51a99 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,
--
1.9.3
next prev parent reply other threads:[~2015-01-21 15:03 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-21 15:01 [GIT PULL 0/9] perf/urgent fixes Arnaldo Carvalho de Melo
2015-01-21 15:01 ` [PATCH 1/9] perf evlist: Remove extraneous 'was' on error message Arnaldo Carvalho de Melo
2015-01-21 15:01 ` [PATCH 2/9] perf scripting perl: Force to use stdbool Arnaldo Carvalho de Melo
2015-01-21 15:01 ` [PATCH 3/9] perf annotate: Handle ins parsing failures Arnaldo Carvalho de Melo
2015-01-21 15:01 ` [PATCH 4/9] perf annotate: Fix memory leaks in LOCK handling Arnaldo Carvalho de Melo
2015-01-21 15:01 ` Arnaldo Carvalho de Melo [this message]
2015-01-21 15:01 ` [PATCH 6/9] perf symbols: Introduce method to iterate symbols ordered by name Arnaldo Carvalho de Melo
2015-01-21 15:01 ` [PATCH 7/9] perf probe: Do not rely on map__load() filter to find symbols Arnaldo Carvalho de Melo
2015-01-21 15:01 ` [PATCH 8/9] perf symbols: Introduce 'for' method to iterate over the symbols with a given name Arnaldo Carvalho de Melo
2015-01-21 15:01 ` [PATCH 9/9] perf probe: Fix probing kretprobes Arnaldo Carvalho de Melo
2015-01-28 14:42 ` [GIT PULL 0/9] perf/urgent 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=1421852470-20153-6-git-send-email-acme@kernel.org \
--to=acme@kernel.org \
--cc=acme@redhat.com \
--cc=dsahern@gmail.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
/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).