tests: extend TEST_NETLINK_OBJECT macro

[strace] / tests / getrusage.c

diff --git a/tests/getrusage.c b/tests/getrusage.c
index 8b76eff69e0e307e70762f9694db12722d3fc544..bb52dd989d014714e34f497f5409effd8bbc4a5f 100644 (file)
--- a/tests/getrusage.c
+++ b/tests/getrusage.c
@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2016 Fei Jie <feij.fnst@cn.fujitsu.com>
  * Copyright (c) 2016 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2016-2017 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,27 +36,46 @@
 # include <stdint.h>
 # include <sys/resource.h>
 # include <unistd.h>
+# include <errno.h>
+
+# include "xlat.h"
+# include "xlat/usagewho.h"
 
 int
-main(void)
+invoke_print(int who, const char *who_str, struct rusage *usage)
 {
-       struct rusage *const usage = tail_alloc(sizeof(struct rusage));
-       int rc = syscall(__NR_getrusage, RUSAGE_SELF, usage);
-       printf("getrusage(RUSAGE_SELF, {ru_utime={tv_sec=%jd, tv_usec=%jd}"
-              ", ru_stime={tv_sec=%jd, tv_usec=%jd}, ru_maxrss=%lu"
+       int rc = syscall(__NR_getrusage, who, usage);
+       int saved_errno = errno;
+       printf("getrusage(%s, {ru_utime={tv_sec=%lld, tv_usec=%llu}"
+              ", ru_stime={tv_sec=%lld, tv_usec=%llu}, ru_maxrss=%lu"
               ", ru_ixrss=%lu, ru_idrss=%lu, ru_isrss=%lu, ru_minflt=%lu"
               ", ru_majflt=%lu, ru_nswap=%lu, ru_inblock=%lu"
               ", ru_oublock=%lu, ru_msgsnd=%lu, ru_msgrcv=%lu"
-              ", ru_nsignals=%lu, ru_nvcsw=%lu, ru_nivcsw=%lu}) = %d\n",
-              (intmax_t) usage->ru_utime.tv_sec,
-              (intmax_t) usage->ru_utime.tv_usec,
-              (intmax_t) usage->ru_stime.tv_sec,
-              (intmax_t) usage->ru_stime.tv_usec,
+              ", ru_nsignals=%lu, ru_nvcsw=%lu, ru_nivcsw=%lu}) = %s\n",
+              who_str,
+              (long long) usage->ru_utime.tv_sec,
+              zero_extend_signed_to_ull(usage->ru_utime.tv_usec),
+              (long long) usage->ru_stime.tv_sec,
+              zero_extend_signed_to_ull(usage->ru_stime.tv_usec),
               usage->ru_maxrss, usage->ru_ixrss, usage->ru_idrss,
               usage->ru_isrss, usage->ru_minflt, usage->ru_majflt,
               usage->ru_nswap, usage->ru_inblock, usage->ru_oublock,
               usage->ru_msgsnd, usage->ru_msgrcv, usage->ru_nsignals,
-              usage->ru_nvcsw, usage->ru_nivcsw, rc);
+              usage->ru_nvcsw, usage->ru_nivcsw, sprintrc(rc));
+       errno = saved_errno;
+       return rc;
+}
+
+int
+main(void)
+{
+       TAIL_ALLOC_OBJECT_CONST_PTR(struct rusage, usage);
+       if (invoke_print(ARG_STR(RUSAGE_SELF), usage)) {
+               perror_msg_and_fail("RUSAGE_SELF");
+       }
+       if (invoke_print(ARG_STR(RUSAGE_THREAD), usage) && errno != EINVAL) {
+               perror_msg_and_fail("RUSAGE_THREAD");
+       }
 
        puts("+++ exited with 0 +++");
        return 0;