wait4, getrusage: add time64/x32 variant

[musl] / src / misc / getrusage.c

diff --git a/src/misc/getrusage.c b/src/misc/getrusage.c
index 1b8850f..8e03e2e 100644 (file)
--- a/src/misc/getrusage.c
+++ b/src/misc/getrusage.c
@@ -1,20 +1,35 @@
 #include <sys/resource.h>
 #include <string.h>
+#include <errno.h>
 #include "syscall.h"
 
-/* this is a huge hack to make up for the kernel's stupid 32bit time_t
- * without having to recopy the whole rusage structure ourselves.. */
-
 int getrusage(int who, struct rusage *ru)
 {
-       struct { long tv_sec, tv_usec; } ktv[2];
-       char *fakeaddr = ((char *)ru + sizeof(struct timeval [2]) - sizeof ktv);
-       if (syscall2(__NR_getrusage, who, (long)fakeaddr) < 0)
-               return -1;
-       memcpy(ktv, fakeaddr, sizeof ktv);
-       ru->ru_utime.tv_sec  = ktv[0].tv_sec;
-       ru->ru_utime.tv_usec = ktv[0].tv_usec;
-       ru->ru_stime.tv_sec  = ktv[1].tv_sec;
-       ru->ru_stime.tv_usec = ktv[1].tv_usec;
-       return 0;
+       int r;
+#ifdef SYS_getrusage_time64
+       long long kru64[18];
+       r = __syscall(SYS_getrusage_time64, who, kru64);
+       if (!r) {
+               ru->ru_utime = (struct timeval)
+                       { .tv_sec = kru64[0], .tv_usec = kru64[1] };
+               ru->ru_stime = (struct timeval)
+                       { .tv_sec = kru64[2], .tv_usec = kru64[3] };
+               char *slots = (char *)&ru->ru_maxrss;
+               for (int i=0; i<14; i++)
+                       *(long *)(slots + i*sizeof(long)) = kru64[4+i];
+       }
+       if (SYS_getrusage_time64 == SYS_getrusage || r != -ENOSYS)
+               return __syscall_ret(r);
+#endif
+       char *dest = (char *)&ru->ru_maxrss - 4*sizeof(long);
+       r = __syscall(SYS_getrusage, who, dest);
+       if (!r && sizeof(time_t) > sizeof(long)) {
+               long kru[4];
+               memcpy(kru, dest, 4*sizeof(long));
+               ru->ru_utime = (struct timeval)
+                       { .tv_sec = kru[0], .tv_usec = kru[1] };
+               ru->ru_stime = (struct timeval)
+                       { .tv_sec = kru[2], .tv_usec = kru[3] };
+       }
+       return __syscall_ret(r);
 }