From 91115d93cf4103c3d37bf8a7588902b4f811c3f2 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Thu, 1 Apr 2010 23:59:17 -0500 Subject: [PATCH] --- yaml --- r: 191203 b: refs/heads/master c: 46656ac7fb3252f8a3db29b18638e0e8067849ba h: refs/heads/master i: 191201: f2fc10e4f9a3e672e901230f1a70542b4735427d 191199: ac7e5f744576a5dce25adea40dc7c29528ffd208 v: v3 --- [refs] | 2 +- trunk/tools/perf/builtin-report.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e3033e177b88..ae2cc822cf23 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 529870e37473a9fc609078f03cc5b4148cf06a87 +refs/heads/master: 46656ac7fb3252f8a3db29b18638e0e8067849ba diff --git a/trunk/tools/perf/builtin-report.c b/trunk/tools/perf/builtin-report.c index daee082ab42b..00b358ff135c 100644 --- a/trunk/tools/perf/builtin-report.c +++ b/trunk/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;