Commit 42aa276f authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo

perf tools: Use perf_data_file__fd() consistently

Do not reference file->fd directly since we want hide the
implementation details from outside for possible future changes.
Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1422518843-25818-8-git-send-email-namhyung@kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 0b064f43
...@@ -343,6 +343,7 @@ static int __cmd_inject(struct perf_inject *inject) ...@@ -343,6 +343,7 @@ static int __cmd_inject(struct perf_inject *inject)
int ret = -EINVAL; int ret = -EINVAL;
struct perf_session *session = inject->session; struct perf_session *session = inject->session;
struct perf_data_file *file_out = &inject->output; struct perf_data_file *file_out = &inject->output;
int fd = perf_data_file__fd(file_out);
signal(SIGINT, sig_handler); signal(SIGINT, sig_handler);
...@@ -376,7 +377,7 @@ static int __cmd_inject(struct perf_inject *inject) ...@@ -376,7 +377,7 @@ static int __cmd_inject(struct perf_inject *inject)
} }
if (!file_out->is_pipe) if (!file_out->is_pipe)
lseek(file_out->fd, session->header.data_offset, SEEK_SET); lseek(fd, session->header.data_offset, SEEK_SET);
ret = perf_session__process_events(session, &inject->tool); ret = perf_session__process_events(session, &inject->tool);
...@@ -385,7 +386,7 @@ static int __cmd_inject(struct perf_inject *inject) ...@@ -385,7 +386,7 @@ static int __cmd_inject(struct perf_inject *inject)
perf_header__set_feat(&session->header, perf_header__set_feat(&session->header,
HEADER_BUILD_ID); HEADER_BUILD_ID);
session->header.data_size = inject->bytes_written; session->header.data_size = inject->bytes_written;
perf_session__write_header(session, session->evlist, file_out->fd, true); perf_session__write_header(session, session->evlist, fd, true);
} }
return ret; return ret;
......
...@@ -208,7 +208,7 @@ static int process_buildids(struct record *rec) ...@@ -208,7 +208,7 @@ static int process_buildids(struct record *rec)
struct perf_data_file *file = &rec->file; struct perf_data_file *file = &rec->file;
struct perf_session *session = rec->session; struct perf_session *session = rec->session;
u64 size = lseek(file->fd, 0, SEEK_CUR); u64 size = lseek(perf_data_file__fd(file), 0, SEEK_CUR);
if (size == 0) if (size == 0)
return 0; return 0;
...@@ -334,6 +334,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) ...@@ -334,6 +334,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
struct perf_data_file *file = &rec->file; struct perf_data_file *file = &rec->file;
struct perf_session *session; struct perf_session *session;
bool disabled = false, draining = false; bool disabled = false, draining = false;
int fd;
rec->progname = argv[0]; rec->progname = argv[0];
...@@ -348,6 +349,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) ...@@ -348,6 +349,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
return -1; return -1;
} }
fd = perf_data_file__fd(file);
rec->session = session; rec->session = session;
record__init_features(rec); record__init_features(rec);
...@@ -372,12 +374,11 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) ...@@ -372,12 +374,11 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
perf_header__clear_feat(&session->header, HEADER_GROUP_DESC); perf_header__clear_feat(&session->header, HEADER_GROUP_DESC);
if (file->is_pipe) { if (file->is_pipe) {
err = perf_header__write_pipe(file->fd); err = perf_header__write_pipe(fd);
if (err < 0) if (err < 0)
goto out_child; goto out_child;
} else { } else {
err = perf_session__write_header(session, rec->evlist, err = perf_session__write_header(session, rec->evlist, fd, false);
file->fd, false);
if (err < 0) if (err < 0)
goto out_child; goto out_child;
} }
...@@ -409,7 +410,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) ...@@ -409,7 +410,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
* return this more properly and also * return this more properly and also
* propagate errors that now are calling die() * propagate errors that now are calling die()
*/ */
err = perf_event__synthesize_tracing_data(tool, file->fd, rec->evlist, err = perf_event__synthesize_tracing_data(tool, fd, rec->evlist,
process_synthesized_event); process_synthesized_event);
if (err <= 0) { if (err <= 0) {
pr_err("Couldn't record tracing data.\n"); pr_err("Couldn't record tracing data.\n");
...@@ -545,8 +546,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) ...@@ -545,8 +546,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
if (!rec->no_buildid) if (!rec->no_buildid)
process_buildids(rec); process_buildids(rec);
perf_session__write_header(rec->session, rec->evlist, perf_session__write_header(rec->session, rec->evlist, fd, true);
file->fd, true);
} }
if (!err && !quiet) { if (!err && !quiet) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment