summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry V. Levin <ldv@altlinux.org>2014-02-05 02:01:16 +0000
committerDmitry V. Levin <ldv@altlinux.org>2014-02-05 02:28:00 +0000
commit9f56d87cc42eec3226477bdf26bfb094bc66f66a (patch)
tree54d7b15c4665e12eb367ddf63644b5dd93c3513e
parentbae549e91b1bf0d2261d1137c7f2bf08180ad9e6 (diff)
downloadstrace-9f56d87cc42eec3226477bdf26bfb094bc66f66a.tar.gz
strace-9f56d87cc42eec3226477bdf26bfb094bc66f66a.tar.bz2
strace-9f56d87cc42eec3226477bdf26bfb094bc66f66a.tar.xz
Convert futexops to XLAT form
* process.c: Define FUTEX_*_PRIVATE macros. (futexops): Convert to XLAT form.
-rw-r--r--process.c66
1 files changed, 51 insertions, 15 deletions
diff --git a/process.c b/process.c
index 883f5b8..afa7118 100644
--- a/process.c
+++ b/process.c
@@ -2651,6 +2651,42 @@ sys_ptrace(struct tcb *tcp)
#ifndef FUTEX_CLOCK_REALTIME
# define FUTEX_CLOCK_REALTIME 256
#endif
+#ifndef FUTEX_WAIT_PRIVATE
+# define FUTEX_WAIT_PRIVATE (FUTEX_WAIT | FUTEX_PRIVATE_FLAG)
+#endif
+#ifndef FUTEX_WAKE_PRIVATE
+# define FUTEX_WAKE_PRIVATE (FUTEX_WAKE | FUTEX_PRIVATE_FLAG)
+#endif
+#ifndef FUTEX_REQUEUE_PRIVATE
+# define FUTEX_REQUEUE_PRIVATE (FUTEX_REQUEUE | FUTEX_PRIVATE_FLAG)
+#endif
+#ifndef FUTEX_CMP_REQUEUE_PRIVATE
+# define FUTEX_CMP_REQUEUE_PRIVATE (FUTEX_CMP_REQUEUE | FUTEX_PRIVATE_FLAG)
+#endif
+#ifndef FUTEX_WAKE_OP_PRIVATE
+# define FUTEX_WAKE_OP_PRIVATE (FUTEX_WAKE_OP | FUTEX_PRIVATE_FLAG)
+#endif
+#ifndef FUTEX_LOCK_PI_PRIVATE
+# define FUTEX_LOCK_PI_PRIVATE (FUTEX_LOCK_PI | FUTEX_PRIVATE_FLAG)
+#endif
+#ifndef FUTEX_UNLOCK_PI_PRIVATE
+# define FUTEX_UNLOCK_PI_PRIVATE (FUTEX_UNLOCK_PI | FUTEX_PRIVATE_FLAG)
+#endif
+#ifndef FUTEX_TRYLOCK_PI_PRIVATE
+# define FUTEX_TRYLOCK_PI_PRIVATE (FUTEX_TRYLOCK_PI | FUTEX_PRIVATE_FLAG)
+#endif
+#ifndef FUTEX_WAIT_BITSET_PRIVATE
+# define FUTEX_WAIT_BITSET_PRIVATE (FUTEX_WAIT_BITSET | FUTEX_PRIVATE_FLAG)
+#endif
+#ifndef FUTEX_WAKE_BITSET_PRIVATE
+# define FUTEX_WAKE_BITSET_PRIVATE (FUTEX_WAKE_BITSET | FUTEX_PRIVATE_FLAG)
+#endif
+#ifndef FUTEX_WAIT_REQUEUE_PI_PRIVATE
+# define FUTEX_WAIT_REQUEUE_PI_PRIVATE (FUTEX_WAIT_REQUEUE_PI | FUTEX_PRIVATE_FLAG)
+#endif
+#ifndef FUTEX_CMP_REQUEUE_PI_PRIVATE
+# define FUTEX_CMP_REQUEUE_PI_PRIVATE (FUTEX_CMP_REQUEUE_PI | FUTEX_PRIVATE_FLAG)
+#endif
static const struct xlat futexops[] = {
XLAT(FUTEX_WAIT),
XLAT(FUTEX_WAKE),
@@ -2665,23 +2701,23 @@ static const struct xlat futexops[] = {
XLAT(FUTEX_WAKE_BITSET),
XLAT(FUTEX_WAIT_REQUEUE_PI),
XLAT(FUTEX_CMP_REQUEUE_PI),
- { FUTEX_WAIT|FUTEX_PRIVATE_FLAG, "FUTEX_WAIT_PRIVATE" },
- { FUTEX_WAKE|FUTEX_PRIVATE_FLAG, "FUTEX_WAKE_PRIVATE" },
- { FUTEX_FD|FUTEX_PRIVATE_FLAG, "FUTEX_FD_PRIVATE" },
- { FUTEX_REQUEUE|FUTEX_PRIVATE_FLAG, "FUTEX_REQUEUE_PRIVATE" },
- { FUTEX_CMP_REQUEUE|FUTEX_PRIVATE_FLAG, "FUTEX_CMP_REQUEUE_PRIVATE" },
- { FUTEX_WAKE_OP|FUTEX_PRIVATE_FLAG, "FUTEX_WAKE_OP_PRIVATE" },
- { 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_WAIT_BITSET|FUTEX_PRIVATE_FLAG, "FUTEX_WAIT_BITSET_PRIVATE" },
- { FUTEX_WAKE_BITSET|FUTEX_PRIVATE_FLAG, "FUTEX_WAKE_BITSET_PRIVATE" },
- { FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG, "FUTEX_WAIT_REQUEUE_PI_PRIVATE" },
- { FUTEX_CMP_REQUEUE_PI|FUTEX_PRIVATE_FLAG, "FUTEX_CMP_REQUEUE_PI_PRIVATE" },
+ XLAT(FUTEX_WAIT_PRIVATE),
+ XLAT(FUTEX_WAKE_PRIVATE),
+ XLAT(FUTEX_FD|FUTEX_PRIVATE_FLAG),
+ XLAT(FUTEX_REQUEUE_PRIVATE),
+ XLAT(FUTEX_CMP_REQUEUE_PRIVATE),
+ XLAT(FUTEX_WAKE_OP_PRIVATE),
+ XLAT(FUTEX_LOCK_PI_PRIVATE),
+ XLAT(FUTEX_UNLOCK_PI_PRIVATE),
+ XLAT(FUTEX_TRYLOCK_PI_PRIVATE),
+ XLAT(FUTEX_WAIT_BITSET_PRIVATE),
+ XLAT(FUTEX_WAKE_BITSET_PRIVATE),
+ XLAT(FUTEX_WAIT_REQUEUE_PI_PRIVATE),
+ XLAT(FUTEX_CMP_REQUEUE_PI_PRIVATE),
XLAT(FUTEX_WAIT_BITSET|FUTEX_CLOCK_REALTIME),
- { FUTEX_WAIT_BITSET|FUTEX_PRIVATE_FLAG|FUTEX_CLOCK_REALTIME, "FUTEX_WAIT_BITSET_PRIVATE|FUTEX_CLOCK_REALTIME" },
+ XLAT(FUTEX_WAIT_BITSET_PRIVATE|FUTEX_CLOCK_REALTIME),
XLAT(FUTEX_WAIT_REQUEUE_PI|FUTEX_CLOCK_REALTIME),
- { FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG|FUTEX_CLOCK_REALTIME, "FUTEX_WAIT_REQUEUE_PI_PRIVATE|FUTEX_CLOCK_REALTIME" },
+ XLAT(FUTEX_WAIT_REQUEUE_PI_PRIVATE|FUTEX_CLOCK_REALTIME),
{ 0, NULL }
};
#ifndef FUTEX_OP_SET