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

perf session: Use session->fd instead of passing fd as argument 



Using session->fd instead of passing fd as argument because it's always
session->fd that's passed as fd argument.

Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Andi Kleen <ak@linux.intel.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/1374083403-14591-2-git-send-email-jolsa@redhat.com


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

tools/perf/util/header.c

+5 −6
Original line number Diff line number Diff line
@@ -2619,19 +2619,17 @@ static int perf_file_header__read_pipe(struct perf_pipe_file_header *header, 
	return 0;

}



static int perf_header__read_pipe(struct perf_session *session, int fd)

static int perf_header__read_pipe(struct perf_session *session)

{

	struct perf_header *header = &session->header;

	struct perf_pipe_file_header f_header;



	if (perf_file_header__read_pipe(&f_header, header, fd,

	if (perf_file_header__read_pipe(&f_header, header, session->fd,

					session->repipe) < 0) {

		pr_debug("incompatible file format\n");

		return -EINVAL;

	}



	session->fd = fd;



	return 0;

}
@@ -2725,20 +2723,21 @@ static int perf_evlist__prepare_tracepoint_events(struct perf_evlist *evlist, 
	return 0;

}



int perf_session__read_header(struct perf_session *session, int fd)

int perf_session__read_header(struct perf_session *session)

{

	struct perf_header *header = &session->header;

	struct perf_file_header	f_header;

	struct perf_file_attr	f_attr;

	u64			f_id;

	int nr_attrs, nr_ids, i, j;

	int fd = session->fd;



	session->evlist = perf_evlist__new();

	if (session->evlist == NULL)

		return -ENOMEM;



	if (session->fd_pipe)

		return perf_header__read_pipe(session, fd);

		return perf_header__read_pipe(session);



	if (perf_file_header__read(&f_header, header, fd) < 0)

		return -EINVAL;

tools/perf/util/header.h

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ struct perf_header { 
struct perf_evlist;

struct perf_session;



int perf_session__read_header(struct perf_session *session, int fd);

int perf_session__read_header(struct perf_session *session);

int perf_session__write_header(struct perf_session *session,

			       struct perf_evlist *evlist,

			       int fd, bool at_exit);

tools/perf/util/session.c

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ static int perf_session__open(struct perf_session *self, bool force) 
		self->fd_pipe = true;

		self->fd = STDIN_FILENO;



		if (perf_session__read_header(self, self->fd) < 0)

		if (perf_session__read_header(self) < 0)

			pr_err("incompatible file format (rerun with -v to learn more)");



		return 0;
@@ -56,7 +56,7 @@ static int perf_session__open(struct perf_session *self, bool force) 
		goto out_close;

	}



	if (perf_session__read_header(self, self->fd) < 0) {

	if (perf_session__read_header(self) < 0) {

		pr_err("incompatible file format (rerun with -v to learn more)");

		goto out_close;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE