Commit e0ad4d68 authored by Ravi Bangoria's avatar Ravi Bangoria Committed by Arnaldo Carvalho de Melo
Browse files

perf annotate: Remove privsize from symbol__annotate() args 



privsize is passed as 0 from all the symbol__annotate() callers.
Remove it from argument list.

Signed-off-by: default avatarRavi Bangoria <ravi.bangoria@linux.ibm.com>
Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Song Liu <songliubraving@fb.com>
Link: http://lore.kernel.org/lkml/20200204045233.474937-2-ravi.bangoria@linux.ibm.com


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

tools/perf/builtin-top.c

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ static int perf_top__parse_source(struct perf_top *top, struct hist_entry *he) 
		return err;

	}



	err = symbol__annotate(&he->ms, evsel, 0, &top->annotation_opts, NULL);

	err = symbol__annotate(&he->ms, evsel, &top->annotation_opts, NULL);

	if (err == 0) {

		top->sym_filter_entry = he;

	} else {

tools/perf/ui/gtk/annotate.c

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static int symbol__gtk_annotate(struct map_symbol *ms, struct evsel *evsel, 
	if (ms->map->dso->annotate_warned)

		return -1;



	err = symbol__annotate(ms, evsel, 0, &annotation__default_options, NULL);

	err = symbol__annotate(ms, evsel, &annotation__default_options, NULL);

	if (err) {

		char msg[BUFSIZ];

		symbol__strerror_disassemble(ms, err, msg, sizeof(msg));

tools/perf/util/annotate.c

+4 −3
Original line number Diff line number Diff line
@@ -2149,9 +2149,10 @@ void symbol__calc_percent(struct symbol *sym, struct evsel *evsel) 
	annotation__calc_percent(notes, evsel, symbol__size(sym));

}



int symbol__annotate(struct map_symbol *ms, struct evsel *evsel, size_t privsize,

int symbol__annotate(struct map_symbol *ms, struct evsel *evsel,

		     struct annotation_options *options, struct arch **parch)

{

	size_t privsize = 0;

	struct symbol *sym = ms->sym;

	struct annotation *notes = symbol__annotation(sym);

	struct annotate_args args = {
@@ -2790,7 +2791,7 @@ int symbol__tty_annotate(struct map_symbol *ms, struct evsel *evsel, 
	struct symbol *sym = ms->sym;

	struct rb_root source_line = RB_ROOT;



	if (symbol__annotate(ms, evsel, 0, opts, NULL) < 0)

	if (symbol__annotate(ms, evsel, opts, NULL) < 0)

		return -1;



	symbol__calc_percent(sym, evsel);
@@ -3070,7 +3071,7 @@ int symbol__annotate2(struct map_symbol *ms, struct evsel *evsel, 
	if (perf_evsel__is_group_event(evsel))

		nr_pcnt = evsel->core.nr_members;



	err = symbol__annotate(ms, evsel, 0, options, parch);

	err = symbol__annotate(ms, evsel, options, parch);

	if (err)

		goto out_free_offsets;

tools/perf/util/annotate.h

+1 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ struct annotated_source *symbol__hists(struct symbol *sym, int nr_hists); 
void symbol__annotate_zero_histograms(struct symbol *sym);



int symbol__annotate(struct map_symbol *ms,

		     struct evsel *evsel, size_t privsize,

		     struct evsel *evsel,

		     struct annotation_options *options,

		     struct arch **parch);

int symbol__annotate2(struct map_symbol *ms,

CRA Git | Maintained and supported by SUSTech CRA and CCSE