* 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>
#ifndef UTIME_OMIT
#define UTIME_OMIT ((1l << 30) - 2l)
#endif
-#endif /* LINUX */
struct timeval32
{
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("{...}");
- }
+ char buf[TIMEVAL_TEXT_BUFSIZE];
+ sprinttv(buf, tcp, addr, bitness, special);
+ tprints(buf);
}
-void
-sprinttv(struct tcb *tcp, long addr, enum bitness_t bitness, char *buf)
+char *
+sprinttv(char *buf, struct tcb *tcp, long addr, enum bitness_t bitness, int special)
{
- if (addr == 0)
- strcpy(buf, "NULL");
- else if (!verbose(tcp))
- sprintf(buf, "%#lx", addr);
- else {
- int rc;
+ int rc;
- if (bitness == BITNESS_32
-#if defined(LINUX) && SUPPORTED_PERSONALITIES > 1
- || personality_wordsize[current_personality] == 4
-#endif
- )
- {
- struct timeval32 tv;
+ if (addr == 0)
+ return stpcpy(buf, "NULL");
- if ((rc = umove(tcp, addr, &tv)) >= 0)
- sprintf(buf, "{%u, %u}",
- tv.tv_sec, tv.tv_usec);
- } else {
- struct timeval tv;
+ if (!verbose(tcp))
+ return buf + sprintf(buf, "%#lx", addr);
- if ((rc = umove(tcp, addr, &tv)) >= 0)
- sprintf(buf, "{%lu, %lu}",
- (unsigned long) tv.tv_sec,
- (unsigned long) tv.tv_usec);
+ if (bitness == BITNESS_32
+#if SUPPORTED_PERSONALITIES > 1
+ || current_wordsize == 4
+#endif
+ )
+ {
+ struct timeval32 tv;
+
+ rc = umove(tcp, addr, &tv);
+ if (rc >= 0) {
+ if (special) {
+ 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) {
+ if (special) {
+ 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)
- strcpy(buf, "{...}");
}
+
+ return stpcpy(buf, "{...}");
}
-void print_timespec(struct tcb *tcp, long addr)
+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 (rc < 0)
- tprintf("{...}");
- }
+ 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");
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;
- 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
{
struct timespec ts;
- if ((rc = umove(tcp, addr, &ts)) >= 0)
+ rc = umove(tcp, addr, &ts);
+ if (rc >= 0)
sprintf(buf, "{%lu, %lu}",
(unsigned long) ts.tv_sec,
(unsigned long) ts.tv_nsec);
int
sys_time(struct tcb *tcp)
-{
- if (exiting(tcp)) {
-#ifndef SVR4
- printnum(tcp, tcp->u_arg[0], "%ld");
-#endif /* SVR4 */
- }
- return 0;
-}
-
-int
-sys_stime(struct tcb *tcp)
{
if (exiting(tcp)) {
printnum(tcp, tcp->u_arg[0], "%ld");
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(struct tcb *tcp)
return 0;
}
printtv_bitness(tcp, tcp->u_arg[0], BITNESS_32, 0);
-#ifndef SVR4
- tprintf(", ");
+ tprints(", ");
printtv_bitness(tcp, tcp->u_arg[1], BITNESS_32, 0);
-#endif /* !SVR4 */
}
return 0;
}
{
if (entering(tcp)) {
printtv(tcp, tcp->u_arg[0]);
-#ifndef SVR4
- tprintf(", ");
+ tprints(", ");
printtv(tcp, tcp->u_arg[1]);
-#endif /* !SVR4 */
}
return 0;
}
{
if (entering(tcp)) {
printtv_bitness(tcp, tcp->u_arg[0], BITNESS_32, 0);
-#ifndef SVR4
- tprintf(", ");
+ tprints(", ");
printtv_bitness(tcp, tcp->u_arg[1], BITNESS_32, 0);
-#endif /* !SVR4 */
}
return 0;
}
{
if (entering(tcp)) {
printtv(tcp, tcp->u_arg[0]);
- tprintf(", ");
+ tprints(", ");
} else {
if (syserror(tcp))
tprintf("%#lx", tcp->u_arg[1]);
{
if (entering(tcp)) {
print_timespec(tcp, tcp->u_arg[0]);
- tprintf(", ");
+ 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 },
-};
+#include "xlat/itimer_which.h"
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;
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 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("}");
+ 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("{...}");
}
}
sys_getitimer(struct tcb *tcp)
{
if (entering(tcp)) {
- printxval(which, tcp->u_arg[0], "ITIMER_???");
- tprintf(", ");
+ printxval(itimer_which, tcp->u_arg[0], "ITIMER_???");
+ tprints(", ");
} else {
if (syserror(tcp))
tprintf("%#lx", tcp->u_arg[1]);
return 0;
}
-
#ifdef ALPHA
int
sys_osf_getitimer(struct tcb *tcp)
{
if (entering(tcp)) {
- printxval(which, tcp->u_arg[0], "ITIMER_???");
- tprintf(", ");
+ printxval(itimer_which, tcp->u_arg[0], "ITIMER_???");
+ tprints(", ");
} else {
if (syserror(tcp))
tprintf("%#lx", tcp->u_arg[1]);
sys_setitimer(struct tcb *tcp)
{
if (entering(tcp)) {
- printxval(which, tcp->u_arg[0], "ITIMER_???");
- tprintf(", ");
+ printxval(itimer_which, tcp->u_arg[0], "ITIMER_???");
+ tprints(", ");
printitv(tcp, tcp->u_arg[1]);
- tprintf(", ");
+ tprints(", ");
} else {
if (syserror(tcp))
tprintf("%#lx", tcp->u_arg[2]);
sys_osf_setitimer(struct tcb *tcp)
{
if (entering(tcp)) {
- printxval(which, tcp->u_arg[0], "ITIMER_???");
- tprintf(", ");
+ printxval(itimer_which, tcp->u_arg[0], "ITIMER_???");
+ tprints(", ");
printitv_bitness(tcp, tcp->u_arg[1], BITNESS_32);
- tprintf(", ");
+ tprints(", ");
} else {
if (syserror(tcp))
tprintf("%#lx", tcp->u_arg[2]);
}
#endif
-#ifdef LINUX
-
-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 }
-};
+#include "xlat/adjtimex_modes.h"
+#include "xlat/adjtimex_status.h"
+#include "xlat/adjtimex_state.h"
#if SUPPORTED_PERSONALITIES > 1
static int
if (umove(tcp, addr, &tx) < 0)
return -1;
- tprintf("{modes=");
+ tprints("{modes=");
printflags(adjtimex_modes, tx.modes, "ADJ_???");
tprintf(", offset=%d, freq=%d, maxerror=%d, ",
tx.offset, tx.freq, tx.maxerror);
tx.shift, tx.stabil, tx.jitcnt);
tprintf(", calcnt=%d, errcnt=%d, stbcnt=%d",
tx.calcnt, tx.errcnt, tx.stbcnt);
- tprintf("}");
+ tprints("}");
return 0;
}
#endif /* SUPPORTED_PERSONALITIES > 1 */
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)
tprintf("tolerance=%ld, time=", tx.tolerance);
tprint_timeval(tcp, &tx.time);
#else
- tprintf("{modes=");
+ 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
- tprintf("}");
+ 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)
- 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;
- }
+ if (exiting(tcp))
+ return do_adjtimex(tcp, tcp->u_arg[0]);
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" },
-#endif
-#ifdef CLOCK_PROCESS_CPUTIME_ID
- { CLOCK_PROCESS_CPUTIME_ID, "CLOCK_PROCESS_CPUTIME_ID" },
-#endif
-#ifdef CLOCK_THREAD_CPUTIME_ID
- { CLOCK_THREAD_CPUTIME_ID, "CLOCK_THREAD_CPUTIME_ID" },
-#endif
-#ifdef CLOCK_MONOTONIC_RAW
- { CLOCK_MONOTONIC_RAW, "CLOCK_MONOTONIC_RAW" },
-#endif
-#ifdef CLOCK_REALTIME_COARSE
- { CLOCK_REALTIME_COARSE, "CLOCK_REALTIME_COARSE" },
-#endif
-#ifdef CLOCK_MONOTONIC_COARSE
- { CLOCK_MONOTONIC_COARSE, "CLOCK_MONOTONIC_COARSE" },
+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(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;
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]);
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]);
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 }
-};
+#include "xlat/sigev_value.h"
#if SUPPORTED_PERSONALITIES > 1
static void
} sev;
if (umove(tcp, arg, &sev) < 0)
- tprintf("{...}");
+ 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 + 1, "SIGEV_???");
- tprintf(", ");
+ 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)
sev.un.thread.function,
sev.un.thread.attribute);
else
- tprintf("{...}");
- tprintf("}");
+ tprints("{...}");
+ tprints("}");
}
}
#endif
struct sigevent sev;
#if SUPPORTED_PERSONALITIES > 1
- if (personality_wordsize[current_personality] == 4)
- {
+ if (current_wordsize == 4) {
printsigevent32(tcp, arg);
return;
}
#endif
- if (umove (tcp, arg, &sev) < 0)
- tprintf("{...}");
+ 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("}");
}
}
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;
}
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]);
tprintf("tm_wday=%d, tm_yday=%d, tm_isdst=%d}",
rt->tm_wday, rt->tm_yday, rt->tm_isdst);
else
- tprintf("...}");
+ tprints("...}");
}
int
if (umove(tcp, arg, &rt) < 0)
tprintf(", %#lx", arg);
else {
- tprintf(", ");
+ tprints(", ");
print_rtc(tcp, &rt);
}
}
if (syserror(tcp) || umove(tcp, arg, &rt) < 0)
tprintf(", %#lx", arg);
else {
- tprintf(", ");
+ tprints(", ");
print_rtc(tcp, &rt);
}
}
tprintf(", {enabled=%d, pending=%d, ",
wk.enabled, wk.pending);
print_rtc(tcp, &wk.time);
- tprintf("}");
+ tprints("}");
}
}
break;
tprintf(", {enabled=%d, pending=%d, ",
wk.enabled, wk.pending);
print_rtc(tcp, &wk.time);
- tprintf("}");
+ tprints("}");
}
}
break;
#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(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_???");
- tprintf(", ");
+ printclockname(tcp->u_arg[0]);
+ tprints(", ");
printflags(timerfdflags, tcp->u_arg[2], "TFD_???");
- tprintf(", ");
+ tprints(", ");
printitv(tcp, tcp->u_arg[3]);
}
return 0;
sys_timerfd_create(struct tcb *tcp)
{
if (entering(tcp)) {
- printxval(clocknames, tcp->u_arg[0], "CLOCK_???");
- tprintf(", ");
+ printclockname(tcp->u_arg[0]);
+ tprints(", ");
printflags(timerfdflags, tcp->u_arg[1], "TFD_???");
}
return 0;
{
if (entering(tcp)) {
printfd(tcp, tcp->u_arg[0]);
- tprintf(", ");
+ tprints(", ");
printflags(timerfdflags, tcp->u_arg[1], "TFD_???");
- tprintf(", ");
+ tprints(", ");
printitv(tcp, tcp->u_arg[2]);
- tprintf(", ");
+ tprints(", ");
printitv(tcp, tcp->u_arg[3]);
}
return 0;
{
if (entering(tcp)) {
printfd(tcp, tcp->u_arg[0]);
- tprintf(", ");
+ tprints(", ");
printitv(tcp, tcp->u_arg[1]);
}
return 0;
}
-
-#endif /* LINUX */
projects / strace / blobdiff