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

Commit ec913369 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by Ingo Molnar
Browse files

perf session: Reduce the number of parms to perf_session__process_events 



By having the cwd/cwdlen in the perf_session struct and
full_paths in perf_event_ops.

Now its just a matter of passing the ops.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1260741029-4430-4-git-send-email-acme@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 13df45ca

tools/perf/builtin-annotate.c

+1 −2
Original line number Diff line number Diff line
@@ -469,8 +469,7 @@ static int __cmd_annotate(void) 
	if (session == NULL)

		return -ENOMEM;



	ret = perf_session__process_events(session, &event_ops, 0,

					   &event__cwdlen, &event__cwd);

	ret = perf_session__process_events(session, &event_ops);

	if (ret)

		goto out_delete;

tools/perf/builtin-kmem.c

+1 −2
Original line number Diff line number Diff line
@@ -372,8 +372,7 @@ static int read_events(void) 
	if (session == NULL)

		return -ENOMEM;



	err = perf_session__process_events(session, &event_ops, 0,

					   &event__cwdlen, &event__cwd);

	err = perf_session__process_events(session, &event_ops);

	perf_session__delete(session);

	return err;

}

tools/perf/builtin-report.c

+2 −4
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ static struct strlist *dso_list, *comm_list, *sym_list; 


static int		force;



static int		full_paths;

static int		show_nr_samples;



static int		show_threads;
@@ -771,8 +770,7 @@ static int __cmd_report(void) 
	if (show_threads)

		perf_read_values_init(&show_threads_values);



	ret = perf_session__process_events(session, &event_ops, full_paths,

					   &event__cwdlen, &event__cwd);

	ret = perf_session__process_events(session, &event_ops);

	if (ret)

		goto out_delete;
@@ -877,7 +875,7 @@ static const struct option options[] = { 
		   "pretty printing style key: normal raw"),

	OPT_STRING('s', "sort", &sort_order, "key[,key2...]",

		   "sort by key(s): pid, comm, dso, symbol, parent"),

	OPT_BOOLEAN('P', "full-paths", &full_paths,

	OPT_BOOLEAN('P', "full-paths", &event_ops.full_paths,

		    "Don't shorten the pathnames taking into account the cwd"),

	OPT_STRING('p', "parent", &parent_pattern, "regex",

		   "regex filter to identify parent, see: '--sort parent'"),

tools/perf/builtin-sched.c

+1 −2
Original line number Diff line number Diff line
@@ -1670,8 +1670,7 @@ static int read_events(void) 
	if (session == NULL)

		return -ENOMEM;



	err = perf_session__process_events(session, &event_ops, 0,

					   &event__cwdlen, &event__cwd);

	err = perf_session__process_events(session, &event_ops);

	perf_session__delete(session);

	return err;

}

tools/perf/builtin-timechart.c

+1 −2
Original line number Diff line number Diff line
@@ -1062,8 +1062,7 @@ static int __cmd_timechart(void) 
	if (session == NULL)

		return -ENOMEM;



	ret = perf_session__process_events(session, &event_ops, 0,

					   &event__cwdlen, &event__cwd);

	ret = perf_session__process_events(session, &event_ops);

	if (ret)

		goto out_delete;