From patchwork Tue Mar 3 17:53:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 38390 Received: (qmail 2156 invoked by alias); 3 Mar 2020 18:01:36 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 2092 invoked by uid 89); 3 Mar 2020 18:01:35 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy= X-HELO: esa1.hgst.iphmx.com DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1583258493; x=1614794493; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=MMB6lF9p9Nr7K956d8foddqlJhLO6N9l9+m6995aqkc=; b=gS1QbKfHThsEPZTzxByBo+o/Tvc3sjazSg5+PpL7jSPxn/QN2uSacTq4 xaa8uennif16aGJFLsW67NOUYGz3RGLeUVyPdLWshW+xN9MYnkEf9KNaO YTZgbagjJRD0hI9V0r07ekL8o2ym96WnDC9c72t65sNyKzpOpC19Lh357 A0ncDxVwJf0tIGMKYkI/1rGyHukLqPZKvtl5IPfVyPaYNVPiBhjVzgXnV UeNctExiOsbpEKrvyfKFzpo/vYZCXpD2NOeclaMrlLQlD3vL0oxkLWenb 7QLv+8TYWVNHUYXlKllWZYFt6hdaRKKnmBF8U2oHdtiodortqLrp1FOo/ g==; IronPort-SDR: 25yENqmxpWn/oLy8wfFtfDU1rdb0jGjT6OIuUq1QgpZ4RFtFblKs0+GHBJpswgLDEBeB+Zktxi 0Yl0lhg9LaMuneJWGZS02bzkD+5BK665dLblBIUKZntkM5rPay+9SyFM73vprDf4/I3Z2tiwVE n8O86fAts1rZzCpQXbSjlIrs2Ut3WQrDTh3JponQE0OY9Bw/l0hFB8/N7Y8ZWvdJn0uHIwqtZ+ Q4CVLxQ23RVqLfUdM2ZetnxnA4L4X1LAgK8F/PjLyrUxtYdCYeRzSbmeAwgo5v8ZHPyG3oZKmx vgs= IronPort-SDR: mwdnDIhQf3Qthni748c/fOQU/rbIIvGtbL3rnWHIgz/C19jmllT9MIEGfxI0N1t7W7edcjjD/S ZLr9Q3MN7YCpTS5j1r4rAxmm8GHhTaeCWhcteV7kT6B/kCUYqbsWIoas3QL24nVkpFZIRzmnLx 9xnwRuEfUCiSftAE90mItNWVGovXpHl7f/6H9MHbOGEWRBhPDJNACOI/EhalPS4McpFizXqMUY QXGX6BlS+4zgLrl7DgNj6jfOerIw8qxxQBuF4poLCz6s6vw/rGjYDL6jvAC3lJB00VMuis04NJ plsFBwkqckGOnPJZw+SPGp2I IronPort-SDR: t2juC2eMFkobLMGskW+sl7suve1zJ6o1A4QLNYKNmyRDAfVDSUS4uIYjdgsADzsDD//qaOMEQ5 2KPwhcghgOhwfeKMlFAET+6VMVe3jWgSavnFPyJEVL8i78mKWrkZtFFsQOu9jyMo0lc93KbiLA LzSimgG8rYsN4AmM26fokQh/I8IejhXYmEZ3guNM1S0ymyP+0Hev6RwstrsxAy9tKM94E/pbqA 0SnxXAJcnd3jYiyMGncrSfNsSRZz8up0z38ZQmHbq9ObWQLIFGWVsXXYchvmrCHj3rPnTDq+DG 3v8= WDCIronportException: Internal From: Alistair Francis To: libc-alpha@sourceware.org Cc: adhemerval.zanella@linaro.org, Alistair Francis , Lukasz Majewski Subject: [PATCH v5 6/8] resource: Add a __rusage64 struct Date: Tue, 3 Mar 2020 09:53:53 -0800 Message-Id: <20200303175355.15770-7-alistair.francis@wdc.com> In-Reply-To: <20200303175355.15770-1-alistair.francis@wdc.com> References: <20200303175355.15770-1-alistair.francis@wdc.com> MIME-Version: 1.0 Add a __rusage64 struct which always uses a 64-bit time_t. Reviewed-by: Lukasz Majewski Reviewed-by: Adhemerval Zanella --- 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 #ifndef _ISOMAC +# include +# include + +/* 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++. */