openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

perf trace: Add array of chars scnprintf beautifier 

Needed for sched's traceoints prev/next comm, where, unlike with
syscalls, we are not dealing with an integer or pointer, but an array
straight out from the ring buffer.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Luis Cláudio Gonçalves <lclaudio@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-rlll7tmcqe1g4odtaifil5re@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2019-10-04 14:56:40 -03:00
parent 888ca854e2
commit 9597945d7f
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/perf/builtin-trace.c
View File

@ -91,6 +91,7 @@ struct syscall_arg_fmt {
unsigned long (*mask_val)(struct syscall_arg *arg, unsigned long val); unsigned long (*mask_val)(struct syscall_arg *arg, unsigned long val);
void *parm; void *parm;
const char *name; const char *name;
u16 nr_entries; // for arrays
bool show_zero; bool show_zero;
}; };
@ -522,6 +523,16 @@ size_t syscall_arg__scnprintf_long(char *bf, size_t size, struct syscall_arg *ar
return scnprintf(bf, size, "%ld", arg->val); return scnprintf(bf, size, "%ld", arg->val);
} }
static size_t syscall_arg__scnprintf_char_array(char *bf, size_t size, struct syscall_arg *arg)
{
// XXX Hey, maybe for sched:sched_switch prev/next comm fields we can
// fill missing comms using thread__set_comm()...
// here or in a special syscall_arg__scnprintf_pid_sched_tp...
return scnprintf(bf, size, "\"%-.*s\"", arg->fmt->nr_entries, arg->val);
}
#define SCA_CHAR_ARRAY syscall_arg__scnprintf_char_array
static const char *bpf_cmd[] = { static const char *bpf_cmd[] = {
"MAP_CREATE", "MAP_LOOKUP_ELEM", "MAP_UPDATE_ELEM", "MAP_DELETE_ELEM", "MAP_CREATE", "MAP_LOOKUP_ELEM", "MAP_UPDATE_ELEM", "MAP_DELETE_ELEM",
"MAP_GET_NEXT_KEY", "PROG_LOAD", "MAP_GET_NEXT_KEY", "PROG_LOAD",
@ -1491,7 +1502,10 @@ syscall_arg_fmt__init_array(struct syscall_arg_fmt *arg, struct tep_format_field
arg->scnprintf = SCA_PID; arg->scnprintf = SCA_PID;
else if (strcmp(field->type, "umode_t") == 0) else if (strcmp(field->type, "umode_t") == 0)
arg->scnprintf = SCA_MODE_T; arg->scnprintf = SCA_MODE_T;
else if ((strcmp(field->type, "int") == 0 || else if ((field->flags & TEP_FIELD_IS_ARRAY) && strstarts(field->type, "char")) {
arg->scnprintf = SCA_CHAR_ARRAY;
arg->nr_entries = field->arraylen;
} else if ((strcmp(field->type, "int") == 0 ||
strcmp(field->type, "unsigned int") == 0 || strcmp(field->type, "unsigned int") == 0 ||
strcmp(field->type, "long") == 0) && strcmp(field->type, "long") == 0) &&
len >= 2 && strcmp(field->name + len - 2, "fd") == 0) { len >= 2 && strcmp(field->name + len - 2, "fd") == 0) {