From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
David Ahern <dsahern@gmail.com>, Ingo Molnar <mingo@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
"Liang, Kan" <kan.liang@intel.com>
Subject: [PATCH 34/57] perf stat record: Add pipe support for record command
Date: Fri, 16 Oct 2015 12:41:09 +0200 [thread overview]
Message-ID: <1444992092-17897-35-git-send-email-jolsa@kernel.org> (raw)
In-Reply-To: <1444992092-17897-1-git-send-email-jolsa@kernel.org>
Allowing storing stat record data into pipe, so report
tools (report/script) could read data directly from
record.
Link: http://lkml.kernel.org/n/tip-m8fj758gty57hgvss5efy6na@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/builtin-stat.c | 39 ++++++++++++++++++++++++++++-----------
1 file changed, 28 insertions(+), 11 deletions(-)
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 39a6ecd532b6..539566eeea97 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -291,10 +291,19 @@ static void workload_exec_failed_signal(int signo __maybe_unused, siginfo_t *inf
workload_exec_errno = info->si_value.sival_int;
}
-static int perf_stat_synthesize_config(void)
+static int perf_stat_synthesize_config(bool is_pipe)
{
int err;
+ if (is_pipe) {
+ err = perf_event__synthesize_attrs(NULL, perf_stat.session,
+ process_synthesized_event);
+ if (err < 0) {
+ pr_err("Couldn't synthesize attrs.\n");
+ return err;
+ }
+ }
+
err = perf_event__synthesize_thread_map2(NULL, evsel_list->threads,
process_synthesized_event,
NULL);
@@ -362,6 +371,7 @@ static int __run_perf_stat(int argc, const char **argv)
size_t l;
int status = 0;
const bool forks = (argc > 0);
+ bool is_pipe = STAT_RECORD ? perf_stat.file.is_pipe : false;
if (interval) {
ts.tv_sec = interval / 1000;
@@ -372,7 +382,7 @@ static int __run_perf_stat(int argc, const char **argv)
}
if (forks) {
- if (perf_evlist__prepare_workload(evsel_list, &target, argv, false,
+ if (perf_evlist__prepare_workload(evsel_list, &target, argv, is_pipe,
workload_exec_failed_signal) < 0) {
perror("failed to prepare workload");
return -1;
@@ -431,12 +441,17 @@ static int __run_perf_stat(int argc, const char **argv)
if (STAT_RECORD) {
int err, fd = perf_data_file__fd(&perf_stat.file);
- err = perf_session__write_header(perf_stat.session, evsel_list,
- fd, false);
+ if (is_pipe) {
+ err = perf_header__write_pipe(perf_data_file__fd(&perf_stat.file));
+ } else {
+ err = perf_session__write_header(perf_stat.session, evsel_list,
+ fd, false);
+ }
+
if (err < 0)
return err;
- err = perf_stat_synthesize_config();
+ err = perf_stat_synthesize_config(is_pipe);
if (err < 0)
return err;
}
@@ -963,6 +978,10 @@ static void print_counters(struct timespec *ts, int argc, const char **argv)
struct perf_evsel *counter;
char buf[64], *prefix = NULL;
+ /* Do not print anything if we record to the pipe. */
+ if (STAT_RECORD && perf_stat.file.is_pipe)
+ return;
+
if (interval)
print_interval(prefix = buf, ts);
else
@@ -1268,10 +1287,6 @@ static int __cmd_record(int argc, const char **argv)
return -1;
}
- /* No pipe support ATM */
- if (perf_stat.file.is_pipe)
- return -EINVAL;
-
init_features(session);
session->evlist = evsel_list;
@@ -1543,8 +1558,10 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)
if (STAT_RECORD) {
int fd = perf_data_file__fd(&perf_stat.file);
- perf_stat.session->header.data_size += perf_stat.bytes_written;
- perf_session__write_header(perf_stat.session, evsel_list, fd, true);
+ if (!perf_stat.file.is_pipe) {
+ perf_stat.session->header.data_size += perf_stat.bytes_written;
+ perf_session__write_header(perf_stat.session, evsel_list, fd, true);
+ }
perf_session__delete(perf_stat.session);
}
--
2.4.3
next prev parent reply other threads:[~2015-10-16 10:50 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-16 10:40 [PATCHv4 00/57] perf stat: Add scripting support Jiri Olsa
2015-10-16 10:40 ` [PATCH 01/57] perf tools: Add thread_map event Jiri Olsa
2015-10-16 10:40 ` [PATCH 02/57] perf tools: Add thread_map event sythesize function Jiri Olsa
2015-10-16 10:40 ` [PATCH 03/57] perf tools: Add thread_map__new_event function Jiri Olsa
2015-10-16 10:40 ` [PATCH 04/57] perf tools: Add perf_event__fprintf_thread_map function Jiri Olsa
2015-10-16 10:40 ` [PATCH 05/57] perf tools: Add cpu_map event Jiri Olsa
2015-10-19 20:45 ` Arnaldo Carvalho de Melo
2015-10-22 7:56 ` Jiri Olsa
2015-10-16 10:40 ` [PATCH 06/57] perf tools: Add cpu_map event synthesize function Jiri Olsa
2015-10-16 10:40 ` [PATCH 07/57] perf tools: Add cpu_map__empty_new function Jiri Olsa
2015-10-16 10:40 ` [PATCH 08/57] perf tools: Add cpu_map__new_event function Jiri Olsa
2015-10-16 10:40 ` [PATCH 09/57] perf tools: Add perf_event__fprintf_cpu_map function Jiri Olsa
2015-10-16 10:40 ` [PATCH 10/57] perf tools: Add stat config event Jiri Olsa
2015-10-16 10:40 ` [PATCH 11/57] perf tools: Add stat config event synthesize function Jiri Olsa
2015-10-16 10:40 ` [PATCH 12/57] perf tools: Add stat config event read function Jiri Olsa
2015-10-16 10:40 ` [PATCH 13/57] perf tools: Add stat event Jiri Olsa
2015-10-16 10:40 ` [PATCH 14/57] perf tools: Add stat event synthesize function Jiri Olsa
2015-10-16 10:40 ` [PATCH 15/57] perf tools: Add stat event read function Jiri Olsa
2015-10-16 10:40 ` [PATCH 16/57] perf tools: Add stat round event Jiri Olsa
2015-10-16 10:40 ` [PATCH 17/57] perf tools: Add stat round event synthesize function Jiri Olsa
2015-10-16 10:40 ` [PATCH 18/57] perf tools: Add stat events fprintf functions Jiri Olsa
2015-10-16 10:40 ` [PATCH 19/57] perf tools: Add attr_update event Jiri Olsa
2015-10-19 21:00 ` Arnaldo Carvalho de Melo
2015-10-22 8:01 ` Jiri Olsa
2015-10-25 12:27 ` Jiri Olsa
2015-10-16 10:40 ` [PATCH 20/57] perf tools: Add attr_update event unit type Jiri Olsa
2015-10-16 10:40 ` [PATCH 21/57] perf tools: Add attr_update event scale type Jiri Olsa
2015-10-16 10:40 ` [PATCH 22/57] perf tools: Add attr_update event name type Jiri Olsa
2015-10-16 10:40 ` [PATCH 23/57] perf tools: Add attr_update event cpus type Jiri Olsa
2015-10-16 10:40 ` [PATCH 24/57] perf tools: Add perf_event__fprintf_attr_update function Jiri Olsa
2015-10-16 10:41 ` [PATCH 25/57] perf report: Display newly added events in raw dump Jiri Olsa
2015-10-16 10:41 ` [PATCH 26/57] perf tools: Introduce stat feature Jiri Olsa
2015-10-16 10:41 ` [PATCH 27/57] perf tools: Move id_offset out of struct perf_evsel union Jiri Olsa
2015-10-16 10:41 ` [PATCH 28/57] perf stat: Rename perf_stat struct into perf_stat_evsel Jiri Olsa
2015-10-19 21:01 ` Arnaldo Carvalho de Melo
2015-10-20 7:48 ` [tip:perf/core] " tip-bot for Jiri Olsa
2015-10-16 10:41 ` [PATCH 29/57] perf stat: Add AGGR_UNSET mode Jiri Olsa
2015-10-19 21:02 ` Arnaldo Carvalho de Melo
2015-10-20 7:48 ` [tip:perf/core] " tip-bot for Jiri Olsa
2015-10-16 10:41 ` [PATCH 30/57] perf stat record: Add record command Jiri Olsa
2015-10-16 10:41 ` [PATCH 31/57] perf stat record: Initialize record features Jiri Olsa
2015-10-16 10:41 ` [PATCH 32/57] perf stat record: Synthesize stat record data Jiri Olsa
2015-10-16 10:41 ` [PATCH 33/57] perf stat record: Store events IDs in perf data file Jiri Olsa
2015-10-16 10:41 ` Jiri Olsa [this message]
2015-10-16 10:41 ` [PATCH 35/57] perf stat record: Write stat events on record Jiri Olsa
2015-10-16 10:41 ` [PATCH 36/57] perf stat record: Write stat round " Jiri Olsa
2015-10-16 10:41 ` [PATCH 37/57] perf stat record: Do not allow record with multiple runs mode Jiri Olsa
2015-10-16 10:41 ` [PATCH 38/57] perf stat record: Synthesize attr update events Jiri Olsa
2015-10-16 10:41 ` [PATCH 39/57] perf tools: Make cpu_map__build_map global Jiri Olsa
2015-10-19 21:03 ` Arnaldo Carvalho de Melo
2015-10-20 7:49 ` [tip:perf/core] perf cpu_map: " tip-bot for Jiri Olsa
2015-10-16 10:41 ` [PATCH 40/57] perf tools: Add data arg to cpu_map__build_map callback Jiri Olsa
2015-10-19 21:04 ` Arnaldo Carvalho de Melo
2015-10-20 7:49 ` [tip:perf/core] perf cpu_map: " tip-bot for Jiri Olsa
2015-10-16 10:41 ` [PATCH 41/57] perf stat report: Cache aggregated map entries in extra cpumap Jiri Olsa
2015-10-16 10:41 ` [PATCH 42/57] perf stat report: Add report command Jiri Olsa
2015-10-16 10:41 ` [PATCH 43/57] perf stat report: Process cpu/threads maps Jiri Olsa
2015-10-16 10:41 ` [PATCH 44/57] perf stat report: Process stat config event Jiri Olsa
2015-10-16 10:41 ` [PATCH 45/57] perf stat report: Add support to initialize aggr_map from file Jiri Olsa
2015-10-16 10:41 ` [PATCH 46/57] perf stat report: Process stat and stat round events Jiri Olsa
2015-10-16 10:41 ` [PATCH 47/57] perf stat report: Process attr update events Jiri Olsa
2015-10-16 10:41 ` [PATCH 48/57] perf stat report: Move csv_sep initialization before report command Jiri Olsa
2015-10-16 10:41 ` [PATCH 49/57] perf stat report: Allow to override aggr_mode Jiri Olsa
2015-10-16 10:41 ` [PATCH 50/57] perf script: Check output fields only for samples Jiri Olsa
2015-10-19 21:06 ` Arnaldo Carvalho de Melo
2015-10-20 7:49 ` [tip:perf/core] " tip-bot for Jiri Olsa
2015-10-16 10:41 ` [PATCH 51/57] perf script: Process cpu/threads maps Jiri Olsa
2015-10-16 10:41 ` [PATCH 52/57] perf script: Process stat config event Jiri Olsa
2015-10-16 10:41 ` [PATCH 53/57] perf script: Add process_stat/process_stat_interval scripting interface Jiri Olsa
2015-10-16 10:41 ` [PATCH 54/57] perf script: Add stat default handlers Jiri Olsa
2015-10-16 10:41 ` [PATCH 55/57] perf script: Display stat events by default Jiri Olsa
2015-10-16 10:41 ` [PATCH 56/57] perf script: Add python support for stat events Jiri Olsa
2015-10-16 10:41 ` [PATCH 57/57] perf script: Add stat-cpi.py script Jiri Olsa
2015-10-19 19:48 ` [PATCHv4 00/57] perf stat: Add scripting support Liang, Kan
2015-10-21 2:03 ` Namhyung Kim
2015-10-21 10:22 ` 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=1444992092-17897-35-git-send-email-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=dsahern@gmail.com \
--cc=kan.liang@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
/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
Powered by JetHome