Attachment 306847 Details for Bug 448628 – Add support for the bitset operations, removing CMP_REQUEUE_PI

[patch] Add support for the bitset operations, removing CMP_REQUEUE_PI

d-strace-futex-bitset (text/plain), 2.46 KB, created by Ulrich Drepper on 2008-05-27 22:30:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ulrich Drepper

Created: 2008-05-27 22:30:34 UTC

Size: 2.46 KB

patch

obsolete

>--- strace-4.5.16/process.c-old	2008-05-27 15:14:19.000000000 -0700
>+++ strace-4.5.16/process.c	2008-05-27 15:19:33.000000000 -0700
>@@ -3084,8 +3084,11 @@
> #  define FUTEX_UNLOCK_PI 7
> #  define FUTEX_TRYLOCK_PI 8
> # endif
>-# ifndef FUTEX_CMP_REQUEUE_PI
>-#  define FUTEX_CMP_REQUEUE_PI 9
>+# ifndef FUTEX_WAIT_BITSET
>+#  define FUTEX_WAIT_BITSET 9
>+# endif
>+# ifndef FUTEX_WAKE_BITSET
>+#  define FUTEX_WAKE_BITSET 10
> # endif
> # ifndef FUTEX_PRIVATE_FLAG
> #  define FUTEX_PRIVATE_FLAG 128
>@@ -3100,7 +3103,8 @@
> 	{ FUTEX_LOCK_PI,				"FUTEX_LOCK_PI" },
> 	{ FUTEX_UNLOCK_PI,				"FUTEX_UNLOCK_PI" },
> 	{ FUTEX_TRYLOCK_PI,				"FUTEX_TRYLOCK_PI" },
>-	{ FUTEX_CMP_REQUEUE_PI,				"FUTEX_CMP_REQUEUE_PI" },
>+	{ FUTEX_WAIT_BITSET,				"FUTEX_WAIT_BITSET" },
>+	{ FUTEX_WAKE_BITSET,				"FUTEX_WAKE_BITSET" },
> 	{ FUTEX_WAIT|FUTEX_PRIVATE_FLAG,		"FUTEX_WAIT_PRIVATE" },
> 	{ FUTEX_WAKE|FUTEX_PRIVATE_FLAG,		"FUTEX_WAKE_PRIVATE" },
> 	{ FUTEX_FD|FUTEX_PRIVATE_FLAG,			"FUTEX_FD_PRIVATE" },
>@@ -3110,7 +3114,8 @@
> 	{ FUTEX_LOCK_PI|FUTEX_PRIVATE_FLAG,		"FUTEX_LOCK_PI_PRIVATE" },
> 	{ FUTEX_UNLOCK_PI|FUTEX_PRIVATE_FLAG,		"FUTEX_UNLOCK_PI_PRIVATE" },
> 	{ FUTEX_TRYLOCK_PI|FUTEX_PRIVATE_FLAG,		"FUTEX_TRYLOCK_PI_PRIVATE" },
>-	{ FUTEX_CMP_REQUEUE_PI|FUTEX_PRIVATE_FLAG,	"FUTEX_CMP_REQUEUE_PI_PRIVATE" },
>+	{ FUTEX_WAIT_BITSET|FUTEX_PRIVATE_FLAG,		"FUTEX_WAIT_BITSET_PRIVATE" },
>+	{ FUTEX_WAKE_BITSET|FUTEX_PRIVATE_FLAG,		"FUTEX_WAKE_BITSET_PRIVATE" },
> 	{ 0,						NULL }
> };
> #ifndef FUTEX_OP_SET
>@@ -3149,13 +3154,19 @@
> struct tcb *tcp;
> {
>     if (entering(tcp)) {
>-	long int cmd = tcp->u_arg[1] & ~FUTEX_PRIVATE_FLAG;
>+	long int cmd = tcp->u_arg[1] & 127;
> 	tprintf("%p, ", (void *) tcp->u_arg[0]);
> 	printxval(futexops, tcp->u_arg[1], "FUTEX_???");
> 	tprintf(", %ld", tcp->u_arg[2]);
>-	if (cmd == FUTEX_WAIT) {
>+	if (cmd == FUTEX_WAKE_BITSET)
>+		tprintf(", %lx", tcp->u_arg[5]);
>+	else if (cmd == FUTEX_WAIT) {
>+		tprintf(", ");
>+		printtv(tcp, tcp->u_arg[3]);
>+	} else if (cmd == FUTEX_WAIT_BITSET) {
> 		tprintf(", ");
> 		printtv(tcp, tcp->u_arg[3]);
>+		tprintf(", %lx", tcp->u_arg[5]);
> 	} else if (cmd == FUTEX_REQUEUE)
> 		tprintf(", %ld, %p", tcp->u_arg[3], (void *) tcp->u_arg[4]);
> 	else if (cmd == FUTEX_CMP_REQUEUE)
>@@ -3170,7 +3181,9 @@
> 			tprintf("FUTEX_OP_OPARG_SHIFT|");
> 		printxval(futexwakecmps, (tcp->u_arg[5] >> 24) & 0x7, "FUTEX_OP_CMP_???");
> 		tprintf(", %ld}", tcp->u_arg[5] & 0xfff);
>-	}
>+	} else
>+		tprintf(", %p, %p, %lx", (void *) tcp->u_arg[3], (void *) tcp->u_arg[4],
>+			tcp->u_arg[5]);
>     }
>     return 0;
> }

Actions: View | Diff

Attachments on bug 448628: 306847 | 306851