perf trace: Use the FD beautifier for socket syscall fds

But we really should have something like 'strace -yy' here...

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-eyrt1ypfq68u4ljagyk2nj1i@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 12 insertions, 6 deletions

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 5c494a8c8942..12fc6dfbae99 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -1173,11 +1173,14 @@ static struct syscall_fmt {
         { .name     = "readv",      .errmsg = true,
           .arg_scnprintf = { [0] = SCA_FD, /* fd */ }, },
         { .name     = "recvfrom",   .errmsg = true,
-          .arg_scnprintf = { [3] = SCA_MSG_FLAGS, /* flags */ }, },
+          .arg_scnprintf = { [0] = SCA_FD, /* fd */
+                             [3] = SCA_MSG_FLAGS, /* flags */ }, },
         { .name     = "recvmmsg",   .errmsg = true,
-          .arg_scnprintf = { [3] = SCA_MSG_FLAGS, /* flags */ }, },
+          .arg_scnprintf = { [0] = SCA_FD, /* fd */
+                             [3] = SCA_MSG_FLAGS, /* flags */ }, },
         { .name     = "recvmsg",    .errmsg = true,
-          .arg_scnprintf = { [2] = SCA_MSG_FLAGS, /* flags */ }, },
+          .arg_scnprintf = { [0] = SCA_FD, /* fd */
+                             [2] = SCA_MSG_FLAGS, /* flags */ }, },
         { .name     = "removexattr", .errmsg = true,
           .arg_scnprintf = { [0] = SCA_FILENAME, /* pathname */ }, },
         { .name     = "renameat",   .errmsg = true,
@@ -1193,11 +1196,14 @@ static struct syscall_fmt {
           .arg_scnprintf = { [2] = SCA_SIGNUM, /* sig */ }, },
         { .name     = "select",     .errmsg = true, .timeout = true, },
         { .name     = "sendmmsg",    .errmsg = true,
-          .arg_scnprintf = { [3] = SCA_MSG_FLAGS, /* flags */ }, },
+          .arg_scnprintf = { [0] = SCA_FD, /* fd */
+                             [3] = SCA_MSG_FLAGS, /* flags */ }, },
         { .name     = "sendmsg",    .errmsg = true,
-          .arg_scnprintf = { [2] = SCA_MSG_FLAGS, /* flags */ }, },
+          .arg_scnprintf = { [0] = SCA_FD, /* fd */
+                             [2] = SCA_MSG_FLAGS, /* flags */ }, },
         { .name     = "sendto",     .errmsg = true,
-          .arg_scnprintf = { [3] = SCA_MSG_FLAGS, /* flags */ }, },
+          .arg_scnprintf = { [0] = SCA_FD, /* fd */
+                             [3] = SCA_MSG_FLAGS, /* flags */ }, },
         { .name     = "setitimer",  .errmsg = true, STRARRAY(0, which, itimers), },
         { .name     = "setrlimit",  .errmsg = true, STRARRAY(0, resource, rlimit_resources), },
         { .name     = "setxattr",   .errmsg = true,