linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
	Adrian Hunter <adrian.hunter@intel.com>,
	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>,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 06/15] perf evlist: Move perf_evlist__config() to a new source file
Date: Fri, 30 Aug 2013 15:58:49 -0300	[thread overview]
Message-ID: <1377889138-8793-7-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1377889138-8793-1-git-send-email-acme@infradead.org>

From: Adrian Hunter <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>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1377591794-30553-7-git-send-email-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 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.8.1.4


  parent reply	other threads:[~2013-08-30 19:01 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-30 18:58 [GIT PULL 00/15] perf/core improvements and fixes Arnaldo Carvalho de Melo
2013-08-30 18:58 ` [PATCH 01/15] perf tools: change machine__findnew_thread() to set thread pid Arnaldo Carvalho de Melo
2013-08-30 18:58 ` [PATCH 02/15] perf evsel: Tidy up sample parsing overflow checking Arnaldo Carvalho de Melo
2013-08-30 18:58 ` [PATCH 03/15] perf callchain: Remove unnecessary validation Arnaldo Carvalho de Melo
2013-08-30 18:58 ` [PATCH 04/15] perf tools: Remove references to struct ip_event Arnaldo Carvalho de Melo
2013-08-30 18:58 ` [PATCH 05/15] perf: make events stream always parsable Arnaldo Carvalho de Melo
2013-08-30 18:58 ` Arnaldo Carvalho de Melo [this message]
2013-08-30 18:58 ` [PATCH 07/15] perf tools: Add support for PERF_SAMPLE_IDENTIFIER Arnaldo Carvalho de Melo
2013-08-30 18:58 ` [PATCH 08/15] perf tools: Add missing 'abi' member to 'struct regs_dump' Arnaldo Carvalho de Melo
2013-08-30 18:58 ` [PATCH 09/15] perf tools: Expand perf_event__synthesize_sample() Arnaldo Carvalho de Melo
2013-08-30 18:58 ` [PATCH 10/15] perf tools: Add a function to calculate sample event size Arnaldo Carvalho de Melo
2013-08-30 18:58 ` [PATCH 11/15] perf tests: Add a sample parsing test Arnaldo Carvalho de Melo
2013-08-30 18:58 ` [PATCH 12/15] perf evlist: Add tracepoint lookup by name Arnaldo Carvalho de Melo
2013-08-30 18:58 ` [PATCH 13/15] perf trace: Add option to analyze events in a file versus live Arnaldo Carvalho de Melo
2013-08-30 18:58 ` [PATCH 14/15] perf trace: Honor target pid / tid options when analyzing a file Arnaldo Carvalho de Melo
2013-08-30 18:58 ` [PATCH 15/15] perf trace: Handle missing HUGEPAGE defines Arnaldo Carvalho de Melo
2013-08-31  8:08 ` [GIT PULL 00/15] 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=1377889138-8793-7-git-send-email-acme@infradead.org \
    --to=acme@infradead.org \
    --cc=acme@redhat.com \
    --cc=adrian.hunter@intel.com \
    --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 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).