]> granicus.if.org Git - strace/blobdiff - time.c
tests: use fixed socket address in net-y-unix.test
[strace] / time.c
diff --git a/time.c b/time.c
index af68eeeb3c2c22ce3fc0b379f538536fb7bf3d4e..6c542f631f9b74061bbc61f32d7b70846733e98b 100644 (file)
--- a/time.c
+++ b/time.c
  * 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.
- *
- *     $Id$
  */
 
 #include "defs.h"
-
-#ifdef LINUX
-#include <linux/version.h>
+#include <fcntl.h>
+#include <signal.h>
 #include <sys/timex.h>
-#include <linux/ioctl.h>
-#include <linux/rtc.h>
-
-#ifndef UTIME_NOW
-#define UTIME_NOW ((1l << 30) - 1l)
-#endif
-#ifndef UTIME_OMIT
-#define UTIME_OMIT ((1l << 30) - 2l)
-#endif
-#endif /* LINUX */
-
-struct timeval32
-{
-       u_int32_t tv_sec, tv_usec;
-};
 
 static void
-tprint_timeval32(struct tcb *tcp, const struct timeval32 *tv)
-{
-       tprintf("{%u, %u}", tv->tv_sec, tv->tv_usec);
-}
-
-static void
-tprint_timeval(struct tcb *tcp, const struct timeval *tv)
-{
-       tprintf("{%lu, %lu}",
-               (unsigned long) tv->tv_sec, (unsigned long) tv->tv_usec);
-}
-
-void
-printtv_bitness(struct tcb *tcp, long addr, enum bitness_t bitness, int special)
-{
-       if (addr == 0)
-               tprintf("NULL");
-       else if (!verbose(tcp))
-               tprintf("%#lx", addr);
-       else
-       {
-               int     rc;
-
-               if (bitness == BITNESS_32
-#if defined(LINUX) && SUPPORTED_PERSONALITIES > 1
-                   || personality_wordsize[current_personality] == 4
-#endif
-                       )
-               {
-                       struct timeval32 tv;
-
-                       if ((rc = umove(tcp, addr, &tv)) >= 0) {
-                               if (special && tv.tv_sec == 0 &&
-                                   tv.tv_usec == UTIME_NOW)
-                                       tprintf("UTIME_NOW");
-                               else if (special && tv.tv_sec == 0 &&
-                                        tv.tv_usec == UTIME_OMIT)
-                                       tprintf("UTIME_OMIT");
-                               else
-                                       tprint_timeval32(tcp, &tv);
-                       }
-               } else
-               {
-                       struct timeval tv;
-
-                       if ((rc = umove(tcp, addr, &tv)) >= 0) {
-                               if (special && tv.tv_sec == 0 &&
-                                   tv.tv_usec == UTIME_NOW)
-                                       tprintf("UTIME_NOW");
-                               else if (special && tv.tv_sec == 0 &&
-                                        tv.tv_usec == UTIME_OMIT)
-                                       tprintf("UTIME_OMIT");
-                               else
-                                       tprint_timeval(tcp, &tv);
-                       }
-               }
-
-               if (rc < 0)
-                       tprintf("{...}");
-       }
-}
-
-void
-sprinttv(struct tcb *tcp, long addr, enum bitness_t bitness, char *buf)
+print_timezone(struct tcb *const tcp, const kernel_ulong_t addr)
 {
-       if (addr == 0)
-               strcpy(buf, "NULL");
-       else if (!verbose(tcp))
-               sprintf(buf, "%#lx", addr);
-       else
-       {
-               int     rc;
-
-               if (bitness == BITNESS_32
-#if defined(LINUX) && SUPPORTED_PERSONALITIES > 1
-                   || personality_wordsize[current_personality] == 4
-#endif
-                       )
-               {
-                       struct timeval32 tv;
-
-                       if ((rc = umove(tcp, addr, &tv)) >= 0)
-                               sprintf(buf, "{%u, %u}",
-                                       tv.tv_sec, tv.tv_usec);
-               } else
-               {
-                       struct timeval tv;
-
-                       if ((rc = umove(tcp, addr, &tv)) >= 0)
-                               sprintf(buf, "{%lu, %lu}",
-                                       (unsigned long) tv.tv_sec,
-                                       (unsigned long) tv.tv_usec);
-               }
-
-               if (rc < 0)
-                       strcpy(buf, "{...}");
-       }
-}
-
-void print_timespec (struct tcb *tcp, long addr)
-{
-       if (addr == 0)
-               tprintf("NULL");
-       else if (!verbose(tcp))
-               tprintf("%#lx", addr);
-       else {
-               int     rc;
-
-#if defined(LINUX) && SUPPORTED_PERSONALITIES > 1
-               if (personality_wordsize[current_personality] == 4)
-               {
-                       struct timeval32 tv;
-
-                       if ((rc = umove(tcp, addr, &tv)) >= 0)
-                               tprintf("{%u, %u}",
-                                       tv.tv_sec, tv.tv_usec);
-               } else
-               {
-#endif
-                       struct timespec ts;
-
-                       if ((rc = umove(tcp, addr, &ts)) >= 0)
-                               tprintf("{%lu, %lu}",
-                                       (unsigned long) ts.tv_sec,
-                                       (unsigned long) ts.tv_nsec);
-#if defined(LINUX) && SUPPORTED_PERSONALITIES > 1
-               }
-#endif
-
-               if (rc < 0)
-                       tprintf("{...}");
-       }
-}
-
-void sprint_timespec (char *buf, struct tcb *tcp, long addr)
-{
-       if (addr == 0)
-               strcpy(buf, "NULL");
-       else if (!verbose(tcp))
-               sprintf(buf, "%#lx", addr);
-       else {
-               int     rc;
-
-#if defined(LINUX) && SUPPORTED_PERSONALITIES > 1
-               if (personality_wordsize[current_personality] == 4)
-               {
-                       struct timeval32 tv;
-
-                       if ((rc = umove(tcp, addr, &tv)) >= 0)
-                               sprintf(buf, "{%u, %u}",
-                                       tv.tv_sec, tv.tv_usec);
-               } else
-               {
-#endif
-                       struct timespec ts;
+       struct timezone tz;
 
-                       if ((rc = umove(tcp, addr, &ts)) >= 0)
-                               sprintf(buf, "{%lu, %lu}",
-                                       (unsigned long) ts.tv_sec,
-                                       (unsigned long) ts.tv_nsec);
-#if defined(LINUX) && SUPPORTED_PERSONALITIES > 1
-               }
-#endif
+       if (umove_or_printaddr(tcp, addr, &tz))
+               return;
 
-               if (rc < 0)
-                       strcpy(buf, "{...}");
-       }
+       tprintf("{tz_minuteswest=%d, tz_dsttime=%d}",
+               tz.tz_minuteswest, tz.tz_dsttime);
 }
 
-int
-sys_time(tcp)
-struct tcb *tcp;
+SYS_FUNC(gettimeofday)
 {
        if (exiting(tcp)) {
-#ifndef SVR4
-               printnum(tcp, tcp->u_arg[0], "%ld");
-#endif /* SVR4 */
+               print_timeval(tcp, tcp->u_arg[0]);
+               tprints(", ");
+               print_timezone(tcp, tcp->u_arg[1]);
        }
        return 0;
 }
 
-int
-sys_stime(tcp)
-struct tcb *tcp;
+#ifdef ALPHA
+SYS_FUNC(osf_gettimeofday)
 {
        if (exiting(tcp)) {
-               printnum(tcp, tcp->u_arg[0], "%ld");
+               print_timeval32(tcp, tcp->u_arg[0]);
+               tprints(", ");
+               print_timezone(tcp, tcp->u_arg[1]);
        }
        return 0;
 }
+#endif
 
-int
-sys_gettimeofday(tcp)
-struct tcb *tcp;
+SYS_FUNC(settimeofday)
 {
-       if (exiting(tcp)) {
-               if (syserror(tcp)) {
-                       tprintf("%#lx, %#lx",
-                               tcp->u_arg[0], tcp->u_arg[1]);
-                       return 0;
-               }
-               printtv(tcp, tcp->u_arg[0]);
-#ifndef SVR4
-               tprintf(", ");
-               printtv(tcp, tcp->u_arg[1]);
-#endif /* !SVR4 */
-       }
-       return 0;
-}
+       print_timeval(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       print_timezone(tcp, tcp->u_arg[1]);
 
+       return RVAL_DECODED;
+}
 
 #ifdef ALPHA
-int
-sys_osf_gettimeofday(tcp)
-struct tcb *tcp;
+SYS_FUNC(osf_settimeofday)
 {
-    if (exiting(tcp)) {
-       if (syserror(tcp)) {
-           tprintf("%#lx, %#lx",
-                   tcp->u_arg[0], tcp->u_arg[1]);
-           return 0;
-       }
-       printtv_bitness(tcp, tcp->u_arg[0], BITNESS_32, 0);
-#ifndef SVR4
-       tprintf(", ");
-       printtv_bitness(tcp, tcp->u_arg[1], BITNESS_32, 0);
-#endif /* !SVR4 */
-    }
-    return 0;
+       print_timeval32(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       print_timezone(tcp, tcp->u_arg[1]);
+
+       return RVAL_DECODED;
 }
 #endif
 
-int
-sys_settimeofday(tcp)
-struct tcb *tcp;
+SYS_FUNC(nanosleep)
 {
        if (entering(tcp)) {
-               printtv(tcp, tcp->u_arg[0]);
-#ifndef SVR4
-               tprintf(", ");
-               printtv(tcp, tcp->u_arg[1]);
-#endif /* !SVR4 */
+               print_timespec(tcp, tcp->u_arg[0]);
+               tprints(", ");
+       } else {
+
+               /*
+                * Second (returned) timespec is only significant if syscall
+                * was interrupted.  On success and in case of other errors we
+                * print only its address, since kernel doesn't modify it,
+                * and printing the value may show uninitialized data.
+                */
+               if (is_erestart(tcp)) {
+                       temporarily_clear_syserror(tcp);
+                       print_timespec(tcp, tcp->u_arg[1]);
+                       restore_cleared_syserror(tcp);
+               } else {
+                       printaddr(tcp->u_arg[1]);
+               }
        }
        return 0;
 }
 
-#ifdef ALPHA
-int
-sys_osf_settimeofday(tcp)
-struct tcb *tcp;
-{
-    if (entering(tcp)) {
-       printtv_bitness(tcp, tcp->u_arg[0], BITNESS_32, 0);
-#ifndef SVR4
-       tprintf(", ");
-       printtv_bitness(tcp, tcp->u_arg[1], BITNESS_32, 0);
-#endif /* !SVR4 */
-    }
-    return 0;
-}
-#endif
+#include "xlat/itimer_which.h"
 
-int
-sys_adjtime(tcp)
-struct tcb *tcp;
+SYS_FUNC(getitimer)
 {
        if (entering(tcp)) {
-               printtv(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               printxval(itimer_which, tcp->u_arg[0], "ITIMER_???");
+               tprints(", ");
        } else {
-               if (syserror(tcp))
-                       tprintf("%#lx", tcp->u_arg[1]);
-               else
-                       printtv(tcp, tcp->u_arg[1]);
+               print_itimerval(tcp, tcp->u_arg[1]);
        }
        return 0;
 }
 
-int
-sys_nanosleep(struct tcb *tcp)
+#ifdef ALPHA
+SYS_FUNC(osf_getitimer)
 {
        if (entering(tcp)) {
-               print_timespec(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               printxval(itimer_which, tcp->u_arg[0], "ITIMER_???");
+               tprints(", ");
        } else {
-               if (!tcp->u_arg[1] || is_restart_error(tcp))
-                       print_timespec(tcp, tcp->u_arg[1]);
-               else
-                       tprintf("%#lx", tcp->u_arg[1]);
+               print_itimerval32(tcp, tcp->u_arg[1]);
        }
        return 0;
 }
-
-static const struct xlat which[] = {
-       { ITIMER_REAL,  "ITIMER_REAL"   },
-       { ITIMER_VIRTUAL,"ITIMER_VIRTUAL"},
-       { ITIMER_PROF,  "ITIMER_PROF"   },
-       { 0,            NULL            },
-};
-
-static void
-printitv_bitness(struct tcb *tcp, long addr, enum bitness_t bitness)
-{
-       if (addr == 0)
-               tprintf("NULL");
-       else if (!verbose(tcp))
-               tprintf("%#lx", addr);
-       else
-       {
-               int     rc;
-
-               if (bitness == BITNESS_32
-#if defined(LINUX) && SUPPORTED_PERSONALITIES > 1
-                   || personality_wordsize[current_personality] == 4
 #endif
-                       )
-               {
-                       struct
-                       {
-                               struct timeval32 it_interval, it_value;
-                       } itv;
-
-                       if ((rc = umove(tcp, addr, &itv)) >= 0) {
-                               tprintf("{it_interval=");
-                               tprint_timeval32(tcp, &itv.it_interval);
-                               tprintf(", it_value=");
-                               tprint_timeval32(tcp, &itv.it_value);
-                               tprintf("}");
-                       }
-               } else
-               {
-                       struct itimerval itv;
-
-                       if ((rc = umove(tcp, addr, &itv)) >= 0) {
-                               tprintf("{it_interval=");
-                               tprint_timeval(tcp, &itv.it_interval);
-                               tprintf(", it_value=");
-                               tprint_timeval(tcp, &itv.it_value);
-                               tprintf("}");
-                       }
-               }
-
-               if (rc < 0)
-                       tprintf("{...}");
-       }
-}
 
-#define printitv(tcp, addr)    \
-       printitv_bitness((tcp), (addr), BITNESS_CURRENT)
-
-int
-sys_getitimer(tcp)
-struct tcb *tcp;
+SYS_FUNC(setitimer)
 {
        if (entering(tcp)) {
-               printxval(which, tcp->u_arg[0], "ITIMER_???");
-               tprintf(", ");
+               printxval(itimer_which, tcp->u_arg[0], "ITIMER_???");
+               tprints(", ");
+               print_itimerval(tcp, tcp->u_arg[1]);
+               tprints(", ");
        } else {
-               if (syserror(tcp))
-                       tprintf("%#lx", tcp->u_arg[1]);
-               else
-                       printitv(tcp, tcp->u_arg[1]);
+               print_itimerval(tcp, tcp->u_arg[2]);
        }
        return 0;
 }
 
-
 #ifdef ALPHA
-int
-sys_osf_getitimer(tcp)
-struct tcb *tcp;
-{
-    if (entering(tcp)) {
-       printxval(which, tcp->u_arg[0], "ITIMER_???");
-       tprintf(", ");
-    } else {
-       if (syserror(tcp))
-           tprintf("%#lx", tcp->u_arg[1]);
-       else
-           printitv_bitness(tcp, tcp->u_arg[1], BITNESS_32);
-    }
-    return 0;
-}
-#endif
-
-int
-sys_setitimer(tcp)
-struct tcb *tcp;
+SYS_FUNC(osf_setitimer)
 {
        if (entering(tcp)) {
-               printxval(which, tcp->u_arg[0], "ITIMER_???");
-               tprintf(", ");
-               printitv(tcp, tcp->u_arg[1]);
-               tprintf(", ");
+               printxval(itimer_which, tcp->u_arg[0], "ITIMER_???");
+               tprints(", ");
+               print_itimerval32(tcp, tcp->u_arg[1]);
+               tprints(", ");
        } else {
-               if (syserror(tcp))
-                       tprintf("%#lx", tcp->u_arg[2]);
-               else
-                       printitv(tcp, tcp->u_arg[2]);
+               print_itimerval32(tcp, tcp->u_arg[2]);
        }
        return 0;
 }
-
-#ifdef ALPHA
-int
-sys_osf_setitimer(tcp)
-struct tcb *tcp;
-{
-    if (entering(tcp)) {
-       printxval(which, tcp->u_arg[0], "ITIMER_???");
-       tprintf(", ");
-       printitv_bitness(tcp, tcp->u_arg[1], BITNESS_32);
-       tprintf(", ");
-    } else {
-       if (syserror(tcp))
-           tprintf("%#lx", tcp->u_arg[2]);
-       else
-           printitv_bitness(tcp, tcp->u_arg[2], BITNESS_32);
-    }
-    return 0;
-}
 #endif
 
-#ifdef LINUX
+#include "xlat/adjtimex_state.h"
 
-static const struct xlat adjtimex_modes[] = {
-  { 0, "0" },
-#ifdef ADJ_OFFSET
-  { ADJ_OFFSET, "ADJ_OFFSET" },
-#endif
-#ifdef ADJ_FREQUENCY
-  { ADJ_FREQUENCY, "ADJ_FREQUENCY" },
-#endif
-#ifdef ADJ_MAXERROR
-  { ADJ_MAXERROR, "ADJ_MAXERROR" },
-#endif
-#ifdef ADJ_ESTERROR
-  { ADJ_ESTERROR, "ADJ_ESTERROR" },
-#endif
-#ifdef ADJ_STATUS
-  { ADJ_STATUS, "ADJ_STATUS" },
-#endif
-#ifdef ADJ_TIMECONST
-  { ADJ_TIMECONST, "ADJ_TIMECONST" },
-#endif
-#ifdef ADJ_TICK
-  { ADJ_TICK, "ADJ_TICK" },
-#endif
-#ifdef ADJ_OFFSET_SINGLESHOT
-  { ADJ_OFFSET_SINGLESHOT, "ADJ_OFFSET_SINGLESHOT" },
-#endif
-  { 0,             NULL }
-};
-
-static const struct xlat adjtimex_status[] = {
-#ifdef STA_PLL
-  { STA_PLL, "STA_PLL" },
-#endif
-#ifdef STA_PPSFREQ
-  { STA_PPSFREQ, "STA_PPSFREQ" },
-#endif
-#ifdef STA_PPSTIME
-  { STA_PPSTIME, "STA_PPSTIME" },
-#endif
-#ifdef STA_FLL
-  { STA_FLL, "STA_FLL" },
-#endif
-#ifdef STA_INS
-  { STA_INS, "STA_INS" },
-#endif
-#ifdef STA_DEL
-  { STA_DEL, "STA_DEL" },
-#endif
-#ifdef STA_UNSYNC
-  { STA_UNSYNC, "STA_UNSYNC" },
-#endif
-#ifdef STA_FREQHOLD
-  { STA_FREQHOLD, "STA_FREQHOLD" },
-#endif
-#ifdef STA_PPSSIGNAL
-  { STA_PPSSIGNAL, "STA_PPSSIGNAL" },
-#endif
-#ifdef STA_PPSJITTER
-  { STA_PPSJITTER, "STA_PPSJITTER" },
-#endif
-#ifdef STA_PPSWANDER
-  { STA_PPSWANDER, "STA_PPSWANDER" },
-#endif
-#ifdef STA_PPSERROR
-  { STA_PPSERROR, "STA_PPSERROR" },
-#endif
-#ifdef STA_CLOCKERR
-  { STA_CLOCKERR, "STA_CLOCKERR" },
-#endif
-  { 0,             NULL }
-};
-
-static const struct xlat adjtimex_state[] = {
-#ifdef TIME_OK
-  { TIME_OK, "TIME_OK" },
-#endif
-#ifdef TIME_INS
-  { TIME_INS, "TIME_INS" },
-#endif
-#ifdef TIME_DEL
-  { TIME_DEL, "TIME_DEL" },
-#endif
-#ifdef TIME_OOP
-  { TIME_OOP, "TIME_OOP" },
-#endif
-#ifdef TIME_WAIT
-  { TIME_WAIT, "TIME_WAIT" },
-#endif
-#ifdef TIME_ERROR
-  { TIME_ERROR, "TIME_ERROR" },
-#endif
-  { 0,             NULL }
-};
-
-#if SUPPORTED_PERSONALITIES > 1
 static int
-tprint_timex32(struct tcb *tcp, long addr)
+do_adjtimex(struct tcb *const tcp, const kernel_ulong_t addr)
 {
-       struct
-       {
-               unsigned int modes;
-               int     offset;
-               int     freq;
-               int     maxerror;
-               int     esterror;
-               int     status;
-               int     constant;
-               int     precision;
-               int     tolerance;
-               struct timeval32 time;
-               int     tick;
-               int     ppsfreq;
-               int     jitter;
-               int     shift;
-               int     stabil;
-               int     jitcnt;
-               int     calcnt;
-               int     errcnt;
-               int     stbcnt;
-       } tx;
-
-       if (umove(tcp, addr, &tx) < 0)
-               return -1;
-
-       tprintf("{modes=");
-       printflags(adjtimex_modes, tx.modes, "ADJ_???");
-       tprintf(", offset=%d, freq=%d, maxerror=%d, ",
-               tx.offset, tx.freq, tx.maxerror);
-       tprintf("esterror=%u, status=", tx.esterror);
-       printflags(adjtimex_status, tx.status, "STA_???");
-       tprintf(", constant=%d, precision=%u, ",
-               tx.constant, tx.precision);
-       tprintf("tolerance=%d, time=", tx.tolerance);
-       tprint_timeval32(tcp, &tx.time);
-       tprintf(", tick=%d, ppsfreq=%d, jitter=%d",
-               tx.tick, tx.ppsfreq, tx.jitter);
-       tprintf(", shift=%d, stabil=%d, jitcnt=%d",
-               tx.shift, tx.stabil, tx.jitcnt);
-       tprintf(", calcnt=%d, errcnt=%d, stbcnt=%d",
-               tx.calcnt, tx.errcnt, tx.stbcnt);
-       tprintf("}");
+       if (print_timex(tcp, addr))
+               return 0;
+       tcp->auxstr = xlookup(adjtimex_state, (kernel_ulong_t) tcp->u_rval);
+       if (tcp->auxstr)
+               return RVAL_STR;
        return 0;
 }
-#endif /* SUPPORTED_PERSONALITIES > 1 */
 
-static int
-tprint_timex(struct tcb *tcp, long addr)
+SYS_FUNC(adjtimex)
 {
-       struct timex tx;
-
-#if SUPPORTED_PERSONALITIES > 1
-       if (personality_wordsize[current_personality] == 4)
-               return tprint_timex32(tcp, addr);
-#endif
-       if (umove(tcp, addr, &tx) < 0)
-               return -1;
-
-#if LINUX_VERSION_CODE < 66332
-       tprintf("{mode=%d, offset=%ld, frequency=%ld, ",
-               tx.mode, tx.offset, tx.frequency);
-       tprintf("maxerror=%ld, esterror=%lu, status=%u, ",
-               tx.maxerror, tx.esterror, tx.status);
-       tprintf("time_constant=%ld, precision=%lu, ",
-               tx.time_constant, tx.precision);
-       tprintf("tolerance=%ld, time=", tx.tolerance);
-       tprint_timeval(tcp, &tx.time);
-#else
-       tprintf("{modes=");
-       printflags(adjtimex_modes, tx.modes, "ADJ_???");
-       tprintf(", offset=%ld, freq=%ld, maxerror=%ld, ",
-               tx.offset, tx.freq, tx.maxerror);
-       tprintf("esterror=%lu, status=", tx.esterror);
-       printflags(adjtimex_status, tx.status, "STA_???");
-       tprintf(", constant=%ld, precision=%lu, ",
-               tx.constant, tx.precision);
-       tprintf("tolerance=%ld, time=", tx.tolerance);
-       tprint_timeval(tcp, &tx.time);
-       tprintf(", tick=%ld, ppsfreq=%ld, jitter=%ld",
-               tx.tick, tx.ppsfreq, tx.jitter);
-       tprintf(", shift=%d, stabil=%ld, jitcnt=%ld",
-               tx.shift, tx.stabil, tx.jitcnt);
-       tprintf(", calcnt=%ld, errcnt=%ld, stbcnt=%ld",
-               tx.calcnt, tx.errcnt, tx.stbcnt);
-#endif
-       tprintf("}");
+       if (exiting(tcp))
+               return do_adjtimex(tcp, tcp->u_arg[0]);
        return 0;
 }
 
-int
-sys_adjtimex(struct tcb *tcp)
-{
-       if (exiting(tcp)) {
-               if (tcp->u_arg[0] == 0)
-                       tprintf("NULL");
-               else if (syserror(tcp) || !verbose(tcp))
-                       tprintf("%#lx", tcp->u_arg[0]);
-               else if (tprint_timex(tcp, tcp->u_arg[0]) < 0)
-                       tprintf("{...}");
-               if (syserror(tcp))
-                       return 0;
-               tcp->auxstr = xlookup(adjtimex_state, tcp->u_rval);
-               if (tcp->auxstr)
-                       return RVAL_STR;
-       }
-       return 0;
-}
-
-static const struct xlat clockflags[] = {
-  { TIMER_ABSTIME, "TIMER_ABSTIME" },
-  { 0,             NULL }
-};
+#include "xlat/clockflags.h"
+#include "xlat/clocknames.h"
 
-static const struct xlat clocknames[] = {
-#ifdef CLOCK_REALTIME
-  { CLOCK_REALTIME, "CLOCK_REALTIME" },
-#endif
-#ifdef CLOCK_MONOTONIC
-  { CLOCK_MONOTONIC, "CLOCK_MONOTONIC" },
+static void
+printclockname(int clockid)
+{
+#ifdef CLOCKID_TO_FD
+# include "xlat/cpuclocknames.h"
+
+       if (clockid < 0) {
+               if ((clockid & CLOCKFD_MASK) == CLOCKFD)
+                       tprintf("FD_TO_CLOCKID(%d)", CLOCKID_TO_FD(clockid));
+               else {
+                       if(CPUCLOCK_PERTHREAD(clockid))
+                               tprintf("MAKE_THREAD_CPUCLOCK(%d,", CPUCLOCK_PID(clockid));
+                       else
+                               tprintf("MAKE_PROCESS_CPUCLOCK(%d,", CPUCLOCK_PID(clockid));
+                       printxval(cpuclocknames, clockid & CLOCKFD_MASK, "CPUCLOCK_???");
+                       tprints(")");
+               }
+       }
+       else
 #endif
-  { 0,             NULL }
-};
+               printxval(clocknames, clockid, "CLOCK_???");
+}
 
-int
-sys_clock_settime(tcp)
-struct tcb *tcp;
+SYS_FUNC(clock_settime)
 {
-       if (entering(tcp)) {
-               printxval(clocknames, tcp->u_arg[0], "CLOCK_???");
-               tprintf(", ");
-               printtv(tcp, tcp->u_arg[1]);
-       }
-       return 0;
+       printclockname(tcp->u_arg[0]);
+       tprints(", ");
+       print_timespec(tcp, tcp->u_arg[1]);
+
+       return RVAL_DECODED;
 }
 
-int
-sys_clock_gettime(tcp)
-struct tcb *tcp;
+SYS_FUNC(clock_gettime)
 {
        if (entering(tcp)) {
-               printxval(clocknames, tcp->u_arg[0], "CLOCK_???");
-               tprintf(", ");
+               printclockname(tcp->u_arg[0]);
+               tprints(", ");
        } else {
-               if (syserror(tcp))
-                       tprintf("%#lx", tcp->u_arg[1]);
-               else
-                       printtv(tcp, tcp->u_arg[1]);
+               print_timespec(tcp, tcp->u_arg[1]);
        }
        return 0;
 }
 
-int
-sys_clock_nanosleep(tcp)
-struct tcb *tcp;
+SYS_FUNC(clock_nanosleep)
 {
        if (entering(tcp)) {
-               printxval(clocknames, tcp->u_arg[0], "CLOCK_???");
-               tprintf(", ");
+               printclockname(tcp->u_arg[0]);
+               tprints(", ");
                printflags(clockflags, tcp->u_arg[1], "TIMER_???");
-               tprintf(", ");
-               printtv(tcp, tcp->u_arg[2]);
-               tprintf(", ");
+               tprints(", ");
+               print_timespec(tcp, tcp->u_arg[2]);
+               tprints(", ");
        } else {
-               if (syserror(tcp))
-                       tprintf("%#lx", tcp->u_arg[3]);
-               else
-                       printtv(tcp, tcp->u_arg[3]);
+               /*
+                * Second (returned) timespec is only significant
+                * if syscall was interrupted and flags is not TIMER_ABSTIME.
+                */
+               if (!tcp->u_arg[1] && is_erestart(tcp)) {
+                       temporarily_clear_syserror(tcp);
+                       print_timespec(tcp, tcp->u_arg[3]);
+                       restore_cleared_syserror(tcp);
+               } else {
+                       printaddr(tcp->u_arg[3]);
+               }
        }
        return 0;
 }
 
-#ifndef SIGEV_THREAD_ID
-# define SIGEV_THREAD_ID 4
-#endif
-static const struct xlat sigev_value[] = {
-       { SIGEV_SIGNAL+1, "SIGEV_SIGNAL" },
-       { SIGEV_NONE+1, "SIGEV_NONE" },
-       { SIGEV_THREAD+1, "SIGEV_THREAD" },
-       { SIGEV_THREAD_ID+1, "SIGEV_THREAD_ID" },
-       { 0, NULL }
-};
-
-#if SUPPORTED_PERSONALITIES > 1
-static void
-printsigevent32(struct tcb *tcp, long arg)
+SYS_FUNC(clock_adjtime)
 {
-       struct
-       {
-               int     sigev_value;
-               int     sigev_signo;
-               int     sigev_notify;
-
-               union
-               {
-                       int     tid;
-                       struct
-                       {
-                               int     function, attribute;
-                       } thread;
-               } un;
-       } sev;
-
-       if (umove(tcp, arg, &sev) < 0)
-               tprintf("{...}");
-       else
-       {
-               tprintf("{%#x, ", sev.sigev_value);
-               if (sev.sigev_notify == SIGEV_SIGNAL)
-                       tprintf("%s, ", signame(sev.sigev_signo));
-               else
-                       tprintf("%u, ", sev.sigev_signo);
-               printxval(sigev_value, sev.sigev_notify + 1, "SIGEV_???");
-               tprintf(", ");
-               if (sev.sigev_notify == SIGEV_THREAD_ID)
-                       tprintf("{%d}", sev.un.tid);
-               else if (sev.sigev_notify == SIGEV_THREAD)
-                       tprintf("{%#x, %#x}",
-                               sev.un.thread.function,
-                               sev.un.thread.attribute);
-               else
-                       tprintf("{...}");
-               tprintf("}");
-       }
-}
-#endif
-
-void
-printsigevent(struct tcb *tcp, long arg)
-{
-       struct sigevent sev;
-
-#if SUPPORTED_PERSONALITIES > 1
-       if (personality_wordsize[current_personality] == 4)
-       {
-               printsigevent32(tcp, arg);
-               return;
-       }
-#endif
-       if (umove (tcp, arg, &sev) < 0)
-               tprintf("{...}");
-       else {
-               tprintf("{%p, ", sev.sigev_value.sival_ptr);
-               if (sev.sigev_notify == SIGEV_SIGNAL)
-                       tprintf("%s, ", signame(sev.sigev_signo));
-               else
-                       tprintf("%u, ", sev.sigev_signo);
-               printxval(sigev_value, sev.sigev_notify+1, "SIGEV_???");
-               tprintf(", ");
-               if (sev.sigev_notify == SIGEV_THREAD_ID)
-                       /* _pad[0] is the _tid field which might not be
-                          present in the userlevel definition of the
-                          struct.  */
-                       tprintf("{%d}", sev._sigev_un._pad[0]);
-               else if (sev.sigev_notify == SIGEV_THREAD)
-                       tprintf("{%p, %p}", sev.sigev_notify_function,
-                               sev.sigev_notify_attributes);
-               else
-                       tprintf("{...}");
-               tprintf("}");
-       }
+       if (exiting(tcp))
+               return do_adjtimex(tcp, tcp->u_arg[1]);
+       printclockname(tcp->u_arg[0]);
+       tprints(", ");
+       return 0;
 }
 
-int
-sys_timer_create(tcp)
-struct tcb *tcp;
+SYS_FUNC(timer_create)
 {
        if (entering(tcp)) {
-               printxval(clocknames, tcp->u_arg[0], "CLOCK_???");
-               tprintf(", ");
-               printsigevent(tcp, tcp->u_arg[1]);
-               tprintf(", ");
+               printclockname(tcp->u_arg[0]);
+               tprints(", ");
+               print_sigevent(tcp, tcp->u_arg[1]);
+               tprints(", ");
        } else {
-               void *p;
-
-               if (syserror(tcp) || umove(tcp, tcp->u_arg[2], &p) < 0)
-                       tprintf("%#lx", tcp->u_arg[2]);
-               else
-                       tprintf("{%p}", p);
+               printnum_int(tcp, tcp->u_arg[2], "%d");
        }
        return 0;
 }
 
-int
-sys_timer_settime(tcp)
-struct tcb *tcp;
+SYS_FUNC(timer_settime)
 {
        if (entering(tcp)) {
-               tprintf("%#lx, ", tcp->u_arg[0]);
+               tprintf("%d, ", (int) tcp->u_arg[0]);
                printflags(clockflags, tcp->u_arg[1], "TIMER_???");
-               tprintf(", ");
-               printitv(tcp, tcp->u_arg[2]);
-               tprintf(", ");
+               tprints(", ");
+               print_itimerspec(tcp, tcp->u_arg[2]);
+               tprints(", ");
        } else {
-               if (syserror(tcp))
-                       tprintf("%#lx", tcp->u_arg[3]);
-               else
-                       printitv(tcp, tcp->u_arg[3]);
+               print_itimerspec(tcp, tcp->u_arg[3]);
        }
        return 0;
 }
 
-int
-sys_timer_gettime(tcp)
-struct tcb *tcp;
+SYS_FUNC(timer_gettime)
 {
        if (entering(tcp)) {
-               tprintf("%#lx, ", tcp->u_arg[0]);
+               tprintf("%d, ", (int) tcp->u_arg[0]);
        } else {
-               if (syserror(tcp))
-                       tprintf("%#lx", tcp->u_arg[1]);
-               else
-                       printitv(tcp, tcp->u_arg[1]);
+               print_itimerspec(tcp, tcp->u_arg[1]);
        }
        return 0;
 }
 
-static void
-print_rtc(tcp, rt)
-struct tcb *tcp;
-const struct rtc_time *rt;
-{
-       tprintf("{tm_sec=%d, tm_min=%d, tm_hour=%d, "
-               "tm_mday=%d, tm_mon=%d, tm_year=%d, ",
-               rt->tm_sec, rt->tm_min, rt->tm_hour,
-               rt->tm_mday, rt->tm_mon, rt->tm_year);
-       if (!abbrev(tcp))
-               tprintf("tm_wday=%d, tm_yday=%d, tm_isdst=%d}",
-                       rt->tm_wday, rt->tm_yday, rt->tm_isdst);
-       else
-               tprintf("...}");
-}
-
-int
-rtc_ioctl(tcp, code, arg)
-struct tcb *tcp;
-long code;
-long arg;
-{
-       switch (code) {
-       case RTC_ALM_SET:
-       case RTC_SET_TIME:
-               if (entering(tcp)) {
-                       struct rtc_time rt;
-                       if (umove(tcp, arg, &rt) < 0)
-                               tprintf(", %#lx", arg);
-                       else {
-                               tprintf(", ");
-                               print_rtc(tcp, &rt);
-                       }
-               }
-               break;
-       case RTC_ALM_READ:
-       case RTC_RD_TIME:
-               if (exiting(tcp)) {
-                       struct rtc_time rt;
-                       if (syserror(tcp) || umove(tcp, arg, &rt) < 0)
-                               tprintf(", %#lx", arg);
-                       else {
-                               tprintf(", ");
-                               print_rtc(tcp, &rt);
-                       }
-               }
-               break;
-       case RTC_IRQP_SET:
-       case RTC_EPOCH_SET:
-               if (entering(tcp))
-                       tprintf(", %lu", arg);
-               break;
-       case RTC_IRQP_READ:
-       case RTC_EPOCH_READ:
-               if (exiting(tcp))
-                       tprintf(", %lu", arg);
-               break;
-       case RTC_WKALM_SET:
-               if (entering(tcp)) {
-                       struct rtc_wkalrm wk;
-                       if (umove(tcp, arg, &wk) < 0)
-                               tprintf(", %#lx", arg);
-                       else {
-                               tprintf(", {enabled=%d, pending=%d, ",
-                                       wk.enabled, wk.pending);
-                               print_rtc(tcp, &wk.time);
-                               tprintf("}");
-                       }
-               }
-               break;
-       case RTC_WKALM_RD:
-               if (exiting(tcp)) {
-                       struct rtc_wkalrm wk;
-                       if (syserror(tcp) || umove(tcp, arg, &wk) < 0)
-                               tprintf(", %#lx", arg);
-                       else {
-                               tprintf(", {enabled=%d, pending=%d, ",
-                                       wk.enabled, wk.pending);
-                               print_rtc(tcp, &wk.time);
-                               tprintf("}");
-                       }
-               }
-               break;
-       default:
-               if (entering(tcp))
-                       tprintf(", %#lx", arg);
-               break;
-       }
-       return 1;
-}
-
-#ifndef TFD_TIMER_ABSTIME
-#define TFD_TIMER_ABSTIME (1 << 0)
-#endif
-
-static const struct xlat timerfdflags[] = {
-       { TFD_TIMER_ABSTIME,    "TFD_TIMER_ABSTIME"     },
-       { 0,                    NULL                    }
-};
+#include "xlat/timerfdflags.h"
 
-int
-sys_timerfd(tcp)
-struct tcb *tcp;
+SYS_FUNC(timerfd_create)
 {
-       if (entering(tcp)) {
-               /* It does not matter that the kernel uses itimerspec.  */
-               tprintf("%ld, ", tcp->u_arg[0]);
-               printxval(clocknames, tcp->u_arg[1], "CLOCK_???");
-               tprintf(", ");
-               printflags(timerfdflags, tcp->u_arg[2], "TFD_???");
-               tprintf(", ");
-               printitv(tcp, tcp->u_arg[3]);
-       }
-       return 0;
-}
+       printclockname(tcp->u_arg[0]);
+       tprints(", ");
+       printflags(timerfdflags, tcp->u_arg[1], "TFD_???");
 
-int
-sys_timerfd_create(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printxval(clocknames, tcp->u_arg[0], "CLOCK_???");
-               tprintf(", ");
-               printflags(timerfdflags, tcp->u_arg[1], "TFD_???");
-       }
-       return 0;
+       return RVAL_DECODED | RVAL_FD;
 }
 
-int
-sys_timerfd_settime(struct tcb *tcp)
+SYS_FUNC(timerfd_settime)
 {
        if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
                printflags(timerfdflags, tcp->u_arg[1], "TFD_???");
-               tprintf(", ");
-               printitv(tcp, tcp->u_arg[2]);
-               tprintf(", ");
-               printitv(tcp, tcp->u_arg[3]);
+               tprints(", ");
+               print_itimerspec(tcp, tcp->u_arg[2]);
+               tprints(", ");
+       } else {
+               print_itimerspec(tcp, tcp->u_arg[3]);
        }
        return 0;
 }
 
-int
-sys_timerfd_gettime(struct tcb *tcp)
+SYS_FUNC(timerfd_gettime)
 {
        if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-               tprintf(", ");
-               printitv(tcp, tcp->u_arg[1]);
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
+       } else {
+               print_itimerspec(tcp, tcp->u_arg[1]);
        }
        return 0;
 }
-
-#endif /* LINUX */