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

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

perf trace: Move perf_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-8r3gmymyn3r0ynt4yuzspp9g@git.kernel.org


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

tools/perf/builtin-trace.c

+1 −44
Original line number Diff line number Diff line
@@ -56,22 +56,6 @@ 
# define MSG_CMSG_CLOEXEC	0x40000000

#endif



#ifndef PERF_FLAG_FD_NO_GROUP

# define PERF_FLAG_FD_NO_GROUP		(1UL << 0)

#endif



#ifndef PERF_FLAG_FD_OUTPUT

# define PERF_FLAG_FD_OUTPUT		(1UL << 1)

#endif



#ifndef PERF_FLAG_PID_CGROUP

# define PERF_FLAG_PID_CGROUP		(1UL << 2) /* pid=cgroup id, per-cpu mode only */

#endif



#ifndef PERF_FLAG_FD_CLOEXEC

# define PERF_FLAG_FD_CLOEXEC		(1UL << 3) /* O_CLOEXEC */

#endif



struct trace {

	struct perf_tool	tool;

	struct syscalltbl	*sctbl;
@@ -674,34 +658,6 @@ static size_t syscall_arg__scnprintf_open_flags(char *bf, size_t size, 


#define SCA_OPEN_FLAGS syscall_arg__scnprintf_open_flags



static size_t syscall_arg__scnprintf_perf_flags(char *bf, size_t size,

						struct syscall_arg *arg)

{

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



	if (flags == 0)

		return 0;



#define	P_FLAG(n) \

	if (flags & PERF_FLAG_##n) { \

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

		flags &= ~PERF_FLAG_##n; \

	}



	P_FLAG(FD_NO_GROUP);

	P_FLAG(FD_OUTPUT);

	P_FLAG(PID_CGROUP);

	P_FLAG(FD_CLOEXEC);

#undef P_FLAG



	if (flags)

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



	return printed;

}



#define SCA_PERF_FLAGS syscall_arg__scnprintf_perf_flags



static size_t syscall_arg__scnprintf_pipe_flags(char *bf, size_t size,

						struct syscall_arg *arg)

{
@@ -894,6 +850,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/perf_event_open.c"

#include "trace/beauty/sched_policy.c"

#include "trace/beauty/socket_type.c"

#include "trace/beauty/waitid_options.c"

tools/perf/trace/beauty/perf_event_open.c

0 → 100644
+43 −0
Original line number Diff line number Diff line 
#ifndef PERF_FLAG_FD_NO_GROUP

# define PERF_FLAG_FD_NO_GROUP		(1UL << 0)

#endif



#ifndef PERF_FLAG_FD_OUTPUT

# define PERF_FLAG_FD_OUTPUT		(1UL << 1)

#endif



#ifndef PERF_FLAG_PID_CGROUP

# define PERF_FLAG_PID_CGROUP		(1UL << 2) /* pid=cgroup id, per-cpu mode only */

#endif



#ifndef PERF_FLAG_FD_CLOEXEC

# define PERF_FLAG_FD_CLOEXEC		(1UL << 3) /* O_CLOEXEC */

#endif



static size_t syscall_arg__scnprintf_perf_flags(char *bf, size_t size,

						struct syscall_arg *arg)

{

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



	if (flags == 0)

		return 0;



#define	P_FLAG(n) \

	if (flags & PERF_FLAG_##n) { \

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

		flags &= ~PERF_FLAG_##n; \

	}



	P_FLAG(FD_NO_GROUP);

	P_FLAG(FD_OUTPUT);

	P_FLAG(PID_CGROUP);

	P_FLAG(FD_CLOEXEC);

#undef P_FLAG



	if (flags)

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



	return printed;

}



#define SCA_PERF_FLAGS syscall_arg__scnprintf_perf_flags