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

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

perf trace: Beautify socket 'type' arg 

Taking into account the fact that the SOCK_ types can be overriden for
ABI reasons on MIPS and also masking and interpreting the socket flags
(NONBLOCK and CLOEXEC), printing whatever is left in the flags bits
as an hex number, or'ed.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-cbn57082gq9v0sbsd67edwjq@git.kernel.org


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

tools/perf/builtin-trace.c

+49 −1
Original line number Diff line number Diff line
@@ -265,6 +265,53 @@ static const char *socket_families[] = { 
};

static DEFINE_STRARRAY(socket_families);



#ifndef SOCK_TYPE_MASK

#define SOCK_TYPE_MASK 0xf

#endif



static size_t syscall_arg__scnprintf_socket_type(char *bf, size_t size,

						      struct syscall_arg *arg)

{

	size_t printed;

	int type = arg->val,

	    flags = type & ~SOCK_TYPE_MASK;



	type &= SOCK_TYPE_MASK;

	/*

 	 * Can't use a strarray, MIPS may override for ABI reasons.

 	 */

	switch (type) {

#define	P_SK_TYPE(n) case SOCK_##n: printed = scnprintf(bf, size, #n); break;

	P_SK_TYPE(STREAM);

	P_SK_TYPE(DGRAM);

	P_SK_TYPE(RAW);

	P_SK_TYPE(RDM);

	P_SK_TYPE(SEQPACKET);

	P_SK_TYPE(DCCP);

	P_SK_TYPE(PACKET);

#undef P_SK_TYPE

	default:

		printed = scnprintf(bf, size, "%#x", type);

	}



#define	P_SK_FLAG(n) \

	if (flags & SOCK_##n) { \

		printed += scnprintf(bf + printed, size - printed, "|%s", #n); \

		flags &= ~SOCK_##n; \

	}



	P_SK_FLAG(CLOEXEC);

	P_SK_FLAG(NONBLOCK);

#undef P_SK_FLAG



	if (flags)

		printed += scnprintf(bf + printed, size - printed, "|%#x", flags);



	return printed;

}



#define SCA_SK_TYPE syscall_arg__scnprintf_socket_type



static size_t syscall_arg__scnprintf_open_flags(char *bf, size_t size,

					       struct syscall_arg *arg)

{
@@ -440,7 +487,8 @@ static struct syscall_fmt { 
	  .arg_scnprintf = { [0] = SCA_STRARRAY, /* which */ },

	  .arg_parm	 = { [0] = &strarray__itimers, /* which */ }, },

	{ .name	    = "socket",	    .errmsg = true,

	  .arg_scnprintf = { [0] = SCA_STRARRAY, /* family */ },

	  .arg_scnprintf = { [0] = SCA_STRARRAY, /* family */

			     [1] = SCA_SK_TYPE, /* type */ },

	  .arg_parm	 = { [0] = &strarray__socket_families, /* family */ }, },

	{ .name	    = "stat",	    .errmsg = true, .alias = "newstat", },

	{ .name	    = "tgkill",	    .errmsg = true,