Commit f67697bd authored Feb 04, 2014 by Jiri Olsa Committed by Arnaldo Carvalho de Melo Feb 10, 2014

perf tools: Handle PERF_RECORD_HEADER_EVENT_TYPE properly



We removed event types from data file in following commits:

  6065210d perf tools: Remove event types framework completely
  44b3c578 perf tools: Remove event types from perf data file

We no longer need this information, because we can get it directly from
tracepoints.

But we still need to handle PERF_RECORD_HEADER_EVENT_TYPE event for the
sake of old perf data files created in pipe mode like:

  $ perf.3.4 record -o - foo >perf.data
  $ perf.312 report -i - < perf.data

Reported-by: Stephane Eranian <eranian@google.com>
Signed-off-by: Jiri Olsa <jolsa@redhat.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/1391524668-12546-1-git-send-email-jolsa@redhat.com


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 981a2379

tools/perf/util/session.c

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1008,6 +1008,12 @@ static int perf_session__process_user_event(struct perf_session *session, union
	if (err == 0)		if (err == 0)
	perf_session__set_id_hdr_size(session);		perf_session__set_id_hdr_size(session);
	return err;		return err;
			case PERF_RECORD_HEADER_EVENT_TYPE:
			/*
			* Depreceated, but we need to handle it for sake
			* of old data files create in pipe mode.
			*/
			return 0;
	case PERF_RECORD_HEADER_TRACING_DATA:		case PERF_RECORD_HEADER_TRACING_DATA:
	/* setup for reading amidst mmap */		/* setup for reading amidst mmap */
	lseek(fd, file_offset, SEEK_SET);		lseek(fd, file_offset, SEEK_SET);