diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-09-26 20:49:53 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-09-26 20:49:53 +0200 |
| commit | 474a83b76f6bde8a5f8f8e39d90181ca85d39f46 (patch) | |
| tree | a9f8e2e790b74de50d85469ec79fb1c841c3da90 /tools/perf/builtin-report.c | |
| parent | 16c21ae5ca636cfd38e581ebcf709c49d78ea56d (diff) | |
| parent | 654fdd041227d7de1594baa61c58f2c87bd0640f (diff) | |
Merge branch 'linus'
Merge in the relevant upstream merge point to queue up dependent patch.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/builtin-report.c')
| -rw-r--r-- | tools/perf/builtin-report.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 8e50d8d77419..72eae7498c09 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -401,8 +401,6 @@ static int perf_report__setup_sample_type(struct perf_report *rep) return 0; } -extern volatile int session_done; - static void sig_handler(int sig __maybe_unused) { session_done = 1; @@ -568,6 +566,9 @@ static int __cmd_report(struct perf_report *rep) } } + if (session_done()) + return 0; + if (nr_samples == 0) { ui__error("The %s file has no samples!\n", session->filename); return 0; |