Skip to content

Commit e0ad4d6

Browse files
Ravi Bangoriaacmel
authored andcommitted
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: Ravi Bangoria <[email protected]> Acked-by: Jiri Olsa <[email protected]> Cc: Ian Rogers <[email protected]> Cc: Jin Yao <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Song Liu <[email protected]> Link: http://lore.kernel.org/lkml/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent bd862b1 commit e0ad4d6

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

tools/perf/builtin-top.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ static int perf_top__parse_source(struct perf_top *top, struct hist_entry *he)
143143
return err;
144144
}
145145

146-
err = symbol__annotate(&he->ms, evsel, 0, &top->annotation_opts, NULL);
146+
err = symbol__annotate(&he->ms, evsel, &top->annotation_opts, NULL);
147147
if (err == 0) {
148148
top->sym_filter_entry = he;
149149
} else {

tools/perf/ui/gtk/annotate.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ static int symbol__gtk_annotate(struct map_symbol *ms, struct evsel *evsel,
174174
if (ms->map->dso->annotate_warned)
175175
return -1;
176176

177-
err = symbol__annotate(ms, evsel, 0, &annotation__default_options, NULL);
177+
err = symbol__annotate(ms, evsel, &annotation__default_options, NULL);
178178
if (err) {
179179
char msg[BUFSIZ];
180180
symbol__strerror_disassemble(ms, err, msg, sizeof(msg));

tools/perf/util/annotate.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2149,9 +2149,10 @@ void symbol__calc_percent(struct symbol *sym, struct evsel *evsel)
21492149
annotation__calc_percent(notes, evsel, symbol__size(sym));
21502150
}
21512151

2152-
int symbol__annotate(struct map_symbol *ms, struct evsel *evsel, size_t privsize,
2152+
int symbol__annotate(struct map_symbol *ms, struct evsel *evsel,
21532153
struct annotation_options *options, struct arch **parch)
21542154
{
2155+
size_t privsize = 0;
21552156
struct symbol *sym = ms->sym;
21562157
struct annotation *notes = symbol__annotation(sym);
21572158
struct annotate_args args = {
@@ -2790,7 +2791,7 @@ int symbol__tty_annotate(struct map_symbol *ms, struct evsel *evsel,
27902791
struct symbol *sym = ms->sym;
27912792
struct rb_root source_line = RB_ROOT;
27922793

2793-
if (symbol__annotate(ms, evsel, 0, opts, NULL) < 0)
2794+
if (symbol__annotate(ms, evsel, opts, NULL) < 0)
27942795
return -1;
27952796

27962797
symbol__calc_percent(sym, evsel);
@@ -3070,7 +3071,7 @@ int symbol__annotate2(struct map_symbol *ms, struct evsel *evsel,
30703071
if (perf_evsel__is_group_event(evsel))
30713072
nr_pcnt = evsel->core.nr_members;
30723073

3073-
err = symbol__annotate(ms, evsel, 0, options, parch);
3074+
err = symbol__annotate(ms, evsel, options, parch);
30743075
if (err)
30753076
goto out_free_offsets;
30763077

tools/perf/util/annotate.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ struct annotated_source *symbol__hists(struct symbol *sym, int nr_hists);
350350
void symbol__annotate_zero_histograms(struct symbol *sym);
351351

352352
int symbol__annotate(struct map_symbol *ms,
353-
struct evsel *evsel, size_t privsize,
353+
struct evsel *evsel,
354354
struct annotation_options *options,
355355
struct arch **parch);
356356
int symbol__annotate2(struct map_symbol *ms,

0 commit comments

Comments
 (0)