From: tip-bot for Jiri Olsa <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com,
mingo@kernel.org, peterz@infradead.org, efault@gmx.de,
namhyung@kernel.org, jolsa@redhat.com, fweisbec@gmail.com,
adrian.hunter@intel.com, dsahern@gmail.com, tglx@linutronix.de
Subject: [tip:perf/core] perf record: Unify data output code into perf_record__write function
Date: Wed, 4 Dec 2013 07:40:03 -0800 [thread overview]
Message-ID: <tip-6233dd5efdf9e2c2da1b003cfb70307b7b2028e8@git.kernel.org> (raw)
In-Reply-To: <1385634619-8129-2-git-send-email-jolsa@redhat.com>
Commit-ID: 6233dd5efdf9e2c2da1b003cfb70307b7b2028e8
Gitweb: http://git.kernel.org/tip/6233dd5efdf9e2c2da1b003cfb70307b7b2028e8
Author: Jiri Olsa <jolsa@redhat.com>
AuthorDate: Thu, 28 Nov 2013 11:30:13 +0100
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 2 Dec 2013 09:22:45 -0300
perf record: Unify data output code into perf_record__write function
Unifying current 2 data output functions do_write_output and
write_output into single one perf_record__write.
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1385634619-8129-2-git-send-email-jolsa@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/builtin-record.c | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 65615a8..d93e2ee 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -76,7 +76,7 @@ struct perf_record {
long samples;
};
-static int do_write_output(struct perf_record *rec, void *buf, size_t size)
+static int perf_record__write(struct perf_record *rec, void *buf, size_t size)
{
struct perf_data_file *file = &rec->file;
@@ -97,21 +97,13 @@ static int do_write_output(struct perf_record *rec, void *buf, size_t size)
return 0;
}
-static int write_output(struct perf_record *rec, void *buf, size_t size)
-{
- return do_write_output(rec, buf, size);
-}
-
static int process_synthesized_event(struct perf_tool *tool,
union perf_event *event,
struct perf_sample *sample __maybe_unused,
struct machine *machine __maybe_unused)
{
struct perf_record *rec = container_of(tool, struct perf_record, tool);
- if (write_output(rec, event, event->header.size) < 0)
- return -1;
-
- return 0;
+ return perf_record__write(rec, event, event->header.size);
}
static int perf_record__mmap_read(struct perf_record *rec,
@@ -136,7 +128,7 @@ static int perf_record__mmap_read(struct perf_record *rec,
size = md->mask + 1 - (old & md->mask);
old += size;
- if (write_output(rec, buf, size) < 0) {
+ if (perf_record__write(rec, buf, size) < 0) {
rc = -1;
goto out;
}
@@ -146,7 +138,7 @@ static int perf_record__mmap_read(struct perf_record *rec,
size = head - old;
old += size;
- if (write_output(rec, buf, size) < 0) {
+ if (perf_record__write(rec, buf, size) < 0) {
rc = -1;
goto out;
}
@@ -335,8 +327,8 @@ static int perf_record__mmap_read_all(struct perf_record *rec)
}
if (perf_header__has_feat(&rec->session->header, HEADER_TRACING_DATA))
- rc = write_output(rec, &finished_round_event,
- sizeof(finished_round_event));
+ rc = perf_record__write(rec, &finished_round_event,
+ sizeof(finished_round_event));
out:
return rc;
next prev parent reply other threads:[~2013-12-04 15:41 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-28 10:30 [PATCHv2 0/7] perf tools: Add data file write interface Jiri Olsa
2013-11-28 10:30 ` [PATCH 1/7] perf record: Unify data output code into perf_record__write function Jiri Olsa
2013-12-04 15:40 ` tip-bot for Jiri Olsa [this message]
2013-11-28 10:30 ` [PATCH 2/7] perf tools: Use correct return type for readn function Jiri Olsa
2013-12-04 15:40 ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-11-28 10:30 ` [PATCH 3/7] perf tools: Fine tune " Jiri Olsa
2013-11-28 15:19 ` David Ahern
2013-11-28 15:43 ` [PATCHv3 " Jiri Olsa
2013-11-28 16:03 ` David Ahern
2013-12-04 15:40 ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-11-28 10:30 ` [PATCH 4/7] perf tools: Add writen function Jiri Olsa
2013-12-04 15:40 ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-11-28 10:30 ` [PATCH 5/7] perf tools: Add perf_data_file__write interface Jiri Olsa
2013-12-04 15:40 ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-11-28 10:30 ` [PATCH 6/7] perf record: Use perf_data_file__write for output file Jiri Olsa
2013-11-28 14:03 ` Arnaldo Carvalho de Melo
2013-11-28 15:21 ` [PATCHv3 " Jiri Olsa
2013-11-28 10:30 ` [PATCH 7/7] perf inject: Handle output file via perf_data_file object Jiri Olsa
2013-11-28 14:14 ` Arnaldo Carvalho de Melo
2013-11-28 15:30 ` Jiri Olsa
2013-11-28 10:36 ` [PATCHv2 0/7] perf tools: Add data file write interface Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-6233dd5efdf9e2c2da1b003cfb70307b7b2028e8@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=dsahern@gmail.com \
--cc=efault@gmx.de \
--cc=fweisbec@gmail.com \
--cc=hpa@zytor.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).