]> granicus.if.org Git - strace/blobdiff - desc.c
Filter out redundant ioctl entries early
[strace] / desc.c
diff --git a/desc.c b/desc.c
index 39572269f683440ac74e7793a3d5c5bdef70d319..491e9ba96b8cb24e801d88708373668d380ef1dc 100644 (file)
--- a/desc.c
+++ b/desc.c
 #ifdef HAVE_SYS_EPOLL_H
 # include <sys/epoll.h>
 #endif
-#ifdef HAVE_LIBAIO_H
-# include <libaio.h>
-#endif
 #ifdef HAVE_LINUX_PERF_EVENT_H
 # include  <linux/perf_event.h>
 #endif
 
-static const struct xlat fcntlcmds[] = {
-       { F_DUPFD,      "F_DUPFD"       },
-       { F_GETFD,      "F_GETFD"       },
-       { F_SETFD,      "F_SETFD"       },
-       { F_GETFL,      "F_GETFL"       },
-       { F_SETFL,      "F_SETFL"       },
-       { F_GETLK,      "F_GETLK"       },
-       { F_SETLK,      "F_SETLK"       },
-       { F_SETLKW,     "F_SETLKW"      },
-       { F_GETOWN,     "F_GETOWN"      },
-       { F_SETOWN,     "F_SETOWN"      },
-#ifdef F_RSETLK
-       { F_RSETLK,     "F_RSETLK"      },
-#endif
-#ifdef F_RSETLKW
-       { F_RSETLKW,    "F_RSETLKW"     },
-#endif
-#ifdef F_RGETLK
-       { F_RGETLK,     "F_RGETLK"      },
-#endif
-#ifdef F_CNVT
-       { F_CNVT,       "F_CNVT"        },
-#endif
-#ifdef F_SETSIG
-       { F_SETSIG,     "F_SETSIG"      },
-#endif
-#ifdef F_GETSIG
-       { F_GETSIG,     "F_GETSIG"      },
-#endif
-#ifdef F_CHKFL
-       { F_CHKFL,      "F_CHKFL"       },
-#endif
-#ifdef F_DUP2FD
-       { F_DUP2FD,     "F_DUP2FD"      },
-#endif
-#ifdef F_ALLOCSP
-       { F_ALLOCSP,    "F_ALLOCSP"     },
-#endif
-#ifdef F_ISSTREAM
-       { F_ISSTREAM,   "F_ISSTREAM"    },
-#endif
-#ifdef F_PRIV
-       { F_PRIV,       "F_PRIV"        },
-#endif
-#ifdef F_NPRIV
-       { F_NPRIV,      "F_NPRIV"       },
-#endif
-#ifdef F_QUOTACL
-       { F_QUOTACL,    "F_QUOTACL"     },
-#endif
-#ifdef F_BLOCKS
-       { F_BLOCKS,     "F_BLOCKS"      },
-#endif
-#ifdef F_BLKSIZE
-       { F_BLKSIZE,    "F_BLKSIZE"     },
-#endif
-#ifdef F_GETOWN
-       { F_GETOWN,     "F_GETOWN"      },
-#endif
-#ifdef F_SETOWN
-       { F_SETOWN,     "F_SETOWN"      },
-#endif
-#ifdef F_REVOKE
-       { F_REVOKE,     "F_REVOKE"      },
-#endif
-#ifdef F_SETLK
-       { F_SETLK,      "F_SETLK"       },
-#endif
-#ifdef F_SETLKW
-       { F_SETLKW,     "F_SETLKW"      },
-#endif
-#ifdef F_FREESP
-       { F_FREESP,     "F_FREESP"      },
-#endif
-#ifdef F_GETLK
-       { F_GETLK,      "F_GETLK"       },
-#endif
-#ifdef F_SETLK64
-       { F_SETLK64,    "F_SETLK64"     },
-#endif
-#ifdef F_SETLKW64
-       { F_SETLKW64,   "F_SETLKW64"    },
-#endif
-#ifdef F_FREESP64
-       { F_FREESP64,   "F_FREESP64"    },
-#endif
-#ifdef F_GETLK64
-       { F_GETLK64,    "F_GETLK64"     },
-#endif
-#ifdef F_SHARE
-       { F_SHARE,      "F_SHARE"       },
-#endif
-#ifdef F_UNSHARE
-       { F_UNSHARE,    "F_UNSHARE"     },
-#endif
-#ifdef F_SETLEASE
-       { F_SETLEASE,   "F_SETLEASE"    },
-#endif
-#ifdef F_GETLEASE
-       { F_GETLEASE,   "F_GETLEASE"    },
-#endif
-#ifdef F_NOTIFY
-       { F_NOTIFY,     "F_NOTIFY"      },
-#endif
-#ifdef F_DUPFD_CLOEXEC
-       { F_DUPFD_CLOEXEC,"F_DUPFD_CLOEXEC"},
-#endif
-       { 0,            NULL            },
-};
+#include "xlat/fcntlcmds.h"
+#include "xlat/fdflags.h"
+#include "xlat/flockcmds.h"
+#include "xlat/lockfcmds.h"
+#include "xlat/notifyflags.h"
+#include "xlat/perf_event_open_flags.h"
 
-static const struct xlat fdflags[] = {
-#ifdef FD_CLOEXEC
-       { FD_CLOEXEC,   "FD_CLOEXEC"    },
+/*
+ * Assume that F_SETLK64, F_SETLKW64, and F_GETLK64 are either defined
+ * or not defined altogether.
+ */
+#if defined(F_SETLK64) && F_SETLK64 + 0 != F_SETLK
+# define USE_PRINTFLOCK64 1
+#else
+# define USE_PRINTFLOCK64 0
 #endif
-       { 0,            NULL            },
-};
 
-#ifdef LOCK_SH
+#if USE_PRINTFLOCK64
 
-static const struct xlat flockcmds[] = {
-       { LOCK_SH,      "LOCK_SH"       },
-       { LOCK_EX,      "LOCK_EX"       },
-       { LOCK_NB,      "LOCK_NB"       },
-       { LOCK_UN,      "LOCK_UN"       },
-       { 0,            NULL            },
-};
-
-#endif /* LOCK_SH */
-
-static const struct xlat lockfcmds[] = {
-       { F_RDLCK,      "F_RDLCK"       },
-       { F_WRLCK,      "F_WRLCK"       },
-       { F_UNLCK,      "F_UNLCK"       },
-#ifdef F_EXLCK
-       { F_EXLCK,      "F_EXLCK"       },
-#endif
-#ifdef F_SHLCK
-       { F_SHLCK,      "F_SHLCK"       },
-#endif
-       { 0,            NULL            },
-};
-
-#ifdef F_NOTIFY
-static const struct xlat notifyflags[] = {
-#ifdef DN_ACCESS
-       { DN_ACCESS,    "DN_ACCESS"     },
-#endif
-#ifdef DN_MODIFY
-       { DN_MODIFY,    "DN_MODIFY"     },
-#endif
-#ifdef DN_CREATE
-       { DN_CREATE,    "DN_CREATE"     },
-#endif
-#ifdef DN_DELETE
-       { DN_DELETE,    "DN_DELETE"     },
-#endif
-#ifdef DN_RENAME
-       { DN_RENAME,    "DN_RENAME"     },
-#endif
-#ifdef DN_ATTRIB
-       { DN_ATTRIB,    "DN_ATTRIB"     },
-#endif
-#ifdef DN_MULTISHOT
-       { DN_MULTISHOT, "DN_MULTISHOT"  },
-#endif
-       { 0,            NULL            },
-};
-#endif
-
-static const struct xlat perf_event_open_flags[] = {
-#ifdef PERF_FLAG_FD_NO_GROUP
-       { PERF_FLAG_FD_NO_GROUP,        "PERF_FLAG_FD_NO_GROUP" },
-#endif
-#ifdef PERF_FLAG_FD_OUTPUT
-       { PERF_FLAG_FD_OUTPUT,          "PERF_FLAG_FD_OUTPUT"   },
-#endif
-#ifdef PERF_FLAG_PID_CGROUP
-       { PERF_FLAG_PID_CGROUP,         "PERF_FLAG_PID_CGROUP"  },
-#endif
-       { 0,                            NULL                    },
+# ifndef HAVE_STRUCT_FLOCK64
+struct flock64 {
+       short int l_type, l_whence;
+       int64_t l_start, l_len;
+       int l_pid;
 };
+# endif
 
-#if _LFS64_LARGEFILE
-/* fcntl/lockf */
 static void
 printflock64(struct tcb *tcp, long addr, int getlk)
 {
@@ -244,22 +84,20 @@ printflock64(struct tcb *tcp, long addr, int getlk)
        else
                tprints("}");
 }
-#endif
+#endif /* USE_PRINTFLOCK64 */
 
-/* fcntl/lockf */
 static void
 printflock(struct tcb *tcp, long addr, int getlk)
 {
        struct flock fl;
+       int r;
 
 #if SUPPORTED_PERSONALITIES > 1
-# ifdef X32
-       if (current_personality == 0) {
-               printflock64(tcp, addr, getlk);
-               return;
-       }
-# endif
-       if (current_wordsize != sizeof(fl.l_start)) {
+       if (
+# if SIZEOF_OFF_T > SIZEOF_LONG
+           current_personality > 0 &&
+#endif
+           current_wordsize != sizeof(fl.l_start)) {
                if (current_wordsize == 4) {
                        /* 32-bit x86 app on x86_64 and similar cases */
                        struct {
@@ -269,15 +107,14 @@ printflock(struct tcb *tcp, long addr, int getlk)
                                int32_t l_len; /* off_t */
                                int32_t l_pid; /* pid_t */
                        } fl32;
-                       if (umove(tcp, addr, &fl32) < 0) {
-                               tprints("{...}");
-                               return;
+                       r = umove(tcp, addr, &fl32);
+                       if (r >= 0) {
+                               fl.l_type = fl32.l_type;
+                               fl.l_whence = fl32.l_whence;
+                               fl.l_start = fl32.l_start;
+                               fl.l_len = fl32.l_len;
+                               fl.l_pid = fl32.l_pid;
                        }
-                       fl.l_type = fl32.l_type;
-                       fl.l_whence = fl32.l_whence;
-                       fl.l_start = fl32.l_start;
-                       fl.l_len = fl32.l_len;
-                       fl.l_pid = fl32.l_pid;
                } else {
                        /* let people know we have a problem here */
                        tprintf("<decode error: unsupported wordsize %d>",
@@ -287,16 +124,17 @@ printflock(struct tcb *tcp, long addr, int getlk)
        } else
 #endif
        {
-               if (umove(tcp, addr, &fl) < 0) {
-                       tprints("{...}");
-                       return;
-               }
+               r = umove(tcp, addr, &fl);
+       }
+       if (r < 0) {
+               tprints("{...}");
+               return;
        }
        tprints("{type=");
        printxval(lockfcmds, fl.l_type, "F_???");
        tprints(", whence=");
        printxval(whence_codes, fl.l_whence, "SEEK_???");
-#ifdef X32
+#if SIZEOF_OFF_T > SIZEOF_LONG
        tprintf(", start=%lld, len=%lld", fl.l_start, fl.l_len);
 #else
        tprintf(", start=%ld, len=%ld", fl.l_start, fl.l_len);
@@ -330,28 +168,15 @@ sys_fcntl(struct tcb *tcp)
                        tprint_open_modes(tcp->u_arg[2]);
                        break;
                case F_SETLK: case F_SETLKW:
-#ifdef F_FREESP
-               case F_FREESP:
-#endif
                        tprints(", ");
                        printflock(tcp, tcp->u_arg[2], 0);
                        break;
-#if _LFS64_LARGEFILE
-#ifdef F_FREESP64
-               case F_FREESP64:
-#endif
-               /* Linux glibc defines SETLK64 as SETLK,
-                  even though the kernel has different values - as does Solaris. */
-#if defined(F_SETLK64) && F_SETLK64 + 0 != F_SETLK
-               case F_SETLK64:
-#endif
-#if defined(F_SETLKW64) && F_SETLKW64 + 0 != F_SETLKW
-               case F_SETLKW64:
-#endif
+#if USE_PRINTFLOCK64
+               case F_SETLK64: case F_SETLKW64:
                        tprints(", ");
                        printflock64(tcp, tcp->u_arg[2], 0);
                        break;
-#endif
+#endif /* USE_PRINTFLOCK64 */
 #ifdef F_NOTIFY
                case F_NOTIFY:
                        tprints(", ");
@@ -396,10 +221,8 @@ sys_fcntl(struct tcb *tcp)
                        tprints(", ");
                        printflock(tcp, tcp->u_arg[2], 1);
                        break;
-#if _LFS64_LARGEFILE
-#if defined(F_GETLK64) && F_GETLK64+0 != F_GETLK
+#if USE_PRINTFLOCK64
                case F_GETLK64:
-#endif
                        tprints(", ");
                        printflock64(tcp, tcp->u_arg[2], 1);
                        break;
@@ -442,6 +265,15 @@ sys_close(struct tcb *tcp)
        return 0;
 }
 
+int
+sys_dup(struct tcb *tcp)
+{
+       if (entering(tcp)) {
+               printfd(tcp, tcp->u_arg[0]);
+       }
+       return RVAL_FD;
+}
+
 static int
 do_dup2(struct tcb *tcp, int flags_arg)
 {
@@ -454,7 +286,7 @@ do_dup2(struct tcb *tcp, int flags_arg)
                        printflags(open_mode_flags, tcp->u_arg[flags_arg], "O_???");
                }
        }
-       return 0;
+       return RVAL_FD;
 }
 
 int
@@ -477,28 +309,12 @@ sys_getdtablesize(struct tcb *tcp)
 }
 #endif
 
-/* FD_ISSET from libc would abort for large fd if built with
- * debug flags/library hacks which enforce array bound checks
- * (fd_set contains a fixed-size array of longs).
- * We need to use a homegrown replacement.
- */
-static inline int
-fd_isset(unsigned fd, fd_set *fds)
-{
-       /* Using unsigned types to avoid signed divisions and shifts,
-        * which are slow(er) on many CPUs.
-        */
-       const unsigned bpl = 8 * sizeof(long);
-       unsigned long *s = (unsigned long *) fds;
-       return s[fd / bpl] & (1UL << (fd % bpl));
-}
-
 static int
 decode_select(struct tcb *tcp, long *args, enum bitness_t bitness)
 {
        int i, j;
        int nfds, fdsize;
-       fd_set *fds;
+       fd_set *fds = NULL;
        const char *sep;
        long arg;
 
@@ -506,10 +322,9 @@ decode_select(struct tcb *tcp, long *args, enum bitness_t bitness)
        nfds = (int) args[0];
 
        /* Kernel rejects negative nfds, so we don't parse it either. */
-       if (nfds < 0) {
+       if (nfds < 0)
                nfds = 0;
-               fds = NULL;
-       }
+
        /* Beware of select(2^31-1, NULL, NULL, NULL) and similar... */
        if (nfds > 1024*1024)
                nfds = 1024*1024;
@@ -518,7 +333,7 @@ decode_select(struct tcb *tcp, long *args, enum bitness_t bitness)
         * We had bugs a-la "while (j < args[0])" and "umoven(args[0])" below.
         * Instead of args[0], use nfds for fd count, fdsize for array lengths.
         */
-       fdsize = (((nfds + 7) / 8) + sizeof(long)-1) & -sizeof(long);
+       fdsize = (((nfds + 7) / 8) + current_wordsize-1) & -current_wordsize;
 
        if (entering(tcp)) {
                tprintf("%d", (int) args[0]);
@@ -543,12 +358,13 @@ decode_select(struct tcb *tcp, long *args, enum bitness_t bitness)
                                continue;
                        }
                        tprints(", [");
-                       for (j = 0, sep = ""; j < nfds; j++) {
-                               if (fd_isset(j, fds)) {
-                                       tprints(sep);
-                                       printfd(tcp, j);
-                                       sep = " ";
-                               }
+                       for (j = 0, sep = "";; j++) {
+                               j = next_set_bit(fds, j, nfds);
+                               if (j < 0)
+                                       break;
+                               tprints(sep);
+                               printfd(tcp, j);
+                               sep = " ";
                        }
                        tprints("]");
                }
@@ -583,26 +399,27 @@ decode_select(struct tcb *tcp, long *args, enum bitness_t bitness)
                        arg = args[i+1];
                        if (!arg || umoven(tcp, arg, fdsize, (char *) fds) < 0)
                                continue;
-                       for (j = 0; j < nfds; j++) {
-                               if (fd_isset(j, fds)) {
-                                       /* +2 chars needed at the end: ']',NUL */
-                                       if (outptr < end_outstr - (sizeof(", except [") + sizeof(int)*3 + 2)) {
-                                               if (first) {
-                                                       outptr += sprintf(outptr, "%s%s [%u",
-                                                               sep,
-                                                               i == 0 ? "in" : i == 1 ? "out" : "except",
-                                                               j
-                                                       );
-                                                       first = 0;
-                                                       sep = ", ";
-                                               }
-                                               else {
-                                                       outptr += sprintf(outptr, " %u", j);
-                                               }
+                       for (j = 0;; j++) {
+                               j = next_set_bit(fds, j, nfds);
+                               if (j < 0)
+                                       break;
+                               /* +2 chars needed at the end: ']',NUL */
+                               if (outptr < end_outstr - (sizeof(", except [") + sizeof(int)*3 + 2)) {
+                                       if (first) {
+                                               outptr += sprintf(outptr, "%s%s [%u",
+                                                       sep,
+                                                       i == 0 ? "in" : i == 1 ? "out" : "except",
+                                                       j
+                                               );
+                                               first = 0;
+                                               sep = ", ";
+                                       }
+                                       else {
+                                               outptr += sprintf(outptr, " %u", j);
                                        }
-                                       if (--ready_fds == 0)
-                                               break;
                                }
+                               if (--ready_fds == 0)
+                                       break;
                        }
                        if (outptr != outstr)
                                *outptr++ = ']';
@@ -644,61 +461,9 @@ sys_osf_select(struct tcb *tcp)
 }
 #endif
 
-static const struct xlat epollctls[] = {
-#ifdef EPOLL_CTL_ADD
-       { EPOLL_CTL_ADD,        "EPOLL_CTL_ADD" },
-#endif
-#ifdef EPOLL_CTL_MOD
-       { EPOLL_CTL_MOD,        "EPOLL_CTL_MOD" },
-#endif
-#ifdef EPOLL_CTL_DEL
-       { EPOLL_CTL_DEL,        "EPOLL_CTL_DEL" },
-#endif
-       { 0,                    NULL            }
-};
-
-static const struct xlat epollevents[] = {
-#ifdef EPOLLIN
-       { EPOLLIN,      "EPOLLIN"       },
-#endif
-#ifdef EPOLLPRI
-       { EPOLLPRI,     "EPOLLPRI"      },
-#endif
-#ifdef EPOLLOUT
-       { EPOLLOUT,     "EPOLLOUT"      },
-#endif
-#ifdef EPOLLRDNORM
-       { EPOLLRDNORM,  "EPOLLRDNORM"   },
-#endif
-#ifdef EPOLLRDBAND
-       { EPOLLRDBAND,  "EPOLLRDBAND"   },
-#endif
-#ifdef EPOLLWRNORM
-       { EPOLLWRNORM,  "EPOLLWRNORM"   },
-#endif
-#ifdef EPOLLWRBAND
-       { EPOLLWRBAND,  "EPOLLWRBAND"   },
-#endif
-#ifdef EPOLLMSG
-       { EPOLLMSG,     "EPOLLMSG"      },
-#endif
-#ifdef EPOLLERR
-       { EPOLLERR,     "EPOLLERR"      },
-#endif
-#ifdef EPOLLHUP
-       { EPOLLHUP,     "EPOLLHUP"      },
-#endif
-#ifdef EPOLLRDHUP
-       { EPOLLRDHUP,   "EPOLLRDHUP"    },
-#endif
-#ifdef EPOLLONESHOT
-       { EPOLLONESHOT, "EPOLLONESHOT"  },
-#endif
-#ifdef EPOLLET
-       { EPOLLET,      "EPOLLET"       },
-#endif
-       { 0,            NULL            }
-};
+#include "xlat/epollctls.h"
+#include "xlat/epollevents.h"
+#include "xlat/epollflags.h"
 
 /* Not aliased to printargs_ld: we want it to have a distinct address */
 int
@@ -707,16 +472,6 @@ sys_epoll_create(struct tcb *tcp)
        return printargs_ld(tcp);
 }
 
-static const struct xlat epollflags[] = {
-#ifdef EPOLL_CLOEXEC
-       { EPOLL_CLOEXEC,        "EPOLL_CLOEXEC" },
-#endif
-#ifdef EPOLL_NONBLOCK
-       { EPOLL_NONBLOCK,       "EPOLL_NONBLOCK"        },
-#endif
-       { 0,            NULL            }
-};
-
 int
 sys_epoll_create1(struct tcb *tcp)
 {
@@ -753,11 +508,15 @@ sys_epoll_ctl(struct tcb *tcp)
                else {
 #ifdef HAVE_SYS_EPOLL_H
                        struct epoll_event ev;
-                       if (umove(tcp, tcp->u_arg[3], &ev) == 0)
+                       if (
+#ifdef EPOLL_CTL_DEL
+                           (tcp->u_arg[1] != EPOLL_CTL_DEL) &&
+#endif
+                           umove(tcp, tcp->u_arg[3], &ev) == 0)
                                print_epoll_event(&ev);
                        else
 #endif
-                               tprints("{...}");
+                               tprintf("%lx", tcp->u_arg[3]);
                }
        }
        return 0;
@@ -824,246 +583,6 @@ sys_epoll_pwait(struct tcb *tcp)
        return 0;
 }
 
-int
-sys_io_setup(struct tcb *tcp)
-{
-       if (entering(tcp))
-               tprintf("%ld, ", tcp->u_arg[0]);
-       else {
-               if (syserror(tcp))
-                       tprintf("0x%0lx", tcp->u_arg[1]);
-               else {
-                       unsigned long user_id;
-                       if (umove(tcp, tcp->u_arg[1], &user_id) == 0)
-                               tprintf("{%lu}", user_id);
-                       else
-                               tprints("{...}");
-               }
-       }
-       return 0;
-}
-
-int
-sys_io_destroy(struct tcb *tcp)
-{
-       if (entering(tcp))
-               tprintf("%lu", tcp->u_arg[0]);
-       return 0;
-}
-
-#ifdef HAVE_LIBAIO_H
-
-enum iocb_sub {
-       SUB_NONE, SUB_COMMON, SUB_POLL, SUB_VECTOR
-};
-
-static const char *
-iocb_cmd_lookup(unsigned cmd, enum iocb_sub *sub)
-{
-       static char buf[sizeof("%u /* SUB_??? */") + sizeof(int)*3];
-       static const struct {
-               const char *name;
-               enum iocb_sub sub;
-       } cmds[] = {
-               { "pread", SUB_COMMON },
-               { "pwrite", SUB_COMMON },
-               { "fsync", SUB_NONE },
-               { "fdsync", SUB_NONE },
-               { "op4", SUB_NONE },
-               { "poll", SUB_POLL },
-               { "noop", SUB_NONE },
-               { "preadv", SUB_VECTOR },
-               { "pwritev", SUB_VECTOR },
-       };
-
-       if (cmd < ARRAY_SIZE(cmds)) {
-               *sub = cmds[cmd].sub;
-               return cmds[cmd].name;
-       }
-       *sub = SUB_NONE;
-       sprintf(buf, "%u /* SUB_??? */", cmd);
-       return buf;
-}
-
-/* Not defined in libaio.h */
-#ifndef IOCB_RESFD
-# define IOCB_RESFD (1 << 0)
-#endif
-
-static void
-print_common_flags(struct iocb *iocb)
-{
-#if HAVE_STRUCT_IOCB_U_C_FLAGS
-       if (iocb->u.c.flags & IOCB_RESFD)
-               tprintf(", resfd=%d", iocb->u.c.resfd);
-       if (iocb->u.c.flags & ~IOCB_RESFD)
-               tprintf(", flags=%x", iocb->u.c.flags);
-#else
-# warning "libaio.h is too old => limited io_submit decoding"
-#endif
-}
-
-#endif /* HAVE_LIBAIO_H */
-
-int
-sys_io_submit(struct tcb *tcp)
-{
-       long nr;
-       if (entering(tcp)) {
-               tprintf("%lu, %ld, ", tcp->u_arg[0], tcp->u_arg[1]);
-               nr = tcp->u_arg[1];
-               /* and if nr is negative? */
-               if (nr == 0)
-                       tprints("{}");
-               else {
-#ifdef HAVE_LIBAIO_H
-                       long i;
-                       struct iocb *iocbp, **iocbs = (void *)tcp->u_arg[2];
-
-                       for (i = 0; i < nr; i++, iocbs++) {
-                               enum iocb_sub sub;
-                               struct iocb iocb;
-                               if (i == 0)
-                                       tprints("{");
-                               else
-                                       tprints(", ");
-
-                               if (umove(tcp, (unsigned long)iocbs, &iocbp) ||
-                                   umove(tcp, (unsigned long)iocbp, &iocb)) {
-                                       tprints("{...}");
-                                       continue;
-                               }
-                               tprints("{");
-                               if (iocb.data)
-                                       tprintf("data:%p, ", iocb.data);
-                               if (iocb.key)
-                                       tprintf("key:%u, ", iocb.key);
-                               tprintf("%s, ", iocb_cmd_lookup(iocb.aio_lio_opcode, &sub));
-                               if (iocb.aio_reqprio)
-                                       tprintf("reqprio:%d, ", iocb.aio_reqprio);
-                               tprintf("filedes:%d", iocb.aio_fildes);
-                               switch (sub) {
-                               case SUB_COMMON:
-#if HAVE_DECL_IO_CMD_PWRITE
-                                       if (iocb.aio_lio_opcode == IO_CMD_PWRITE) {
-                                               tprints(", str:");
-                                               printstr(tcp, (unsigned long)iocb.u.c.buf,
-                                                        iocb.u.c.nbytes);
-                                       } else
-#endif
-                                               tprintf(", buf:%p", iocb.u.c.buf);
-                                       tprintf(", nbytes:%lu, offset:%lld",
-                                               iocb.u.c.nbytes,
-                                               iocb.u.c.offset);
-                                       print_common_flags(&iocb);
-                                       break;
-                               case SUB_VECTOR:
-                                       tprintf(", %lld", iocb.u.v.offset);
-                                       print_common_flags(&iocb);
-                                       tprints(", ");
-                                       tprint_iov(tcp, iocb.u.v.nr,
-                                                  (unsigned long)iocb.u.v.vec,
-#if HAVE_DECL_IO_CMD_PWRITEV
-                                                  iocb.aio_lio_opcode == IO_CMD_PWRITEV
-#else
-                                                  0
-#endif
-                                                 );
-                                       break;
-                               case SUB_POLL:
-                                       tprintf(", %x", iocb.u.poll.events);
-                                       break;
-                               case SUB_NONE:
-                                       break;
-                               }
-                               tprints("}");
-                       }
-                       if (i)
-                               tprints("}");
-#else
-#warning "libaio.h is not available => no io_submit decoding"
-                       tprintf("%#lx", tcp->u_arg[2]);
-#endif
-               }
-       }
-       return 0;
-}
-
-int
-sys_io_cancel(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-#ifdef HAVE_LIBAIO_H
-               struct iocb iocb;
-#endif
-               tprintf("%lu, ", tcp->u_arg[0]);
-#ifdef HAVE_LIBAIO_H
-               if (umove(tcp, tcp->u_arg[1], &iocb) == 0) {
-                       tprintf("{%p, %u, %u, %u, %d}, ",
-                               iocb.data, iocb.key,
-                               (unsigned)iocb.aio_lio_opcode,
-                               (unsigned)iocb.aio_reqprio, iocb.aio_fildes);
-               } else
-#endif
-                       tprints("{...}, ");
-       } else {
-               if (tcp->u_rval < 0)
-                       tprints("{...}");
-               else {
-#ifdef HAVE_LIBAIO_H
-                       struct io_event event;
-                       if (umove(tcp, tcp->u_arg[2], &event) == 0)
-                               tprintf("{%p, %p, %ld, %ld}",
-                                       event.data, event.obj,
-                                       event.res, event.res2);
-                       else
-#endif
-                               tprints("{...}");
-               }
-       }
-       return 0;
-}
-
-int
-sys_io_getevents(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               tprintf("%ld, %ld, %ld, ", tcp->u_arg[0], tcp->u_arg[1],
-                       tcp->u_arg[2]);
-       } else {
-               if (tcp->u_rval == 0) {
-                       tprints("{}");
-               } else {
-#ifdef HAVE_LIBAIO_H
-                       struct io_event *events = (void *)tcp->u_arg[3];
-                       long i, nr = tcp->u_rval;
-
-                       for (i = 0; i < nr; i++, events++) {
-                               struct io_event event;
-
-                               if (i == 0)
-                                       tprints("{");
-                               else
-                                       tprints(", ");
-
-                               if (umove(tcp, (unsigned long)events, &event) != 0) {
-                                       tprints("{...}");
-                                       continue;
-                               }
-                               tprintf("{%p, %p, %ld, %ld}", event.data,
-                                       event.obj, event.res, event.res2);
-                       }
-                       tprints("}, ");
-#else
-                       tprints("{...}");
-#endif
-               }
-
-               print_timespec(tcp, tcp->u_arg[4]);
-       }
-       return 0;
-}
-
 int
 sys_select(struct tcb *tcp)
 {