From: Jiri Olsa <jolsa@redhat.com>
To: Namhyung Kim <namhyung@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>,
Ingo Molnar <mingo@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Jiri Olsa <jolsa@kernel.org>, LKML <linux-kernel@vger.kernel.org>,
David Ahern <dsahern@gmail.com>,
Frederic Weisbecker <fweisbec@gmail.com>
Subject: Re: [PATCH 3/7] perf callchain: Add enum match_result for match_chain()
Date: Sat, 23 Jan 2016 18:01:10 +0100 [thread overview]
Message-ID: <20160123170110.GA4675@krava.local> (raw)
In-Reply-To: <1453470100-8637-4-git-send-email-namhyung@kernel.org>
On Fri, Jan 22, 2016 at 10:41:36PM +0900, Namhyung Kim wrote:
SNIP
> /* lookup in childrens */
> while (*p) {
> - s64 ret;
> + enum match_result ret;
>
> parent = *p;
> rnode = rb_entry(parent, struct callchain_node, rb_node_in);
>
> /* If at least first entry matches, rely to children */
> ret = append_chain(rnode, cursor, period);
> - if (ret == 0)
> + if (ret == MATCH_EQ)
> goto inc_children_hit;
>
> - if (ret < 0)
> + if (ret == MATCH_LT)
> p = &parent->rb_left;
> else
> p = &parent->rb_right;
so if we want to use the return values like that you
probably missed 2 other places
thanks,
jirka
---
diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c
index 7139d438ee6d..dc08e76aa8d9 100644
--- a/tools/perf/util/callchain.c
+++ b/tools/perf/util/callchain.c
@@ -565,7 +565,7 @@ split_add_child(struct callchain_node *parent,
cnode = list_first_entry(&first->val, struct callchain_list,
list);
- if (match_chain(node, cnode) < 0)
+ if (match_chain(node, cnode) == MATCH_LT)
pp = &p->rb_left;
else
pp = &p->rb_right;
@@ -652,7 +652,7 @@ append_chain(struct callchain_node *root,
break;
cmp = match_chain(node, cnode);
- if (cmp)
+ if (cmp != MATCH_EQ)
break;
found = true;
next prev parent reply other threads:[~2016-01-23 17:01 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-22 13:41 [PATCHSET 0/7] perf tools: Check error during collapsing hist entries Namhyung Kim
2016-01-22 13:41 ` [PATCH 1/7] perf callchain: Check return value of add_child() Namhyung Kim
2016-01-22 13:41 ` [PATCH 2/7] perf callchain: Check return value of fill_node() Namhyung Kim
2016-01-22 13:41 ` [PATCH 3/7] perf callchain: Add enum match_result for match_chain() Namhyung Kim
2016-01-23 17:01 ` Jiri Olsa [this message]
2016-01-24 4:05 ` Namhyung Kim
2016-01-24 5:49 ` [PATCH v2 " Namhyung Kim
2016-01-22 13:41 ` [PATCH 4/7] perf callchain: Check return value of split_add_child() Namhyung Kim
2016-01-22 13:41 ` [PATCH 5/7] perf callchain: Check return value of append_chain_children() Namhyung Kim
2016-01-22 13:41 ` [PATCH 6/7] perf hists: Return error from hists__collapse_resort() Namhyung Kim
2016-01-22 13:41 ` [PATCH 7/7] perf report: Check error during report__collapse_hists() Namhyung Kim
2016-01-23 17:01 ` [PATCHSET 0/7] perf tools: Check error during collapsing hist entries Jiri Olsa
2016-01-24 4:37 ` Namhyung Kim
2016-01-25 7:12 ` Jiri Olsa
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=20160123170110.GA4675@krava.local \
--to=jolsa@redhat.com \
--cc=acme@kernel.org \
--cc=dsahern@gmail.com \
--cc=fweisbec@gmail.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.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