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

perf evsel: Cache associated event_format 



We already lookup the associated event_format when reading the perf.data
header, so that we can cache the tracepoint name in evsel->name, so do
it a little further and save the event_format itself, so that we can
avoid relookups in tools that need to access it.

Change the tools to take the most obvious advantage, when they were
using pevent_find_event directly. More work is needed for further
removing the need of a pointer to pevent, such as when asking for event
field values ("common_pid" and the other common fields and per
event_format fields).

This is something that was planned but only got actually done when
Andrey Wagin needed to do this lookup at perf_tool->sample() time, when
we don't have access to pevent (session->pevent) to use with
pevent_find_event().

Cc: Andrey Wagin <avagin@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Link: http://lkml.kernel.org/n/tip-txkvew2ckko0b594ae8fbnyk@git.kernel.org


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

tools/perf/builtin-kmem.c

+12 −27
Original line number Original line Diff line number Diff line 
#include "builtin.h"

#include "builtin.h"

#include "perf.h"

#include "perf.h"





#include "util/evsel.h"

#include "util/util.h"

#include "util/util.h"

#include "util/cache.h"

#include "util/cache.h"

#include "util/symbol.h"

#include "util/symbol.h"
@@ -57,11 +58,6 @@ static unsigned long nr_allocs, nr_cross_allocs; 




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

#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)

static void init_cpunode_map(void)

{

{

	FILE *fp;

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

	s_alloc->alloc_cpu = -1;

}

}





static void process_raw_event(struct perf_tool *tool,

static void process_raw_event(struct perf_evsel *evsel, void *data,

			      union perf_event *raw_event __used, void *data,

			      int cpu, u64 timestamp, struct thread *thread)

			      int cpu, u64 timestamp, struct thread *thread)

{

{

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

	struct event_format *event = evsel->tp_format;

	struct event_format *event;

	int type;



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

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





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

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

	    !strcmp(event->name, "kmem_cache_alloc")) {

	    !strcmp(event->name, "kmem_cache_alloc")) {
@@ -313,10 +303,10 @@ static void process_raw_event(struct perf_tool *tool, 
	}

	}

}

}





static int process_sample_event(struct perf_tool *tool,

static int process_sample_event(struct perf_tool *tool __used,

				union perf_event *event,

				union perf_event *event,

				struct perf_sample *sample,

				struct perf_sample *sample,

				struct perf_evsel *evsel __used,

				struct perf_evsel *evsel,

				struct machine *machine)

				struct machine *machine)

{

{

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

	struct thread *thread = machine__findnew_thread(machine, event->ip.pid);
@@ -329,18 +319,16 @@ static int process_sample_event(struct perf_tool *tool, 




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

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





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

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

			  sample->time, thread);

			  sample->time, thread);





	return 0;

	return 0;

}

}





static struct perf_kmem perf_kmem = {

static struct perf_tool perf_kmem = {

	.tool = {

	.sample		 = process_sample_event,

	.sample		 = process_sample_event,

	.comm		 = perf_event__process_comm,

	.comm		 = perf_event__process_comm,

	.ordered_samples = true,

	.ordered_samples = true,

	},

};

};





static double fragmentation(unsigned long n_req, unsigned long n_alloc)

static double fragmentation(unsigned long n_req, unsigned long n_alloc)
@@ -497,13 +485,10 @@ static int __cmd_kmem(void) 
	int err = -EINVAL;

	int err = -EINVAL;

	struct perf_session *session;

	struct perf_session *session;





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

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

				    &perf_kmem.tool);

	if (session == NULL)

	if (session == NULL)

		return -ENOMEM;

		return -ENOMEM;





	perf_kmem.session = session;



	if (perf_session__create_kernel_maps(session) < 0)

	if (perf_session__create_kernel_maps(session) < 0)

		goto out_delete;

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

		goto out_delete;





	setup_pager();

	setup_pager();

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

	err = perf_session__process_events(session, &perf_kmem);

	if (err != 0)

	if (err != 0)

		goto out_delete;

		goto out_delete;

	sort_result();

	sort_result();

tools/perf/builtin-lock.c

+6 −9
Original line number Original line Diff line number Diff line 
#include "builtin.h"

#include "builtin.h"

#include "perf.h"

#include "perf.h"





#include "util/evsel.h"

#include "util/util.h"

#include "util/util.h"

#include "util/cache.h"

#include "util/cache.h"

#include "util/symbol.h"

#include "util/symbol.h"
@@ -718,14 +719,10 @@ process_lock_release_event(void *data, 
		trace_handler->release_event(&release_event, event, cpu, timestamp, thread);

		trace_handler->release_event(&release_event, event, cpu, timestamp, thread);

}

}





static void

static void process_raw_event(struct perf_evsel *evsel, void *data, int cpu,

process_raw_event(void *data, int cpu, u64 timestamp, struct thread *thread)

			      u64 timestamp, struct thread *thread)

{

{

	struct event_format *event;

	struct event_format *event = evsel->tp_format;

	int type;



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

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





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

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

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

		process_lock_acquire_event(data, event, cpu, timestamp, thread);
@@ -849,7 +846,7 @@ static void dump_info(void) 
static int process_sample_event(struct perf_tool *tool __used,

static int process_sample_event(struct perf_tool *tool __used,

				union perf_event *event,

				union perf_event *event,

				struct perf_sample *sample,

				struct perf_sample *sample,

				struct perf_evsel *evsel __used,

				struct perf_evsel *evsel,

				struct machine *machine)

				struct machine *machine)

{

{

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

	struct thread *thread = machine__findnew_thread(machine, sample->tid);
@@ -860,7 +857,7 @@ static int process_sample_event(struct perf_tool *tool __used, 
		return -1;

		return -1;

	}

	}





	process_raw_event(sample->raw_data, sample->cpu, sample->time, thread);

	process_raw_event(evsel, sample->raw_data, sample->cpu, sample->time, thread);





	return 0;

	return 0;

}

}

tools/perf/builtin-sched.c

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




static unsigned long		nr_tasks;

static unsigned long		nr_tasks;





struct perf_sched {

	struct perf_tool    tool;

	struct perf_session *session;

};



struct sched_atom;

struct sched_atom;





struct task_desc {

struct task_desc {
@@ -1596,14 +1591,12 @@ typedef void (*tracepoint_handler)(struct perf_tool *tool, struct event_format * 
				   struct machine *machine,

				   struct machine *machine,

				   struct thread *thread);

				   struct thread *thread);





static int perf_sched__process_tracepoint_sample(struct perf_tool *tool,

static int perf_sched__process_tracepoint_sample(struct perf_tool *tool __used,

						 union perf_event *event __used,

						 union perf_event *event __used,

						 struct perf_sample *sample,

						 struct perf_sample *sample,

						 struct perf_evsel *evsel,

						 struct perf_evsel *evsel,

						 struct machine *machine)

						 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);

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





	if (thread == NULL) {

	if (thread == NULL) {
@@ -1617,25 +1610,18 @@ static int perf_sched__process_tracepoint_sample(struct perf_tool *tool, 




	if (evsel->handler.func != NULL) {

	if (evsel->handler.func != NULL) {

		tracepoint_handler f = evsel->handler.func;

		tracepoint_handler f = evsel->handler.func;



		f(tool, evsel->tp_format, sample, machine, thread);

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

			evsel->handler.data = pevent_find_event(pevent,

							  evsel->attr.config);



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

	}

	}





	return 0;

	return 0;

}

}





static struct perf_sched perf_sched = {

static struct perf_tool perf_sched = {

	.tool = {

	.sample		 = perf_sched__process_tracepoint_sample,

	.sample		 = perf_sched__process_tracepoint_sample,

	.comm		 = perf_event__process_comm,

	.comm		 = perf_event__process_comm,

	.lost		 = perf_event__process_lost,

	.lost		 = perf_event__process_lost,

	.fork		 = perf_event__process_task,

	.fork		 = perf_event__process_task,

	.ordered_samples = true,

	.ordered_samples = true,

	},

};

};





static void read_events(bool destroy, struct perf_session **psession)

static void read_events(bool destroy, struct perf_session **psession)
@@ -1652,18 +1638,15 @@ static void read_events(bool destroy, struct perf_session **psession) 
	};

	};

	struct perf_session *session;

	struct perf_session *session;





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

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

				    &perf_sched.tool);

	if (session == NULL)

	if (session == NULL)

		die("No Memory");

		die("No Memory");





	perf_sched.session = session;



	err = perf_session__set_tracepoints_handlers(session, handlers);

	err = perf_session__set_tracepoints_handlers(session, handlers);

	assert(err == 0);

	assert(err == 0);





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

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

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

		err = perf_session__process_events(session, &perf_sched);

		if (err)

		if (err)

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

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

tools/perf/builtin-script.c

+6 −23
Original line number Original line Diff line number Diff line
@@ -262,14 +262,11 @@ static int perf_session__check_output_opt(struct perf_session *session) 
	return 0;

	return 0;

}

}





static void print_sample_start(struct pevent *pevent,

static void print_sample_start(struct perf_sample *sample,

			       struct perf_sample *sample,

			       struct thread *thread,

			       struct thread *thread,

			       struct perf_evsel *evsel)

			       struct perf_evsel *evsel)

{

{

	int type;

	struct perf_event_attr *attr = &evsel->attr;

	struct perf_event_attr *attr = &evsel->attr;

	struct event_format *event;

	const char *evname = NULL;

	const char *evname = NULL;

	unsigned long secs;

	unsigned long secs;

	unsigned long usecs;

	unsigned long usecs;
@@ -307,20 +304,7 @@ static void print_sample_start(struct pevent *pevent, 
	}

	}





	if (PRINT_FIELD(EVNAME)) {

	if (PRINT_FIELD(EVNAME)) {

		if (attr->type == PERF_TYPE_TRACEPOINT) {

			/*

			 * 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

		evname = perf_evsel__name(evsel);

		evname = perf_evsel__name(evsel);



		printf("%s: ", evname ? evname : "[unknown]");

		printf("%s: ", evname ? evname : "[unknown]");

	}

	}

}

}
@@ -416,7 +400,7 @@ static void print_sample_bts(union perf_event *event, 
}

}





static void process_event(union perf_event *event __unused,

static void process_event(union perf_event *event __unused,

			  struct pevent *pevent,

			  struct pevent *pevent __unused,

			  struct perf_sample *sample,

			  struct perf_sample *sample,

			  struct perf_evsel *evsel,

			  struct perf_evsel *evsel,

			  struct machine *machine,

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

	if (output[attr->type].fields == 0)

		return;

		return;





	print_sample_start(pevent, sample, thread, evsel);

	print_sample_start(sample, thread, evsel);





	if (is_bts_event(attr)) {

	if (is_bts_event(attr)) {

		print_sample_bts(event, sample, evsel, machine, thread);

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

	}





	if (PRINT_FIELD(TRACE))

	if (PRINT_FIELD(TRACE))

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

		event_format__print(evsel->tp_format, sample->cpu,

				  sample->raw_size);

				    sample->raw_data, sample->raw_size);



	if (PRINT_FIELD(ADDR))

	if (PRINT_FIELD(ADDR))

		print_sample_addr(event, sample, machine, thread, attr);

		print_sample_addr(event, sample, machine, thread, attr);

tools/perf/util/evsel.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -56,6 +56,7 @@ struct perf_evsel { 
	int			ids;

	int			ids;

	struct hists		hists;

	struct hists		hists;

	char			*name;

	char			*name;

	struct event_format	*tp_format;

	union {

	union {

		void		*priv;

		void		*priv;

		off_t		id_offset;

		off_t		id_offset;

CRA Git | Maintained and supported by SUSTech CRA and CCSE