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

Commit b809ac10 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf evlist: Make create_maps() take struct perf_target 



Now we have all information that needed to create cpu/thread maps in
struct perf_target, it'd be better using it as an argument.

Signed-off-by: default avatarNamhyung Kim <namhyung.kim@lge.com>
Reviewed-by: default avatarDavid Ahern <dsahern@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1335417327-11796-6-git-send-email-namhyung.kim@lge.com


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

tools/perf/builtin-record.c

+1 −3
Original line number Diff line number Diff line
@@ -891,9 +891,7 @@ int cmd_record(int argc, const char **argv, const char *prefix __used) 
	    rec->opts.target.uid == UINT_MAX - 1)

		goto out_free_fd;



	if (perf_evlist__create_maps(evsel_list, rec->opts.target.pid,

				     rec->opts.target.tid, rec->opts.target.uid,

				     rec->opts.target.cpu_list) < 0)

	if (perf_evlist__create_maps(evsel_list, &rec->opts.target) < 0)

		usage_with_options(record_usage, record_options);



	list_for_each_entry(pos, &evsel_list->entries, node) {

tools/perf/builtin-test.c

+4 −3
Original line number Diff line number Diff line
@@ -1165,6 +1165,9 @@ static int sched__get_first_possible_cpu(pid_t pid, cpu_set_t **maskp, 
static int test__PERF_RECORD(void)

{

	struct perf_record_opts opts = {

		.target = {

			.uid = UINT_MAX,

		},

		.no_delay   = true,

		.freq	    = 10,

		.mmap_pages = 256,
@@ -1207,9 +1210,7 @@ static int test__PERF_RECORD(void) 
	 * perf_evlist__prepare_workload we'll fill in the only thread

	 * we're monitoring, the one forked there.

	 */

	err = perf_evlist__create_maps(evlist, opts.target.pid,

				       opts.target.tid, UINT_MAX,

				       opts.target.cpu_list);

	err = perf_evlist__create_maps(evlist, &opts.target);

	if (err < 0) {

		pr_debug("Not enough memory to create thread/cpu maps\n");

		goto out_delete_evlist;

tools/perf/builtin-top.c

+1 −3
Original line number Diff line number Diff line
@@ -1258,9 +1258,7 @@ int cmd_top(int argc, const char **argv, const char *prefix __used) 
	if (top.target.uid_str != NULL && top.target.uid == UINT_MAX - 1)

		goto out_delete_evlist;



	if (perf_evlist__create_maps(top.evlist, top.target.pid,

				     top.target.tid, top.target.uid,

				     top.target.cpu_list) < 0)

	if (perf_evlist__create_maps(top.evlist, &top.target) < 0)

		usage_with_options(top_usage, options);



	if (!top.evlist->nr_entries &&

tools/perf/util/evlist.c

+7 −5
Original line number Diff line number Diff line
@@ -599,18 +599,20 @@ int perf_evlist__mmap(struct perf_evlist *evlist, unsigned int pages, 
	return perf_evlist__mmap_per_cpu(evlist, prot, mask);

}



int perf_evlist__create_maps(struct perf_evlist *evlist, const char *target_pid,

			     const char *target_tid, uid_t uid, const char *cpu_list)

int perf_evlist__create_maps(struct perf_evlist *evlist,

			     struct perf_target *target)

{

	evlist->threads = thread_map__new_str(target_pid, target_tid, uid);

	evlist->threads = thread_map__new_str(target->pid, target->tid,

					      target->uid);



	if (evlist->threads == NULL)

		return -1;



	if (uid != UINT_MAX || (cpu_list == NULL && target_tid))

	if (target->uid != UINT_MAX ||

	    (target->cpu_list == NULL && target->tid))

		evlist->cpus = cpu_map__dummy_new();

	else

		evlist->cpus = cpu_map__new(cpu_list);

		evlist->cpus = cpu_map__new(target->cpu_list);



	if (evlist->cpus == NULL)

		goto out_delete_threads;

tools/perf/util/evlist.h

+2 −2
Original line number Diff line number Diff line
@@ -106,8 +106,8 @@ static inline void perf_evlist__set_maps(struct perf_evlist *evlist, 
	evlist->threads	= threads;

}



int perf_evlist__create_maps(struct perf_evlist *evlist, const char *target_pid,

			     const char *tid, uid_t uid, const char *cpu_list);

int perf_evlist__create_maps(struct perf_evlist *evlist,

			     struct perf_target *target);

void perf_evlist__delete_maps(struct perf_evlist *evlist);

int perf_evlist__set_filters(struct perf_evlist *evlist);