Skip to content

Commit f174341

Browse files
namhyungacmel
authored andcommitted
perf tools: Convert to perf_record_header_attr_id()
Instead of accessing the attr.id directly, use the perf_record_header_attr_id() helper to handle old versions. Signed-off-by: Namhyung Kim <namhyung@kernel.org> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Ian Rogers <irogers@google.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Link: https://lore.kernel.org/r/20230825152552.112913-3-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent baec608 commit f174341

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

tools/perf/util/header.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4405,7 +4405,7 @@ int perf_event__process_attr(struct perf_tool *tool __maybe_unused,
44054405
if (perf_evsel__alloc_id(&evsel->core, 1, n_ids))
44064406
return -ENOMEM;
44074407

4408-
ids = (void *)&event->attr.attr + event->attr.attr.size;
4408+
ids = perf_record_header_attr_id(event);
44094409
for (i = 0; i < n_ids; i++) {
44104410
perf_evlist__id_add(&evlist->core, &evsel->core, 0, i, ids[i]);
44114411
}

tools/perf/util/session.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -833,8 +833,8 @@ static void perf_event__hdr_attr_swap(union perf_event *event,
833833
perf_event__attr_swap(&event->attr.attr);
834834

835835
size = event->header.size;
836-
size -= (void *)&event->attr.id - (void *)event;
837-
mem_bswap_64(event->attr.id, size);
836+
size -= perf_record_header_attr_id(event) - (void *)event;
837+
mem_bswap_64(perf_record_header_attr_id(event), size);
838838
}
839839

840840
static void perf_event__event_update_swap(union perf_event *event,

tools/perf/util/synthetic-events.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2145,7 +2145,7 @@ int perf_event__synthesize_attr(struct perf_tool *tool, struct perf_event_attr *
21452145
return -ENOMEM;
21462146

21472147
ev->attr.attr = *attr;
2148-
memcpy(ev->attr.id, id, ids * sizeof(u64));
2148+
memcpy(perf_record_header_attr_id(ev), id, ids * sizeof(u64));
21492149

21502150
ev->attr.header.type = PERF_RECORD_HEADER_ATTR;
21512151
ev->attr.header.size = (u16)size;

0 commit comments

Comments
 (0)