/*
- * Copyright (c) 2015 Dmitry V. Levin <ldv@altlinux.org>
+ * 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
#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)(struct tcb *tcp, const long addr)
-{
- timespec_t t;
-
- if (umove_or_printaddr(tcp, addr, &t))
- return;
-
- print_timespec_t(&t);
-}
-
-MPERS_PRINTER_DECL(const char *, sprint_timespec)(struct tcb *tcp, const long addr)
-{
- timespec_t t;
- static char buf[sizeof(time_fmt) + 3 * sizeof(t)];
-
- if (!addr) {
- strcpy(buf, "NULL");
- } else if (!verbose(tcp) || (exiting(tcp) && syserror(tcp)) ||
- umove(tcp, addr, &t)) {
- snprintf(buf, sizeof(buf), "%#lx", addr);
- } else {
- snprintf(buf, sizeof(buf), time_fmt,
- (intmax_t) t.tv_sec, (intmax_t) t.tv_nsec);
- }
-
- return buf;
-}
-
-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)(struct tcb *tcp, const long addr)
-{
- timeval_t t;
-
- if (umove_or_printaddr(tcp, addr, &t))
- return;
-
- print_timeval_t(&t);
-}
-
-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(const char *, sprint_timeval)(struct tcb *tcp, const long addr)
-{
- timeval_t t;
- static char buf[sizeof(time_fmt) + 3 * sizeof(t)];
-
- if (!addr) {
- strcpy(buf, "NULL");
- } else if (!verbose(tcp) || (exiting(tcp) && syserror(tcp)) ||
- umove(tcp, addr, &t)) {
- snprintf(buf, sizeof(buf), "%#lx", addr);
- } else {
- snprintf(buf, sizeof(buf), time_fmt,
- (intmax_t) t.tv_sec, (intmax_t) t.tv_usec);
- }
-
- return buf;
-}
-
-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);
- }
-
- return 0;
-}
-
-#ifdef ALPHA
+ if (!umove_or_printaddr(tcp, tcp->u_arg[0], &t)) {
+ tprintf("[%lld", (long long) t);
+ tprints_comment(sprinttime(t));
+ tprints("]");
+ }
-typedef struct {
- int tv_sec, tv_usec;
-} timeval32_t;
+ if (!syserror(tcp)) {
+ tcp->auxstr = sprinttime((time_t) tcp->u_rval);
-static void
-print_timeval32_t(const timeval32_t *t)
-{
- tprintf(time_fmt, (intmax_t) t->tv_sec, (intmax_t) t->tv_usec);
-}
-
-void
-print_timeval32(struct tcb *tcp, const long addr)
-{
- timeval32_t t;
-
- if (umove_or_printaddr(tcp, addr, &t))
- return;
-
- print_timeval32_t(&t);
-}
-
-void
-print_timeval32_pair(struct tcb *tcp, const long addr)
-{
- timeval32_t t[2];
-
- if (umove_or_printaddr(tcp, addr, &t))
- return;
-
- tprints("[");
- print_timeval32_t(&t[0]);
- tprints(", ");
- print_timeval32_t(&t[1]);
- tprints("]");
-}
-
-void
-print_itimerval32(struct tcb *tcp, const long addr)
-{
- timeval32_t t[2];
-
- if (umove_or_printaddr(tcp, addr, &t))
- return;
-
- tprints("{it_interval=");
- print_timeval32_t(&t[0]);
- tprints(", it_value=");
- print_timeval32_t(&t[1]);
- tprints("}");
-}
-
-const char *
-sprint_timeval32(struct tcb *tcp, const long addr)
-{
- timeval32_t t;
- static char buf[sizeof(time_fmt) + 3 * sizeof(t)];
-
- if (!addr) {
- strcpy(buf, "NULL");
- } else if (!verbose(tcp) || (exiting(tcp) && syserror(tcp)) ||
- umove(tcp, addr, &t)) {
- snprintf(buf, sizeof(buf), "%#lx", addr);
- } else {
- snprintf(buf, sizeof(buf), time_fmt,
- (intmax_t) t.tv_sec, (intmax_t) t.tv_usec);
+ return RVAL_STR;
+ }
}
- return buf;
+ return 0;
}
-
-#endif /* ALPHA */
projects / strace / blobdiff