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

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

perf tools: Remove event types from perf data file 



Removing event types data storing/reading to/from perf data file as it's
no longer needed. The only user of this data 'perf timechart' was
switched to use tracepoints handler callbacks.

The event_types offset and size stay in the perf data file header but
are ignored from now on.

Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
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/1373556513-3000-4-git-send-email-jolsa@redhat.com


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

tools/perf/util/header.c

+1 −27
Original line number Diff line number Diff line
@@ -2334,16 +2334,6 @@ int perf_session__write_header(struct perf_session *session, 
		}

	}



	header->event_offset = lseek(fd, 0, SEEK_CUR);

	header->event_size = trace_event_count * sizeof(struct perf_trace_event_type);

	if (trace_events) {

		err = do_write(fd, trace_events, header->event_size);

		if (err < 0) {

			pr_debug("failed to write perf header events\n");

			return err;

		}

	}



	header->data_offset = lseek(fd, 0, SEEK_CUR);



	if (at_exit) {
@@ -2364,10 +2354,7 @@ int perf_session__write_header(struct perf_session *session, 
			.offset = header->data_offset,

			.size	= header->data_size,

		},

		.event_types = {

			.offset = header->event_offset,

			.size	= header->event_size,

		},

		/* event_types is ignored, store zeros */

	};



	memcpy(&f_header.adds_features, &header->adds_features, sizeof(header->adds_features));
@@ -2614,8 +2601,6 @@ int perf_file_header__read(struct perf_file_header *header, 
	memcpy(&ph->adds_features, &header->adds_features,

	       sizeof(ph->adds_features));



	ph->event_offset = header->event_types.offset;

	ph->event_size   = header->event_types.size;

	ph->data_offset  = header->data.offset;

	ph->data_size	 = header->data.size;

	return 0;
@@ -2839,17 +2824,6 @@ int perf_session__read_header(struct perf_session *session, int fd) 


	symbol_conf.nr_events = nr_attrs;



	if (f_header.event_types.size) {

		lseek(fd, f_header.event_types.offset, SEEK_SET);

		trace_events = malloc(f_header.event_types.size);

		if (trace_events == NULL)

			return -ENOMEM;

		if (perf_header__getbuffer64(header, fd, trace_events,

					     f_header.event_types.size))

			goto out_errno;

		trace_event_count =  f_header.event_types.size / sizeof(struct perf_trace_event_type);

	}



	perf_header__process_sections(header, fd, &session->pevent,

				      perf_file_section__process);

tools/perf/util/header.h

+1 −2
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ struct perf_file_header { 
	u64				attr_size;

	struct perf_file_section	attrs;

	struct perf_file_section	data;

	/* event_types is ignored */

	struct perf_file_section	event_types;

	DECLARE_BITMAP(adds_features, HEADER_FEAT_BITS);

};
@@ -88,8 +89,6 @@ struct perf_header { 
	s64			attr_offset;

	u64			data_offset;

	u64			data_size;

	u64			event_offset;

	u64			event_size;

	DECLARE_BITMAP(adds_features, HEADER_FEAT_BITS);

	struct perf_session_env env;

};