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

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

perf symbols: Add nr_events to symbol_conf 

Since symbol__alloc_hists need it, to avoid passing it around in many
functions have it in the symbol_conf struct.

Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-cwv8ysvpywzjq4v3xtbd4zwv@git.kernel.org


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

tools/perf/builtin-annotate.c

+8 −14
Original line number Diff line number Diff line
@@ -43,9 +43,8 @@ static const char *sym_hist_filter; 
static const char	*cpu_list;

static DECLARE_BITMAP(cpu_bitmap, MAX_NR_CPUS);



static int perf_evlist__add_sample(struct perf_evlist *evlist,

static int perf_evsel__add_sample(struct perf_evsel *evsel,

				  struct perf_sample *sample,

				   struct perf_evsel *evsel,

				  struct addr_location *al)

{

	struct hist_entry *he;
@@ -69,8 +68,7 @@ static int perf_evlist__add_sample(struct perf_evlist *evlist, 
	ret = 0;

	if (he->ms.sym != NULL) {

		struct annotation *notes = symbol__annotation(he->ms.sym);

		if (notes->src == NULL &&

		    symbol__alloc_hist(he->ms.sym, evlist->nr_entries) < 0)

		if (notes->src == NULL && symbol__alloc_hist(he->ms.sym) < 0)

			return -ENOMEM;



		ret = hist_entry__inc_addr_samples(he, evsel->idx, al->addr);
@@ -98,8 +96,7 @@ static int process_sample_event(union perf_event *event, 
	if (cpu_list && !test_bit(sample->cpu, cpu_bitmap))

		return 0;



	if (!al.filtered &&

	    perf_evlist__add_sample(session->evlist, sample, evsel, &al)) {

	if (!al.filtered && perf_evsel__add_sample(evsel, sample, &al)) {

		pr_warning("problem incrementing symbol count, "

			   "skipping event\n");

		return -1;
@@ -114,8 +111,7 @@ static int hist_entry__tty_annotate(struct hist_entry *he, int evidx) 
				    print_line, full_paths, 0, 0);

}



static void hists__find_annotations(struct hists *self, int evidx,

				    int nr_events)

static void hists__find_annotations(struct hists *self, int evidx)

{

	struct rb_node *nd = rb_first(&self->entries), *next;

	int key = K_RIGHT;
@@ -138,8 +134,7 @@ find_next: 
		}



		if (use_browser > 0) {

			key = hist_entry__tui_annotate(he, evidx, nr_events,

						       NULL, NULL, 0);

			key = hist_entry__tui_annotate(he, evidx, NULL, NULL, 0);

			switch (key) {

			case K_RIGHT:

				next = rb_next(nd);
@@ -217,8 +212,7 @@ static int __cmd_annotate(void) 
			total_nr_samples += nr_samples;

			hists__collapse_resort(hists);

			hists__output_resort(hists);

			hists__find_annotations(hists, pos->idx,

						session->evlist->nr_entries);

			hists__find_annotations(hists, pos->idx);

		}

	}

tools/perf/builtin-report.c

+1 −2
Original line number Diff line number Diff line
@@ -92,8 +92,7 @@ static int perf_session__add_hist_entry(struct perf_session *session, 
		assert(evsel != NULL);



		err = -ENOMEM;

		if (notes->src == NULL &&

		    symbol__alloc_hist(he->ms.sym, session->evlist->nr_entries) < 0)

		if (notes->src == NULL && symbol__alloc_hist(he->ms.sym) < 0)

			goto out;



		err = hist_entry__inc_addr_samples(he, evsel->idx, al->addr);

tools/perf/builtin-top.c

+4 −3
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static int parse_source(struct hist_entry *he) 


	pthread_mutex_lock(&notes->lock);



	if (symbol__alloc_hist(sym, top.evlist->nr_entries) < 0) {

	if (symbol__alloc_hist(sym) < 0) {

		pthread_mutex_unlock(&notes->lock);

		pr_err("Not enough memory for annotating '%s' symbol!\n",

		       sym->name);
@@ -210,8 +210,7 @@ static void record_precise_ip(struct hist_entry *he, int counter, u64 ip) 
	if (pthread_mutex_trylock(&notes->lock))

		return;



	if (notes->src == NULL &&

	    symbol__alloc_hist(sym, top.evlist->nr_entries) < 0) {

	if (notes->src == NULL && symbol__alloc_hist(sym) < 0) {

		pthread_mutex_unlock(&notes->lock);

		pr_err("Not enough memory for annotating '%s' symbol!\n",

		       sym->name);
@@ -1215,6 +1214,8 @@ int cmd_top(int argc, const char **argv, const char *prefix __used) 
		return -ENOMEM;

	}



	symbol_conf.nr_events = top.evlist->nr_entries;



	if (top.delay_secs < 1)

		top.delay_secs = 1;

tools/perf/util/annotate.c

+3 −3
Original line number Diff line number Diff line
@@ -25,17 +25,17 @@ int symbol__annotate_init(struct map *map __used, struct symbol *sym) 
	return 0;

}



int symbol__alloc_hist(struct symbol *sym, int nevents)

int symbol__alloc_hist(struct symbol *sym)

{

	struct annotation *notes = symbol__annotation(sym);

	size_t sizeof_sym_hist = (sizeof(struct sym_hist) +

				  (sym->end - sym->start) * sizeof(u64));



	notes->src = zalloc(sizeof(*notes->src) + nevents * sizeof_sym_hist);

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

	if (notes->src == NULL)

		return -1;

	notes->src->sizeof_sym_hist = sizeof_sym_hist;

	notes->src->nr_histograms   = nevents;

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

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

	return 0;

}

tools/perf/util/annotate.h

+2 −3
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static inline struct annotation *symbol__annotation(struct symbol *sym) 


int symbol__inc_addr_samples(struct symbol *sym, struct map *map,

			     int evidx, u64 addr);

int symbol__alloc_hist(struct symbol *sym, int nevents);

int symbol__alloc_hist(struct symbol *sym);

void symbol__annotate_zero_histograms(struct symbol *sym);



int symbol__annotate(struct symbol *sym, struct map *map, size_t privsize);
@@ -99,8 +99,7 @@ static inline int symbol__tui_annotate(struct symbol *sym __used, 
}

#else

int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx,

			 int nr_events, void(*timer)(void *arg), void *arg,

			 int delay_secs);

			 void(*timer)(void *arg), void *arg, int delay_secs);

#endif



extern const char	*disassembler_style;