From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: Clark Williams <williams@redhat.com>,
linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
Arnaldo Carvalho de Melo <acme@redhat.com>,
Adrian Hunter <adrian.hunter@intel.com>,
David Ahern <dsahern@gmail.com>,
Namhyung Kim <namhyung@kernel.org>,
Wang Nan <wangnan0@huawei.com>
Subject: [PATCH 02/12] perf hists: Make hist_entry__has_callchains() work with 'perf c2c'
Date: Mon, 11 Jun 2018 14:48:00 -0300 [thread overview]
Message-ID: <20180611174810.14815-3-acme@kernel.org> (raw)
In-Reply-To: <20180611174810.14815-1-acme@kernel.org>
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Since 'perf c2c' uses 'struct hists' not allocated together with a
'struct perf_evsel' instance, we can't go from a 'struct hist_entry'
pointer to a 'struct perf_evsel' via he->hists, so, instead, check if
space was set aside for hist_entry->callchain[0] at hist_entry__new()
time.
Reported-by: Jin Yao <yao.jin@linux.intel.com>
Reported-by: Jiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Fixes: fabd37b837f6 ("perf hists: Check if a hist_entry has callchains before using them")
Link: https://lkml.kernel.org/n/tip-e8ife8djvvvwmeze3s4yodii@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/sort.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h
index 9ab9257ed887..8bf302cafcec 100644
--- a/tools/perf/util/sort.h
+++ b/tools/perf/util/sort.h
@@ -155,7 +155,7 @@ struct hist_entry {
static __pure inline bool hist_entry__has_callchains(struct hist_entry *he)
{
- return hists__has_callchains(he->hists);
+ return he->callchain_size != 0;
}
static inline bool hist_entry__has_pairs(struct hist_entry *he)
--
2.14.3
next prev parent reply other threads:[~2018-06-11 17:48 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-11 17:47 [GIT PULL 00/12] perf/urgent fixes and improvements Arnaldo Carvalho de Melo
2018-06-11 17:47 ` [PATCH 01/12] perf hists: Save the callchain_size in struct hist_entry Arnaldo Carvalho de Melo
2018-06-11 17:48 ` Arnaldo Carvalho de Melo [this message]
2018-06-11 17:48 ` [PATCH 03/12] perf hists browser gtk: Use hist_entry__has_callchains() Arnaldo Carvalho de Melo
2018-06-11 17:48 ` [PATCH 04/12] perf hists: Reimplement hists__has_callchains() Arnaldo Carvalho de Melo
2018-06-11 17:48 ` [PATCH 05/12] perf tools: Fix error index for pmu event parser Arnaldo Carvalho de Melo
2018-06-11 17:48 ` [PATCH 06/12] perf stat: Add --interval-clear option Arnaldo Carvalho de Melo
2018-06-11 17:48 ` [PATCH 07/12] perf stat: Use only color_fprintf call in print_metric_only Arnaldo Carvalho de Melo
2018-06-11 17:48 ` [PATCH 08/12] perf stat: Fix metric column header display alignment Arnaldo Carvalho de Melo
2018-06-11 17:48 ` [PATCH 09/12] perf stat: Allow to specify specific metric column len Arnaldo Carvalho de Melo
2018-06-11 17:48 ` [PATCH 10/12] perf stat: Add event parsing error handling to add_default_attributes Arnaldo Carvalho de Melo
2018-06-11 17:48 ` [PATCH 11/12] perf c2c: Keep struct hist_entry at the end of struct c2c_hist_entry Arnaldo Carvalho de Melo
2018-06-11 17:48 ` [PATCH 12/12] perf script: Show hw-cache events Arnaldo Carvalho de Melo
2018-06-14 6:13 ` [GIT PULL 00/12] perf/urgent fixes and improvements 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=20180611174810.14815-3-acme@kernel.org \
--to=acme@kernel.org \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=dsahern@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=wangnan0@huawei.com \
--cc=williams@redhat.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 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).