]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
libperf: Rename the PERF_RECORD_ structs to have a "perf" prefix
authorJiri Olsa <jolsa@kernel.org>
Wed, 28 Aug 2019 13:57:16 +0000 (15:57 +0200)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Thu, 29 Aug 2019 11:36:12 +0000 (08:36 -0300)
Even more, to have a "perf_record_" prefix, so that they match the
PERF_RECORD_ enum they map to.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20190828135717.7245-23-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
33 files changed:
tools/perf/arch/arm/util/cs-etm.c
tools/perf/arch/arm64/util/arm-spe.c
tools/perf/arch/s390/util/auxtrace.c
tools/perf/arch/x86/util/intel-bts.c
tools/perf/arch/x86/util/intel-pt.c
tools/perf/arch/x86/util/tsc.c
tools/perf/builtin-record.c
tools/perf/builtin-script.c
tools/perf/builtin-stat.c
tools/perf/lib/include/perf/event.h
tools/perf/tests/cpumap.c
tools/perf/tests/event_update.c
tools/perf/tests/stat.c
tools/perf/tests/thread-map.c
tools/perf/util/arm-spe.c
tools/perf/util/auxtrace.c
tools/perf/util/auxtrace.h
tools/perf/util/build-id.c
tools/perf/util/cpumap.c
tools/perf/util/cpumap.h
tools/perf/util/cs-etm.c
tools/perf/util/event.c
tools/perf/util/event.h
tools/perf/util/header.c
tools/perf/util/intel-bts.c
tools/perf/util/intel-pt.c
tools/perf/util/python.c
tools/perf/util/s390-cpumsf.c
tools/perf/util/session.c
tools/perf/util/session.h
tools/perf/util/stat.c
tools/perf/util/thread_map.c
tools/perf/util/thread_map.h

index 5d856edc412bfb023873f69cacaa624a61e6f977..9644e2d405f7fd2ec5f3de114413d54c579912fa 100644 (file)
@@ -565,7 +565,7 @@ static int cs_etm_get_ro(struct perf_pmu *pmu, int cpu, const char *path)
 
 static void cs_etm_get_metadata(int cpu, u32 *offset,
                                struct auxtrace_record *itr,
-                               struct auxtrace_info_event *info)
+                               struct perf_record_auxtrace_info *info)
 {
        u32 increment;
        u64 magic;
@@ -630,7 +630,7 @@ static void cs_etm_get_metadata(int cpu, u32 *offset,
 
 static int cs_etm_info_fill(struct auxtrace_record *itr,
                            struct perf_session *session,
-                           struct auxtrace_info_event *info,
+                           struct perf_record_auxtrace_info *info,
                            size_t priv_size)
 {
        int i;
index c7b38f09260fba967f4f8c4ae597dce28598bedf..4b364692da67907f94a629f216a7152da3c80121 100644 (file)
@@ -41,7 +41,7 @@ arm_spe_info_priv_size(struct auxtrace_record *itr __maybe_unused,
 
 static int arm_spe_info_fill(struct auxtrace_record *itr,
                             struct perf_session *session,
-                            struct auxtrace_info_event *auxtrace_info,
+                            struct perf_record_auxtrace_info *auxtrace_info,
                             size_t priv_size)
 {
        struct arm_spe_recording *sper =
index f32d7a72d0398e721947f7d5c984958b29405f6c..b0fb70e38960dc9c339aaa7348eb5bff73f2459e 100644 (file)
@@ -29,7 +29,7 @@ static size_t cpumsf_info_priv_size(struct auxtrace_record *itr __maybe_unused,
 static int
 cpumsf_info_fill(struct auxtrace_record *itr __maybe_unused,
                 struct perf_session *session __maybe_unused,
-                struct auxtrace_info_event *auxtrace_info __maybe_unused,
+                struct perf_record_auxtrace_info *auxtrace_info __maybe_unused,
                 size_t priv_size __maybe_unused)
 {
        auxtrace_info->type = PERF_AUXTRACE_S390_CPUMSF;
index e4bb5df9b731aeaa0b6278dff215cb2caa0f3221..d263430c045f4761b382f1f5631ba94de3369d46 100644 (file)
@@ -60,7 +60,7 @@ intel_bts_info_priv_size(struct auxtrace_record *itr __maybe_unused,
 
 static int intel_bts_info_fill(struct auxtrace_record *itr,
                               struct perf_session *session,
-                              struct auxtrace_info_event *auxtrace_info,
+                              struct perf_record_auxtrace_info *auxtrace_info,
                               size_t priv_size)
 {
        struct intel_bts_recording *btsr =
index 89fe30d3310fd8bc659968471861ccb2c33d0892..cb7cf16af79cf0a12bd9409dd5dc4246ee303817 100644 (file)
@@ -314,7 +314,7 @@ static void intel_pt_tsc_ctc_ratio(u32 *n, u32 *d)
 
 static int intel_pt_info_fill(struct auxtrace_record *itr,
                              struct perf_session *session,
-                             struct auxtrace_info_event *auxtrace_info,
+                             struct perf_record_auxtrace_info *auxtrace_info,
                              size_t priv_size)
 {
        struct intel_pt_recording *ptr =
index b1eb963b4a6e117146ef8668fb5b49512ecff093..81720e27f8a3464543ac31f3ccab614cb16efcab 100644 (file)
@@ -57,7 +57,7 @@ int perf_event__synth_time_conv(const struct perf_event_mmap_page *pc,
                .time_conv = {
                        .header = {
                                .type = PERF_RECORD_TIME_CONV,
-                               .size = sizeof(struct time_conv_event),
+                               .size = sizeof(struct perf_record_time_conv),
                        },
                },
        };
index afe55844967763b7f1ededefdcd1258a073a138c..bd2a0cc6eb527561642f010db82bea101a008f84 100644 (file)
@@ -898,7 +898,7 @@ static void record__adjust_affinity(struct record *rec, struct perf_mmap *map)
 
 static size_t process_comp_header(void *record, size_t increment)
 {
-       struct compressed_event *event = record;
+       struct perf_record_compressed *event = record;
        size_t size = sizeof(*event);
 
        if (increment) {
@@ -916,7 +916,7 @@ static size_t zstd_compress(struct perf_session *session, void *dst, size_t dst_
                            void *src, size_t src_size)
 {
        size_t compressed;
-       size_t max_record_size = PERF_SAMPLE_MAX_SIZE - sizeof(struct compressed_event) - 1;
+       size_t max_record_size = PERF_SAMPLE_MAX_SIZE - sizeof(struct perf_record_compressed) - 1;
 
        compressed = zstd_compress_stream_to_records(&session->zstd_data, dst, dst_size, src, src_size,
                                                     max_record_size, process_comp_header);
index e005be0d359f427f65035e3a7f6887a510993e3c..37297b67905d6f8a995e12a28c33ea306f0d0812 100644 (file)
@@ -3244,7 +3244,7 @@ static void script__setup_sample_type(struct perf_script *script)
 static int process_stat_round_event(struct perf_session *session,
                                    union perf_event *event)
 {
-       struct stat_round_event *round = &event->stat_round;
+       struct perf_record_stat_round *round = &event->stat_round;
        struct evsel *counter;
 
        evlist__for_each_entry(session->evlist, counter) {
index 6ab13f466827ac909d3d8a5c722fcdc086759624..a7e8c26635db85084a24ac8cf3bdb9bd93e31129 100644 (file)
@@ -1462,7 +1462,7 @@ static int __cmd_record(int argc, const char **argv)
 static int process_stat_round_event(struct perf_session *session,
                                    union perf_event *event)
 {
-       struct stat_round_event *stat_round = &event->stat_round;
+       struct perf_record_stat_round *stat_round = &event->stat_round;
        struct evsel *counter;
        struct timespec tsh, *ts = NULL;
        const char **argv = session->header.env.cmdline_argv;
index a5b08ef118a7790be7fcf564ec394108fb3d7a77..1655c744ec2b15aee07bd1d04664f1084c6fec76 100644 (file)
@@ -110,13 +110,13 @@ struct perf_record_sample {
        __u64                    array[];
 };
 
-struct context_switch_event {
+struct perf_record_switch {
        struct perf_event_header header;
        __u32                    next_prev_pid;
        __u32                    next_prev_tid;
 };
 
-struct attr_event {
+struct perf_record_header_attr {
        struct perf_event_header header;
        struct perf_event_attr   attr;
        __u64                    id[];
@@ -132,20 +132,20 @@ struct cpu_map_entries {
        __u16                    cpu[];
 };
 
-struct cpu_map_mask {
+struct perf_record_record_cpu_map {
        __u16                    nr;
        __u16                    long_size;
        unsigned long            mask[];
 };
 
-struct cpu_map_data {
+struct perf_record_cpu_map_data {
        __u16                    type;
        char                     data[];
 };
 
-struct cpu_map_event {
-       struct perf_event_header header;
-       struct cpu_map_data      data;
+struct perf_record_cpu_map {
+       struct perf_event_header         header;
+       struct perf_record_cpu_map_data  data;
 };
 
 enum {
@@ -155,15 +155,15 @@ enum {
        PERF_EVENT_UPDATE__CPUS  = 3,
 };
 
-struct event_update_event_cpus {
-       struct cpu_map_data      cpus;
+struct perf_record_event_update_cpus {
+       struct perf_record_cpu_map_data  cpus;
 };
 
-struct event_update_event_scale {
+struct perf_record_event_update_scale {
        double                   scale;
 };
 
-struct event_update_event {
+struct perf_record_event_update {
        struct perf_event_header header;
        __u64                    type;
        __u64                    id;
@@ -177,17 +177,17 @@ struct perf_trace_event_type {
        char                     name[MAX_EVENT_NAME];
 };
 
-struct event_type_event {
+struct perf_record_header_event_type {
        struct perf_event_header         header;
        struct perf_trace_event_type     event_type;
 };
 
-struct tracing_data_event {
+struct perf_record_header_tracing_data {
        struct perf_event_header header;
        __u32                    size;
 };
 
-struct build_id_event {
+struct perf_record_header_build_id {
        struct perf_event_header header;
        pid_t                    pid;
        __u8                     build_id[24];
@@ -201,20 +201,20 @@ struct id_index_entry {
        __u64                    tid;
 };
 
-struct id_index_event {
+struct perf_record_id_index {
        struct perf_event_header header;
        __u64                    nr;
        struct id_index_entry    entries[0];
 };
 
-struct auxtrace_info_event {
+struct perf_record_auxtrace_info {
        struct perf_event_header header;
        __u32                    type;
        __u32                    reserved__; /* For alignment */
        __u64                    priv[];
 };
 
-struct auxtrace_event {
+struct perf_record_auxtrace {
        struct perf_event_header header;
        __u64                    size;
        __u64                    offset;
@@ -227,7 +227,7 @@ struct auxtrace_event {
 
 #define MAX_AUXTRACE_ERROR_MSG 64
 
-struct auxtrace_error_event {
+struct perf_record_auxtrace_error {
        struct perf_event_header header;
        __u32                    type;
        __u32                    code;
@@ -240,28 +240,28 @@ struct auxtrace_error_event {
        char                     msg[MAX_AUXTRACE_ERROR_MSG];
 };
 
-struct aux_event {
+struct perf_record_aux {
        struct perf_event_header header;
        __u64                    aux_offset;
        __u64                    aux_size;
        __u64                    flags;
 };
 
-struct itrace_start_event {
+struct perf_record_itrace_start {
        struct perf_event_header header;
        __u32                    pid;
        __u32                    tid;
 };
 
-struct thread_map_event_entry {
+struct perf_record_thread_map_entry {
        __u64                    pid;
        char                     comm[16];
 };
 
-struct thread_map_event {
-       struct perf_event_header         header;
-       __u64                            nr;
-       struct thread_map_event_entry    entries[];
+struct perf_record_thread_map {
+       struct perf_event_header                 header;
+       __u64                                    nr;
+       struct perf_record_thread_map_entry      entries[];
 };
 
 enum {
@@ -271,18 +271,18 @@ enum {
        PERF_STAT_CONFIG_TERM__MAX              = 3,
 };
 
-struct stat_config_event_entry {
+struct perf_record_stat_config_entry {
        __u64                    tag;
        __u64                    val;
 };
 
-struct stat_config_event {
-       struct perf_event_header         header;
-       __u64                            nr;
-       struct stat_config_event_entry   data[];
+struct perf_record_stat_config {
+       struct perf_event_header                 header;
+       __u64                                    nr;
+       struct perf_record_stat_config_entry     data[];
 };
 
-struct stat_event {
+struct perf_record_stat {
        struct perf_event_header header;
 
        __u64                    id;
@@ -299,64 +299,64 @@ struct stat_event {
        };
 };
 
-struct stat_round_event {
+struct perf_record_stat_round {
        struct perf_event_header header;
        __u64                    type;
        __u64                    time;
 };
 
-struct time_conv_event {
+struct perf_record_time_conv {
        struct perf_event_header header;
        __u64                    time_shift;
        __u64                    time_mult;
        __u64                    time_zero;
 };
 
-struct feature_event {
+struct perf_record_header_feature {
        struct perf_event_header header;
        __u64                    feat_id;
        char                     data[];
 };
 
-struct compressed_event {
+struct perf_record_compressed {
        struct perf_event_header header;
        char                     data[];
 };
 
 union perf_event {
-       struct perf_event_header        header;
-       struct perf_record_mmap         mmap;
-       struct perf_record_mmap2        mmap2;
-       struct perf_record_comm         comm;
-       struct perf_record_namespaces   namespaces;
-       struct perf_record_fork         fork;
-       struct perf_record_lost         lost;
-       struct perf_record_lost_samples lost_samples;
-       struct perf_record_read         read;
-       struct perf_record_throttle     throttle;
-       struct perf_record_sample       sample;
-       struct perf_record_bpf_event    bpf;
-       struct perf_record_ksymbol      ksymbol;
-       struct attr_event               attr;
-       struct event_update_event       event_update;
-       struct event_type_event         event_type;
-       struct tracing_data_event       tracing_data;
-       struct build_id_event           build_id;
-       struct id_index_event           id_index;
-       struct auxtrace_info_event      auxtrace_info;
-       struct auxtrace_event           auxtrace;
-       struct auxtrace_error_event     auxtrace_error;
-       struct aux_event                aux;
-       struct itrace_start_event       itrace_start;
-       struct context_switch_event     context_switch;
-       struct thread_map_event         thread_map;
-       struct cpu_map_event            cpu_map;
-       struct stat_config_event        stat_config;
-       struct stat_event               stat;
-       struct stat_round_event         stat_round;
-       struct time_conv_event          time_conv;
-       struct feature_event            feat;
-       struct compressed_event         pack;
+       struct perf_event_header                header;
+       struct perf_record_mmap                 mmap;
+       struct perf_record_mmap2                mmap2;
+       struct perf_record_comm                 comm;
+       struct perf_record_namespaces           namespaces;
+       struct perf_record_fork                 fork;
+       struct perf_record_lost                 lost;
+       struct perf_record_lost_samples         lost_samples;
+       struct perf_record_read                 read;
+       struct perf_record_throttle             throttle;
+       struct perf_record_sample               sample;
+       struct perf_record_bpf_event            bpf;
+       struct perf_record_ksymbol              ksymbol;
+       struct perf_record_header_attr          attr;
+       struct perf_record_event_update         event_update;
+       struct perf_record_header_event_type    event_type;
+       struct perf_record_header_tracing_data  tracing_data;
+       struct perf_record_header_build_id      build_id;
+       struct perf_record_id_index             id_index;
+       struct perf_record_auxtrace_info        auxtrace_info;
+       struct perf_record_auxtrace             auxtrace;
+       struct perf_record_auxtrace_error       auxtrace_error;
+       struct perf_record_aux                  aux;
+       struct perf_record_itrace_start         itrace_start;
+       struct perf_record_switch               context_switch;
+       struct perf_record_thread_map           thread_map;
+       struct perf_record_cpu_map              cpu_map;
+       struct perf_record_stat_config          stat_config;
+       struct perf_record_stat                 stat;
+       struct perf_record_stat_round           stat_round;
+       struct perf_record_time_conv            time_conv;
+       struct perf_record_header_feature       feat;
+       struct perf_record_compressed           pack;
 };
 
 #endif /* __LIBPERF_EVENT_H */
index b71fe09a8087f26f8823867583d5fda936f1d52b..39493de50117be335c315f0b518a07e5db2b25b4 100644 (file)
@@ -15,9 +15,9 @@ static int process_event_mask(struct perf_tool *tool __maybe_unused,
                         struct perf_sample *sample __maybe_unused,
                         struct machine *machine __maybe_unused)
 {
-       struct cpu_map_event *map_event = &event->cpu_map;
-       struct cpu_map_mask *mask;
-       struct cpu_map_data *data;
+       struct perf_record_cpu_map *map_event = &event->cpu_map;
+       struct perf_record_record_cpu_map *mask;
+       struct perf_record_cpu_map_data *data;
        struct perf_cpu_map *map;
        int i;
 
@@ -25,7 +25,7 @@ static int process_event_mask(struct perf_tool *tool __maybe_unused,
 
        TEST_ASSERT_VAL("wrong type", data->type == PERF_CPU_MAP__MASK);
 
-       mask = (struct cpu_map_mask *)data->data;
+       mask = (struct perf_record_record_cpu_map *)data->data;
 
        TEST_ASSERT_VAL("wrong nr",   mask->nr == 1);
 
@@ -49,9 +49,9 @@ static int process_event_cpus(struct perf_tool *tool __maybe_unused,
                         struct perf_sample *sample __maybe_unused,
                         struct machine *machine __maybe_unused)
 {
-       struct cpu_map_event *map_event = &event->cpu_map;
+       struct perf_record_cpu_map *map_event = &event->cpu_map;
        struct cpu_map_entries *cpus;
-       struct cpu_map_data *data;
+       struct perf_record_cpu_map_data *data;
        struct perf_cpu_map *map;
 
        data = &map_event->data;
index c37ff49c07c70e3a0f2042ccd61b1ee5749ac159..1411155597b84376db8ace7b6a652985afd670df 100644 (file)
@@ -12,7 +12,7 @@ static int process_event_unit(struct perf_tool *tool __maybe_unused,
                              struct perf_sample *sample __maybe_unused,
                              struct machine *machine __maybe_unused)
 {
-       struct event_update_event *ev = (struct event_update_event *) event;
+       struct perf_record_event_update *ev = (struct perf_record_event_update *)event;
 
        TEST_ASSERT_VAL("wrong id", ev->id == 123);
        TEST_ASSERT_VAL("wrong id", ev->type == PERF_EVENT_UPDATE__UNIT);
@@ -25,10 +25,10 @@ static int process_event_scale(struct perf_tool *tool __maybe_unused,
                               struct perf_sample *sample __maybe_unused,
                               struct machine *machine __maybe_unused)
 {
-       struct event_update_event *ev = (struct event_update_event *) event;
-       struct event_update_event_scale *ev_data;
+       struct perf_record_event_update *ev = (struct perf_record_event_update *)event;
+       struct perf_record_event_update_scale *ev_data;
 
-       ev_data = (struct event_update_event_scale *) ev->data;
+       ev_data = (struct perf_record_event_update_scale *)ev->data;
 
        TEST_ASSERT_VAL("wrong id", ev->id == 123);
        TEST_ASSERT_VAL("wrong id", ev->type == PERF_EVENT_UPDATE__SCALE);
@@ -47,7 +47,7 @@ static int process_event_name(struct perf_tool *tool,
                              struct machine *machine __maybe_unused)
 {
        struct event_name *tmp = container_of(tool, struct event_name, tool);
-       struct event_update_event *ev = (struct event_update_event*) event;
+       struct perf_record_event_update *ev = (struct perf_record_event_update *)event;
 
        TEST_ASSERT_VAL("wrong id", ev->id == 123);
        TEST_ASSERT_VAL("wrong id", ev->type == PERF_EVENT_UPDATE__NAME);
@@ -60,11 +60,11 @@ static int process_event_cpus(struct perf_tool *tool __maybe_unused,
                              struct perf_sample *sample __maybe_unused,
                              struct machine *machine __maybe_unused)
 {
-       struct event_update_event *ev = (struct event_update_event*) event;
-       struct event_update_event_cpus *ev_data;
+       struct perf_record_event_update *ev = (struct perf_record_event_update *)event;
+       struct perf_record_event_update_cpus *ev_data;
        struct perf_cpu_map *map;
 
-       ev_data = (struct event_update_event_cpus*) ev->data;
+       ev_data = (struct perf_record_event_update_cpus *) ev->data;
 
        map = cpu_map__new_data(&ev_data->cpus);
 
index 94250024684a7b890f0308fd4ee0318ef653bc69..cc10b4116c9f960153d3427491b9290442b14a1e 100644 (file)
@@ -6,7 +6,7 @@
 #include "counts.h"
 #include "debug.h"
 
-static bool has_term(struct stat_config_event *config,
+static bool has_term(struct perf_record_stat_config *config,
                     u64 tag, u64 val)
 {
        unsigned i;
@@ -25,7 +25,7 @@ static int process_stat_config_event(struct perf_tool *tool __maybe_unused,
                                     struct perf_sample *sample __maybe_unused,
                                     struct machine *machine __maybe_unused)
 {
-       struct stat_config_event *config = &event->stat_config;
+       struct perf_record_stat_config *config = &event->stat_config;
        struct perf_stat_config stat_config;
 
 #define HAS(term, val) \
@@ -65,7 +65,7 @@ static int process_stat_event(struct perf_tool *tool __maybe_unused,
                              struct perf_sample *sample __maybe_unused,
                              struct machine *machine __maybe_unused)
 {
-       struct stat_event *st = &event->stat;
+       struct perf_record_stat *st = &event->stat;
 
        TEST_ASSERT_VAL("wrong cpu",    st->cpu    == 1);
        TEST_ASSERT_VAL("wrong thread", st->thread == 2);
@@ -95,7 +95,7 @@ static int process_stat_round_event(struct perf_tool *tool __maybe_unused,
                                    struct perf_sample *sample __maybe_unused,
                                    struct machine *machine __maybe_unused)
 {
-       struct stat_round_event *stat_round = &event->stat_round;
+       struct perf_record_stat_round *stat_round = &event->stat_round;
 
        TEST_ASSERT_VAL("wrong time", stat_round->time == 0xdeadbeef);
        TEST_ASSERT_VAL("wrong type", stat_round->type == PERF_STAT_ROUND_TYPE__INTERVAL);
index d803eafedc60a21129b0143bb14c6e839d10a061..c19ec8849e772fee163d86a03747058c6962e716 100644 (file)
@@ -56,7 +56,7 @@ static int process_event(struct perf_tool *tool __maybe_unused,
                         struct perf_sample *sample __maybe_unused,
                         struct machine *machine __maybe_unused)
 {
-       struct thread_map_event *map = &event->thread_map;
+       struct perf_record_thread_map *map = &event->thread_map;
        struct perf_thread_map *threads;
 
        TEST_ASSERT_VAL("wrong nr",   map->nr == 1);
index cd26315bc9aae0575f60b654e7817138e1601ad3..d7c3fbb3694f08cf70c196bfd374744051595f9c 100644 (file)
@@ -192,12 +192,12 @@ static void arm_spe_print_info(__u64 *arr)
 int arm_spe_process_auxtrace_info(union perf_event *event,
                                  struct perf_session *session)
 {
-       struct auxtrace_info_event *auxtrace_info = &event->auxtrace_info;
+       struct perf_record_auxtrace_info *auxtrace_info = &event->auxtrace_info;
        size_t min_sz = sizeof(u64) * ARM_SPE_PMU_TYPE;
        struct arm_spe *spe;
        int err;
 
-       if (auxtrace_info->header.size < sizeof(struct auxtrace_info_event) +
+       if (auxtrace_info->header.size < sizeof(struct perf_record_auxtrace_info) +
                                        min_sz)
                return -EINVAL;
 
index c3da8a0e66b2544c672cff0ca53d1f8ffb4564d0..10c707724035c1a69d2df936d027d58ce040c0e7 100644 (file)
@@ -386,7 +386,7 @@ static int auxtrace_queues__add_indexed_event(struct auxtrace_queues *queues,
                return err;
 
        if (event->header.type == PERF_RECORD_AUXTRACE) {
-               if (event->header.size < sizeof(struct auxtrace_event) ||
+               if (event->header.size < sizeof(struct perf_record_auxtrace) ||
                    event->header.size != sz) {
                        err = -EINVAL;
                        goto out;
@@ -519,7 +519,7 @@ static int auxtrace_not_supported(void)
 
 int auxtrace_record__info_fill(struct auxtrace_record *itr,
                               struct perf_session *session,
-                              struct auxtrace_info_event *auxtrace_info,
+                              struct perf_record_auxtrace_info *auxtrace_info,
                               size_t priv_size)
 {
        if (itr)
@@ -859,13 +859,13 @@ void auxtrace_buffer__free(struct auxtrace_buffer *buffer)
        free(buffer);
 }
 
-void auxtrace_synth_error(struct auxtrace_error_event *auxtrace_error, int type,
+void auxtrace_synth_error(struct perf_record_auxtrace_error *auxtrace_error, int type,
                          int code, int cpu, pid_t pid, pid_t tid, u64 ip,
                          const char *msg, u64 timestamp)
 {
        size_t size;
 
-       memset(auxtrace_error, 0, sizeof(struct auxtrace_error_event));
+       memset(auxtrace_error, 0, sizeof(struct perf_record_auxtrace_error));
 
        auxtrace_error->header.type = PERF_RECORD_AUXTRACE_ERROR;
        auxtrace_error->type = type;
@@ -894,12 +894,12 @@ int perf_event__synthesize_auxtrace_info(struct auxtrace_record *itr,
 
        pr_debug2("Synthesizing auxtrace information\n");
        priv_size = auxtrace_record__info_priv_size(itr, session->evlist);
-       ev = zalloc(sizeof(struct auxtrace_info_event) + priv_size);
+       ev = zalloc(sizeof(struct perf_record_auxtrace_info) + priv_size);
        if (!ev)
                return -ENOMEM;
 
        ev->auxtrace_info.header.type = PERF_RECORD_AUXTRACE_INFO;
-       ev->auxtrace_info.header.size = sizeof(struct auxtrace_info_event) +
+       ev->auxtrace_info.header.size = sizeof(struct perf_record_auxtrace_info) +
                                        priv_size;
        err = auxtrace_record__info_fill(itr, session, &ev->auxtrace_info,
                                         priv_size);
@@ -1169,7 +1169,7 @@ static const char *auxtrace_error_name(int type)
 
 size_t perf_event__fprintf_auxtrace_error(union perf_event *event, FILE *fp)
 {
-       struct auxtrace_error_event *e = &event->auxtrace_error;
+       struct perf_record_auxtrace_error *e = &event->auxtrace_error;
        unsigned long long nsecs = e->time;
        const char *msg = e->msg;
        int ret;
@@ -1197,7 +1197,7 @@ size_t perf_event__fprintf_auxtrace_error(union perf_event *event, FILE *fp)
 void perf_session__auxtrace_error_inc(struct perf_session *session,
                                      union perf_event *event)
 {
-       struct auxtrace_error_event *e = &event->auxtrace_error;
+       struct perf_record_auxtrace_error *e = &event->auxtrace_error;
 
        if (e->type < PERF_AUXTRACE_ERROR_MAX)
                session->evlist->stats.nr_auxtrace_errors[e->type] += 1;
index 8e637ac3918e5be719b555a2a096f7ffc5852ef8..b213e6431d886acdc44124610dfa77703c47383b 100644 (file)
@@ -28,7 +28,7 @@ struct perf_tool;
 struct perf_mmap;
 struct option;
 struct record_opts;
-struct auxtrace_info_event;
+struct perf_record_auxtrace_info;
 struct events_stats;
 
 /* Auxtrace records must have the same alignment as perf event records */
@@ -318,7 +318,7 @@ struct auxtrace_record {
                                 struct evlist *evlist);
        int (*info_fill)(struct auxtrace_record *itr,
                         struct perf_session *session,
-                        struct auxtrace_info_event *auxtrace_info,
+                        struct perf_record_auxtrace_info *auxtrace_info,
                         size_t priv_size);
        void (*free)(struct auxtrace_record *itr);
        int (*snapshot_start)(struct auxtrace_record *itr);
@@ -498,7 +498,7 @@ size_t auxtrace_record__info_priv_size(struct auxtrace_record *itr,
                                       struct evlist *evlist);
 int auxtrace_record__info_fill(struct auxtrace_record *itr,
                               struct perf_session *session,
-                              struct auxtrace_info_event *auxtrace_info,
+                              struct perf_record_auxtrace_info *auxtrace_info,
                               size_t priv_size);
 void auxtrace_record__free(struct auxtrace_record *itr);
 int auxtrace_record__snapshot_start(struct auxtrace_record *itr);
@@ -515,7 +515,7 @@ int auxtrace_index__process(int fd, u64 size, struct perf_session *session,
                            bool needs_swap);
 void auxtrace_index__free(struct list_head *head);
 
-void auxtrace_synth_error(struct auxtrace_error_event *auxtrace_error, int type,
+void auxtrace_synth_error(struct perf_record_auxtrace_error *auxtrace_error, int type,
                          int code, int cpu, pid_t pid, pid_t tid, u64 ip,
                          const char *msg, u64 timestamp);
 
index b98754863de9a44bc49bc2e18cffe8a7fcf533bb..4c96a33b09ffe3cb49369d3c2f938dd4c9dbd4e4 100644 (file)
@@ -295,7 +295,7 @@ static int write_buildid(const char *name, size_t name_len, u8 *build_id,
                         pid_t pid, u16 misc, struct feat_fd *fd)
 {
        int err;
-       struct build_id_event b;
+       struct perf_record_header_build_id b;
        size_t len;
 
        len = name_len + 1;
index f5c21184e1fc9a39318aa3edc8ccc308e8d8057d..b9301e7e9c76bd1ca712a27f7eea6581043ae826 100644 (file)
@@ -43,7 +43,7 @@ static struct perf_cpu_map *cpu_map__from_entries(struct cpu_map_entries *cpus)
        return map;
 }
 
-static struct perf_cpu_map *cpu_map__from_mask(struct cpu_map_mask *mask)
+static struct perf_cpu_map *cpu_map__from_mask(struct perf_record_record_cpu_map *mask)
 {
        struct perf_cpu_map *map;
        int nr, nbits = mask->nr * mask->long_size * BITS_PER_BYTE;
@@ -61,12 +61,12 @@ static struct perf_cpu_map *cpu_map__from_mask(struct cpu_map_mask *mask)
 
 }
 
-struct perf_cpu_map *cpu_map__new_data(struct cpu_map_data *data)
+struct perf_cpu_map *cpu_map__new_data(struct perf_record_cpu_map_data *data)
 {
        if (data->type == PERF_CPU_MAP__CPUS)
                return cpu_map__from_entries((struct cpu_map_entries *)data->data);
        else
-               return cpu_map__from_mask((struct cpu_map_mask *)data->data);
+               return cpu_map__from_mask((struct perf_record_record_cpu_map *)data->data);
 }
 
 size_t cpu_map__fprintf(struct perf_cpu_map *map, FILE *fp)
index c2519e7ea958e92ed5dbee46a1d03620d729d7a0..2553bef1279dcba598e202aad852f151ac885774 100644 (file)
@@ -7,10 +7,10 @@
 #include <internal/cpumap.h>
 #include <perf/cpumap.h>
 
-struct cpu_map_data;
+struct perf_record_cpu_map_data;
 
 struct perf_cpu_map *perf_cpu_map__empty_new(int nr);
-struct perf_cpu_map *cpu_map__new_data(struct cpu_map_data *data);
+struct perf_cpu_map *cpu_map__new_data(struct perf_record_cpu_map_data *data);
 size_t cpu_map__snprint(struct perf_cpu_map *map, char *buf, size_t size);
 size_t cpu_map__snprint_mask(struct perf_cpu_map *map, char *buf, size_t size);
 size_t cpu_map__fprintf(struct perf_cpu_map *map, FILE *fp);
index e210c1dde964ddd66f7850199d26ae63ab3782b2..d6de3834865e7e45b5c08d1743b7cace38f0e512 100644 (file)
@@ -2393,7 +2393,7 @@ static void cs_etm__print_auxtrace_info(__u64 *val, int num)
 int cs_etm__process_auxtrace_info(union perf_event *event,
                                  struct perf_session *session)
 {
-       struct auxtrace_info_event *auxtrace_info = &event->auxtrace_info;
+       struct perf_record_auxtrace_info *auxtrace_info = &event->auxtrace_info;
        struct cs_etm_auxtrace *etm = NULL;
        struct int_node *inode;
        unsigned int pmu_type;
index b711019a9ed215e33bbd75645c6fe241b98d39ee..c9d1f83c747ab6442d10c248a8949670e018dc88 100644 (file)
@@ -992,7 +992,7 @@ int perf_event__synthesize_thread_map2(struct perf_tool *tool,
        event->thread_map.nr = threads->nr;
 
        for (i = 0; i < threads->nr; i++) {
-               struct thread_map_event_entry *entry = &event->thread_map.entries[i];
+               struct perf_record_thread_map_entry *entry = &event->thread_map.entries[i];
                char *comm = perf_thread_map__comm(threads, i);
 
                if (!comm)
@@ -1019,7 +1019,7 @@ static void synthesize_cpus(struct cpu_map_entries *cpus,
                cpus->cpu[i] = map->map[i];
 }
 
-static void synthesize_mask(struct cpu_map_mask *mask,
+static void synthesize_mask(struct perf_record_record_cpu_map *mask,
                            struct perf_cpu_map *map, int max)
 {
        int i;
@@ -1050,7 +1050,7 @@ static size_t mask_size(struct perf_cpu_map *map, int *max)
                        *max = bit;
        }
 
-       return sizeof(struct cpu_map_mask) + BITS_TO_LONGS(*max) * sizeof(long);
+       return sizeof(struct perf_record_record_cpu_map) + BITS_TO_LONGS(*max) * sizeof(long);
 }
 
 void *cpu_map_data__alloc(struct perf_cpu_map *map, size_t *size, u16 *type, int *max)
@@ -1061,15 +1061,15 @@ void *cpu_map_data__alloc(struct perf_cpu_map *map, size_t *size, u16 *type, int
        /*
         * Both array and mask data have variable size based
         * on the number of cpus and their actual values.
-        * The size of the 'struct cpu_map_data' is:
+        * The size of the 'struct perf_record_cpu_map_data' is:
         *
         *   array = size of 'struct cpu_map_entries' +
         *           number of cpus * sizeof(u64)
         *
-        *   mask  = size of 'struct cpu_map_mask' +
+        *   mask  = size of 'struct perf_record_record_cpu_map' +
         *           maximum cpu bit converted to size of longs
         *
-        * and finaly + the size of 'struct cpu_map_data'.
+        * and finaly + the size of 'struct perf_record_cpu_map_data'.
         */
        size_cpus = cpus_size(map);
        size_mask = mask_size(map, max);
@@ -1082,12 +1082,12 @@ void *cpu_map_data__alloc(struct perf_cpu_map *map, size_t *size, u16 *type, int
                *type  = PERF_CPU_MAP__MASK;
        }
 
-       *size += sizeof(struct cpu_map_data);
+       *size += sizeof(struct perf_record_cpu_map_data);
        *size = PERF_ALIGN(*size, sizeof(u64));
        return zalloc(*size);
 }
 
-void cpu_map_data__synthesize(struct cpu_map_data *data, struct perf_cpu_map *map,
+void cpu_map_data__synthesize(struct perf_record_cpu_map_data *data, struct perf_cpu_map *map,
                              u16 type, int max)
 {
        data->type = type;
@@ -1097,16 +1097,16 @@ void cpu_map_data__synthesize(struct cpu_map_data *data, struct perf_cpu_map *ma
                synthesize_cpus((struct cpu_map_entries *) data->data, map);
                break;
        case PERF_CPU_MAP__MASK:
-               synthesize_mask((struct cpu_map_mask *) data->data, map, max);
+               synthesize_mask((struct perf_record_record_cpu_map *)data->data, map, max);
        default:
                break;
        };
 }
 
-static struct cpu_map_event* cpu_map_event__new(struct perf_cpu_map *map)
+static struct perf_record_cpu_map *cpu_map_event__new(struct perf_cpu_map *map)
 {
-       size_t size = sizeof(struct cpu_map_event);
-       struct cpu_map_event *event;
+       size_t size = sizeof(struct perf_record_cpu_map);
+       struct perf_record_cpu_map *event;
        int max;
        u16 type;
 
@@ -1127,7 +1127,7 @@ int perf_event__synthesize_cpu_map(struct perf_tool *tool,
                                   perf_event__handler_t process,
                                   struct machine *machine)
 {
-       struct cpu_map_event *event;
+       struct perf_record_cpu_map *event;
        int err;
 
        event = cpu_map_event__new(map);
@@ -1145,7 +1145,7 @@ int perf_event__synthesize_stat_config(struct perf_tool *tool,
                                       perf_event__handler_t process,
                                       struct machine *machine)
 {
-       struct stat_config_event *event;
+       struct perf_record_stat_config *event;
        int size, i = 0, err;
 
        size  = sizeof(*event);
@@ -1184,7 +1184,7 @@ int perf_event__synthesize_stat(struct perf_tool *tool,
                                perf_event__handler_t process,
                                struct machine *machine)
 {
-       struct stat_event event;
+       struct perf_record_stat event;
 
        event.header.type = PERF_RECORD_STAT;
        event.header.size = sizeof(event);
@@ -1205,7 +1205,7 @@ int perf_event__synthesize_stat_round(struct perf_tool *tool,
                                      perf_event__handler_t process,
                                      struct machine *machine)
 {
-       struct stat_round_event event;
+       struct perf_record_stat_round event;
 
        event.header.type = PERF_RECORD_STAT_ROUND;
        event.header.size = sizeof(event);
@@ -1218,7 +1218,7 @@ int perf_event__synthesize_stat_round(struct perf_tool *tool,
 }
 
 void perf_event__read_stat_config(struct perf_stat_config *config,
-                                 struct stat_config_event *event)
+                                 struct perf_record_stat_config *event)
 {
        unsigned i;
 
index e15eed53ce90f07efc9e1f0665b8d6047c68f829..a7341e14eb4863b32c2e751172cda6af096460ff 100644 (file)
@@ -374,7 +374,7 @@ int perf_event__synthesize_stat_config(struct perf_tool *tool,
                                       perf_event__handler_t process,
                                       struct machine *machine);
 void perf_event__read_stat_config(struct perf_stat_config *config,
-                                 struct stat_config_event *event);
+                                 struct perf_record_stat_config *event);
 int perf_event__synthesize_stat(struct perf_tool *tool,
                                u32 cpu, u32 thread, u64 id,
                                struct perf_counts_values *count,
@@ -511,7 +511,7 @@ int kallsyms__get_function_start(const char *kallsyms_filename,
                                 const char *symbol_name, u64 *addr);
 
 void *cpu_map_data__alloc(struct perf_cpu_map *map, size_t *size, u16 *type, int *max);
-void  cpu_map_data__synthesize(struct cpu_map_data *data, struct perf_cpu_map *map,
+void  cpu_map_data__synthesize(struct perf_record_cpu_map_data *data, struct perf_cpu_map *map,
                               u16 type, int max);
 
 void event_attr_init(struct perf_event_attr *attr);
index 629bdb150cb99996181b0271727dfae10d2aa79b..0a842d9eff226f89aa2710f7dd712125f0869124 100644 (file)
@@ -1878,7 +1878,7 @@ static void print_mem_topology(struct feat_fd *ff, FILE *fp)
        }
 }
 
-static int __event_process_build_id(struct build_id_event *bev,
+static int __event_process_build_id(struct perf_record_header_build_id *bev,
                                    char *filename,
                                    struct perf_session *session)
 {
@@ -1947,7 +1947,7 @@ static int perf_header__read_build_ids_abi_quirk(struct perf_header *header,
                u8                         build_id[PERF_ALIGN(BUILD_ID_SIZE, sizeof(u64))];
                char                       filename[0];
        } old_bev;
-       struct build_id_event bev;
+       struct perf_record_header_build_id bev;
        char filename[PATH_MAX];
        u64 limit = offset + size;
 
@@ -1988,7 +1988,7 @@ static int perf_header__read_build_ids(struct perf_header *header,
                                       int input, u64 offset, u64 size)
 {
        struct perf_session *session = container_of(header, struct perf_session, header);
-       struct build_id_event bev;
+       struct perf_record_header_build_id bev;
        char filename[PATH_MAX];
        u64 limit = offset + size, orig_offset = offset;
        int err = -1;
@@ -2010,7 +2010,7 @@ static int perf_header__read_build_ids(struct perf_header *header,
                 *
                 * "perf: 'perf kvm' tool for monitoring guest performance from host"
                 *
-                * Added a field to struct build_id_event that broke the file
+                * Added a field to struct perf_record_header_build_id that broke the file
                 * format.
                 *
                 * Since the kernel build-id is the first entry, process the
@@ -3678,7 +3678,7 @@ int perf_event__synthesize_features(struct perf_tool *tool,
 {
        struct perf_header *header = &session->header;
        struct feat_fd ff;
-       struct feature_event *fe;
+       struct perf_record_header_feature *fe;
        size_t sz, sz_hdr;
        int feat, ret;
 
@@ -3741,7 +3741,7 @@ int perf_event__process_feature(struct perf_session *session,
 {
        struct perf_tool *tool = session->tool;
        struct feat_fd ff = { .fd = 0 };
-       struct feature_event *fe = (struct feature_event *)event;
+       struct perf_record_header_feature *fe = (struct perf_record_header_feature *)event;
        int type = fe->header.type;
        u64 feat = fe->feat_id;
 
@@ -3778,10 +3778,10 @@ int perf_event__process_feature(struct perf_session *session,
        return 0;
 }
 
-static struct event_update_event *
+static struct perf_record_event_update *
 event_update_event__new(size_t size, u64 type, u64 id)
 {
-       struct event_update_event *ev;
+       struct perf_record_event_update *ev;
 
        size += sizeof(*ev);
        size  = PERF_ALIGN(size, sizeof(u64));
@@ -3801,7 +3801,7 @@ perf_event__synthesize_event_update_unit(struct perf_tool *tool,
                                         struct evsel *evsel,
                                         perf_event__handler_t process)
 {
-       struct event_update_event *ev;
+       struct perf_record_event_update *ev;
        size_t size = strlen(evsel->unit);
        int err;
 
@@ -3820,15 +3820,15 @@ perf_event__synthesize_event_update_scale(struct perf_tool *tool,
                                          struct evsel *evsel,
                                          perf_event__handler_t process)
 {
-       struct event_update_event *ev;
-       struct event_update_event_scale *ev_data;
+       struct perf_record_event_update *ev;
+       struct perf_record_event_update_scale *ev_data;
        int err;
 
        ev = event_update_event__new(sizeof(*ev_data), PERF_EVENT_UPDATE__SCALE, evsel->id[0]);
        if (ev == NULL)
                return -ENOMEM;
 
-       ev_data = (struct event_update_event_scale *) ev->data;
+       ev_data = (struct perf_record_event_update_scale *)ev->data;
        ev_data->scale = evsel->scale;
        err = process(tool, (union perf_event*) ev, NULL, NULL);
        free(ev);
@@ -3840,7 +3840,7 @@ perf_event__synthesize_event_update_name(struct perf_tool *tool,
                                         struct evsel *evsel,
                                         perf_event__handler_t process)
 {
-       struct event_update_event *ev;
+       struct perf_record_event_update *ev;
        size_t len = strlen(evsel->name);
        int err;
 
@@ -3859,8 +3859,8 @@ perf_event__synthesize_event_update_cpus(struct perf_tool *tool,
                                        struct evsel *evsel,
                                        perf_event__handler_t process)
 {
-       size_t size = sizeof(struct event_update_event);
-       struct event_update_event *ev;
+       size_t size = sizeof(struct perf_record_event_update);
+       struct perf_record_event_update *ev;
        int max, err;
        u16 type;
 
@@ -3876,7 +3876,7 @@ perf_event__synthesize_event_update_cpus(struct perf_tool *tool,
        ev->type = PERF_EVENT_UPDATE__CPUS;
        ev->id   = evsel->id[0];
 
-       cpu_map_data__synthesize((struct cpu_map_data *) ev->data,
+       cpu_map_data__synthesize((struct perf_record_cpu_map_data *)ev->data,
                                 evsel->core.own_cpus,
                                 type, max);
 
@@ -3887,9 +3887,9 @@ perf_event__synthesize_event_update_cpus(struct perf_tool *tool,
 
 size_t perf_event__fprintf_event_update(union perf_event *event, FILE *fp)
 {
-       struct event_update_event *ev = &event->event_update;
-       struct event_update_event_scale *ev_scale;
-       struct event_update_event_cpus *ev_cpus;
+       struct perf_record_event_update *ev = &event->event_update;
+       struct perf_record_event_update_scale *ev_scale;
+       struct perf_record_event_update_cpus *ev_cpus;
        struct perf_cpu_map *map;
        size_t ret;
 
@@ -3897,7 +3897,7 @@ size_t perf_event__fprintf_event_update(union perf_event *event, FILE *fp)
 
        switch (ev->type) {
        case PERF_EVENT_UPDATE__SCALE:
-               ev_scale = (struct event_update_event_scale *) ev->data;
+               ev_scale = (struct perf_record_event_update_scale *)ev->data;
                ret += fprintf(fp, "... scale: %f\n", ev_scale->scale);
                break;
        case PERF_EVENT_UPDATE__UNIT:
@@ -3907,7 +3907,7 @@ size_t perf_event__fprintf_event_update(union perf_event *event, FILE *fp)
                ret += fprintf(fp, "... name:  %s\n", ev->data);
                break;
        case PERF_EVENT_UPDATE__CPUS:
-               ev_cpus = (struct event_update_event_cpus *) ev->data;
+               ev_cpus = (struct perf_record_event_update_cpus *)ev->data;
                ret += fprintf(fp, "... ");
 
                map = cpu_map__new_data(&ev_cpus->cpus);
@@ -4053,9 +4053,9 @@ int perf_event__process_event_update(struct perf_tool *tool __maybe_unused,
                                     union perf_event *event,
                                     struct evlist **pevlist)
 {
-       struct event_update_event *ev = &event->event_update;
-       struct event_update_event_scale *ev_scale;
-       struct event_update_event_cpus *ev_cpus;
+       struct perf_record_event_update *ev = &event->event_update;
+       struct perf_record_event_update_scale *ev_scale;
+       struct perf_record_event_update_cpus *ev_cpus;
        struct evlist *evlist;
        struct evsel *evsel;
        struct perf_cpu_map *map;
@@ -4077,11 +4077,11 @@ int perf_event__process_event_update(struct perf_tool *tool __maybe_unused,
                evsel->name = strdup(ev->data);
                break;
        case PERF_EVENT_UPDATE__SCALE:
-               ev_scale = (struct event_update_event_scale *) ev->data;
+               ev_scale = (struct perf_record_event_update_scale *)ev->data;
                evsel->scale = ev_scale->scale;
                break;
        case PERF_EVENT_UPDATE__CPUS:
-               ev_cpus = (struct event_update_event_cpus *) ev->data;
+               ev_cpus = (struct perf_record_event_update_cpus *)ev->data;
 
                map = cpu_map__new_data(&ev_cpus->cpus);
                if (map)
@@ -4153,7 +4153,7 @@ int perf_event__process_tracing_data(struct perf_session *session,
        char buf[BUFSIZ];
 
        /* setup for reading amidst mmap */
-       lseek(fd, offset + sizeof(struct tracing_data_event),
+       lseek(fd, offset + sizeof(struct perf_record_header_tracing_data),
              SEEK_SET);
 
        size_read = trace_report(fd, &session->tevent,
index 03c581a0d5d03fdd40fc388f1b7268d38b01bd8b..99dddb63dac1cc5ab8b39042dff221f5e2205c5b 100644 (file)
@@ -848,12 +848,12 @@ static void intel_bts_print_info(__u64 *arr, int start, int finish)
 int intel_bts_process_auxtrace_info(union perf_event *event,
                                    struct perf_session *session)
 {
-       struct auxtrace_info_event *auxtrace_info = &event->auxtrace_info;
+       struct perf_record_auxtrace_info *auxtrace_info = &event->auxtrace_info;
        size_t min_sz = sizeof(u64) * INTEL_BTS_SNAPSHOT_MODE;
        struct intel_bts *bts;
        int err;
 
-       if (auxtrace_info->header.size < sizeof(struct auxtrace_info_event) +
+       if (auxtrace_info->header.size < sizeof(struct perf_record_auxtrace_info) +
                                        min_sz)
                return -EINVAL;
 
index c83a9a718c03f550f19b65868ac8152cb26a1e67..825a6a3b03a1696b4b63a3593836d2ab912fb64c 100644 (file)
@@ -3063,23 +3063,23 @@ static void intel_pt_print_info_str(const char *name, const char *str)
        fprintf(stdout, "  %-20s%s\n", name, str ? str : "");
 }
 
-static bool intel_pt_has(struct auxtrace_info_event *auxtrace_info, int pos)
+static bool intel_pt_has(struct perf_record_auxtrace_info *auxtrace_info, int pos)
 {
        return auxtrace_info->header.size >=
-               sizeof(struct auxtrace_info_event) + (sizeof(u64) * (pos + 1));
+               sizeof(struct perf_record_auxtrace_info) + (sizeof(u64) * (pos + 1));
 }
 
 int intel_pt_process_auxtrace_info(union perf_event *event,
                                   struct perf_session *session)
 {
-       struct auxtrace_info_event *auxtrace_info = &event->auxtrace_info;
+       struct perf_record_auxtrace_info *auxtrace_info = &event->auxtrace_info;
        size_t min_sz = sizeof(u64) * INTEL_PT_PER_CPU_MMAPS;
        struct intel_pt *pt;
        void *info_end;
        __u64 *info;
        int err;
 
-       if (auxtrace_info->header.size < sizeof(struct auxtrace_info_event) +
+       if (auxtrace_info->header.size < sizeof(struct perf_record_auxtrace_info) +
                                        min_sz)
                return -EINVAL;
 
index 59974e901232fc18e5cf797f94e122dafc086d65..11479a7ad1c7e6c24ccd4378bfe5a66036f44ff0 100644 (file)
@@ -431,8 +431,8 @@ static char pyrf_context_switch_event__doc[] = PyDoc_STR("perf context_switch ev
 static PyMemberDef pyrf_context_switch_event__members[] = {
        sample_members
        member_def(perf_event_header, type, T_UINT, "event type"),
-       member_def(context_switch_event, next_prev_pid, T_UINT, "next/prev pid"),
-       member_def(context_switch_event, next_prev_tid, T_UINT, "next/prev tid"),
+       member_def(perf_record_switch, next_prev_pid, T_UINT, "next/prev pid"),
+       member_def(perf_record_switch, next_prev_tid, T_UINT, "next/prev tid"),
        { .name = NULL, },
 };
 
index d078ae8353c8a577e313d5f0c7e909241570ff00..4f6c1465998f569dec4e4d6bdaf77b5fbbfea948 100644 (file)
@@ -1109,11 +1109,11 @@ static int s390_cpumsf__config(const char *var, const char *value, void *cb)
 int s390_cpumsf_process_auxtrace_info(union perf_event *event,
                                      struct perf_session *session)
 {
-       struct auxtrace_info_event *auxtrace_info = &event->auxtrace_info;
+       struct perf_record_auxtrace_info *auxtrace_info = &event->auxtrace_info;
        struct s390_cpumsf *sf;
        int err;
 
-       if (auxtrace_info->header.size < sizeof(struct auxtrace_info_event))
+       if (auxtrace_info->header.size < sizeof(struct perf_record_auxtrace_info))
                return -EINVAL;
 
        sf = zalloc(sizeof(struct s390_cpumsf));
index aa9667424c1c7e7005ab3091c1495e80b9130aba..7350b0dfbc1e9b22612053d0ff14d99c59ae9103 100644 (file)
@@ -64,8 +64,8 @@ static int perf_session__process_compressed_event(struct perf_session *session,
                decomp->size = decomp_last_rem;
        }
 
-       src = (void *)event + sizeof(struct compressed_event);
-       src_size = event->pack.header.size - sizeof(struct compressed_event);
+       src = (void *)event + sizeof(struct perf_record_compressed);
+       src_size = event->pack.header.size - sizeof(struct perf_record_compressed);
 
        decomp_size = zstd_decompress_stream(&(session->zstd_data), src, src_size,
                                &(decomp->data[decomp_last_rem]), decomp_len - decomp_last_rem);
@@ -836,9 +836,9 @@ static void perf_event__thread_map_swap(union perf_event *event,
 static void perf_event__cpu_map_swap(union perf_event *event,
                                     bool sample_id_all __maybe_unused)
 {
-       struct cpu_map_data *data = &event->cpu_map.data;
+       struct perf_record_cpu_map_data *data = &event->cpu_map.data;
        struct cpu_map_entries *cpus;
-       struct cpu_map_mask *mask;
+       struct perf_record_record_cpu_map *mask;
        unsigned i;
 
        data->type = bswap_64(data->type);
@@ -853,7 +853,7 @@ static void perf_event__cpu_map_swap(union perf_event *event,
                        cpus->cpu[i] = bswap_16(cpus->cpu[i]);
                break;
        case PERF_CPU_MAP__MASK:
-               mask = (struct cpu_map_mask *) data->data;
+               mask = (struct perf_record_record_cpu_map *)data->data;
 
                mask->nr = bswap_16(mask->nr);
                mask->long_size = bswap_16(mask->long_size);
@@ -2376,10 +2376,10 @@ int perf_event__process_id_index(struct perf_session *session,
                                 union perf_event *event)
 {
        struct evlist *evlist = session->evlist;
-       struct id_index_event *ie = &event->id_index;
+       struct perf_record_id_index *ie = &event->id_index;
        size_t i, nr, max_nr;
 
-       max_nr = (ie->header.size - sizeof(struct id_index_event)) /
+       max_nr = (ie->header.size - sizeof(struct perf_record_id_index)) /
                 sizeof(struct id_index_entry);
        nr = ie->nr;
        if (nr > max_nr)
@@ -2421,14 +2421,14 @@ int perf_event__synthesize_id_index(struct perf_tool *tool,
 
        pr_debug2("Synthesizing id index\n");
 
-       max_nr = (UINT16_MAX - sizeof(struct id_index_event)) /
+       max_nr = (UINT16_MAX - sizeof(struct perf_record_id_index)) /
                 sizeof(struct id_index_entry);
 
        evlist__for_each_entry(evlist, evsel)
                nr += evsel->ids;
 
        n = nr > max_nr ? max_nr : nr;
-       sz = sizeof(struct id_index_event) + n * sizeof(struct id_index_entry);
+       sz = sizeof(struct perf_record_id_index) + n * sizeof(struct id_index_entry);
        ev = zalloc(sz);
        if (!ev)
                return -ENOMEM;
@@ -2468,7 +2468,7 @@ int perf_event__synthesize_id_index(struct perf_tool *tool,
                }
        }
 
-       sz = sizeof(struct id_index_event) + nr * sizeof(struct id_index_entry);
+       sz = sizeof(struct perf_record_id_index) + nr * sizeof(struct id_index_entry);
        ev->id_index.header.size = sz;
        ev->id_index.nr = nr;
 
index 79e97d17ea047e92a07992417cd943f05be1364f..b7aa076ab6fd6388b2f60348e882ca7b6d86eb14 100644 (file)
@@ -28,7 +28,7 @@ struct perf_session {
        struct itrace_synth_opts *itrace_synth_opts;
        struct list_head        auxtrace_index;
        struct trace_event      tevent;
-       struct time_conv_event  time_conv;
+       struct perf_record_time_conv    time_conv;
        bool                    repipe;
        bool                    one_mmap;
        void                    *one_mmap_addr;
index 4c7957496e7c280f398498e0264692b25d19b085..66f8808e57d321e1cac923fa41fb1c84df758f1c 100644 (file)
@@ -382,7 +382,7 @@ int perf_event__process_stat_event(struct perf_session *session,
                                   union perf_event *event)
 {
        struct perf_counts_values count;
-       struct stat_event *st = &event->stat;
+       struct perf_record_stat *st = &event->stat;
        struct evsel *counter;
 
        count.val = st->val;
@@ -402,7 +402,7 @@ int perf_event__process_stat_event(struct perf_session *session,
 
 size_t perf_event__fprintf_stat(union perf_event *event, FILE *fp)
 {
-       struct stat_event *st = (struct stat_event *) event;
+       struct perf_record_stat *st = (struct perf_record_stat *)event;
        size_t ret;
 
        ret  = fprintf(fp, "\n... id %" PRI_lu64 ", cpu %d, thread %d\n",
@@ -415,7 +415,7 @@ size_t perf_event__fprintf_stat(union perf_event *event, FILE *fp)
 
 size_t perf_event__fprintf_stat_round(union perf_event *event, FILE *fp)
 {
-       struct stat_round_event *rd = (struct stat_round_event *)event;
+       struct perf_record_stat_round *rd = (struct perf_record_stat_round *)event;
        size_t ret;
 
        ret = fprintf(fp, "\n... time %" PRI_lu64 ", type %s\n", rd->time,
index 3e64525bf604a7d57455ac57e5469f27009e305c..c9bfe4696943b10e4c8a04abd5ed1a55d6207545 100644 (file)
@@ -369,7 +369,7 @@ void thread_map__read_comms(struct perf_thread_map *threads)
 }
 
 static void thread_map__copy_event(struct perf_thread_map *threads,
-                                  struct thread_map_event *event)
+                                  struct perf_record_thread_map *event)
 {
        unsigned i;
 
@@ -383,7 +383,7 @@ static void thread_map__copy_event(struct perf_thread_map *threads,
        refcount_set(&threads->refcnt, 1);
 }
 
-struct perf_thread_map *thread_map__new_event(struct thread_map_event *event)
+struct perf_thread_map *thread_map__new_event(struct perf_record_thread_map *event)
 {
        struct perf_thread_map *threads;
 
index ca165fdf6cb02c1b91aa8cbb399e0a8904b6d575..3bb860a32b8e9253a7bb29ea9b58fb6eacabefd8 100644 (file)
@@ -8,7 +8,7 @@
 #include <internal/threadmap.h>
 #include <perf/threadmap.h>
 
-struct thread_map_event;
+struct perf_record_thread_map;
 
 struct perf_thread_map *thread_map__new_dummy(void);
 struct perf_thread_map *thread_map__new_by_pid(pid_t pid);
@@ -16,7 +16,7 @@ struct perf_thread_map *thread_map__new_by_tid(pid_t tid);
 struct perf_thread_map *thread_map__new_by_uid(uid_t uid);
 struct perf_thread_map *thread_map__new_all_cpus(void);
 struct perf_thread_map *thread_map__new(pid_t pid, pid_t tid, uid_t uid);
-struct perf_thread_map *thread_map__new_event(struct thread_map_event *event);
+struct perf_thread_map *thread_map__new_event(struct perf_record_thread_map *event);
 
 struct perf_thread_map *thread_map__new_str(const char *pid,
                const char *tid, uid_t uid, bool all_threads);