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

Commit ca396503 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf annotate: Introduce constructor/destructor for annotated_source 

More stuff will go in there, all the parts that are not needed when a
symbol had no samples and that were mistakenly added to 'struct
annotation'.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-u4761kyzhixw9ydk6kib3f0o@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 116c626b

tools/perf/util/annotate.c

+22 −3
Original line number Diff line number Diff line
@@ -678,6 +678,25 @@ static struct arch *arch__find(const char *name) 
	return bsearch(name, architectures, nmemb, sizeof(struct arch), arch__key_cmp);

}



static struct annotated_source *annotated_source__new(void)

{

	struct annotated_source *src = zalloc(sizeof(*src));



	if (src != NULL)

		INIT_LIST_HEAD(&src->source);



	return src;

}



static void annotated_source__delete(struct annotated_source *src)

{

	if (src == NULL)

		return;

	zfree(&src->histograms);

	zfree(&src->cycles_hist);

	free(src);

}



int symbol__alloc_hist(struct symbol *sym)

{

	struct annotation *notes = symbol__annotation(sym);
@@ -704,17 +723,17 @@ int symbol__alloc_hist(struct symbol *sym) 
	if (sizeof_sym_hist > SIZE_MAX / symbol_conf.nr_events)

		return -1;



	notes->src = zalloc(sizeof(*notes->src));

	notes->src = annotated_source__new();

	if (notes->src == NULL)

		return -1;

	notes->src->histograms = calloc(symbol_conf.nr_events, sizeof_sym_hist);

	if (notes->src->histograms == NULL) {

		zfree(&notes->src);

		annotated_source__delete(notes->src);

		notes->src = NULL;

		return -1;

	}

	notes->src->sizeof_sym_hist = sizeof_sym_hist;

	notes->src->nr_histograms   = symbol_conf.nr_events;

	INIT_LIST_HEAD(&notes->src->source);

	return 0;

}