Perf invoke symbol__init function twice when we input command "perf
kmem/sched record ls", then it will core dump when symbol__exit
invoked.
So give a flag to make symbol__init can be invoked once.
Signed-off-by: Jovi Zhang <[email protected]>
tools/perf/util/symbol.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 1a36773..aded121 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -43,6 +43,8 @@ struct symbol_conf symbol_conf = {
.try_vmlinux_path = true,
};
+static bool symbol_initizated;
+
int dso__name_len(const struct dso *self)
{
if (verbose)
@@ -2268,6 +2270,11 @@ static int setup_list(struct strlist **list,
const char *list_str,
int symbol__init(void)
{
+ if (symbol_initizated == true)
+ return 0;
+ else
+ symbol_initizated = true;
+
elf_version(EV_CURRENT);
if (symbol_conf.sort_by_name)
symbol_conf.priv_size += (sizeof(struct symbol_name_rb_node) -
@@ -2304,6 +2311,8 @@ out_free_comm_list:
void symbol__exit(void)
{
+ if (symbol_initizated == false)
+ return;
strlist__delete(symbol_conf.sym_list);
strlist__delete(symbol_conf.dso_list);
strlist__delete(symbol_conf.comm_list);
Em Tue, Aug 24, 2010 at 03:07:33PM +0800, jovi zhang escreveu:
> Perf invoke symbol__init function twice when we input command "perf
> kmem/sched record ls", then it will core dump when symbol__exit
> invoked.
> So give a flag to make symbol__init can be invoked once.
Yeah, this fixes the problem, and I'll apply this patch, but I think
that the elegant solution is to adopt one more kernel construct, i.e.
__init markings :)
Thanks!
- Arnaldo
> Signed-off-by: Jovi Zhang <[email protected]>
> tools/perf/util/symbol.c | ? ?9 +++++++++
> 1 files changed, 9 insertions(+), 0 deletions(-)
> diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
> index 1a36773..aded121 100644
> --- a/tools/perf/util/symbol.c
> +++ b/tools/perf/util/symbol.c
> @@ -43,6 +43,8 @@ struct symbol_conf symbol_conf = {
> ? ? ? ?.try_vmlinux_path = true,
> };
>
> +static bool symbol_initizated;
> +
> int dso__name_len(const struct dso *self)
> {
> ? ? ? ?if (verbose)
> @@ -2268,6 +2270,11 @@ static int setup_list(struct strlist **list,
> const char *list_str,
>
> int symbol__init(void)
> {
> + ? ? ? if (symbol_initizated == true)
> + ? ? ? ? ? ? ? return 0;
> + ? ? ? else
> + ? ? ? ? ? ? ? symbol_initizated = true;
> +
> ? ? ? ?elf_version(EV_CURRENT);
> ? ? ? ?if (symbol_conf.sort_by_name)
> ? ? ? ? ? ? ? ?symbol_conf.priv_size += (sizeof(struct symbol_name_rb_node) -
> @@ -2304,6 +2311,8 @@ out_free_comm_list:
>
> void symbol__exit(void)
> {
> + ? ? ? if (symbol_initizated == false)
> + ? ? ? ? ? ? ? return;
> ? ? ? ?strlist__delete(symbol_conf.sym_list);
> ? ? ? ?strlist__delete(symbol_conf.dso_list);
> ? ? ? ?strlist__delete(symbol_conf.comm_list);