perf report: Introduce special handling for pipe input

Adds special treatment for stdin - if the user specifies '-i -'
to perf report, the intent is that the event stream be written
to 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 <[email protected]>
Acked-by: Thomas Gleixner <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
LKML-Reference: <1270184365[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index daee082ab42bd60ca58b3ceb75623b85e4293d4d..00b358ff135c4b80ff7973e28ba1b03b87bd1c5d 100644 (file)
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -269,6 +269,13 @@ static struct perf_event_ops event_ops = {
        .read   = process_read_event,
 };
 
+extern volatile int session_done;
+
+static void sig_handler(int sig __attribute__((__unused__)))
+{
+       session_done = 1;
+}
+
 static int __cmd_report(void)
 {
        int ret = -EINVAL;
@@ -276,6 +283,8 @@ static int __cmd_report(void)
        struct rb_node *next;
        const char *help = "For a higher level overview, try: perf report --sort comm,dso";
 
+       signal(SIGINT, sig_handler);
+
        session = perf_session__new(input_name, O_RDONLY, force);
        if (session == NULL)
                return -ENOMEM;
@@ -465,7 +474,8 @@ int cmd_report(int argc, const char **argv, const char *prefix __used)
 {
        argc = parse_options(argc, argv, options, report_usage, 0);
 
-       setup_browser();
+       if (strcmp(input_name, "-") != 0)
+               setup_browser();
 
        if (symbol__init() < 0)
                return -1;