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

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

perf evlist: Introduce perf_evlist__new_default function 



Adding new common function to create evlist with default event. It
spares some code lines in automated tests.

Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1378031796-17892-4-git-send-email-jolsa@redhat.com


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

tools/perf/tests/perf-record.c

+1 −11
Original line number Original line Diff line number Diff line
@@ -45,7 +45,7 @@ int test__PERF_RECORD(void) 
	};

	};

	cpu_set_t cpu_mask;

	cpu_set_t cpu_mask;

	size_t cpu_mask_size = sizeof(cpu_mask);

	size_t cpu_mask_size = sizeof(cpu_mask);

	struct perf_evlist *evlist = perf_evlist__new();

	struct perf_evlist *evlist = perf_evlist__new_default();

	struct perf_evsel *evsel;

	struct perf_evsel *evsel;

	struct perf_sample sample;

	struct perf_sample sample;

	const char *cmd = "sleep";

	const char *cmd = "sleep";
@@ -65,16 +65,6 @@ int test__PERF_RECORD(void) 
		goto out;

		goto out;

	}

	}





	/*

	 * We need at least one evsel in the evlist, use the default

	 * one: "cycles".

	 */

	err = perf_evlist__add_default(evlist);

	if (err < 0) {

		pr_debug("Not enough memory to create evsel\n");

		goto out_delete_evlist;

	}



	/*

	/*

	 * Create maps of threads and cpus to monitor. In this case

	 * Create maps of threads and cpus to monitor. In this case

	 * we start with all threads and cpus (-1, -1) but then in

	 * we start with all threads and cpus (-1, -1) but then in

tools/perf/tests/task-exit.c

+2 −12
Original line number Original line Diff line number Diff line
@@ -37,20 +37,11 @@ int test__task_exit(void) 
	signal(SIGCHLD, sig_handler);

	signal(SIGCHLD, sig_handler);

	signal(SIGUSR1, sig_handler);

	signal(SIGUSR1, sig_handler);





	evlist = perf_evlist__new();

	evlist = perf_evlist__new_default();

	if (evlist == NULL) {

	if (evlist == NULL) {

		pr_debug("perf_evlist__new\n");

		pr_debug("perf_evlist__new_default\n");

		return -1;

		return -1;

	}

	}

	/*

	 * We need at least one evsel in the evlist, use the default

	 * one: "cycles".

	 */

	err = perf_evlist__add_default(evlist);

	if (err < 0) {

		pr_debug("Not enough memory to create evsel\n");

		goto out_free_evlist;

	}





	/*

	/*

	 * Create maps of threads and cpus to monitor. In this case

	 * Create maps of threads and cpus to monitor. In this case
@@ -117,7 +108,6 @@ out_close_evlist: 
	perf_evlist__close(evlist);

	perf_evlist__close(evlist);

out_delete_maps:

out_delete_maps:

	perf_evlist__delete_maps(evlist);

	perf_evlist__delete_maps(evlist);

out_free_evlist:

	perf_evlist__delete(evlist);

	perf_evlist__delete(evlist);

	return err;

	return err;

}
 
}

tools/perf/util/evlist.c

+12 −0
Original line number Original line Diff line number Diff line
@@ -50,6 +50,18 @@ struct perf_evlist *perf_evlist__new(void) 
	return evlist;

	return evlist;

}

}





struct perf_evlist *perf_evlist__new_default(void)

{

	struct perf_evlist *evlist = perf_evlist__new();



	if (evlist && perf_evlist__add_default(evlist)) {

		perf_evlist__delete(evlist);

		evlist = NULL;

	}



	return evlist;

}



/**

/**

 * perf_evlist__set_id_pos - set the positions of event ids.

 * perf_evlist__set_id_pos - set the positions of event ids.

 * @evlist: selected event list

 * @evlist: selected event list

tools/perf/util/evlist.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -53,6 +53,7 @@ struct perf_evsel_str_handler { 
};

};





struct perf_evlist *perf_evlist__new(void);

struct perf_evlist *perf_evlist__new(void);

struct perf_evlist *perf_evlist__new_default(void);

void perf_evlist__init(struct perf_evlist *evlist, struct cpu_map *cpus,

void perf_evlist__init(struct perf_evlist *evlist, struct cpu_map *cpus,

		       struct thread_map *threads);

		       struct thread_map *threads);

void perf_evlist__exit(struct perf_evlist *evlist);

void perf_evlist__exit(struct perf_evlist *evlist);