Remove linux/ptp_clock.h

[strace] / print_timeval.c

diff --git a/print_timeval.c b/print_timeval.c
index ca9439494dac8a7c6a144bf9f734521e82d42fde..8e0708f4e03e3c826608a1748b21ac846a163ef6 100644 (file)
--- a/print_timeval.c
+++ b/print_timeval.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2015-2017 Dmitry V. Levin <ldv@altlinux.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,16 +33,42 @@ typedef struct timeval timeval_t;
 
 #include MPERS_DEFS
 
-static const char timeval_fmt[]  = "{tv_sec=%jd, tv_usec=%jd}";
+static const char timeval_fmt[]  = "{tv_sec=%lld, tv_usec=%llu}";
 
 static void
 print_timeval_t(const timeval_t *t)
 {
-       tprintf(timeval_fmt, (intmax_t) t->tv_sec, (intmax_t) t->tv_usec);
+       tprintf(timeval_fmt, (long long) t->tv_sec,
+               zero_extend_signed_to_ull(t->tv_usec));
+}
+
+static void
+print_timeval_t_utime(const timeval_t *t)
+{
+       print_timeval_t(t);
+       tprints_comment(sprinttime_usec(t->tv_sec,
+               zero_extend_signed_to_ull(t->tv_usec)));
+}
+
+MPERS_PRINTER_DECL(void, print_struct_timeval, const void *arg)
+{
+       print_timeval_t(arg);
+}
+
+MPERS_PRINTER_DECL(bool, print_struct_timeval_data_size,
+                  const void *arg, const size_t size)
+{
+       if (size < sizeof(timeval_t)) {
+               tprints("?");
+               return false;
+       }
+
+       print_timeval_t(arg);
+       return true;
 }
 
 MPERS_PRINTER_DECL(void, print_timeval,
-                  struct tcb *tcp, const long addr)
+                  struct tcb *const tcp, const kernel_ulong_t addr)
 {
        timeval_t t;
 
@@ -52,8 +78,8 @@ MPERS_PRINTER_DECL(void, print_timeval,
        print_timeval_t(&t);
 }
 
-MPERS_PRINTER_DECL(void, print_timeval_pair,
-                  struct tcb *tcp, const long addr)
+MPERS_PRINTER_DECL(void, print_timeval_utimes,
+                  struct tcb *const tcp, const kernel_ulong_t addr)
 {
        timeval_t t[2];
 
@@ -61,14 +87,14 @@ MPERS_PRINTER_DECL(void, print_timeval_pair,
                return;
 
        tprints("[");
-       print_timeval_t(&t[0]);
+       print_timeval_t_utime(&t[0]);
        tprints(", ");
-       print_timeval_t(&t[1]);
+       print_timeval_t_utime(&t[1]);
        tprints("]");
 }
 
 MPERS_PRINTER_DECL(const char *, sprint_timeval,
-                  struct tcb *tcp, const long addr)
+                  struct tcb *const tcp, const kernel_ulong_t addr)
 {
        timeval_t t;
        static char buf[sizeof(timeval_fmt) + 3 * sizeof(t)];
@@ -77,17 +103,18 @@ MPERS_PRINTER_DECL(const char *, sprint_timeval,
                strcpy(buf, "NULL");
        } else if (!verbose(tcp) || (exiting(tcp) && syserror(tcp)) ||
                   umove(tcp, addr, &t)) {
-               snprintf(buf, sizeof(buf), "%#lx", addr);
+               snprintf(buf, sizeof(buf), "%#" PRI_klx, addr);
        } else {
                snprintf(buf, sizeof(buf), timeval_fmt,
-                        (intmax_t) t.tv_sec, (intmax_t) t.tv_usec);
+                        (long long) t.tv_sec,
+                        zero_extend_signed_to_ull(t.tv_usec));
        }
 
        return buf;
 }
 
 MPERS_PRINTER_DECL(void, print_itimerval,
-                  struct tcb *tcp, const long addr)
+                  struct tcb *const tcp, const kernel_ulong_t addr)
 {
        timeval_t t[2];
 
@@ -103,18 +130,23 @@ MPERS_PRINTER_DECL(void, print_itimerval,
 
 #ifdef ALPHA
 
-typedef struct {
-       int tv_sec, tv_usec;
-} timeval32_t;
+void
+print_timeval32_t(const timeval32_t *t)
+{
+       tprintf(timeval_fmt, (long long) t->tv_sec,
+               zero_extend_signed_to_ull(t->tv_usec));
+}
 
 static void
-print_timeval32_t(const timeval32_t *t)
+print_timeval32_t_utime(const timeval32_t *t)
 {
-       tprintf(timeval_fmt, (intmax_t) t->tv_sec, (intmax_t) t->tv_usec);
+       print_timeval32_t(t);
+       tprints_comment(sprinttime_usec(t->tv_sec,
+               zero_extend_signed_to_ull(t->tv_usec)));
 }
 
 void
-print_timeval32(struct tcb *tcp, const long addr)
+print_timeval32(struct tcb *const tcp, const kernel_ulong_t addr)
 {
        timeval32_t t;
 
@@ -125,7 +157,7 @@ print_timeval32(struct tcb *tcp, const long addr)
 }
 
 void
-print_timeval32_pair(struct tcb *tcp, const long addr)
+print_timeval32_utimes(struct tcb *const tcp, const kernel_ulong_t addr)
 {
        timeval32_t t[2];
 
@@ -133,14 +165,14 @@ print_timeval32_pair(struct tcb *tcp, const long addr)
                return;
 
        tprints("[");
-       print_timeval32_t(&t[0]);
+       print_timeval32_t_utime(&t[0]);
        tprints(", ");
-       print_timeval32_t(&t[1]);
+       print_timeval32_t_utime(&t[1]);
        tprints("]");
 }
 
 void
-print_itimerval32(struct tcb *tcp, const long addr)
+print_itimerval32(struct tcb *const tcp, const kernel_ulong_t addr)
 {
        timeval32_t t[2];
 
@@ -155,7 +187,7 @@ print_itimerval32(struct tcb *tcp, const long addr)
 }
 
 const char *
-sprint_timeval32(struct tcb *tcp, const long addr)
+sprint_timeval32(struct tcb *const tcp, const kernel_ulong_t addr)
 {
        timeval32_t t;
        static char buf[sizeof(timeval_fmt) + 3 * sizeof(t)];
@@ -164,10 +196,11 @@ sprint_timeval32(struct tcb *tcp, const long addr)
                strcpy(buf, "NULL");
        } else if (!verbose(tcp) || (exiting(tcp) && syserror(tcp)) ||
                   umove(tcp, addr, &t)) {
-               snprintf(buf, sizeof(buf), "%#lx", addr);
+               snprintf(buf, sizeof(buf), "%#" PRI_klx, addr);
        } else {
                snprintf(buf, sizeof(buf), timeval_fmt,
-                        (intmax_t) t.tv_sec, (intmax_t) t.tv_usec);
+                        (long long) t.tv_sec,
+                        zero_extend_signed_to_ull(t.tv_usec));
        }
 
        return buf;