Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fd5578a authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf tools: Ditch the symbol_conf.nr_events global 

Since over time the places where we need to pass this got reduced
because we can obtain it from evsel->evlist->nr_entries, no need to have
this global anymore.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-ovhikrfj8pzdv93yq3gt6sei@git.kernel.org


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

tools/perf/builtin-kvm.c

+0 −2
Original line number Diff line number Diff line
@@ -1438,8 +1438,6 @@ static int kvm_events_live(struct perf_kvm_stat *kvm, 
		goto out;

	}



	symbol_conf.nr_events = kvm->evlist->nr_entries;



	if (perf_evlist__create_maps(kvm->evlist, &kvm->opts.target) < 0)

		usage_with_options(live_usage, live_options);

tools/perf/builtin-top.c

+0 −2
Original line number Diff line number Diff line
@@ -1462,8 +1462,6 @@ int cmd_top(int argc, const char **argv) 
		goto out_delete_evlist;

	}



	symbol_conf.nr_events = top.evlist->nr_entries;



	if (top.delay_secs < 1)

		top.delay_secs = 1;

tools/perf/util/header.c

+0 −4
Original line number Diff line number Diff line
@@ -3312,8 +3312,6 @@ int perf_session__read_header(struct perf_session *session) 
		lseek(fd, tmp, SEEK_SET);

	}



	symbol_conf.nr_events = nr_attrs;



	perf_header__process_sections(header, fd, &session->tevent,

				      perf_file_section__process);
@@ -3739,8 +3737,6 @@ int perf_event__process_attr(struct perf_tool *tool __maybe_unused, 
		perf_evlist__id_add(evlist, evsel, 0, i, event->attr.id[i]);

	}



	symbol_conf.nr_events = evlist->nr_entries;



	return 0;

}

tools/perf/util/symbol.h

+0 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ struct intlist; 


struct symbol_conf {

	unsigned short	priv_size;

	unsigned short	nr_events;

	bool		try_vmlinux_path,

			init_annotation,

			force,