Re: [PATCH v3 3/4] perf session: Add swap operation for event TIME_CONV

From: Adrian Hunter
Date: Wed Apr 28 2021 - 10:43:49 EST


On 28/04/21 3:09 pm, Leo Yan wrote:
> Since commit d110162cafc8 ("perf tsc: Support cap_user_time_short for
> event TIME_CONV"), the event PERF_RECORD_TIME_CONV has extended the data
> structure for clock parameters.
>
> To be backwards-compatible, this patch adds a dedicated swap operation
> for the event PERF_RECORD_TIME_CONV, based on checking if the event
> contains field "time_cycles", it can support both for the old and new
> event formats.
>
> Fixes: d110162cafc8 ("perf tsc: Support cap_user_time_short for event TIME_CONV")
> Signed-off-by: Leo Yan <leo.yan@xxxxxxxxxx>

Acked-by: Adrian Hunter <adrian.hunter@xxxxxxxxx>

> ---
> tools/perf/util/session.c | 15 ++++++++++++++-
> 1 file changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
> index eba3769be3f1..1e3cab92042d 100644
> --- a/tools/perf/util/session.c
> +++ b/tools/perf/util/session.c
> @@ -949,6 +949,19 @@ static void perf_event__stat_round_swap(union perf_event *event,
> event->stat_round.time = bswap_64(event->stat_round.time);
> }
>
> +static void perf_event__time_conv_swap(union perf_event *event,
> + bool sample_id_all __maybe_unused)
> +{
> + event->time_conv.time_shift = bswap_64(event->time_conv.time_shift);
> + event->time_conv.time_mult = bswap_64(event->time_conv.time_mult);
> + event->time_conv.time_zero = bswap_64(event->time_conv.time_zero);
> +
> + if (event_contains(event->time_conv, time_cycles)) {
> + event->time_conv.time_cycles = bswap_64(event->time_conv.time_cycles);
> + event->time_conv.time_mask = bswap_64(event->time_conv.time_mask);
> + }
> +}
> +
> typedef void (*perf_event__swap_op)(union perf_event *event,
> bool sample_id_all);
>
> @@ -985,7 +998,7 @@ static perf_event__swap_op perf_event__swap_ops[] = {
> [PERF_RECORD_STAT] = perf_event__stat_swap,
> [PERF_RECORD_STAT_ROUND] = perf_event__stat_round_swap,
> [PERF_RECORD_EVENT_UPDATE] = perf_event__event_update_swap,
> - [PERF_RECORD_TIME_CONV] = perf_event__all64_swap,
> + [PERF_RECORD_TIME_CONV] = perf_event__time_conv_swap,
> [PERF_RECORD_HEADER_MAX] = NULL,
> };
>
>