aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAdrian Hunter <adrian.hunter@intel.com>2013-08-27 04:23:08 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2013-08-29 14:49:10 -0400
commitfaf967068e8c4d8df52f01f9361241101b3065a0 (patch)
tree5ce65e6ed55c9ff22cfe7db6c2854715fee40c91 /tools
parentff3d527cebc1fa3707c617bfe9e74f53fcfb0955 (diff)
perf evlist: Move perf_evlist__config() to a new source file
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>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/Makefile1
-rw-r--r--tools/perf/util/evlist.c22
-rw-r--r--tools/perf/util/record.c25
3 files changed, 26 insertions, 22 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 7d30a7ddcc88..845cc762735d 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -360,6 +360,7 @@ LIB_OBJS += $(OUTPUT)util/rblist.o
360LIB_OBJS += $(OUTPUT)util/intlist.o 360LIB_OBJS += $(OUTPUT)util/intlist.o
361LIB_OBJS += $(OUTPUT)util/vdso.o 361LIB_OBJS += $(OUTPUT)util/vdso.o
362LIB_OBJS += $(OUTPUT)util/stat.o 362LIB_OBJS += $(OUTPUT)util/stat.o
363LIB_OBJS += $(OUTPUT)util/record.o
363 364
364LIB_OBJS += $(OUTPUT)ui/setup.o 365LIB_OBJS += $(OUTPUT)ui/setup.o
365LIB_OBJS += $(OUTPUT)ui/helpline.o 366LIB_OBJS += $(OUTPUT)ui/helpline.o
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 1f5105ac5c85..9d682e5f7184 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -49,28 +49,6 @@ struct perf_evlist *perf_evlist__new(void)
49 return evlist; 49 return evlist;
50} 50}
51 51
52void perf_evlist__config(struct perf_evlist *evlist,
53 struct perf_record_opts *opts)
54{
55 struct perf_evsel *evsel;
56 /*
57 * Set the evsel leader links before we configure attributes,
58 * since some might depend on this info.
59 */
60 if (opts->group)
61 perf_evlist__set_leader(evlist);
62
63 if (evlist->cpus->map[0] < 0)
64 opts->no_inherit = true;
65
66 list_for_each_entry(evsel, &evlist->entries, node) {
67 perf_evsel__config(evsel, opts);
68
69 if (evlist->nr_entries > 1)
70 perf_evsel__set_sample_id(evsel);
71 }
72}
73
74static void perf_evlist__purge(struct perf_evlist *evlist) 52static void perf_evlist__purge(struct perf_evlist *evlist)
75{ 53{
76 struct perf_evsel *pos, *n; 54 struct perf_evsel *pos, *n;
diff --git a/tools/perf/util/record.c b/tools/perf/util/record.c
new file mode 100644
index 000000000000..9b5ef7933135
--- /dev/null
+++ b/tools/perf/util/record.c
@@ -0,0 +1,25 @@
1#include "evlist.h"
2#include "evsel.h"
3#include "cpumap.h"
4
5void perf_evlist__config(struct perf_evlist *evlist,
6 struct perf_record_opts *opts)
7{
8 struct perf_evsel *evsel;
9 /*
10 * Set the evsel leader links before we configure attributes,
11 * since some might depend on this info.
12 */
13 if (opts->group)
14 perf_evlist__set_leader(evlist);
15
16 if (evlist->cpus->map[0] < 0)
17 opts->no_inherit = true;
18
19 list_for_each_entry(evsel, &evlist->entries, node) {
20 perf_evsel__config(evsel, opts);
21
22 if (evlist->nr_entries > 1)
23 perf_evsel__set_sample_id(evsel);
24 }
25}