Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2873325 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf unwind: Add initialized arg into unwind__prepare_access 



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.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1467634583-29147-4-git-send-email-jolsa@kernel.org


[ Remove ; after static inline function signatures, fixes build break ]
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 347ca878

tools/perf/util/thread.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -202,7 +202,7 @@ int thread__insert_map(struct thread *thread, struct map *map) 
{

{

	int ret;

	int ret;





	ret = unwind__prepare_access(thread, map);

	ret = unwind__prepare_access(thread, map, NULL);

	if (ret)

	if (ret)

		return ret;

		return ret;

tools/perf/util/unwind-libunwind.c

+9 −2
Original line number Original line Diff line number Diff line
@@ -14,15 +14,19 @@ static void unwind__register_ops(struct thread *thread, 
	thread->unwind_libunwind_ops = ops;

	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;

	const char *arch;

	enum dso_type dso_type;

	enum dso_type dso_type;

	struct unwind_libunwind_ops *ops = local_unwind_libunwind_ops;

	struct unwind_libunwind_ops *ops = local_unwind_libunwind_ops;

	int err;





	if (thread->addr_space) {

	if (thread->addr_space) {

		pr_debug("unwind: thread map already set, dso=%s\n",

		pr_debug("unwind: thread map already set, dso=%s\n",

			 map->dso->name);

			 map->dso->name);

		if (initialized)

			*initialized = true;

		return 0;

		return 0;

	}

	}
@@ -51,7 +55,10 @@ int unwind__prepare_access(struct thread *thread, struct map *map) 
out_register:

out_register:

	unwind__register_ops(thread, ops);

	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)

void unwind__flush_access(struct thread *thread)

tools/perf/util/unwind.h

+6 −3
Original line number Original line Diff line number Diff line
@@ -42,12 +42,14 @@ int unwind__get_entries(unwind_entry_cb_t cb, void *arg, 
#endif

#endif





int LIBUNWIND__ARCH_REG_ID(int regnum);

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__flush_access(struct thread *thread);

void unwind__finish_access(struct thread *thread);

void unwind__finish_access(struct thread *thread);

#else

#else

static inline int unwind__prepare_access(struct thread *thread __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;

	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,

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;

	return 0;

}

}