[tip:perf/live] perf trace: Introduce special handling for pipe input

From: tip-bot for Tom Zanussi
Date: Wed Apr 14 2010 - 06:04:56 EST


Commit-ID: c239da3b4b55dbb8f30bcb8d1a0d63fc44a567c3
Gitweb: http://git.kernel.org/tip/c239da3b4b55dbb8f30bcb8d1a0d63fc44a567c3
Author: Tom Zanussi <tzanussi@xxxxxxxxx>
AuthorDate: Thu, 1 Apr 2010 23:59:18 -0500
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Wed, 14 Apr 2010 11:56:06 +0200

perf trace: Introduce special handling for pipe input

Adds special treatment for stdin - if the user specifies '-i -'
to perf trace, the intent is that the event stream be read from
stdin rather than from a disk file.

The actual handling of the '-' filename is done by the session;
this just adds a signal handler to stop reporting, and turns off
interference by the pager.

Signed-off-by: Tom Zanussi <tzanussi@xxxxxxxxx>
Acked-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: fweisbec@xxxxxxxxx
Cc: rostedt@xxxxxxxxxxx
Cc: k-keiichi@xxxxxxxxxxxxx
Cc: acme@xxxxxxxxxxxxxxxxxx
LKML-Reference: <1270184365-8281-5-git-send-email-tzanussi@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
tools/perf/builtin-trace.c | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 8fc50d8..c681e85 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -106,8 +106,17 @@ static struct perf_event_ops event_ops = {
.comm = event__process_comm,
};

+extern volatile int session_done;
+
+static void sig_handler(int sig __unused)
+{
+ session_done = 1;
+}
+
static int __cmd_trace(struct perf_session *session)
{
+ signal(SIGINT, sig_handler);
+
return perf_session__process_events(session, &event_ops);
}

@@ -580,7 +589,8 @@ int cmd_trace(int argc, const char **argv, const char *prefix __used)
if (session == NULL)
return -ENOMEM;

- if (!perf_session__has_traces(session, "record -R"))
+ if (strcmp(input_name, "-") &&
+ !perf_session__has_traces(session, "record -R"))
return -EINVAL;

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