[PATCH V13 06/12] perf tools: 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 Acked-by: Namhyung Kim --- 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, >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 000..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, >entries, node) { + perf_evsel__config(evsel, opts); + + if (evlist->nr_entries > 1) + perf_evsel__set_sample_id(evsel); + } +} -- 1.7.11.7 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH V13 06/12] perf tools: 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.hun...@intel.com Acked-by: Namhyung Kim namhy...@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 000..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 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/