From patchwork Mon Jul 13 17:10:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 40073 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 A6631388E833; Mon, 13 Jul 2020 17:10:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A6631388E833 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1594660243; bh=5GH/Ivgi4OztfFaEArLQvLfMISjBY9WgAO7W43AEQNY=; 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=bkg3gxjpgYPYY8cQ0mapNfvVSxWMoHVZudeP6QGkBEDHiDic6WP5UhMutWtybXFke V+OT6ykw9SjYtg4Syx31jqaW5+E08sgFIHk7Yb6hSCEzhwo/vfFNThkOxaNMtO+tcc C1IkzwSbyfZ5PQyjaeVEUkCDBvI6A+4EObsBe+Fo= 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 AC869388E813 for ; Mon, 13 Jul 2020 17:10:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org AC869388E813 Received: by mail-qt1-x841.google.com with SMTP id w34so10546841qte.1 for ; Mon, 13 Jul 2020 10:10:41 -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=5GH/Ivgi4OztfFaEArLQvLfMISjBY9WgAO7W43AEQNY=; b=adkN4B0K6wlQljUKDiXb89Y9NHzOBULIOApEu+ZhRCkeH7CxcGoi9FnPblEoZaZjD7 I5ONfyGDCAjlnNlldZJ2h2imGiZdlwCBRTcVXfYm2RuXyiCVE+tDCfyBMU3zJTkJQbdu JkpFUFQksjaAuiX4HMoKz4PsY9DmrY/GKSHl6VAPxur3FCsYsuBCHpNaD6Ty4AV1jXZZ OB0XE2PbNLUQebDphJhjY7armHxhkgTuMEDKya2c+HKJZ2NaPbK1T/ryZXUDd/Hwu401 g3WAtRwBC8uOXeejuTPRrlbvTc4qU8YDfIW2R3oiLVS39avU0iRiNy/7hJXj1wiQgteI hvdA== X-Gm-Message-State: AOAM530bNtSbBsr4I0qhlJBifEBS1zA3jSYCdahBqJQPZV3yo7SzWBhb gkH1egs4BsELiJkJV+qaKqGa0mNgiRc= X-Google-Smtp-Source: ABdhPJxRZTKieYA3cTS0OfKUM4P2SuOVgNW2QdzXWe1lV5h1aAD9y5mzaYoqVxkgy/uj+rIxEAwbSQ== X-Received: by 2002:ac8:bc2:: with SMTP id p2mr338162qti.374.1594660241067; Mon, 13 Jul 2020 10:10:41 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id v10sm19767919qtk.14.2020.07.13.10.10.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 10:10:40 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 08/23] linux: Simplify sched_rr_get_interval Date: Mon, 13 Jul 2020 14:10:10 -0300 Message-Id: <20200713171025.3661832-8-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 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_sched_rr_get_interval or __NR_sched_rr_get_interval_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/sched_rr_gi.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/sysdeps/unix/sysv/linux/sched_rr_gi.c b/sysdeps/unix/sysv/linux/sched_rr_gi.c index 3d7b484591..997562159f 100644 --- a/sysdeps/unix/sysv/linux/sched_rr_gi.c +++ b/sysdeps/unix/sysv/linux/sched_rr_gi.c @@ -25,24 +25,20 @@ int __sched_rr_get_interval64 (pid_t pid, struct __timespec64 *tp) { -#ifdef __ASSUME_TIME64_SYSCALLS -# ifndef __NR_sched_rr_get_interval_time64 -# define __NR_sched_rr_get_interval_time64 __NR_sched_rr_get_interval -# endif - return INLINE_SYSCALL_CALL (sched_rr_get_interval_time64, pid, tp); -#else -# ifdef __NR_sched_rr_get_interval_time64 +#ifndef __NR_sched_rr_get_interval_time64 +# define __NR_sched_rr_get_interval_time64 __NR_sched_rr_get_interval +#endif int ret = INLINE_SYSCALL_CALL (sched_rr_get_interval_time64, pid, tp); +#ifndef __ASSUME_TIME64_SYSCALLS if (ret == 0 || errno != ENOSYS) return ret; -# endif + struct timespec tp32; - int retval = INLINE_SYSCALL_CALL (sched_rr_get_interval, pid, &tp32); - if (retval == 0) + ret = INLINE_SYSCALL_CALL (sched_rr_get_interval, pid, &tp32); + if (ret == 0) *tp = valid_timespec_to_timespec64 (tp32); - - return retval; #endif + return ret; } #if __TIMESIZE != 64