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

Commit 1cb8bdcc authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf inject: Move session handling out of __cmd_inject() 



This is a preparation of fixing dso__load_kernel_sym().  It needs a
session info before calling symbol__init().

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1407825645-24586-6-git-send-email-namhyung@kernel.org


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

tools/perf/builtin-inject.c

+17 −12
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 


struct perf_inject {

	struct perf_tool	tool;

	struct perf_session	*session;

	bool			build_ids;

	bool			sched_stat;

	const char		*input_name;
@@ -340,12 +341,8 @@ static int perf_evsel__check_stype(struct perf_evsel *evsel, 


static int __cmd_inject(struct perf_inject *inject)

{

	struct perf_session *session;

	int ret = -EINVAL;

	struct perf_data_file file = {

		.path = inject->input_name,

		.mode = PERF_DATA_MODE_READ,

	};

	struct perf_session *session = inject->session;

	struct perf_data_file *file_out = &inject->output;



	signal(SIGINT, sig_handler);
@@ -357,10 +354,6 @@ static int __cmd_inject(struct perf_inject *inject) 
		inject->tool.tracing_data = perf_event__repipe_tracing_data;

	}



	session = perf_session__new(&file, true, &inject->tool);

	if (session == NULL)

		return -ENOMEM;



	if (inject->build_ids) {

		inject->tool.sample = perf_event__inject_buildid;

	} else if (inject->sched_stat) {
@@ -396,8 +389,6 @@ static int __cmd_inject(struct perf_inject *inject) 
		perf_session__write_header(session, session->evlist, file_out->fd, true);

	}



	perf_session__delete(session);



	return ret;

}
@@ -427,6 +418,11 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused) 
			.mode = PERF_DATA_MODE_WRITE,

		},

	};

	struct perf_data_file file = {

		.mode = PERF_DATA_MODE_READ,

	};

	int ret;



	const struct option options[] = {

		OPT_BOOLEAN('b', "build-ids", &inject.build_ids,

			    "Inject build-ids into the output stream"),
@@ -461,8 +457,17 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused) 
		return -1;

	}



	file.path = inject.input_name;

	inject.session = perf_session__new(&file, true, &inject.tool);

	if (inject.session == NULL)

		return -ENOMEM;



	if (symbol__init() < 0)

		return -1;



	return __cmd_inject(&inject);

	ret = __cmd_inject(&inject);



	perf_session__delete(inject.session);



	return ret;

}