[PATCH] perf script: Allow --time with --reltime

[PATCH] perf script: Allow --time with --reltime

[Andi Kleen]

From: Andi Kleen <ak@linux.intel.com>

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>
---
 tools/perf/builtin-script.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 32b17d51c982..7481003b2761 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -3601,11 +3601,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.21.0

Re: [PATCH] perf script: Allow --time with --reltime

[Jiri Olsa]

On Wed, Oct 02, 2019 at 09:46:42AM -0700, Andi Kleen wrote:
> From: Andi Kleen <ak@linux.intel.com>
> 
> 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>

thanks,
jirka

> ---
>  tools/perf/builtin-script.c | 5 -----
>  1 file changed, 5 deletions(-)
> 
> diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
> index 32b17d51c982..7481003b2761 100644
> --- a/tools/perf/builtin-script.c
> +++ b/tools/perf/builtin-script.c
> @@ -3601,11 +3601,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.21.0
> 

Re: [PATCH] perf script: Allow --time with --reltime

[Arnaldo Carvalho de Melo]

Em Thu, Oct 03, 2019 at 12:18:27PM +0200, Jiri Olsa escreveu:
> On Wed, Oct 02, 2019 at 09:46:42AM -0700, Andi Kleen wrote:
> > From: Andi Kleen <ak@linux.intel.com>
> > 
> > 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>

Thanks, applied.

- Arnaldo

[tip: perf/core] perf script: Allow --time with --reltime

[tip-bot2 for Andi Kleen]

The following commit has been merged into the perf/core branch of tip:

Commit-ID:     3714437d3fcc7956cabcb0077f2a506b61160a56
Gitweb:        https://git.kernel.org/tip/3714437d3fcc7956cabcb0077f2a506b61160a56
Author:        Andi Kleen <ak@linux.intel.com>
AuthorDate:    Wed, 02 Oct 2019 09:46:42 -07:00
Committer:     Arnaldo Carvalho de Melo <acme@redhat.com>
CommitterDate: Mon, 07 Oct 2019 12:22:18 -03:00

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>
---
 tools/perf/builtin-script.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 67be8d3..1c797a9 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;