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

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

perf trace: Move msg_flags beautifier to tools/perf/trace/beauty/ 

To reduce the size of builtin-trace.c.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-11zxg3qitk6bw2x30135k9z4@git.kernel.org


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

tools/perf/builtin-trace.c

+1 −61
Original line number Diff line number Diff line
@@ -52,10 +52,6 @@ 
# define O_CLOEXEC		02000000

#endif



#ifndef MSG_CMSG_CLOEXEC

# define MSG_CMSG_CLOEXEC	0x40000000

#endif



struct trace {

	struct perf_tool	tool;

	struct syscalltbl	*sctbl;
@@ -513,63 +509,6 @@ static const char *socket_families[] = { 
};

static DEFINE_STRARRAY(socket_families);



#ifndef MSG_PROBE

#define MSG_PROBE	     0x10

#endif

#ifndef MSG_WAITFORONE

#define MSG_WAITFORONE	0x10000

#endif

#ifndef MSG_SENDPAGE_NOTLAST

#define MSG_SENDPAGE_NOTLAST 0x20000

#endif

#ifndef MSG_FASTOPEN

#define MSG_FASTOPEN	     0x20000000

#endif



static size_t syscall_arg__scnprintf_msg_flags(char *bf, size_t size,

					       struct syscall_arg *arg)

{

	int printed = 0, flags = arg->val;



	if (flags == 0)

		return scnprintf(bf, size, "NONE");

#define	P_MSG_FLAG(n) \

	if (flags & MSG_##n) { \

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

		flags &= ~MSG_##n; \

	}



	P_MSG_FLAG(OOB);

	P_MSG_FLAG(PEEK);

	P_MSG_FLAG(DONTROUTE);

	P_MSG_FLAG(TRYHARD);

	P_MSG_FLAG(CTRUNC);

	P_MSG_FLAG(PROBE);

	P_MSG_FLAG(TRUNC);

	P_MSG_FLAG(DONTWAIT);

	P_MSG_FLAG(EOR);

	P_MSG_FLAG(WAITALL);

	P_MSG_FLAG(FIN);

	P_MSG_FLAG(SYN);

	P_MSG_FLAG(CONFIRM);

	P_MSG_FLAG(RST);

	P_MSG_FLAG(ERRQUEUE);

	P_MSG_FLAG(NOSIGNAL);

	P_MSG_FLAG(MORE);

	P_MSG_FLAG(WAITFORONE);

	P_MSG_FLAG(SENDPAGE_NOTLAST);

	P_MSG_FLAG(FASTOPEN);

	P_MSG_FLAG(CMSG_CLOEXEC);

#undef P_MSG_FLAG



	if (flags)

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



	return printed;

}



#define SCA_MSG_FLAGS syscall_arg__scnprintf_msg_flags



static size_t syscall_arg__scnprintf_access_mode(char *bf, size_t size,

						 struct syscall_arg *arg)

{
@@ -850,6 +789,7 @@ static size_t syscall_arg__scnprintf_getrandom_flags(char *bf, size_t size, 
#include "trace/beauty/pid.c"

#include "trace/beauty/mmap.c"

#include "trace/beauty/mode_t.c"

#include "trace/beauty/msg_flags.c"

#include "trace/beauty/perf_event_open.c"

#include "trace/beauty/sched_policy.c"

#include "trace/beauty/socket_type.c"

tools/perf/trace/beauty/msg_flags.c

0 → 100644
+62 −0
Original line number Diff line number Diff line 
#include <sys/types.h>

#include <sys/socket.h>



#ifndef MSG_PROBE

#define MSG_PROBE		     0x10

#endif

#ifndef MSG_WAITFORONE

#define MSG_WAITFORONE		   0x10000

#endif

#ifndef MSG_SENDPAGE_NOTLAST

#define MSG_SENDPAGE_NOTLAST	   0x20000

#endif

#ifndef MSG_FASTOPEN

#define MSG_FASTOPEN		0x20000000

#endif

#ifndef MSG_CMSG_CLOEXEC

# define MSG_CMSG_CLOEXEC	0x40000000

#endif



static size_t syscall_arg__scnprintf_msg_flags(char *bf, size_t size,

					       struct syscall_arg *arg)

{

	int printed = 0, flags = arg->val;



	if (flags == 0)

		return scnprintf(bf, size, "NONE");

#define	P_MSG_FLAG(n) \

	if (flags & MSG_##n) { \

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

		flags &= ~MSG_##n; \

	}



	P_MSG_FLAG(OOB);

	P_MSG_FLAG(PEEK);

	P_MSG_FLAG(DONTROUTE);

	P_MSG_FLAG(TRYHARD);

	P_MSG_FLAG(CTRUNC);

	P_MSG_FLAG(PROBE);

	P_MSG_FLAG(TRUNC);

	P_MSG_FLAG(DONTWAIT);

	P_MSG_FLAG(EOR);

	P_MSG_FLAG(WAITALL);

	P_MSG_FLAG(FIN);

	P_MSG_FLAG(SYN);

	P_MSG_FLAG(CONFIRM);

	P_MSG_FLAG(RST);

	P_MSG_FLAG(ERRQUEUE);

	P_MSG_FLAG(NOSIGNAL);

	P_MSG_FLAG(MORE);

	P_MSG_FLAG(WAITFORONE);

	P_MSG_FLAG(SENDPAGE_NOTLAST);

	P_MSG_FLAG(FASTOPEN);

	P_MSG_FLAG(CMSG_CLOEXEC);

#undef P_MSG_FLAG



	if (flags)

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



	return printed;

}



#define SCA_MSG_FLAGS syscall_arg__scnprintf_msg_flags