perf trace: Introduce a strtoul() method for 'struct strarrays'
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: d0a3a1041005d9273d18669819e2a6dfed922a4d Gitweb: https://git.kernel.org/tip/d0a3a1041005d9273d18669819e2a6dfed922a4d Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Wed, 09 Oct 2019 16:11:36 -03:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Wed, 09 Oct 2019 16:11:36 -03:00
perf trace: Introduce a strtoul() method for 'struct strarrays'
And also for 'struct strarray', since its needed to implement strarrays__strtoul(). This just traverses the entries and when finding a match, returns (offset + index), i.e. the value associated with the searched string.
E.g. "EFER" (MSR_EFER) returns:
# grep -w EFER -B2 /tmp/build/perf/trace/beauty/generated/x86_arch_MSRs_array.c
#define x86_64_specific_MSRs_offset 0xc0000080
static const char *x86_64_specific_MSRs[] = {
[0xc0000080 - x86_64_specific_MSRs_offset] = "EFER",
# 0xc0000080
This will be auto-attached to 'struct syscall_arg_fmt' entries associated with strarrays as soon as we add a ->strarray and ->strarrays to 'struct syscall_arg_fmt'.
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/builtin-trace.c | 28 ++++++++++++++++++++++++++++ tools/perf/trace/beauty/beauty.h | 5 +++++ 2 files changed, 33 insertions(+)
tools/perf/builtin-trace.c +28 -0
@@ -477,6 +477,34 @@ size_t strarrays__scnprintf(struct strarrays *sas, char *bf, size_t size, constreturn printed; } +bool strarray__strtoul (struct strarray *sa,char *bf,size_t size,u64 *ret) +{ +int i; + +for (i =0 ; i < sa->nr_entries; ++i) { +if (sa->entries[i] &&strncmp (sa->entries[i], bf, size) ==0 && sa->entries[i][size] =='\0' ) { + *ret = sa->offset + i; +return true; + } + } + +return false; +} + +bool strarrays__strtoul (struct strarrays *sas,char *bf,size_t size,u64 *ret) +{ +int i; + +for (i =0 ; i < sas->nr_entries; ++i) { +struct strarray *sa = sas->entries[i]; + +if (strarray__strtoul (sa, bf, size, ret)) +return true; + } + +return false; +} +size_t syscall_arg__scnprintf_strarrays (char *bf,size_t size,struct syscall_arg *arg) {
tools/perf/trace/beauty/beauty.h +5 -0
@@ -5,6 +5,7 @@#include <linux/kernel.h> #include <linux/types.h> #include <sys/types.h> +#include <stdbool.h> struct strarray {u64 offset;
@@ -29,6 +30,8 @@ struct strarray {size_t strarray__scnprintf (struct strarray *sa,char *bf,size_t size,const char *intfmt,bool show_prefix,int val);size_t strarray__scnprintf_flags (struct strarray *sa,char *bf,size_t size,bool show_prefix,unsigned long flags); +bool strarray__strtoul (struct strarray *sa,char *bf,size_t size,u64 *ret); +struct trace ;struct thread ;
@@ -51,6 +54,8 @@ struct strarrays {size_t strarrays__scnprintf (struct strarrays *sas,char *bf,size_t size,const char *intfmt,bool show_prefix,int val); +bool strarrays__strtoul (struct strarrays *sas,char *bf,size_t size,u64 *ret); +size_t pid__scnprintf_fd (struct trace *trace,pid_t pid,int fd,char *bf,size_t size);extern struct strarray strarray__socket_families;