Re: [PATCHSET 0/8] perf annotate: Make annotation_options global (v1)

From: Ian Rogers
Date: Thu Dec 07 2023 - 15:14:40 EST


On Thu, Dec 7, 2023 at 11:52 AM Arnaldo Carvalho de Melo
<acme@xxxxxxxxxx> wrote:
>
> Em Thu, Dec 07, 2023 at 04:50:30PM -0300, Arnaldo Carvalho de Melo escreveu:
> > Em Tue, Dec 05, 2023 at 09:59:02AM -0800, Ian Rogers escreveu:
> > > On Mon, Dec 4, 2023 at 2:46 PM Namhyung Kim <namhyung@xxxxxxxxxx> wrote:
> > > > On Thu, Nov 30, 2023 at 10:37 AM Ian Rogers <irogers@xxxxxxxxxx> wrote:
> > > > > Sgtm. My point wasn't to criticize, I think this is a good change, I
> > > > > was just trying to imagine doing things in a way that could overall
> > > > > reduce complexity
> >
> > > > Yep, thanks for your review. Can I get your ACKs? :)
> >
> > > For the series:
> > > Reviewed-by: Ian Rogers <irogers@xxxxxxxxxx>
> >
> > Thanks, applied to perf-tools-next.
>
>
> Now trying to fix this:
>
> CC bench/numa.o
> CC tests/hists_cumulate.o
> ui/gtk/annotate.c: In function ‘symbol__gtk_annotate’:
> ui/gtk/annotate.c:179:43: error: passing argument 3 of ‘symbol__annotate’ from incompatible pointer type [-Werror=incompatible-pointer-types]
> 179 | err = symbol__annotate(ms, evsel, options, NULL);
> | ^~~~~~~
> | |
> | struct annotation_options *
> In file included from ui/gtk/annotate.c:5:
> /home/acme/git/perf-tools-next/tools/perf/util/annotate.h:376:36: note: expected ‘struct arch **’ but argument is of type ‘struct annotation_options *’
> 376 | struct arch **parch);
> | ~~~~~~~~~~~~~~^~~~~
> ui/gtk/annotate.c:179:15: error: too many arguments to function ‘symbol__annotate’
> 179 | err = symbol__annotate(ms, evsel, options, NULL);
> | ^~~~~~~~~~~~~~~~
> /home/acme/git/perf-tools-next/tools/perf/util/annotate.h:374:5: note: declared here
> 374 | int symbol__annotate(struct map_symbol *ms,
> | ^~~~~~~~~~~~~~~~
> cc1: all warnings being treated as errors
> CC tests/python-use.o
> CC trace/beauty/sockaddr.o
> CC arch/x86/util/topdown.o
> make[6]: *** [/home/acme/git/perf-tools-next/tools/build/Makefile.build:105: ui/gtk/annotate.o] Error 1
> make[6]: *** Waiting for unfinished jobs....
> CC arch/x86/util/machine.o

Maybe a signal to remove the gtk support :-)

Ian