Commit 7336555a authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Remove perf_tool from event_op3 



Now that we keep a perf_tool pointer inside perf_session, there's no need
to have a perf_tool argument in the event_op3 callback. Remove it.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20180913125450.21342-3-jolsa@kernel.org


[ Fix the builtin-inject.c build for !HAVE_AUXTRACE_SUPPORT ]
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 89f1688a

tools/perf/builtin-inject.c

+5 −6
Original line number Diff line number Diff line
@@ -131,10 +131,10 @@ static int copy_bytes(struct perf_inject *inject, int fd, off_t size) 
	return 0;

}



static s64 perf_event__repipe_auxtrace(struct perf_tool *tool,

				       union perf_event *event,

				       struct perf_session *session)

static s64 perf_event__repipe_auxtrace(struct perf_session *session,

				       union perf_event *event)

{

	struct perf_tool *tool = session->tool;

	struct perf_inject *inject = container_of(tool, struct perf_inject,

						  tool);

	int ret;
@@ -172,9 +172,8 @@ static s64 perf_event__repipe_auxtrace(struct perf_tool *tool, 
#else



static s64

perf_event__repipe_auxtrace(struct perf_tool *tool __maybe_unused,

			    union perf_event *event __maybe_unused,

			    struct perf_session *session __maybe_unused)

perf_event__repipe_auxtrace(struct perf_session *session __maybe_unused,

			    union perf_event *event __maybe_unused)

{

	pr_err("AUX area tracing not supported\n");

	return -EINVAL;

tools/perf/util/auxtrace.c

+3 −4
Original line number Diff line number Diff line
@@ -931,9 +931,8 @@ int perf_event__process_auxtrace_info(struct perf_session *session, 
	}

}



s64 perf_event__process_auxtrace(struct perf_tool *tool,

				 union perf_event *event,

				 struct perf_session *session)

s64 perf_event__process_auxtrace(struct perf_session *session,

				 union perf_event *event)

{

	s64 err;
@@ -949,7 +948,7 @@ s64 perf_event__process_auxtrace(struct perf_tool *tool, 
	if (!session->auxtrace || event->header.type != PERF_RECORD_AUXTRACE)

		return -EINVAL;



	err = session->auxtrace->process_auxtrace_event(session, event, tool);

	err = session->auxtrace->process_auxtrace_event(session, event, session->tool);

	if (err < 0)

		return err;

tools/perf/util/auxtrace.h

+2 −3
Original line number Diff line number Diff line
@@ -519,9 +519,8 @@ int perf_event__synthesize_auxtrace_info(struct auxtrace_record *itr, 
					 perf_event__handler_t process);

int perf_event__process_auxtrace_info(struct perf_session *session,

				      union perf_event *event);

s64 perf_event__process_auxtrace(struct perf_tool *tool,

				 union perf_event *event,

				 struct perf_session *session);

s64 perf_event__process_auxtrace(struct perf_session *session,

				 union perf_event *event);

int perf_event__process_auxtrace_error(struct perf_session *session,

				       union perf_event *event);

int itrace_parse_synth_opts(const struct option *opt, const char *str,

tools/perf/util/session.c

+3 −5
Original line number Diff line number Diff line
@@ -275,10 +275,8 @@ static int skipn(int fd, off_t n) 
	return 0;

}



static s64 process_event_auxtrace_stub(struct perf_tool *tool __maybe_unused,

				       union perf_event *event,

				       struct perf_session *session

				       __maybe_unused)

static s64 process_event_auxtrace_stub(struct perf_session *session __maybe_unused,

				       union perf_event *event)

{

	dump_printf(": unhandled!\n");

	if (perf_data__is_pipe(session->data))
@@ -1376,7 +1374,7 @@ static s64 perf_session__process_user_event(struct perf_session *session, 
	case PERF_RECORD_AUXTRACE:

		/* setup for reading amidst mmap */

		lseek(fd, file_offset + event->header.size, SEEK_SET);

		return tool->auxtrace(tool, event, session);

		return tool->auxtrace(session, event);

	case PERF_RECORD_AUXTRACE_ERROR:

		perf_session__auxtrace_error_inc(session, event);

		return tool->auxtrace_error(session, event);

tools/perf/util/tool.h

+1 −3
Original line number Diff line number Diff line
@@ -27,13 +27,11 @@ typedef int (*event_attr_op)(struct perf_tool *tool, 
			     struct perf_evlist **pevlist);



typedef int (*event_op2)(struct perf_session *session, union perf_event *event);

typedef s64 (*event_op3)(struct perf_session *session, union perf_event *event);



typedef int (*event_oe)(struct perf_tool *tool, union perf_event *event,

			struct ordered_events *oe);



typedef s64 (*event_op3)(struct perf_tool *tool, union perf_event *event,

			 struct perf_session *session);



enum show_feature_header {

	SHOW_FEAT_NO_HEADER = 0,

	SHOW_FEAT_HEADER,

CRA Git | Maintained and supported by SUSTech CRA and CCSE