From: tip-bot for Dongsheng Yang <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com,
mingo@kernel.org, namhyung.kim@lge.com, jolsa@redhat.com,
dsahern@gmail.com, tglx@linutronix.de,
yangds.fnst@cn.fujitsu.com
Subject: [tip:perf/core] perf tools: Find the proc info under machine-> root_dir.
Date: Sun, 12 Jan 2014 10:37:04 -0800 [thread overview]
Message-ID: <tip-995634650ef1f907196bd7e9ae45354124a80e47@git.kernel.org> (raw)
In-Reply-To: <927b937da9177a079abafe4532fa9c9b60b5c4b7.1387572416.git.yangds.fnst@cn.fujitsu.com>
Commit-ID: 995634650ef1f907196bd7e9ae45354124a80e47
Gitweb: http://git.kernel.org/tip/995634650ef1f907196bd7e9ae45354124a80e47
Author: Dongsheng Yang <yangds.fnst@cn.fujitsu.com>
AuthorDate: Fri, 20 Dec 2013 15:52:57 -0500
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 23 Dec 2013 16:49:49 -0300
perf tools: Find the proc info under machine->root_dir.
When we synthesize the threads, we are looking for the infomation under
/proc. But it is only for host.
This patch look for the path of proc under machine->root_dir, then
XXX__synthesize_threads() functions can support guest machines.
Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Link: http://lkml.kernel.org/r/927b937da9177a079abafe4532fa9c9b60b5c4b7.1387572416.git.yangds.fnst@cn.fujitsu.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/event.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 484e994..a61726e 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -129,7 +129,8 @@ static pid_t perf_event__synthesize_comm(struct perf_tool *tool,
goto out;
}
- snprintf(filename, sizeof(filename), "/proc/%d/task", pid);
+ snprintf(filename, sizeof(filename), "%s/proc/%d/task",
+ machine->root_dir, pid);
tasks = opendir(filename);
if (tasks == NULL) {
@@ -178,7 +179,8 @@ static int perf_event__synthesize_mmap_events(struct perf_tool *tool,
FILE *fp;
int rc = 0;
- snprintf(filename, sizeof(filename), "/proc/%d/maps", pid);
+ snprintf(filename, sizeof(filename), "%s/proc/%d/maps",
+ machine->root_dir, pid);
fp = fopen(filename, "r");
if (fp == NULL) {
@@ -387,6 +389,7 @@ int perf_event__synthesize_threads(struct perf_tool *tool,
struct machine *machine, bool mmap_data)
{
DIR *proc;
+ char proc_path[PATH_MAX];
struct dirent dirent, *next;
union perf_event *comm_event, *mmap_event;
int err = -1;
@@ -399,7 +402,9 @@ int perf_event__synthesize_threads(struct perf_tool *tool,
if (mmap_event == NULL)
goto out_free_comm;
- proc = opendir("/proc");
+ snprintf(proc_path, sizeof(proc_path), "%s/proc", machine->root_dir);
+ proc = opendir(proc_path);
+
if (proc == NULL)
goto out_free_mmap;
next prev parent reply other threads:[~2014-01-12 18:37 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-20 20:52 [PATCH 0/7 V2] Add support of user space symboles for guest Dongsheng Yang
2013-12-20 15:02 ` David Ahern
2013-12-30 15:32 ` Dongsheng Yang
2013-12-20 20:52 ` [PATCH 1/7] perf tools: Add support for PERF_RECORD_MISC_GUEST_USER in thread__find_addr_map() Dongsheng Yang
2014-01-12 18:36 ` [tip:perf/core] " tip-bot for Dongsheng Yang
2013-12-20 20:52 ` [PATCH 2/7] perf tools: Find the proc info under machine->root_dir Dongsheng Yang
2014-01-12 18:37 ` tip-bot for Dongsheng Yang [this message]
2013-12-20 20:52 ` [PATCH 3/7] perf tools: Set event->header.misc to PERF_RECORD_MISC_GUEST_USER if machine is guest Dongsheng Yang
2014-01-12 18:37 ` [tip:perf/core] perf tools: Set event-> header.misc " tip-bot for Dongsheng Yang
2013-12-20 20:52 ` [PATCH 4/7] perf tools: Use machine->pid for tgid if mahicne " Dongsheng Yang
2014-01-12 18:37 ` [tip:perf/core] perf tools: Use machine-> pid for tgid if machine " tip-bot for Dongsheng Yang
2013-12-20 20:53 ` [PATCH 5/7] perf tools: Do not synthesize the treads of default guest Dongsheng Yang
2014-01-12 18:37 ` [tip:perf/core] " tip-bot for Dongsheng Yang
2013-12-20 20:53 ` [PATCH 6/7] perf tools: Add support of user space symbols for guest in perf kvm top Dongsheng Yang
2013-12-20 20:53 ` [PATCH 7/7] perf tools: Add support of user space symbols for guest in perf kvm record Dongsheng Yang
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-995634650ef1f907196bd7e9ae45354124a80e47@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=dsahern@gmail.com \
--cc=hpa@zytor.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung.kim@lge.com \
--cc=tglx@linutronix.de \
--cc=yangds.fnst@cn.fujitsu.com \
/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
Powered by JetHome