tests: extend TEST_NETLINK_OBJECT macro

[strace] / tests / clock_nanosleep.c

diff --git a/tests/clock_nanosleep.c b/tests/clock_nanosleep.c
index 1c4c42775bf20030776666ef60d794119aa720e5..72ac2e47595c184ca24863cdb06272775fbed8a7 100644 (file)
--- a/tests/clock_nanosleep.c
+++ b/tests/clock_nanosleep.c
@@ -1,5 +1,8 @@
 /*
+ * Check decoding of clock_nanosleep and clock_gettime syscalls.
+ *
  * 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
@@ -33,7 +36,7 @@
 #include <time.h>
 #include <unistd.h>
 #include <sys/time.h>
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 static void
 handler(int signo)
@@ -47,7 +50,7 @@ main(void)
                struct timespec ts;
                uint32_t pad[2];
        } req = {
-               .ts = { .tv_nsec = 0xc0de1 },
+               .ts.tv_nsec = 0xc0de1,
                .pad = { 0xdeadbeef, 0xbadc0ded }
        }, rem = {
                .ts = { .tv_sec = 0xc0de2, .tv_nsec = 0xc0de3 },
@@ -62,8 +65,10 @@ main(void)
 
        if (syscall(__NR_clock_nanosleep, CLOCK_REALTIME, 0, &req.ts, NULL))
                perror_msg_and_skip("clock_nanosleep CLOCK_REALTIME");
-       printf("clock_nanosleep(CLOCK_REALTIME, 0, {%jd, %jd}, NULL) = 0\n",
-              (intmax_t) req.ts.tv_sec, (intmax_t) req.ts.tv_nsec);
+       printf("clock_nanosleep(CLOCK_REALTIME, 0"
+              ", {tv_sec=%lld, tv_nsec=%llu}, NULL) = 0\n",
+              (long long) req.ts.tv_sec,
+              zero_extend_signed_to_ull(req.ts.tv_nsec));
 
        assert(syscall(__NR_clock_nanosleep, CLOCK_REALTIME, 0,
                       NULL, &rem.ts) == -1);
@@ -72,49 +77,71 @@ main(void)
 
        assert(syscall(__NR_clock_nanosleep, CLOCK_REALTIME, 0,
                       &req.ts, &rem.ts) == 0);
-       printf("clock_nanosleep(CLOCK_REALTIME, 0, {%jd, %jd}, %p) = 0\n",
-              (intmax_t) req.ts.tv_sec, (intmax_t) req.ts.tv_nsec, &rem.ts);
+       printf("clock_nanosleep(CLOCK_REALTIME, 0"
+              ", {tv_sec=%lld, tv_nsec=%llu}, %p) = 0\n",
+              (long long) req.ts.tv_sec,
+              zero_extend_signed_to_ull(req.ts.tv_nsec), &rem.ts);
 
        req.ts.tv_nsec = 999999999 + 1;
        assert(syscall(__NR_clock_nanosleep, CLOCK_MONOTONIC, 0,
                       &req.ts, &rem.ts) == -1);
        printf("clock_nanosleep(CLOCK_MONOTONIC, 0"
-              ", {%jd, %jd}, %p) = -1 EINVAL (%m)\n",
-              (intmax_t) req.ts.tv_sec, (intmax_t) req.ts.tv_nsec, &rem.ts);
+              ", {tv_sec=%lld, tv_nsec=%llu}, %p) = -1 EINVAL (%m)\n",
+              (long long) req.ts.tv_sec,
+              zero_extend_signed_to_ull(req.ts.tv_nsec), &rem.ts);
+
+       req.ts.tv_sec = 0xdeadbeefU;
+       req.ts.tv_nsec = 0xfacefeedU;
+       assert(syscall(__NR_clock_nanosleep, CLOCK_REALTIME, 0,
+                      &req.ts, &rem.ts) == -1);
+       printf("clock_nanosleep(CLOCK_REALTIME, 0"
+              ", {tv_sec=%lld, tv_nsec=%llu}, %p) = -1 EINVAL (%m)\n",
+              (long long) req.ts.tv_sec,
+              zero_extend_signed_to_ull(req.ts.tv_nsec), &rem.ts);
+
+       req.ts.tv_sec = (time_t) 0xcafef00ddeadbeefLL;
+       req.ts.tv_nsec = (long) 0xbadc0dedfacefeedLL;
+       assert(syscall(__NR_clock_nanosleep, CLOCK_MONOTONIC, 0,
+                      &req.ts, &rem.ts) == -1);
+       printf("clock_nanosleep(CLOCK_MONOTONIC, 0"
+              ", {tv_sec=%lld, tv_nsec=%llu}, %p) = -1 EINVAL (%m)\n",
+              (long long) req.ts.tv_sec,
+              zero_extend_signed_to_ull(req.ts.tv_nsec), &rem.ts);
 
        assert(sigaction(SIGALRM, &act, NULL) == 0);
        assert(sigprocmask(SIG_SETMASK, &set, NULL) == 0);
 
        if (setitimer(ITIMER_REAL, &itv, NULL))
                perror_msg_and_skip("setitimer");
-       printf("setitimer(ITIMER_REAL, {it_interval={%jd, %jd}"
-              ", it_value={%jd, %jd}}, NULL) = 0\n",
-              (intmax_t) itv.it_interval.tv_sec,
-              (intmax_t) itv.it_interval.tv_usec,
-              (intmax_t) itv.it_value.tv_sec,
-              (intmax_t) itv.it_value.tv_usec);
 
-       --req.ts.tv_nsec;
+       req.ts.tv_sec = 0;
+       req.ts.tv_nsec = 999999999;
        assert(syscall(__NR_clock_nanosleep, CLOCK_REALTIME, 0,
                       &req.ts, &rem.ts) == -1);
-       printf("clock_nanosleep(CLOCK_REALTIME, 0, {%jd, %jd}, {%jd, %jd})"
+       printf("clock_nanosleep(CLOCK_REALTIME, 0"
+              ", {tv_sec=%lld, tv_nsec=%llu}, {tv_sec=%lld, tv_nsec=%llu})"
               " = ? ERESTART_RESTARTBLOCK (Interrupted by signal)\n",
-              (intmax_t) req.ts.tv_sec, (intmax_t) req.ts.tv_nsec,
-              (intmax_t) rem.ts.tv_sec, (intmax_t) rem.ts.tv_nsec);
+              (long long) req.ts.tv_sec,
+              zero_extend_signed_to_ull(req.ts.tv_nsec),
+              (long long) rem.ts.tv_sec,
+              zero_extend_signed_to_ull(rem.ts.tv_nsec));
        puts("--- SIGALRM {si_signo=SIGALRM, si_code=SI_KERNEL} ---");
 
        assert(syscall(__NR_clock_gettime, CLOCK_REALTIME, &req.ts) == 0);
-       printf("clock_gettime(CLOCK_REALTIME, {%jd, %jd}) = 0\n",
-              (intmax_t) req.ts.tv_sec, (intmax_t) req.ts.tv_nsec);
+       printf("clock_gettime(CLOCK_REALTIME, {tv_sec=%lld, tv_nsec=%llu}) = 0\n",
+              (long long) req.ts.tv_sec,
+              zero_extend_signed_to_ull(req.ts.tv_nsec));
 
        ++req.ts.tv_sec;
        rem.ts.tv_sec = 0xc0de4;
        rem.ts.tv_nsec = 0xc0de5;
        assert(syscall(__NR_clock_nanosleep, CLOCK_REALTIME, TIMER_ABSTIME,
                       &req.ts, &rem.ts) == -1);
-       printf("clock_nanosleep(CLOCK_REALTIME, TIMER_ABSTIME, {%jd, %jd}, %p)"
+       printf("clock_nanosleep(CLOCK_REALTIME, TIMER_ABSTIME"
+              ", {tv_sec=%lld, tv_nsec=%llu}, %p)"
               " = ? ERESTARTNOHAND (To be restarted if no handler)\n",
-              (intmax_t) req.ts.tv_sec, (intmax_t) req.ts.tv_nsec, &rem.ts);
+              (long long) req.ts.tv_sec,
+              zero_extend_signed_to_ull(req.ts.tv_nsec), &rem.ts);
        puts("--- SIGALRM {si_signo=SIGALRM, si_code=SI_KERNEL} ---");
 
        puts("+++ exited with 0 +++");