From patchwork Mon Jul 13 17:10:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 40074 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 33D43388E83C; Mon, 13 Jul 2020 17:10:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 33D43388E83C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1594660245; bh=dpkETXr57I+oXUP7EtlXRZ22bRcDMKIDJZHNTHoOXkc=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=yWgnUFhyJPdsdm0cOkBgVAULLWltK3aEe4CtRg/G+mXzmF8icplimtfGM4ekZ4MRV dWjJVWCqXQ601nVBiUe4YGXbPKeIIxRDFYX8ZG1wVOZtkLBTIszIirvCKUtLyqDdHW sSkWk8fgdzKhTfemD464xTGZGM04MszRob5tLiEQ= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qt1-x844.google.com (mail-qt1-x844.google.com [IPv6:2607:f8b0:4864:20::844]) by sourceware.org (Postfix) with ESMTPS id 24364388E813 for ; Mon, 13 Jul 2020 17:10:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 24364388E813 Received: by mail-qt1-x844.google.com with SMTP id a32so10531929qtb.5 for ; Mon, 13 Jul 2020 10:10:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dpkETXr57I+oXUP7EtlXRZ22bRcDMKIDJZHNTHoOXkc=; b=Q4m7Y7Y0rAsrrog1tjWTLNE6TRWDbHQYrdsD0EPg9Hl4j31ehsawHGzWxgXy7RBHNv fpBZj+mIqsUuP1DhqRYwU+YwUovFJepBMxHuZl180JDqomm0IZpdtcqF/vnuMffqWw4m zWUOJY/r8ko1iGVX6duG34ecNUFedWY6SJ/kJH8f0QcMr7tPwu9MBaSEnY59oODtgmi+ SC00xbvQDnSCNF8YknCBc4PHRtijRGP/KMiJ3xMukgkKvg0TE2BE8NFSuNNMOK2ETFTM PV2N/qOATHgv3i+H0awi5bMrOb9mDW/FTnL9/3vM4HDOlSpL0uallutDSezPQmar7/Ls 3Dvw== X-Gm-Message-State: AOAM532Fty50oeL6Ij4x4ABSG/kL/OK8xpPd/t3soP/zhNz/ZeLN4vN1 PIrECqw1ZNtpvyAxPCli/cph/KM7qc0= X-Google-Smtp-Source: ABdhPJwIKTzgvhh0cX2pW2KCYyx1Hkc5bn0ZIKWEtMZMHrreGyXZoT+p9aJKgQqP+9uXYiDUdflHFw== X-Received: by 2002:ac8:4f50:: with SMTP id i16mr323854qtw.216.1594660242563; Mon, 13 Jul 2020 10:10:42 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id v10sm19767919qtk.14.2020.07.13.10.10.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 10:10:42 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 09/23] linux: Simplify timer_gettime Date: Mon, 13 Jul 2020 14:10:11 -0300 Message-Id: <20200713171025.3661832-9-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200713171025.3661832-1-adhemerval.zanella@linaro.org> References: <20200713171025.3661832-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-14.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" With arch-syscall.h it can now assumes the existance of either __NR_timer_gettime or __NR_time_gettime_time64. The 32-bit time_t support is now only build for !__ASSUME_TIME64_SYSCALLS. Checked on x86_64-linux-gnu and i686-linux-gnu (on 5.4 and on 4.15 kernel). Reviewed-by: Lukasz Majewski --- sysdeps/unix/sysv/linux/timer_gettime.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/sysdeps/unix/sysv/linux/timer_gettime.c b/sysdeps/unix/sysv/linux/timer_gettime.c index 1e07d4845b..5d31c7c864 100644 --- a/sysdeps/unix/sysv/linux/timer_gettime.c +++ b/sysdeps/unix/sysv/linux/timer_gettime.c @@ -28,27 +28,23 @@ __timer_gettime64 (timer_t timerid, struct __itimerspec64 *value) { struct timer *kt = (struct timer *) timerid; -#ifdef __ASSUME_TIME64_SYSCALLS -# ifndef __NR_timer_gettime64 -# define __NR_timer_gettime64 __NR_timer_gettime -# endif - return INLINE_SYSCALL_CALL (timer_gettime64, kt->ktimerid, value); -#else -# ifdef __NR_timer_gettime64 +#ifndef __NR_timer_gettime64 +# define __NR_timer_gettime64 __NR_timer_gettime +#endif int ret = INLINE_SYSCALL_CALL (timer_gettime64, kt->ktimerid, value); +#ifndef __ASSUME_TIME64_SYSCALLS if (ret == 0 || errno != ENOSYS) return ret; -# endif + struct itimerspec its32; - int retval = INLINE_SYSCALL_CALL (timer_gettime, kt->ktimerid, &its32); - if (retval == 0) + ret = INLINE_SYSCALL_CALL (timer_gettime, kt->ktimerid, &its32); + if (ret == 0) { value->it_interval = valid_timespec_to_timespec64 (its32.it_interval); value->it_value = valid_timespec_to_timespec64 (its32.it_value); } - - return retval; #endif + return ret; } #if __TIMESIZE != 64