This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH v4 6/8] resource: Add a __rusage64 struct
- From: Alistair Francis <alistair dot francis at wdc dot com>
- To: libc-alpha at sourceware dot org
- Cc: alistair23 at gmail dot com, Alistair Francis <alistair dot francis at wdc dot com>, Lukasz Majewski <lukma at denx dot de>
- Date: Wed, 19 Feb 2020 10:10:55 -0800
- Subject: [PATCH v4 6/8] resource: Add a __rusage64 struct
- Ironport-sdr: WOiwqYKzHzuRHWGjuXtvncv9zU/p7qmhxoiqAeuHBRzsLEsIqth1glTgbwel8qXZFSgXTBM9lQ kY6OD+NrtdbNPGwhlzaSco8qFYGBicrhOUs5VFkhYsBdPKB6U7y1rCzpbN5Xlc3LuiGisfl2Ye IJHvPDL0Kt0q1Xe9jtgna93oRE2C53mc+mv7KnLLS8wLavTX8qLecXduClQfkMfd9BS1bwo/NL p8qUV8XLKn231alJ4N5xMJ+zljgIdhjbE8lBzupOEoUIsifyFmif0cXt6ZSuttW0rGdf/O3G+1 TuE=
- Ironport-sdr: HrXagNtie3HNmFOrn4Lx+QSYYmyqPVvQs6GMYnh2+nKuHu7yo2rYXy5ZUDlW49NVjWvIwvmyGk R1c0FDlOJ1sq4hIE18bmxLKPVLZSYErl8uQvSxP+qMbl0mODn6yRhaBdk8lOwZjEk/OYgZckxD B/PwSEE53z7j+TWzZ4tJk0BEzoGrWR4PryfiT9r53GCgvaa2fyGQiuGXBVadT1qZEDSAmpkJVs 8Dba7iJnxPQUoIQ5LnuH9V80iF6UObkFLTUwkwKXBEwLgtoBr4ouzlxmKrFFoQCYvjpGnt/V6i JEcaFCDPk0x5VprEbpr6JUQF
- Ironport-sdr: FruY0skbDCb/QY7KKy5tpghnDOsqR8S6SwWnqNJ7VqxjfNNdUOYfUVJidnl/dnbMF84+CiMuJ/ hCb/zykriZgIUqil5l/zRhH/4J53FBVSJ1VFXRsoIX5mXZHm+Xb8uVVWP+W7y1lC2nhv7ZrHZJ W2i5d6xpW9fVywLTInt/xmQacvF/yuXjbZSKr62Cr6wLusC6+U2ca439qjYSwL2elBernYjalQ NNI0DPQ/+jgo+AHTxU/sychWiVhJ5sCXZHuduxjXg/65VP+8ny0lWqq9HrFC74x5OagVgC9eqV tLw=
- References: <20200219181057.10297-1-alistair.francis@wdc.com>
- Wdcironportexception: Internal
Add a __rusage64 struct which always uses a 64-bit time_t.
Reviewed-by: Lukasz Majewski <lukma@denx.de>
---
include/sys/resource.h | 110 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 110 insertions(+)
diff --git a/include/sys/resource.h b/include/sys/resource.h
index c55d4e63bd..9d604dfe3e 100644
--- a/include/sys/resource.h
+++ b/include/sys/resource.h
@@ -2,6 +2,116 @@
#include <resource/sys/resource.h>
#ifndef _ISOMAC
+# include <time.h>
+# include <string.h>
+
+/* Internal version of rusage with a 64-bit time_t. */
+#if __TIMESIZE == 64
+# define __rusage64 rusage
+#else
+struct __rusage64
+ {
+ struct __timeval64 ru_utime;
+ struct __timeval64 ru_stime;
+ __extension__ union
+ {
+ long int ru_maxrss;
+ __syscall_slong_t __ru_maxrss_word;
+ };
+ __extension__ union
+ {
+ long int ru_ixrss;
+ __syscall_slong_t __ru_ixrss_word;
+ };
+ __extension__ union
+ {
+ long int ru_idrss;
+ __syscall_slong_t __ru_idrss_word;
+ };
+ __extension__ union
+ {
+ long int ru_isrss;
+ __syscall_slong_t __ru_isrss_word;
+ };
+ __extension__ union
+ {
+ long int ru_minflt;
+ __syscall_slong_t __ru_minflt_word;
+ };
+ __extension__ union
+ {
+ long int ru_majflt;
+ __syscall_slong_t __ru_majflt_word;
+ };
+ __extension__ union
+ {
+ long int ru_nswap;
+ __syscall_slong_t __ru_nswap_word;
+ };
+ __extension__ union
+ {
+ long int ru_inblock;
+ __syscall_slong_t __ru_inblock_word;
+ };
+ __extension__ union
+ {
+ long int ru_oublock;
+ __syscall_slong_t __ru_oublock_word;
+ };
+ __extension__ union
+ {
+ long int ru_msgsnd;
+ __syscall_slong_t __ru_msgsnd_word;
+ };
+ __extension__ union
+ {
+ long int ru_msgrcv;
+ __syscall_slong_t __ru_msgrcv_word;
+ };
+ __extension__ union
+ {
+ long int ru_nsignals;
+ __syscall_slong_t __ru_nsignals_word;
+ };
+ __extension__ union
+ {
+ long int ru_nvcsw;
+ __syscall_slong_t __ru_nvcsw_word;
+ };
+ __extension__ union
+ {
+ long int ru_nivcsw;
+ __syscall_slong_t __ru_nivcsw_word;
+ };
+ };
+#endif
+
+static inline void
+rusage64_to_rusage (const struct __rusage64 *restrict r64,
+ struct rusage *restrict r)
+{
+ /* Make sure the entire output structure is cleared, including
+ padding and reserved fields. */
+ memset (r, 0, sizeof *r);
+
+ r->ru_utime = valid_timeval64_to_timeval (r64->ru_utime);
+ r->ru_stime = valid_timeval64_to_timeval (r64->ru_stime);
+ r->ru_maxrss = r64->ru_maxrss;
+ r->ru_ixrss = r64->ru_ixrss;
+ r->ru_idrss = r64->ru_idrss;
+ r->ru_isrss = r64->ru_isrss;
+ r->ru_minflt = r64->ru_minflt;
+ r->ru_majflt = r64->ru_majflt;
+ r->ru_nswap = r64->ru_nswap;
+ r->ru_inblock = r64->ru_inblock;
+ r->ru_oublock = r64->ru_oublock;
+ r->ru_msgsnd = r64->ru_msgsnd;
+ r->ru_msgrcv = r64->ru_msgrcv;
+ r->ru_nsignals = r64->ru_nsignals;
+ r->ru_nvcsw = r64->ru_nvcsw;
+ r->ru_nivcsw = r64->ru_nivcsw;
+}
+
/* Prototypes repeated instead of using __typeof because
sys/resource.h is included in C++ tests, and declaring functions
with __typeof and __THROW doesn't work for C++. */
--
2.25.0