Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef969ca6 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf trace beauty: Do not try to use the fd->pathname beautifier for bind/connect fd arg 

Doesn't make sense and also we now beautify the sockaddr, which provides
enough info:

  # trace -e close,socket,connec* ssh www.bla.com
  <SNIP>
  close(5)                                = 0
  socket(PF_INET, SOCK_DGRAM|CLOEXEC|NONBLOCK, IPPROTO_IP) = 5
  connect(5, { .family: PF_INET, port: 53, addr: 192.168.44.1 }, 16) = 0
  close(5)                                = 0
  socket(PF_INET, SOCK_STREAM, IPPROTO_TCP) = 5
  ^C#

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-h9drpb7ail808d2mh4n7tla4@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 79d725cd

tools/perf/builtin-trace.c

+4 −2
Original line number Diff line number Diff line
@@ -710,7 +710,8 @@ static struct syscall_fmt { 
	  .arg = { [0] = { .scnprintf = SCA_X86_ARCH_PRCTL_CODE, /* code */ },

		   [1] = { .scnprintf = SCA_PTR, /* arg2 */ }, }, },

	{ .name	    = "bind",

	  .arg = { [1] = { .scnprintf = SCA_SOCKADDR, /* umyaddr */ }, }, },

	  .arg = { [0] = { .scnprintf = SCA_INT, /* fd */ },

		   [1] = { .scnprintf = SCA_SOCKADDR, /* umyaddr */ }, }, },

	{ .name	    = "bpf",

	  .arg = { [0] = STRARRAY(cmd, bpf_cmd), }, },

	{ .name	    = "brk",	    .hexret = true,
@@ -726,7 +727,8 @@ static struct syscall_fmt { 
	{ .name	    = "close",

	  .arg = { [0] = { .scnprintf = SCA_CLOSE_FD, /* fd */ }, }, },

	{ .name	    = "connect",

	  .arg = { [1] = { .scnprintf = SCA_SOCKADDR, /* servaddr */ },

	  .arg = { [0] = { .scnprintf = SCA_INT, /* fd */ },

		   [1] = { .scnprintf = SCA_SOCKADDR, /* servaddr */ },

		   [2] = { .scnprintf = SCA_INT, /* addrlen */ }, }, },

	{ .name	    = "epoll_ctl",

	  .arg = { [1] = STRARRAY(op, epoll_ctl_ops), }, },