[tip:perf/core] perf record: Simplify perf_record__write

[tip-bot for Arnaldo Carvalho de Melo]

Commit-ID: cf8b2e6941091d2034f19c1799f8d6407bd565a4
Gitweb: http://git.kernel.org/tip/cf8b2e6941091d2034f19c1799f8d6407bd565a4
Author: Arnaldo Carvalho de Melo <ac...@redhat.com>
AuthorDate: Thu, 19 Dec 2013 14:26:26 -0300
Committer: Arnaldo Carvalho de Melo <ac...@redhat.com>
CommitDate: Thu, 19 Dec 2013 14:26:26 -0300

perf record: Simplify perf_record__write

1. Since all callers either test if it is less than zero or assign its
result to an int variable, convert it from ssize_t to int;

2. There is just one use for the 'session' variable, so use rec->session
directly instead;

3. No need to store the result of perf_data_file__write, since that
result is either 'size' or -1, the later making the error result to
be stored in 'errno' and accessed thru printf's %m in the pr_err
call.

Cc: Adrian Hunter <adrian...@intel.com>
Cc: David Ahern <dsa...@gmail.com>
Cc: Frederic Weisbecker <fwei...@gmail.com>
Cc: Jiri Olsa <jo...@redhat.com>
Cc: Mike Galbraith <efa...@gmx.de>
Cc: Namhyung Kim <namh...@kernel.org>
Cc: Paul Mackerras <pau...@samba.org>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Stephane Eranian <era...@google.com>
Link: http://lkml.kernel.org/n/tip-xwsk964dp6...@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <ac...@redhat.com>
---
tools/perf/builtin-record.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 8eed3d7..e8d606c 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -76,19 +76,14 @@ struct perf_record {
long samples;
};

-static ssize_t perf_record__write(struct perf_record *rec,
- void *buf, size_t size)
+static int perf_record__write(struct perf_record *rec, void *bf, size_t size)
{
- struct perf_session *session = rec->session;
- ssize_t ret;
-
- ret = perf_data_file__write(session->file, buf, size);
- if (ret < 0) {
+ if (perf_data_file__write(rec->session->file, bf, size) < 0) {
pr_err("failed to write perf data, error: %m\n");
return -1;
}

- rec->bytes_written += ret;
+ rec->bytes_written += size;
return 0;
}

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/