From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 695 invoked from network); 27 Dec 2020 18:57:19 -0000 Received: from mother.openwall.net (195.42.179.200) by inbox.vuxu.org with ESMTPUTF8; 27 Dec 2020 18:57:19 -0000 Received: (qmail 28652 invoked by uid 550); 27 Dec 2020 18:57:07 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Reply-To: musl@lists.openwall.com Received: (qmail 6085 invoked from network); 27 Dec 2020 18:42:57 -0000 Date: Sun, 27 Dec 2020 18:42:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail; t=1609094566; bh=wvbjn6xfXgqkE20530GwCvZ8oaVPWvtxdUICMhRnv88=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=EBNaawAw5CCNra01mP/DGih1Pw8srD/kg2qfzMI2xCWNmejNPSF+Z/odY5H+cnCJ1 ZeXstdmXIVhOyjbfVaCibEZVheIZRiP7/mkeXc7N85w64je9x714B6H9RLHb6P2kEJ XoGLTR/Xw4bOQIT8Z/aEVcdBB67KYp8sxWvt5QumJsksMgiQy7Mc0fTmNZ7FdXt72j Hv2yIW69+E8sKzftN+H/M6ZX7OVcVq4lSaoCJHnce9eobG6Vzw9g9k7Du73BKdeN6e p7vloFpVWOweSbSEs6SryTwpHJRA4M8eX2Q8FG78gEtCTcmAKWRPtODkCHL2tvJ6t5 QPR1NfyytrfVg== To: Rich Felker , musl@lists.openwall.com From: Alexander Lobakin Cc: Alexander Lobakin Message-ID: <20201227184032.22413-16-alobakin@pm.me> In-Reply-To: <20201227184032.22413-1-alobakin@pm.me> References: <20201227183842.22030-1-alobakin@pm.me> <20201227184032.22413-1-alobakin@pm.me> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: [musl] [PATCH 16/18] [rt_]sigtimedwait: prefer time64 variant if available Instead of using time64 variant "only when needed", use it as a default and fallback to time32 only on -ENOSYS. Signed-off-by: Alexander Lobakin --- src/signal/sigtimedwait.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/signal/sigtimedwait.c b/src/signal/sigtimedwait.c index 1287174ebafd..603ba912f78f 100644 --- a/src/signal/sigtimedwait.c +++ b/src/signal/sigtimedwait.c @@ -10,10 +10,8 @@ static int do_sigtimedwait(const sigset_t *restrict mask= , siginfo_t *restrict si #ifdef SYS_rt_sigtimedwait_time64 =09time_t s =3D ts ? ts->tv_sec : 0; =09long ns =3D ts ? ts->tv_nsec : 0; -=09int r =3D -ENOSYS; -=09if (SYS_rt_sigtimedwait =3D=3D SYS_rt_sigtimedwait_time64 || !IS32BIT(s= )) -=09=09r =3D __syscall_cp(SYS_rt_sigtimedwait_time64, mask, si, -=09=09=09ts ? ((long long[]){s, ns}) : 0, _NSIG/8); +=09int r =3D __syscall_cp(SYS_rt_sigtimedwait_time64, mask, si, +=09=09ts ? ((long long[]){s, ns}) : 0, _NSIG/8); =09if (SYS_rt_sigtimedwait =3D=3D SYS_rt_sigtimedwait_time64 || r!=3D-ENOS= YS) =09=09return r; =09return __syscall_cp(SYS_rt_sigtimedwait, mask, si, --=20 2.29.2