From: Adrian Hunter <adrian.hunter@intel.com>
To: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: 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>,
Peter Zijlstra <peterz@infradead.org>,
Stephane Eranian <eranian@google.com>,
Ingo Molnar <mingo@kernel.org>
Subject: [PATCH V13 06/12] perf tools: move perf_evlist__config() to a new source file
Date: Tue, 27 Aug 2013 11:23:08 +0300 [thread overview]
Message-ID: <1377591794-30553-7-git-send-email-adrian.hunter@intel.com> (raw)
In-Reply-To: <1377591794-30553-1-git-send-email-adrian.hunter@intel.com>
perf_evlist__config() must be moved to a separate source
file to avoid Python link errors when adding support for
PERF_SAMPLE_IDENTIFIER.
It is appropriate to do this because perf_evlist__config()
is a helper function for event recording. It is used by
tools to apply recording options to perf_evlist. It is
not used by the Python API.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/Makefile | 1 +
tools/perf/util/evlist.c | 22 ----------------------
tools/perf/util/record.c | 25 +++++++++++++++++++++++++
3 files changed, 26 insertions(+), 22 deletions(-)
create mode 100644 tools/perf/util/record.c
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 7d30a7d..845cc76 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -360,6 +360,7 @@ LIB_OBJS += $(OUTPUT)util/rblist.o
LIB_OBJS += $(OUTPUT)util/intlist.o
LIB_OBJS += $(OUTPUT)util/vdso.o
LIB_OBJS += $(OUTPUT)util/stat.o
+LIB_OBJS += $(OUTPUT)util/record.o
LIB_OBJS += $(OUTPUT)ui/setup.o
LIB_OBJS += $(OUTPUT)ui/helpline.o
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 1f5105a..9d682e5 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -49,28 +49,6 @@ struct perf_evlist *perf_evlist__new(void)
return evlist;
}
-void perf_evlist__config(struct perf_evlist *evlist,
- struct perf_record_opts *opts)
-{
- struct perf_evsel *evsel;
- /*
- * Set the evsel leader links before we configure attributes,
- * since some might depend on this info.
- */
- if (opts->group)
- perf_evlist__set_leader(evlist);
-
- if (evlist->cpus->map[0] < 0)
- opts->no_inherit = true;
-
- list_for_each_entry(evsel, &evlist->entries, node) {
- perf_evsel__config(evsel, opts);
-
- if (evlist->nr_entries > 1)
- perf_evsel__set_sample_id(evsel);
- }
-}
-
static void perf_evlist__purge(struct perf_evlist *evlist)
{
struct perf_evsel *pos, *n;
diff --git a/tools/perf/util/record.c b/tools/perf/util/record.c
new file mode 100644
index 0000000..9b5ef79
--- /dev/null
+++ b/tools/perf/util/record.c
@@ -0,0 +1,25 @@
+#include "evlist.h"
+#include "evsel.h"
+#include "cpumap.h"
+
+void perf_evlist__config(struct perf_evlist *evlist,
+ struct perf_record_opts *opts)
+{
+ struct perf_evsel *evsel;
+ /*
+ * Set the evsel leader links before we configure attributes,
+ * since some might depend on this info.
+ */
+ if (opts->group)
+ perf_evlist__set_leader(evlist);
+
+ if (evlist->cpus->map[0] < 0)
+ opts->no_inherit = true;
+
+ list_for_each_entry(evsel, &evlist->entries, node) {
+ perf_evsel__config(evsel, opts);
+
+ if (evlist->nr_entries > 1)
+ perf_evsel__set_sample_id(evsel);
+ }
+}
--
1.7.11.7
next prev parent reply other threads:[~2013-08-27 8:17 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-27 8:23 [PATCH V13 00/12] perf tools: some fixes and tweaks Adrian Hunter
2013-08-27 8:23 ` [PATCH V13 01/12] perf tools: change machine__findnew_thread() to set thread pid Adrian Hunter
2013-08-31 8:13 ` [tip:perf/core] " tip-bot for Adrian Hunter
2013-08-27 8:23 ` [PATCH V13 02/12] perf tools: tidy up sample parsing overflow checking Adrian Hunter
2013-08-31 8:13 ` [tip:perf/core] perf evsel: Tidy " tip-bot for Adrian Hunter
2013-08-27 8:23 ` [PATCH V13 03/12] perf tools: remove unnecessary callchain validation Adrian Hunter
2013-08-31 8:13 ` [tip:perf/core] perf callchain: Remove unnecessary validation tip-bot for Adrian Hunter
2013-08-27 8:23 ` [PATCH V13 04/12] perf tools: remove references to struct ip_event Adrian Hunter
2013-08-31 8:13 ` [tip:perf/core] perf tools: Remove " tip-bot for Adrian Hunter
2013-08-27 8:23 ` [PATCH V13 05/12] perf: make events stream always parsable Adrian Hunter
2013-08-31 8:13 ` [tip:perf/core] " tip-bot for Adrian Hunter
2013-08-27 8:23 ` Adrian Hunter [this message]
2013-08-31 8:14 ` [tip:perf/core] perf evlist: Move perf_evlist__config() to a new source file tip-bot for Adrian Hunter
2013-08-27 8:23 ` [PATCH V13 07/12] perf tools: add support for PERF_SAMPLE_IDENTFIER Adrian Hunter
2013-08-31 8:14 ` [tip:perf/core] perf tools: Add support for PERF_SAMPLE_IDENTIFIER tip-bot for Adrian Hunter
2013-08-27 8:23 ` [PATCH V13 08/12] perf tools: add missing 'abi' member to 'struct regs_dump' Adrian Hunter
2013-08-31 8:14 ` [tip:perf/core] perf tools: Add missing 'abi' member to ' struct regs_dump' tip-bot for Adrian Hunter
2013-08-27 8:23 ` [PATCH V13 09/12] perf tools: expand perf_event__synthesize_sample() Adrian Hunter
2013-08-31 8:14 ` [tip:perf/core] perf tools: Expand perf_event__synthesize_sample( ) tip-bot for Adrian Hunter
2013-08-27 8:23 ` [PATCH V13 10/12] perf tools: add a function to calculate sample event size Adrian Hunter
2013-08-31 8:14 ` [tip:perf/core] perf tools: Add " tip-bot for Adrian Hunter
2013-08-27 8:23 ` [PATCH V13 11/12] perf tools: add a sample parsing test Adrian Hunter
2013-08-31 8:14 ` [tip:perf/core] perf tests: Add " tip-bot for Adrian Hunter
2013-08-27 8:23 ` [PATCH V13 12/12] perf tools: allow non-matching sample types 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=1377591794-30553-7-git-send-email-adrian.hunter@intel.com \
--to=adrian.hunter@intel.com \
--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@kernel.org \
--cc=namhyung@gmail.com \
--cc=paulus@samba.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.