perf annotate: Use global annotation_options

Now it can directly use the global options and no need to pass it as an
argument.

Reviewed-by: Ian Rogers <irogers@google.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20231128175441.721579-5-namhyung@kernel.org
[ Fixup build with GTK2=1 ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Namhyung Kim
2023-11-28 09:54:37 -08:00
committed by Arnaldo Carvalho de Melo
parent c9a21a872c
commit 41fd3cacd2
8 changed files with 71 additions and 89 deletions

View File

@@ -317,9 +317,9 @@ static int hist_entry__tty_annotate(struct hist_entry *he,
struct perf_annotate *ann)
{
if (!ann->use_stdio2)
return symbol__tty_annotate(&he->ms, evsel, &annotate_opts);
return symbol__tty_annotate(&he->ms, evsel);
return symbol__tty_annotate2(&he->ms, evsel, &annotate_opts);
return symbol__tty_annotate2(&he->ms, evsel);
}
static void hists__find_annotations(struct hists *hists,
@@ -365,7 +365,6 @@ find_next:
int ret;
int (*annotate)(struct hist_entry *he,
struct evsel *evsel,
struct annotation_options *options,
struct hist_browser_timer *hbt);
annotate = dlsym(perf_gtk_handle,
@@ -375,7 +374,7 @@ find_next:
return;
}
ret = annotate(he, evsel, &annotate_opts, NULL);
ret = annotate(he, evsel, NULL);
if (!ret || !ann->skip_missing)
return;