| From de803ea535f00a7acdbdea21e06dcfeff9a58f21 Mon Sep 17 00:00:00 2001 |
| From: Andi Kleen <ak@linux.intel.com> |
| Date: Wed, 2 Oct 2019 09:46:42 -0700 |
| Subject: [PATCH] perf script: Allow --time with --reltime |
| |
| commit 3714437d3fcc7956cabcb0077f2a506b61160a56 upstream. |
| |
| The original --reltime patch forbid --time with --reltime. |
| |
| But it turns out --time doesn't really care about --reltime, because the |
| relative time is only used at final output, while the time filtering |
| always works earlier on absolute time. |
| |
| So just remove the check and allow combining the two options. |
| |
| Fixes: 90b10f47c0ee ("perf script: Support relative time") |
| Signed-off-by: Andi Kleen <ak@linux.intel.com> |
| Acked-by: Jiri Olsa <jolsa@kernel.org> |
| Link: http://lore.kernel.org/lkml/20191002164642.1719-1-andi@firstfloor.org |
| Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c |
| index 676734c1fb35..be78cb91b8e5 100644 |
| --- a/tools/perf/builtin-script.c |
| +++ b/tools/perf/builtin-script.c |
| @@ -3500,11 +3500,6 @@ int cmd_script(int argc, const char **argv) |
| } |
| } |
| |
| - if (script.time_str && reltime) { |
| - fprintf(stderr, "Don't combine --reltime with --time\n"); |
| - return -1; |
| - } |
| - |
| if (itrace_synth_opts.callchain && |
| itrace_synth_opts.callchain_sz > scripting_max_stack) |
| scripting_max_stack = itrace_synth_opts.callchain_sz; |
| -- |
| 2.7.4 |
| |
