tests: check decoding of vcpu auxstr

[strace] / print_time.c

diff --git a/print_time.c b/print_time.c
index 147e018e433c38cc3aae0c1d6d021b0e5c588986..faba47a3af88d7b4f3b61ae3e8fce055dece1397 100644 (file)
--- a/print_time.c
+++ b/print_time.c
@@ -1,144 +1,54 @@
+/*
+ * 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
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #include "defs.h"
 
 #include DEF_MPERS_TYPE(time_t)
-#include DEF_MPERS_TYPE(timespec_t)
-#include DEF_MPERS_TYPE(timeval_t)
-
-typedef struct timespec timespec_t;
-typedef struct timeval timeval_t;
 
 #include MPERS_DEFS
 
-#ifndef UTIME_NOW
-# define UTIME_NOW ((1l << 30) - 1l)
-#endif
-#ifndef UTIME_OMIT
-# define UTIME_OMIT ((1l << 30) - 2l)
-#endif
-
-static const char time_fmt[] = "{%jd, %jd}";
-
-static void
-print_timespec_t(const timespec_t *t)
-{
-       tprintf(time_fmt, (intmax_t) t->tv_sec, (intmax_t) t->tv_nsec);
-}
-
-static void
-print_timespec_t_utime(const timespec_t *t)
-{
-       switch (t->tv_nsec) {
-       case UTIME_NOW:
-               tprints("UTIME_NOW");
-               break;
-       case UTIME_OMIT:
-               tprints("UTIME_OMIT");
-               break;
-       default:
-               print_timespec_t(t);
-               break;
-       }
-}
-
-static void
-print_timeval_t(const timeval_t *t)
-{
-       tprintf(time_fmt, (intmax_t) t->tv_sec, (intmax_t) t->tv_usec);
-}
-
-MPERS_PRINTER_DECL(void, print_timespec_utime_pair)(struct tcb *tcp, const long addr)
-{
-       timespec_t t[2];
-
-       if (umove_or_printaddr(tcp, addr, &t))
-               return;
-
-       tprints("[");
-       print_timespec_t_utime(&t[0]);
-       tprints(", ");
-       print_timespec_t_utime(&t[1]);
-       tprints("]");
-}
-
-MPERS_PRINTER_DECL(void, print_itimerspec)(struct tcb *tcp, const long addr)
-{
-       timespec_t t[2];
-
-       if (umove_or_printaddr(tcp, addr, &t))
-               return;
-
-       tprints("{it_interval=");
-       print_timespec_t(&t[0]);
-       tprints(", it_value=");
-       print_timespec_t(&t[1]);
-       tprints("}");
-}
-
-MPERS_PRINTER_DECL(void, print_timeval_pair)(struct tcb *tcp, const long addr)
-{
-       timeval_t t[2];
-
-       if (umove_or_printaddr(tcp, addr, &t))
-               return;
-
-       tprints("[");
-       print_timeval_t(&t[0]);
-       tprints(", ");
-       print_timeval_t(&t[1]);
-       tprints("]");
-}
-
-MPERS_PRINTER_DECL(void, print_itimerval)(struct tcb *tcp, const long addr)
-{
-       timeval_t t[2];
-
-       if (umove_or_printaddr(tcp, addr, &t))
-               return;
-
-       tprints("{it_interval=");
-       print_timeval_t(&t[0]);
-       tprints(", it_value=");
-       print_timeval_t(&t[1]);
-       tprints("}");
-}
-
 SYS_FUNC(time)
 {
        if (exiting(tcp)) {
                time_t t;
 
-               if (!umove_or_printaddr(tcp, tcp->u_arg[0], &t))
-                       tprintf("[%jd]", (intmax_t) t);
-       }
+               if (!umove_or_printaddr(tcp, tcp->u_arg[0], &t)) {
+                       tprintf("[%lld", (long long) t);
+                       tprints_comment(sprinttime(t));
+                       tprints("]");
+               }
 
-       return 0;
-}
-
-#ifdef ALPHA
-
-typedef struct {
-       int tv_sec, tv_usec;
-} timeval32_t;
-
-static void
-print_timeval32_t(const timeval32_t *t)
-{
-       tprintf(time_fmt, (intmax_t) t->tv_sec, (intmax_t) t->tv_usec);
-}
+               if (!syserror(tcp)) {
+                       tcp->auxstr = sprinttime((time_t) tcp->u_rval);
 
-void
-print_itimerval32(struct tcb *tcp, const long addr)
-{
-       timeval32_t t[2];
-
-       if (umove_or_printaddr(tcp, addr, &t))
-               return;
+                       return RVAL_STR;
+               }
+       }
 
-       tprints("{it_interval=");
-       print_timeval32_t(&t[0]);
-       tprints(", it_value=");
-       print_timeval32_t(&t[1]);
-       tprints("}");
+       return 0;
 }
-
-#endif /* ALPHA */