Skip to contentSkip to conversation

perf trace beauty: Add the glue for the autogenerated x86 IRQ vector array

tip: perf/core tip-bot2 for Arnaldo Carvalho de Melo 1 participant 1 message Oct 22, 2019 1 message not in the archive perf events

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

tip-bot2 for Arnaldo Carvalho de Melo

author merge bot Applied
#1 lore raw

The following commit has been merged into the perf/core branch of tip:

Commit-ID:     573ed8985d290214440e6d9866e5330b5ef064ca
Gitweb:        https://git.kernel.org/tip/573ed8985d290214440e6d9866e5330b5ef064ca
Author:        Arnaldo Carvalho de Melo <[email protected]>
AuthorDate:    Tue, 15 Oct 2019 16:03:25 -03:00
Committer:     Arnaldo Carvalho de Melo <[email protected]>
CommitterDate: Tue, 15 Oct 2019 16:13:27 -03:00

perf trace beauty: Add the glue for the autogenerated x86 IRQ vector array

We need to wrap this autogenerated string array with the strarray__scnprintf() formatter and the strarray__strotul() lookup method, do it.

---
 tools/perf/trace/beauty/beauty.h                      |  6 ++-
 tools/perf/trace/beauty/tracepoints/Build             |  1 +-
 tools/perf/trace/beauty/tracepoints/x86_irq_vectors.c | 29 ++++++++++-
 3 files changed, 36 insertions(+)
 create mode 100644 tools/perf/trace/beauty/tracepoints/x86_irq_vectors.c
tools/perf/trace/beauty/beauty.h +6 -0
index 165f56b..232b64d 100644
@@ -122,6 +122,12 @@ 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_irq_vectors(char *bf, size_t size, struct syscall_arg *arg);
+#define SCA_X86_IRQ_VECTORS syscall_arg__scnprintf_x86_irq_vectors
+
+bool syscall_arg__strtoul_x86_irq_vectors(char *bf, size_t size, struct syscall_arg *arg, u64 *ret);
+#define STUL_X86_IRQ_VECTORS syscall_arg__strtoul_x86_irq_vectors
+
 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
 
tools/perf/trace/beauty/tracepoints/Build +1 -0
index 625a676..e35087f 100644
@@ -1 +1,2 @@
+perf-y += x86_irq_vectors.o
 perf-y += x86_msr.o
tools/perf/trace/beauty/tracepoints/x86_irq_vectors.c new file +29 -0
new file mode 100644
index 0000000..8eb9bc8
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: LGPL-2.1
+/*
+ * trace/beauty/x86_irq_vectors.c
+ *
+ *  Copyright (C) 2019, Red Hat Inc, Arnaldo Carvalho de Melo <[email protected]>
+ */
+
+#include "trace/beauty/beauty.h"
+
+#include "trace/beauty/generated/x86_arch_irq_vectors_array.c"
+
+static DEFINE_STRARRAY(x86_irq_vectors, "_VECTOR");
+
+static size_t x86_irq_vectors__scnprintf(unsigned long vector, char *bf, size_t size, bool show_prefix)
+{
+	return strarray__scnprintf_suffix(&strarray__x86_irq_vectors, bf, size, "%#x", show_prefix, vector);
+}
+
+size_t syscall_arg__scnprintf_x86_irq_vectors(char *bf, size_t size, struct syscall_arg *arg)
+{
+	unsigned long vector = arg->val;
+
+	return x86_irq_vectors__scnprintf(vector, bf, size, arg->show_string_prefix);
+}
+
+bool syscall_arg__strtoul_x86_irq_vectors(char *bf, size_t size, struct syscall_arg *arg __maybe_unused, u64 *ret)
+{
+	return strarray__strtoul(&strarray__x86_irq_vectors, bf, size, ret);
+}