From: Adrian Hunter <adrian.hunter@intel.com>
To: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>,
Ingo Molnar <mingo@redhat.com>,
linux-kernel@vger.kernel.org, David Ahern <dsahern@gmail.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Jiri Olsa <jolsa@redhat.com>, Mike Galbraith <efault@gmx.de>,
Namhyung Kim <namhyung@gmail.com>,
Paul Mackerras <paulus@samba.org>,
Stephane Eranian <eranian@google.com>
Subject: [PATCH V2 3/9] perf tools: Add machine__get_kallsyms_filename()
Date: Wed, 29 Jan 2014 16:14:38 +0200 [thread overview]
Message-ID: <1391004884-10334-4-git-send-email-adrian.hunter@intel.com> (raw)
In-Reply-To: <1391004884-10334-1-git-send-email-adrian.hunter@intel.com>
Separate out the logic used to make the
kallsyms full path name for a machine.
It will be reused in a subsequent patch.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
tools/perf/util/machine.c | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index ded7459..290c2e6 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -496,19 +496,22 @@ static int symbol__in_kernel(void *arg, const char *name,
return 1;
}
+static void machine__get_kallsyms_filename(struct machine *machine, char *buf,
+ size_t bufsz)
+{
+ if (machine__is_default_guest(machine))
+ scnprintf(buf, bufsz, "%s", symbol_conf.default_guest_kallsyms);
+ else
+ scnprintf(buf, bufsz, "%s/proc/kallsyms", machine->root_dir);
+}
+
/* Figure out the start address of kernel map from /proc/kallsyms */
static u64 machine__get_kernel_start_addr(struct machine *machine)
{
- const char *filename;
- char path[PATH_MAX];
+ char filename[PATH_MAX];
struct process_args args;
- if (machine__is_default_guest(machine))
- filename = (char *)symbol_conf.default_guest_kallsyms;
- else {
- sprintf(path, "%s/proc/kallsyms", machine->root_dir);
- filename = path;
- }
+ machine__get_kallsyms_filename(machine, filename, PATH_MAX);
if (symbol__restricted_filename(filename, "/proc/kallsyms"))
return 0;
--
1.7.11.7
next prev parent reply other threads:[~2014-01-29 14:13 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-29 14:14 [PATCH V2 0/9] perf tools: kaslr fixes Adrian Hunter
2014-01-29 14:14 ` [PATCH V2 1/9] perf tools: Fix symbol annotation for relocated kernel Adrian Hunter
2014-01-29 18:57 ` Arnaldo Carvalho de Melo
2014-01-30 7:20 ` Adrian Hunter
2014-01-30 8:59 ` Ingo Molnar
2014-01-30 9:21 ` Adrian Hunter
2014-01-30 9:20 ` Ingo Molnar
2014-01-30 18:08 ` Arnaldo Carvalho de Melo
2014-01-30 18:12 ` Arnaldo Carvalho de Melo
2014-01-30 18:15 ` Arnaldo Carvalho de Melo
2014-01-30 20:10 ` Arnaldo Carvalho de Melo
2014-02-02 8:55 ` [tip:perf/urgent] perf symbols: " tip-bot for Adrian Hunter
2014-01-29 14:14 ` [PATCH V2 2/9] perf tools: Add kallsyms__get_function_start() Adrian Hunter
2014-02-02 8:55 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2014-01-29 14:14 ` Adrian Hunter [this message]
2014-02-02 8:55 ` [tip:perf/urgent] perf machine: Add machine__get_kallsyms_filename() tip-bot for Adrian Hunter
2014-01-29 14:14 ` [PATCH V2 4/9] perf tools: Set up ref_reloc_sym in machine__create_kernel_maps() Adrian Hunter
2014-02-02 8:55 ` [tip:perf/urgent] perf machine: " tip-bot for Adrian Hunter
2014-01-29 14:14 ` [PATCH V2 5/9] perf record: Get ref_reloc_sym from kernel map Adrian Hunter
2014-02-02 8:55 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2014-01-29 14:14 ` [PATCH V2 6/9] perf tools: Prevent the use of kcore if the kernel has moved Adrian Hunter
2014-02-02 8:56 ` [tip:perf/urgent] perf symbols: " tip-bot for Adrian Hunter
2014-01-29 14:14 ` [PATCH V2 7/9] perf tools: Test does not need to set up ref_reloc_sym Adrian Hunter
2014-02-02 8:56 ` [tip:perf/urgent] perf tests: No " tip-bot for Adrian Hunter
2014-01-29 14:14 ` [PATCH V2 8/9] perf tools: Adjust kallsyms for relocated kernel Adrian Hunter
2014-01-29 19:08 ` Arnaldo Carvalho de Melo
2014-01-30 8:10 ` Adrian Hunter
2014-01-31 18:21 ` Arnaldo Carvalho de Melo
2014-02-02 8:56 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2014-01-29 14:14 ` [PATCH V2 9/9] perf buildid-cache: Check relocation when checking for existing kcore Adrian Hunter
2014-01-29 19:14 ` Arnaldo Carvalho de Melo
2014-01-30 9:34 ` Adrian Hunter
2014-01-30 14:18 ` Arnaldo Carvalho de Melo
2014-01-30 16:35 ` Adrian Hunter
2014-02-02 8:56 ` [tip:perf/urgent] " tip-bot for Adrian Hunter
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=1391004884-10334-4-git-send-email-adrian.hunter@intel.com \
--to=adrian.hunter@intel.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@ghostprotocols.net \
--cc=dsahern@gmail.com \
--cc=efault@gmx.de \
--cc=eranian@google.com \
--cc=fweisbec@gmail.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@gmail.com \
--cc=paulus@samba.org \
/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;
as well as URLs for NNTP newsgroup(s).