9baa6bcc88
Add an argument to print_time* routines that signalises, whether the time value is wall clock time or not. * aio.c (print_io_getevents): Add an argument to print_timespec call. * defs.h (print_timeval32_t, print_timeval32, print_itimerval32): Add "bool rtc" argument. * desc.c (decode_select): Add bool argument to print_tv_ts callback function argument. * futex.c (SYS_FUNC(futex)) <case FUTEX_WAIT>: Call print_timespec with rtc=false, as the timestamp is always relative. <case FUTEX_LOCK_PI>: Call print_timespec with rtc=true, as the timeout is always absolute. <case FUTEX_WAIT_BITSET, case FUTEX_WAIT_REQUEUE_PI>: Call print_timespec with rtc set to true when op has FUTEX_CLOCK_REALTIME flag. * ipc_sem.c (SYS_FUNC(semtimedop)): Call print_timespec with rtc=false, as timeout is always relative. * linux/dummy.h (sys_clock_getres, sys_stime): Remove. * mmsghdr.c (SYS_FUNC(recvmmsg)): Call print_timespec with rtc=false, as timeout is relative. * mq.c (SYS_FUNC(mq_timedsend), SYS_FUNC(mq_timedreceive)): Call print_timespec with rtc=true, as timeout is absolute. * msghdr.c (print_scm_timestamp, print_scm_timestampns, print_scm_timestamping): Call print_struct_timeval_data_size, print_struct_timespec_data_size, print_struct_timespec_array_data_size with rtc=true as timestamps presumed absolute. * poll.c (SYS_FUNC(ppoll)): Call print_timespec with rtc=false, as timeout is relative. * print_time.c (print_time_t): New function. (SYS_FUNC(time)): Use print_time_t for printing time. (SYS_FUNC(stime)): New function. * print_timespec.c (print_timespec_t, print_struct_timespec_data_size, print_struct_timespec_array_data_size, print_timespec): Add rtc argument, handle it. (print_timespec_t_utime): Call print_timespec_t with rtc=false when xlat_style is not abbreviated, call print_timespec_t with rtc=true instead of manual time stamp printing. (print_itimerspec): Call print_timespec_t with rtc=false. * print_timeval.c (print_timeval_t, print_struct_timeval_data_size, print_timeval, print_itimerval, print_timeval32_t, print_timeval32): Add rtc argument, handle it. (print_timeval_t_utime, print_timeval32_t_utime): Remove. (print_struct_timeval): New function. (print_timeval_utimes): Use print_struct_timeval instead of print_timeval_t_utime. * print_timex.c (print_timex): Add rtc argument, handle it. * printrusage.c (printrusage): Call print_struct_timeval with rtc=false. * sched.c (sched_rr_get_interval): Call print_timespec with rtc=false. * signal.c (rt_sigtimedwait): Call print_timespec with rtc=false. * time.c: Include "xlat/clocknames.h" under XLAT_MACROS_ONLY. (gettimeofday, settimeofday): Call print_timeval with rtc=true. (osf_gettimeofday, osf_settimeofday): Call print_timeval32 with rtc=true. (nanosleep): Call print_timespec with rtc=false. (getitimer, setitimer): Call print_itimerval with rtc=false. (osf_getitimer, osf_setitimer): Call print_itimerval32 wirh rtc=false. (do_adjtimex): Add rtc argument, handle it. (is_rtcid): New function. (clock_settime, clock_gettime): Call print_timespec with rtc=true if 0th argument is a real-time clock (as indicated by is_rtcid). (SYS_FUNC(clock_getres)): New syscall decoder. (SYS_FUNC(clock_nanosleep)): Call print_timespec with rtc=true if clock is realtime (as indicated by is_rtcid) and TIMER_ABSTIME is set in flags. (SYS_FUNC(clock_adjtime)): Call do_adjtimex with rtc=true if clock is realtime. * tests/adjtimex.c: Update expected output. * tests/clock_nanosleep.c: Likewise.
131 lines
4.4 KiB
C
131 lines
4.4 KiB
C
/*
|
|
* Copyright (c) 1991, 1992 Paul Kranenburg <pk@cs.few.eur.nl>
|
|
* Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
|
|
* Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
|
|
* Copyright (c) 1996-1999 Wichert Akkerman <wichert@cistron.nl>
|
|
* Copyright (c) 1999-2017 The strace developers.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. The name of the author may not be used to endorse or promote products
|
|
* derived from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* 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.
|
|
*/
|
|
|
|
#include "defs.h"
|
|
#include <sys/resource.h>
|
|
|
|
#include DEF_MPERS_TYPE(rusage_t)
|
|
|
|
typedef struct rusage rusage_t;
|
|
|
|
#include MPERS_DEFS
|
|
|
|
MPERS_PRINTER_DECL(void, printrusage,
|
|
struct tcb *const tcp, const kernel_ulong_t addr)
|
|
{
|
|
rusage_t ru;
|
|
|
|
if (umove_or_printaddr(tcp, addr, &ru))
|
|
return;
|
|
|
|
tprints("{ru_utime=");
|
|
MPERS_FUNC_NAME(print_struct_timeval)(&ru.ru_utime, false);
|
|
tprints(", ru_stime=");
|
|
MPERS_FUNC_NAME(print_struct_timeval)(&ru.ru_stime, false);
|
|
if (abbrev(tcp))
|
|
tprints(", ...");
|
|
else {
|
|
#define PRINT_RUSAGE_MEMBER(member) \
|
|
tprintf(", " #member "=%llu", zero_extend_signed_to_ull(ru.member))
|
|
PRINT_RUSAGE_MEMBER(ru_maxrss);
|
|
PRINT_RUSAGE_MEMBER(ru_ixrss);
|
|
PRINT_RUSAGE_MEMBER(ru_idrss);
|
|
PRINT_RUSAGE_MEMBER(ru_isrss);
|
|
PRINT_RUSAGE_MEMBER(ru_minflt);
|
|
PRINT_RUSAGE_MEMBER(ru_majflt);
|
|
PRINT_RUSAGE_MEMBER(ru_nswap);
|
|
PRINT_RUSAGE_MEMBER(ru_inblock);
|
|
PRINT_RUSAGE_MEMBER(ru_oublock);
|
|
PRINT_RUSAGE_MEMBER(ru_msgsnd);
|
|
PRINT_RUSAGE_MEMBER(ru_msgrcv);
|
|
PRINT_RUSAGE_MEMBER(ru_nsignals);
|
|
PRINT_RUSAGE_MEMBER(ru_nvcsw);
|
|
PRINT_RUSAGE_MEMBER(ru_nivcsw);
|
|
#undef PRINT_RUSAGE_MEMBER
|
|
}
|
|
tprints("}");
|
|
}
|
|
|
|
#ifdef ALPHA
|
|
void
|
|
printrusage32(struct tcb *const tcp, const kernel_ulong_t addr)
|
|
{
|
|
struct rusage32 {
|
|
timeval32_t ru_utime; /* user time used */
|
|
timeval32_t ru_stime; /* system time used */
|
|
long ru_maxrss; /* maximum resident set size */
|
|
long ru_ixrss; /* integral shared memory size */
|
|
long ru_idrss; /* integral unshared data size */
|
|
long ru_isrss; /* integral unshared stack size */
|
|
long ru_minflt; /* page reclaims */
|
|
long ru_majflt; /* page faults */
|
|
long ru_nswap; /* swaps */
|
|
long ru_inblock; /* block input operations */
|
|
long ru_oublock; /* block output operations */
|
|
long ru_msgsnd; /* messages sent */
|
|
long ru_msgrcv; /* messages received */
|
|
long ru_nsignals; /* signals received */
|
|
long ru_nvcsw; /* voluntary context switches */
|
|
long ru_nivcsw; /* involuntary " */
|
|
} ru;
|
|
|
|
if (umove_or_printaddr(tcp, addr, &ru))
|
|
return;
|
|
|
|
tprints("{ru_utime=");
|
|
print_timeval32_t(&ru.ru_utime);
|
|
tprints(", ru_stime=");
|
|
print_timeval32_t(&ru.ru_stime);
|
|
if (abbrev(tcp))
|
|
tprints(", ...");
|
|
else {
|
|
# define PRINT_RUSAGE_MEMBER(member) \
|
|
tprintf(", " #member "=%lu", ru.member)
|
|
PRINT_RUSAGE_MEMBER(ru_maxrss);
|
|
PRINT_RUSAGE_MEMBER(ru_ixrss);
|
|
PRINT_RUSAGE_MEMBER(ru_idrss);
|
|
PRINT_RUSAGE_MEMBER(ru_isrss);
|
|
PRINT_RUSAGE_MEMBER(ru_minflt);
|
|
PRINT_RUSAGE_MEMBER(ru_majflt);
|
|
PRINT_RUSAGE_MEMBER(ru_nswap);
|
|
PRINT_RUSAGE_MEMBER(ru_inblock);
|
|
PRINT_RUSAGE_MEMBER(ru_oublock);
|
|
PRINT_RUSAGE_MEMBER(ru_msgsnd);
|
|
PRINT_RUSAGE_MEMBER(ru_msgrcv);
|
|
PRINT_RUSAGE_MEMBER(ru_nsignals);
|
|
PRINT_RUSAGE_MEMBER(ru_nvcsw);
|
|
PRINT_RUSAGE_MEMBER(ru_nivcsw);
|
|
# undef PRINT_RUSAGE_MEMBER
|
|
}
|
|
tprints("}");
|
|
}
|
|
#endif
|