diff options
author | Tom Zanussi <tzanussi@gmail.com> | 2010-04-02 00:59:18 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-04-14 05:56:06 -0400 |
commit | c239da3b4b55dbb8f30bcb8d1a0d63fc44a567c3 (patch) | |
tree | c7bbe718db4ff6bb82b2eac9870f5cbabdf8b988 /tools/perf/builtin-trace.c | |
parent | 46656ac7fb3252f8a3db29b18638e0e8067849ba (diff) |
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@gmail.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Cc: fweisbec@gmail.com
Cc: rostedt@goodmis.org
Cc: k-keiichi@bx.jp.nec.com
Cc: acme@ghostprotocols.net
LKML-Reference: <1270184365-8281-5-git-send-email-tzanussi@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/builtin-trace.c')
-rw-r--r-- | 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 8fc50d831540..c681e85a912c 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c | |||
@@ -106,8 +106,17 @@ static struct perf_event_ops event_ops = { | |||
106 | .comm = event__process_comm, | 106 | .comm = event__process_comm, |
107 | }; | 107 | }; |
108 | 108 | ||
109 | extern volatile int session_done; | ||
110 | |||
111 | static void sig_handler(int sig __unused) | ||
112 | { | ||
113 | session_done = 1; | ||
114 | } | ||
115 | |||
109 | static int __cmd_trace(struct perf_session *session) | 116 | static int __cmd_trace(struct perf_session *session) |
110 | { | 117 | { |
118 | signal(SIGINT, sig_handler); | ||
119 | |||
111 | return perf_session__process_events(session, &event_ops); | 120 | return perf_session__process_events(session, &event_ops); |
112 | } | 121 | } |
113 | 122 | ||
@@ -580,7 +589,8 @@ int cmd_trace(int argc, const char **argv, const char *prefix __used) | |||
580 | if (session == NULL) | 589 | if (session == NULL) |
581 | return -ENOMEM; | 590 | return -ENOMEM; |
582 | 591 | ||
583 | if (!perf_session__has_traces(session, "record -R")) | 592 | if (strcmp(input_name, "-") && |
593 | !perf_session__has_traces(session, "record -R")) | ||
584 | return -EINVAL; | 594 | return -EINVAL; |
585 | 595 | ||
586 | if (generate_script_lang) { | 596 | if (generate_script_lang) { |