perf trace beauty futex: Beautify FUTEX_BITSET_MATCH_ANY (3258abe0) · Commits · 戴 / test

E.g.: # strace -e futex -p 14437 strace: Process 14437 attached futex(0x7f46f4808d70, FUTEX_WAKE_PRIVATE, 1) = 0 futex(0x7f46f24e68b0, FUTEX_WAIT_BITSET_PRIVATE|FUTEX_CLOCK_REALTIME, 0, {tv_sec=1516636744, tv_nsec=221969000}, 0xffffffff) = -1 ETIMEDOUT (Connection timed out) <detached ...> # Should pretty print that 0xffffffff value, like: # trace -e futex --tid 14437 0.028 ( 0.005 ms): futex(uaddr: 0x7f46f4808d70, op: WAKE|PRIV, val: 1 ) = 0 0.037 (1000.092 ms): futex(uaddr: 0x7f46f24e68b0, op: WAIT_BITSET|PRIV|CLKRT, utime: 0x7f46f23fedf0, val3: MATCH_ANY) = -1 ETIMEDOUT Connection timed out ^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: https://lkml.kernel.org/n/tip-raef6e352la90600yksthao1@git.kernel.org Signed-off-by:

Arnaldo Carvalho de Melo <acme@redhat.com>

tools/perf/builtin-trace.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -549,6 +549,7 @@ static size_t syscall_arg__scnprintf_getrandom_flags(char *bf, size_t size,
		#include "trace/beauty/eventfd.c"
		#include "trace/beauty/flock.c"
		#include "trace/beauty/futex_op.c"
		#include "trace/beauty/futex_val3.c"
		#include "trace/beauty/mmap.c"
		#include "trace/beauty/mode_t.c"
		#include "trace/beauty/msg_flags.c"
		@@ -611,7 +612,8 @@ static struct syscall_fmt {
		{ .name = "fstat", .alias = "newfstat", },
		{ .name = "fstatat", .alias = "newfstatat", },
		{ .name = "futex",
		.arg = { [1] = { .scnprintf = SCA_FUTEX_OP, /* op */ }, }, },
		.arg = { [1] = { .scnprintf = SCA_FUTEX_OP, /* op */ },
		[5] = { .scnprintf = SCA_FUTEX_VAL3, /* val3 */ }, }, },
		{ .name = "futimesat",
		.arg = { [0] = { .scnprintf = SCA_FDAT, /* fd */ }, }, },
		{ .name = "getitimer",

tools/perf/trace/beauty/futex_val3.c

0 → 100644

+18 −0

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0
		#include <linux/futex.h>

		#ifndef FUTEX_BITSET_MATCH_ANY
		#define FUTEX_BITSET_MATCH_ANY 0xffffffff
		#endif

		static size_t syscall_arg__scnprintf_futex_val3(char bf, size_t size, struct syscall_arg arg)
		{
		unsigned int bitset = arg->val;

		if (bitset == FUTEX_BITSET_MATCH_ANY)
		return scnprintf(bf, size, "MATCH_ANY");

		return scnprintf(bf, size, "%#xd", bitset);
		}

		#define SCA_FUTEX_VAL3 syscall_arg__scnprintf_futex_val3

Admin message