Remove XLAT_END

[strace] / kcmp.c

diff --git a/kcmp.c b/kcmp.c
index 8b5bd708be449567f5078fca97f0bbe657507644..6722d77429fe68833de39a90587d14f380562460 100644 (file)
--- a/kcmp.c
+++ b/kcmp.c
@@ -1,48 +1,75 @@
 /*
  * Copyright (c) 2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2015-2018 The strace developers.
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
 #include "defs.h"
+#include "print_fields.h"
 #include "xlat/kcmp_types.h"
 
+struct strace_kcmp_epoll_slot {
+       uint32_t efd;
+       uint32_t tfd;
+       uint32_t toff;
+};
+
+static void
+printpidfd(struct tcb *tcp, pid_t pid, int fd)
+{
+       /*
+        * XXX We want to use printfd here, but we should figure out which
+        *     process in strace's PID NS is referred to first.
+        */
+       tprintf("%d", fd);
+}
+
+#define PRINT_FIELD_PIDFD(prefix_, where_, field_, tcp_, pid_)         \
+       do {                                                            \
+               STRACE_PRINTF("%s%s=", (prefix_), #field_);             \
+               printpidfd((tcp_), (pid_), (where_).field_);            \
+       } while (0)
+
 SYS_FUNC(kcmp)
 {
        pid_t pid1 = tcp->u_arg[0];
        pid_t pid2 = tcp->u_arg[1];
        int type = tcp->u_arg[2];
-       kernel_ulong_t idx1 = getarg_klu(tcp, 3);
-       kernel_ulong_t idx2 = getarg_klu(tcp, 4);
+       kernel_ulong_t idx1 = tcp->u_arg[3];
+       kernel_ulong_t idx2 = tcp->u_arg[4];
 
        tprintf("%d, %d, ", pid1, pid2);
        printxval(kcmp_types, type, "KCMP_???");
 
-       switch(type) {
+       switch (type) {
                case KCMP_FILE:
-                       tprintf(", %u, %u", (unsigned) idx1, (unsigned) idx2);
+                       tprints(", ");
+                       printpidfd(tcp, pid1, idx1);
+                       tprints(", ");
+                       printpidfd(tcp, pid1, idx2);
+
                        break;
+
+               case KCMP_EPOLL_TFD: {
+                       struct strace_kcmp_epoll_slot slot;
+
+                       tprints(", ");
+                       printpidfd(tcp, pid1, idx1);
+                       tprints(", ");
+
+                       if (umove_or_printaddr(tcp, idx2, &slot))
+                               break;
+
+                       PRINT_FIELD_PIDFD("{",  slot, efd, tcp, pid2);
+                       PRINT_FIELD_PIDFD(", ", slot, tfd, tcp, pid2);
+                       PRINT_FIELD_U(", ", slot, toff);
+                       tprints("}");
+
+                       break;
+               }
+
                case KCMP_FILES:
                case KCMP_FS:
                case KCMP_IO: