Commit 89f1688a authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Remove perf_tool from event_op2 



Now that we keep a perf_tool pointer inside perf_session, there's no
need to have a perf_tool argument in the event_op2 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-2-jolsa@kernel.org


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

tools/perf/builtin-annotate.c

+3 −4
Original line number Diff line number Diff line
@@ -283,12 +283,11 @@ out_put: 
	return ret;

}



static int process_feature_event(struct perf_tool *tool,

				 union perf_event *event,

				 struct perf_session *session)

static int process_feature_event(struct perf_session *session,

				 union perf_event *event)

{

	if (event->feat.feat_id < HEADER_LAST_FEATURE)

		return perf_event__process_feature(tool, event, session);

		return perf_event__process_feature(session, event);

	return 0;

}

tools/perf/builtin-inject.c

+11 −15
Original line number Diff line number Diff line
@@ -86,12 +86,10 @@ static int perf_event__drop_oe(struct perf_tool *tool __maybe_unused, 
}

#endif



static int perf_event__repipe_op2_synth(struct perf_tool *tool,

					union perf_event *event,

					struct perf_session *session

					__maybe_unused)

static int perf_event__repipe_op2_synth(struct perf_session *session,

					union perf_event *event)

{

	return perf_event__repipe_synth(tool, event);

	return perf_event__repipe_synth(session->tool, event);

}



static int perf_event__repipe_attr(struct perf_tool *tool,
@@ -362,26 +360,24 @@ static int perf_event__repipe_exit(struct perf_tool *tool, 
	return err;

}



static int perf_event__repipe_tracing_data(struct perf_tool *tool,

					   union perf_event *event,

					   struct perf_session *session)

static int perf_event__repipe_tracing_data(struct perf_session *session,

					   union perf_event *event)

{

	int err;



	perf_event__repipe_synth(tool, event);

	err = perf_event__process_tracing_data(tool, event, session);

	perf_event__repipe_synth(session->tool, event);

	err = perf_event__process_tracing_data(session, event);



	return err;

}



static int perf_event__repipe_id_index(struct perf_tool *tool,

				       union perf_event *event,

				       struct perf_session *session)

static int perf_event__repipe_id_index(struct perf_session *session,

				       union perf_event *event)

{

	int err;



	perf_event__repipe_synth(tool, event);

	err = perf_event__process_id_index(tool, event, session);

	perf_event__repipe_synth(session->tool, event);

	err = perf_event__process_id_index(session, event);



	return err;

}

tools/perf/builtin-report.c

+4 −5
Original line number Diff line number Diff line
@@ -201,14 +201,13 @@ static void setup_forced_leader(struct report *report, 
		perf_evlist__force_leader(evlist);

}



static int process_feature_event(struct perf_tool *tool,

				 union perf_event *event,

				 struct perf_session *session __maybe_unused)

static int process_feature_event(struct perf_session *session,

				 union perf_event *event)

{

	struct report *rep = container_of(tool, struct report, tool);

	struct report *rep = container_of(session->tool, struct report, tool);



	if (event->feat.feat_id < HEADER_LAST_FEATURE)

		return perf_event__process_feature(tool, event, session);

		return perf_event__process_feature(session, event);



	if (event->feat.feat_id != HEADER_LAST_FEATURE) {

		pr_err("failed: wrong feature ID: %" PRIu64 "\n",

tools/perf/builtin-script.c

+18 −20
Original line number Diff line number Diff line
@@ -2965,9 +2965,8 @@ static void script__setup_sample_type(struct perf_script *script) 
	}

}



static int process_stat_round_event(struct perf_tool *tool __maybe_unused,

				    union perf_event *event,

				    struct perf_session *session)

static int process_stat_round_event(struct perf_session *session,

				    union perf_event *event)

{

	struct stat_round_event *round = &event->stat_round;

	struct perf_evsel *counter;
@@ -2981,9 +2980,8 @@ static int process_stat_round_event(struct perf_tool *tool __maybe_unused, 
	return 0;

}



static int process_stat_config_event(struct perf_tool *tool __maybe_unused,

				     union perf_event *event,

				     struct perf_session *session __maybe_unused)

static int process_stat_config_event(struct perf_session *session __maybe_unused,

				     union perf_event *event)

{

	perf_event__read_stat_config(&stat_config, &event->stat_config);

	return 0;
@@ -3009,10 +3007,10 @@ static int set_maps(struct perf_script *script) 
}



static

int process_thread_map_event(struct perf_tool *tool,

			     union perf_event *event,

			     struct perf_session *session __maybe_unused)

int process_thread_map_event(struct perf_session *session,

			     union perf_event *event)

{

	struct perf_tool *tool = session->tool;

	struct perf_script *script = container_of(tool, struct perf_script, tool);



	if (script->threads) {
@@ -3028,10 +3026,10 @@ int process_thread_map_event(struct perf_tool *tool, 
}



static

int process_cpu_map_event(struct perf_tool *tool __maybe_unused,

			  union perf_event *event,

			  struct perf_session *session __maybe_unused)

int process_cpu_map_event(struct perf_session *session,

			  union perf_event *event)

{

	struct perf_tool *tool = session->tool;

	struct perf_script *script = container_of(tool, struct perf_script, tool);



	if (script->cpus) {
@@ -3046,21 +3044,21 @@ int process_cpu_map_event(struct perf_tool *tool __maybe_unused, 
	return set_maps(script);

}



static int process_feature_event(struct perf_tool *tool,

				 union perf_event *event,

				 struct perf_session *session)

static int process_feature_event(struct perf_session *session,

				 union perf_event *event)

{

	if (event->feat.feat_id < HEADER_LAST_FEATURE)

		return perf_event__process_feature(tool, event, session);

		return perf_event__process_feature(session, event);

	return 0;

}



#ifdef HAVE_AUXTRACE_SUPPORT

static int perf_script__process_auxtrace_info(struct perf_tool *tool,

					      union perf_event *event,

					      struct perf_session *session)

static int perf_script__process_auxtrace_info(struct perf_session *session,

					      union perf_event *event)

{

	int ret = perf_event__process_auxtrace_info(tool, event, session);

	struct perf_tool *tool = session->tool;



	int ret = perf_event__process_auxtrace_info(session, event);



	if (ret == 0) {

		struct perf_script *script = container_of(tool, struct perf_script, tool);

tools/perf/builtin-stat.c

+11 −12
Original line number Diff line number Diff line
@@ -1354,9 +1354,8 @@ static int __cmd_record(int argc, const char **argv) 
	return argc;

}



static int process_stat_round_event(struct perf_tool *tool __maybe_unused,

				    union perf_event *event,

				    struct perf_session *session)

static int process_stat_round_event(struct perf_session *session,

				    union perf_event *event)

{

	struct stat_round_event *stat_round = &event->stat_round;

	struct perf_evsel *counter;
@@ -1381,10 +1380,10 @@ static int process_stat_round_event(struct perf_tool *tool __maybe_unused, 
}



static

int process_stat_config_event(struct perf_tool *tool,

			      union perf_event *event,

			      struct perf_session *session __maybe_unused)

int process_stat_config_event(struct perf_session *session,

			      union perf_event *event)

{

	struct perf_tool *tool = session->tool;

	struct perf_stat *st = container_of(tool, struct perf_stat, tool);



	perf_event__read_stat_config(&stat_config, &event->stat_config);
@@ -1424,10 +1423,10 @@ static int set_maps(struct perf_stat *st) 
}



static

int process_thread_map_event(struct perf_tool *tool,

			     union perf_event *event,

			     struct perf_session *session __maybe_unused)

int process_thread_map_event(struct perf_session *session,

			     union perf_event *event)

{

	struct perf_tool *tool = session->tool;

	struct perf_stat *st = container_of(tool, struct perf_stat, tool);



	if (st->threads) {
@@ -1443,10 +1442,10 @@ int process_thread_map_event(struct perf_tool *tool, 
}



static

int process_cpu_map_event(struct perf_tool *tool,

			  union perf_event *event,

			  struct perf_session *session __maybe_unused)

int process_cpu_map_event(struct perf_session *session,

			  union perf_event *event)

{

	struct perf_tool *tool = session->tool;

	struct perf_stat *st = container_of(tool, struct perf_stat, tool);

	struct cpu_map *cpus;

CRA Git | Maintained and supported by SUSTech CRA and CCSE