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

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

perf tools: Stop using a global trace events description list 



The pevent thing is per perf.data file, so I made it stop being static
and become a perf_session member, so tools processing perf.data files
use perf_session and _there_ we read the trace events description into
session->pevent and then change everywhere to stop using that single
global pevent variable and use the per session one.

Note that it _doesn't_ fall backs to trace__event_id, as we're not
interested at all in what is present in the
/sys/kernel/debug/tracing/events in the workstation doing the analysis,
just in what is in the perf.data file.

This patch also introduces perf_session__set_tracepoints_handlers that
is the perf perf.data/session way to associate handlers to tracepoint
events by resolving their IDs using the events descriptions stored in a
perf.data file. Make 'perf sched' use it.

Reported-by: default avatarDmitry Antipov <dmitry.antipov@linaro.org>
Tested-by: default avatarDmitry Antipov <dmitry.antipov@linaro.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: linaro-dev@lists.linaro.org
Cc: patches@linaro.org
Link: http://lkml.kernel.org/r/20120625232016.GA28525@infradead.org


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

tools/perf/builtin-kmem.c

+25 −12
Original line number Diff line number Diff line
@@ -57,6 +57,11 @@ static unsigned long nr_allocs, nr_cross_allocs; 


#define PATH_SYS_NODE	"/sys/devices/system/node"



struct perf_kmem {

	struct perf_tool    tool;

	struct perf_session *session;

};



static void init_cpunode_map(void)

{

	FILE *fp;
@@ -278,14 +283,16 @@ static void process_free_event(void *data, 
	s_alloc->alloc_cpu = -1;

}



static void process_raw_event(union perf_event *raw_event __used, void *data,

static void process_raw_event(struct perf_tool *tool,

			      union perf_event *raw_event __used, void *data,

			      int cpu, u64 timestamp, struct thread *thread)

{

	struct perf_kmem *kmem = container_of(tool, struct perf_kmem, tool);

	struct event_format *event;

	int type;



	type = trace_parse_common_type(data);

	event = trace_find_event(type);

	type = trace_parse_common_type(kmem->session->pevent, data);

	event = pevent_find_event(kmem->session->pevent, type);



	if (!strcmp(event->name, "kmalloc") ||

	    !strcmp(event->name, "kmem_cache_alloc")) {
@@ -306,7 +313,7 @@ static void process_raw_event(union perf_event *raw_event __used, void *data, 
	}

}



static int process_sample_event(struct perf_tool *tool __used,

static int process_sample_event(struct perf_tool *tool,

				union perf_event *event,

				struct perf_sample *sample,

				struct perf_evsel *evsel __used,
@@ -322,16 +329,18 @@ static int process_sample_event(struct perf_tool *tool __used, 


	dump_printf(" ... thread: %s:%d\n", thread->comm, thread->pid);



	process_raw_event(event, sample->raw_data, sample->cpu,

	process_raw_event(tool, event, sample->raw_data, sample->cpu,

			  sample->time, thread);



	return 0;

}



static struct perf_tool perf_kmem = {

static struct perf_kmem perf_kmem = {

	.tool = {

		.sample			= process_sample_event,

		.comm			= perf_event__process_comm,

		.ordered_samples	= true,

	},

};



static double fragmentation(unsigned long n_req, unsigned long n_alloc)
@@ -486,11 +495,15 @@ static void sort_result(void) 
static int __cmd_kmem(void)

{

	int err = -EINVAL;

	struct perf_session *session = perf_session__new(input_name, O_RDONLY,

							 0, false, &perf_kmem);

	struct perf_session *session;



	session = perf_session__new(input_name, O_RDONLY, 0, false,

				    &perf_kmem.tool);

	if (session == NULL)

		return -ENOMEM;



	perf_kmem.session = session;



	if (perf_session__create_kernel_maps(session) < 0)

		goto out_delete;
@@ -498,7 +511,7 @@ static int __cmd_kmem(void) 
		goto out_delete;



	setup_pager();

	err = perf_session__process_events(session, &perf_kmem);

	err = perf_session__process_events(session, &perf_kmem.tool);

	if (err != 0)

		goto out_delete;

	sort_result();

tools/perf/builtin-lock.c

+2 −2
Original line number Diff line number Diff line
@@ -724,8 +724,8 @@ process_raw_event(void *data, int cpu, u64 timestamp, struct thread *thread) 
	struct event_format *event;

	int type;



	type = trace_parse_common_type(data);

	event = trace_find_event(type);

	type = trace_parse_common_type(session->pevent, data);

	event = pevent_find_event(session->pevent, type);



	if (!strcmp(event->name, "lock_acquire"))

		process_lock_acquire_event(data, event, cpu, timestamp, thread);

tools/perf/builtin-sched.c

+25 −11
Original line number Diff line number Diff line
@@ -43,6 +43,11 @@ static u64 sleep_measurement_overhead; 


static unsigned long		nr_tasks;



struct perf_sched {

	struct perf_tool    tool;

	struct perf_session *session;

};



struct sched_atom;



struct task_desc {
@@ -1597,6 +1602,8 @@ static int perf_sched__process_tracepoint_sample(struct perf_tool *tool, 
						 struct perf_evsel *evsel,

						 struct machine *machine)

{

	struct perf_sched *sched = container_of(tool, struct perf_sched, tool);

	struct pevent *pevent = sched->session->pevent;

	struct thread *thread = machine__findnew_thread(machine, sample->pid);



	if (thread == NULL) {
@@ -1612,7 +1619,8 @@ static int perf_sched__process_tracepoint_sample(struct perf_tool *tool, 
		tracepoint_handler f = evsel->handler.func;



		if (evsel->handler.data == NULL)

			evsel->handler.data = trace_find_event(evsel->attr.config);

			evsel->handler.data = pevent_find_event(pevent,

							  evsel->attr.config);



		f(tool, evsel->handler.data, sample, machine, thread);

	}
@@ -1620,12 +1628,14 @@ static int perf_sched__process_tracepoint_sample(struct perf_tool *tool, 
	return 0;

}



static struct perf_tool perf_sched = {

static struct perf_sched perf_sched = {

	.tool = {

		.sample		 = perf_sched__process_tracepoint_sample,

		.comm		 = perf_event__process_comm,

		.lost		 = perf_event__process_lost,

		.fork		 = perf_event__process_task,

		.ordered_samples = true,

	},

};



static void read_events(bool destroy, struct perf_session **psession)
@@ -1640,16 +1650,20 @@ static void read_events(bool destroy, struct perf_session **psession) 
		{ "sched:sched_process_exit", process_sched_exit_event, },

		{ "sched:sched_migrate_task", process_sched_migrate_task_event, },

	};

	struct perf_session *session = perf_session__new(input_name, O_RDONLY,

							 0, false, &perf_sched);

	struct perf_session *session;



	session = perf_session__new(input_name, O_RDONLY, 0, false,

				    &perf_sched.tool);

	if (session == NULL)

		die("No Memory");



	err = perf_evlist__set_tracepoints_handlers_array(session->evlist, handlers);

	perf_sched.session = session;



	err = perf_session__set_tracepoints_handlers(session, handlers);

	assert(err == 0);



	if (perf_session__has_traces(session, "record -R")) {

		err = perf_session__process_events(session, &perf_sched);

		err = perf_session__process_events(session, &perf_sched.tool);

		if (err)

			die("Failed to process events, error %d", err);

tools/perf/builtin-script.c

+44 −22
Original line number Diff line number Diff line
@@ -28,6 +28,11 @@ static bool system_wide; 
static const char		*cpu_list;

static DECLARE_BITMAP(cpu_bitmap, MAX_NR_CPUS);



struct perf_script {

	struct perf_tool    tool;

	struct perf_session *session;

};



enum perf_output_field {

	PERF_OUTPUT_COMM            = 1U << 0,

	PERF_OUTPUT_TID             = 1U << 1,
@@ -257,7 +262,8 @@ static int perf_session__check_output_opt(struct perf_session *session) 
	return 0;

}



static void print_sample_start(struct perf_sample *sample,

static void print_sample_start(struct pevent *pevent,

			       struct perf_sample *sample,

			       struct thread *thread,

			       struct perf_evsel *evsel)

{
@@ -302,8 +308,14 @@ static void print_sample_start(struct perf_sample *sample, 


	if (PRINT_FIELD(EVNAME)) {

		if (attr->type == PERF_TYPE_TRACEPOINT) {

			type = trace_parse_common_type(sample->raw_data);

			event = trace_find_event(type);

			/*

			 * XXX Do we really need this here?

			 * perf_evlist__set_tracepoint_names should have done

			 * this already

			 */

			type = trace_parse_common_type(pevent,

						       sample->raw_data);

			event = pevent_find_event(pevent, type);

			if (event)

				evname = event->name;

		} else
@@ -404,6 +416,7 @@ static void print_sample_bts(union perf_event *event, 
}



static void process_event(union perf_event *event __unused,

			  struct pevent *pevent,

			  struct perf_sample *sample,

			  struct perf_evsel *evsel,

			  struct machine *machine,
@@ -414,7 +427,7 @@ static void process_event(union perf_event *event __unused, 
	if (output[attr->type].fields == 0)

		return;



	print_sample_start(sample, thread, evsel);

	print_sample_start(pevent, sample, thread, evsel);



	if (is_bts_event(attr)) {

		print_sample_bts(event, sample, evsel, machine, thread);
@@ -422,7 +435,7 @@ static void process_event(union perf_event *event __unused, 
	}



	if (PRINT_FIELD(TRACE))

		print_trace_event(sample->cpu, sample->raw_data,

		print_trace_event(pevent, sample->cpu, sample->raw_data,

				  sample->raw_size);



	if (PRINT_FIELD(ADDR))
@@ -453,7 +466,8 @@ static int default_stop_script(void) 
	return 0;

}



static int default_generate_script(const char *outfile __unused)

static int default_generate_script(struct pevent *pevent __unused,

				   const char *outfile __unused)

{

	return 0;

}
@@ -491,6 +505,7 @@ static int process_sample_event(struct perf_tool *tool __used, 
				struct machine *machine)

{

	struct addr_location al;

	struct perf_script *scr = container_of(tool, struct perf_script, tool);

	struct thread *thread = machine__findnew_thread(machine, event->ip.tid);



	if (thread == NULL) {
@@ -522,13 +537,15 @@ static int process_sample_event(struct perf_tool *tool __used, 
	if (cpu_list && !test_bit(sample->cpu, cpu_bitmap))

		return 0;



	scripting_ops->process_event(event, sample, evsel, machine, thread);

	scripting_ops->process_event(event, scr->session->pevent,

				     sample, evsel, machine, thread);



	evsel->hists.stats.total_period += sample->period;

	return 0;

}



static struct perf_tool perf_script = {

static struct perf_script perf_script = {

	.tool = {

		.sample		 = process_sample_event,

		.mmap		 = perf_event__process_mmap,

		.comm		 = perf_event__process_comm,
@@ -540,6 +557,7 @@ static struct perf_tool perf_script = { 
		.build_id	 = perf_event__process_build_id,

		.ordered_samples = true,

		.ordering_requires_timestamps = true,

	},

};



extern volatile int session_done;
@@ -555,7 +573,7 @@ static int __cmd_script(struct perf_session *session) 


	signal(SIGINT, sig_handler);



	ret = perf_session__process_events(session, &perf_script);

	ret = perf_session__process_events(session, &perf_script.tool);



	if (debug_mode)

		pr_err("Misordered timestamps: %" PRIu64 "\n", nr_unordered);
@@ -1337,10 +1355,13 @@ int cmd_script(int argc, const char **argv, const char *prefix __used) 
	if (!script_name)

		setup_pager();



	session = perf_session__new(input_name, O_RDONLY, 0, false, &perf_script);

	session = perf_session__new(input_name, O_RDONLY, 0, false,

				    &perf_script.tool);

	if (session == NULL)

		return -ENOMEM;



	perf_script.session = session;



	if (cpu_list) {

		if (perf_session__cpu_bitmap(session, cpu_list, cpu_bitmap))

			return -1;
@@ -1386,7 +1407,8 @@ int cmd_script(int argc, const char **argv, const char *prefix __used) 
			return -1;

		}



		err = scripting_ops->generate_script("perf-script");

		err = scripting_ops->generate_script(session->pevent,

						     "perf-script");

		goto out;

	}

tools/perf/util/evlist.c

+2 −2
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ int perf_evlist__add_tracepoints(struct perf_evlist *evlist, 
	return err;

}



static struct perf_evsel *

struct perf_evsel *

perf_evlist__find_tracepoint_by_id(struct perf_evlist *evlist, int id)

{

	struct perf_evsel *evsel;