From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
Dongsheng Yang <yangds.fnst@cn.fujitsu.com>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 14/21] perf kvm: Move code to generate filename for perf-kvm to function.
Date: Mon, 9 Dec 2013 16:37:03 -0300 [thread overview]
Message-ID: <1386617830-18926-15-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1386617830-18926-1-git-send-email-acme@infradead.org>
From: Dongsheng Yang <yangds.fnst@cn.fujitsu.com>
The code in builtin-kvm.c to generate filename for perf-kvm is useful to
other command such as builtin-diff.
This patch move the related code form builtin-kvm.c to util/util.c and
wrap them in a function named get_filename_for_perf_kvm.
Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com>
Link: http://lkml.kernel.org/r/5e09a5c47e8a495e888cbdc65a6fafb2c950f529.1386368672.git.yangds.fnst@cn.fujitsu.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/builtin-kvm.c | 7 +------
tools/perf/util/util.c | 14 ++++++++++++++
tools/perf/util/util.h | 2 ++
3 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c
index c2e5d56a291d..c6fa3cbd45a9 100644
--- a/tools/perf/builtin-kvm.c
+++ b/tools/perf/builtin-kvm.c
@@ -1713,12 +1713,7 @@ int cmd_kvm(int argc, const char **argv, const char *prefix __maybe_unused)
perf_guest = 1;
if (!file_name) {
- if (perf_host && !perf_guest)
- file_name = strdup("perf.data.host");
- else if (!perf_host && perf_guest)
- file_name = strdup("perf.data.guest");
- else
- file_name = strdup("perf.data.kvm");
+ file_name = get_filename_for_perf_kvm();
if (!file_name) {
pr_err("Failed to allocate memory for filename\n");
diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c
index bae8756a4eb1..4a57609c0b43 100644
--- a/tools/perf/util/util.c
+++ b/tools/perf/util/util.c
@@ -482,3 +482,17 @@ int filename__read_str(const char *filename, char **buf, size_t *sizep)
close(fd);
return err;
}
+
+const char *get_filename_for_perf_kvm(void)
+{
+ const char *filename;
+
+ if (perf_host && !perf_guest)
+ filename = strdup("perf.data.host");
+ else if (!perf_host && perf_guest)
+ filename = strdup("perf.data.guest");
+ else
+ filename = strdup("perf.data.kvm");
+
+ return filename;
+}
diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
index 659abf30e01b..0171213d1d4d 100644
--- a/tools/perf/util/util.h
+++ b/tools/perf/util/util.h
@@ -321,4 +321,6 @@ void free_srcline(char *srcline);
int filename__read_int(const char *filename, int *value);
int filename__read_str(const char *filename, char **buf, size_t *sizep);
+
+const char *get_filename_for_perf_kvm(void);
#endif /* GIT_COMPAT_UTIL_H */
--
1.8.1.4
next prev parent reply other threads:[~2013-12-09 19:37 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-09 19:36 [GIT PULL 00/21] perf/core improvements and fixes Arnaldo Carvalho de Melo
2013-12-09 19:36 ` [PATCH 01/21] perf trace: Add support for syscalls vs raw_syscalls Arnaldo Carvalho de Melo
2013-12-09 19:36 ` [PATCH 02/21] perf trace: Fix summary percentage when processing files Arnaldo Carvalho de Melo
2013-12-09 19:36 ` [PATCH 03/21] tools lib traceevent: Report better error message on bad function args Arnaldo Carvalho de Melo
2013-12-09 19:36 ` [PATCH 04/21] perf script: Fix symoff printing in callchains Arnaldo Carvalho de Melo
2013-12-09 19:36 ` [PATCH 05/21] perf script: Add an option to print the source line number Arnaldo Carvalho de Melo
2013-12-09 19:36 ` [PATCH 06/21] perf record: Fix display of incorrect mmap pages Arnaldo Carvalho de Melo
2013-12-09 19:36 ` [PATCH 07/21] perf evlist: Remove unnecessary parentheses Arnaldo Carvalho de Melo
2013-12-09 19:36 ` [PATCH 08/21] perf evlist: Fix max mmap_pages Arnaldo Carvalho de Melo
2013-12-09 19:36 ` [PATCH 09/21] perf evlist: Fix mmap pages rounding to power of 2 Arnaldo Carvalho de Melo
2013-12-09 19:36 ` [PATCH 10/21] perf kvm: Introduce option -v for perf kvm command Arnaldo Carvalho de Melo
2013-12-09 19:37 ` [PATCH 11/21] perf kvm: Fix bug in 'stat report' Arnaldo Carvalho de Melo
2013-12-09 19:37 ` [PATCH 12/21] perf archive: Remove duplicated 'runs' in man page Arnaldo Carvalho de Melo
2013-12-09 19:37 ` [PATCH 13/21] perf annotate: Fix typo Arnaldo Carvalho de Melo
2013-12-09 19:37 ` Arnaldo Carvalho de Melo [this message]
2013-12-09 19:37 ` [PATCH 15/21] perf kvm: Make perf kvm diff support --guestmount Arnaldo Carvalho de Melo
2013-12-09 19:37 ` [PATCH 16/21] tools lib traceevent: Get rid of malloc_or_die() in pevent_filter_alloc() Arnaldo Carvalho de Melo
2013-12-09 19:37 ` [PATCH 17/21] tools lib traceevent: Get rid of malloc_or_die() in add_event() Arnaldo Carvalho de Melo
2013-12-09 19:37 ` [PATCH 18/21] tools lib traceevent: Get rid of die() in create_arg_item() Arnaldo Carvalho de Melo
2013-12-09 19:37 ` [PATCH 19/21] tools lib traceevent: Get rid of malloc_or_die() in pevent_filter_add_filter_str() Arnaldo Carvalho de Melo
2013-12-09 19:37 ` [PATCH 20/21] tools lib traceevent: Get rid of die() in pevent_filter_clear_trivial() Arnaldo Carvalho de Melo
2013-12-09 19:37 ` [PATCH 21/21] perf symbols: fix bug in usage of the basename() function Arnaldo Carvalho de Melo
2013-12-10 11:07 ` [GIT PULL 00/21] perf/core improvements and fixes Ingo Molnar
2013-12-10 15:47 ` Jiri Olsa
2013-12-10 15:49 ` Ingo Molnar
2013-12-10 11:12 ` Ingo Molnar
2013-12-10 11:44 ` Arnaldo Carvalho de Melo
2013-12-10 11:47 ` Ingo Molnar
2013-12-10 12:01 ` Arnaldo Carvalho de Melo
2013-12-10 12:07 ` Ingo Molnar
2013-12-10 12:13 ` Adrian Hunter
2013-12-10 12:10 ` Arnaldo Carvalho de Melo
2013-12-10 12:22 ` Adrian Hunter
2013-12-10 12:22 ` Arnaldo Carvalho de Melo
2013-12-10 12:23 ` Arnaldo Carvalho de Melo
2013-12-10 12:24 ` Ingo Molnar
2013-12-11 11:07 ` [tip:perf/core] perf symbols: Remove open coded management of short_name_allocated member tip-bot for Adrian Hunter
2013-12-10 12:18 ` [GIT PULL 00/21] perf/core improvements and fixes Ingo Molnar
2013-12-10 12:46 ` Ingo Molnar
2013-12-10 13:29 ` Arnaldo Carvalho de Melo
2013-12-10 13:49 ` Arnaldo Carvalho de Melo
2013-12-10 15:05 ` Ingo Molnar
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=1386617830-18926-15-git-send-email-acme@infradead.org \
--to=acme@infradead.org \
--cc=acme@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).