From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Jiri Olsa <jolsa@kernel.org>
Cc: He Kuang <hekuang@huawei.com>,
lkml <linux-kernel@vger.kernel.org>,
David Ahern <dsahern@gmail.com>, Ingo Molnar <mingo@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: Re: [PATCH 3/4] perf tools: Add initialized arg into unwind__prepare_access
Date: Mon, 4 Jul 2016 16:25:11 -0300 [thread overview]
Message-ID: <20160704192511.GX5324@kernel.org> (raw)
In-Reply-To: <1467634583-29147-4-git-send-email-jolsa@kernel.org>
Em Mon, Jul 04, 2016 at 02:16:22PM +0200, Jiri Olsa escreveu:
> Adding initialized arg into unwind__prepare_access
> to get feedback about the initialization state.
>
> It's not possible to get it from error code, because
> we return 0 even in case we don't recognize dso, which
> is valid.
>
> The 'initialized' value is used in following patch
> to speedup unwind__prepare_access calls logic in
> fork path.
>
> Cc: He Kuang <hekuang@huawei.com>
> Link: http://lkml.kernel.org/n/tip-vzmw5piz7diqa7rd6c49mjph@git.kernel.org
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
> tools/perf/util/thread.c | 2 +-
> tools/perf/util/unwind-libunwind.c | 11 +++++++++--
> tools/perf/util/unwind.h | 9 ++++++---
> 3 files changed, 16 insertions(+), 6 deletions(-)
>
> diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c
> index f30f9566fddc..2439b122a4e4 100644
> --- a/tools/perf/util/thread.c
> +++ b/tools/perf/util/thread.c
> @@ -202,7 +202,7 @@ int thread__insert_map(struct thread *thread, struct map *map)
> {
> int ret;
>
> - ret = unwind__prepare_access(thread, map);
> + ret = unwind__prepare_access(thread, map, NULL);
> if (ret)
> return ret;
>
> diff --git a/tools/perf/util/unwind-libunwind.c b/tools/perf/util/unwind-libunwind.c
> index 854711966cad..6d542a4e0648 100644
> --- a/tools/perf/util/unwind-libunwind.c
> +++ b/tools/perf/util/unwind-libunwind.c
> @@ -14,15 +14,19 @@ static void unwind__register_ops(struct thread *thread,
> thread->unwind_libunwind_ops = ops;
> }
>
> -int unwind__prepare_access(struct thread *thread, struct map *map)
> +int unwind__prepare_access(struct thread *thread, struct map *map,
> + bool *initialized)
> {
> const char *arch;
> enum dso_type dso_type;
> struct unwind_libunwind_ops *ops = local_unwind_libunwind_ops;
> + int err;
>
> if (thread->addr_space) {
> pr_debug("unwind: thread map already set, dso=%s\n",
> map->dso->name);
> + if (initialized)
> + *initialized = true;
> return 0;
> }
>
> @@ -51,7 +55,10 @@ int unwind__prepare_access(struct thread *thread, struct map *map)
> out_register:
> unwind__register_ops(thread, ops);
>
> - return thread->unwind_libunwind_ops->prepare_access(thread);
> + err = thread->unwind_libunwind_ops->prepare_access(thread);
> + if (initialized)
> + *initialized = err ? false : true;
> + return err;
> }
>
> void unwind__flush_access(struct thread *thread)
> diff --git a/tools/perf/util/unwind.h b/tools/perf/util/unwind.h
> index 84c6d44d52f9..17ea1f928f13 100644
> --- a/tools/perf/util/unwind.h
> +++ b/tools/perf/util/unwind.h
> @@ -42,12 +42,14 @@ int unwind__get_entries(unwind_entry_cb_t cb, void *arg,
> #endif
>
> int LIBUNWIND__ARCH_REG_ID(int regnum);
> -int unwind__prepare_access(struct thread *thread, struct map *map);
> +int unwind__prepare_access(struct thread *thread, struct map *map,
> + bool *initialized);
> void unwind__flush_access(struct thread *thread);
> void unwind__finish_access(struct thread *thread);
> #else
> static inline int unwind__prepare_access(struct thread *thread __maybe_unused,
> - struct map *map __maybe_unused)
> + struct map *map __maybe_unused,
> + bool *initialized __maybe_unused);
> {
> return 0;
> }
> @@ -67,7 +69,8 @@ unwind__get_entries(unwind_entry_cb_t cb __maybe_unused,
> }
>
> static inline int unwind__prepare_access(struct thread *thread __maybe_unused,
> - struct map *map __maybe_unused)
> + struct map *map __maybe_unused,
> + bool *initialized __maybe_unused);
> {
> return 0;
> }
That extra ; breaks the build on centos5 (i.e. on an arch where the
above code gets compiled:
CC /tmp/build/perf/bench/sched-pipe.o
In file included from util/machine.c:14:
util/unwind.h:74: error: expected identifier or '(' before '{' token
MKDIR /tmp/build/perf/tests/
CC /tmp/build/perf/tests/parse-events.o
mv: cannot stat `/tmp/build/perf/util/.machine.o.tmp': No such file or directory
make[3]: *** [/tmp/build/perf/util/machine.o] Error 1
make[3]: *** Waiting for unfinished jobs....
MKDIR /tmp/build/perf/tests/
CC /tmp/build/perf/tests/dso-data.o
make[2]: *** [util] Error 2
make[1]: *** [/tmp/build/perf/libperf-in.o] Error 2
make[1]: *** Waiting for unfinished jobs....
MKDIR /tmp/build/perf/tests/
Fixing it.
> --
> 2.4.11
next prev parent reply other threads:[~2016-07-04 19:25 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-04 12:16 [PATCHv2 0/4] perf tools: Various fixes Jiri Olsa
2016-07-04 12:16 ` [PATCH 1/4] perf tools: Transform nodes string info to struct Jiri Olsa
2016-07-05 10:20 ` [tip:perf/core] perf header: " tip-bot for Jiri Olsa
2016-07-04 12:16 ` [PATCH 2/4] perf tests: Fix hist accumulation test Jiri Olsa
2016-07-05 10:20 ` [tip:perf/core] " tip-bot for Jiri Olsa
2016-07-04 12:16 ` [PATCH 3/4] perf tools: Add initialized arg into unwind__prepare_access Jiri Olsa
2016-07-04 19:25 ` Arnaldo Carvalho de Melo [this message]
2016-07-05 6:20 ` Jiri Olsa
2016-07-05 10:21 ` [tip:perf/core] perf unwind: " tip-bot for Jiri Olsa
2016-07-04 12:16 ` [PATCH 4/4] perf tools: Call unwind__prepare_access for forked thread Jiri Olsa
2016-07-05 10:21 ` [tip:perf/core] perf unwind: " tip-bot for 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=20160704192511.GX5324@kernel.org \
--to=acme@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=dsahern@gmail.com \
--cc=hekuang@huawei.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--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).