From patchwork Thu Nov 25 12:27:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 48127 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 EEA293858030 for ; Thu, 25 Nov 2021 12:27:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EEA293858030 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1637843276; bh=Ckh8cx8sRDG5QwPVgapcu+qoEi7LBcbA+MzdXttZMRM=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Rn05psTKZX5p8pILBzZ9YubERzQnbCTPW6rkhQYvjWVc28KkskPs1IiYfvLj6JZwx GSPE1umAQNyzhmBmCjz9SQb+u0NPjILJv6dmV/av/nN1DLT7qIs4phnEBLWc9w6IIL prG34B2Xj3RflBdGgzm16BAwXrtUaANdyMFRZf/0= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-ua1-x931.google.com (mail-ua1-x931.google.com [IPv6:2607:f8b0:4864:20::931]) by sourceware.org (Postfix) with ESMTPS id 5BD3C3858C60 for ; Thu, 25 Nov 2021 12:27:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5BD3C3858C60 Received: by mail-ua1-x931.google.com with SMTP id w23so11910917uao.5 for ; Thu, 25 Nov 2021 04:27:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Ckh8cx8sRDG5QwPVgapcu+qoEi7LBcbA+MzdXttZMRM=; b=A/Hz/utM9NlIiZSuPmcvbNU1prnWQF4ZIw5suOtgKFs7SMPVV14j0gAxg1bIxW0VLG fq1s0wr5M+OcL60apBMJtGEO58QcSA25dBT4UVHl/KP2iC9agRHc7UI0LH7r7uYjJbWW gs+VLsi/3thfTNQg/7/Q4X6oJ55Ga1x4g4Lpa/FQzByQ7+E1FuguWajqulNYEXQwaUwE Iphx9mFYQ5zv/DsnUYgp4ENA0MZd+wjlGVkWDFEcTg1s7zTHAzmUjm0S8qQcFhB2kcD4 wCWb+Yhi8q5tO1ScJt8pR0tQpBFTKD2sRxnvpRQhaMFGESEIH8hfY02rWUOfJVn04vUg YrPA== X-Gm-Message-State: AOAM531MvdvE7WiU4JGCcgQrbT7jBGU1XyG1xQUoK9WzXJstgDrEHtHM +v7fjV9Is/EuaCUbmBDrN7lMkFSj7VfW7A== X-Google-Smtp-Source: ABdhPJzmMdAcdLuAVlYNaE7uxZI4brjF6vhUUXgigU5tl3O01DlwgCDyZ/9ocl4TrMnhn2WjLS96uQ== X-Received: by 2002:ab0:6f4f:: with SMTP id r15mr24918379uat.17.1637843252817; Thu, 25 Nov 2021 04:27:32 -0800 (PST) Received: from birita.. ([2804:431:c7cb:e054:2b7b:edb0:2264:6dae]) by smtp.gmail.com with ESMTPSA id m15sm1535453vkl.40.2021.11.25.04.27.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 04:27:32 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH] linux: Use /proc/stat fallback for __get_nprocs_conf (BZ #28624) Date: Thu, 25 Nov 2021 09:27:27 -0300 Message-Id: <20211125122727.124002-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-Spam-Status: No, score=-12.9 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.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" The /proc/statm fallback was removed by f13fb81ad3159 if sysfs is not available, reinstate it. Checked on x86_64-linux-gnu. --- sysdeps/unix/sysv/linux/getsysstats.c | 60 ++++++++++++++++----------- 1 file changed, 35 insertions(+), 25 deletions(-) diff --git a/sysdeps/unix/sysv/linux/getsysstats.c b/sysdeps/unix/sysv/linux/getsysstats.c index 15ad91cf2f..0165e58b05 100644 --- a/sysdeps/unix/sysv/linux/getsysstats.c +++ b/sysdeps/unix/sysv/linux/getsysstats.c @@ -107,6 +107,39 @@ next_line (int fd, char *const buffer, char **cp, char **re, return res == *re ? NULL : res; } +static int +get_nproc_stat (void) +{ + enum { buffer_size = 1024 }; + char buffer[buffer_size]; + char *buffer_end = buffer + buffer_size; + char *cp = buffer_end; + char *re = buffer_end; + + /* Default to an SMP system in case we cannot obtain an accurate + number. */ + int result = 2; + + const int flags = O_RDONLY | O_CLOEXEC; + int fd = __open_nocancel ("/proc/stat", flags); + if (fd != -1) + { + result = 0; + + char *l; + while ((l = next_line (fd, buffer, &cp, &re, buffer_end)) != NULL) + /* The current format of /proc/stat has all the cpu* entries + at the front. We assume here that stays this way. */ + if (strncmp (l, "cpu", 3) != 0) + break; + else if (isdigit (l[3])) + ++result; + + __close_nocancel_nostatus (fd); + } + + return result; +} int __get_nprocs (void) @@ -162,30 +195,7 @@ __get_nprocs (void) return result; } - cp = buffer_end; - re = buffer_end; - - /* Default to an SMP system in case we cannot obtain an accurate - number. */ - result = 2; - - fd = __open_nocancel ("/proc/stat", flags); - if (fd != -1) - { - result = 0; - - while ((l = next_line (fd, buffer, &cp, &re, buffer_end)) != NULL) - /* The current format of /proc/stat has all the cpu* entries - at the front. We assume here that stays this way. */ - if (strncmp (l, "cpu", 3) != 0) - break; - else if (isdigit (l[3])) - ++result; - - __close_nocancel_nostatus (fd); - } - - return result; + return get_nproc_stat (); } libc_hidden_def (__get_nprocs) weak_alias (__get_nprocs, get_nprocs) @@ -219,7 +229,7 @@ __get_nprocs_conf (void) return count; } - return 1; + return get_nproc_stat (); } libc_hidden_def (__get_nprocs_conf) weak_alias (__get_nprocs_conf, get_nprocs_conf)