X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=resource.c;h=61c877e4c2f16de1f865ec4426b7e379f435de91;hb=3fb78d7305cd5b38bbed2d91b328c3181207b4e9;hp=77a94a29625c43e47d6748f6e7c85a7da1908ee9;hpb=b468f2320a8b8e245b481c78b58431ac56505849;p=strace diff --git a/resource.c b/resource.c index 77a94a29..61c877e4 100644 --- a/resource.c +++ b/resource.c @@ -30,67 +30,8 @@ #include "defs.h" #include -#include -#include -static const struct xlat resources[] = { -#ifdef RLIMIT_AS - { RLIMIT_AS, "RLIMIT_AS" }, -#endif -#ifdef RLIMIT_CORE - { RLIMIT_CORE, "RLIMIT_CORE" }, -#endif -#ifdef RLIMIT_CPU - { RLIMIT_CPU, "RLIMIT_CPU" }, -#endif -#ifdef RLIMIT_DATA - { RLIMIT_DATA, "RLIMIT_DATA" }, -#endif -#ifdef RLIMIT_FSIZE - { RLIMIT_FSIZE, "RLIMIT_FSIZE" }, -#endif -#ifdef RLIMIT_LOCKS - { RLIMIT_LOCKS, "RLIMIT_LOCKS" }, -#endif -#ifdef RLIMIT_MEMLOCK - { RLIMIT_MEMLOCK, "RLIMIT_MEMLOCK" }, -#endif -#ifdef RLIMIT_MSGQUEUE - { RLIMIT_MSGQUEUE, "RLIMIT_MSGQUEUE" }, -#endif -#ifdef RLIMIT_NICE - { RLIMIT_NICE, "RLIMIT_NICE" }, -#endif -#ifdef RLIMIT_NOFILE - { RLIMIT_NOFILE, "RLIMIT_NOFILE" }, -#endif -#ifdef RLIMIT_NPROC - { RLIMIT_NPROC, "RLIMIT_NPROC" }, -#endif -#ifdef RLIMIT_RSS - { RLIMIT_RSS, "RLIMIT_RSS" }, -#endif -#ifdef RLIMIT_RTPRIO - { RLIMIT_RTPRIO, "RLIMIT_RTPRIO" }, -#endif -#ifdef RLIMIT_RTTIME - { RLIMIT_RTTIME, "RLIMIT_RTTIME" }, -#endif -#ifdef RLIMIT_SIGPENDING - { RLIMIT_SIGPENDING, "RLIMIT_SIGPENDING" }, -#endif -#ifdef RLIMIT_STACK - { RLIMIT_STACK, "RLIMIT_STACK" }, -#endif -#ifdef RLIMIT_VMEM - { RLIMIT_VMEM, "RLIMIT_VMEM" }, -#endif - { 0, NULL } -}; - -#if !(SIZEOF_RLIM_T == 4 || SIZEOF_RLIM_T == 8) -# error "Unsupported SIZEOF_RLIM_T value" -#endif +#include "xlat/resources.h" static const char * sprint_rlim64(uint64_t lim) @@ -108,34 +49,20 @@ sprint_rlim64(uint64_t lim) } static void -print_rlimit64(struct tcb *tcp, unsigned long addr) +print_rlimit64(struct tcb *const tcp, const kernel_ulong_t addr) { struct rlimit_64 { uint64_t rlim_cur; uint64_t rlim_max; } rlim; - if (umove(tcp, addr, &rlim) < 0) - tprintf("%#lx", addr); - else { + if (!umove_or_printaddr(tcp, addr, &rlim)) { tprintf("{rlim_cur=%s,", sprint_rlim64(rlim.rlim_cur)); tprintf(" rlim_max=%s}", sprint_rlim64(rlim.rlim_max)); } } -static void -decode_rlimit64(struct tcb *tcp, unsigned long addr) -{ - if (!addr) - tprints("NULL"); - else if (!verbose(tcp) || - (exiting(tcp) && syserror(tcp))) - tprintf("%#lx", addr); - else - print_rlimit64(tcp, addr); -} - -#if SIZEOF_RLIM_T == 4 || SUPPORTED_PERSONALITIES > 1 +#if !defined(current_wordsize) || current_wordsize == 4 static const char * sprint_rlim32(uint32_t lim) @@ -153,49 +80,41 @@ sprint_rlim32(uint32_t lim) } static void -print_rlimit32(struct tcb *tcp, unsigned long addr) +print_rlimit32(struct tcb *const tcp, const kernel_ulong_t addr) { struct rlimit_32 { uint32_t rlim_cur; uint32_t rlim_max; } rlim; - if (umove(tcp, addr, &rlim) < 0) - tprintf("%#lx", addr); - else { + if (!umove_or_printaddr(tcp, addr, &rlim)) { tprintf("{rlim_cur=%s,", sprint_rlim32(rlim.rlim_cur)); tprintf(" rlim_max=%s}", sprint_rlim32(rlim.rlim_max)); } } static void -decode_rlimit(struct tcb *tcp, unsigned long addr) -{ - if (!addr) - tprints("NULL"); - else if (!verbose(tcp) || - (exiting(tcp) && syserror(tcp))) - tprintf("%#lx", addr); - else { -# if SIZEOF_RLIM_T == 4 +decode_rlimit(struct tcb *const tcp, const kernel_ulong_t addr) +{ + /* + * i386 is the only personality on X86_64 and X32 + * with 32-bit rlim_t. + * When current_personality is X32, current_wordsize + * equals to 4 but rlim_t is 64-bit. + */ + if (current_klongsize == 4) print_rlimit32(tcp, addr); -# else - if (personality_wordsize[current_personality] == 4) - print_rlimit32(tcp, addr); - else - print_rlimit64(tcp, addr); -# endif - } + else + print_rlimit64(tcp, addr); } -#else /* SIZEOF_RLIM_T == 8 && SUPPORTED_PERSONALITIES == 1 */ +#else /* defined(current_wordsize) && current_wordsize != 4 */ -# define decode_rlimit decode_rlimit64 +# define decode_rlimit print_rlimit64 -#endif /* SIZEOF_RLIM_T == 4 || SUPPORTED_PERSONALITIES > 1 */ +#endif -int -sys_getrlimit(struct tcb *tcp) +SYS_FUNC(getrlimit) { if (entering(tcp)) { printxval(resources, tcp->u_arg[0], "RLIMIT_???"); @@ -207,136 +126,32 @@ sys_getrlimit(struct tcb *tcp) return 0; } -int -sys_setrlimit(struct tcb *tcp) +SYS_FUNC(setrlimit) { - if (entering(tcp)) { - printxval(resources, tcp->u_arg[0], "RLIMIT_???"); - tprints(", "); - decode_rlimit(tcp, tcp->u_arg[1]); - } - return 0; + printxval(resources, tcp->u_arg[0], "RLIMIT_???"); + tprints(", "); + decode_rlimit(tcp, tcp->u_arg[1]); + + return RVAL_DECODED; } -int -sys_prlimit64(struct tcb *tcp) +SYS_FUNC(prlimit64) { if (entering(tcp)) { - tprintf("%ld, ", tcp->u_arg[0]); + tprintf("%d, ", (int) tcp->u_arg[0]); printxval(resources, tcp->u_arg[1], "RLIMIT_???"); tprints(", "); - decode_rlimit64(tcp, tcp->u_arg[2]); + print_rlimit64(tcp, tcp->u_arg[2]); tprints(", "); } else { - decode_rlimit64(tcp, tcp->u_arg[3]); + print_rlimit64(tcp, tcp->u_arg[3]); } return 0; } -static const struct xlat usagewho[] = { - { RUSAGE_SELF, "RUSAGE_SELF" }, - { RUSAGE_CHILDREN, "RUSAGE_CHILDREN" }, -#ifdef RUSAGE_BOTH - { RUSAGE_BOTH, "RUSAGE_BOTH" }, -#endif - { 0, NULL }, -}; - -#ifdef ALPHA -void -printrusage32(struct tcb *tcp, long addr) -{ - struct timeval32 { - unsigned tv_sec; - unsigned tv_usec; - }; - struct rusage32 { - struct timeval32 ru_utime; /* user time used */ - struct timeval32 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 (!addr) - tprints("NULL"); - else if (syserror(tcp) || !verbose(tcp)) - tprintf("%#lx", addr); - else if (umove(tcp, addr, &ru) < 0) - tprints("{...}"); - else if (!abbrev(tcp)) { - tprintf("{ru_utime={%lu, %lu}, ru_stime={%lu, %lu}, ", - (long) ru.ru_utime.tv_sec, (long) ru.ru_utime.tv_usec, - (long) ru.ru_stime.tv_sec, (long) ru.ru_stime.tv_usec); - tprintf("ru_maxrss=%lu, ru_ixrss=%lu, ", - ru.ru_maxrss, ru.ru_ixrss); - tprintf("ru_idrss=%lu, ru_isrss=%lu, ", - ru.ru_idrss, ru.ru_isrss); - tprintf("ru_minflt=%lu, ru_majflt=%lu, ru_nswap=%lu, ", - ru.ru_minflt, ru.ru_majflt, ru.ru_nswap); - tprintf("ru_inblock=%lu, ru_oublock=%lu, ", - ru.ru_inblock, ru.ru_oublock); - tprintf("ru_msgsnd=%lu, ru_msgrcv=%lu, ", - ru.ru_msgsnd, ru.ru_msgrcv); - tprintf("ru_nsignals=%lu, ru_nvcsw=%lu, ru_nivcsw=%lu}", - ru.ru_nsignals, ru.ru_nvcsw, ru.ru_nivcsw); - } - else { - tprintf("{ru_utime={%lu, %lu}, ru_stime={%lu, %lu}, ...}", - (long) ru.ru_utime.tv_sec, (long) ru.ru_utime.tv_usec, - (long) ru.ru_stime.tv_sec, (long) ru.ru_stime.tv_usec); - } -} -#endif - -void -printrusage(struct tcb *tcp, long addr) -{ - struct rusage ru; - - if (!addr) - tprints("NULL"); - else if (syserror(tcp) || !verbose(tcp)) - tprintf("%#lx", addr); - else if (umove(tcp, addr, &ru) < 0) - tprints("{...}"); - else if (!abbrev(tcp)) { - tprintf("{ru_utime={%lu, %lu}, ru_stime={%lu, %lu}, ", - (long) ru.ru_utime.tv_sec, (long) ru.ru_utime.tv_usec, - (long) ru.ru_stime.tv_sec, (long) ru.ru_stime.tv_usec); - tprintf("ru_maxrss=%lu, ru_ixrss=%lu, ", - ru.ru_maxrss, ru.ru_ixrss); - tprintf("ru_idrss=%lu, ru_isrss=%lu, ", - ru.ru_idrss, ru.ru_isrss); - tprintf("ru_minflt=%lu, ru_majflt=%lu, ru_nswap=%lu, ", - ru.ru_minflt, ru.ru_majflt, ru.ru_nswap); - tprintf("ru_inblock=%lu, ru_oublock=%lu, ", - ru.ru_inblock, ru.ru_oublock); - tprintf("ru_msgsnd=%lu, ru_msgrcv=%lu, ", - ru.ru_msgsnd, ru.ru_msgrcv); - tprintf("ru_nsignals=%lu, ru_nvcsw=%lu, ru_nivcsw=%lu}", - ru.ru_nsignals, ru.ru_nvcsw, ru.ru_nivcsw); - } - else { - tprintf("{ru_utime={%lu, %lu}, ru_stime={%lu, %lu}, ...}", - (long) ru.ru_utime.tv_sec, (long) ru.ru_utime.tv_usec, - (long) ru.ru_stime.tv_sec, (long) ru.ru_stime.tv_usec); - } -} +#include "xlat/usagewho.h" -int -sys_getrusage(struct tcb *tcp) +SYS_FUNC(getrusage) { if (entering(tcp)) { printxval(usagewho, tcp->u_arg[0], "RUSAGE_???"); @@ -348,8 +163,7 @@ sys_getrusage(struct tcb *tcp) } #ifdef ALPHA -int -sys_osf_getrusage(struct tcb *tcp) +SYS_FUNC(osf_getrusage) { if (entering(tcp)) { printxval(usagewho, tcp->u_arg[0], "RUSAGE_???"); @@ -361,77 +175,20 @@ sys_osf_getrusage(struct tcb *tcp) } #endif /* ALPHA */ -int -sys_sysinfo(struct tcb *tcp) -{ - struct sysinfo si; +#include "xlat/priorities.h" - if (exiting(tcp)) { - if (syserror(tcp) || !verbose(tcp)) - tprintf("%#lx", tcp->u_arg[0]); - else if (umove(tcp, tcp->u_arg[0], &si) < 0) - tprints("{...}"); - else { - tprintf("{uptime=%lu, loads=[%lu, %lu, %lu] ", - (long) si.uptime, (long) si.loads[0], - (long) si.loads[1], (long) si.loads[2]); - tprintf("totalram=%lu, freeram=%lu, ", - (long) si.totalram, (long) si.freeram); - tprintf("sharedram=%lu, bufferram=%lu} ", - (long) si.sharedram, (long) si.bufferram); - tprintf("totalswap=%lu, freeswap=%lu, procs=%hu}", - (long) si.totalswap, (long) si.freeswap, - si.procs); - } - } - return 0; -} - -static const struct xlat priorities[] = { - { PRIO_PROCESS, "PRIO_PROCESS" }, - { PRIO_PGRP, "PRIO_PGRP" }, - { PRIO_USER, "PRIO_USER" }, - { 0, NULL }, -}; - -int -sys_getpriority(struct tcb *tcp) +SYS_FUNC(getpriority) { - if (entering(tcp)) { - printxval(priorities, tcp->u_arg[0], "PRIO_???"); - tprintf(", %lu", tcp->u_arg[1]); - } - return 0; -} + printxval(priorities, tcp->u_arg[0], "PRIO_???"); + tprintf(", %d", (int) tcp->u_arg[1]); -int -sys_setpriority(struct tcb *tcp) -{ - if (entering(tcp)) { - printxval(priorities, tcp->u_arg[0], "PRIO_???"); - tprintf(", %lu, %ld", tcp->u_arg[1], tcp->u_arg[2]); - } - return 0; + return RVAL_DECODED; } -int -sys_times(struct tcb *tcp) +SYS_FUNC(setpriority) { - struct tms tbuf; + printxval(priorities, tcp->u_arg[0], "PRIO_???"); + tprintf(", %d, %d", (int) tcp->u_arg[1], (int) tcp->u_arg[2]); - if (exiting(tcp)) { - if (tcp->u_arg[0] == 0) - tprints("NULL"); - else if (syserror(tcp)) - tprintf("%#lx", tcp->u_arg[0]); - else if (umove(tcp, tcp->u_arg[0], &tbuf) < 0) - tprints("{...}"); - else { - tprintf("{tms_utime=%lu, tms_stime=%lu, ", - tbuf.tms_utime, tbuf.tms_stime); - tprintf("tms_cutime=%lu, tms_cstime=%lu}", - tbuf.tms_cutime, tbuf.tms_cstime); - } - } - return 0; + return RVAL_DECODED; }