From patchwork Mon Mar 29 18:25:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 42801 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 6D44E3850417; Mon, 29 Mar 2021 18:25:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6D44E3850417 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1617042333; bh=KL/dXHClwAVCiQ1pWfB/SiGjuE6YzlT8ELYubyAFY5w=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=aGBY2jri2OTq9UR2uiPzTWVdqm/cqsAJ/eOFLiPnnSgc0Ncdu2JpHTQqMzFGa8DFh 2MlKWRNIluLvvcy4+/mb4HPP7eZ5giRdjMgGDXUN4gtcgWKnWCHONRGFGY4LHzAlZp gYaoMnl5zOh26fBLRmVfYoZHnz9GQTfDybEN5x0o= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qv1-xf2b.google.com (mail-qv1-xf2b.google.com [IPv6:2607:f8b0:4864:20::f2b]) by sourceware.org (Postfix) with ESMTPS id 895A03860C34 for ; Mon, 29 Mar 2021 18:25:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 895A03860C34 Received: by mail-qv1-xf2b.google.com with SMTP id g8so6928988qvx.1 for ; Mon, 29 Mar 2021 11:25:30 -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=KL/dXHClwAVCiQ1pWfB/SiGjuE6YzlT8ELYubyAFY5w=; b=NnKolE2CKN42Fqfcw3C5/B9SvtsmrxjxFv+YZsfYcjV2HrmtqxPGO91QhjRUX2FPY4 +qTFaW3CTBn+a5mw6v41ezEBCDf0tL2HH8bztl0TNzTsqk/pcv0A0r7Ra4iXVXJESc3j OWDSPF2oa8VPZWA5mvXr4kgxS22Lg/7FN+8pQt8uj0g72/qSpYAdaI2FS+HRSYE7ojj1 bihFa7+CvCAf26Wsy+vbjNP8rbjGUtFtH4LatU+2hZhGz3quwKf1Go+1C8Z8mRftAz7T WcK4hEar9n4Xu62OSnrrP3Pwo88Wud3u7WNzFVfpJPAA+TGIsawxbnF50iBiZDgxoqgG eY2A== X-Gm-Message-State: AOAM532j7yU9AqFtevesaJYHDWC9t/3dIg4g/nr8gm5NNQ4gCcHy+ccn cJxNC9LLGd0lu/tRC5zwSQYhhS/0zl7XOdqr X-Google-Smtp-Source: ABdhPJy806Jui58z3I840V5SfwR0lqPOzYaHqw0OKetKjizDuAbt9XIUPV2WEv8/mNW25fyjlUgUYw== X-Received: by 2002:ad4:560f:: with SMTP id ca15mr26498643qvb.42.1617042329853; Mon, 29 Mar 2021 11:25:29 -0700 (PDT) Received: from localhost.localdomain ([177.194.41.149]) by smtp.googlemail.com with ESMTPSA id o7sm14009565qkb.104.2021.03.29.11.25.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Mar 2021 11:25:29 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 4/4] linux: Remove /proc/cpuinfo fallback on alpha and sparc Date: Mon, 29 Mar 2021 15:25:20 -0300 Message-Id: <20210329182520.323665-4-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210329182520.323665-1-adhemerval.zanella@linaro.org> References: <20210329182520.323665-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, 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 Cc: crrodriguez@opensuse.org Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" There is no much gain in fallback to cpuinfo if sysfs is no present, usually on restricted environment neither will be present. It also simplifies the code and make all architecture use the sched_getaffinity as the sysfs fallback. Checked on sparc64-linux-gnu. --- sysdeps/unix/sysv/linux/alpha/getsysstats.c | 38 --------------------- sysdeps/unix/sysv/linux/getsysstats.c | 22 ++---------- sysdeps/unix/sysv/linux/sparc/getsysstats.c | 38 --------------------- 3 files changed, 3 insertions(+), 95 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/alpha/getsysstats.c delete mode 100644 sysdeps/unix/sysv/linux/sparc/getsysstats.c diff --git a/sysdeps/unix/sysv/linux/alpha/getsysstats.c b/sysdeps/unix/sysv/linux/alpha/getsysstats.c deleted file mode 100644 index 098575faef..0000000000 --- a/sysdeps/unix/sysv/linux/alpha/getsysstats.c +++ /dev/null @@ -1,38 +0,0 @@ -/* Determine various system internal values, Linux/Alpha version. - Copyright (C) 1999-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Andreas Schwab - - 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 - . */ - - -/* On the Alpha we can distinguish between the number of configured and - active cpus. */ -#define GET_NPROCS_CONF_PARSER(FP, BUFFER, RESULT) \ - do \ - { \ - /* Find the line that contains the information about the number of \ - probed cpus. We don't have to fear extremely long lines since \ - the kernel will not generate them. 8192 bytes are really enough. \ - If there is no "CPUs ..." line then we are on a UP system. */ \ - (RESULT) = 1; \ - while (__fgets_unlocked ((BUFFER), sizeof (BUFFER), (FP)) != NULL) \ - if ((sscanf (buffer, "cpus detected : %d", &(RESULT)) == 1) \ - || (sscanf (buffer, "CPUs probed %d", &(RESULT)) == 1)) \ - break; \ - } \ - while (0) - -#include diff --git a/sysdeps/unix/sysv/linux/getsysstats.c b/sysdeps/unix/sysv/linux/getsysstats.c index 5069951246..0791399b8f 100644 --- a/sysdeps/unix/sysv/linux/getsysstats.c +++ b/sysdeps/unix/sysv/linux/getsysstats.c @@ -64,13 +64,13 @@ weak_alias (__get_nprocs, get_nprocs) int __get_nprocs_conf (void) { - int result = 1; - /* Try to use the sysfs filesystem. It has actual information about online processors. */ int fd = __open64_nocancel ("/sys/devices/system/cpu/possible", O_RDONLY); if (fd != -1) { + int result = 0; + /* The entry is in the form of '[cpuX]-[cpuY]'. */ char buf[2 * INT_STRLEN_BOUND (unsigned int) + 1]; @@ -97,23 +97,7 @@ __get_nprocs_conf (void) return result + 1; } -#ifdef GET_NPROCS_CONF_PARSER - /* If we haven't found an appropriate entry return 1. */ - FILE *fp = fopen ("/proc/cpuinfo", "rce"); - if (fp != NULL) - { - char buffer[8192]; - - /* No threads use this stream. */ - __fsetlocking (fp, FSETLOCKING_BYCALLER); - GET_NPROCS_CONF_PARSER (fp, buffer, result); - fclose (fp); - } -#else - result = __get_nprocs (); -#endif - - return result; + return __get_nprocs (); } libc_hidden_def (__get_nprocs_conf) weak_alias (__get_nprocs_conf, get_nprocs_conf) diff --git a/sysdeps/unix/sysv/linux/sparc/getsysstats.c b/sysdeps/unix/sysv/linux/sparc/getsysstats.c deleted file mode 100644 index a8adba8321..0000000000 --- a/sysdeps/unix/sysv/linux/sparc/getsysstats.c +++ /dev/null @@ -1,38 +0,0 @@ -/* Determine various system internal values, Linux/Sparc version. - Copyright (C) 1999-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Andreas Schwab and - Jakub Jelinek - - 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 - . */ - - -/* On the Sparc we can distinguish between the number of configured and - active cpus. */ -#define GET_NPROCS_CONF_PARSER(FP, BUFFER, RESULT) \ - do \ - { \ - (RESULT) = 0; \ - /* Find the line that contains the information about the number of \ - probed cpus. We don't have to fear extremely long lines since \ - the kernel will not generate them. 8192 bytes are really \ - enough. */ \ - while (__fgets_unlocked ((BUFFER), sizeof (BUFFER), (FP)) != NULL) \ - if (sscanf (buffer, "ncpus probed : %d", &(RESULT)) == 1) \ - break; \ - } \ - while (0) - -#include