mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot for Martin Liška" <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, mingo@kernel.org,
	a.p.zijlstra@chello.nl, acme@redhat.com, mliska@suse.cz,
	tglx@linutronix.de, paulus@samba.org, hpa@zytor.com
Subject: [tip:perf/core] perf annotate: Fix -i option, which is currently ignored.
Date: Fri, 29 May 2015 11:35:03 -0700	[thread overview]
Message-ID: <tip-44848cdbbd1bacbac2a825920b699adc000d51c7@git.kernel.org> (raw)
In-Reply-To: <55685654.2010209@suse.cz>

Commit-ID:  44848cdbbd1bacbac2a825920b699adc000d51c7
Gitweb:     http://git.kernel.org/tip/44848cdbbd1bacbac2a825920b699adc000d51c7
Author:     Martin Liška <mliska@suse.cz>
AuthorDate: Fri, 29 May 2015 14:06:44 +0200
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Fri, 29 May 2015 12:43:34 -0300

perf annotate: Fix -i option, which is currently ignored.

Assign input_name, received from program arguments, to file data
structure.

Signed-off-by: Martin Liska <mliska@suse.cz>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/55685654.2010209@suse.cz
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 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);

      parent reply	other threads:[~2015-05-29 18:35 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-29 12:06 [PATCH] perf annotate: fix " Martin Liška
2015-05-29 12:42 ` Arnaldo Carvalho de Melo
2015-05-29 12:43   ` Arnaldo Carvalho de Melo
2015-05-29 12:47     ` Martin Liška
2015-05-29 12:51       ` Arnaldo Carvalho de Melo
2015-05-29 13:08       ` Arnaldo Carvalho de Melo
2015-05-29 13:09         ` Martin Liška
2015-05-29 13:59           ` Arnaldo Carvalho de Melo
2015-05-29 14:01             ` Martin Liška
2015-05-29 14:17               ` Arnaldo Carvalho de Melo
2015-05-29 13:16         ` Arnaldo Carvalho de Melo
2015-05-29 18:35 ` tip-bot for Martin Liška [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-44848cdbbd1bacbac2a825920b699adc000d51c7@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@redhat.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=mliska@suse.cz \
    --cc=paulus@samba.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®