tests: extend TEST_NETLINK_OBJECT macro

[strace] / tests / timerfd_xettime.c

diff --git a/tests/timerfd_xettime.c b/tests/timerfd_xettime.c
index a084b666150b4384d5c7cc32cf0841f1260a75b7..1e8a23ad0b119b6f627bb2785efdf9d1d44b2978 100644 (file)
--- a/tests/timerfd_xettime.c
+++ b/tests/timerfd_xettime.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2015-2016 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2015-2017 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,43 +48,59 @@ main(void)
                perror_msg_and_skip("timerfd_create");
        puts("timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC|TFD_NONBLOCK) = 0");
 
-       struct {
-               struct itimerspec its;
-               uint32_t pad[4];
-       } old = {
-               .pad = { 0xdeadbeef, 0xbadc0ded, 0xdeadbeef, 0xbadc0ded }
-       }, new = {
-               .its = {
-                       .it_interval = { 0xdeface1, 0xdeface2 },
-                       .it_value = { 0xdeface3, 0xdeface4 }
-               },
-               .pad = { 0xdeadbeef, 0xbadc0ded, 0xdeadbeef, 0xbadc0ded }
-       };
+       TAIL_ALLOC_OBJECT_CONST_PTR(struct itimerspec, its_new);
+       TAIL_ALLOC_OBJECT_CONST_PTR(struct itimerspec, its_old);
 
-       if (syscall(__NR_timerfd_settime, 0, 0, &new.its, &old.its))
+       its_new->it_interval.tv_sec = 0xdeadbeefU;
+       its_new->it_interval.tv_nsec = 0xfacefeedU;
+       its_new->it_value.tv_sec = (time_t) 0xcafef00ddeadbeefLL;
+       its_new->it_value.tv_nsec = (long) 0xbadc0dedfacefeedLL;
+
+       long rc = syscall(__NR_timerfd_settime, 0, 0, its_new, its_old);
+       printf("timerfd_settime(0, 0"
+              ", {it_interval={tv_sec=%lld, tv_nsec=%llu}"
+              ", it_value={tv_sec=%lld, tv_nsec=%llu}}, %p) = %s\n",
+              (long long) its_new->it_interval.tv_sec,
+              zero_extend_signed_to_ull(its_new->it_interval.tv_nsec),
+              (long long) its_new->it_value.tv_sec,
+              zero_extend_signed_to_ull(its_new->it_value.tv_nsec),
+              its_old, sprintrc(rc));
+
+       its_new->it_interval.tv_sec = 0xdeface1;
+       its_new->it_interval.tv_nsec = 0xdeface2;
+       its_new->it_value.tv_sec = 0xdeface3;
+       its_new->it_value.tv_nsec = 0xdeface4;
+       its_old->it_interval.tv_sec = 0xdeface5;
+       its_old->it_interval.tv_nsec = 0xdeface6;
+       its_old->it_value.tv_sec = 0xdeface7;
+       its_old->it_value.tv_nsec = 0xdeface8;
+
+       if (syscall(__NR_timerfd_settime, 0, 0, its_new, its_old))
                perror_msg_and_skip("timerfd_settime");
        printf("timerfd_settime(0, 0"
-              ", {it_interval={%jd, %jd}, it_value={%jd, %jd}}"
-              ", {it_interval={%jd, %jd}, it_value={%jd, %jd}}"
+              ", {it_interval={tv_sec=%lld, tv_nsec=%llu}"
+              ", it_value={tv_sec=%lld, tv_nsec=%llu}}"
+              ", {it_interval={tv_sec=%lld, tv_nsec=%llu}"
+              ", it_value={tv_sec=%lld, tv_nsec=%llu}}"
               ") = 0\n",
-              (intmax_t) new.its.it_interval.tv_sec,
-              (intmax_t) new.its.it_interval.tv_nsec,
-              (intmax_t) new.its.it_value.tv_sec,
-              (intmax_t) new.its.it_value.tv_nsec,
-              (intmax_t) old.its.it_interval.tv_sec,
-              (intmax_t) old.its.it_interval.tv_nsec,
-              (intmax_t) old.its.it_value.tv_sec,
-              (intmax_t) old.its.it_value.tv_nsec);
+              (long long) its_new->it_interval.tv_sec,
+              zero_extend_signed_to_ull(its_new->it_interval.tv_nsec),
+              (long long) its_new->it_value.tv_sec,
+              zero_extend_signed_to_ull(its_new->it_value.tv_nsec),
+              (long long) its_old->it_interval.tv_sec,
+              zero_extend_signed_to_ull(its_old->it_interval.tv_nsec),
+              (long long) its_old->it_value.tv_sec,
+              zero_extend_signed_to_ull(its_old->it_value.tv_nsec));
 
-       if (syscall(__NR_timerfd_gettime, 0, &old.its))
+       if (syscall(__NR_timerfd_gettime, 0, its_old))
                perror_msg_and_skip("timerfd_gettime");
        printf("timerfd_gettime(0"
-              ", {it_interval={%jd, %jd}, it_value={%jd, %jd}}"
-              ") = 0\n",
-              (intmax_t) old.its.it_interval.tv_sec,
-              (intmax_t) old.its.it_interval.tv_nsec,
-              (intmax_t) old.its.it_value.tv_sec,
-              (intmax_t) old.its.it_value.tv_nsec);
+              ", {it_interval={tv_sec=%lld, tv_nsec=%llu}"
+              ", it_value={tv_sec=%lld, tv_nsec=%llu}}) = 0\n",
+              (long long) its_old->it_interval.tv_sec,
+              zero_extend_signed_to_ull(its_old->it_interval.tv_nsec),
+              (long long) its_old->it_value.tv_sec,
+              zero_extend_signed_to_ull(its_old->it_value.tv_nsec));
 
        puts("+++ exited with 0 +++");
        return 0;