Print struct iovec as a regular structure

[strace] / resource.c

diff --git a/resource.c b/resource.c
index e3c9a02d72afc59c5605106ff0c8b3f532636a11..475afc26e61f2e5b8afb031111f1479ba8830e3a 100644 (file)
--- a/resource.c
+++ b/resource.c
@@ -30,8 +30,6 @@
 
 #include "defs.h"
 #include <sys/resource.h>
-#include <sys/times.h>
-#include <linux/kernel.h>
 
 #include "xlat/resources.h"
 
@@ -144,7 +142,7 @@ SYS_FUNC(setrlimit)
 SYS_FUNC(prlimit64)
 {
        if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
+               tprintf("%d, ", (int) tcp->u_arg[0]);
                printxval(resources, tcp->u_arg[1], "RLIMIT_???");
                tprints(", ");
                print_rlimit64(tcp, tcp->u_arg[2]);
@@ -157,91 +155,6 @@ SYS_FUNC(prlimit64)
 
 #include "xlat/usagewho.h"
 
-#ifdef ALPHA
-void
-printrusage32(struct tcb *tcp, long 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 */
-               long    ru_maxrss;              /* maximum resident set size */
-               long    ru_ixrss;               /* integral shared memory size */
-               long    ru_idrss;               /* integral unshared data size */
-               long    ru_isrss;               /* integral unshared stack size */
-               long    ru_minflt;              /* page reclaims */
-               long    ru_majflt;              /* page faults */
-               long    ru_nswap;               /* swaps */
-               long    ru_inblock;             /* block input operations */
-               long    ru_oublock;             /* block output operations */
-               long    ru_msgsnd;              /* messages sent */
-               long    ru_msgrcv;              /* messages received */
-               long    ru_nsignals;            /* signals received */
-               long    ru_nvcsw;               /* voluntary context switches */
-               long    ru_nivcsw;              /* involuntary " */
-       } 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);
-       }
-       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);
-       }
-}
-#endif
-
-void
-printrusage(struct tcb *tcp, long addr)
-{
-       struct rusage 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);
-       }
-       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);
-       }
-}
-
 SYS_FUNC(getrusage)
 {
        if (entering(tcp)) {
@@ -271,7 +184,7 @@ SYS_FUNC(osf_getrusage)
 SYS_FUNC(getpriority)
 {
        printxval(priorities, tcp->u_arg[0], "PRIO_???");
-       tprintf(", %lu", tcp->u_arg[1]);
+       tprintf(", %d", (int) tcp->u_arg[1]);
 
        return RVAL_DECODED;
 }
@@ -279,24 +192,7 @@ SYS_FUNC(getpriority)
 SYS_FUNC(setpriority)
 {
        printxval(priorities, tcp->u_arg[0], "PRIO_???");
-       tprintf(", %lu, %d", tcp->u_arg[1], (int) tcp->u_arg[2]);
+       tprintf(", %d, %d", (int) tcp->u_arg[1], (int) tcp->u_arg[2]);
 
        return RVAL_DECODED;
 }
-
-SYS_FUNC(times)
-{
-       struct tms tbuf;
-
-       if (exiting(tcp)) {
-               if (!umove_or_printaddr(tcp, tcp->u_arg[0], &tbuf)) {
-                       tprintf("{tms_utime=%llu, tms_stime=%llu, ",
-                               (unsigned long long) tbuf.tms_utime,
-                               (unsigned long long) tbuf.tms_stime);
-                       tprintf("tms_cutime=%llu, tms_cstime=%llu}",
-                               (unsigned long long) tbuf.tms_cutime,
-                               (unsigned long long) tbuf.tms_cstime);
-               }
-       }
-       return 0;
-}