From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
Josh Poimboeuf <jpoimboe@redhat.com>,
Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 11/11] perf tools: Move cmd_version() to builtin-version.c
Date: Wed, 9 Dec 2015 13:51:56 -0300 [thread overview]
Message-ID: <1449679916-25311-12-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1449679916-25311-1-git-send-email-acme@kernel.org>
From: Josh Poimboeuf <jpoimboe@redhat.com>
Move cmd_version() to its own file so that help.c can be moved to a
library.
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/e908b1b68f20ab6d8d33941d5571c23110622e60.1449548395.git.jpoimboe@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/Build | 1 +
tools/perf/builtin-version.c | 10 ++++++++++
tools/perf/util/help.c | 7 -------
3 files changed, 11 insertions(+), 7 deletions(-)
create mode 100644 tools/perf/builtin-version.c
diff --git a/tools/perf/Build b/tools/perf/Build
index 2c7aaf2ba119..2a41217e9d88 100644
--- a/tools/perf/Build
+++ b/tools/perf/Build
@@ -20,6 +20,7 @@ perf-y += builtin-kvm.o
perf-y += builtin-inject.o
perf-y += builtin-mem.o
perf-y += builtin-data.o
+perf-y += builtin-version.o
perf-$(CONFIG_AUDIT) += builtin-trace.o
perf-$(CONFIG_LIBELF) += builtin-probe.o
diff --git a/tools/perf/builtin-version.c b/tools/perf/builtin-version.c
new file mode 100644
index 000000000000..9b10cda6b6dc
--- /dev/null
+++ b/tools/perf/builtin-version.c
@@ -0,0 +1,10 @@
+#include "util/util.h"
+#include "builtin.h"
+#include "perf.h"
+
+int cmd_version(int argc __maybe_unused, const char **argv __maybe_unused,
+ const char *prefix __maybe_unused)
+{
+ printf("perf version %s\n", perf_version_string);
+ return 0;
+}
diff --git a/tools/perf/util/help.c b/tools/perf/util/help.c
index fa1fc4acb8a4..929c93f2c333 100644
--- a/tools/perf/util/help.c
+++ b/tools/perf/util/help.c
@@ -332,10 +332,3 @@ const char *help_unknown_cmd(const char *cmd)
exit(1);
}
-
-int cmd_version(int argc __maybe_unused, const char **argv __maybe_unused,
- const char *prefix __maybe_unused)
-{
- printf("perf version %s\n", perf_version_string);
- return 0;
-}
--
2.1.0
next prev parent reply other threads:[~2015-12-09 16:53 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-09 16:51 [GIT PULL 00/11] perf/core improvements and fixes Arnaldo Carvalho de Melo
2015-12-09 16:51 ` [PATCH 01/11] perf tui: Change default selection background color to yellow Arnaldo Carvalho de Melo
2015-12-09 16:51 ` [PATCH 02/11] perf tools: Fix map_groups__clone to put cloned map Arnaldo Carvalho de Melo
2015-12-09 16:51 ` [PATCH 03/11] perf stat: Fix cmd_stat to release cpu_map Arnaldo Carvalho de Melo
2015-12-09 16:51 ` [PATCH 04/11] perf hists: Fix hists_evsel to release hists Arnaldo Carvalho de Melo
2015-12-09 16:51 ` [PATCH 05/11] perf tools: Fix maps__fixup_overlappings to put used maps Arnaldo Carvalho de Melo
2015-12-09 16:51 ` [PATCH 06/11] perf machine: Fix machine.vmlinux_maps to make sure to clear the old one Arnaldo Carvalho de Melo
2015-12-09 16:51 ` [PATCH 07/11] perf tools: Fix write_numa_topology to put cpu_map instead of free Arnaldo Carvalho de Melo
2015-12-09 16:51 ` [PATCH 08/11] perf tools: Remove unused pager_use_color variable Arnaldo Carvalho de Melo
2015-12-09 16:51 ` [PATCH 09/11] perf tools: Move term functions out of util.c Arnaldo Carvalho de Melo
2015-12-09 16:51 ` [PATCH 10/11] perf tools: Save cmdline arguments earlier Arnaldo Carvalho de Melo
2015-12-09 16:51 ` Arnaldo Carvalho de Melo [this message]
2015-12-10 8:12 ` [GIT PULL 00/11] perf/core improvements and fixes 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=1449679916-25311-12-git-send-email-acme@kernel.org \
--to=acme@kernel.org \
--cc=acme@redhat.com \
--cc=jolsa@redhat.com \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.