perf trace: Associate more argument names with the filename beautifier
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: dea87bfb7b280e8b14519eb6b5e8bafbbf4c66f2 Gitweb: https://git.kernel.org/tip/dea87bfb7b280e8b14519eb6b5e8bafbbf4c66f2 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Wed, 5 Jun 2019 10:53:06 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 5 Jun 2019 10:53:06 -0300
perf trace: Associate more argument names with the filename beautifier
For instance, the rename* family uses "oldname", "newname", so check if "name" is at the end and treat it as a filename.
Cc Adrian Hunter <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-trace.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
tools/perf/builtin-trace.c +5 -5
@@ -1431,10 +1431,11 @@ static int syscall__set_arg_fmts(struct syscall *sc)if (sc->fmt && sc->fmt->arg[idx].scnprintf)continue ; + len =strlen (field->name); +if (strcmp (field->type,"const char *" ) ==0 && - (strcmp (field->name,"filename" ) ==0 || -strcmp (field->name,"path" ) ==0 || -strcmp (field->name,"pathname" ) ==0 )) + ((len >=4 &&strcmp (field->name + len -4 ,"name" ) ==0 ) || +strstr (field->name,"path" ) !=NULL )) sc->arg_fmt[idx].scnprintf =SCA_FILENAME ;else if ((field->flags &TEP_FIELD_IS_POINTER ) ||strstr (field->name,"addr" )) sc->arg_fmt[idx].scnprintf =SCA_PTR ;
@@ -1445,8 +1446,7 @@ static int syscall__set_arg_fmts(struct syscall *sc)else if ((strcmp (field->type,"int" ) ==0 ||strcmp (field->type,"unsigned int" ) ==0 ||strcmp (field->type,"long" ) ==0 ) && - (len =strlen (field->name)) >=2 && -strcmp (field->name + len -2 ,"fd" ) ==0 ) { + len >=2 &&strcmp (field->name + len -2 ,"fd" ) ==0 ) {/* * /sys/kernel/tracing/events/syscalls/sys_enter* * egrep 'field:.*fd;' .../format|sed -r 's/.*field:([a-z ]+) [a-z_]*fd.+/\1/g'|sort|uniq -c