tests: check decoding of netlink smc_diag_msg attributes

[strace] / printrusage.c

diff --git a/printrusage.c b/printrusage.c
index 7661e7d121dd7b463fc2e777ca3a91c7964fb5e3..a25ef99f50a3a8ff5abd4071dc9283ebc5906839 100644 (file)
--- a/printrusage.c
+++ b/printrusage.c
@@ -3,6 +3,7 @@
  * Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
  * Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
  * Copyright (c) 1996-1999 Wichert Akkerman <wichert@cistron.nl>
+ * Copyright (c) 1999-2017 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31,48 +32,55 @@
 #include "defs.h"
 #include <sys/resource.h>
 
-void
-printrusage(struct tcb *tcp, long addr)
+#include DEF_MPERS_TYPE(rusage_t)
+
+typedef struct rusage rusage_t;
+
+#include MPERS_DEFS
+
+MPERS_PRINTER_DECL(void, printrusage,
+                  struct tcb *const tcp, const kernel_ulong_t addr)
 {
-       struct rusage ru;
+       rusage_t ru;
 
        if (umove_or_printaddr(tcp, addr, &ru))
                return;
-       if (!abbrev(tcp)) {
-               tprintf("{ru_utime={%lu, %lu}, ru_stime={%lu, %lu}, ",
-                       (long) ru.ru_utime.tv_sec, (long) ru.ru_utime.tv_usec,
-                       (long) ru.ru_stime.tv_sec, (long) ru.ru_stime.tv_usec);
-               tprintf("ru_maxrss=%lu, ru_ixrss=%lu, ",
-                       ru.ru_maxrss, ru.ru_ixrss);
-               tprintf("ru_idrss=%lu, ru_isrss=%lu, ",
-                       ru.ru_idrss, ru.ru_isrss);
-               tprintf("ru_minflt=%lu, ru_majflt=%lu, ru_nswap=%lu, ",
-                       ru.ru_minflt, ru.ru_majflt, ru.ru_nswap);
-               tprintf("ru_inblock=%lu, ru_oublock=%lu, ",
-                       ru.ru_inblock, ru.ru_oublock);
-               tprintf("ru_msgsnd=%lu, ru_msgrcv=%lu, ",
-                       ru.ru_msgsnd, ru.ru_msgrcv);
-               tprintf("ru_nsignals=%lu, ru_nvcsw=%lu, ru_nivcsw=%lu}",
-                       ru.ru_nsignals, ru.ru_nvcsw, ru.ru_nivcsw);
-       }
+
+       tprints("{ru_utime=");
+       MPERS_FUNC_NAME(print_struct_timeval)(&ru.ru_utime);
+       tprints(", ru_stime=");
+       MPERS_FUNC_NAME(print_struct_timeval)(&ru.ru_stime);
+       if (abbrev(tcp))
+               tprints(", ...");
        else {
-               tprintf("{ru_utime={%lu, %lu}, ru_stime={%lu, %lu}, ...}",
-                       (long) ru.ru_utime.tv_sec, (long) ru.ru_utime.tv_usec,
-                       (long) ru.ru_stime.tv_sec, (long) ru.ru_stime.tv_usec);
+#define PRINT_RUSAGE_MEMBER(member) \
+               tprintf(", " #member "=%llu", zero_extend_signed_to_ull(ru.member))
+               PRINT_RUSAGE_MEMBER(ru_maxrss);
+               PRINT_RUSAGE_MEMBER(ru_ixrss);
+               PRINT_RUSAGE_MEMBER(ru_idrss);
+               PRINT_RUSAGE_MEMBER(ru_isrss);
+               PRINT_RUSAGE_MEMBER(ru_minflt);
+               PRINT_RUSAGE_MEMBER(ru_majflt);
+               PRINT_RUSAGE_MEMBER(ru_nswap);
+               PRINT_RUSAGE_MEMBER(ru_inblock);
+               PRINT_RUSAGE_MEMBER(ru_oublock);
+               PRINT_RUSAGE_MEMBER(ru_msgsnd);
+               PRINT_RUSAGE_MEMBER(ru_msgrcv);
+               PRINT_RUSAGE_MEMBER(ru_nsignals);
+               PRINT_RUSAGE_MEMBER(ru_nvcsw);
+               PRINT_RUSAGE_MEMBER(ru_nivcsw);
+#undef PRINT_RUSAGE_MEMBER
        }
+       tprints("}");
 }
 
 #ifdef ALPHA
 void
-printrusage32(struct tcb *tcp, long addr)
+printrusage32(struct tcb *const tcp, const kernel_ulong_t addr)
 {
-       struct timeval32 {
-               unsigned tv_sec;
-               unsigned tv_usec;
-       };
        struct rusage32 {
-               struct timeval32 ru_utime;      /* user time used */
-               struct timeval32 ru_stime;      /* system time used */
+               timeval32_t ru_utime;           /* user time used */
+               timeval32_t ru_stime;           /* system time used */
                long    ru_maxrss;              /* maximum resident set size */
                long    ru_ixrss;               /* integral shared memory size */
                long    ru_idrss;               /* integral unshared data size */
@@ -91,27 +99,32 @@ printrusage32(struct tcb *tcp, long addr)
 
        if (umove_or_printaddr(tcp, addr, &ru))
                return;
-       if (!abbrev(tcp)) {
-               tprintf("{ru_utime={%lu, %lu}, ru_stime={%lu, %lu}, ",
-                       (long) ru.ru_utime.tv_sec, (long) ru.ru_utime.tv_usec,
-                       (long) ru.ru_stime.tv_sec, (long) ru.ru_stime.tv_usec);
-               tprintf("ru_maxrss=%lu, ru_ixrss=%lu, ",
-                       ru.ru_maxrss, ru.ru_ixrss);
-               tprintf("ru_idrss=%lu, ru_isrss=%lu, ",
-                       ru.ru_idrss, ru.ru_isrss);
-               tprintf("ru_minflt=%lu, ru_majflt=%lu, ru_nswap=%lu, ",
-                       ru.ru_minflt, ru.ru_majflt, ru.ru_nswap);
-               tprintf("ru_inblock=%lu, ru_oublock=%lu, ",
-                       ru.ru_inblock, ru.ru_oublock);
-               tprintf("ru_msgsnd=%lu, ru_msgrcv=%lu, ",
-                       ru.ru_msgsnd, ru.ru_msgrcv);
-               tprintf("ru_nsignals=%lu, ru_nvcsw=%lu, ru_nivcsw=%lu}",
-                       ru.ru_nsignals, ru.ru_nvcsw, ru.ru_nivcsw);
-       }
+
+       tprints("{ru_utime=");
+       print_timeval32_t(&ru.ru_utime);
+       tprints(", ru_stime=");
+       print_timeval32_t(&ru.ru_stime);
+       if (abbrev(tcp))
+               tprints(", ...");
        else {
-               tprintf("{ru_utime={%lu, %lu}, ru_stime={%lu, %lu}, ...}",
-                       (long) ru.ru_utime.tv_sec, (long) ru.ru_utime.tv_usec,
-                       (long) ru.ru_stime.tv_sec, (long) ru.ru_stime.tv_usec);
+# define PRINT_RUSAGE_MEMBER(member) \
+               tprintf(", " #member "=%lu", ru.member)
+               PRINT_RUSAGE_MEMBER(ru_maxrss);
+               PRINT_RUSAGE_MEMBER(ru_ixrss);
+               PRINT_RUSAGE_MEMBER(ru_idrss);
+               PRINT_RUSAGE_MEMBER(ru_isrss);
+               PRINT_RUSAGE_MEMBER(ru_minflt);
+               PRINT_RUSAGE_MEMBER(ru_majflt);
+               PRINT_RUSAGE_MEMBER(ru_nswap);
+               PRINT_RUSAGE_MEMBER(ru_inblock);
+               PRINT_RUSAGE_MEMBER(ru_oublock);
+               PRINT_RUSAGE_MEMBER(ru_msgsnd);
+               PRINT_RUSAGE_MEMBER(ru_msgrcv);
+               PRINT_RUSAGE_MEMBER(ru_nsignals);
+               PRINT_RUSAGE_MEMBER(ru_nvcsw);
+               PRINT_RUSAGE_MEMBER(ru_nivcsw);
+# undef PRINT_RUSAGE_MEMBER
        }
+       tprints("}");
 }
 #endif