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

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

perf session: Move the event processing routines to session.c 



No need for an extra "data_map" file since the routines there
operate mainly on a perf_session instance.

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: <1261957026-15580-3-git-send-email-acme@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 3912f2ab

tools/perf/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -423,7 +423,6 @@ LIB_OBJS += util/trace-event-perl.o 
LIB_OBJS += util/svghelper.o

LIB_OBJS += util/sort.o

LIB_OBJS += util/hist.o

LIB_OBJS += util/data_map.o

LIB_OBJS += util/probe-event.o



BUILTIN_OBJS += builtin-annotate.o

tools/perf/util/data_map.c

deleted100644 → 0
+0 −252
Original line number Diff line number Diff line 
#include "symbol.h"

#include "util.h"

#include "debug.h"

#include "thread.h"

#include "session.h"



static int process_event_stub(event_t *event __used,

			      struct perf_session *session __used)

{

	dump_printf(": unhandled!\n");

	return 0;

}



static void perf_event_ops__fill_defaults(struct perf_event_ops *handler)

{

	if (!handler->process_sample_event)

		handler->process_sample_event = process_event_stub;

	if (!handler->process_mmap_event)

		handler->process_mmap_event = process_event_stub;

	if (!handler->process_comm_event)

		handler->process_comm_event = process_event_stub;

	if (!handler->process_fork_event)

		handler->process_fork_event = process_event_stub;

	if (!handler->process_exit_event)

		handler->process_exit_event = process_event_stub;

	if (!handler->process_lost_event)

		handler->process_lost_event = process_event_stub;

	if (!handler->process_read_event)

		handler->process_read_event = process_event_stub;

	if (!handler->process_throttle_event)

		handler->process_throttle_event = process_event_stub;

	if (!handler->process_unthrottle_event)

		handler->process_unthrottle_event = process_event_stub;

}



static const char *event__name[] = {

	[0]			 = "TOTAL",

	[PERF_RECORD_MMAP]	 = "MMAP",

	[PERF_RECORD_LOST]	 = "LOST",

	[PERF_RECORD_COMM]	 = "COMM",

	[PERF_RECORD_EXIT]	 = "EXIT",

	[PERF_RECORD_THROTTLE]	 = "THROTTLE",

	[PERF_RECORD_UNTHROTTLE] = "UNTHROTTLE",

	[PERF_RECORD_FORK]	 = "FORK",

	[PERF_RECORD_READ]	 = "READ",

	[PERF_RECORD_SAMPLE]	 = "SAMPLE",

};



unsigned long event__total[PERF_RECORD_MAX];



void event__print_totals(void)

{

	int i;

	for (i = 0; i < PERF_RECORD_MAX; ++i)

		pr_info("%10s events: %10ld\n",

			event__name[i], event__total[i]);

}



static int process_event(event_t *event, struct perf_session *session,

			 struct perf_event_ops *ops,

			 unsigned long offset, unsigned long head)

{

	trace_event(event);



	if (event->header.type < PERF_RECORD_MAX) {

		dump_printf("%p [%p]: PERF_RECORD_%s",

			    (void *)(offset + head),

			    (void *)(long)(event->header.size),

			    event__name[event->header.type]);

		++event__total[0];

		++event__total[event->header.type];

	}



	switch (event->header.type) {

	case PERF_RECORD_SAMPLE:

		return ops->process_sample_event(event, session);

	case PERF_RECORD_MMAP:

		return ops->process_mmap_event(event, session);

	case PERF_RECORD_COMM:

		return ops->process_comm_event(event, session);

	case PERF_RECORD_FORK:

		return ops->process_fork_event(event, session);

	case PERF_RECORD_EXIT:

		return ops->process_exit_event(event, session);

	case PERF_RECORD_LOST:

		return ops->process_lost_event(event, session);

	case PERF_RECORD_READ:

		return ops->process_read_event(event, session);

	case PERF_RECORD_THROTTLE:

		return ops->process_throttle_event(event, session);

	case PERF_RECORD_UNTHROTTLE:

		return ops->process_unthrottle_event(event, session);

	default:

		ops->total_unknown++;

		return -1;

	}

}



int perf_header__read_build_ids(int input, u64 offset, u64 size)

{

	struct build_id_event bev;

	char filename[PATH_MAX];

	u64 limit = offset + size;

	int err = -1;



	while (offset < limit) {

		struct dso *dso;

		ssize_t len;



		if (read(input, &bev, sizeof(bev)) != sizeof(bev))

			goto out;



		len = bev.header.size - sizeof(bev);

		if (read(input, filename, len) != len)

			goto out;



		dso = dsos__findnew(filename);

		if (dso != NULL)

			dso__set_build_id(dso, &bev.build_id);



		offset += bev.header.size;

	}

	err = 0;

out:

	return err;

}



static struct thread *perf_session__register_idle_thread(struct perf_session *self)

{

	struct thread *thread = perf_session__findnew(self, 0);



	if (!thread || thread__set_comm(thread, "swapper")) {

		pr_err("problem inserting idle task.\n");

		thread = NULL;

	}



	return thread;

}



int perf_session__process_events(struct perf_session *self,

				 struct perf_event_ops *ops)

{

	int err;

	unsigned long head, shift;

	unsigned long offset = 0;

	size_t	page_size;

	event_t *event;

	uint32_t size;

	char *buf;



	if (perf_session__register_idle_thread(self) == NULL)

		return -ENOMEM;



	perf_event_ops__fill_defaults(ops);



	page_size = getpagesize();



	head = self->header.data_offset;

	self->sample_type = perf_header__sample_type(&self->header);



	err = -EINVAL;

	if (ops->sample_type_check && ops->sample_type_check(self) < 0)

		goto out_err;



	if (!ops->full_paths) {

		char bf[PATH_MAX];



		if (getcwd(bf, sizeof(bf)) == NULL) {

			err = -errno;

out_getcwd_err:

			pr_err("failed to get the current directory\n");

			goto out_err;

		}

		self->cwd = strdup(bf);

		if (self->cwd == NULL) {

			err = -ENOMEM;

			goto out_getcwd_err;

		}

		self->cwdlen = strlen(self->cwd);

	}



	shift = page_size * (head / page_size);

	offset += shift;

	head -= shift;



remap:

	buf = mmap(NULL, page_size * self->mmap_window, PROT_READ,

		   MAP_SHARED, self->fd, offset);

	if (buf == MAP_FAILED) {

		pr_err("failed to mmap file\n");

		err = -errno;

		goto out_err;

	}



more:

	event = (event_t *)(buf + head);



	size = event->header.size;

	if (!size)

		size = 8;



	if (head + event->header.size >= page_size * self->mmap_window) {

		int munmap_ret;



		shift = page_size * (head / page_size);



		munmap_ret = munmap(buf, page_size * self->mmap_window);

		assert(munmap_ret == 0);



		offset += shift;

		head -= shift;

		goto remap;

	}



	size = event->header.size;



	dump_printf("\n%p [%p]: event: %d\n",

			(void *)(offset + head),

			(void *)(long)event->header.size,

			event->header.type);



	if (!size || process_event(event, self, ops, offset, head) < 0) {



		dump_printf("%p [%p]: skipping unknown header type: %d\n",

			(void *)(offset + head),

			(void *)(long)(event->header.size),

			event->header.type);



		/*

		 * assume we lost track of the stream, check alignment, and

		 * increment a single u64 in the hope to catch on again 'soon'.

		 */



		if (unlikely(head & 7))

			head &= ~7ULL;



		size = 8;

	}



	head += size;



	if (offset + head >= self->header.data_offset + self->header.data_size)

		goto done;



	if (offset + head < self->size)

		goto more;



done:

	err = 0;

out_err:

	return err;

}

tools/perf/util/session.c

+245 −0
Original line number Diff line number Diff line
@@ -148,3 +148,248 @@ struct symbol **perf_session__resolve_callchain(struct perf_session *self, 


	return syms;

}



static int process_event_stub(event_t *event __used,

			      struct perf_session *session __used)

{

	dump_printf(": unhandled!\n");

	return 0;

}



static void perf_event_ops__fill_defaults(struct perf_event_ops *handler)

{

	if (handler->process_sample_event == NULL)

		handler->process_sample_event = process_event_stub;

	if (handler->process_mmap_event == NULL)

		handler->process_mmap_event = process_event_stub;

	if (handler->process_comm_event == NULL)

		handler->process_comm_event = process_event_stub;

	if (handler->process_fork_event == NULL)

		handler->process_fork_event = process_event_stub;

	if (handler->process_exit_event == NULL)

		handler->process_exit_event = process_event_stub;

	if (handler->process_lost_event == NULL)

		handler->process_lost_event = process_event_stub;

	if (handler->process_read_event == NULL)

		handler->process_read_event = process_event_stub;

	if (handler->process_throttle_event == NULL)

		handler->process_throttle_event = process_event_stub;

	if (handler->process_unthrottle_event == NULL)

		handler->process_unthrottle_event = process_event_stub;

}



static const char *event__name[] = {

	[0]			 = "TOTAL",

	[PERF_RECORD_MMAP]	 = "MMAP",

	[PERF_RECORD_LOST]	 = "LOST",

	[PERF_RECORD_COMM]	 = "COMM",

	[PERF_RECORD_EXIT]	 = "EXIT",

	[PERF_RECORD_THROTTLE]	 = "THROTTLE",

	[PERF_RECORD_UNTHROTTLE] = "UNTHROTTLE",

	[PERF_RECORD_FORK]	 = "FORK",

	[PERF_RECORD_READ]	 = "READ",

	[PERF_RECORD_SAMPLE]	 = "SAMPLE",

};



unsigned long event__total[PERF_RECORD_MAX];



void event__print_totals(void)

{

	int i;

	for (i = 0; i < PERF_RECORD_MAX; ++i)

		pr_info("%10s events: %10ld\n",

			event__name[i], event__total[i]);

}



static int perf_session__process_event(struct perf_session *self,

				       event_t *event,

				       struct perf_event_ops *ops,

				       unsigned long offset, unsigned long head)

{

	trace_event(event);



	if (event->header.type < PERF_RECORD_MAX) {

		dump_printf("%p [%p]: PERF_RECORD_%s",

			    (void *)(offset + head),

			    (void *)(long)(event->header.size),

			    event__name[event->header.type]);

		++event__total[0];

		++event__total[event->header.type];

	}



	switch (event->header.type) {

	case PERF_RECORD_SAMPLE:

		return ops->process_sample_event(event, self);

	case PERF_RECORD_MMAP:

		return ops->process_mmap_event(event, self);

	case PERF_RECORD_COMM:

		return ops->process_comm_event(event, self);

	case PERF_RECORD_FORK:

		return ops->process_fork_event(event, self);

	case PERF_RECORD_EXIT:

		return ops->process_exit_event(event, self);

	case PERF_RECORD_LOST:

		return ops->process_lost_event(event, self);

	case PERF_RECORD_READ:

		return ops->process_read_event(event, self);

	case PERF_RECORD_THROTTLE:

		return ops->process_throttle_event(event, self);

	case PERF_RECORD_UNTHROTTLE:

		return ops->process_unthrottle_event(event, self);

	default:

		ops->total_unknown++;

		return -1;

	}

}



int perf_header__read_build_ids(int input, u64 offset, u64 size)

{

	struct build_id_event bev;

	char filename[PATH_MAX];

	u64 limit = offset + size;

	int err = -1;



	while (offset < limit) {

		struct dso *dso;

		ssize_t len;



		if (read(input, &bev, sizeof(bev)) != sizeof(bev))

			goto out;



		len = bev.header.size - sizeof(bev);

		if (read(input, filename, len) != len)

			goto out;



		dso = dsos__findnew(filename);

		if (dso != NULL)

			dso__set_build_id(dso, &bev.build_id);



		offset += bev.header.size;

	}

	err = 0;

out:

	return err;

}



static struct thread *perf_session__register_idle_thread(struct perf_session *self)

{

	struct thread *thread = perf_session__findnew(self, 0);



	if (thread == NULL || thread__set_comm(thread, "swapper")) {

		pr_err("problem inserting idle task.\n");

		thread = NULL;

	}



	return thread;

}



int perf_session__process_events(struct perf_session *self,

				 struct perf_event_ops *ops)

{

	int err;

	unsigned long head, shift;

	unsigned long offset = 0;

	size_t	page_size;

	event_t *event;

	uint32_t size;

	char *buf;



	if (perf_session__register_idle_thread(self) == NULL)

		return -ENOMEM;



	perf_event_ops__fill_defaults(ops);



	page_size = getpagesize();



	head = self->header.data_offset;

	self->sample_type = perf_header__sample_type(&self->header);



	err = -EINVAL;

	if (ops->sample_type_check && ops->sample_type_check(self) < 0)

		goto out_err;



	if (!ops->full_paths) {

		char bf[PATH_MAX];



		if (getcwd(bf, sizeof(bf)) == NULL) {

			err = -errno;

out_getcwd_err:

			pr_err("failed to get the current directory\n");

			goto out_err;

		}

		self->cwd = strdup(bf);

		if (self->cwd == NULL) {

			err = -ENOMEM;

			goto out_getcwd_err;

		}

		self->cwdlen = strlen(self->cwd);

	}



	shift = page_size * (head / page_size);

	offset += shift;

	head -= shift;



remap:

	buf = mmap(NULL, page_size * self->mmap_window, PROT_READ,

		   MAP_SHARED, self->fd, offset);

	if (buf == MAP_FAILED) {

		pr_err("failed to mmap file\n");

		err = -errno;

		goto out_err;

	}



more:

	event = (event_t *)(buf + head);



	size = event->header.size;

	if (size == 0)

		size = 8;



	if (head + event->header.size >= page_size * self->mmap_window) {

		int munmap_ret;



		shift = page_size * (head / page_size);



		munmap_ret = munmap(buf, page_size * self->mmap_window);

		assert(munmap_ret == 0);



		offset += shift;

		head -= shift;

		goto remap;

	}



	size = event->header.size;



	dump_printf("\n%p [%p]: event: %d\n",

			(void *)(offset + head),

			(void *)(long)event->header.size,

			event->header.type);



	if (size == 0 ||

	    perf_session__process_event(self, event, ops, offset, head) < 0) {

		dump_printf("%p [%p]: skipping unknown header type: %d\n",

			    (void *)(offset + head),

			    (void *)(long)(event->header.size),

			    event->header.type);

		/*

		 * assume we lost track of the stream, check alignment, and

		 * increment a single u64 in the hope to catch on again 'soon'.

		 */

		if (unlikely(head & 7))

			head &= ~7ULL;



		size = 8;

	}



	head += size;



	if (offset + head >= self->header.data_offset + self->header.data_size)

		goto done;



	if (offset + head < self->size)

		goto more;

done:

	err = 0;

out_err:

	return err;

}