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

Commit ce9036a6 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

libperf: Include perf_evlist in evlist object 



Include perf_evlist in the evlist object, will continue to move other
generic things into libperf's perf_evlist.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20190721112506.12306-37-jolsa@kernel.org


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

tools/perf/builtin-record.c

+2 −2
Original line number Diff line number Diff line
@@ -1002,7 +1002,7 @@ static void record__init_features(struct record *rec) 
	if (rec->no_buildid)

		perf_header__clear_feat(&session->header, HEADER_BUILD_ID);



	if (!have_tracepoints(&rec->evlist->entries))

	if (!have_tracepoints(&rec->evlist->core.entries))

		perf_header__clear_feat(&session->header, HEADER_TRACING_DATA);



	if (!rec->opts.branch_stack)
@@ -1218,7 +1218,7 @@ static int record__synthesize(struct record *rec, bool tail) 
			return err;

		}



		if (have_tracepoints(&rec->evlist->entries)) {

		if (have_tracepoints(&rec->evlist->core.entries)) {

			/*

			 * FIXME err <= 0 here actually means that

			 * there were no tracepoints so its not really

tools/perf/builtin-sched.c

+1 −1
Original line number Diff line number Diff line
@@ -2929,7 +2929,7 @@ static int timehist_check_attr(struct perf_sched *sched, 
	struct evsel *evsel;

	struct evsel_runtime *er;



	list_for_each_entry(evsel, &evlist->entries, core.node) {

	list_for_each_entry(evsel, &evlist->core.entries, core.node) {

		er = perf_evsel__get_runtime(evsel);

		if (er == NULL) {

			pr_err("Failed to allocate memory for evsel runtime data\n");

tools/perf/builtin-trace.c

+1 −1
Original line number Diff line number Diff line
@@ -3980,7 +3980,7 @@ static int trace__parse_cgroups(const struct option *opt, const char *str, int u 
{

	struct trace *trace = opt->value;



	if (!list_empty(&trace->evlist->entries))

	if (!list_empty(&trace->evlist->core.entries))

		return parse_cgroups(opt, str, unset);



	trace->cgroup = evlist__findnew_cgroup(trace->evlist, str);

tools/perf/ui/browsers/hists.c

+3 −3
Original line number Diff line number Diff line
@@ -3309,13 +3309,13 @@ static int perf_evsel_menu__run(struct evsel_menu *menu, 
			ui_browser__show_title(&menu->b, title);

			switch (key) {

			case K_TAB:

				if (pos->core.node.next == &evlist->entries)

				if (pos->core.node.next == &evlist->core.entries)

					pos = perf_evlist__first(evlist);

				else

					pos = perf_evsel__next(pos);

				goto browse_hists;

			case K_UNTAB:

				if (pos->core.node.prev == &evlist->entries)

				if (pos->core.node.prev == &evlist->core.entries)

					pos = perf_evlist__last(evlist);

				else

					pos = perf_evsel__prev(pos);
@@ -3370,7 +3370,7 @@ static int __perf_evlist__tui_browse_hists(struct evlist *evlist, 
	struct evsel *pos;

	struct evsel_menu menu = {

		.b = {

			.entries    = &evlist->entries,

			.entries    = &evlist->core.entries,

			.refresh    = ui_browser__list_head_refresh,

			.seek	    = ui_browser__list_head_seek,

			.write	    = perf_evsel_menu__write,

tools/perf/util/cgroup.c

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ int parse_cgroups(const struct option *opt, const char *str, 
	char *s;

	int ret, i;



	if (list_empty(&evlist->entries)) {

	if (list_empty(&evlist->core.entries)) {

		fprintf(stderr, "must define events before cgroups\n");

		return -1;

	}