From patchwork Mon Feb 18 21:11:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 158649 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2938413jaa; Mon, 18 Feb 2019 13:12:01 -0800 (PST) X-Google-Smtp-Source: AHgI3IZ1sR1+k4nd/Df64YaRZKLsLNC2qHWvOXpMmke8UFjkFU8/LhED4tQDFCSZ0Lv1Ybaxw1do X-Received: by 2002:a62:4254:: with SMTP id p81mr26039934pfa.185.1550524321529; Mon, 18 Feb 2019 13:12:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550524321; cv=none; d=google.com; s=arc-20160816; b=w3XpzrEnHW8heSJvo84vGEYNWI2qKNMkJ9DbijF/wDZImbTjEZpaWr6jPf6kyKMOgh wXnMufyvpfpNr3AymkaKNMTdlBWVHexOMzLd1SS3ogJ02AkMGgfeJRP0YVQpjEHtBpXU tKFGnsSY+Tba6lMV6+1MseA7tJl/AdljAvxqn/12ASOmPVMgmzvst6YJSXMneciwuTdn vCr1B1x1prJQ4CKzLJioSNsvyt5htQ3gw8zOUqxdLBbgNalm28B1JvGmu0mUvJyybuRB SmwYJZ/rn38whpD425FlK+YtwgYnAZ2c1fgS8fVnXjFI0uh39X/DqlUrr/UbZS6cHZ+G wmaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from :dkim-signature:delivered-to:sender:list-help:list-post:list-archive :list-subscribe:list-unsubscribe:list-id:precedence:mailing-list :dkim-signature:domainkey-signature; bh=sTKeh7xLlpBEWwhYozLZU7XnJkRQ0oCpX2E+snoaAU8=; b=bcGJc625Tp8TFiEvH+tRrIARXaqC28f0vrV+3LgLvCuGv2dZOm2qqLqAr2gGN0X5An oKFrWllpk0PZjOOznrLDvHagjo4RAesSIwPPtfDO4mP7c8dP+J1HdsV2lZelEw8mV7m6 AJwVrP6rLjRTw2nzMPp1o0yaP7nOE39bDNn4sIpEdFGc52cgU8S38UiuJy0Oi5seBGOS 6DyRRk59hYWsWegbjOGCDAKnc7M30tiJBl0nREcGxFzBibmiOMP8ywAHorCDrdkjKkEt S5OKrH/xaNM1wBYhTRezc0CxpG9uUql915RAz2KPEEQ+AY7JUypPiKm2pBpKTycNoUV+ u5RA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=P8Bw9Kk7; dkim=pass header.i=@linaro.org header.s=google header.b=Xb7zYANY; spf=pass (google.com: domain of libc-alpha-return-100124-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-100124-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id x38si14062132pgl.419.2019.02.18.13.12.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Feb 2019 13:12:01 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-100124-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=P8Bw9Kk7; dkim=pass header.i=@linaro.org header.s=google header.b=Xb7zYANY; spf=pass (google.com: domain of libc-alpha-return-100124-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-100124-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=Z2CeDkFoWoYOb12N1ox1F4aFdua+qJ1 OuShf6Uo2+bFdTLc2EYEFxmvzR4C0Y8eBMceMvKe5A92iWoUrF1P1htyey5S+tzt cdwMIrcfjt1WMbMSUS4plpBnO6p1EOtGBI2x5I+pEB9j3PSwQ4LE3rEjuN6jB6mz q3UZ/F/9X9X4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=CPsoMxEsk5JXPENaTJStaW89EbY=; b=P8Bw9 Kk7175OUElUTKcdQ3s+IHdwidSvUioNV9rjfLNrSWNbQlkHRoLZ0J+tTqJFDfzsv IQbzqxj4CH6CccAspA3g1kA8ZtsSBUuhmw96dwVNdXbKvGXUu3tVnL+H67PfAkbC GEEb+XTfVJzJkM75nY8iwjp7APHfDW0aTQ11AA= Received: (qmail 60724 invoked by alias); 18 Feb 2019 21:11:40 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 60608 invoked by uid 89); 18 Feb 2019 21:11:40 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=Try, distributed, sk:interna, consolidate X-HELO: mail-qk1-f195.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=sTKeh7xLlpBEWwhYozLZU7XnJkRQ0oCpX2E+snoaAU8=; b=Xb7zYANY22xahYX7TCiMsS3tv6CwbuOHLG7lqYD0vBTvBG6AZAM52lELXKwJve3zVw 5CpBslU4Ltw+dmLrk4smqt3pW+eL3oAoqpdCMkdWx0l/aTms5Xiihty0vY87GRWwYUqe O45o29mqD+nXBhTvymi+WEiQNk1kwaGbzngO9aZNFFNjLaNRFMukemrviA/reh6t5YSW A2kw7UpCYWX8T+ummuL37bBNmF5zTL2eRPuvyUGRFNaLxlJWSvuiUpQVdHl4Vc4Arrok lEVrZocq4SyrX2vWUJI02gh335ihwCpgYMvxodS6Q0yeaU0gCR/GT1KzNeLUrQkNPCkE xE2w== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH v2 2/6] linux: Assume clock_getres CLOCK_{PROCESS, THREAD}_CPUTIME_ID Date: Mon, 18 Feb 2019 18:11:24 -0300 Message-Id: <20190218211128.1869-2-adhemerval.zanella@linaro.org> In-Reply-To: <20190218211128.1869-1-adhemerval.zanella@linaro.org> References: <20190218211128.1869-1-adhemerval.zanella@linaro.org> Changes from previous version: - Remove ia64 itc drift check and assume kernel handles it correctly. --- This patch assumes that clock_getres syscall always support CLOCK_PROCESS_CPUTIME_ID and CLOCK_THREAD_CPUTIME_ID, so there is no need to fallback to hp-timing support for _SC_MONOTONIC_CLOCK. This allows simplify the sysconf support to always use the syscall. The ia64 implementation is also simplified and consolidate in one file. Checked on aarch64-linux-gnu, x86_64-linux-gnu, and i686-linux-gnu. * sysdeps/unix/sysv/linux/ia64/has_cpuclock.c: Remove file. * sysdeps/unix/sysv/linux/ia64/sysconf.c: Likewise. * sysdeps/unix/sysv/linux/sysconf.c (has_cpuclock): Remove function. (check_clock_getres): New function. (__sysconf): Use check_clock_getres instead of has_cpuclock. --- sysdeps/unix/sysv/linux/ia64/has_cpuclock.c | 51 --------------------- sysdeps/unix/sysv/linux/ia64/sysconf.c | 30 ------------ sysdeps/unix/sysv/linux/sysconf.c | 48 ++++++------------- 3 files changed, 13 insertions(+), 116 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/ia64/has_cpuclock.c delete mode 100644 sysdeps/unix/sysv/linux/ia64/sysconf.c -- 2.17.1 diff --git a/sysdeps/unix/sysv/linux/ia64/has_cpuclock.c b/sysdeps/unix/sysv/linux/ia64/has_cpuclock.c deleted file mode 100644 index b3afb37f8b..0000000000 --- a/sysdeps/unix/sysv/linux/ia64/has_cpuclock.c +++ /dev/null @@ -1,51 +0,0 @@ -/* Copyright (C) 2000-2019 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#include -#include -#include -#include -#include -#include - -static int itc_usable; - -static int -has_cpuclock (void) -{ - if (__builtin_expect (itc_usable == 0, 0)) - { - int newval = 1; - int fd = __open_nocancel ("/proc/sal/itc_drift", O_RDONLY); - if (__builtin_expect (fd != -1, 1)) - { - char buf[16]; - /* We expect the file to contain a single digit followed by - a newline. If the format changes we better not rely on - the file content. */ - if (__read_nocancel (fd, buf, sizeof buf) != 2 - || buf[0] != '0' || buf[1] != '\n') - newval = -1; - - __close_nocancel_nostatus (fd); - } - - itc_usable = newval; - } - - return itc_usable; -} diff --git a/sysdeps/unix/sysv/linux/ia64/sysconf.c b/sysdeps/unix/sysv/linux/ia64/sysconf.c deleted file mode 100644 index ef75322f1f..0000000000 --- a/sysdeps/unix/sysv/linux/ia64/sysconf.c +++ /dev/null @@ -1,30 +0,0 @@ -/* Get file-specific information about a file. Linux/ia64 version. - Copyright (C) 2003-2019 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#include -#include -#include -#include - - -#include "has_cpuclock.c" -#define HAS_CPUCLOCK(name) (has_cpuclock () ? _POSIX_VERSION : -1) - - -/* Now the generic Linux version. */ -#include diff --git a/sysdeps/unix/sysv/linux/sysconf.c b/sysdeps/unix/sysv/linux/sysconf.c index 4b297ba35f..2027444488 100644 --- a/sysdeps/unix/sysv/linux/sysconf.c +++ b/sysdeps/unix/sysv/linux/sysconf.c @@ -35,33 +35,18 @@ static long int posix_sysconf (int name); -#ifndef HAS_CPUCLOCK static long int -has_cpuclock (int name) +check_clock_getres (clockid_t clk_id) { -# if defined __NR_clock_getres || HP_TIMING_AVAIL - /* If we have HP_TIMING, we will fall back on that if the system - call does not work, so we support it either way. */ -# if !HP_TIMING_AVAIL - /* Check using the clock_getres system call. */ struct timespec ts; INTERNAL_SYSCALL_DECL (err); - int r = INTERNAL_SYSCALL (clock_getres, err, 2, - (name == _SC_CPUTIME - ? CLOCK_PROCESS_CPUTIME_ID - : CLOCK_THREAD_CPUTIME_ID), - &ts); + /* Avoid setting errno to we can check whether the kernel supports + the CLK_ID. */ + int r = INTERNAL_SYSCALL_CALL (clock_getres, err, clk_id, &ts); if (INTERNAL_SYSCALL_ERROR_P (r, err)) return -1; -# endif return _POSIX_VERSION; -# else - return -1; -# endif } -# define HAS_CPUCLOCK(name) has_cpuclock (name) -#endif - /* Get the value of the system variable NAME. */ long int @@ -71,29 +56,21 @@ __sysconf (int name) switch (name) { - struct rlimit rlimit; -#ifdef __NR_clock_getres case _SC_MONOTONIC_CLOCK: - /* Check using the clock_getres system call. */ - { - struct timespec ts; - INTERNAL_SYSCALL_DECL (err); - int r; - r = INTERNAL_SYSCALL (clock_getres, err, 2, CLOCK_MONOTONIC, &ts); - return INTERNAL_SYSCALL_ERROR_P (r, err) ? -1 : _POSIX_VERSION; - } -#endif - + return check_clock_getres (CLOCK_MONOTONIC); case _SC_CPUTIME: + return check_clock_getres (CLOCK_PROCESS_CPUTIME_ID); case _SC_THREAD_CPUTIME: - return HAS_CPUCLOCK (name); + return check_clock_getres (CLOCK_THREAD_CPUTIME_ID); - case _SC_ARG_MAX: + case _SC_ARG_MAX: { + struct rlimit rlimit; /* Use getrlimit to get the stack limit. */ if (__getrlimit (RLIMIT_STACK, &rlimit) == 0) return MAX (legacy_ARG_MAX, rlimit.rlim_cur / 4); return legacy_ARG_MAX; + } break; case _SC_NGROUPS_MAX: /* Try to read the information from the /proc/sys/kernel/ngroups_max @@ -101,13 +78,14 @@ __sysconf (int name) procfname = "/proc/sys/kernel/ngroups_max"; break; - case _SC_SIGQUEUE_MAX: + case _SC_SIGQUEUE_MAX: { + struct rlimit rlimit; if (__getrlimit (RLIMIT_SIGPENDING, &rlimit) == 0) return rlimit.rlim_cur; /* The /proc/sys/kernel/rtsig-max file contains the answer. */ procfname = "/proc/sys/kernel/rtsig-max"; - break; + } break; default: break;