diff options
author | Namhyung Kim <namhyung@kernel.org> | 2015-01-29 03:06:48 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-01-29 14:58:24 -0500 |
commit | 42aa276f40730211383e9a9923416f1fb9841d68 (patch) | |
tree | c48c5c8f9dd2139e6a8efc2ac365f988b44b9f11 /tools/perf/builtin-inject.c | |
parent | 0b064f43001fc2627ff8c3020647b85db040235f (diff) |
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: Namhyung 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.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/builtin-inject.c')
-rw-r--r-- | tools/perf/builtin-inject.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c index 84df2deed988..a13641e066f5 100644 --- a/tools/perf/builtin-inject.c +++ b/tools/perf/builtin-inject.c | |||
@@ -343,6 +343,7 @@ static int __cmd_inject(struct perf_inject *inject) | |||
343 | int ret = -EINVAL; | 343 | int ret = -EINVAL; |
344 | struct perf_session *session = inject->session; | 344 | struct perf_session *session = inject->session; |
345 | struct perf_data_file *file_out = &inject->output; | 345 | struct perf_data_file *file_out = &inject->output; |
346 | int fd = perf_data_file__fd(file_out); | ||
346 | 347 | ||
347 | signal(SIGINT, sig_handler); | 348 | signal(SIGINT, sig_handler); |
348 | 349 | ||
@@ -376,7 +377,7 @@ static int __cmd_inject(struct perf_inject *inject) | |||
376 | } | 377 | } |
377 | 378 | ||
378 | if (!file_out->is_pipe) | 379 | if (!file_out->is_pipe) |
379 | lseek(file_out->fd, session->header.data_offset, SEEK_SET); | 380 | lseek(fd, session->header.data_offset, SEEK_SET); |
380 | 381 | ||
381 | ret = perf_session__process_events(session, &inject->tool); | 382 | ret = perf_session__process_events(session, &inject->tool); |
382 | 383 | ||
@@ -385,7 +386,7 @@ static int __cmd_inject(struct perf_inject *inject) | |||
385 | perf_header__set_feat(&session->header, | 386 | perf_header__set_feat(&session->header, |
386 | HEADER_BUILD_ID); | 387 | HEADER_BUILD_ID); |
387 | session->header.data_size = inject->bytes_written; | 388 | session->header.data_size = inject->bytes_written; |
388 | perf_session__write_header(session, session->evlist, file_out->fd, true); | 389 | perf_session__write_header(session, session->evlist, fd, true); |
389 | } | 390 | } |
390 | 391 | ||
391 | return ret; | 392 | return ret; |