From cdac62a7de99ef398f66321049a45093b7979190 Mon Sep 17 00:00:00 2001
From: Tom Zanussi <tzanussi@gmail.com>
Date: Thu, 1 Apr 2010 23:59:18 -0500
Subject: [PATCH] --- yaml --- r: 191204 b: refs/heads/master c:
 c239da3b4b55dbb8f30bcb8d1a0d63fc44a567c3 h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/tools/perf/builtin-trace.c | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ae2cc822cf23..34b31edfc9d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46656ac7fb3252f8a3db29b18638e0e8067849ba
+refs/heads/master: c239da3b4b55dbb8f30bcb8d1a0d63fc44a567c3
diff --git a/trunk/tools/perf/builtin-trace.c b/trunk/tools/perf/builtin-trace.c
index 8fc50d831540..c681e85a912c 100644
--- a/trunk/tools/perf/builtin-trace.c
+++ b/trunk/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) {