netlink_sock_diag: print inet_diag_sockid.idiag_if as an interface index

[strace] / futex.c

diff --git a/futex.c b/futex.c
index d909d5ecc2662ebba91721d40f4c569373999a23..16ccddb77f598e976ccd9cc27baaf3cace7cac6b 100644 (file)
--- a/futex.c
+++ b/futex.c
@@ -3,6 +3,7 @@
  * Copyright (c) 2007-2008 Ulrich Drepper <drepper@redhat.com>
  * Copyright (c) 2009 Andreas Schwab <schwab@redhat.com>
  * Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2014-2017 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,10 +31,6 @@
 
 #include "defs.h"
 
-#ifdef HAVE_LINUX_FUTEX_H
-# include <linux/futex.h>
-#endif
-
 #ifndef FUTEX_PRIVATE_FLAG
 # define FUTEX_PRIVATE_FLAG 128
 #endif
@@ -47,66 +44,90 @@
 
 SYS_FUNC(futex)
 {
-       const long uaddr = tcp->u_arg[0];
+       const kernel_ulong_t uaddr = tcp->u_arg[0];
        const int op = tcp->u_arg[1];
        const int cmd = op & 127;
-       const long timeout = tcp->u_arg[3];
-       const long uaddr2 = tcp->u_arg[4];
+       const kernel_ulong_t timeout = tcp->u_arg[3];
+       const kernel_ulong_t uaddr2 = tcp->u_arg[4];
        const unsigned int val = tcp->u_arg[2];
        const unsigned int val2 = tcp->u_arg[3];
        const unsigned int val3 = tcp->u_arg[5];
+       const char *comment;
 
        printaddr(uaddr);
        tprints(", ");
        printxval(futexops, op, "FUTEX_???");
-       tprintf(", %u", val);
        switch (cmd) {
        case FUTEX_WAIT:
+               tprintf(", %u", val);
+               tprints(", ");
+               print_timespec(tcp, timeout);
+               break;
        case FUTEX_LOCK_PI:
                tprints(", ");
                print_timespec(tcp, timeout);
                break;
        case FUTEX_WAIT_BITSET:
+               tprintf(", %u", val);
                tprints(", ");
                print_timespec(tcp, timeout);
                tprintf(", %#x", val3);
                break;
        case FUTEX_WAKE_BITSET:
+               tprintf(", %u", val);
                tprintf(", %#x", val3);
                break;
        case FUTEX_REQUEUE:
+               tprintf(", %u", val);
                tprintf(", %u, ", val2);
                printaddr(uaddr2);
                break;
        case FUTEX_CMP_REQUEUE:
        case FUTEX_CMP_REQUEUE_PI:
+               tprintf(", %u", val);
                tprintf(", %u, ", val2);
                printaddr(uaddr2);
                tprintf(", %u", val3);
                break;
        case FUTEX_WAKE_OP:
+               tprintf(", %u", val);
                tprintf(", %u, ", val2);
                printaddr(uaddr2);
-               tprints(", {");
+               tprints(", ");
                if ((val3 >> 28) & 8)
-                       tprints("FUTEX_OP_OPARG_SHIFT|");
-               printxval(futexwakeops, (val3 >> 28) & 0x7, "FUTEX_OP_???");
-               tprintf(", %u, ", (val3 >> 12) & 0xfff);
-               printxval(futexwakecmps, (val3 >> 24) & 0xf, "FUTEX_OP_CMP_???");
-               tprintf(", %u}", val3 & 0xfff);
+                       tprints("FUTEX_OP_OPARG_SHIFT<<28|");
+               comment = printxval(futexwakeops, (val3 >> 28) & 0x7, NULL)
+                       ? NULL : "FUTEX_OP_???";
+               tprints("<<28");
+               tprints_comment(comment);
+               tprintf("|%#x<<12|", (val3 >> 12) & 0xfff);
+               comment = printxval(futexwakecmps, (val3 >> 24) & 0xf, NULL)
+                       ? NULL : "FUTEX_OP_CMP_???";
+               tprints("<<24");
+               tprints_comment(comment);
+               tprintf("|%#x", val3 & 0xfff);
                break;
        case FUTEX_WAIT_REQUEUE_PI:
+               tprintf(", %u", val);
                tprints(", ");
                print_timespec(tcp, timeout);
                tprints(", ");
                printaddr(uaddr2);
                break;
+       case FUTEX_FD:
        case FUTEX_WAKE:
+               tprintf(", %u", val);
+               break;
        case FUTEX_UNLOCK_PI:
        case FUTEX_TRYLOCK_PI:
                break;
        default:
-               tprintf(", %lx, %lx, %x", timeout, uaddr2, val3);
+               tprintf(", %u", val);
+               tprints(", ");
+               printaddr(timeout);
+               tprints(", ");
+               printaddr(uaddr2);
+               tprintf(", %#x", val3);
                break;
        }