]> granicus.if.org Git - strace/blobdiff - time.c
Use XLAT_END macro
[strace] / time.c
diff --git a/time.c b/time.c
index 932c71f7e72b918e262e1730300a79463617cb4e..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>
@@ -43,7 +39,6 @@
 #ifndef UTIME_OMIT
 #define UTIME_OMIT ((1l << 30) - 2l)
 #endif
-#endif /* LINUX */
 
 struct timeval32
 {
@@ -66,126 +61,71 @@ tprint_timeval(struct tcb *tcp, const struct timeval *tv)
 void
 printtv_bitness(struct tcb *tcp, long addr, enum bitness_t bitness, int special)
 {
-       if (addr == 0)
-               tprints("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;
-
-                       rc = umove(tcp, addr, &tv);
-                       if (rc >= 0) {
-                               if (special && tv.tv_sec == 0 &&
-                                   tv.tv_usec == UTIME_NOW)
-                                       tprints("UTIME_NOW");
-                               else if (special && tv.tv_sec == 0 &&
-                                        tv.tv_usec == UTIME_OMIT)
-                                       tprints("UTIME_OMIT");
-                               else
-                                       tprint_timeval32(tcp, &tv);
-                       }
-               } else {
-                       struct timeval tv;
-
-                       rc = umove(tcp, addr, &tv);
-                       if (rc >= 0) {
-                               if (special && tv.tv_sec == 0 &&
-                                   tv.tv_usec == UTIME_NOW)
-                                       tprints("UTIME_NOW");
-                               else if (special && tv.tv_sec == 0 &&
-                                        tv.tv_usec == UTIME_OMIT)
-                                       tprints("UTIME_OMIT");
-                               else
-                                       tprint_timeval(tcp, &tv);
-                       }
-               }
-               if (rc < 0)
-                       tprints("{...}");
-       }
+       char buf[TIMEVAL_TEXT_BUFSIZE];
+       sprinttv(buf, tcp, addr, bitness, special);
+       tprints(buf);
 }
 
 char *
-sprinttv(struct tcb *tcp, long addr, enum bitness_t bitness, char *buf)
+sprinttv(char *buf, struct tcb *tcp, long addr, enum bitness_t bitness, int special)
 {
        int rc;
 
        if (addr == 0)
                return stpcpy(buf, "NULL");
 
-       if (!verbose(tcp)) {
-               buf += sprintf(buf, "%#lx", addr);
-               return buf;
-       }
+       if (!verbose(tcp))
+               return buf + sprintf(buf, "%#lx", addr);
 
        if (bitness == BITNESS_32
-#if defined(LINUX) && SUPPORTED_PERSONALITIES > 1
-           || personality_wordsize[current_personality] == 4
+#if SUPPORTED_PERSONALITIES > 1
+           || current_wordsize == 4
 #endif
                )
        {
                struct timeval32 tv;
 
                rc = umove(tcp, addr, &tv);
-               if (rc >= 0)
-                       buf += sprintf(buf, "{%u, %u}",
+               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;
 
                rc = umove(tcp, addr, &tv);
-               if (rc >= 0)
-                       buf += sprintf(buf, "{%lu, %lu}",
+               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);
+               }
        }
-       if (rc < 0)
-               buf = stpcpy(buf, "{...}");
 
-       return buf;
+       return stpcpy(buf, "{...}");
 }
 
-void print_timespec(struct tcb *tcp, long addr)
+void
+print_timespec(struct tcb *tcp, long addr)
 {
-       if (addr == 0)
-               tprints("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;
-
-                       rc = umove(tcp, addr, &tv);
-                       if (rc >= 0)
-                               tprintf("{%u, %u}",
-                                       tv.tv_sec, tv.tv_usec);
-               } else
-#endif
-               {
-                       struct timespec ts;
-
-                       rc = umove(tcp, addr, &ts);
-                       if (rc >= 0)
-                               tprintf("{%lu, %lu}",
-                                       (unsigned long) ts.tv_sec,
-                                       (unsigned long) ts.tv_nsec);
-               }
-               if (rc < 0)
-                       tprints("{...}");
-       }
+       char buf[TIMESPEC_TEXT_BUFSIZE];
+       sprint_timespec(buf, tcp, addr);
+       tprints(buf);
 }
 
-void sprint_timespec(char *buf, struct tcb *tcp, long addr)
+void
+sprint_timespec(char *buf, struct tcb *tcp, long addr)
 {
        if (addr == 0)
                strcpy(buf, "NULL");
@@ -194,8 +134,8 @@ void sprint_timespec(char *buf, struct tcb *tcp, long addr)
        else {
                int rc;
 
-#if defined(LINUX) && SUPPORTED_PERSONALITIES > 1
-               if (personality_wordsize[current_personality] == 4) {
+#if SUPPORTED_PERSONALITIES > 1
+               if (current_wordsize == 4) {
                        struct timeval32 tv;
 
                        rc = umove(tcp, addr, &tv);
@@ -222,9 +162,7 @@ int
 sys_time(struct tcb *tcp)
 {
        if (exiting(tcp)) {
-#ifndef SVR4
                printnum(tcp, tcp->u_arg[0], "%ld");
-#endif /* SVR4 */
        }
        return 0;
 }
@@ -248,15 +186,12 @@ sys_gettimeofday(struct tcb *tcp)
                        return 0;
                }
                printtv(tcp, tcp->u_arg[0]);
-#ifndef SVR4
                tprints(", ");
                printtv(tcp, tcp->u_arg[1]);
-#endif /* !SVR4 */
        }
        return 0;
 }
 
-
 #ifdef ALPHA
 int
 sys_osf_gettimeofday(struct tcb *tcp)
@@ -267,10 +202,8 @@ sys_osf_gettimeofday(struct tcb *tcp)
                        return 0;
                }
                printtv_bitness(tcp, tcp->u_arg[0], BITNESS_32, 0);
-#ifndef SVR4
                tprints(", ");
                printtv_bitness(tcp, tcp->u_arg[1], BITNESS_32, 0);
-#endif /* !SVR4 */
        }
        return 0;
 }
@@ -281,10 +214,8 @@ sys_settimeofday(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printtv(tcp, tcp->u_arg[0]);
-#ifndef SVR4
                tprints(", ");
                printtv(tcp, tcp->u_arg[1]);
-#endif /* !SVR4 */
        }
        return 0;
 }
@@ -295,10 +226,8 @@ sys_osf_settimeofday(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printtv_bitness(tcp, tcp->u_arg[0], BITNESS_32, 0);
-#ifndef SVR4
                tprints(", ");
                printtv_bitness(tcp, tcp->u_arg[1], BITNESS_32, 0);
-#endif /* !SVR4 */
        }
        return 0;
 }
@@ -326,19 +255,35 @@ sys_nanosleep(struct tcb *tcp)
                print_timespec(tcp, tcp->u_arg[0]);
                tprints(", ");
        } else {
-               if (!tcp->u_arg[1] || is_restart_error(tcp))
+               /* 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]);
-               else
-                       tprintf("%#lx", 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
@@ -352,8 +297,8 @@ printitv_bitness(struct tcb *tcp, long addr, enum bitness_t bitness)
                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
                        )
                {
@@ -404,7 +349,6 @@ sys_getitimer(struct tcb *tcp)
        return 0;
 }
 
-
 #ifdef ALPHA
 int
 sys_osf_getitimer(struct tcb *tcp)
@@ -458,100 +402,122 @@ sys_osf_setitimer(struct tcb *tcp)
 }
 #endif
 
-#ifdef LINUX
-
 static const struct xlat adjtimex_modes[] = {
-  { 0, "0" },
+       XLAT(0),
 #ifdef ADJ_OFFSET
-  { ADJ_OFFSET, "ADJ_OFFSET" },
+       XLAT(ADJ_OFFSET),
 #endif
 #ifdef ADJ_FREQUENCY
-  { ADJ_FREQUENCY, "ADJ_FREQUENCY" },
+       XLAT(ADJ_FREQUENCY),
 #endif
 #ifdef ADJ_MAXERROR
-  { ADJ_MAXERROR, "ADJ_MAXERROR" },
+       XLAT(ADJ_MAXERROR),
 #endif
 #ifdef ADJ_ESTERROR
-  { ADJ_ESTERROR, "ADJ_ESTERROR" },
+       XLAT(ADJ_ESTERROR),
 #endif
 #ifdef ADJ_STATUS
-  { ADJ_STATUS, "ADJ_STATUS" },
+       XLAT(ADJ_STATUS),
 #endif
 #ifdef ADJ_TIMECONST
-  { ADJ_TIMECONST, "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
-  { ADJ_TICK, "ADJ_TICK" },
+       XLAT(ADJ_TICK),
 #endif
 #ifdef ADJ_OFFSET_SINGLESHOT
-  { ADJ_OFFSET_SINGLESHOT, "ADJ_OFFSET_SINGLESHOT" },
+       XLAT(ADJ_OFFSET_SINGLESHOT),
+#endif
+#ifdef ADJ_OFFSET_SS_READ
+       XLAT(ADJ_OFFSET_SS_READ),
 #endif
-  { 0,             NULL }
+       XLAT_END
 };
 
 static const struct xlat adjtimex_status[] = {
 #ifdef STA_PLL
-  { STA_PLL, "STA_PLL" },
+       XLAT(STA_PLL),
 #endif
 #ifdef STA_PPSFREQ
-  { STA_PPSFREQ, "STA_PPSFREQ" },
+       XLAT(STA_PPSFREQ),
 #endif
 #ifdef STA_PPSTIME
-  { STA_PPSTIME, "STA_PPSTIME" },
+       XLAT(STA_PPSTIME),
 #endif
 #ifdef STA_FLL
-  { STA_FLL, "STA_FLL" },
+       XLAT(STA_FLL),
 #endif
 #ifdef STA_INS
-  { STA_INS, "STA_INS" },
+       XLAT(STA_INS),
 #endif
 #ifdef STA_DEL
-  { STA_DEL, "STA_DEL" },
+       XLAT(STA_DEL),
 #endif
 #ifdef STA_UNSYNC
-  { STA_UNSYNC, "STA_UNSYNC" },
+       XLAT(STA_UNSYNC),
 #endif
 #ifdef STA_FREQHOLD
-  { STA_FREQHOLD, "STA_FREQHOLD" },
+       XLAT(STA_FREQHOLD),
 #endif
 #ifdef STA_PPSSIGNAL
-  { STA_PPSSIGNAL, "STA_PPSSIGNAL" },
+       XLAT(STA_PPSSIGNAL),
 #endif
 #ifdef STA_PPSJITTER
-  { STA_PPSJITTER, "STA_PPSJITTER" },
+       XLAT(STA_PPSJITTER),
 #endif
 #ifdef STA_PPSWANDER
-  { STA_PPSWANDER, "STA_PPSWANDER" },
+       XLAT(STA_PPSWANDER),
 #endif
 #ifdef STA_PPSERROR
-  { STA_PPSERROR, "STA_PPSERROR" },
+       XLAT(STA_PPSERROR),
 #endif
 #ifdef STA_CLOCKERR
-  { STA_CLOCKERR, "STA_CLOCKERR" },
+       XLAT(STA_CLOCKERR),
 #endif
-  { 0,             NULL }
+#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
-  { TIME_OK, "TIME_OK" },
+       XLAT(TIME_OK),
 #endif
 #ifdef TIME_INS
-  { TIME_INS, "TIME_INS" },
+       XLAT(TIME_INS),
 #endif
 #ifdef TIME_DEL
-  { TIME_DEL, "TIME_DEL" },
+       XLAT(TIME_DEL),
 #endif
 #ifdef TIME_OOP
-  { TIME_OOP, "TIME_OOP" },
+       XLAT(TIME_OOP),
 #endif
 #ifdef TIME_WAIT
-  { TIME_WAIT, "TIME_WAIT" },
+       XLAT(TIME_WAIT),
 #endif
 #ifdef TIME_ERROR
-  { TIME_ERROR, "TIME_ERROR" },
+       XLAT(TIME_ERROR),
 #endif
-  { 0,             NULL }
+       XLAT_END
 };
 
 #if SUPPORTED_PERSONALITIES > 1
@@ -610,7 +576,7 @@ tprint_timex(struct tcb *tcp, long addr)
        struct timex tx;
 
 #if SUPPORTED_PERSONALITIES > 1
-       if (personality_wordsize[current_personality] == 4)
+       if (current_wordsize == 4)
                return tprint_timex32(tcp, addr);
 #endif
        if (umove(tcp, addr, &tx) < 0)
@@ -629,78 +595,114 @@ tprint_timex(struct tcb *tcp, long addr)
        tprints("{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);
+               (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, ",
-               tx.constant, tx.precision);
-       tprintf("tolerance=%ld, time=", tx.tolerance);
+               (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",
-               tx.tick, tx.ppsfreq, tx.jitter);
+               (long) tx.tick, (long) tx.ppsfreq, (long) tx.jitter);
        tprintf(", shift=%d, stabil=%ld, jitcnt=%ld",
-               tx.shift, tx.stabil, tx.jitcnt);
+               tx.shift, (long) tx.stabil, (long) tx.jitcnt);
        tprintf(", calcnt=%ld, errcnt=%ld, stbcnt=%ld",
-               tx.calcnt, tx.errcnt, tx.stbcnt);
+               (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)) {
-               if (tcp->u_arg[0] == 0)
-                       tprints("NULL");
-               else if (syserror(tcp) || !verbose(tcp))
-                       tprintf("%#lx", tcp->u_arg[0]);
-               else if (tprint_timex(tcp, tcp->u_arg[0]) < 0)
-                       tprints("{...}");
-               if (syserror(tcp))
-                       return 0;
-               tcp->auxstr = xlookup(adjtimex_state, tcp->u_rval);
-               if (tcp->auxstr)
-                       return RVAL_STR;
-       }
+       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
-  { CLOCK_PROCESS_CPUTIME_ID, "CLOCK_PROCESS_CPUTIME_ID" },
+       XLAT(CLOCK_PROCESS_CPUTIME_ID),
 #endif
 #ifdef CLOCK_THREAD_CPUTIME_ID
-  { CLOCK_THREAD_CPUTIME_ID, "CLOCK_THREAD_CPUTIME_ID" },
+       XLAT(CLOCK_THREAD_CPUTIME_ID),
 #endif
 #ifdef CLOCK_MONOTONIC_RAW
-  { CLOCK_MONOTONIC_RAW, "CLOCK_MONOTONIC_RAW" },
+       XLAT(CLOCK_MONOTONIC_RAW),
 #endif
 #ifdef CLOCK_REALTIME_COARSE
-  { CLOCK_REALTIME_COARSE, "CLOCK_REALTIME_COARSE" },
+       XLAT(CLOCK_REALTIME_COARSE),
 #endif
 #ifdef CLOCK_MONOTONIC_COARSE
-  { CLOCK_MONOTONIC_COARSE, "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(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               printxval(clocknames, tcp->u_arg[0], "CLOCK_???");
+               printclockname(tcp->u_arg[0]);
                tprints(", ");
                printtv(tcp, tcp->u_arg[1]);
        }
@@ -711,7 +713,7 @@ int
 sys_clock_gettime(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               printxval(clocknames, tcp->u_arg[0], "CLOCK_???");
+               printclockname(tcp->u_arg[0]);
                tprints(", ");
        } else {
                if (syserror(tcp))
@@ -726,7 +728,7 @@ int
 sys_clock_nanosleep(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               printxval(clocknames, tcp->u_arg[0], "CLOCK_???");
+               printclockname(tcp->u_arg[0]);
                tprints(", ");
                printflags(clockflags, tcp->u_arg[1], "TIMER_???");
                tprints(", ");
@@ -741,15 +743,25 @@ sys_clock_nanosleep(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
@@ -777,7 +789,7 @@ printsigevent32(struct tcb *tcp, long arg)
                        tprintf("%s, ", signame(sev.sigev_signo));
                else
                        tprintf("%u, ", sev.sigev_signo);
-               printxval(sigev_value, sev.sigev_notify + 1, "SIGEV_???");
+               printxval(sigev_value, sev.sigev_notify, "SIGEV_???");
                tprints(", ");
                if (sev.sigev_notify == SIGEV_THREAD_ID)
                        tprintf("{%d}", sev.un.tid);
@@ -798,7 +810,7 @@ printsigevent(struct tcb *tcp, long arg)
        struct sigevent sev;
 
 #if SUPPORTED_PERSONALITIES > 1
-       if (personality_wordsize[current_personality] == 4) {
+       if (current_wordsize == 4) {
                printsigevent32(tcp, arg);
                return;
        }
@@ -811,13 +823,20 @@ printsigevent(struct tcb *tcp, long arg)
                        tprintf("%s, ", signame(sev.sigev_signo));
                else
                        tprintf("%u, ", sev.sigev_signo);
-               printxval(sigev_value, sev.sigev_notify+1, "SIGEV_???");
+               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);
@@ -831,7 +850,7 @@ int
 sys_timer_create(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               printxval(clocknames, tcp->u_arg[0], "CLOCK_???");
+               printclockname(tcp->u_arg[0]);
                tprints(", ");
                printsigevent(tcp, tcp->u_arg[1]);
                tprints(", ");
@@ -969,8 +988,8 @@ rtc_ioctl(struct tcb *tcp, long code, long arg)
 #endif
 
 static const struct xlat timerfdflags[] = {
-       { TFD_TIMER_ABSTIME,    "TFD_TIMER_ABSTIME"     },
-       { 0,                    NULL                    }
+       XLAT(TFD_TIMER_ABSTIME),
+       XLAT_END
 };
 
 int
@@ -979,7 +998,7 @@ sys_timerfd(struct tcb *tcp)
        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_???");
+               printclockname(tcp->u_arg[0]);
                tprints(", ");
                printflags(timerfdflags, tcp->u_arg[2], "TFD_???");
                tprints(", ");
@@ -992,7 +1011,7 @@ int
 sys_timerfd_create(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               printxval(clocknames, tcp->u_arg[0], "CLOCK_???");
+               printclockname(tcp->u_arg[0]);
                tprints(", ");
                printflags(timerfdflags, tcp->u_arg[1], "TFD_???");
        }
@@ -1024,5 +1043,3 @@ sys_timerfd_gettime(struct tcb *tcp)
        }
        return 0;
 }
-
-#endif /* LINUX */