1 files changed, 74 insertions, 1 deletions

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 8fc50d831540..2eefb33c9679 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -104,10 +104,23 @@ static int process_sample_event(event_t *event, struct perf_session *session)
 static struct perf_event_ops event_ops = {
         .sample = process_sample_event,
         .comm   = event__process_comm,
+        .attr   = event__process_attr,
+        .event_type = event__process_event_type,
+        .tracing_data = event__process_tracing_data,
+        .build_id = event__process_build_id,
 };
 
+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);
 }
 
@@ -548,6 +561,65 @@ int cmd_trace(int argc, const char **argv, const char *prefix __used)
                 suffix = REPORT_SUFFIX;
         }
 
+        if (!suffix && argc >= 2 && strncmp(argv[1], "-", strlen("-")) != 0) {
+                char *record_script_path, *report_script_path;
+                int live_pipe[2];
+                pid_t pid;
+
+                record_script_path = get_script_path(argv[1], RECORD_SUFFIX);
+                if (!record_script_path) {
+                        fprintf(stderr, "record script not found\n");
+                        return -1;
+                }
+
+                report_script_path = get_script_path(argv[1], REPORT_SUFFIX);
+                if (!report_script_path) {
+                        fprintf(stderr, "report script not found\n");
+                        return -1;
+                }
+
+                if (pipe(live_pipe) < 0) {
+                        perror("failed to create pipe");
+                        exit(-1);
+                }
+
+                pid = fork();
+                if (pid < 0) {
+                        perror("failed to fork");
+                        exit(-1);
+                }
+
+                if (!pid) {
+                        dup2(live_pipe[1], 1);
+                        close(live_pipe[0]);
+
+                        __argv = malloc(5 * sizeof(const char *));
+                        __argv[0] = "/bin/sh";
+                        __argv[1] = record_script_path;
+                        __argv[2] = "-o";
+                        __argv[3] = "-";
+                        __argv[4] = NULL;
+
+                        execvp("/bin/sh", (char **)__argv);
+                        exit(-1);
+                }
+
+                dup2(live_pipe[0], 0);
+                close(live_pipe[1]);
+
+                __argv = malloc((argc + 3) * sizeof(const char *));
+                __argv[0] = "/bin/sh";
+                __argv[1] = report_script_path;
+                for (i = 2; i < argc; i++)
+                        __argv[i] = argv[i];
+                __argv[i++] = "-i";
+                __argv[i++] = "-";
+                __argv[i++] = NULL;
+
+                execvp("/bin/sh", (char **)__argv);
+                exit(-1);
+        }
+
         if (suffix) {
                 script_path = get_script_path(argv[2], suffix);
                 if (!script_path) {
@@ -580,7 +652,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) {