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

Commit 6065210d authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Remove event types framework completely 



Removing event types framework completely. The only remainder (apart
from few comments) is following enum:

  enum perf_user_event_type {
    ...
    PERF_RECORD_HEADER_EVENT_TYPE           = 65, /* deprecated */
    ...
  }

It's kept as deprecated, resulting in error when processed in
perf_session__process_user_event function.

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-6-git-send-email-jolsa@redhat.com


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

tools/perf/builtin-inject.c

+0 −7
Original line number Diff line number Diff line
@@ -67,12 +67,6 @@ static int perf_event__repipe_op2_synth(struct perf_tool *tool, 
	return perf_event__repipe_synth(tool, event);

}



static int perf_event__repipe_event_type_synth(struct perf_tool *tool,

					       union perf_event *event)

{

	return perf_event__repipe_synth(tool, event);

}



static int perf_event__repipe_attr(struct perf_tool *tool,

				   union perf_event *event,

				   struct perf_evlist **pevlist)
@@ -402,7 +396,6 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused) 
			.throttle	= perf_event__repipe,

			.unthrottle	= perf_event__repipe,

			.attr		= perf_event__repipe_attr,

			.event_type	= perf_event__repipe_event_type_synth,

			.tracing_data	= perf_event__repipe_op2_synth,

			.finished_round	= perf_event__repipe_op2_synth,

			.build_id	= perf_event__repipe_op2_synth,

tools/perf/builtin-record.c

+0 −7
Original line number Diff line number Diff line
@@ -474,13 +474,6 @@ static int __cmd_record(struct perf_record *rec, int argc, const char **argv) 
			goto out_delete_session;

		}



		err = perf_event__synthesize_event_types(tool, process_synthesized_event,

							 machine);

		if (err < 0) {

			pr_err("Couldn't synthesize event_types.\n");

			goto out_delete_session;

		}



		if (have_tracepoints(&evsel_list->entries)) {

			/*

			 * FIXME err <= 0 here actually means that

tools/perf/builtin-report.c

+0 −1
Original line number Diff line number Diff line
@@ -741,7 +741,6 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) 
			.lost		 = perf_event__process_lost,

			.read		 = process_read_event,

			.attr		 = perf_event__process_attr,

			.event_type	 = perf_event__process_event_type,

			.tracing_data	 = perf_event__process_tracing_data,

			.build_id	 = perf_event__process_build_id,

			.ordered_samples = true,

tools/perf/builtin-script.c

+0 −1
Original line number Diff line number Diff line
@@ -524,7 +524,6 @@ static struct perf_tool perf_script = { 
	.exit		 = perf_event__process_exit,

	.fork		 = perf_event__process_fork,

	.attr		 = perf_event__process_attr,

	.event_type	 = perf_event__process_event_type,

	.tracing_data	 = perf_event__process_tracing_data,

	.build_id	 = perf_event__process_build_id,

	.ordered_samples = true,

tools/perf/util/event.h

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ struct build_id_event { 
enum perf_user_event_type { /* above any possible kernel type */

	PERF_RECORD_USER_TYPE_START		= 64,

	PERF_RECORD_HEADER_ATTR			= 64,

	PERF_RECORD_HEADER_EVENT_TYPE		= 65,

	PERF_RECORD_HEADER_EVENT_TYPE		= 65, /* depreceated */

	PERF_RECORD_HEADER_TRACING_DATA		= 66,

	PERF_RECORD_HEADER_BUILD_ID		= 67,

	PERF_RECORD_FINISHED_ROUND		= 68,