From patchwork Mon Jul 13 17:10:22 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: 40085 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 A3ABD3939C06; Mon, 13 Jul 2020 17:11:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A3ABD3939C06 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1594660262; bh=HDlQC6HfvgJumjh4j1VN8jlvnx2Ggdr1wyNWQusd37Q=; 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=ORN/hdHrXafLEhj/tPJqz6KOlOVlnFQO7RU5qLYcfBVy6EypbkBc2AOry/ZZO/f0m fU7A03uKUXgs5OEcqt6LKVwHq6BpzrCtlqThrJM3F92pFs3bRF+jJ8zINd1M9utfYJ ++D+6OjPhQFweRgEfMGiHAqx4y59FjZJXpMD0GbQ= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qv1-xf41.google.com (mail-qv1-xf41.google.com [IPv6:2607:f8b0:4864:20::f41]) by sourceware.org (Postfix) with ESMTPS id 48FCA388C031 for ; Mon, 13 Jul 2020 17:11:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 48FCA388C031 Received: by mail-qv1-xf41.google.com with SMTP id di5so6091760qvb.11 for ; Mon, 13 Jul 2020 10:11:00 -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=HDlQC6HfvgJumjh4j1VN8jlvnx2Ggdr1wyNWQusd37Q=; b=aio+WKXUSWblqIaK3IOjCouh0boElaZPNew1W1INQJA9tCWMhnc2buWQB2UmSWexy3 b/hGmN6nlaD991Q0gZcNI2ZxMU/a0sGtIZo9U8YaQIM68Nkvw7uL4WtrpY7HDO4x2/FE 0ab+UwweHBPwh3OGim7IuIDznjZ1WfBTiZ1usEYYT7hQOdEgW6w+bp1dB/rAoaOLQrvk ghBHm4Llk1uoyerQtWDmbvxM5QeTUKQ9rpwZ4mJUaQi2dJ1rKOgyRmoO5NmSoJp/S0ik PAERhL8m1agkHgi0Z6Sa1WiBhZMp+Azp4d7FVB9arqA2KWSCm7P8CYO2eXQpfc/V9+OR wpjw== X-Gm-Message-State: AOAM532JZRGkzbtNTfFV1XAs+l14mbgFWTbZ6+8Sc4fxEEXp5qsKevY5 eQIpeyByc5cLS82a6Yi75Q+aGcvSJuI= X-Google-Smtp-Source: ABdhPJyYVZjtYBN3W1RegOFJnRqSgsWBt0dziRxqaUVwR7t5vM5TFcep99FnnJ+M+z6i2j/vy44KtQ== X-Received: by 2002:a0c:e80c:: with SMTP id y12mr463697qvn.146.1594660259596; Mon, 13 Jul 2020 10:10:59 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id v10sm19767919qtk.14.2020.07.13.10.10.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 10:10:59 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 20/23] linux: Use 64-bit time_t syscall on clock_getcputclockid Date: Mon, 13 Jul 2020 14:10:22 -0300 Message-Id: <20200713171025.3661832-20-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" The syscall __NR_clock_getres_time64 (for 32-bit) or __NR_clock_getres (for 64-bit) is used as default. The 32-bit fallback is used iff __ASSUME_TIME64_SYSCALLS is not defined, which assumes the kernel ABI provides either __NR_rt_sigtimedwait (32-bit time_t). Since the symbol does not use any type which might be affected by the time_t, there is no need to add a 64-bit variant. Checked on x86_64-linux-gnu and i686-linux-gnu (on 5.4 and on 4.15 kernel). --- sysdeps/unix/sysv/linux/clock_getcpuclockid.c | 37 ++++++++++++------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/sysdeps/unix/sysv/linux/clock_getcpuclockid.c b/sysdeps/unix/sysv/linux/clock_getcpuclockid.c index be1f477187..3c3bdd42ed 100644 --- a/sysdeps/unix/sysv/linux/clock_getcpuclockid.c +++ b/sysdeps/unix/sysv/linux/clock_getcpuclockid.c @@ -22,6 +22,20 @@ #include "kernel-posix-cpu-timers.h" #include +static int +clock_getcpuclockid_return (int r, clockid_t pidclock, clockid_t *clock_id) +{ + if (r == 0) + { + *clock_id = pidclock; + return 0; + } + if (r == -EINVAL) + /* The clock_getres system call checked the PID for us. */ + return ESRCH; + return -r; +} + int __clock_getcpuclockid (pid_t pid, clockid_t *clock_id) { @@ -30,20 +44,17 @@ __clock_getcpuclockid (pid_t pid, clockid_t *clock_id) const clockid_t pidclock = MAKE_PROCESS_CPUCLOCK (pid, CPUCLOCK_SCHED); - int r = INTERNAL_SYSCALL_CALL (clock_getres, pidclock, NULL); - if (!INTERNAL_SYSCALL_ERROR_P (r)) - { - *clock_id = pidclock; - return 0; - } +#ifndef __NR_clock_getres_time64 +# define __NR_clock_getres_time64 __NR_clock_getres +#endif + int r = INTERNAL_SYSCALL_CALL (clock_getres_time64, pidclock, NULL); +#ifndef __ASSUME_TIME64_SYSCALLS + if (r == 0 && r != -ENOSYS) + return clock_getcpuclockid_return (r, pidclock, clock_id); - if (INTERNAL_SYSCALL_ERRNO (r) == EINVAL) - { - /* The clock_getres system call checked the PID for us. */ - return ESRCH; - } - else - return INTERNAL_SYSCALL_ERRNO (r); + r = INTERNAL_SYSCALL_CALL (clock_getres, pidclock, NULL); +#endif + return clock_getcpuclockid_return (r, pidclock, clock_id); } versioned_symbol (libc, __clock_getcpuclockid, clock_getcpuclockid, GLIBC_2_17);