Re: [PATCH] perf annotate: fix -i option, which is currently ignored.

Arnaldo Carvalho de Melo
2015-05-29T12:42:53Z

Em Fri, May 29, 2015 at 02:06:44PM +0200, Martin Liška escreveu:
> Assign input_name, received from program arguments, to
> file data structure.

Doesn't apply:

pat[acme@zoo linux]$ patch -p1 < /wb/1.patch
patching file tools/perf/builtin-annotate.c
Hunk #1 FAILED at 289.
Hunk #2 FAILED at 346.
2 out of 2 hunks FAILED -- saving rejects to file
tools/perf/builtin-annotate.c.rej
[acme@zoo linux]$

What branch is this intended for? I.e. where have you cloned this from?

Yeah, I reproduced the problem and will try to figure this out, but
please always be explicit where to apply this.

- Arnaldo

> Signed-off-by: Martin Liska <mliska@suse.cz>
> ---
> tools/perf/builtin-annotate.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
> index c434e12..4e08c2d 100644
> --- a/tools/perf/builtin-annotate.c
> +++ b/tools/perf/builtin-annotate.c
> @@ -289,7 +289,6 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused)
> },
> };
> struct perf_data_file file = {
> - .path = input_name,
> .mode = PERF_DATA_MODE_READ,
> };
> const struct option options[] = {
> @@ -346,6 +345,8 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused)
> else if (annotate.use_gtk)
> use_browser = 2;
> + file.path = input_name;
> +
> setup_browser(true);
> annotate.session = perf_session__new(&file, false, &annotate.tool);
> --
> 2.1.4