Skip to content

Commit

Permalink
perf evlist: Move perf_evlist__config() to a new source file
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Adrian Hunter authored and Arnaldo Carvalho de Melo committed Aug 29, 2013
1 parent ff3d527 commit faf9670
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 22 deletions.
1 change: 1 addition & 0 deletions tools/perf/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 0 additions & 22 deletions tools/perf/util/evlist.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
25 changes: 25 additions & 0 deletions tools/perf/util/record.c
Original file line number Diff line number Diff line change
@@ -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);
}
}

0 comments on commit faf9670

Please sign in to comment.