Commit 217b7d41 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf annotate: Add init/exit to annotation_options remove default 



The annotation__default_options global variable was used to initialize
annotation_options.  Switch to the init/exit pattern as later changes
will give ownership over strings and this will be necessary to avoid
memory leaks.

Committer note:

Fix the GTK2=1 build, hist_entry__gtk_annotate() needs to receive a
'struct annotation_options' pointer.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Andres Freund <andres@anarazel.de>
Cc: German Gomez <german.gomez@arm.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sandipan Das <sandipan.das@amd.com>
Cc: Tom Rix <trix@redhat.com>
Cc: llvm@lists.linux.dev
Link: https://lore.kernel.org/r/20230328235543.1082207-2-irogers@google.com


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

tools/perf/builtin-annotate.c

+4 −2
Original line number Diff line number Diff line
@@ -352,6 +352,7 @@ static void hists__find_annotations(struct hists *hists, 
			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,
@@ -361,7 +362,7 @@ static void hists__find_annotations(struct hists *hists, 
				return;

			}



			ret = annotate(he, evsel, NULL);

			ret = annotate(he, evsel, &ann->opts, NULL);

			if (!ret || !ann->skip_missing)

				return;
@@ -509,7 +510,6 @@ int cmd_annotate(int argc, const char **argv) 
			.ordered_events = true,

			.ordering_requires_timestamps = true,

		},

		.opts = annotation__default_options,

	};

	struct perf_data data = {

		.mode  = PERF_DATA_MODE_READ,
@@ -598,6 +598,7 @@ int cmd_annotate(int argc, const char **argv) 
	set_option_flag(options, 0, "show-total-period", PARSE_OPT_EXCLUSIVE);

	set_option_flag(options, 0, "show-nr-samples", PARSE_OPT_EXCLUSIVE);



	annotation_options__init(&annotate.opts);



	ret = hists__init();

	if (ret < 0)
@@ -698,6 +699,7 @@ int cmd_annotate(int argc, const char **argv) 
#ifndef NDEBUG

	perf_session__delete(annotate.session);

#endif

	annotation_options__exit(&annotate.opts);



	return ret;

}

tools/perf/builtin-report.c

+4 −3
Original line number Diff line number Diff line
@@ -728,8 +728,7 @@ static int hists__resort_cb(struct hist_entry *he, void *arg) 
	if (rep->symbol_ipc && sym && !sym->annotate2) {

		struct evsel *evsel = hists_to_evsel(he->hists);



		symbol__annotate2(&he->ms, evsel,

				  &annotation__default_options, NULL);

		symbol__annotate2(&he->ms, evsel, &rep->annotation_opts, NULL);

	}



	return 0;
@@ -1223,7 +1222,6 @@ int cmd_report(int argc, const char **argv) 
		.max_stack		 = PERF_MAX_STACK_DEPTH,

		.pretty_printing_style	 = "normal",

		.socket_filter		 = -1,

		.annotation_opts	 = annotation__default_options,

		.skip_empty		 = true,

	};

	char *sort_order_help = sort_help("sort by key(s):");
@@ -1403,6 +1401,8 @@ int cmd_report(int argc, const char **argv) 
	if (ret < 0)

		goto exit;



	annotation_options__init(&report.annotation_opts);



	ret = perf_config(report__config, &report);

	if (ret)

		goto exit;
@@ -1706,6 +1706,7 @@ int cmd_report(int argc, const char **argv) 
	zstd_fini(&(session->zstd_data));

	perf_session__delete(session);

exit:

	annotation_options__exit(&report.annotation_opts);

	free(sort_order_help);

	free(field_order_help);

	return ret;

tools/perf/builtin-top.c

+3 −1
Original line number Diff line number Diff line
@@ -1435,7 +1435,6 @@ int cmd_top(int argc, const char **argv) 
			.sample_time_set = true,

		},

		.max_stack	     = sysctl__max_stack(),

		.annotation_opts     = annotation__default_options,

		.nr_threads_synthesize = UINT_MAX,

	};

	struct record_opts *opts = &top.record_opts;
@@ -1587,6 +1586,8 @@ int cmd_top(int argc, const char **argv) 
	if (status < 0)

		return status;



	annotation_options__init(&top.annotation_opts);



	top.annotation_opts.min_pcnt = 5;

	top.annotation_opts.context  = 4;
@@ -1783,6 +1784,7 @@ int cmd_top(int argc, const char **argv) 
out_delete_evlist:

	evlist__delete(top.evlist);

	perf_session__delete(top.session);

	annotation_options__exit(&top.annotation_opts);



	return status;

}

tools/perf/ui/gtk/annotate.c

+4 −2
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ static int perf_gtk__annotate_symbol(GtkWidget *window, struct map_symbol *ms, 
}



static int symbol__gtk_annotate(struct map_symbol *ms, struct evsel *evsel,

				struct annotation_options *options,

				struct hist_browser_timer *hbt)

{

	struct symbol *sym = ms->sym;
@@ -174,7 +175,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, &annotation__default_options, NULL);

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

	if (err) {

		char msg[BUFSIZ];

		ms->map->dso->annotate_warned = true;
@@ -242,9 +243,10 @@ static int symbol__gtk_annotate(struct map_symbol *ms, struct evsel *evsel, 


int hist_entry__gtk_annotate(struct hist_entry *he,

			     struct evsel *evsel,

			     struct annotation_options *options,

			     struct hist_browser_timer *hbt)

{

	return symbol__gtk_annotate(&he->ms, evsel, hbt);

	return symbol__gtk_annotate(&he->ms, evsel, options, hbt);

}



void perf_gtk__show_annotations(void)

tools/perf/ui/gtk/gtk.h

+2 −0
Original line number Diff line number Diff line
@@ -56,11 +56,13 @@ struct evsel; 
struct evlist;

struct hist_entry;

struct hist_browser_timer;

struct annotation_options;



int evlist__gtk_browse_hists(struct evlist *evlist, const char *help,

			     struct hist_browser_timer *hbt, float min_pcnt);

int hist_entry__gtk_annotate(struct hist_entry *he,

			     struct evsel *evsel,

			     struct annotation_options *options,

			     struct hist_browser_timer *hbt);

void perf_gtk__show_annotations(void);