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>,
"Martin Liška" <mliska@suse.cz>,
"Peter Zijlstra" <a.p.zijlstra@chello.nl>,
"Taeung Song" <treeze.taeung@gmail.com>,
"Arnaldo Carvalho de Melo" <acme@redhat.com>
Subject: [PATCH 6/8] perf annotate: Fix 'annotate.use_offset' config variable usage
Date: Thu, 22 Oct 2015 19:14:33 -0300 [thread overview]
Message-ID: <1445552075-25155-7-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1445552075-25155-1-git-send-email-acme@kernel.org>
From: Namhyung Kim <namhyung@kernel.org>
The annotate__configs should be sorted so that it can use bsearch(3).
However commit 0c4a5bcea460 ("perf annotate: Display total number of
samples with --show-total-period") added a new config item at the end.
This resulted in the 'annotate.use_offset' config variable cannot be
found and perf terminated like below:
$ perf report
bad config file line 6 in ~/.perfconfig
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Martin Liška <mliska@suse.cz>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Taeung Song <treeze.taeung@gmail.com>
Fixes: 0c4a5bcea460 ("perf annotate: Display total number of samples with --show-total-period")
Link: http://lkml.kernel.org/r/1445396240-3428-1-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/ui/browsers/annotate.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index bec0b62d8e38..ba72e018e99a 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -1125,8 +1125,8 @@ static struct annotate_config {
ANNOTATE_CFG(jump_arrows),
ANNOTATE_CFG(show_linenr),
ANNOTATE_CFG(show_nr_jumps),
- ANNOTATE_CFG(use_offset),
ANNOTATE_CFG(show_total_period),
+ ANNOTATE_CFG(use_offset),
};
#undef ANNOTATE_CFG
--
2.1.0
next prev parent reply other threads:[~2015-10-22 22:16 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-22 22:14 [GIT PULL 0/8] perf/core improvements and fixes Arnaldo Carvalho de Melo
2015-10-22 22:14 ` [PATCH 1/8] tools lib traceevent: Support %ps/%pS Arnaldo Carvalho de Melo
2015-10-22 22:14 ` [PATCH 2/8] perf tools: Move callchain help messages to callchain.h Arnaldo Carvalho de Melo
2015-10-22 22:14 ` [PATCH 3/8] perf top: Support call-graph display options also Arnaldo Carvalho de Melo
2015-10-22 22:14 ` [PATCH 4/8] perf tools: Defaults to 'caller' callchain order only if --children is enabled Arnaldo Carvalho de Melo
2015-10-22 22:14 ` [PATCH 5/8] perf tools: Improve call graph documents and help messages Arnaldo Carvalho de Melo
2015-10-22 22:14 ` Arnaldo Carvalho de Melo [this message]
2015-10-22 22:14 ` [PATCH 7/8] perf ui tui: Register the error callbacks before initializing the widgets Arnaldo Carvalho de Melo
2015-10-22 22:14 ` [PATCH 8/8] perf annotate: Don't die() when finding an invalid config option Arnaldo Carvalho de Melo
2015-10-23 8:28 ` [GIT PULL 0/8] perf/core improvements and 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=1445552075-25155-7-git-send-email-acme@kernel.org \
--to=acme@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=dsahern@gmail.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mliska@suse.cz \
--cc=namhyung@kernel.org \
--cc=treeze.taeung@gmail.com \
/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.