]> granicus.if.org Git - strace/blobdiff - time.c
Use XLAT_END macro
[strace] / time.c
diff --git a/time.c b/time.c
index 139af0f4b4d567634b6a7dfcdf1bc84b5dbf326e..9f47a71d8a64f0fea423bfc639b46b5a15c0120f 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 <sys/timex.h>
 #include <linux/ioctl.h>
 #include <linux/rtc.h>
-#endif /* LINUX */
+
+#ifndef UTIME_NOW
+#define UTIME_NOW ((1l << 30) - 1l)
+#endif
+#ifndef UTIME_OMIT
+#define UTIME_OMIT ((1l << 30) - 2l)
+#endif
 
 struct timeval32
 {
@@ -57,91 +59,116 @@ tprint_timeval(struct tcb *tcp, const struct timeval *tv)
 }
 
 void
-printtv_bitness(struct tcb *tcp, long addr, enum bitness_t bitness)
+printtv_bitness(struct tcb *tcp, long addr, enum bitness_t bitness, int special)
+{
+       char buf[TIMEVAL_TEXT_BUFSIZE];
+       sprinttv(buf, tcp, addr, bitness, special);
+       tprints(buf);
+}
+
+char *
+sprinttv(char *buf, struct tcb *tcp, long addr, enum bitness_t bitness, int special)
 {
+       int rc;
+
        if (addr == 0)
-               tprintf("NULL");
-       else if (!verbose(tcp))
-               tprintf("%#lx", addr);
-       else
-       {
-               int     rc;
+               return stpcpy(buf, "NULL");
 
-               if (bitness == BITNESS_32
-#if defined(LINUX) && SUPPORTED_PERSONALITIES > 1
-                   || personality_wordsize[current_personality] == 4
-#endif
-                       )
-               {
-                       struct timeval32 tv;
+       if (!verbose(tcp))
+               return buf + sprintf(buf, "%#lx", addr);
 
-                       if ((rc = umove(tcp, addr, &tv)) >= 0)
-                               tprint_timeval32(tcp, &tv);
-               } else
-               {
-                       struct timeval tv;
+       if (bitness == BITNESS_32
+#if SUPPORTED_PERSONALITIES > 1
+           || current_wordsize == 4
+#endif
+               )
+       {
+               struct timeval32 tv;
 
-                       if ((rc = umove(tcp, addr, &tv)) >= 0)
-                               tprint_timeval(tcp, &tv);
+               rc = umove(tcp, addr, &tv);
+               if (rc >= 0) {
+                       if (special && tv.tv_sec == 0) {
+                               if (tv.tv_usec == UTIME_NOW)
+                                       return stpcpy(buf, "UTIME_NOW");
+                               if (tv.tv_usec == UTIME_OMIT)
+                                       return stpcpy(buf, "UTIME_OMIT");
+                       }
+                       return buf + sprintf(buf, "{%u, %u}",
+                               tv.tv_sec, tv.tv_usec);
                }
+       } else {
+               struct timeval tv;
 
-               if (rc < 0)
-                       tprintf("{...}");
+               rc = umove(tcp, addr, &tv);
+               if (rc >= 0) {
+                       if (special && tv.tv_sec == 0) {
+                               if (tv.tv_usec == UTIME_NOW)
+                                       return stpcpy(buf, "UTIME_NOW");
+                               if (tv.tv_usec == UTIME_OMIT)
+                                       return stpcpy(buf, "UTIME_OMIT");
+                       }
+                       return buf + sprintf(buf, "{%lu, %lu}",
+                               (unsigned long) tv.tv_sec,
+                               (unsigned long) tv.tv_usec);
+               }
        }
+
+       return stpcpy(buf, "{...}");
 }
 
 void
-sprinttv(struct tcb *tcp, long addr, enum bitness_t bitness, char *buf)
+print_timespec(struct tcb *tcp, long addr)
+{
+       char buf[TIMESPEC_TEXT_BUFSIZE];
+       sprint_timespec(buf, tcp, addr);
+       tprints(buf);
+}
+
+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;
+       else {
+               int rc;
 
-               if (bitness == BITNESS_32
-#if defined(LINUX) && SUPPORTED_PERSONALITIES > 1
-                   || personality_wordsize[current_personality] == 4
-#endif
-                       )
-               {
+#if SUPPORTED_PERSONALITIES > 1
+               if (current_wordsize == 4) {
                        struct timeval32 tv;
 
-                       if ((rc = umove(tcp, addr, &tv)) >= 0)
+                       rc = umove(tcp, addr, &tv);
+                       if (rc >= 0)
                                sprintf(buf, "{%u, %u}",
                                        tv.tv_sec, tv.tv_usec);
                } else
+#endif
                {
-                       struct timeval tv;
+                       struct timespec ts;
 
-                       if ((rc = umove(tcp, addr, &tv)) >= 0)
+                       rc = umove(tcp, addr, &ts);
+                       if (rc >= 0)
                                sprintf(buf, "{%lu, %lu}",
-                                       (unsigned long) tv.tv_sec,
-                                       (unsigned long) tv.tv_usec);
+                                       (unsigned long) ts.tv_sec,
+                                       (unsigned long) ts.tv_nsec);
                }
-
                if (rc < 0)
                        strcpy(buf, "{...}");
        }
 }
 
 int
-sys_time(tcp)
-struct tcb *tcp;
+sys_time(struct tcb *tcp)
 {
        if (exiting(tcp)) {
-#ifndef SVR4
                printnum(tcp, tcp->u_arg[0], "%ld");
-#endif /* SVR4 */
        }
        return 0;
 }
 
 int
-sys_stime(tcp)
-struct tcb *tcp;
+sys_stime(struct tcb *tcp)
 {
        if (exiting(tcp)) {
                printnum(tcp, tcp->u_arg[0], "%ld");
@@ -150,8 +177,7 @@ struct tcb *tcp;
 }
 
 int
-sys_gettimeofday(tcp)
-struct tcb *tcp;
+sys_gettimeofday(struct tcb *tcp)
 {
        if (exiting(tcp)) {
                if (syserror(tcp)) {
@@ -160,73 +186,59 @@ struct tcb *tcp;
                        return 0;
                }
                printtv(tcp, tcp->u_arg[0]);
-#ifndef SVR4
-               tprintf(", ");
+               tprints(", ");
                printtv(tcp, tcp->u_arg[1]);
-#endif /* !SVR4 */
        }
        return 0;
 }
 
-
 #ifdef ALPHA
 int
-sys_osf_gettimeofday(tcp)
-struct tcb *tcp;
-{
-    if (exiting(tcp)) {
-       if (syserror(tcp)) {
-           tprintf("%#lx, %#lx",
-                   tcp->u_arg[0], tcp->u_arg[1]);
-           return 0;
+sys_osf_gettimeofday(struct tcb *tcp)
+{
+       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);
+               tprints(", ");
+               printtv_bitness(tcp, tcp->u_arg[1], BITNESS_32, 0);
        }
-       printtv_bitness(tcp, tcp->u_arg[0], BITNESS_32);
-#ifndef SVR4
-       tprintf(", ");
-       printtv_bitness(tcp, tcp->u_arg[1], BITNESS_32);
-#endif /* !SVR4 */
-    }
-    return 0;
+       return 0;
 }
 #endif
 
 int
-sys_settimeofday(tcp)
-struct tcb *tcp;
+sys_settimeofday(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printtv(tcp, tcp->u_arg[0]);
-#ifndef SVR4
-               tprintf(", ");
+               tprints(", ");
                printtv(tcp, tcp->u_arg[1]);
-#endif /* !SVR4 */
        }
        return 0;
 }
 
 #ifdef ALPHA
 int
-sys_osf_settimeofday(tcp)
-struct tcb *tcp;
+sys_osf_settimeofday(struct tcb *tcp)
 {
-    if (entering(tcp)) {
-       printtv_bitness(tcp, tcp->u_arg[0], BITNESS_32);
-#ifndef SVR4
-       tprintf(", ");
-       printtv_bitness(tcp, tcp->u_arg[1], BITNESS_32);
-#endif /* !SVR4 */
-    }
-    return 0;
+       if (entering(tcp)) {
+               printtv_bitness(tcp, tcp->u_arg[0], BITNESS_32, 0);
+               tprints(", ");
+               printtv_bitness(tcp, tcp->u_arg[1], BITNESS_32, 0);
+       }
+       return 0;
 }
 #endif
 
 int
-sys_adjtime(tcp)
-struct tcb *tcp;
+sys_adjtime(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printtv(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               tprints(", ");
        } else {
                if (syserror(tcp))
                        tprintf("%#lx", tcp->u_arg[1]);
@@ -236,55 +248,86 @@ struct tcb *tcp;
        return 0;
 }
 
+int
+sys_nanosleep(struct tcb *tcp)
+{
+       if (entering(tcp)) {
+               print_timespec(tcp, tcp->u_arg[0]);
+               tprints(", ");
+       } else {
+               /* Second (returned) timespec is only significant
+                * if syscall was interrupted. On success, we print
+                * only its address, since kernel doesn't modify it,
+                * and printing the value may show uninitialized data.
+                */
+               switch (tcp->u_error) {
+               default:
+                       /* Not interrupted (slept entire interval) */
+                       if (tcp->u_arg[1]) {
+                               tprintf("%#lx", tcp->u_arg[1]);
+                               break;
+                       }
+                       /* Fall through: print_timespec(NULL) prints "NULL" */
+               case ERESTARTSYS:
+               case ERESTARTNOINTR:
+               case ERESTARTNOHAND:
+               case ERESTART_RESTARTBLOCK:
+                       /* Interrupted */
+                       print_timespec(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            },
+       XLAT(ITIMER_REAL),
+       XLAT(ITIMER_VIRTUAL),
+       XLAT(ITIMER_PROF),
+       XLAT_END
 };
 
 static void
 printitv_bitness(struct tcb *tcp, long addr, enum bitness_t bitness)
 {
        if (addr == 0)
-               tprintf("NULL");
+               tprints("NULL");
        else if (!verbose(tcp))
                tprintf("%#lx", addr);
-       else
-       {
-               int     rc;
+       else {
+               int rc;
 
                if (bitness == BITNESS_32
-#if defined(LINUX) && SUPPORTED_PERSONALITIES > 1
-                   || personality_wordsize[current_personality] == 4
+#if SUPPORTED_PERSONALITIES > 1
+                   || current_wordsize == 4
 #endif
                        )
                {
-                       struct
-                       {
+                       struct {
                                struct timeval32 it_interval, it_value;
                        } itv;
 
-                       if ((rc = umove(tcp, addr, &itv)) >= 0)
-                               tprintf("{it_interval=");
+                       rc = umove(tcp, addr, &itv);
+                       if (rc >= 0) {
+                               tprints("{it_interval=");
                                tprint_timeval32(tcp, &itv.it_interval);
-                               tprintf(", it_value=");
+                               tprints(", it_value=");
                                tprint_timeval32(tcp, &itv.it_value);
-                               tprintf("}");
-               } else
-               {
+                               tprints("}");
+                       }
+               } else {
                        struct itimerval itv;
 
-                       if ((rc = umove(tcp, addr, &itv)) >= 0)
-                               tprintf("{it_interval=");
+                       rc = umove(tcp, addr, &itv);
+                       if (rc >= 0) {
+                               tprints("{it_interval=");
                                tprint_timeval(tcp, &itv.it_interval);
-                               tprintf(", it_value=");
+                               tprints(", it_value=");
                                tprint_timeval(tcp, &itv.it_value);
-                               tprintf("}");
+                               tprints("}");
+                       }
                }
-
                if (rc < 0)
-                       tprintf("{...}");
+                       tprints("{...}");
        }
 }
 
@@ -292,12 +335,11 @@ printitv_bitness(struct tcb *tcp, long addr, enum bitness_t bitness)
        printitv_bitness((tcp), (addr), BITNESS_CURRENT)
 
 int
-sys_getitimer(tcp)
-struct tcb *tcp;
+sys_getitimer(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printxval(which, tcp->u_arg[0], "ITIMER_???");
-               tprintf(", ");
+               tprints(", ");
        } else {
                if (syserror(tcp))
                        tprintf("%#lx", tcp->u_arg[1]);
@@ -307,34 +349,31 @@ struct tcb *tcp;
        return 0;
 }
 
-
 #ifdef ALPHA
 int
-sys_osf_getitimer(tcp)
-struct tcb *tcp;
+sys_osf_getitimer(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;
+       if (entering(tcp)) {
+               printxval(which, tcp->u_arg[0], "ITIMER_???");
+               tprints(", ");
+       } 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_setitimer(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printxval(which, tcp->u_arg[0], "ITIMER_???");
-               tprintf(", ");
+               tprints(", ");
                printitv(tcp, tcp->u_arg[1]);
-               tprintf(", ");
+               tprints(", ");
        } else {
                if (syserror(tcp))
                        tprintf("%#lx", tcp->u_arg[2]);
@@ -346,101 +385,336 @@ struct tcb *tcp;
 
 #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;
+sys_osf_setitimer(struct tcb *tcp)
+{
+       if (entering(tcp)) {
+               printxval(which, tcp->u_arg[0], "ITIMER_???");
+               tprints(", ");
+               printitv_bitness(tcp, tcp->u_arg[1], BITNESS_32);
+               tprints(", ");
+       } 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
+static const struct xlat adjtimex_modes[] = {
+       XLAT(0),
+#ifdef ADJ_OFFSET
+       XLAT(ADJ_OFFSET),
+#endif
+#ifdef ADJ_FREQUENCY
+       XLAT(ADJ_FREQUENCY),
+#endif
+#ifdef ADJ_MAXERROR
+       XLAT(ADJ_MAXERROR),
+#endif
+#ifdef ADJ_ESTERROR
+       XLAT(ADJ_ESTERROR),
+#endif
+#ifdef ADJ_STATUS
+       XLAT(ADJ_STATUS),
+#endif
+#ifdef ADJ_TIMECONST
+       XLAT(ADJ_TIMECONST),
+#endif
+#ifdef ADJ_TAI
+       XLAT(ADJ_TAI),
+#endif
+#ifdef ADJ_SETOFFSET
+       XLAT(ADJ_SETOFFSET),
+#endif
+#ifdef ADJ_MICRO
+       XLAT(ADJ_MICRO),
+#endif
+#ifdef ADJ_NANO
+       XLAT(ADJ_NANO),
+#endif
+#ifdef ADJ_TICK
+       XLAT(ADJ_TICK),
+#endif
+#ifdef ADJ_OFFSET_SINGLESHOT
+       XLAT(ADJ_OFFSET_SINGLESHOT),
+#endif
+#ifdef ADJ_OFFSET_SS_READ
+       XLAT(ADJ_OFFSET_SS_READ),
+#endif
+       XLAT_END
+};
 
-int
-sys_adjtimex(tcp)
-struct tcb *tcp;
+static const struct xlat adjtimex_status[] = {
+#ifdef STA_PLL
+       XLAT(STA_PLL),
+#endif
+#ifdef STA_PPSFREQ
+       XLAT(STA_PPSFREQ),
+#endif
+#ifdef STA_PPSTIME
+       XLAT(STA_PPSTIME),
+#endif
+#ifdef STA_FLL
+       XLAT(STA_FLL),
+#endif
+#ifdef STA_INS
+       XLAT(STA_INS),
+#endif
+#ifdef STA_DEL
+       XLAT(STA_DEL),
+#endif
+#ifdef STA_UNSYNC
+       XLAT(STA_UNSYNC),
+#endif
+#ifdef STA_FREQHOLD
+       XLAT(STA_FREQHOLD),
+#endif
+#ifdef STA_PPSSIGNAL
+       XLAT(STA_PPSSIGNAL),
+#endif
+#ifdef STA_PPSJITTER
+       XLAT(STA_PPSJITTER),
+#endif
+#ifdef STA_PPSWANDER
+       XLAT(STA_PPSWANDER),
+#endif
+#ifdef STA_PPSERROR
+       XLAT(STA_PPSERROR),
+#endif
+#ifdef STA_CLOCKERR
+       XLAT(STA_CLOCKERR),
+#endif
+#ifdef STA_NANO
+       XLAT(STA_NANO),
+#endif
+#ifdef STA_MODE
+       XLAT(STA_MODE),
+#endif
+#ifdef STA_CLK
+       XLAT(STA_CLK),
+#endif
+       XLAT_END
+};
+
+static const struct xlat adjtimex_state[] = {
+#ifdef TIME_OK
+       XLAT(TIME_OK),
+#endif
+#ifdef TIME_INS
+       XLAT(TIME_INS),
+#endif
+#ifdef TIME_DEL
+       XLAT(TIME_DEL),
+#endif
+#ifdef TIME_OOP
+       XLAT(TIME_OOP),
+#endif
+#ifdef TIME_WAIT
+       XLAT(TIME_WAIT),
+#endif
+#ifdef TIME_ERROR
+       XLAT(TIME_ERROR),
+#endif
+       XLAT_END
+};
+
+#if SUPPORTED_PERSONALITIES > 1
+static int
+tprint_timex32(struct tcb *tcp, long addr)
 {
-       struct timex txc;
+       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;
+
+       tprints("{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);
+       tprints("}");
+       return 0;
+}
+#endif /* SUPPORTED_PERSONALITIES > 1 */
+
+static int
+tprint_timex(struct tcb *tcp, long addr)
+{
+       struct timex tx;
+
+#if SUPPORTED_PERSONALITIES > 1
+       if (current_wordsize == 4)
+               return tprint_timex32(tcp, addr);
+#endif
+       if (umove(tcp, addr, &tx) < 0)
+               return -1;
 
-       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 (umove(tcp, tcp->u_arg[0], &txc) < 0)
-                       tprintf("{...}");
-               else {
 #if LINUX_VERSION_CODE < 66332
-                       tprintf("{mode=%d, offset=%ld, frequency=%ld, ",
-                               txc.mode, txc.offset, txc.frequency);
-                       tprintf("maxerror=%ld, esterror=%lu, status=%u, ",
-                               txc.maxerror, txc.esterror, txc.status);
-                       tprintf("time_constant=%ld, precision=%lu, ",
-                               txc.time_constant, txc.precision);
-                       tprintf("tolerance=%ld, time=", txc.tolerance);
-                       tprint_timeval(tcp, &txc.time);
+       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=%d, offset=%ld, freq=%ld, ",
-                               txc.modes, txc.offset, txc.freq);
-                       tprintf("maxerror=%ld, esterror=%lu, status=%u, ",
-                               txc.maxerror, txc.esterror, txc.status);
-                       tprintf("constant=%ld, precision=%lu, ",
-                               txc.constant, txc.precision);
-                       tprintf("tolerance=%ld, time=", txc.tolerance);
-                       tprint_timeval(tcp, &txc.time);
-                       /* there's a bunch of other stuff, but it's not
-                        * worth the time or the trouble to include */
-#endif
-                       tprintf("}");
-               }
-       }
+       tprints("{modes=");
+       printflags(adjtimex_modes, tx.modes, "ADJ_???");
+       tprintf(", offset=%ld, freq=%ld, maxerror=%ld, ",
+               (long) tx.offset, (long) tx.freq, (long) tx.maxerror);
+       tprintf("esterror=%lu, status=", (long) tx.esterror);
+       printflags(adjtimex_status, tx.status, "STA_???");
+       tprintf(", constant=%ld, precision=%lu, ",
+               (long) tx.constant, (long) tx.precision);
+       tprintf("tolerance=%ld, time=", (long) tx.tolerance);
+       tprint_timeval(tcp, &tx.time);
+       tprintf(", tick=%ld, ppsfreq=%ld, jitter=%ld",
+               (long) tx.tick, (long) tx.ppsfreq, (long) tx.jitter);
+       tprintf(", shift=%d, stabil=%ld, jitcnt=%ld",
+               tx.shift, (long) tx.stabil, (long) tx.jitcnt);
+       tprintf(", calcnt=%ld, errcnt=%ld, stbcnt=%ld",
+               (long) tx.calcnt, (long) tx.errcnt, (long) tx.stbcnt);
+#endif
+       tprints("}");
+       return 0;
+}
+
+static int
+do_adjtimex(struct tcb *tcp, long addr)
+{
+       if (addr == 0)
+               tprints("NULL");
+       else if (syserror(tcp) || !verbose(tcp))
+               tprintf("%#lx", addr);
+       else if (tprint_timex(tcp, addr) < 0)
+               tprints("{...}");
+       if (syserror(tcp))
+               return 0;
+       tcp->auxstr = xlookup(adjtimex_state, tcp->u_rval);
+       if (tcp->auxstr)
+               return RVAL_STR;
+       return 0;
+}
+
+int
+sys_adjtimex(struct tcb *tcp)
+{
+       if (exiting(tcp))
+               return do_adjtimex(tcp, tcp->u_arg[0]);
        return 0;
 }
 
 static const struct xlat clockflags[] = {
-  { TIMER_ABSTIME, "TIMER_ABSTIME" },
-  { 0,             NULL }
+       XLAT(TIMER_ABSTIME),
+       XLAT_END
 };
 
 static const struct xlat clocknames[] = {
 #ifdef CLOCK_REALTIME
-  { CLOCK_REALTIME, "CLOCK_REALTIME" },
+       XLAT(CLOCK_REALTIME),
 #endif
 #ifdef CLOCK_MONOTONIC
-  { CLOCK_MONOTONIC, "CLOCK_MONOTONIC" },
+       XLAT(CLOCK_MONOTONIC),
+#endif
+#ifdef CLOCK_PROCESS_CPUTIME_ID
+       XLAT(CLOCK_PROCESS_CPUTIME_ID),
+#endif
+#ifdef CLOCK_THREAD_CPUTIME_ID
+       XLAT(CLOCK_THREAD_CPUTIME_ID),
+#endif
+#ifdef CLOCK_MONOTONIC_RAW
+       XLAT(CLOCK_MONOTONIC_RAW),
+#endif
+#ifdef CLOCK_REALTIME_COARSE
+       XLAT(CLOCK_REALTIME_COARSE),
+#endif
+#ifdef CLOCK_MONOTONIC_COARSE
+       XLAT(CLOCK_MONOTONIC_COARSE),
 #endif
-  { 0,             NULL }
+       XLAT_END
 };
 
+#ifdef CLOCKID_TO_FD
+static const struct xlat cpuclocknames[] = {
+       XLAT(CPUCLOCK_PROF),
+       XLAT(CPUCLOCK_VIRT),
+       XLAT(CPUCLOCK_SCHED),
+       XLAT_END
+};
+#endif
+
+static void
+printclockname(int clockid)
+{
+#ifdef CLOCKID_TO_FD
+       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
+               printxval(clocknames, clockid, "CLOCK_???");
+}
+
 int
-sys_clock_settime(tcp)
-struct tcb *tcp;
+sys_clock_settime(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               printxval(clocknames, tcp->u_arg[0], "CLOCK_???");
-               tprintf(", ");
+               printclockname(tcp->u_arg[0]);
+               tprints(", ");
                printtv(tcp, tcp->u_arg[1]);
        }
        return 0;
 }
 
 int
-sys_clock_gettime(tcp)
-struct tcb *tcp;
+sys_clock_gettime(struct tcb *tcp)
 {
        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]);
@@ -451,16 +725,15 @@ struct tcb *tcp;
 }
 
 int
-sys_clock_nanosleep(tcp)
-struct tcb *tcp;
+sys_clock_nanosleep(struct tcb *tcp)
 {
        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(", ");
+               tprints(", ");
                printtv(tcp, tcp->u_arg[2]);
-               tprintf(", ");
+               tprints(", ");
        } else {
                if (syserror(tcp))
                        tprintf("%#lx", tcp->u_arg[3]);
@@ -470,77 +743,137 @@ struct tcb *tcp;
        return 0;
 }
 
+int
+sys_clock_adjtime(struct tcb *tcp)
+{
+       if (exiting(tcp))
+               return do_adjtimex(tcp, tcp->u_arg[1]);
+       printclockname(tcp->u_arg[0]);
+       tprints(", ");
+       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 }
+       XLAT(SIGEV_SIGNAL),
+       XLAT(SIGEV_NONE),
+       XLAT(SIGEV_THREAD),
+       XLAT(SIGEV_THREAD_ID),
+       XLAT_END
 };
 
+#if SUPPORTED_PERSONALITIES > 1
+static void
+printsigevent32(struct tcb *tcp, long arg)
+{
+       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)
+               tprints("{...}");
+       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, "SIGEV_???");
+               tprints(", ");
+               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
+                       tprints("{...}");
+               tprints("}");
+       }
+}
+#endif
+
 void
-printsigevent(tcp, arg)
-struct tcb *tcp;
-long arg;
+printsigevent(struct tcb *tcp, long arg)
 {
        struct sigevent sev;
-       if (umove (tcp, arg, &sev) < 0)
-               tprintf("{...}");
+
+#if SUPPORTED_PERSONALITIES > 1
+       if (current_wordsize == 4) {
+               printsigevent32(tcp, arg);
+               return;
+       }
+#endif
+       if (umove(tcp, arg, &sev) < 0)
+               tprints("{...}");
        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(", ");
+               printxval(sigev_value, sev.sigev_notify, "SIGEV_???");
+               tprints(", ");
                if (sev.sigev_notify == SIGEV_THREAD_ID)
+#if defined(HAVE_STRUCT_SIGEVENT__SIGEV_UN__PAD)
                        /* _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]);
+#elif defined(HAVE_STRUCT_SIGEVENT___PAD)
+                       tprintf("{%d}", sev.__pad[0]);
+#else
+# warning unfamiliar struct sigevent => incomplete SIGEV_THREAD_ID decoding
+                       tprints("{...}");
+#endif
                else if (sev.sigev_notify == SIGEV_THREAD)
                        tprintf("{%p, %p}", sev.sigev_notify_function,
                                sev.sigev_notify_attributes);
                else
-                       tprintf("{...}");
-               tprintf("}");
+                       tprints("{...}");
+               tprints("}");
        }
 }
 
 int
-sys_timer_create(tcp)
-struct tcb *tcp;
+sys_timer_create(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               printxval(clocknames, tcp->u_arg[0], "CLOCK_???");
-               tprintf(", ");
+               printclockname(tcp->u_arg[0]);
+               tprints(", ");
                printsigevent(tcp, tcp->u_arg[1]);
-               tprintf(", ");
+               tprints(", ");
        } else {
-               void *p;
+               int timer_id;
 
-               if (syserror(tcp) || umove(tcp, tcp->u_arg[2], &p) < 0)
+               if (syserror(tcp) || umove(tcp, tcp->u_arg[2], &timer_id) < 0)
                        tprintf("%#lx", tcp->u_arg[2]);
                else
-                       tprintf("{%p}", p);
+                       tprintf("{%d}", timer_id);
        }
        return 0;
 }
 
 int
-sys_timer_settime(tcp)
-struct tcb *tcp;
+sys_timer_settime(struct tcb *tcp)
 {
        if (entering(tcp)) {
                tprintf("%#lx, ", tcp->u_arg[0]);
                printflags(clockflags, tcp->u_arg[1], "TIMER_???");
-               tprintf(", ");
+               tprints(", ");
                printitv(tcp, tcp->u_arg[2]);
-               tprintf(", ");
+               tprints(", ");
        } else {
                if (syserror(tcp))
                        tprintf("%#lx", tcp->u_arg[3]);
@@ -551,8 +884,7 @@ struct tcb *tcp;
 }
 
 int
-sys_timer_gettime(tcp)
-struct tcb *tcp;
+sys_timer_gettime(struct tcb *tcp)
 {
        if (entering(tcp)) {
                tprintf("%#lx, ", tcp->u_arg[0]);
@@ -566,9 +898,7 @@ struct tcb *tcp;
 }
 
 static void
-print_rtc(tcp, rt)
-struct tcb *tcp;
-const struct rtc_time *rt;
+print_rtc(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, ",
@@ -578,14 +908,11 @@ const struct rtc_time *rt;
                tprintf("tm_wday=%d, tm_yday=%d, tm_isdst=%d}",
                        rt->tm_wday, rt->tm_yday, rt->tm_isdst);
        else
-               tprintf("...}");
+               tprints("...}");
 }
 
 int
-rtc_ioctl(tcp, code, arg)
-struct tcb *tcp;
-long code;
-long arg;
+rtc_ioctl(struct tcb *tcp, long code, long arg)
 {
        switch (code) {
        case RTC_ALM_SET:
@@ -595,7 +922,7 @@ long arg;
                        if (umove(tcp, arg, &rt) < 0)
                                tprintf(", %#lx", arg);
                        else {
-                               tprintf(", ");
+                               tprints(", ");
                                print_rtc(tcp, &rt);
                        }
                }
@@ -607,7 +934,7 @@ long arg;
                        if (syserror(tcp) || umove(tcp, arg, &rt) < 0)
                                tprintf(", %#lx", arg);
                        else {
-                               tprintf(", ");
+                               tprints(", ");
                                print_rtc(tcp, &rt);
                        }
                }
@@ -631,7 +958,7 @@ long arg;
                                tprintf(", {enabled=%d, pending=%d, ",
                                        wk.enabled, wk.pending);
                                print_rtc(tcp, &wk.time);
-                               tprintf("}");
+                               tprints("}");
                        }
                }
                break;
@@ -644,7 +971,7 @@ long arg;
                                tprintf(", {enabled=%d, pending=%d, ",
                                        wk.enabled, wk.pending);
                                print_rtc(tcp, &wk.time);
-                               tprintf("}");
+                               tprints("}");
                        }
                }
                break;
@@ -655,4 +982,64 @@ long arg;
        }
        return 1;
 }
-#endif /* LINUX */
+
+#ifndef TFD_TIMER_ABSTIME
+#define TFD_TIMER_ABSTIME (1 << 0)
+#endif
+
+static const struct xlat timerfdflags[] = {
+       XLAT(TFD_TIMER_ABSTIME),
+       XLAT_END
+};
+
+int
+sys_timerfd(struct tcb *tcp)
+{
+       if (entering(tcp)) {
+               /* It does not matter that the kernel uses itimerspec.  */
+               tprintf("%ld, ", tcp->u_arg[0]);
+               printclockname(tcp->u_arg[0]);
+               tprints(", ");
+               printflags(timerfdflags, tcp->u_arg[2], "TFD_???");
+               tprints(", ");
+               printitv(tcp, tcp->u_arg[3]);
+       }
+       return 0;
+}
+
+int
+sys_timerfd_create(struct tcb *tcp)
+{
+       if (entering(tcp)) {
+               printclockname(tcp->u_arg[0]);
+               tprints(", ");
+               printflags(timerfdflags, tcp->u_arg[1], "TFD_???");
+       }
+       return 0;
+}
+
+int
+sys_timerfd_settime(struct tcb *tcp)
+{
+       if (entering(tcp)) {
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
+               printflags(timerfdflags, tcp->u_arg[1], "TFD_???");
+               tprints(", ");
+               printitv(tcp, tcp->u_arg[2]);
+               tprints(", ");
+               printitv(tcp, tcp->u_arg[3]);
+       }
+       return 0;
+}
+
+int
+sys_timerfd_gettime(struct tcb *tcp)
+{
+       if (entering(tcp)) {
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
+               printitv(tcp, tcp->u_arg[1]);
+       }
+       return 0;
+}