[PATCH] perf tools: mark branch_info maps as referenced

[PATCH] perf tools: mark branch_info maps as referenced

[Stephane Eranian]

As noticed by Jiri, the hist_entry->branch_info.to/from maps
need to be marked as referenced to avoid problems later on.
So we do this when the hist_entry is allocated.

Signed-off-by: Stephane Eranian <eranian@google.com>
--

diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index cb17e2a..ab35b82 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -242,6 +242,14 @@ static struct hist_entry *hist_entry__new(struct hist_entry *template)
 
 		if (he->ms.map)
 			he->ms.map->referenced = true;
+
+		if (he->branch_info) {
+			if (he->branch_info->from.map)
+				he->branch_info->from.map->referenced = true;
+			if (he->branch_info->to.map)
+				he->branch_info->to.map->referenced = true;
+		}
+
 		if (symbol_conf.use_callchain)
 			callchain_init(he->callchain);
 

Re: [PATCH] perf tools: mark branch_info maps as referenced

[Jiri Olsa]

On Mon, Jan 14, 2013 at 03:02:45PM +0100, Stephane Eranian wrote:
> 
> As noticed by Jiri, the hist_entry->branch_info.to/from maps
> need to be marked as referenced to avoid problems later on.
> So we do this when the hist_entry is allocated.
> 
> Signed-off-by: Stephane Eranian <eranian@google.com>

Acked-by: Jiri Olsa <jolsa@redhat.com>

> --
> 
> diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
> index cb17e2a..ab35b82 100644
> --- a/tools/perf/util/hist.c
> +++ b/tools/perf/util/hist.c
> @@ -242,6 +242,14 @@ static struct hist_entry *hist_entry__new(struct hist_entry *template)
>  
>  		if (he->ms.map)
>  			he->ms.map->referenced = true;
> +
> +		if (he->branch_info) {
> +			if (he->branch_info->from.map)
> +				he->branch_info->from.map->referenced = true;
> +			if (he->branch_info->to.map)
> +				he->branch_info->to.map->referenced = true;
> +		}
> +
>  		if (symbol_conf.use_callchain)
>  			callchain_init(he->callchain);
>  

[tip:perf/core] perf tools: Mark branch_info maps as referenced

[tip-bot for Stephane Eranian]

Commit-ID:  3cf0cb1f899640f1eb8b3984739cfd70375c9c36
Gitweb:     http://git.kernel.org/tip/3cf0cb1f899640f1eb8b3984739cfd70375c9c36
Author:     Stephane Eranian <eranian@google.com>
AuthorDate: Mon, 14 Jan 2013 15:02:45 +0100
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Thu, 24 Jan 2013 16:40:38 -0300

perf tools: Mark branch_info maps as referenced

As noticed by Jiri, the hist_entry->branch_info.to/from maps need to be
marked as referenced to avoid problems later on.  So we do this when the
hist_entry is allocated.

Signed-off-by: Stephane Eranian <eranian@google.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20130114140245.GA4692@quad
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/hist.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 9485c70..8170a3d 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -245,6 +245,14 @@ static struct hist_entry *hist_entry__new(struct hist_entry *template)
 
 		if (he->ms.map)
 			he->ms.map->referenced = true;
+
+		if (he->branch_info) {
+			if (he->branch_info->from.map)
+				he->branch_info->from.map->referenced = true;
+			if (he->branch_info->to.map)
+				he->branch_info->to.map->referenced = true;
+		}
+
 		if (symbol_conf.use_callchain)
 			callchain_init(he->callchain);