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

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

perf annotate: Split allocation of annotated_source struct 

So that we can allocate just the notes->src->cyc_hist, that, unlike
notes->src->histograms, is not per event, and in paths where we
need to lazily allocate notes->src->cyc_hist we don't have the
number of events handy to also allocate ->histograms.

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-tsx7dhxzpi0criyx0sio3pz3@git.kernel.org


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

tools/perf/util/annotate.c

+7 −3
Original line number Diff line number Diff line
@@ -701,13 +701,17 @@ int symbol__alloc_hist(struct symbol *sym) 
	sizeof_sym_hist = (sizeof(struct sym_hist) + size * sizeof(struct sym_hist_entry));



	/* Check for overflow in zalloc argument */

	if (sizeof_sym_hist > (SIZE_MAX - sizeof(*notes->src))

				/ symbol_conf.nr_events)

	if (sizeof_sym_hist > SIZE_MAX / symbol_conf.nr_events)

		return -1;



	notes->src = zalloc(sizeof(*notes->src) + symbol_conf.nr_events * sizeof_sym_hist);

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

	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);

		return -1;

	}

	notes->src->sizeof_sym_hist = sizeof_sym_hist;

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

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

tools/perf/util/annotate.h

+3 −3
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ struct cyc_hist { 


/** struct annotated_source - symbols with hits have this attached as in sannotation

 *

 * @histogram: Array of addr hit histograms per event being monitored

 * @histograms: Array of addr hit histograms per event being monitored

 * @lines: If 'print_lines' is specified, per source code line percentages

 * @source: source parsed from a disassembler like objdump -dS

 * @cyc_hist: Average cycles per basic block
@@ -217,7 +217,7 @@ struct annotated_source { 
	int    		   nr_histograms;

	size_t		   sizeof_sym_hist;

	struct cyc_hist	   *cycles_hist;

	struct sym_hist	   histograms[0];

	struct sym_hist	   *histograms;

};



struct annotation {
@@ -269,7 +269,7 @@ void annotation__init_column_widths(struct annotation *notes, struct symbol *sym 


static inline struct sym_hist *annotation__histogram(struct annotation *notes, int idx)

{

	return (((void *)&notes->src->histograms) +

	return (((void *)notes->src->histograms) +

	 	(notes->src->sizeof_sym_hist * idx));

}