perf trace beauty: Add the glue for the autogenerated MSR arrays
A message that is not in the archive (sent off-list or not yet received): [email protected]
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 646b3e2cfbf2d9207b4dbfaade7a28351aa7edeb Gitweb: https://git.kernel.org/tip/646b3e2cfbf2d9207b4dbfaade7a28351aa7edeb Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 07 Oct 2019 15:52:19 -03:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Wed, 09 Oct 2019 11:23:52 -03:00
perf trace beauty: Add the glue for the autogenerated MSR arrays
We need to wrap those autogenerated string arrays with the strarrays__scnprintf() formatter, do it.
Cc Adrian Hunter <[email protected]>
Cc Brendan Gregg <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Luis Cláudio Gonçalves <[email protected]>
Cc Namhyung Kim <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/trace/beauty/Build | 1 +- tools/perf/trace/beauty/beauty.h | 3 ++- tools/perf/trace/beauty/tracepoints/Build | 1 +- tools/perf/trace/beauty/tracepoints/x86_msr.c | 34 ++++++++++++++++++- 4 files changed, 39 insertions(+) create mode 100644 tools/perf/trace/beauty/tracepoints/Build create mode 100644 tools/perf/trace/beauty/tracepoints/x86_msr.c
tools/perf/trace/beauty/Build +1 -0
@@ -17,3 +17,4 @@ perf-y += sockaddr.o perf-y += socket.o perf-y += statx.o perf-y += sync_file_range.o +perf-y += tracepoints/
tools/perf/trace/beauty/beauty.h +3 -0
@@ -114,6 +114,9 @@ unsigned long syscall_arg__val(struct syscall_arg *arg, u8 idx);size_t syscall_arg__scnprintf_strarray_flags (char *bf,size_t size,struct syscall_arg *arg);#define SCA_STRARRAY_FLAGS syscall_arg__scnprintf_strarray_flags +size_t syscall_arg__scnprintf_x86_MSR (char *bf,size_t size,struct syscall_arg *arg); +#define SCA_X86_MSR syscall_arg__scnprintf_x86_MSR +size_t syscall_arg__scnprintf_strarrays (char *bf,size_t size,struct syscall_arg *arg);#define SCA_STRARRAYS syscall_arg__scnprintf_strarrays
tools/perf/trace/beauty/tracepoints/Build new file +1 -0
@@ -0,0 +1 @@ +perf-y += x86_msr.o
tools/perf/trace/beauty/tracepoints/x86_msr.c new file +34 -0
@@ -0,0 +1,34 @@ +// SPDX-License-Identifier: LGPL-2.1 +/* +* trace/beauty/x86_msr.c +* +* Copyright (C) 2019, Red Hat Inc, Arnaldo Carvalho de Melo <[email protected]> +*/ + +#include "trace/beauty/beauty.h" + +#include "trace/beauty/generated/x86_arch_MSRs_array.c" + +static DEFINE_STRARRAY(x86_MSRs, "MSR_"); +static DEFINE_STRARRAY_OFFSET(x86_64_specific_MSRs, "MSR_", x86_64_specific_MSRs_offset); +static DEFINE_STRARRAY_OFFSET(x86_AMD_V_KVM_MSRs, "MSR_", x86_AMD_V_KVM_MSRs_offset); + +static struct strarray *x86_MSRs_tables[] = { + &strarray__x86_MSRs, + &strarray__x86_64_specific_MSRs, + &strarray__x86_AMD_V_KVM_MSRs, +}; + +static DEFINE_STRARRAYS (x86_MSRs_tables); + +static size_t x86_MSR__scnprintf (unsigned long msr,char *bf,size_t size,bool show_prefix) +{ +return strarrays__scnprintf (&strarrays__x86_MSRs_tables, bf, size,"%#x" , show_prefix, msr); +} + +size_t syscall_arg__scnprintf_x86_MSR (char *bf,size_t size,struct syscall_arg *arg) +{ +unsigned long flags = arg->val; + +return x86_MSR__scnprintf (flags, bf, size, arg->show_string_prefix); +}