libperf: Move perf_event_attr field from perf's evsel to libperf's perf_evsel

[mirror_ubuntu-hirsute-kernel.git] / tools / perf / util / header.c

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 141de44251004f5895da7592c587529573227ab6..d81afe56392c98dee7a8e1797f5407cc8f869ad5 100644 (file)
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -488,13 +488,13 @@ static int write_event_desc(struct feat_fd *ff,
        /*
         * size of perf_event_attr struct
         */
-       sz = (u32)sizeof(evsel->attr);
+       sz = (u32)sizeof(evsel->core.attr);
        ret = do_write(ff, &sz, sizeof(sz));
        if (ret < 0)
                return ret;
 
        evlist__for_each_entry(evlist, evsel) {
-               ret = do_write(ff, &evsel->attr, sz);
+               ret = do_write(ff, &evsel->core.attr, sz);
                if (ret < 0)
                        return ret;
                /*
@@ -1575,7 +1575,7 @@ static void free_event_desc(struct evsel *events)
        if (!events)
                return;
 
-       for (evsel = events; evsel->attr.size; evsel++) {
+       for (evsel = events; evsel->core.attr.size; evsel++) {
                zfree(&evsel->name);
                zfree(&evsel->id);
        }
@@ -1603,12 +1603,12 @@ static struct evsel *read_event_desc(struct feat_fd *ff)
        if (!buf)
                goto error;
 
-       /* the last event terminates with evsel->attr.size == 0: */
+       /* the last event terminates with evsel->core.attr.size == 0: */
        events = calloc(nre + 1, sizeof(*events));
        if (!events)
                goto error;
 
-       msz = sizeof(evsel->attr);
+       msz = sizeof(evsel->core.attr);
        if (sz < msz)
                msz = sz;
 
@@ -1625,7 +1625,7 @@ static struct evsel *read_event_desc(struct feat_fd *ff)
                if (ff->ph->needs_swap)
                        perf_event__attr_swap(buf);
 
-               memcpy(&evsel->attr, buf, msz);
+               memcpy(&evsel->core.attr, buf, msz);
 
                if (do_read_u32(ff, &nr))
                        goto error;
@@ -1683,7 +1683,7 @@ static void print_event_desc(struct feat_fd *ff, FILE *fp)
                return;
        }
 
-       for (evsel = events; evsel->attr.size; evsel++) {
+       for (evsel = events; evsel->core.attr.size; evsel++) {
                fprintf(fp, "# event : name = %s, ", evsel->name);
 
                if (evsel->ids) {
@@ -1696,7 +1696,7 @@ static void print_event_desc(struct feat_fd *ff, FILE *fp)
                        fprintf(fp, " }");
                }
 
-               perf_event_attr__fprintf(fp, &evsel->attr, __desc_attr__fprintf, NULL);
+               perf_event_attr__fprintf(fp, &evsel->core.attr, __desc_attr__fprintf, NULL);
 
                fputc('\n', fp);
        }
@@ -2138,7 +2138,7 @@ process_event_desc(struct feat_fd *ff, void *data __maybe_unused)
                ff->events = events;
        }
 
-       for (evsel = events; evsel->attr.size; evsel++)
+       for (evsel = events; evsel->core.attr.size; evsel++)
                perf_evlist__set_event_name(session->evlist, evsel);
 
        if (!session->data->is_pipe)
@@ -3071,7 +3071,7 @@ int perf_session__write_header(struct perf_session *session,
 
        evlist__for_each_entry(evlist, evsel) {
                f_attr = (struct perf_file_attr){
-                       .attr = evsel->attr,
+                       .attr = evsel->core.attr,
                        .ids  = {
                                .offset = evsel->id_offset,
                                .size   = evsel->ids * sizeof(u64),
@@ -3494,9 +3494,9 @@ static int perf_evsel__prepare_tracepoint_event(struct evsel *evsel,
                return -1;
        }
 
-       event = tep_find_event(pevent, evsel->attr.config);
+       event = tep_find_event(pevent, evsel->core.attr.config);
        if (event == NULL) {
-               pr_debug("cannot find event format for %d\n", (int)evsel->attr.config);
+               pr_debug("cannot find event format for %d\n", (int)evsel->core.attr.config);
                return -1;
        }
 
@@ -3517,7 +3517,7 @@ static int perf_evlist__prepare_tracepoint_events(struct evlist *evlist,
        struct evsel *pos;
 
        evlist__for_each_entry(evlist, pos) {
-               if (pos->attr.type == PERF_TYPE_TRACEPOINT &&
+               if (pos->core.attr.type == PERF_TYPE_TRACEPOINT &&
                    perf_evsel__prepare_tracepoint_event(pos, pevent))
                        return -1;
        }
@@ -3928,7 +3928,7 @@ int perf_event__synthesize_attrs(struct perf_tool *tool,
        int err = 0;
 
        evlist__for_each_entry(evlist, evsel) {
-               err = perf_event__synthesize_attr(tool, &evsel->attr, evsel->ids,
+               err = perf_event__synthesize_attr(tool, &evsel->core.attr, evsel->ids,
                                                  evsel->id, process);
                if (err) {
                        pr_debug("failed to create perf header attribute\n");