diff options
| author |   Andi Kleen <ak@linux.intel.com> | 2019-10-02 09:46:42 -0700 |
|---|---|---|
| committer |   Arnaldo Carvalho de Melo <acme@redhat.com> | 2019-10-07 12:22:18 -0300 |
| commit | 3714437d3fcc7956cabcb0077f2a506b61160a56 (patch) | |
| tree | e04aa7e5aa98d7f4a348d4604344570cc73e9c37 /tools/perf/builtin-script.c | |
| parent | samples/bpf: fix build by setting HAVE_ATTR_TEST to zero (diff) | |
| download | linux-dev-3714437d3fcc7956cabcb0077f2a506b61160a56.tar.xz linux-dev-3714437d3fcc7956cabcb0077f2a506b61160a56.zip | |
perf script: Allow --time with --reltime
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>
Diffstat (limited to 'tools/perf/builtin-script.c')
| -rw-r--r-- | tools/perf/builtin-script.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 67be8d31afab..1c797a948ada 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -3605,11 +3605,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; |