From patchwork Mon Feb 10 17:43:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 1235940 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-109373-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha1 header.s=default header.b=Z+4SL8dy; dkim=pass (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256 header.s=dkim.wdc.com header.b=U44cETM+; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48GYNk5mdLz9sRp for ; Tue, 11 Feb 2020 04:51:02 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; q=dns; s= default; b=vIltax6JJNv52XMYqlKTsg69yVT2xEbW0NdAUvinsr/w6hH8X9jfQ 1Ieg2YyltzVhchNroKzW4QOCgL3+4k//6z0lg8gSuqjIUT7E0i1uraqOfZKn3OWT B2EdJRUjrUe+2r2QZ5JYaKGGAC+lRAqdNaXztOBhte8+52Jv69zt2s= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; s=default; bh=MMoVxkMlwMSbhAvmGQQfiPuG2JI=; b=Z+4SL8dy5DKHLsYBbb9CPYrrNCxy 9JgpRFTa5cThtWEE7Ryp35eXqeBU11e/1rWrhmprVUoVLc8NkkSBZDSHV9VvBFCp BRbrH2x0IFHLQWD988UAx1SaIr2FUKmvhLi9hlS02AJn2sTi1zvLZZonbfkYBc4X WCWr5DOivhuU26A= Received: (qmail 56038 invoked by alias); 10 Feb 2020 17:50:27 -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 55937 invoked by uid 89); 10 Feb 2020 17:50:26 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.6 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=declaring, HContent-Transfer-Encoding:8bit X-HELO: esa2.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=1581357026; x=1612893026; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=iku69JlpGgq6iqzo1ecClo3/J9V8eL9dXmtN23lyUV0=; b=U44cETM+MnLMFBZ/Beqt9mEQXiPDBcby3xksfOT3KhK13RCfrfIKb97c a1HytlWJV6+D0VpASuGHanl+/JdgcbB/Qe45TIEgCs4Mc7KaN5S58YdXk JarSa0jonTlSRESnpWtBcylhNg7tdnwSlr64tfBP+YRxHMz8wBwDAljhZ LspnlgonYRZatjiSdrMiyKHvYxjCELUkd9pH9J3yivjd/0WgYnuopl/ai nc/9jrMeMVdzl94Z2UnWyQ7g/HgUfNoVOWXzNPCcVFlGQy8R6AFxepAzq /Y7qCU7aoqBle6R9UGLXJmEBFkYbGYiF79OZA3KMwmVkqdM2CDDP50813 w==; IronPort-SDR: pkLh0aV9ilgLBkPCy10LbyXjHhOqAtmD1RZPm/4aPiB68ZLHp0wSw1F5RfV3bmoZcAZjfmYr/w NIU3hHzyXE2nSDIEDC7qn4ch4Nr+n9a5mGnaDFrLKYwxELOYiqCiI46bQVb/Qm9yQ4+hfCNeir WSjZ7y/5D3h5wWgjvkg2OsrkGKuNPAbom2y5/bv8wj20fB4Yc6NaQ/m2AZ5ybJ8wGx2O821da9 hB7hAysruD6eXH7qVSjvPtARaQHLMLt0N96Mq4ktB4Z76ROJ3p6hP4DRYY90h1EuRZ0a/HJLsO oZk= IronPort-SDR: 0BP+jCaqWEKJrEdoh2myefK5HQ5b9nrTHOZb+h1bVGYZIitCU90SKg2VPJSU1u95zogDSAurFb oEa5r6YTwVTNQP1mduUylVbnzSF1TOYgXLniemD4PiksVv5mqgswIiCnWUwTKYXrefYTWdPZNC 6DqmlL56ZaF8r4OlDavupfCz1Y1FEBsmVl/yjV/O/W1GnPD+cdO/6XwODyvNjGwu8uqS1bnid1 POS4kjSwMSNRsj2oZRJwzsb24Ima7JE3baG8yGKS1VEqtGJq6VWjFACYxL/NF5jQ0lKhNUHZbv k1u2BKQ05l71HCm/yKCDTGD+ IronPort-SDR: Z2WYOAnenwU4aRvu/WWwWquumNOV+NgPpV4Mi+eCmrFL9sR9f/MURw+DKEywGauXAzVzx3C7PQ 6npmMjsDvzstWDDkRYYL24oF3kCUe4Tu1jm1Sr5E3HL6Db37gBlgguwJhNs34zLcn5tjUc4AUA SCCcHOAARo/sHngU4hOrfMjlTYymYOaCxWAYxRMvMOuCkFdfpcw0P9cQ0hRzgPxcSLwUgesqrm WP/kaC434xgYwcR6yqtJx0whub2TrGlyi8szn9StGkPZ4/KEB6gVQd3vGXEAsKDOybe2oTg7zR y8U= WDCIronportException: Internal From: Alistair Francis To: libc-alpha@sourceware.org Cc: alistair23@gmail.com, Alistair Francis , Lukasz Majewski Subject: [PATCH v2 5/6] resource: Add a __rusage64 struct Date: Mon, 10 Feb 2020 09:43:24 -0800 Message-Id: <20200210174325.6566-6-alistair.francis@wdc.com> In-Reply-To: <20200210174325.6566-1-alistair.francis@wdc.com> References: <20200210174325.6566-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 --- 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++. */