From patchwork Tue Sep 8 14:57:31 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: 40374 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 1B9453951C4C; Tue, 8 Sep 2020 14:57:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1B9453951C4C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1599577074; bh=wza4BQ/EEblV6D7QwRl/SdKGwfU55zwOcAuK2bLh+cE=; 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=m8o1hzc+4yrAi/mQx94C9ptJ2btgFVItvhJWxP7/SpmUS9R6+VQoGzFhSm6rvV+iP HuLXGKbreU7GUdiOVY0EGaYQ1ZUsKlyv2MpkdwjDRZLVPxLPesLIDY5sDfvZzOeq/x aRFNe0+wf+Cqv+9p0MRwn+rrhu7nWBa8MgfRUgxs= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qt1-x841.google.com (mail-qt1-x841.google.com [IPv6:2607:f8b0:4864:20::841]) by sourceware.org (Postfix) with ESMTPS id 43AEC3861830 for ; Tue, 8 Sep 2020 14:57:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 43AEC3861830 Received: by mail-qt1-x841.google.com with SMTP id n10so12120612qtv.3 for ; Tue, 08 Sep 2020 07:57:52 -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:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wza4BQ/EEblV6D7QwRl/SdKGwfU55zwOcAuK2bLh+cE=; b=LpTXjY1tavt4fAGDQLttiFysX1o+hlvfqRgeLnTpDJ/YthvIyvBfGPvtk3GnJGB+Ay 7Rf/KHSXkxV9NTB5NgJM/nxIDWipEmzitlIN6RyXQXi3eDDNdVql9/c4l646f0YSv5e2 gURLQAaLSA7VMUQTvye3sw1QGRmJagXGqAVwkJCYh/gmOhrU3CgBPKzYbScE6yEMuZAm CWMYI7OzXmQ4wAkaYjAnzm3lTtUMlD3BcE+B6Ly4ZMqi1fIJvkvLpOr4yO/+l4RU747+ J6KkrSmj0Xc+CIGdSy+0MPnWzUbNSqwqExTwTw05/ooC3SmC4P0M/2VIPvuRtUVTb6Ti p+Wg== X-Gm-Message-State: AOAM532n9aysU8ytdhnORSwJ9CdQxXtdU8TQg31/3A+R8N9jMXdqej7N RgkC6PECU5hjZ7mfviYTvWSZWogNBiXAxA== X-Google-Smtp-Source: ABdhPJxxTBKo1EZqSNcgQA98ukFXHjlvROZarU9pvcvfIJS1EojTZ8zPMN5O0E6vgPjMe4EYjjPqUQ== X-Received: by 2002:ac8:7388:: with SMTP id t8mr432801qtp.187.1599577071676; Tue, 08 Sep 2020 07:57:51 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id e188sm10800748qkd.55.2020.09.08.07.57.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2020 07:57:51 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v2 07/14] linux: Use 64-bit time_t syscall on clock_getcputclockid Date: Tue, 8 Sep 2020 11:57:31 -0300 Message-Id: <20200908145738.640039-7-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200908145738.640039-1-adhemerval.zanella@linaro.org> References: <20200908145738.640039-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.5 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). Reviewed-by: Alistair Francis --- sysdeps/unix/sysv/linux/clock_getcpuclockid.c | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/sysdeps/unix/sysv/linux/clock_getcpuclockid.c b/sysdeps/unix/sysv/linux/clock_getcpuclockid.c index be1f477187..7d2e6d6bfe 100644 --- a/sysdeps/unix/sysv/linux/clock_getcpuclockid.c +++ b/sysdeps/unix/sysv/linux/clock_getcpuclockid.c @@ -30,20 +30,25 @@ __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)) +#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) + r = INTERNAL_SYSCALL_CALL (clock_getres, pidclock, NULL); +#endif + + if (r == 0) { *clock_id = pidclock; return 0; } - - if (INTERNAL_SYSCALL_ERRNO (r) == EINVAL) - { - /* The clock_getres system call checked the PID for us. */ - return ESRCH; - } - else - return INTERNAL_SYSCALL_ERRNO (r); + if (r == -EINVAL) + /* The clock_getres system call checked the PID for us. */ + return ESRCH; + return -r; } versioned_symbol (libc, __clock_getcpuclockid, clock_getcpuclockid, GLIBC_2_17);