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

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

perf trace: Move futex_op 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-vb8dpy7bptkf219q5c25ulfp@git.kernel.org


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

tools/perf/builtin-trace.c

+2 −45
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 


#include <libaudit.h> /* FIXME: Still needed for audit_errno_to_name */

#include <stdlib.h>

#include <linux/futex.h>

#include <linux/err.h>

#include <linux/seccomp.h>

#include <linux/filter.h>
@@ -401,49 +400,6 @@ static size_t syscall_arg__scnprintf_flock(char *bf, size_t size, 


#define SCA_FLOCK syscall_arg__scnprintf_flock



static size_t syscall_arg__scnprintf_futex_op(char *bf, size_t size, struct syscall_arg *arg)

{

	enum syscall_futex_args {

		SCF_UADDR   = (1 << 0),

		SCF_OP	    = (1 << 1),

		SCF_VAL	    = (1 << 2),

		SCF_TIMEOUT = (1 << 3),

		SCF_UADDR2  = (1 << 4),

		SCF_VAL3    = (1 << 5),

	};

	int op = arg->val;

	int cmd = op & FUTEX_CMD_MASK;

	size_t printed = 0;



	switch (cmd) {

#define	P_FUTEX_OP(n) case FUTEX_##n: printed = scnprintf(bf, size, #n);

	P_FUTEX_OP(WAIT);	    arg->mask |= SCF_VAL3|SCF_UADDR2;		  break;

	P_FUTEX_OP(WAKE);	    arg->mask |= SCF_VAL3|SCF_UADDR2|SCF_TIMEOUT; break;

	P_FUTEX_OP(FD);		    arg->mask |= SCF_VAL3|SCF_UADDR2|SCF_TIMEOUT; break;

	P_FUTEX_OP(REQUEUE);	    arg->mask |= SCF_VAL3|SCF_TIMEOUT;	          break;

	P_FUTEX_OP(CMP_REQUEUE);    arg->mask |= SCF_TIMEOUT;			  break;

	P_FUTEX_OP(CMP_REQUEUE_PI); arg->mask |= SCF_TIMEOUT;			  break;

	P_FUTEX_OP(WAKE_OP);							  break;

	P_FUTEX_OP(LOCK_PI);	    arg->mask |= SCF_VAL3|SCF_UADDR2|SCF_TIMEOUT; break;

	P_FUTEX_OP(UNLOCK_PI);	    arg->mask |= SCF_VAL3|SCF_UADDR2|SCF_TIMEOUT; break;

	P_FUTEX_OP(TRYLOCK_PI);	    arg->mask |= SCF_VAL3|SCF_UADDR2;		  break;

	P_FUTEX_OP(WAIT_BITSET);    arg->mask |= SCF_UADDR2;			  break;

	P_FUTEX_OP(WAKE_BITSET);    arg->mask |= SCF_UADDR2;			  break;

	P_FUTEX_OP(WAIT_REQUEUE_PI);						  break;

	default: printed = scnprintf(bf, size, "%#x", cmd);			  break;

	}



	if (op & FUTEX_PRIVATE_FLAG)

		printed += scnprintf(bf + printed, size - printed, "|PRIV");



	if (op & FUTEX_CLOCK_REALTIME)

		printed += scnprintf(bf + printed, size - printed, "|CLKRT");



	return printed;

}



#define SCA_FUTEX_OP  syscall_arg__scnprintf_futex_op



static const char *bpf_cmd[] = {

	"MAP_CREATE", "MAP_LOOKUP_ELEM", "MAP_UPDATE_ELEM", "MAP_DELETE_ELEM",

	"MAP_GET_NEXT_KEY", "PROG_LOAD",
@@ -678,12 +634,13 @@ static size_t syscall_arg__scnprintf_getrandom_flags(char *bf, size_t size, 
	  .arg_parm	 = { [arg] = &strarray__##array, }



#include "trace/beauty/eventfd.c"

#include "trace/beauty/pid.c"

#include "trace/beauty/futex_op.c"

#include "trace/beauty/mmap.c"

#include "trace/beauty/mode_t.c"

#include "trace/beauty/msg_flags.c"

#include "trace/beauty/open_flags.c"

#include "trace/beauty/perf_event_open.c"

#include "trace/beauty/pid.c"

#include "trace/beauty/sched_policy.c"

#include "trace/beauty/signum.c"

#include "trace/beauty/socket_type.c"

tools/perf/trace/beauty/futex_op.c

0 → 100644
+44 −0
Original line number Diff line number Diff line 
#include <linux/futex.h>



static size_t syscall_arg__scnprintf_futex_op(char *bf, size_t size, struct syscall_arg *arg)

{

	enum syscall_futex_args {

		SCF_UADDR   = (1 << 0),

		SCF_OP	    = (1 << 1),

		SCF_VAL	    = (1 << 2),

		SCF_TIMEOUT = (1 << 3),

		SCF_UADDR2  = (1 << 4),

		SCF_VAL3    = (1 << 5),

	};

	int op = arg->val;

	int cmd = op & FUTEX_CMD_MASK;

	size_t printed = 0;



	switch (cmd) {

#define	P_FUTEX_OP(n) case FUTEX_##n: printed = scnprintf(bf, size, #n);

	P_FUTEX_OP(WAIT);	    arg->mask |= SCF_VAL3|SCF_UADDR2;		  break;

	P_FUTEX_OP(WAKE);	    arg->mask |= SCF_VAL3|SCF_UADDR2|SCF_TIMEOUT; break;

	P_FUTEX_OP(FD);		    arg->mask |= SCF_VAL3|SCF_UADDR2|SCF_TIMEOUT; break;

	P_FUTEX_OP(REQUEUE);	    arg->mask |= SCF_VAL3|SCF_TIMEOUT;	          break;

	P_FUTEX_OP(CMP_REQUEUE);    arg->mask |= SCF_TIMEOUT;			  break;

	P_FUTEX_OP(CMP_REQUEUE_PI); arg->mask |= SCF_TIMEOUT;			  break;

	P_FUTEX_OP(WAKE_OP);							  break;

	P_FUTEX_OP(LOCK_PI);	    arg->mask |= SCF_VAL3|SCF_UADDR2|SCF_TIMEOUT; break;

	P_FUTEX_OP(UNLOCK_PI);	    arg->mask |= SCF_VAL3|SCF_UADDR2|SCF_TIMEOUT; break;

	P_FUTEX_OP(TRYLOCK_PI);	    arg->mask |= SCF_VAL3|SCF_UADDR2;		  break;

	P_FUTEX_OP(WAIT_BITSET);    arg->mask |= SCF_UADDR2;			  break;

	P_FUTEX_OP(WAKE_BITSET);    arg->mask |= SCF_UADDR2;			  break;

	P_FUTEX_OP(WAIT_REQUEUE_PI);						  break;

	default: printed = scnprintf(bf, size, "%#x", cmd);			  break;

	}



	if (op & FUTEX_PRIVATE_FLAG)

		printed += scnprintf(bf + printed, size - printed, "|PRIV");



	if (op & FUTEX_CLOCK_REALTIME)

		printed += scnprintf(bf + printed, size - printed, "|CLKRT");



	return printed;

}



#define SCA_FUTEX_OP  syscall_arg__scnprintf_futex_op