From patchwork Tue Jan 26 09:14:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 371035 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 255DCC43331 for ; Tue, 26 Jan 2021 17:20:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E0C77230FD for ; Tue, 26 Jan 2021 17:20:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390958AbhAZRUe (ORCPT ); Tue, 26 Jan 2021 12:20:34 -0500 Received: from mx2.suse.de ([195.135.220.15]:57552 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731028AbhAZJR0 (ORCPT ); Tue, 26 Jan 2021 04:17:26 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id A5DB5B284; Tue, 26 Jan 2021 09:15:06 +0000 (UTC) From: Daniel Wagner To: Clark Williams , John Kacur Cc: linux-rt-users@vger.kernel.org, Daniel Wagner Subject: [rt-tests v3 13/16] rt-numa: Remove used max_cpus argument from cpu_for_thread() Date: Tue, 26 Jan 2021 10:14:57 +0100 Message-Id: <20210126091500.31735-14-dwagner@suse.de> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210126091500.31735-1-dwagner@suse.de> References: <20210126091500.31735-1-dwagner@suse.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-rt-users@vger.kernel.org There is no need to pass in the max_cpus anymore. Thus remove the argument. Signed-off-by: Daniel Wagner --- src/cyclictest/cyclictest.c | 2 +- src/include/rt-numa.h | 2 +- src/lib/rt-numa.c | 10 +++++----- src/signaltest/signaltest.c | 3 +-- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c index 366b2aaaa9f8..7a0501031857 100644 --- a/src/cyclictest/cyclictest.c +++ b/src/cyclictest/cyclictest.c @@ -1882,7 +1882,7 @@ int main(int argc, char **argv) if (status != 0) fatal("error from pthread_attr_init for thread %d: %s\n", i, strerror(status)); - cpu = cpu_for_thread(i, max_cpus, affinity_mask); + cpu = cpu_for_thread(i, affinity_mask); if (verbose) printf("Thread %d using cpu %d.\n", i, cpu); diff --git a/src/include/rt-numa.h b/src/include/rt-numa.h index 446ce54a6ba2..405e57869735 100644 --- a/src/include/rt-numa.h +++ b/src/include/rt-numa.h @@ -5,7 +5,7 @@ #include int get_available_cpus(struct bitmask *cpumask); -int cpu_for_thread(int thread_num, int max_cpus, struct bitmask *cpumask); +int cpu_for_thread(int thread_num, struct bitmask *cpumask); int parse_cpumask(char *str, struct bitmask **cpumask); diff --git a/src/lib/rt-numa.c b/src/lib/rt-numa.c index 45d4f1193d5f..04f2e9adb4b1 100644 --- a/src/lib/rt-numa.c +++ b/src/lib/rt-numa.c @@ -21,7 +21,7 @@ int get_available_cpus(struct bitmask *cpumask) return numa_num_task_cpus(); } -static int cpu_for_thread_sp(int thread_num, int max_cpus, struct bitmask *cpumask) +static int cpu_for_thread_sp(int thread_num, struct bitmask *cpumask) { unsigned int m, cpu, i, num_cpus; @@ -44,7 +44,7 @@ static int cpu_for_thread_sp(int thread_num, int max_cpus, struct bitmask *cpuma return 0; } -static int cpu_for_thread_ua(int thread_num, int max_cpus) +static int cpu_for_thread_ua(int thread_num) { int res, num_cpus, i, m, cpu; pthread_t thread; @@ -72,12 +72,12 @@ static int cpu_for_thread_ua(int thread_num, int max_cpus) return 0; } -int cpu_for_thread(int thread_num, int max_cpus, struct bitmask *cpumask) +int cpu_for_thread(int thread_num, struct bitmask *cpumask) { if (cpumask) - return cpu_for_thread_sp(thread_num, max_cpus, cpumask); + return cpu_for_thread_sp(thread_num, cpumask); else - return cpu_for_thread_ua(thread_num, max_cpus); + return cpu_for_thread_ua(thread_num); } /* diff --git a/src/signaltest/signaltest.c b/src/signaltest/signaltest.c index 3ca26fb373bb..5427db7f8d85 100644 --- a/src/signaltest/signaltest.c +++ b/src/signaltest/signaltest.c @@ -320,7 +320,6 @@ int main(int argc, char **argv) struct thread_stat *stat; int i, ret = -1; int status, cpu; - int max_cpus = sysconf(_SC_NPROCESSORS_ONLN); if (numa_available() == -1) fatal("Couldn't initialize libnuma"); @@ -373,7 +372,7 @@ int main(int argc, char **argv) par[i].bufmsk = VALBUF_SIZE - 1; } - cpu = cpu_for_thread(i, max_cpus, affinity_mask); + cpu = cpu_for_thread(i, affinity_mask); if (verbose) printf("Thread %d using cpu %d.\n", i, cpu);