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

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

perf ordered_events: Shorten function signatures 

By keeping pointers to machines, evlist and tool in ordered_events.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-0c6huyaf59mqtm2ek9pmposl@git.kernel.org


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

tools/perf/builtin-annotate.c

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static int __cmd_annotate(struct perf_annotate *ann) 
			goto out;

	}



	ret = perf_session__process_events(session, &ann->tool);

	ret = perf_session__process_events(session);

	if (ret)

		goto out;

tools/perf/builtin-buildid-list.c

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static int perf_session__list_build_ids(bool force, bool with_hits) 
	 * the record stream. Buildids are stored as RECORD_HEADER_BUILD_ID

	 */

	if (with_hits || perf_data_file__is_pipe(&file))

		perf_session__process_events(session, &build_id__mark_dso_hit_ops);

		perf_session__process_events(session);



	perf_session__fprintf_dsos_buildid(session, stdout, dso__skip_buildid, with_hits);

	perf_session__delete(session);

tools/perf/builtin-diff.c

+1 −1
Original line number Diff line number Diff line
@@ -747,7 +747,7 @@ static int __cmd_diff(void) 
			goto out_delete;

		}



		ret = perf_session__process_events(d->session, &tool);

		ret = perf_session__process_events(d->session);

		if (ret) {

			pr_err("Failed to process %s\n", d->file.path);

			goto out_delete;

tools/perf/builtin-inject.c

+3 −3
Original line number Diff line number Diff line
@@ -359,8 +359,6 @@ static int __cmd_inject(struct perf_inject *inject) 
	} else if (inject->sched_stat) {

		struct perf_evsel *evsel;



		inject->tool.ordered_events = true;



		evlist__for_each(session->evlist, evsel) {

			const char *name = perf_evsel__name(evsel);
@@ -379,7 +377,7 @@ static int __cmd_inject(struct perf_inject *inject) 
	if (!file_out->is_pipe)

		lseek(fd, session->header.data_offset, SEEK_SET);



	ret = perf_session__process_events(session, &inject->tool);

	ret = perf_session__process_events(session);



	if (!file_out->is_pipe) {

		if (inject->build_ids)
@@ -458,6 +456,8 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused) 
		return -1;

	}



	inject.tool.ordered_events = inject.sched_stat;



	file.path = inject.input_name;

	inject.session = perf_session__new(&file, true, &inject.tool);

	if (inject.session == NULL)

tools/perf/builtin-kmem.c

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ static int __cmd_kmem(struct perf_session *session) 
	}



	setup_pager();

	err = perf_session__process_events(session, &perf_kmem);

	err = perf_session__process_events(session);

	if (err != 0)

		goto out;

	sort_result();